Index: wp-admin/includes/template.php
===================================================================
--- wp-admin/includes/template.php	(revision 24796)
+++ wp-admin/includes/template.php	(working copy)
@@ -1734,7 +1734,8 @@ final class WP_Internal_Pointers {
 		$registered_pointers = array(
 			'index.php'    => 'wp330_toolbar',
 			'post-new.php' => 'wp350_media',
-			'post.php'     => 'wp350_media',
+			'post.php'     => array( 'wp350_media', 'wp360_revisions' ),
+			'edit.php'     => 'wp360_locks',
 			'themes.php'   => array( 'wp330_saving_widgets', 'wp340_customize_current_theme_link' ),
 			'appearance_page_custom-header' => 'wp340_choose_image_from_library',
 			'appearance_page_custom-background' => 'wp340_choose_image_from_library',
@@ -1751,6 +1752,8 @@ final class WP_Internal_Pointers {
 			'wp340_customize_current_theme_link' => array( 'edit_theme_options' ),
 			'wp340_choose_image_from_library' => array( 'edit_theme_options' ),
 			'wp350_media' => array( 'upload_files' ),
+			'wp360_revisions' => array( 'edit_posts' ),
+			'wp360_locks' => array( 'read' ),
 		);
 
 		// Get dismissed pointers
@@ -1810,7 +1813,11 @@ final class WP_Internal_Pointers {
 			});
 
 			setup = function() {
-				$('<?php echo $selector; ?>').pointer( options ).pointer('open');
+				if ( $('<?php echo $selector; ?>').pointer( options ).pointer('open').length < 1 ) {
+					if ( options.position && options.position.defer_loading ) {
+						setTimeout( setup, 3000 );
+					}
+				}
 			};
 
 			if ( options.position && options.position.defer_loading )
@@ -1900,13 +1907,33 @@ final class WP_Internal_Pointers {
 		) );
 	}
 
+	public static function pointer_wp360_revisions() {
+		$content  = '<h3>' . __( 'New Revisions Viewer' ) . '</h3>';
+		$content .= '<p>' . __( 'View, compare, and restore other revisions of this content on the improved revisions screen.' ) . '</p>';
+
+		self::print_js( 'wp360_revisions', '.misc-pub-section.num-revisions', array(
+			'content' => $content,
+			'position' => array( 'edge' => is_rtl() ? 'left' : 'right', 'align' => 'center', 'my' => is_rtl() ? 'left' : 'right-14px' ),
+		) );
+	}
+
+	public static function pointer_wp360_locks() {
+		$content  = '<h3>' . __( 'Edit Lock' ) . '</h3>';
+		$content .= '<p>' . __( 'This indicates that someone is currently editing this content. Watch this screen &mdash; it will live-update when they are done!' ) . '</p>';
+
+		self::print_js( 'wp360_locks', 'tr.wp-locked .locked-indicator', array(
+			'content' => $content,
+			'position' => array( 'edge' => 'top', 'align' => 'center', 'my' => 'top+5px', 'defer_loading' => true ),
+		) );
+	}
+
 	/**
 	 * Prevents new users from seeing existing 'new feature' pointers.
 	 *
 	 * @since 3.3.0
 	 */
 	public static function dismiss_pointers_for_new_users( $user_id ) {
-		add_user_meta( $user_id, 'dismissed_wp_pointers', 'wp330_toolbar,wp330_saving_widgets,wp340_choose_image_from_library,wp340_customize_current_theme_link,wp350_media' );
+		add_user_meta( $user_id, 'dismissed_wp_pointers', 'wp330_toolbar,wp330_saving_widgets,wp340_choose_image_from_library,wp340_customize_current_theme_link,wp350_media,wp360_revisions' );
 	}
 }