Index: wp-admin/includes/deprecated.php
===================================================================
--- wp-admin/includes/deprecated.php	(revision 28845)
+++ wp-admin/includes/deprecated.php	(working copy)
@@ -14,8 +14,7 @@
 
 /**
  * @since 2.1.0
- * @deprecated 2.1.0
- * @deprecated Use wp_editor().
+ * @deprecated 2.1.0 Use wp_editor().
  * @see wp_editor()
  */
 function tinymce_include() {
@@ -40,8 +39,7 @@
  * Calculates the new dimensions for a downsampled image.
  *
  * @since 2.0.0
- * @deprecated 3.0.0
- * @deprecated Use wp_constrain_dimensions()
+ * @deprecated 3.0.0 Use wp_constrain_dimensions()
  * @see wp_constrain_dimensions()
  *
  * @param int $width Current width of the image
@@ -59,8 +57,7 @@
  * Calculated the new dimensions for a downsampled image.
  *
  * @since 2.0.0
- * @deprecated 3.5.0
- * @deprecated Use wp_constrain_dimensions()
+ * @deprecated 3.5.0 Use wp_constrain_dimensions()
  * @see wp_constrain_dimensions()
  *
  * @param int $width Current width of the image
@@ -76,8 +73,7 @@
  * {@internal Missing Short Description}}
  *
  * @since 0.71
- * @deprecated 2.6.0
- * @deprecated Use wp_category_checklist()
+ * @deprecated 2.6.0 Use wp_category_checklist()
  * @see wp_category_checklist()
  *
  * @param unknown_type $default
@@ -94,8 +90,7 @@
  * {@internal Missing Short Description}}
  *
  * @since 2.1.0
- * @deprecated 2.6.0
- * @deprecated Use wp_link_category_checklist()
+ * @deprecated 2.6.0 Use wp_link_category_checklist()
  * @see wp_link_category_checklist()
  *
  * @param unknown_type $default
@@ -126,8 +121,7 @@
  * {@internal Missing Short Description}}
  *
  * @since 1.2.0
- * @deprecated 3.0.0
- * @deprecated Use wp_dropdown_categories()
+ * @deprecated 3.0.0 Use wp_dropdown_categories()
  * @see wp_dropdown_categories()
  *
  * @param unknown_type $currentcat
@@ -163,8 +157,7 @@
  * Register a setting and its sanitization callback
  *
  * @since 2.7.0
- * @deprecated 3.0.0
- * @deprecated Use register_setting()
+ * @deprecated 3.0.0 Use register_setting()
  * @see register_setting()
  *
  * @param string $option_group A settings group name. Should correspond to a whitelisted option key name.
@@ -182,8 +175,7 @@
  * Unregister a setting
  *
  * @since 2.7.0
- * @deprecated 3.0.0
- * @deprecated Use unregister_setting()
+ * @deprecated 3.0.0 Use unregister_setting()
  * @see unregister_setting()
  *
  * @param unknown_type $option_group
@@ -232,7 +224,7 @@
 }
 
 /**
- * @deprecated 3.1.0
+ * @deprecated 3.1.0 Use get_users()
  *
  * @return array List of user IDs.
  */
