--- trunk/django/django/conf/admin_templates/delete_confirmation_generic.html   (revision 656)
+++ trunk/django/django/conf/admin_templates/delete_confirmation_generic.html   (working copy)
@@ -14,7 +14,8 @@
     <ul>{{ deleted_objects|unordered_list }}</ul>
     <form action="" method="post">
     <input type="hidden" name="post" value="yes" />
-    <input type="submit" value="Yes, I'm sure" />
+    <input type="submit" value="Yes, delete the {{ object_name }}" />
+    <span class="cancel"> or <a href="../">cancel</a></span>
     </form>
 {% endif %}
 
--- trunk/django/django/conf/admin_media/css/global.css (revision 656)
+++ trunk/django/django/conf/admin_media/css/global.css (working copy)
@@ -37,6 +37,7 @@
 a:link, a:visited { color: #5b80b2; text-decoration:none; }
 a:hover { color: #036; }
 a img { border:none; }
+span.cancel {font-size:12px; vertical-align:bottom;}
 
 /*  GLOBAL DEFAULTS */
 
--- trunk/django/django/views/admin/main.py (revision 656)
+++ trunk/django/django/views/admin/main.py (working copy)
@@ -527,6 +527,7 @@
         (ordered_objects and change and 'onclick="submitOrderForm();"' or ''))
     t.append('<input type="submit" value="Save" class="default" %s/>' % \
         (ordered_objects and change and 'onclick="submitOrderForm();"' or ''))
+    t.append('<span class="cancel"> or <a href="../">cancel</a></span>')       
     t.append('</div>\n')
     return t