Index: modules/comment/comment.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/comment/comment.module,v
retrieving revision 1.602
diff -u -r1.602 comment.module
--- modules/comment/comment.module	12 Nov 2007 19:06:32 -0000	1.602
+++ modules/comment/comment.module	27 Nov 2007 10:32:27 -0000
@@ -1312,17 +1312,17 @@
   $form['nid'] = array('#type' => 'value', '#value' => $edit['nid']);
   $form['uid'] = array('#type' => 'value', '#value' => !empty($edit['uid']) ? $edit['uid'] : NULL);
 
-  $form['preview'] = array('#type' => 'button', '#value' => t('Preview comment'), '#weight' => 19);
-  $form['#token'] = 'comment'. $edit['nid'] . (isset($edit['pid']) ? $edit['pid'] : '');
-
-  // Only show post button if preview is optional or if we are in preview mode.
-  // We show the post button in preview mode even if there are form errors so that
+  // Only show save button if preview is optional or if we are in preview mode.
+  // We show the save button in preview mode even if there are form errors so that
   // optional form elements (e.g., captcha) can be updated in preview mode.
-  if (!form_get_errors() && ((variable_get('comment_preview_'. $node->type, COMMENT_PREVIEW_REQUIRED) == COMMENT_PREVIEW_OPTIONAL) || ($op == t('Preview comment')) || ($op == t('Post comment')))) {
-    $form['submit'] = array('#type' => 'submit', '#value' => t('Post comment'), '#weight' => 20);
+  if (!form_get_errors() && ((variable_get('comment_preview_'. $node->type, COMMENT_PREVIEW_REQUIRED) == COMMENT_PREVIEW_OPTIONAL) || ($op == t('Preview')) || ($op == t('Save')))) {
+    $form['submit'] = array('#type' => 'submit', '#value' => t('Save'), '#weight' => 20);
   }
+  
+  $form['preview'] = array('#type' => 'button', '#value' => t('Preview'), '#weight' => 19);
+  $form['#token'] = 'comment'. $edit['nid'] . (isset($edit['pid']) ? $edit['pid'] : '');
 
-  if ($op == t('Preview comment')) {
+  if ($op == t('Preview')) {
     $form['#after_build'] = array('comment_form_add_preview');
   }
 
Index: modules/node/node.pages.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/node/node.pages.inc,v
retrieving revision 1.9
diff -u -r1.9 node.pages.inc
--- modules/node/node.pages.inc	16 Nov 2007 09:52:37 -0000	1.9
+++ modules/node/node.pages.inc	27 Nov 2007 10:35:06 -0000
@@ -190,6 +190,12 @@
   }
 
   // Add the buttons.
+  $form['buttons']['submit'] = array(
+  '#type' => 'submit',
+  '#value' => t('Save'),
+  '#weight' => 10,
+  '#submit' => array('node_form_submit'),
+);
   $form['buttons'] = array();
   $form['buttons']['preview'] = array(
     '#type' => 'submit',
@@ -197,12 +203,6 @@
     '#weight' => 5,
     '#submit' => array('node_form_build_preview'),
   );
-  $form['buttons']['submit'] = array(
-    '#type' => 'submit',
-    '#value' => t('Save'),
-    '#weight' => 10,
-    '#submit' => array('node_form_submit'),
-  );
   if (!empty($node->nid) && node_access('delete', $node)) {
     $form['buttons']['delete'] = array(
       '#type' => 'submit',