@@ -249,7 +241,7 @@
 }
 
 /**
- * @deprecated 3.1.0
+ * @deprecated 3.1.0 Use get_users()
  *
  * @param int $user_id User ID.
  * @return array|bool List of editable authors. False if no editable users.
@@ -272,7 +264,7 @@
 }
 
 /**
- * @deprecated 3.1.0
+ * @deprecated 3.1.0 Use get_users()
  *
  * @param int $user_id User ID.
  * @param bool $exclude_zeros Optional, default is true. Whether to exclude zeros.
@@ -307,7 +299,7 @@
 }
 
 /**
- * @deprecated 3.1.0
+ * @deprecated 3.1.0 Use get_users()
  */
 function get_nonauthor_user_ids() {
 	_deprecated_function( __FUNCTION__, '3.1', 'get_users()' );
@@ -327,7 +319,7 @@
  * WordPress User Search class.
  *
  * @since 2.1.0
- * @deprecated 3.1.0
+ * @deprecated 3.1.0 Use WP_User_Query
  */
 class WP_User_Search {
 
@@ -724,8 +716,7 @@
  * Output the QuickPress dashboard widget.
  *
  * @since 3.0.0
- * @deprecated 3.2.0
- * @deprecated Use wp_dashboard_quick_press()
+ * @deprecated 3.2.0 Use wp_dashboard_quick_press()
  * @see wp_dashboard_quick_press()
  */
 function wp_dashboard_quick_press_output() {
@@ -735,8 +726,7 @@
 
 /**
  * @since 2.7.0
- * @deprecated 3.3.0
- * @deprecated Use wp_editor()
+ * @deprecated 3.3.0 Use wp_editor()
  * @see wp_editor()
  */
 function wp_tiny_mce( $teeny = false, $settings = false ) {
@@ -760,8 +750,7 @@
 }
 
 /**
- * @deprecated 3.3.0
- * @deprecated Use wp_editor()
+ * @deprecated 3.3.0 Use wp_editor()
  * @see wp_editor()
  */
 function wp_preload_dialogs() {
@@ -769,8 +758,7 @@
 }
 
 /**
- * @deprecated 3.3.0
- * @deprecated Use wp_editor()
+ * @deprecated 3.3.0 Use wp_editor()
  * @see wp_editor()
  */
 function wp_print_editor_js() {
@@ -778,8 +766,7 @@
 }
 
 /**
- * @deprecated 3.3.0
- * @deprecated Use wp_editor()
+ * @deprecated 3.3.0 Use wp_editor()
  * @see wp_editor()
  */
 function wp_quicktags() {
@@ -790,8 +777,7 @@
  * Returns the screen layout options.
  *
  * @since 2.8.0
- * @deprecated 3.3.0
- * @deprecated Use $current_screen->render_screen_layout()
+ * @deprecated 3.3.0 Use $current_screen->render_screen_layout()
  * @see WP_Screen::render_screen_layout()
  */
 function screen_layout( $screen ) {
@@ -811,8 +797,7 @@
  * Returns the screen's per-page options.
  *
  * @since 2.8.0
- * @deprecated 3.3.0
- * @deprecated Use $current_screen->render_per_page_options()
+ * @deprecated 3.3.0 Use $current_screen->render_per_page_options()
  * @see WP_Screen::render_per_page_options()
  */
 function screen_options( $screen ) {
@@ -832,8 +817,7 @@
  * Renders the screen's help.
  *
  * @since 2.7.0
- * @deprecated 3.3.0
- * @deprecated Use $current_screen->render_screen_meta()
+ * @deprecated 3.3.0 Use $current_screen->render_screen_meta()
  * @see WP_Screen::render_screen_meta()
  */
 function screen_meta( $screen ) {
@@ -845,47 +829,79 @@
  * Favorite actions were deprecated in version 3.2. Use the admin bar instead.
  *
  * @since 2.7.0
- * @deprecated 3.2.0
+ * @deprecated 3.2.0 Use WP_Admin_Bar
  */
 function favorite_actions() {
 	_deprecated_function( __FUNCTION__, '3.2', 'WP_Admin_Bar' );
 }
 
+/**
+ * @deprecated 3.3.0 Use wp_media_upload_handler()
+ * @see wp_media_upload_handler()
+ */
 function media_upload_image() {
 	_deprecated_function( __FUNCTION__, '3.3', 'wp_media_upload_handler()' );
 	return wp_media_upload_handler();
 }
 
+/**
+ * @deprecated 3.3.0 Use wp_media_upload_handler()
+ * @see wp_media_upload_handler()
+ */
 function media_upload_audio() {
 	_deprecated_function( __FUNCTION__, '3.3', 'wp_media_upload_handler()' );
 	return wp_media_upload_handler();
 }
 
+/**
+ * @deprecated 3.3.0 Use wp_media_upload_handler()
+ * @see wp_media_upload_handler()
+ */
 function media_upload_video() {
 	_deprecated_function( __FUNCTION__, '3.3', 'wp_media_upload_handler()' );
 	return wp_media_upload_handler();
 }
 
+/**
+ * @deprecated 3.3.0 Use wp_media_upload_handler()
+ * @see wp_media_upload_handler()
+ */
 function media_upload_file() {
 	_deprecated_function( __FUNCTION__, '3.3', 'wp_media_upload_handler()' );
 	return wp_media_upload_handler();
 }
 
+/**
+ * @deprecated 3.3.0 Use wp_media_insert_url_form('image')
+ * @see wp_media_insert_url_form('image')
+ */
 function type_url_form_image() {
 	_deprecated_function( __FUNCTION__, '3.3', "wp_media_insert_url_form('image')" );
 	return wp_media_insert_url_form( 'image' );
 }
 
+/**
+ * @deprecated 3.3.0 Use wp_media_insert_url_form('audio')
+ * @see wp_media_insert_url_form('audio')
+ */
 function type_url_form_audio() {
 	_deprecated_function( __FUNCTION__, '3.3', "wp_media_insert_url_form('audio')" );
 	return wp_media_insert_url_form( 'audio' );
 }
 
+/**
+ * @deprecated 3.3.0 Use wp_media_insert_url_form('video')
+ * @see wp_media_insert_url_form('video')
+ */
 function type_url_form_video() {
 	_deprecated_function( __FUNCTION__, '3.3', "wp_media_insert_url_form('video')" );
 	return wp_media_insert_url_form( 'video' );
 }
 
+/**
+ * @deprecated 3.3.0 Use wp_media_insert_url_form('file')
+ * @see wp_media_insert_url_form('file')
+ */
 function type_url_form_file() {
 	_deprecated_function( __FUNCTION__, '3.3', "wp_media_insert_url_form('file')" );
 	return wp_media_insert_url_form( 'file' );
@@ -897,8 +913,7 @@
  * Creates an 'Overview' help tab.
  *
  * @since 2.7.0
- * @deprecated 3.3.0
- * @deprecated Use get_current_screen()->add_help_tab()
+ * @deprecated 3.3.0 Use get_current_screen()->add_help_tab()
  * @see WP_Screen
  *
  * @param string    $screen The handle for the screen to add help to. This is usually the hook name returned by the add_*_page() functions.
@@ -917,8 +932,7 @@
  * Get the allowed themes for the current blog.
  *
  * @since 3.0.0
- * @deprecated 3.4.0
- * @deprecated Use wp_get_themes()
+ * @deprecated 3.4.0 Use wp_get_themes()
  * @see wp_get_themes()
  *
  * @return array $themes Array of allowed themes.
@@ -940,7 +954,8 @@
  * {@internal Missing Short Description}}
  *
  * @since 1.5.0
- * @deprecated 3.4.0
+ * @deprecated 3.4.0 Use wp_get_themes( array( 'errors' => true ) )
+ * @see wp_get_themes()
  *
  * @return unknown
  */
@@ -964,7 +979,8 @@
  * {@internal Missing Short Description}}
  *
  * @since 2.0.0
- * @deprecated 3.4.0
+ * @deprecated 3.4.0 Use wp_get_theme()
+ * @see wp_get_theme()
  *
  * @return unknown
  */
@@ -996,7 +1012,8 @@
  * Get an existing post and format it for editing.
  *
  * @since 2.0.0
- * @deprecated 3.5.0
+ * @deprecated 3.5.0 Use get_post()
+ * @see get_post()
  *
  * @param int $id
  * @return object
@@ -1011,8 +1028,8 @@
  * Get the default page information to use.
  *
  * @since 2.5.0
- * @deprecated 3.5.0
- * @deprecated Use get_default_post_to_edit()
+ * @deprecated 3.5.0 Use get_default_post_to_edit()
+ * @see get_default_post_to_edit()
  *
  * @return WP_Post Post object containing all the default post data as attributes
  */
@@ -1028,8 +1045,7 @@
  * This was once used to create a thumbnail from an Image given a maximum side size.
  *
  * @since 1.2.0
- * @deprecated 3.5.0
- * @deprecated Use image_resize()
+ * @deprecated 3.5.0 Use image_resize()
  * @see image_resize()
  *
  * @param mixed $file Filename of the original image, Or attachment id.
@@ -1061,7 +1077,7 @@
  * and calling the 'upgrade' method.
  *
  * @since 2.7.0
- * @deprecated 3.7.0
+ * @deprecated 3.7.0 Use new Core_Upgrader()
  * @see Core_Upgrader
  */
 function wp_update_core($current, $feedback = '') {
@@ -1084,7 +1100,7 @@
  * Unused since 2.8.0.
  *
  * @since 2.5.0
- * @deprecated 3.7.0
+ * @deprecated 3.7.0 Use new Plugin_Upgrader()
  * @see Plugin_Upgrader
  */
 function wp_update_plugin($plugin, $feedback = '') {
@@ -1106,7 +1122,7 @@
  * Unused since 2.8.0.
  *
  * @since 2.7.0
- * @deprecated 3.7.0
+ * @deprecated 3.7.0 Use new Theme_Upgrader()
  * @see Theme_Upgrader
  */
 function wp_update_theme($theme, $feedback = '') {
@@ -1135,20 +1151,27 @@
 	_deprecated_function( __FUNCTION__, '3.7' );
 }
 
-/**#@+
+/**
  * Displays a screen icon.
  *
  * @since 2.7.0
  * @since 3.8.0 Screen icons are no longer used in WordPress. This function no longer produces output.
- * @deprecated 3.8.0
+ * @deprecated 3.8.0 Screen icons are no longer used in WordPress. This function no longer produces output.
  */
 function screen_icon() {
 	echo get_screen_icon();
 }
+
+/**
+ * Returns a screen icon.
+ *
+ * @since 2.7.0
+ * @since 3.8.0 Screen icons are no longer used in WordPress. This function no longer returns output.
+ * @deprecated 3.8.0 Screen icons are no longer used in WordPress. This function no longer returns output.
+ */
 function get_screen_icon() {
 	return '<!-- Screen icons are no longer used as of WordPress 3.8. -->';
 }
-/**#@-*/
 
 /**#@+
  * Deprecated dashboard widget controls.
Index: wp-admin/includes/ms-deprecated.php
===================================================================
--- wp-admin/includes/ms-deprecated.php	(revision 28845)
+++ wp-admin/includes/ms-deprecated.php	(working copy)
@@ -20,7 +20,7 @@
 /**
   * Determines if the available space defined by the admin has been exceeded by the user.
   *
-  * @deprecated 3.0.0
+  * @deprecated 3.0.0 Use is_upload_space_available()
   * @see is_upload_space_available()
  */
 function wpmu_checkAvailableSpace() {
@@ -39,7 +39,7 @@
 }
 
 /**
- * @deprecated 3.0.0
+ * @deprecated 3.0.0 Use activate_plugin()
  * @see activate_plugin()
  */
 function activate_sitewide_plugin() {
@@ -48,8 +48,8 @@
 }
 
 /**
- * @deprecated 3.0.0
- * @see deactivate_sitewide_plugin()
+ * @deprecated 3.0.0 Use deactivate_plugin()
+ * @see deactivate_plugin()
  */
 function deactivate_sitewide_plugin( $plugin = false ) {
 	_deprecated_function(__FUNCTION__, '3.0', 'deactivate_plugin()' );
@@ -57,7 +57,7 @@
 }
 
 /**
- * @deprecated 3.0.0
+ * @deprecated 3.0.0 Use is_network_only_plugin()
  * @see is_network_only_plugin()
  */
 function is_wpmu_sitewide_plugin( $file ) {
@@ -65,14 +65,28 @@
 	return is_network_only_plugin( $file );
 }
 
+
+/**
+ * @deprecated 3.4.0 Use WP_Theme::get_allowed_on_network()
+ * @see WP_Theme::get_allowed_on_network()
+ */
 function get_site_allowed_themes() {
 	_deprecated_function( __FUNCTION__, '3.4', 'WP_Theme::get_allowed_on_network()' );
 	return array_map( 'intval', WP_Theme::get_allowed_on_network() );
 }
 
+
+/**
+ * @deprecated 3.4.0 Use WP_Theme::get_allowed_on_site()
+ * @see WP_Theme::get_allowed_on_site()
+ */
 function wpmu_get_blog_allowedthemes( $blog_id = 0 ) {
 	_deprecated_function( __FUNCTION__, '3.4', 'WP_Theme::get_allowed_on_site()' );
 	return array_map( 'intval', WP_Theme::get_allowed_on_site( $blog_id ) );
 }
 
+
+/**
+ * @deprecated 3.0.0
+ */
 function ms_deprecated_blogs_file() {}
\ No newline at end of file
Index: wp-includes/cache.php
===================================================================
--- wp-includes/cache.php	(revision 28845)
+++ wp-includes/cache.php	(working copy)
@@ -571,7 +571,8 @@
 	 * Reset keys
 	 *
 	 * @since 3.0.0
-	 * @deprecated 3.5.0
+	 * @deprecated 3.5.0 Use switch_to_blog()
+	 * @see switch_to_blog()
 	 */
 	public function reset() {
 		_deprecated_function( __FUNCTION__, '3.5', 'switch_to_blog()' );
Index: wp-includes/class-simplepie.php
===================================================================
--- wp-includes/class-simplepie.php	(revision 28845)
+++ wp-includes/class-simplepie.php	(working copy)
@@ -959,7 +959,7 @@
 	/**#@+
 	 * Useful when you are overloading or extending SimplePie's default classes.
 	 *
-	 * @deprecated Use {@see get_registry()} instead
+	 * @deprecated Use get_registry()
 	 * @link http://php.net/manual/en/language.oop5.basic.php#language.oop5.basic.extends PHP5 extends documentation
 	 * @param string $class Name of custom class
 	 * @return boolean True on success, false otherwise
Index: wp-includes/class-wp-xmlrpc-server.php
===================================================================
--- wp-includes/class-wp-xmlrpc-server.php	(revision 28845)
+++ wp-includes/class-wp-xmlrpc-server.php	(working copy)
@@ -243,8 +243,7 @@
 	 * Check user's credentials. Deprecated.
 	 *
 	 * @since 1.5.0
-	 * @deprecated 2.8.0
-	 * @deprecated use wp_xmlrpc_server::login
+	 * @deprecated 2.8.0 Use wp_xmlrpc_server::login
 	 * @see wp_xmlrpc_server::login
 	 *
 	 * @param string $username User's username.
Index: wp-includes/deprecated.php
===================================================================
--- wp-includes/deprecated.php	(revision 28845)
+++ wp-includes/deprecated.php	(working copy)
@@ -16,8 +16,7 @@
  * Entire Post data.
  *
  * @since 0.71
- * @deprecated 1.5.1
- * @deprecated Use get_post()
+ * @deprecated 1.5.1 Use get_post()
  * @see get_post()
  *
  * @param int $postid
@@ -53,8 +52,7 @@
  * Sets up the WordPress Loop.
  *
  * @since 1.0.1
- * @deprecated 1.5.0
- * @deprecated Use The Loop - {@link http://codex.wordpress.org/The_Loop Use new WordPress Loop}
+ * @deprecated 1.5.0 Use The Loop - {@link http://codex.wordpress.org/The_Loop Use new WordPress Loop}
  */
 function start_wp() {
 	global $wp_query;
@@ -71,8 +69,7 @@
  * Return or Print Category ID.
  *
  * @since 0.71
- * @deprecated 0.71
- * @deprecated use get_the_category()
+ * @deprecated 0.71 Use get_the_category()
  * @see get_the_category()
  *
  * @param bool $echo
@@ -95,8 +92,7 @@
  * Print category with optional text before and after.
  *
  * @since 0.71
- * @deprecated 0.71
- * @deprecated use get_the_category_by_ID()
+ * @deprecated 0.71 Use get_the_category_by_ID()
  * @see get_the_category_by_ID()
  *
  * @param string $before
@@ -122,8 +118,7 @@
  * Prints link to the previous post.
  *
  * @since 1.5.0
- * @deprecated 2.0.0
- * @deprecated Use previous_post_link()
+ * @deprecated 2.0.0 Use previous_post_link()
  * @see previous_post_link()
  *
  * @param string $format
@@ -159,8 +154,7 @@
  * Prints link to the next post.
  *
  * @since 0.71
- * @deprecated 2.0.0
- * @deprecated Use next_post_link()
+ * @deprecated 2.0.0 Use next_post_link()
  * @see next_post_link()
  *
  * @param string $format
@@ -195,8 +189,7 @@
  * Whether user can create a post.
  *
  * @since 1.5.0
- * @deprecated 2.0.0
- * @deprecated Use current_user_can()
+ * @deprecated 2.0.0 Use current_user_can()
  * @see current_user_can()
  *
  * @param int $user_id
@@ -215,8 +208,7 @@
  * Whether user can create a post.
  *
  * @since 1.5.0
- * @deprecated 2.0.0
- * @deprecated Use current_user_can()
+ * @deprecated 2.0.0 Use current_user_can()
  * @see current_user_can()
  *
  * @param int $user_id
@@ -235,8 +227,7 @@
  * Whether user can edit a post.
  *
  * @since 1.5.0
- * @deprecated 2.0.0
- * @deprecated Use current_user_can()
+ * @deprecated 2.0.0 Use current_user_can()
  * @see current_user_can()
  *
  * @param int $user_id
@@ -264,8 +255,7 @@
  * Whether user can delete a post.
  *
  * @since 1.5.0
- * @deprecated 2.0.0
- * @deprecated Use current_user_can()
+ * @deprecated 2.0.0 Use current_user_can()
  * @see current_user_can()
  *
  * @param int $user_id
@@ -284,8 +274,7 @@
  * Whether user can set new posts' dates.
  *
  * @since 1.5.0
- * @deprecated 2.0.0
- * @deprecated Use current_user_can()
+ * @deprecated 2.0.0 Use current_user_can()
  * @see current_user_can()
  *
  * @param int $user_id
@@ -304,8 +293,7 @@
  * Whether user can delete a post.
  *
  * @since 1.5.0
- * @deprecated 2.0.0
- * @deprecated Use current_user_can()
+ * @deprecated 2.0.0 Use current_user_can()
  * @see current_user_can()
  *
  * @param int $user_id
@@ -324,8 +312,7 @@
  * Whether user can delete a post.
  *
  * @since 1.5.0
- * @deprecated 2.0.0
- * @deprecated Use current_user_can()
+ * @deprecated 2.0.0 Use current_user_can()
  * @see current_user_can()
  *
  * @param int $user_id
@@ -344,8 +331,7 @@
  * Whether user can delete a post.
  *
  * @since 1.5.0
- * @deprecated 2.0.0
- * @deprecated Use current_user_can()
+ * @deprecated 2.0.0 Use current_user_can()
  * @see current_user_can()
  *
  * @param int $user_id
@@ -364,8 +350,7 @@
  * Can user can edit other user.
  *
  * @since 1.5.0
- * @deprecated 2.0.0
- * @deprecated Use current_user_can()
+ * @deprecated 2.0.0 Use current_user_can()
  * @see current_user_can()
  *
  * @param int $user_id
@@ -387,8 +372,7 @@
  * Gets the links associated with category $cat_name.
  *
  * @since 0.71
- * @deprecated 2.1.0
- * @deprecated Use get_bookmarks()
+ * @deprecated 2.1.0 Use get_bookmarks()
  * @see get_bookmarks()
  *
  * @param string $cat_name Optional. The category name to use. If no match is found uses all.
@@ -421,8 +405,7 @@
  * Gets the links associated with the named category.
  *
  * @since 1.0.1
- * @deprecated 2.1.0
- * @deprecated Use wp_list_bookmarks()
+ * @deprecated 2.1.0 Use wp_list_bookmarks()
  * @see wp_list_bookmarks()
  *
  * @param string $category The category to use.
@@ -459,8 +442,7 @@
  * </code>
  *
  * @since 1.0.1
- * @deprecated 2.1.0
- * @deprecated Use get_bookmarks()
+ * @deprecated 2.1.0 Use get_bookmarks()
  * @see get_bookmarks()
  *
  * @param string $cat_name The category name to use. If no match is found uses all.
@@ -512,8 +494,7 @@
  * </ol>
  *
  * @since 1.0.1
- * @deprecated 2.1.0
- * @deprecated Use get_bookmarks()
+ * @deprecated 2.1.0 Use get_bookmarks()
  * @see get_bookmarks()
  *
  * @param int $category The category to use. If no category supplied uses all
@@ -540,8 +521,7 @@
  * Gets the links associated with category 'cat_name' and display rating stars/chars.
  *
  * @since 0.71
- * @deprecated 2.1.0
- * @deprecated Use get_bookmarks()
+ * @deprecated 2.1.0 Use get_bookmarks()
  * @see get_bookmarks()
  *
  * @param string $cat_name The category name to use. If no match is found uses all
@@ -568,8 +548,7 @@
  * Gets the links associated with category n and display rating stars/chars.
  *
  * @since 0.71
- * @deprecated 2.1.0
- * @deprecated Use get_bookmarks()
+ * @deprecated 2.1.0 Use get_bookmarks()
  * @see get_bookmarks()
  *
  * @param int $category The category to use. If no category supplied uses all
@@ -596,8 +575,7 @@
  * Gets the auto_toggle setting.
  *
  * @since 0.71
- * @deprecated 2.1.0
- * @deprecated No alternative function available
+ * @deprecated 2.1.0 No alternative function available
  *
  * @param int $id The category to get. If no category supplied uses 0
  * @return int Only returns 0.
@@ -609,8 +587,7 @@
 
 /**
  * @since 0.71
- * @deprecated 2.1.0
- * @deprecated Use wp_list_categories()
+ * @deprecated 2.1.0 Use wp_list_categories()
  * @see wp_list_categories()
  *
  * @param int $optionall
@@ -645,8 +622,7 @@
 
 /**
  * @since 1.2.0
- * @deprecated 2.1.0
- * @deprecated Use wp_list_categories()
+ * @deprecated 2.1.0 Use wp_list_categories()
  * @see wp_list_categories()
  *
  * @param string|array $args
@@ -677,8 +653,7 @@
 
 /**
  * @since 0.71
- * @deprecated 2.1.0
- * @deprecated Use wp_dropdown_categories()
+ * @deprecated 2.1.0 Use wp_dropdown_categories()
  * @see wp_dropdown_categories()
  *
  * @param int $optionall
@@ -716,8 +691,7 @@
  * List authors.
  *
  * @since 1.2.0
- * @deprecated 2.1.0
- * @deprecated Use wp_list_authors()
+ * @deprecated 2.1.0 Use wp_list_authors()
  * @see wp_list_authors()
  *
  * @param bool $optioncount
@@ -737,8 +711,7 @@
 
 /**
  * @since 1.0.1
- * @deprecated 2.1.0
- * @deprecated Use wp_get_post_categories()
+ * @deprecated 2.1.0 Use wp_get_post_categories()
  * @see wp_get_post_categories()
  *
  * @param int $blogid Not Used
@@ -754,8 +727,7 @@
  * Sets the categories that the post id belongs to.
  *
  * @since 1.0.1
- * @deprecated 2.1.0
- * @deprecated Use wp_set_post_categories()
+ * @deprecated 2.1.0 Use wp_set_post_categories()
  * @see wp_set_post_categories()
  *
  * @param int $blogid Not used
@@ -770,8 +742,7 @@
 
 /**
  * @since 0.71
- * @deprecated 2.1.0
- * @deprecated Use wp_get_archives()
+ * @deprecated 2.1.0 Use wp_get_archives()
  * @see wp_get_archives()
  *
  * @param string $type
@@ -792,8 +763,7 @@
  * Returns or Prints link to the author's posts.
  *
  * @since 1.2.0
- * @deprecated 2.1.0
- * @deprecated Use get_author_posts_url()
+ * @deprecated 2.1.0 Use get_author_posts_url()
  * @see get_author_posts_url()
  *
  * @param bool $echo
@@ -815,8 +785,7 @@
  * Print list of pages based on arguments.
  *
  * @since 0.71
- * @deprecated 2.1.0
- * @deprecated Use wp_link_pages()
+ * @deprecated 2.1.0 Use wp_link_pages()
  * @see wp_link_pages()
  *
  * @param string $before
@@ -840,8 +809,7 @@
  * Get value based on option.
  *
  * @since 0.71
- * @deprecated 2.1.0
- * @deprecated Use get_option()
+ * @deprecated 2.1.0 Use get_option()
  * @see get_option()
  *
  * @param string $option
@@ -857,8 +825,7 @@
  * Print the permalink of the current post in the loop.
  *
  * @since 0.71
- * @deprecated 1.2.0
- * @deprecated Use the_permalink()
+ * @deprecated 1.2.0 Use the_permalink()
  * @see the_permalink()
  */
 function permalink_link() {
@@ -870,8 +837,7 @@
  * Print the permalink to the RSS feed.
  *
  * @since 0.71
- * @deprecated 2.3.0
- * @deprecated Use the_permalink_rss()
+ * @deprecated 2.3.0 Use the_permalink_rss()
  * @see the_permalink_rss()
  *
  * @param string $deprecated
@@ -886,8 +852,7 @@
  *
  * @see get_links() for argument information that can be used in $args
  * @since 1.0.1
- * @deprecated 2.1.0
- * @deprecated Use wp_list_bookmarks()
+ * @deprecated 2.1.0 Use wp_list_bookmarks()
  * @see wp_list_bookmarks()
  *
  * @param string $args a query string
@@ -926,8 +891,7 @@
  * Gets the links associated with category by id.
  *
  * @since 0.71
- * @deprecated 2.1.0
- * @deprecated Use get_bookmarks()
+ * @deprecated 2.1.0 Use get_bookmarks()
  * @see get_bookmarks()
  *
  * @param int $category The category to use. If no category supplied uses all
@@ -1035,8 +999,7 @@
  * $wpdb->linkcategories and output it as a nested HTML unordered list.
  *
  * @since 1.0.1
- * @deprecated 2.1.0
- * @deprecated Use wp_list_bookmarks()
+ * @deprecated 2.1.0 Use wp_list_bookmarks()
  * @see wp_list_bookmarks()
  *
  * @param string $order Sort link categories by 'name' or 'id'
@@ -1078,8 +1041,7 @@
  * Show the link to the links popup and the number of links.
  *
  * @since 0.71
- * @deprecated 2.1.0
- * @deprecated {@internal Use function instead is unknown}}
+ * @deprecated 2.1.0 {@internal Use function instead is unknown}}
  *
  * @param string $text the text of the link
  * @param int $width the width of the popup window
@@ -1093,8 +1055,7 @@
 
 /**
  * @since 1.0.1
- * @deprecated 2.1.0
- * @deprecated Use sanitize_bookmark_field()
+ * @deprecated 2.1.0 Use sanitize_bookmark_field()
  * @see sanitize_bookmark_field()
  *
  * @param object $link
@@ -1109,8 +1070,7 @@
  * Gets the name of category by id.
  *
  * @since 0.71
- * @deprecated 2.1.0
- * @deprecated Use get_category()
+ * @deprecated 2.1.0 Use get_category()
  * @see get_category()
  *
  * @param int $id The category to get. If no category supplied uses 0
@@ -1139,8 +1099,7 @@
  * Print RSS comment feed link.
  *
  * @since 1.0.1
- * @deprecated 2.5.0
- * @deprecated Use post_comments_feed_link()
+ * @deprecated 2.5.0 Use post_comments_feed_link()
  * @see post_comments_feed_link()
  *
  * @param string $link_text
@@ -1154,8 +1113,7 @@
  * Print/Return link to category RSS2 feed.
  *
  * @since 1.2.0
- * @deprecated 2.5.0
- * @deprecated Use get_category_feed_link()
+ * @deprecated 2.5.0 Use get_category_feed_link()
  * @see get_category_feed_link()
  *
  * @param bool $echo
@@ -1176,8 +1134,7 @@
  * Print/Return link to author RSS feed.
  *
  * @since 1.2.0
- * @deprecated 2.5.0
- * @deprecated Use get_author_feed_link()
+ * @deprecated 2.5.0 Use get_author_feed_link()
  * @see get_author_feed_link()
  *
  * @param bool $echo
@@ -1197,8 +1154,7 @@
  * Return link to the post RSS feed.
  *
  * @since 1.5.0
- * @deprecated 2.2.0
- * @deprecated Use get_post_comments_feed_link()
+ * @deprecated 2.2.0 Use get_post_comments_feed_link()
  * @see get_post_comments_feed_link()
  *
  * @return string
@@ -1212,8 +1168,7 @@
  * An alias of wp_create_user().
  *
  * @since 2.0.0
- * @deprecated 2.0.0
- * @deprecated Use wp_create_user()
+ * @deprecated 2.0.0 Use wp_create_user()
  * @see wp_create_user()
  *
  * @param string $username The user's username.
@@ -1240,8 +1195,7 @@
  * Retrieve an array of comment data about comment $comment_ID.
  *
  * @since 0.71
- * @deprecated 2.7.0
- * @deprecated Use get_comment()
+ * @deprecated 2.7.0 Use get_comment()
  * @see get_comment()
  *
  * @param int $comment_ID The ID of the comment
@@ -1258,8 +1212,7 @@
  * Retrieve the category name by the category ID.
  *
  * @since 0.71
- * @deprecated 2.8.0
- * @deprecated Use get_cat_name()
+ * @deprecated 2.8.0 Use get_cat_name()
  * @see get_cat_name()
  *
  * @param int $cat_ID Category ID
@@ -1274,8 +1227,7 @@
  * Retrieve category children list separated before and after the term IDs.
  *
  * @since 1.2.0
- * @deprecated 2.8.0
- * @deprecated Use get_term_children()
+ * @deprecated 2.8.0 Use get_term_children()
  * @see get_term_children()
  *
  * @param int $id Category ID to retrieve children.
@@ -1312,7 +1264,7 @@
  * Retrieves all category IDs.
  *
  * @since 2.0.0
- * @deprecated 4.0.0 Use get_terms() instead.
+ * @deprecated 4.0.0 Use get_terms()
  * @see get_terms()
  * @link http://codex.wordpress.org/Function_Reference/get_all_category_ids
  *
@@ -1333,14 +1285,13 @@
  * Retrieve the description of the author of the current post.
  *
  * @since 1.5.0
- * @deprecated 2.8.0
- * @deprecated Use get_the_author_meta('description')
+ * @deprecated 2.8.0 Use get_the_author_meta( 'description' )
  * @see get_the_author_meta()
  *
  * @return string The author's description.
  */
 function get_the_author_description() {
-	_deprecated_function( __FUNCTION__, '2.8', 'get_the_author_meta(\'description\')' );
+	_deprecated_function( __FUNCTION__, '2.8', 'get_the_author_meta( \'description\' )' );
 	return get_the_author_meta('description');
 }
 
@@ -1348,12 +1299,11 @@
  * Display the description of the author of the current post.
  *
  * @since 1.0.0
- * @deprecated 2.8.0
- * @deprecated Use the_author_meta('description')
+ * @deprecated 2.8.0 Use the_author_meta( 'description' )
  * @see the_author_meta()
  */
 function the_author_description() {
-	_deprecated_function( __FUNCTION__, '2.8', 'the_author_meta(\'description\')' );
+	_deprecated_function( __FUNCTION__, '2.8', 'the_author_meta( \'description\' )' );
 	the_author_meta('description');
 }
 
@@ -1361,14 +1311,13 @@
  * Retrieve the login name of the author of the current post.
  *
  * @since 1.5.0
- * @deprecated 2.8.0
- * @deprecated Use get_the_author_meta('login')
+ * @deprecated 2.8.0 Use get_the_author_meta( 'login' )
  * @see get_the_author_meta()
  *
  * @return string The author's login name (username).
  */
 function get_the_author_login() {
-	_deprecated_function( __FUNCTION__, '2.8', 'get_the_author_meta(\'login\')' );
+	_deprecated_function( __FUNCTION__, '2.8', 'get_the_author_meta( \'login\' )' );
 	return get_the_author_meta('login');
 }
 
@@ -1376,12 +1325,11 @@
  * Display the login name of the author of the current post.
  *
  * @since 0.71
- * @deprecated 2.8.0
- * @deprecated Use the_author_meta('login')
+ * @deprecated 2.8.0 Use the_author_meta( 'login' )
  * @see the_author_meta()
  */
 function the_author_login() {
-	_deprecated_function( __FUNCTION__, '2.8', 'the_author_meta(\'login\')' );
+	_deprecated_function( __FUNCTION__, '2.8', 'the_author_meta( \'login\' )' );
 	the_author_meta('login');
 }
 
@@ -1389,14 +1337,13 @@
  * Retrieve the first name of the author of the current post.
  *
  * @since 1.5.0
- * @deprecated 2.8.0
- * @deprecated Use get_the_author_meta('first_name')
+ * @deprecated 2.8.0 Use get_the_author_meta( 'first_name' )
  * @see get_the_author_meta()
  *
  * @return string The author's first name.
  */
 function get_the_author_firstname() {
-	_deprecated_function( __FUNCTION__, '2.8', 'get_the_author_meta(\'first_name\')' );
+	_deprecated_function( __FUNCTION__, '2.8', 'get_the_author_meta( \'first_name\' )' );
 	return get_the_author_meta('first_name');
 }
 
@@ -1404,12 +1351,11 @@
  * Display the first name of the author of the current post.
  *
  * @since 0.71
- * @deprecated 2.8.0
- * @deprecated Use the_author_meta('first_name')
+ * @deprecated 2.8.0 Use the_author_meta( 'first_name' )
  * @see the_author_meta()
  */
 function the_author_firstname() {
-	_deprecated_function( __FUNCTION__, '2.8', 'the_author_meta(\'first_name\')' );
+	_deprecated_function( __FUNCTION__, '2.8', 'the_author_meta( \'first_name\' )' );
 	the_author_meta('first_name');
 }
 
@@ -1417,14 +1363,13 @@
  * Retrieve the last name of the author of the current post.
  *
  * @since 1.5.0
- * @deprecated 2.8.0
- * @deprecated Use get_the_author_meta('last_name')
+ * @deprecated 2.8.0 Use get_the_author_meta( 'last_name' )
  * @see get_the_author_meta()
  *
  * @return string The author's last name.
  */
 function get_the_author_lastname() {
-	_deprecated_function( __FUNCTION__, '2.8', 'get_the_author_meta(\'last_name\')' );
+	_deprecated_function( __FUNCTION__, '2.8', 'get_the_author_meta( \'last_name\' )' );
 	return get_the_author_meta('last_name');
 }
 
@@ -1432,12 +1377,11 @@
  * Display the last name of the author of the current post.
  *
  * @since 0.71
- * @deprecated 2.8.0
- * @deprecated Use the_author_meta('last_name')
+ * @deprecated 2.8.0 Use the_author_meta( 'last_name' )
  * @see the_author_meta()
  */
 function the_author_lastname() {
-	_deprecated_function( __FUNCTION__, '2.8', 'the_author_meta(\'last_name\')' );
+	_deprecated_function( __FUNCTION__, '2.8', 'the_author_meta( \'last_name\' )' );
 	the_author_meta('last_name');
 }
 
@@ -1445,14 +1389,13 @@
  * Retrieve the nickname of the author of the current post.
  *
  * @since 1.5.0
- * @deprecated 2.8.0
- * @deprecated Use get_the_author_meta('nickname')
+ * @deprecated 2.8.0 Use get_the_author_meta( 'nickname' )
  * @see get_the_author_meta()
  *
  * @return string The author's nickname.
  */
 function get_the_author_nickname() {
-	_deprecated_function( __FUNCTION__, '2.8', 'get_the_author_meta(\'nickname\')' );
+	_deprecated_function( __FUNCTION__, '2.8', 'get_the_author_meta( \'nickname\' )' );
 	return get_the_author_meta('nickname');
 }
 
@@ -1460,12 +1403,11 @@
  * Display the nickname of the author of the current post.
  *
  * @since 0.71
- * @deprecated 2.8.0
- * @deprecated Use the_author_meta('nickname')
+ * @deprecated 2.8.0 Use the_author_meta( 'nickname' )
  * @see the_author_meta()
  */
 function the_author_nickname() {
-	_deprecated_function( __FUNCTION__, '2.8', 'the_author_meta(\'nickname\')' );
+	_deprecated_function( __FUNCTION__, '2.8', 'the_author_meta( \'nickname\' )' );
 	the_author_meta('nickname');
 }
 
@@ -1473,14 +1415,13 @@
  * Retrieve the email of the author of the current post.
  *
  * @since 1.5.0
- * @deprecated 2.8.0
- * @deprecated Use get_the_author_meta('email')
+ * @deprecated 2.8.0 Use get_the_author_meta( 'email' )
  * @see get_the_author_meta()
  *
  * @return string The author's username.
  */
 function get_the_author_email() {
-	_deprecated_function( __FUNCTION__, '2.8', 'get_the_author_meta(\'email\')' );
+	_deprecated_function( __FUNCTION__, '2.8', 'get_the_author_meta( \'email\' )' );
 	return get_the_author_meta('email');
 }
 
@@ -1488,12 +1429,11 @@
  * Display the email of the author of the current post.
  *
  * @since 0.71
- * @deprecated 2.8.0
- * @deprecated Use the_author_meta('email')
+ * @deprecated 2.8.0 Use the_author_meta( 'email' )
  * @see the_author_meta()
  */
 function the_author_email() {
-	_deprecated_function( __FUNCTION__, '2.8', 'the_author_meta(\'email\')' );
+	_deprecated_function( __FUNCTION__, '2.8', 'the_author_meta( \'email\' )' );
 	the_author_meta('email');
 }
 
@@ -1501,14 +1441,13 @@
  * Retrieve the ICQ number of the author of the current post.
  *
  * @since 1.5.0
- * @deprecated 2.8.0
- * @deprecated Use get_the_author_meta('icq')
+ * @deprecated 2.8.0 Use get_the_author_meta( 'icq' )
  * @see get_the_author_meta()
  *
  * @return string The author's ICQ number.
  */
 function get_the_author_icq() {
-	_deprecated_function( __FUNCTION__, '2.8', 'get_the_author_meta(\'icq\')' );
+	_deprecated_function( __FUNCTION__, '2.8', 'get_the_author_meta( \'icq\' )' );
 	return get_the_author_meta('icq');
 }
 
@@ -1516,12 +1455,11 @@
  * Display the ICQ number of the author of the current post.
  *
  * @since 0.71
- * @deprecated 2.8.0
- * @deprecated Use the_author_meta('icq')
+ * @deprecated 2.8.0 Use the_author_meta( 'icq' )
  * @see the_author_meta()
  */
 function the_author_icq() {
-	_deprecated_function( __FUNCTION__, '2.8', 'the_author_meta(\'icq\')' );
+	_deprecated_function( __FUNCTION__, '2.8', 'the_author_meta( \'icq\' )' );
 	the_author_meta('icq');
 }
 
@@ -1529,14 +1467,13 @@
  * Retrieve the Yahoo! IM name of the author of the current post.
  *
  * @since 1.5.0
- * @deprecated 2.8.0
- * @deprecated Use get_the_author_meta('yim')
+ * @deprecated 2.8.0 Use get_the_author_meta( 'yim' )
  * @see get_the_author_meta()
  *
  * @return string The author's Yahoo! IM name.
  */
 function get_the_author_yim() {
-	_deprecated_function( __FUNCTION__, '2.8', 'get_the_author_meta(\'yim\')' );
+	_deprecated_function( __FUNCTION__, '2.8', 'get_the_author_meta( \'yim\' )' );
 	return get_the_author_meta('yim');
 }
 
@@ -1544,12 +1481,11 @@
  * Display the Yahoo! IM name of the author of the current post.
  *
  * @since 0.71
- * @deprecated 2.8.0
- * @deprecated Use the_author_meta('yim')
+ * @deprecated 2.8.0 Use the_author_meta( 'yim' )
  * @see the_author_meta()
  */
 function the_author_yim() {
-	_deprecated_function( __FUNCTION__, '2.8', 'the_author_meta(\'yim\')' );
+	_deprecated_function( __FUNCTION__, '2.8', 'the_author_meta( \'yim\' )' );
 	the_author_meta('yim');
 }
 
@@ -1557,14 +1493,13 @@
  * Retrieve the MSN address of the author of the current post.
  *
  * @since 1.5.0
- * @deprecated 2.8.0
- * @deprecated Use get_the_author_meta('msn')
+ * @deprecated 2.8.0 Use get_the_author_meta( 'msn' )
  * @see get_the_author_meta()
  *
  * @return string The author's MSN address.
  */
 function get_the_author_msn() {
-	_deprecated_function( __FUNCTION__, '2.8', 'get_the_author_meta(\'msn\')' );
+	_deprecated_function( __FUNCTION__, '2.8', 'get_the_author_meta( \'msn\' )' );
 	return get_the_author_meta('msn');
 }
 
@@ -1572,12 +1507,11 @@
  * Display the MSN address of the author of the current post.
  *
  * @since 0.71
- * @deprecated 2.8.0
- * @deprecated Use the_author_meta('msn')
+ * @deprecated 2.8.0 Use the_author_meta( 'msn' )
  * @see the_author_meta()
  */
 function the_author_msn() {
-	_deprecated_function( __FUNCTION__, '2.8', 'the_author_meta(\'msn\')' );
+	_deprecated_function( __FUNCTION__, '2.8', 'the_author_meta( \'msn\' )' );
 	the_author_meta('msn');
 }
 
@@ -1585,14 +1519,13 @@
  * Retrieve the AIM address of the author of the current post.
  *
  * @since 1.5.0
- * @deprecated 2.8.0
- * @deprecated Use get_the_author_meta('aim')
+ * @deprecated 2.8.0 Use get_the_author_meta( 'aim' )
  * @see get_the_author_meta()
  *
  * @return string The author's AIM address.
  */
 function get_the_author_aim() {
-	_deprecated_function( __FUNCTION__, '2.8', 'get_the_author_meta(\'aim\')' );
+	_deprecated_function( __FUNCTION__, '2.8', 'get_the_author_meta( \'aim\' )' );
 	return get_the_author_meta('aim');
 }
 
@@ -1601,11 +1534,10 @@
  *
  * @since 0.71
  * @see the_author_meta()
- * @deprecated 2.8.0
- * @deprecated Use the_author_meta('aim')
+ * @deprecated 2.8.0 Use the_author_meta( 'aim' )
  */
 function the_author_aim() {
-	_deprecated_function( __FUNCTION__, '2.8', 'the_author_meta(\'aim\')' );
+	_deprecated_function( __FUNCTION__, '2.8', 'the_author_meta( \'aim\' )' );
 	the_author_meta('aim');
 }
 
@@ -1613,8 +1545,7 @@
  * Retrieve the specified author's preferred display name.
  *
  * @since 1.0.0
- * @deprecated 2.8.0
- * @deprecated Use get_the_author_meta('display_name')
+ * @deprecated 2.8.0 Use get_the_author_meta( 'display_name' )
  * @see get_the_author_meta()
  *
  * @param int $auth_id The ID of the author.
@@ -1621,7 +1552,7 @@
  * @return string The author's display name.
  */
 function get_author_name( $auth_id = false ) {
-	_deprecated_function( __FUNCTION__, '2.8', 'get_the_author_meta(\'display_name\')' );
+	_deprecated_function( __FUNCTION__, '2.8', 'get_the_author_meta( \'display_name\' )' );
 	return get_the_author_meta('display_name', $auth_id);
 }
 
@@ -1629,14 +1560,13 @@
  * Retrieve the URL to the home page of the author of the current post.
  *
  * @since 1.5.0
- * @deprecated 2.8.0
- * @deprecated Use get_the_author_meta('url')
+ * @deprecated 2.8.0 Use get_the_author_meta( 'url' )
  * @see get_the_author_meta()
  *
  * @return string The URL to the author's page.
  */
 function get_the_author_url() {
-	_deprecated_function( __FUNCTION__, '2.8', 'get_the_author_meta(\'url\')' );
+	_deprecated_function( __FUNCTION__, '2.8', 'get_the_author_meta( \'url\' )' );
 	return get_the_author_meta('url');
 }
 
@@ -1644,12 +1574,11 @@
  * Display the URL to the home page of the author of the current post.
  *
  * @since 0.71
- * @deprecated 2.8.0
- * @deprecated Use the_author_meta('url')
+ * @deprecated 2.8.0 Use the_author_meta( 'url' )
  * @see the_author_meta()
  */
 function the_author_url() {
-	_deprecated_function( __FUNCTION__, '2.8', 'the_author_meta(\'url\')' );
+	_deprecated_function( __FUNCTION__, '2.8', 'the_author_meta( \'url\' )' );
 	the_author_meta('url');
 }
 
@@ -1657,14 +1586,13 @@
  * Retrieve the ID of the author of the current post.
  *
  * @since 1.5.0
- * @deprecated 2.8.0
- * @deprecated Use get_the_author_meta('ID')
+ * @deprecated 2.8.0 Use get_the_author_meta( 'ID' )
  * @see get_the_author_meta()
  *
  * @return int The author's ID.
  */
 function get_the_author_ID() {
-	_deprecated_function( __FUNCTION__, '2.8', 'get_the_author_meta(\'ID\')' );
+	_deprecated_function( __FUNCTION__, '2.8', 'get_the_author_meta( \'ID\' )' );
 	return get_the_author_meta('ID');
 }
 
@@ -1672,12 +1600,11 @@
  * Display the ID of the author of the current post.
  *
  * @since 0.71
- * @deprecated 2.8.0
- * @deprecated Use the_author_meta('ID')
+ * @deprecated 2.8.0 Use the_author_meta( 'ID' )
  * @see the_author_meta()
 */
 function the_author_ID() {
-	_deprecated_function( __FUNCTION__, '2.8', 'the_author_meta(\'ID\')' );
+	_deprecated_function( __FUNCTION__, '2.8', 'the_author_meta( \'ID\' )' );
 	the_author_meta('ID');
 }
 
@@ -1701,8 +1628,7 @@
  * @since 0.71
  * @uses apply_filters() Calls 'the_content_rss' on the content before processing.
  *
- * @deprecated 2.9.0
- * @deprecated Use the_content_feed()
+ * @deprecated 2.9.0 Use the_content_feed()
  * @see the_content_feed()
  *
  * @param string $more_link_text Optional. Text to display when more content is available but not displayed.
@@ -1712,7 +1638,7 @@
  * @param int $encode_html Optional. How to encode the content.
  */
 function the_content_rss($more_link_text='(more...)', $stripteaser=0, $more_file='', $cut = 0, $encode_html = 0) {
-	_deprecated_function( __FUNCTION__, '2.9', 'the_content_feed' );
+	_deprecated_function( __FUNCTION__, '2.9', 'the_content_feed()' );
 	$content = get_the_content($more_link_text, $stripteaser);
 	$content = apply_filters('the_content_rss', $content);
 	if ( $cut && !$encode_html )
@@ -1752,7 +1678,7 @@
  * them at the bottom of the content with numbers.
  *
  * @since 0.71
- * @deprecated 2.9.0
+ * @deprecated 2.9.0 No alternative function available
  *
  * @param string $content Content to get links
  * @return string HTML stripped out of content with links at the bottom.
@@ -1789,8 +1715,7 @@
  * everything is returned.
  *
  * @since 2.2.0
- * @deprecated 2.9.0
- * @deprecated Use _x()
+ * @deprecated 2.9.0 Use _x()
  * @see _x()
  *
  * @param string $text Text to translate
@@ -1808,8 +1733,7 @@
  *
  * @since 2.5.0
  * @uses translate()
- * @deprecated 3.0.0
- * @deprecated Use _x()
+ * @deprecated 3.0.0 Use _x()
  * @see _x()
  *
  * @param string $text Text to translate
@@ -1826,8 +1750,7 @@
  * Strips everything from the translation after the last bar.
  *
  * @since 2.7.0
- * @deprecated 3.0.0
- * @deprecated Use _nx()
+ * @deprecated 2.9.0 Use _nx()
  * @see _nx()
  * @see _n() For parameters.
  * @see _c() For parameters. _c() is deprecated.
@@ -1842,8 +1765,7 @@
  * Retrieve the plural or single form based on the amount.
  *
  * @since 1.2.0
- * @deprecated 2.8.0
- * @deprecated Use _n()
+ * @deprecated 2.8.0 Use _n()
  * @see _n()
  */
 function __ngettext() {
@@ -1856,8 +1778,7 @@
  * Register plural strings in POT file, but don't translate them.
  *
  * @since 2.5.0
- * @deprecated 2.8.0
- * @deprecated Use _n_noop()
+ * @deprecated 2.8.0 Use _n_noop()
  * @see _n_noop()
  */
 function __ngettext_noop() {
@@ -1871,8 +1792,7 @@
  * Retrieve all autoload options, or all options if no autoloaded ones exist.
  *
  * @since 1.0.0
- * @deprecated 3.0.0
- * @deprecated Use wp_load_alloptions())
+ * @deprecated 3.0.0 Use wp_load_alloptions())
  * @see wp_load_alloptions()
  *
  * @return array List of all options.
@@ -1886,8 +1806,7 @@
  * Retrieve HTML content of attachment image with link.
  *
  * @since 2.0.0
- * @deprecated 2.5.0
- * @deprecated Use wp_get_attachment_link()
+ * @deprecated 2.5.0 Use wp_get_attachment_link()
  * @see wp_get_attachment_link()
  *
  * @param int $id Optional. Post ID.
@@ -1917,8 +1836,7 @@
  * Retrieve icon URL and Path.
  *
  * @since 2.1.0
- * @deprecated 2.5.0
- * @deprecated Use wp_get_attachment_image_src()
+ * @deprecated 2.5.0 Use wp_get_attachment_image_src()
  * @see wp_get_attachment_image_src()
  *
  * @param int $id Optional. Post ID.
@@ -1959,8 +1877,7 @@
  * Retrieve HTML content of icon attachment image element.
  *
  * @since 2.0.0
- * @deprecated 2.5.0
- * @deprecated Use wp_get_attachment_image()
+ * @deprecated 2.5.0 Use wp_get_attachment_image()
  * @see wp_get_attachment_image()
  *
  * @param int $id Optional. Post ID.
@@ -2016,8 +1933,7 @@
  * Retrieve HTML content of image element.
  *
  * @since 2.0.0
- * @deprecated 2.5.0
- * @deprecated Use wp_get_attachment_image()
+ * @deprecated 2.5.0 Use wp_get_attachment_image()
  * @see wp_get_attachment_image()
  *
  * @param int $id Optional. Post ID.
@@ -2043,8 +1959,7 @@
  * Retrieve bookmark data based on ID.
  *
  * @since 2.0.0
- * @deprecated 2.1.0
- * @deprecated Use get_bookmark()
+ * @deprecated 2.1.0 Use get_bookmark()
  * @see get_bookmark()
  *
  * @param int $bookmark_id ID of link
@@ -2060,8 +1975,7 @@
  * Performs esc_url() for database or redirect usage.
  *
  * @since 2.3.1
- * @deprecated 2.8.0
- * @deprecated Use esc_url_raw()
+ * @deprecated 2.8.0 Use esc_url_raw()
  * @see esc_url_raw()
  *
  * @param string $url The URL to be cleaned.
@@ -2081,8 +1995,7 @@
  * is applied to the returned cleaned URL.
  *
  * @since 1.2.0
- * @deprecated 3.0.0
- * @deprecated Use esc_url()
+ * @deprecated 3.0.0 Use esc_url()
  * @see Alias for esc_url()
  *
  * @param string $url The URL to be cleaned.
@@ -2104,8 +2017,7 @@
  * The filter 'js_escape' is also applied by esc_js()
  *
  * @since 2.0.4
- * @deprecated 2.8.0
- * @deprecated Use esc_js()
+ * @deprecated 2.8.0 Use esc_js()
  * @see esc_js()
  *
  * @param string $text The text to be escaped.
@@ -2119,8 +2031,7 @@
 /**
  * Escaping for HTML blocks.
  *
- * @deprecated 2.8.0
- * @deprecated Use esc_html()
+ * @deprecated 2.8.0 Use esc_html()
  * @see esc_html()
  */
 function wp_specialchars( $string, $quote_style = ENT_NOQUOTES, $charset = false, $double_encode = false ) {
@@ -2137,8 +2048,7 @@
  * Escaping for HTML attributes.
  *
  * @since 2.0.6
- * @deprecated 2.8.0
- * @deprecated Use esc_attr()
+ * @deprecated 2.8.0 Use esc_attr()
  * @see esc_attr()
  *
  * @param string $text
@@ -2160,8 +2070,7 @@
  * backwards compatibility is complete.
  *
  * @since 2.2.0
- * @deprecated 2.8.0
- * @deprecated Use wp_register_sidebar_widget()
+ * @deprecated 2.8.0 Use wp_register_sidebar_widget()
  * @see wp_register_sidebar_widget()
  *
  * @param string|int $name Widget ID.
@@ -2195,8 +2104,7 @@
  * Alias of {@link wp_unregister_sidebar_widget()}.
  *
  * @since 2.2.0
- * @deprecated 2.8.0
- * @deprecated Use wp_unregister_sidebar_widget()
+ * @deprecated 2.8.0 Use wp_unregister_sidebar_widget()
  * @see wp_unregister_sidebar_widget()
  *
  * @param int|string $id Widget ID.
@@ -2217,8 +2125,7 @@
  * been compiled.
  *
  * @since 2.2.0
- * @deprecated 2.8.0
- * @deprecated Use wp_register_widget_control()
+ * @deprecated 2.8.0 Use wp_register_widget_control()
  * @see wp_register_widget_control()
  *
  * @param int|string $name Sidebar ID.
@@ -2254,8 +2161,7 @@
  * Alias of {@link wp_unregister_widget_control()}.
  *
  * @since 2.2.0
- * @deprecated 2.8.0
- * @deprecated Use wp_unregister_widget_control()
+ * @deprecated 2.8.0 Use wp_unregister_widget_control()
  * @see wp_unregister_widget_control()
  *
  * @param int|string $id Widget ID.
@@ -2269,8 +2175,7 @@
  * Remove user meta data.
  *
  * @since 2.0.0
- * @deprecated 3.0.0
- * @deprecated Use delete_user_meta()
+ * @deprecated 3.0.0 Use delete_user_meta()
  * @see delete_user_meta()
  *
  * @param int $user_id User ID.
@@ -2317,8 +2222,7 @@
  * than one metadata value, then it will be list of metadata values.
  *
  * @since 2.0.0
- * @deprecated 3.0.0
- * @deprecated Use get_user_meta()
+ * @deprecated 3.0.0 Use get_user_meta()
  * @see get_user_meta()
  *
  * @param int $user_id User ID
@@ -2370,8 +2274,7 @@
  * Will remove the metadata, if the meta value is empty.
  *
  * @since 2.0.0
- * @deprecated 3.0.0
- * @deprecated Use update_user_meta()
+ * @deprecated 3.0.0 Use update_user_meta()
  * @see update_user_meta()
  *
  * @param int $user_id User ID
@@ -2425,7 +2328,7 @@
  * multi-blog feature.
  *
  * @since 2.2.0
- * @deprecated 3.1.0
+ * @deprecated 3.1.0 Use get_users()
  * @uses $wpdb WordPress database object for queries
  * @uses $blog_id The Blog id of the blog for those that use more than one blog
  *
@@ -2447,8 +2350,7 @@
  * Enable/disable automatic general feed link outputting.
  *
  * @since 2.8.0
- * @deprecated 3.0.0
- * @deprecated Use add_theme_support( 'automatic-feed-links' )
+ * @deprecated 3.0.0 Use add_theme_support( 'automatic-feed-links' )
  *
  * @param boolean $add Optional, default is true. Add or remove links. Defaults to true.
  */
@@ -2465,8 +2367,7 @@
  * Retrieve user data based on field.
  *
  * @since 1.5.0
- * @deprecated 3.0.0
- * @deprecated Use get_the_author_meta()
+ * @deprecated 3.0.0 Use get_the_author_meta()
  * @see get_the_author_meta()
  */
 function get_profile( $field, $user = false ) {
@@ -2482,8 +2383,7 @@
  * Number of posts user has written.
  *
  * @since 0.71
- * @deprecated 3.0.0
- * @deprecated Use count_user_posts()
+ * @deprecated 3.0.0 Use count_user_posts()
  * @see count_user_posts()
  */
 function get_usernumposts( $userid ) {
@@ -2535,8 +2435,7 @@
  * Checks that the taxonomy name exists.
  *
  * @since 2.3.0
- * @deprecated 3.0.0
- * @deprecated Use taxonomy_exists()
+ * @deprecated 3.0.0 Use taxonomy_exists()
  * @see taxonomy_exists()
  *
  * @param string $taxonomy Name of taxonomy object
@@ -2551,8 +2450,7 @@
  * Check if Term exists.
  *
  * @since 2.3.0
- * @deprecated 3.0.0
- * @deprecated Use term_exists()
+ * @deprecated 3.0.0 Use term_exists()
  * @see term_exists()
  *
  * @param int|string $term The term to check
@@ -2569,8 +2467,7 @@
  * Is the current admin page generated by a plugin?
  *
  * @since 1.5.0
- * @deprecated 3.1.0
- * @deprecated Use global $plugin_page and/or get_plugin_page_hookname() hooks.
+ * @deprecated 3.1.0 Use global $plugin_page and/or get_plugin_page_hookname() hooks.
  *
  * @global $plugin_page
  *
@@ -2623,8 +2520,7 @@
  * Display editor: TinyMCE, HTML, or both.
  *
  * @since 2.1.0
- * @deprecated 3.3.0
- * @deprecated Use wp_editor()
+ * @deprecated 3.3.0 Use wp_editor()
  * @see wp_editor()
  *
  * @param string $content Textarea content.
@@ -2861,8 +2757,7 @@
  * Checks if the current user belong to a given blog.
  *
  * @since MU
- * @deprecated 3.3.0
- * @deprecated Use is_user_member_of_blog()
+ * @deprecated 3.3.0 Use is_user_member_of_blog()
  * @see is_user_member_of_blog()
  *
  * @param int $blog_id Blog ID
@@ -2878,12 +2773,11 @@
  * Open the file handle for debugging.
  *
  * @since 0.71
- * @deprecated Use error_log()
+ * @deprecated 3.4.0 Use error_log()
  * @link http://www.php.net/manual/en/function.error-log.php
- * @deprecated 3.4.0
  */
 function debug_fopen( $filename, $mode ) {
-	_deprecated_function( __FUNCTION__, 'error_log()' );
+	_deprecated_function( __FUNCTION__, '3.4', 'error_log()' );
 	return false;
 }
 
@@ -2891,12 +2785,11 @@
  * Write contents to the file used for debugging.
  *
  * @since 0.71
- * @deprecated Use error_log() instead.
+ * @deprecated 3.4.0 Use error_log()
  * @link http://www.php.net/manual/en/function.error-log.php
- * @deprecated 3.4.0
  */
 function debug_fwrite( $fp, $string ) {
-	_deprecated_function( __FUNCTION__, 'error_log()' );
+	_deprecated_function( __FUNCTION__, '3.4', 'error_log()' );
 	if ( ! empty( $GLOBALS['debug'] ) )
 		error_log( $string );
 }
@@ -2905,12 +2798,11 @@
  * Close the debugging file handle.
  *
  * @since 0.71
- * @deprecated Use error_log()
+ * @deprecated 3.4.0 Use error_log()
  * @link http://www.php.net/manual/en/function.error-log.php
- * @deprecated 3.4.0
  */
 function debug_fclose( $fp ) {
-	_deprecated_function( __FUNCTION__, 'error_log()' );
+	_deprecated_function( __FUNCTION__, '3.4', 'error_log()' );
 }
 
 /**
@@ -2921,8 +2813,7 @@
  * broken, if it is missing style.css; index.php is optional.
  *
  * @since 1.5.0
- * @deprecated 3.4.0
- * @deprecated Use wp_get_themes()
+ * @deprecated 3.4.0 Use wp_get_themes()
  * @see wp_get_themes()
  *
  * @return array Theme list with theme data.
@@ -2952,8 +2843,7 @@
  * Retrieve theme data.
  *
  * @since 1.5.0
- * @deprecated 3.4.0
- * @deprecated Use wp_get_theme()
+ * @deprecated 3.4.0 Use wp_get_theme()
  * @see wp_get_theme()
  *
  * @param string $theme Theme name.
@@ -2972,8 +2862,7 @@
  * Retrieve current theme name.
  *
  * @since 1.5.0
- * @deprecated 3.4.0
- * @deprecated Use (string) wp_get_theme()
+ * @deprecated 3.4.0 Use (string) wp_get_theme()
  * @see wp_get_theme()
  *
  * @return string
@@ -3019,8 +2908,7 @@
  * Add callbacks for image header display.
  *
  * @since 2.1.0
- * @deprecated 3.4.0
- * @deprecated Use add_theme_support('custom-header', $args)
+ * @deprecated 3.4.0 Use add_theme_support( 'custom-header', $args )
  * @see add_theme_support()
  *
  * @param callback $wp_head_callback Call on 'wp_head' action.
@@ -3042,8 +2930,7 @@
  * Remove image header support.
  *
  * @since 3.1.0
- * @deprecated 3.4.0
- * @deprecated Use remove_theme_support('custom-header')
+ * @deprecated 3.4.0 Use remove_theme_support( 'custom-header' )
  * @see remove_theme_support()
  *
  * @return bool Whether support was removed.
@@ -3057,8 +2944,7 @@
  * Add callbacks for background image display.
  *
  * @since 3.0.0
- * @deprecated 3.4.0
- * @deprecated Use add_theme_support('custom-background, $args)
+ * @deprecated 3.4.0 Use add_theme_support( 'custom-background', $args )
  * @see add_theme_support()
  *
  * @param callback $wp_head_callback Call on 'wp_head' action.
@@ -3081,6 +2967,7 @@
  * Remove custom background support.
  *
  * @since 3.1.0
+ * @deprecated 3.4.0 Use add_theme_support( 'custom-background' )
  * @see add_custom_background()
  *
  * @return bool Whether support was removed.
@@ -3094,8 +2981,7 @@
  * Retrieve theme data from parsed theme file.
  *
  * @since 1.5.0
- * @deprecated 3.4.0
- * @deprecated Use wp_get_theme()
+ * @deprecated 3.4.0 Use wp_get_theme()
  * @see wp_get_theme()
  *
  * @param string $theme_file Theme file path.
@@ -3133,7 +3019,7 @@
  * @see update_post_cache() Posts and pages are the same, alias is intentional
  *
  * @since 1.5.1
- * @deprecated 3.4.0
+ * @deprecated 3.4.0 Use update_post_cache()
  *
  * @param array $pages list of page objects
  */
@@ -3150,7 +3036,7 @@
  * associated with 'all_page_ids' and 'get_pages'.
  *
  * @since 2.0.0
- * @deprecated 3.4.0
+ * @deprecated 3.4.0 Use clean_post_cache()
  *
  * @uses do_action() Will call the 'clean_page_cache' hook action.
  *
@@ -3168,8 +3054,7 @@
  * Deprecated in 3.4.1 and 3.5.0. Backported to 3.3.3.
  *
  * @since 2.0.4
- * @deprecated 3.4.1
- * @deprecated Use wp_nonce_ays()
+ * @deprecated 3.4.1 Use wp_nonce_ays()
  * @see wp_nonce_ays()
  *
  * @param string $action Nonce action.
@@ -3184,8 +3069,7 @@
  * Display "sticky" CSS class, if a post is sticky.
  *
  * @since 2.7.0
- * @deprecated 3.5.0
- * @deprecated Use post_class()
+ * @deprecated 3.5.0 Use post_class()
  * @see post_class()
  *
  * @param int $post_id An optional post ID.
@@ -3214,7 +3098,7 @@
  * Load an image from a string, if PHP supports it.
  *
  * @since 2.1.0
- * @deprecated 3.5.0
+ * @deprecated 3.5.0 Use wp_get_image_editor()
  * @see wp_get_image_editor()
  *
  * @param string $file Filename of the image to load.
@@ -3254,7 +3138,7 @@
  * downgraded, not actual defects), but of your PHP version.
  *
  * @since 2.5.0
- * @deprecated 3.5.0
+ * @deprecated 3.5.0 Use wp_get_image_editor()
  * @see wp_get_image_editor()
  *
  * @param string $file Image file path.
@@ -3294,7 +3178,7 @@
  * property or key.
  *
  * @since 1.0.0
- * @deprecated 3.5.0
+ * @deprecated 3.5.0 Use get_post()
  * @see get_post()
  *
  * @param int $postid Post ID.
@@ -3310,8 +3194,7 @@
  * Check that the user login name and password is correct.
  *
  * @since 0.71
- * @deprecated 3.5.0
- * @deprecated Use wp_authenticate()
+ * @deprecated 3.5.0 Use wp_authenticate()
  * @see wp_authenticate()
  *
  * @param string $user_login User name.
@@ -3339,7 +3222,7 @@
  * Check if the installed version of GD supports particular image type
  *
  * @since 2.9.0
- * @deprecated 3.5.0
+ * @deprecated 3.5.0 Use wp_image_editor_supports()
  * @see wp_image_editor_supports()
  *
  * @param string $mime_type
@@ -3374,8 +3257,7 @@
  * Converts an integer byte value to a shorthand byte value.
  *
  * @since 2.3.0
- * @deprecated 3.6.0
- * @deprecated Use size_format()
+ * @deprecated 3.6.0 Use size_format()
  *
  * @param int $bytes An integer byte value.
  * @return string A shorthand byte value.
@@ -3462,8 +3344,7 @@
  * Formerly used to escape strings before searching the DB. It was poorly documented and never worked as described.
  *
  * @since 2.5.0
- * @deprecated 4.0.0
- * @deprecated Use wpdb::esc_like()
+ * @deprecated 4.0.0 Use wpdb::esc_like()
  *
  * @param string $text The text to be escaped.
  * @return string text, safe for inclusion in LIKE query.
Index: wp-includes/ms-deprecated.php
===================================================================
--- wp-includes/ms-deprecated.php	(revision 28848)
+++ wp-includes/ms-deprecated.php	(working copy)
@@ -18,7 +18,7 @@
  * Dashboard blog functionality was removed in WordPress 3.1, replaced by the user admin.
  *
  * @since MU
- * @deprecated 3.1.0
+ * @deprecated 3.1.0 Use get_blog_details()
  * @see get_blog_details()
  * @return int
  */
@@ -32,8 +32,7 @@
 
 /**
  * @since MU
- * @deprecated 3.0.0
- * @deprecated Use wp_generate_password()
+ * @deprecated 3.0.0 Use wp_generate_password()
  * @see wp_generate_password()
  */
 function generate_random_password( $len = 8 ) {
@@ -51,8 +50,7 @@
  * legacy function_exists() checks to determine if multisite is enabled.
  *
  * @since MU
- * @deprecated 3.0.0
- * @deprecated Use is_super_admin()
+ * @deprecated 3.0.0 Use is_super_admin()
  * @see is_super_admin()
  * @see is_multisite()
  *
@@ -77,8 +75,7 @@
 if ( !function_exists( 'graceful_fail' ) ) :
 /**
  * @since MU
- * @deprecated 3.0.0
- * @deprecated Use wp_die()
+ * @deprecated 3.0.0 Use wp_die()
  * @see wp_die()
  */
 function graceful_fail( $message ) {
@@ -114,8 +111,7 @@
 
 /**
  * @since MU
- * @deprecated 3.0.0
- * @deprecated Use get_user_by()
+ * @deprecated 3.0.0 Use get_user_by()
  * @see get_user_by()
  */
 function get_user_details( $username ) {
@@ -125,8 +121,7 @@
 
 /**
  * @since MU
- * @deprecated 3.0.0
- * @deprecated Use clean_post_cache()
+ * @deprecated 3.0.0 Use clean_post_cache()
  * @see clean_post_cache()
  */
 function clear_global_post_cache( $post_id ) {
@@ -135,8 +130,7 @@
 
 /**
  * @since MU
- * @deprecated 3.0.0
- * @deprecated Use is_main_site()
+ * @deprecated 3.0.0 Use is_main_site()
  * @see is_main_site()
  */
 function is_main_blog() {
@@ -146,8 +140,7 @@
 
 /**
  * @since MU
- * @deprecated 3.0.0
- * @deprecated Use is_email()
+ * @deprecated 3.0.0 Use is_email()
  * @see is_email()
  */
 function validate_email( $email, $check_domain = true) {
@@ -157,8 +150,7 @@
 
 /**
  * @since MU
- * @deprecated 3.0.0
- * @deprecated No alternative available. For performance reasons this function is not recommended.
+ * @deprecated 3.0.0 No alternative available. For performance reasons this function is not recommended.
  */
 function get_blog_list( $start = 0, $num = 10, $deprecated = '' ) {
 	_deprecated_function( __FUNCTION__, '3.0', 'wp_get_sites()' );
@@ -184,8 +176,7 @@
 
 /**
  * @since MU
- * @deprecated 3.0.0
- * @deprecated No alternative available. For performance reasons this function is not recommended.
+ * @deprecated 3.0.0 No alternative available. For performance reasons this function is not recommended.
  */
 function get_most_active_blogs( $num = 10, $display = true ) {
 	_deprecated_function( __FUNCTION__, '3.0' );
@@ -230,14 +221,13 @@
  * 6) $url
  *
  * @since MU
- * @deprecated 3.3.0
- * @deprecated Use wp_redirect()
+ * @deprecated 3.3.0 Use wp_redirect()
  * @uses wpmu_admin_redirect_add_updated_param()
  *
  * @param string $url
  */
 function wpmu_admin_do_redirect( $url = '' ) {
-	_deprecated_function( __FUNCTION__, '3.3' );
+	_deprecated_function( __FUNCTION__, '3.3', 'wp_redirect()' );
 
 	$ref = '';
 	if ( isset( $_GET['ref'] ) )
@@ -270,14 +260,13 @@
  * Adds an 'updated=true' argument to a URL.
  *
  * @since MU
- * @deprecated 3.3.0
- * @deprecated Use add_query_arg()
+ * @deprecated 3.3.0 Use add_query_arg()
  *
  * @param string $url
  * @return string
  */
 function wpmu_admin_redirect_add_updated_param( $url = '' ) {
-	_deprecated_function( __FUNCTION__, '3.3' );
+	_deprecated_function( __FUNCTION__, '3.3', 'add_query_arg()' );
 
 	if ( strpos( $url, 'updated=true' ) === false ) {
 		if ( strpos( $url, '?' ) === false )
@@ -295,8 +284,8 @@
  * and is simply returned as such.
  *
  * @since MU
- * @deprecated 3.6.0
- * @deprecated Use get_user_by()
+ * @deprecated 3.6.0 Use get_user_by()
+ * @see get_user_by()
  * @uses get_user_by()
  *
  * @param string $string Either an email address or a login.
Index: wp-includes/pluggable-deprecated.php
===================================================================
--- wp-includes/pluggable-deprecated.php	(revision 28845)
+++ wp-includes/pluggable-deprecated.php	(working copy)
@@ -23,8 +23,7 @@
  *
  * @since 2.0.1
  * @see wp_set_current_user() An alias of wp_set_current_user()
- * @deprecated 3.0.0
- * @deprecated Use wp_set_current_user()
+ * @deprecated 3.0.0 Use wp_set_current_user()
  *
  * @param int|null $id User ID.
  * @param string $name Optional. The user's username
@@ -41,8 +40,7 @@
  * Retrieve user info by login name.
  *
  * @since 0.71
- * @deprecated 3.3.0
- * @deprecated Use get_user_by('login')
+ * @deprecated 3.3.0 Use get_user_by('login')
  *
  * @param string $user_login User's username
  * @return bool|object False on failure, User DB row object
@@ -58,8 +56,7 @@
  * Retrieve user info by email.
  *
  * @since 2.5.0
- * @deprecated 3.3.0
- * @deprecated Use get_user_by('email')
+ * @deprecated 3.3.0 Use get_user_by('email')
  *
  * @param string $email User's email address
  * @return bool|object False on failure, User DB row object
@@ -75,8 +72,7 @@
  * Sets a cookie for a user who just logged in. This function is deprecated.
  *
  * @since 1.5.0
- * @deprecated 2.5.0
- * @deprecated Use wp_set_auth_cookie()
+ * @deprecated 2.5.0 Use wp_set_auth_cookie()
  * @see wp_set_auth_cookie()
  *
  * @param string $username The user's username
@@ -100,8 +96,7 @@
  * Clears the authentication cookie, logging the user out. This function is deprecated.
  *
  * @since 1.5.0
- * @deprecated 2.5.0
- * @deprecated Use wp_clear_auth_cookie()
+ * @deprecated 2.5.0 Use wp_clear_auth_cookie()
  * @see wp_clear_auth_cookie()
  */
 function wp_clearcookie() {
@@ -120,8 +115,7 @@
  * used anywhere in WordPress. Also, plugins shouldn't use it either.
  *
  * @since 2.0.3
- * @deprecated 2.5.0
- * @deprecated No alternative
+ * @deprecated 2.5.0 No alternative function available
  *
  * @return bool Always returns false
  */
@@ -145,7 +139,7 @@
  * failure can utilize it later.
  *
  * @since 1.2.2
- * @deprecated Use wp_signon()
+ * @deprecated 2.5.0 Use wp_signon()
  * @global string $error Error when false is returned
  *
  * @param string $username User's username
@@ -176,7 +170,7 @@
  * It is kept here in case a plugin directly referred to the class.
  *
  * @since 2.2.0
- * @deprecated 3.5.0
+ * @deprecated 3.5.0 Use the Atom Publishing Protocol plugin
  * @link https://wordpress.org/plugins/atom-publishing-protocol/
  */
 if ( ! class_exists( 'wp_atom_server' ) ) {
Index: wp-includes/post.php
===================================================================
--- wp-includes/post.php	(revision 28845)
+++ wp-includes/post.php	(working copy)
@@ -3980,7 +3980,8 @@
  * Use get_post() instead of get_page().
  *
  * @since 1.5.1
- * @deprecated 3.5.0
+ * @deprecated 3.5.0 Use get_post()
+ * @see get_post()
  *
  * @param mixed $page Page object or page ID. Passed by reference.
  * @param string $output What to output. OBJECT, ARRAY_A, or ARRAY_N.
Index: wp-includes/wp-db.php
===================================================================
--- wp-includes/wp-db.php	(revision 28845)
+++ wp-includes/wp-db.php	(working copy)
@@ -1007,7 +1007,7 @@
 	 * Use esc_sql() or wpdb::prepare() instead.
 	 *
 	 * @since 2.8.0
-	 * @deprecated 3.6.0
+	 * @deprecated 3.6.0 Use wpdb::prepare() or esc_sql()
 	 * @see wpdb::prepare
 	 * @see esc_sql()
 	 * @access private
@@ -1077,7 +1077,7 @@
 	 * Use esc_sql() or wpdb::prepare() instead.
 	 *
 	 * @since 0.71
-	 * @deprecated 3.6.0
+	 * @deprecated 3.6.0 Use wpdb::prepare() or esc_sql()
 	 * @see wpdb::prepare()
 	 * @see esc_sql()
 	 *
@@ -2101,8 +2101,7 @@
 	 * Called when WordPress is generating the table scheme.
 	 *
 	 * @since 2.5.0
-	 * @deprecated 3.5.0
-	 * @deprecated Use wpdb::has_cap( 'collation' )
+	 * @deprecated 3.5.0 Use wpdb::has_cap( 'collation' )
 	 *
 	 * @return bool True if collation is supported, false if version does not
 	 */
Index: xmlrpc.php
===================================================================
--- xmlrpc.php	(revision 28845)
+++ xmlrpc.php	(working copy)
@@ -88,8 +88,7 @@
 /**
  * logIO() - Writes logging info to a file.
  *
- * @deprecated 3.4.0
- * @deprecated Use error_log()
+ * @deprecated 3.4.0 Use error_log()
  *
  * @param string $io Whether input or output
  * @param string $msg Information describing logging reason.