Index: wp-admin/includes/meta-boxes.php
===================================================================
--- wp-admin/includes/meta-boxes.php	(revision 23362)
+++ wp-admin/includes/meta-boxes.php	(working copy)
@@ -1,7 +1,5 @@
 <?php
-
 // -- Post related Meta Boxes
-
 /**
  * Display post submit form fields.
  *
@@ -53,58 +51,118 @@
 <div class="clear"></div>
 </div><!-- #minor-publishing-actions -->
 
-<div id="misc-publishing-actions">
 
-<div class="misc-pub-section"><label for="post_status"><?php _e('Status:') ?></label>
-<span id="post-status-display">
+</div>
+
+<div id="major-publishing-actions">
+<?php do_action('post_submitbox_start'); ?>
+<div id="delete-action">
 <?php
-switch ( $post->post_status ) {
-	case 'private':
-		_e('Privately Published');
-		break;
-	case 'publish':
-		_e('Published');
-		break;
-	case 'future':
-		_e('Scheduled');
-		break;
-	case 'pending':
-		_e('Pending Review');
-		break;
-	case 'draft':
-	case 'auto-draft':
-		_e('Draft');
-		break;
-}
-?>
-</span>
-<?php if ( 'publish' == $post->post_status || 'private' == $post->post_status || $can_publish ) { ?>
-<a href="#post_status" <?php if ( 'private' == $post->post_status ) { ?>style="display:none;" <?php } ?>class="edit-post-status hide-if-no-js"><?php _e('Edit') ?></a>
+if ( current_user_can( "delete_post", $post->ID ) ) {
+	if ( !EMPTY_TRASH_DAYS )
+		$delete_text = __('Delete Permanently');
+	else
+		$delete_text = __('Move to Trash');
+	?>
+<a class="submitdelete deletion" href="<?php echo get_delete_post_link($post->ID); ?>"><?php echo $delete_text; ?></a><?php
+} ?>
+</div>
 
-<div id="post-status-select" class="hide-if-js">
-<input type="hidden" name="hidden_post_status" id="hidden_post_status" value="<?php echo esc_attr( ('auto-draft' == $post->post_status ) ? 'draft' : $post->post_status); ?>" />
-<select name='post_status' id='post_status'>
-<?php if ( 'publish' == $post->post_status ) : ?>
-<option<?php selected( $post->post_status, 'publish' ); ?> value='publish'><?php _e('Published') ?></option>
-<?php elseif ( 'private' == $post->post_status ) : ?>
-<option<?php selected( $post->post_status, 'private' ); ?> value='publish'><?php _e('Privately Published') ?></option>
-<?php elseif ( 'future' == $post->post_status ) : ?>
-<option<?php selected( $post->post_status, 'future' ); ?> value='future'><?php _e('Scheduled') ?></option>
-<?php endif; ?>
-<option<?php selected( $post->post_status, 'pending' ); ?> value='pending'><?php _e('Pending Review') ?></option>
-<?php if ( 'auto-draft' == $post->post_status ) : ?>
-<option<?php selected( $post->post_status, 'auto-draft' ); ?> value='draft'><?php _e('Draft') ?></option>
-<?php else : ?>
-<option<?php selected( $post->post_status, 'draft' ); ?> value='draft'><?php _e('Draft') ?></option>
-<?php endif; ?>
-</select>
- <a href="#post_status" class="save-post-status hide-if-no-js button"><?php _e('OK'); ?></a>
- <a href="#post_status" class="cancel-post-status hide-if-no-js"><?php _e('Cancel'); ?></a>
+<div id="publishing-action">
+<span class="spinner"></span>
+<?php
+if ( !in_array( $post->post_status, array('publish', 'future', 'private') ) || 0 == $post->ID ) {
+	if ( $can_publish ) :
+		if ( !empty($post->post_date_gmt) && time() < strtotime( $post->post_date_gmt . ' +0000' ) ) : ?>
+		<input name="original_publish" type="hidden" id="original_publish" value="<?php esc_attr_e('Schedule') ?>" />
+		<?php submit_button( __( 'Schedule' ), 'primary button-large', 'publish', false, array( 'accesskey' => 'p' ) ); ?>
+<?php	else : ?>
+		<input name="original_publish" type="hidden" id="original_publish" value="<?php esc_attr_e('Publish') ?>" />
+		<?php submit_button( __( 'Publish' ), 'primary button-large', 'publish', false, array( 'accesskey' => 'p' ) ); ?>
+<?php	endif;
+	else : ?>
+		<input name="original_publish" type="hidden" id="original_publish" value="<?php esc_attr_e('Submit for Review') ?>" />
+		<?php submit_button( __( 'Submit for Review' ), 'primary button-large', 'publish', false, array( 'accesskey' => 'p' ) ); ?>
+<?php
+	endif;
+} else { ?>
+		<input name="original_publish" type="hidden" id="original_publish" value="<?php esc_attr_e('Update') ?>" />
+		<input name="save" type="submit" class="button button-primary button-large" id="publish" accesskey="p" value="<?php esc_attr_e('Update') ?>" />
+<?php
+} ?>
 </div>
+<div class="clear"></div>
+</div>
+</div>
 
-<?php } ?>
-</div><!-- .misc-pub-section -->
+<?php
+}
+/**
+ * Display post submit option fields.
+ *
+ * @since 3.6
+ *
+ * @param object $post
+ */
+function post_submit_options_meta_box($post) {
 
+	$post_type = $post->post_type;
+	$post_type_object = get_post_type_object($post_type);
+	$can_publish = current_user_can($post_type_object->cap->publish_posts);
+	?>
+	<div class="submitbox" id="submitpost">
+		<div id="misc-publishing-actions">
+		<div class="misc-pub-section">
+			<label for="post_status"><?php _e('Status:') ?></label>
+		<span id="post-status-display">
+	<?php
+		switch ( $post->post_status ) {
+			case 'private':
+				_e('Privately Published');
+				break;
+			case 'publish':
+				_e('Published');
+				break;
+			case 'future':
+				_e('Scheduled');
+				break;
+			case 'pending':
+				_e('Pending Review');
+				break;
+			case 'draft':
+			case 'auto-draft':
+				_e('Draft');
+				break;
+		}
+	?>
+		</span>
+	<?php if ( 'publish' == $post->post_status || 'private' == $post->post_status || $can_publish ) { ?>
+		<a href="#post_status" <?php if ( 'private' == $post->post_status ) { ?>style="display:none;" <?php } ?>class="edit-post-status hide-if-no-js"><?php _e('Edit') ?></a>
+			<div id="post-status-select" class="hide-if-js">
+				<input type="hidden" name="hidden_post_status" id="hidden_post_status" value="<?php echo esc_attr( ('auto-draft' == $post->post_status ) ? 'draft' : $post->post_status); ?>" />
+				<select name='post_status' id='post_status'>
+				<?php if ( 'publish' == $post->post_status ) : ?>
+					<option<?php selected( $post->post_status, 'publish' ); ?> value='publish'><?php _e('Published') ?></option>
+				<?php elseif ( 'private' == $post->post_status ) : ?>
+					<option<?php selected( $post->post_status, 'private' ); ?> value='publish'><?php _e('Privately Published') ?></option>
+				<?php elseif ( 'future' == $post->post_status ) : ?>
+					<option<?php selected( $post->post_status, 'future' ); ?> value='future'><?php _e('Scheduled') ?></option>
+				<?php endif; ?>
+				<option<?php selected( $post->post_status, 'pending' ); ?> value='pending'><?php _e('Pending Review') ?></option>
+				<?php if ( 'auto-draft' == $post->post_status ) : ?>
+					<option<?php selected( $post->post_status, 'auto-draft' ); ?> value='draft'><?php _e('Draft') ?></option>
+				<?php else : ?>
+					<option<?php selected( $post->post_status, 'draft' ); ?> value='draft'><?php _e('Draft') ?></option>
+				<?php endif; ?>
+				</select>
+				 <a href="#post_status" class="save-post-status hide-if-no-js button"><?php _e('OK'); ?></a>
+				 <a href="#post_status" class="cancel-post-status hide-if-no-js"><?php _e('Cancel'); ?></a>
+			</div>
+		<?php 
+		}
+		?>
+	</div><!-- .misc-pub-section -->
+
 <div class="misc-pub-section" id="visibility">
 <?php _e('Visibility:'); ?> <span id="post-visibility-display"><?php
 
@@ -178,54 +236,21 @@
 	<a href="#edit_timestamp" class="edit-timestamp hide-if-no-js"><?php _e('Edit') ?></a>
 	<div id="timestampdiv" class="hide-if-js"><?php touch_time(($action == 'edit'), 1); ?></div>
 </div><?php // /misc-pub-section ?>
-<?php endif; ?>
+<?php endif; 
 
-<?php do_action('post_submitbox_misc_actions'); ?>
-</div>
+	$the_revisions = wp_get_post_revisions( $post->ID );
+	$revision_count = count( $the_revisions );
+	if ( post_type_supports( $post_type, 'revisions' ) && 0 < $revision_count ) :
+?>
+<div id="major-publishing-actions" >
+	<span id="revisions-link"><?php printf( _n( '%d Revision', '%d Revisions', $revision_count ), $revision_count ); ?></span>
+	<a href="revision.php?revision=<?php echo key( $the_revisions ) ?>&action=edit" class="edit-revisions hide-if-no-js"><?php _e( 'View' ) ?></a>
 <div class="clear"></div>
 </div>
-
-<div id="major-publishing-actions">
-<?php do_action('post_submitbox_start'); ?>
-<div id="delete-action">
-<?php
-if ( current_user_can( "delete_post", $post->ID ) ) {
-	if ( !EMPTY_TRASH_DAYS )
-		$delete_text = __('Delete Permanently');
-	else
-		$delete_text = __('Move to Trash');
-	?>
-<a class="submitdelete deletion" href="<?php echo get_delete_post_link($post->ID); ?>"><?php echo $delete_text; ?></a><?php
-} ?>
 </div>
-
-<div id="publishing-action">
-<span class="spinner"></span>
-<?php
-if ( !in_array( $post->post_status, array('publish', 'future', 'private') ) || 0 == $post->ID ) {
-	if ( $can_publish ) :
-		if ( !empty($post->post_date_gmt) && time() < strtotime( $post->post_date_gmt . ' +0000' ) ) : ?>
-		<input name="original_publish" type="hidden" id="original_publish" value="<?php esc_attr_e('Schedule') ?>" />
-		<?php submit_button( __( 'Schedule' ), 'primary button-large', 'publish', false, array( 'accesskey' => 'p' ) ); ?>
-<?php	else : ?>
-		<input name="original_publish" type="hidden" id="original_publish" value="<?php esc_attr_e('Publish') ?>" />
-		<?php submit_button( __( 'Publish' ), 'primary button-large', 'publish', false, array( 'accesskey' => 'p' ) ); ?>
-<?php	endif;
-	else : ?>
-		<input name="original_publish" type="hidden" id="original_publish" value="<?php esc_attr_e('Submit for Review') ?>" />
-		<?php submit_button( __( 'Submit for Review' ), 'primary button-large', 'publish', false, array( 'accesskey' => 'p' ) ); ?>
-<?php
-	endif;
-} else { ?>
-		<input name="original_publish" type="hidden" id="original_publish" value="<?php esc_attr_e('Update') ?>" />
-		<input name="save" type="submit" class="button button-primary button-large" id="publish" accesskey="p" value="<?php esc_attr_e('Update') ?>" />
-<?php
-} ?>
+<?php endif; ?>
+<?php do_action('post_submitbox_misc_actions'); ?>
 </div>
-<div class="clear"></div>
-</div>
-</div>
-
 <?php
 }
 
Index: wp-admin/edit-form-advanced.php
===================================================================
--- wp-admin/edit-form-advanced.php	(revision 23362)
+++ wp-admin/edit-form-advanced.php	(working copy)
@@ -110,6 +110,7 @@
 	add_action( 'edit_form_after_title', 'edit_form_image_editor' );
 } else {
 	add_meta_box( 'submitdiv', __( 'Publish' ), 'post_submit_meta_box', null, 'side', 'core' );
+	add_meta_box( 'submitoptionsdiv', __( 'Publish Options' ), 'post_submit_options_meta_box', null, 'side', 'core' );
 }
 
 if ( current_theme_supports( 'post-formats' ) && post_type_supports( $post_type, 'post-formats' ) )
Index: wp-admin/css/wp-admin.css
===================================================================
--- wp-admin/css/wp-admin.css	(revision 23362)
+++ wp-admin/css/wp-admin.css	(working copy)
@@ -1041,7 +1041,7 @@
 }
 
 #minor-publishing-actions {
-	padding: 10px 10px 2px 8px;
+	padding: 10px 10px 10px 10px;
 	text-align: right;
 }