diff --git a/wp-includes/deprecated.php b/wp-includes/deprecated.php
index b8b2274b94..582b2fd5f2 100644
--- a/wp-includes/deprecated.php
+++ b/wp-includes/deprecated.php
@@ -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
@@ -52,9 +51,12 @@ function get_postdata($postid) {
 /**
  * Sets up the WordPress Loop.
  *
+ * Use The Loop instead.
+ *
+ * @link https://codex.wordpress.org/The_Loop
+ *
  * @since 1.0.1
  * @deprecated 1.5.0
- * @deprecated Use The Loop - {@link https://codex.wordpress.org/The_Loop Use new WordPress Loop}
  */
 function start_wp() {
 	global $wp_query;
@@ -71,8 +73,7 @@ function start_wp() {
  * 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 +96,7 @@ function the_category_ID($echo = true) {
  * 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 +122,7 @@ function the_category_head($before='', $after='') {
  * 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 +158,7 @@ function previous_post($format='%', $previous='previous post: ', $title='yes', $
  * 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 +193,7 @@ function next_post($format='%', $next='next post: ', $title='yes', $in_same_cat=
  * 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 +212,7 @@ function user_can_create_post($user_id, $blog_id = 1, $category_id = 'None') {
  * 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 +231,7 @@ function user_can_create_draft($user_id, $blog_id = 1, $category_id = 'None') {
  * 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 +259,7 @@ function user_can_edit_post($user_id, $post_id, $blog_id = 1) {
  * 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 +278,7 @@ function user_can_delete_post($user_id, $post_id, $blog_id = 1) {
  * 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 +297,7 @@ function user_can_set_post_date($user_id, $blog_id = 1, $category_id = 'None') {
  * 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 +316,7 @@ function user_can_edit_post_date($user_id, $post_id, $blog_id = 1) {
  * 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 +335,7 @@ function user_can_edit_post_comments($user_id, $post_id, $blog_id = 1) {
  * 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 +354,7 @@ function user_can_delete_post_comments($user_id, $post_id, $blog_id = 1) {
  * 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 +376,7 @@ function user_can_edit_user($user_id, $other_user) {
  * 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 +409,7 @@ function get_linksbyname($cat_name = "noname", $before = '', $after = '<br />',
  * 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.
@@ -457,8 +444,7 @@ function wp_get_linksbyname($category, $args = '') {
  *     }
  *
  * @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.
@@ -508,8 +494,7 @@ function get_linkobjectsbyname($cat_name = "noname" , $orderby = 'name', $limit
  * - link_notes
  *
  * @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
@@ -536,8 +521,7 @@ function get_linkobjects($category = 0, $orderby = 'name', $limit = 0) {
  * 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
@@ -564,8 +548,7 @@ function get_linksbyname_withrating($cat_name = "noname", $before = '', $after =
  * 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
@@ -593,7 +576,6 @@ function get_links_withrating($category = -1, $before = '', $after = '<br />', $
  *
  * @since 0.71
  * @deprecated 2.1.0
- * @deprecated No alternative function available
  *
  * @param int $id The category to get. If no category supplied uses 0
  * @return int Only returns 0.
@@ -604,9 +586,10 @@ function get_autotoggle($id = 0) {
 }
 
 /**
+ * Lists categories.
+ *
  * @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
@@ -640,9 +623,10 @@ function list_cats($optionall = 1, $all = 'All', $sort_column = 'ID', $sort_orde
 }
 
 /**
+ * Lists categories.
+ *
  * @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
@@ -672,9 +656,10 @@ function wp_list_cats($args = '') {
 }
 
 /**
+ * Deprecated method for generating a drop-down of categories.
+ *
  * @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
@@ -709,11 +694,10 @@ function dropdown_cats($optionall = 1, $all = 'All', $orderby = 'ID', $order = '
 }
 
 /**
- * List authors.
+ * Lists 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
@@ -732,9 +716,10 @@ function list_authors($optioncount = false, $exclude_admin = true, $show_fullnam
 }
 
 /**
+ * Retrieves a list of post categories.
+ *
  * @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
@@ -765,9 +750,10 @@ function wp_set_post_cats($blogid = '1', $post_ID = 0, $post_categories = array(
 }
 
 /**
+ * Retrieves a list of archives.
+ *
  * @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
@@ -788,8 +774,7 @@ function get_archives($type='', $limit='', $format='html', $before = '', $after
  * 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
@@ -811,8 +796,7 @@ function get_author_link($echo, $author_id, $author_nicename = '') {
  * 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
@@ -836,8 +820,7 @@ function link_pages($before='<br />', $after='<br />', $next_or_number='number',
  * 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
@@ -853,8 +836,7 @@ function get_settings($option) {
  * 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() {
@@ -866,8 +848,7 @@ function permalink_link() {
  * 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
@@ -880,10 +861,8 @@ function permalink_single_rss($deprecated = '') {
 /**
  * Gets the links associated with category.
  *
- * @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
@@ -922,8 +901,7 @@ function wp_get_links($args = '') {
  * 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
@@ -1031,8 +1009,7 @@ function get_links($category = -1, $before = '', $after = '<br />', $between = '
  * $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'
@@ -1075,7 +1052,6 @@ function get_links_list($order = 'name') {
  *
  * @since 0.71
  * @deprecated 2.1.0
- * @deprecated {@internal Use function instead is unknown}}
  *
  * @param string $text the text of the link
  * @param int $width the width of the popup window
@@ -1089,8 +1065,7 @@ function links_popup_script($text = 'Links', $width=400, $height=400, $file='lin
 
 /**
  * @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
@@ -1105,8 +1080,7 @@ function get_linkrating($link) {
  * 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
@@ -1135,8 +1109,7 @@ function get_linkcatname($id = 0) {
  * 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
@@ -1150,8 +1123,7 @@ function comments_rss_link($link_text = 'Comments RSS') {
  * 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
@@ -1172,8 +1144,7 @@ function get_category_rss_link($echo = false, $cat_ID = 1) {
  * 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
@@ -1193,8 +1164,7 @@ function get_author_rss_link($echo = false, $author_id = 1) {
  * 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
@@ -1208,8 +1178,7 @@ function comments_rss() {
  * 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.
@@ -1236,8 +1205,7 @@ function gzip_compression() {
  * 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
@@ -1254,8 +1222,7 @@ function get_commentdata( $comment_ID, $no_cache = 0, $include_unapproved = fals
  * 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
@@ -1270,8 +1237,7 @@ function get_catname( $cat_ID ) {
  * 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.
@@ -1308,8 +1274,9 @@ function get_category_children( $id, $before = '/', $after = '', $visited = arra
  * 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 https://codex.wordpress.org/Function_Reference/get_all_category_ids
  *
  * @return object List of all of the category IDs.
@@ -1329,8 +1296,7 @@ function get_all_category_ids() {
  * 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()
  * @see get_the_author_meta()
  *
  * @return string The author's description.
@@ -1344,8 +1310,7 @@ function get_the_author_description() {
  * 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()
  * @see the_author_meta()
  */
 function the_author_description() {
@@ -1357,8 +1322,7 @@ function the_author_description() {
  * 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()
  * @see get_the_author_meta()
  *
  * @return string The author's login name (username).
@@ -1372,8 +1336,7 @@ function get_the_author_login() {
  * 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()
  * @see the_author_meta()
  */
 function the_author_login() {
@@ -1385,8 +1348,7 @@ function the_author_login() {
  * 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()
  * @see get_the_author_meta()
  *
  * @return string The author's first name.
@@ -1400,8 +1362,7 @@ function get_the_author_firstname() {
  * 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()
  * @see the_author_meta()
  */
 function the_author_firstname() {
@@ -1413,8 +1374,7 @@ function the_author_firstname() {
  * 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()
  * @see get_the_author_meta()
  *
  * @return string The author's last name.
@@ -1428,8 +1388,7 @@ function get_the_author_lastname() {
  * 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()
  * @see the_author_meta()
  */
 function the_author_lastname() {
@@ -1441,8 +1400,7 @@ function the_author_lastname() {
  * 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()
  * @see get_the_author_meta()
  *
  * @return string The author's nickname.
@@ -1456,8 +1414,7 @@ function get_the_author_nickname() {
  * 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()
  * @see the_author_meta()
  */
 function the_author_nickname() {
@@ -1469,8 +1426,7 @@ function the_author_nickname() {
  * 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()
  * @see get_the_author_meta()
  *
  * @return string The author's username.
@@ -1484,8 +1440,7 @@ function get_the_author_email() {
  * 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()
  * @see the_author_meta()
  */
 function the_author_email() {
@@ -1497,8 +1452,7 @@ function the_author_email() {
  * 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()
  * @see get_the_author_meta()
  *
  * @return string The author's ICQ number.
@@ -1512,8 +1466,7 @@ function get_the_author_icq() {
  * 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()
  * @see the_author_meta()
  */
 function the_author_icq() {
@@ -1525,8 +1478,7 @@ function the_author_icq() {
  * 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()
  * @see get_the_author_meta()
  *
  * @return string The author's Yahoo! IM name.
@@ -1540,8 +1492,7 @@ function get_the_author_yim() {
  * 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()
  * @see the_author_meta()
  */
 function the_author_yim() {
@@ -1553,8 +1504,7 @@ function the_author_yim() {
  * 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()
  * @see get_the_author_meta()
  *
  * @return string The author's MSN address.
@@ -1568,8 +1518,7 @@ function get_the_author_msn() {
  * 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()
  * @see the_author_meta()
  */
 function the_author_msn() {
@@ -1581,8 +1530,7 @@ function the_author_msn() {
  * 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()
  * @see get_the_author_meta()
  *
  * @return string The author's AIM address.
@@ -1596,9 +1544,8 @@ function get_the_author_aim() {
  * Display the AIM address of the author of the current post.
  *
  * @since 0.71
+ * @deprecated 2.8.0 Use the_author_meta('aim')
  * @see the_author_meta()
- * @deprecated 2.8.0
- * @deprecated Use the_author_meta('aim')
  */
 function the_author_aim() {
 	_deprecated_function( __FUNCTION__, '2.8', 'the_author_meta(\'aim\')' );
@@ -1609,8 +1556,7 @@ function the_author_aim() {
  * 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()
  * @see get_the_author_meta()
  *
  * @param int $auth_id The ID of the author.
@@ -1625,8 +1571,7 @@ function get_author_name( $auth_id = false ) {
  * 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()
  * @see get_the_author_meta()
  *
  * @return string The URL to the author's page.
@@ -1640,8 +1585,7 @@ function get_the_author_url() {
  * 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()
  * @see the_author_meta()
  */
 function the_author_url() {
@@ -1653,8 +1597,7 @@ function the_author_url() {
  * 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()
  * @see get_the_author_meta()
  *
  * @return string|int The author's ID.
@@ -1668,8 +1611,7 @@ function get_the_author_ID() {
  * 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()
  * @see the_author_meta()
 */
 function the_author_ID() {
@@ -1696,8 +1638,7 @@ function the_author_ID() {
  *
  * @since 0.71
  *
- * @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.
@@ -1784,8 +1725,7 @@ function make_url_footnote( $content ) {
  * 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
@@ -1802,8 +1742,7 @@ function _c( $text, $domain = 'default' ) {
  * contains a context after its last vertical bar.
  *
  * @since 2.5.0
- * @deprecated 3.0.0
- * @deprecated Use _x()
+ * @deprecated 3.0.0 Use _x()
  * @see _x()
  *
  * @param string $text Text to translate
@@ -1820,12 +1759,8 @@ function translate_with_context( $text, $domain = 'default' ) {
  * Strips everything from the translation after the last bar.
  *
  * @since 2.7.0
- * @deprecated 3.0.0
- * @deprecated Use _nx()
+ * @deprecated 3.0.0 Use _nx()
  * @see _nx()
- * @see _n() For parameters.
- * @see _c() For parameters. _c() is deprecated.
- *
  */
 function _nc( $single, $plural, $number, $domain = 'default' ) {
 	_deprecated_function( __FUNCTION__, '2.9', '_nx()' );
@@ -1836,8 +1771,7 @@ function _nc( $single, $plural, $number, $domain = 'default' ) {
  * 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() {
@@ -1850,8 +1784,7 @@ function __ngettext() {
  * 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() {
@@ -1865,8 +1798,7 @@ function __ngettext_noop() {
  * 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.
@@ -1880,8 +1812,7 @@ function get_alloptions() {
  * 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.
@@ -1911,8 +1842,7 @@ function get_the_attachment_link($id = 0, $fullsize = false, $max_dims = false,
  * 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.
@@ -1953,8 +1883,7 @@ function get_attachment_icon_src( $id = 0, $fullsize = false ) {
  * 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.
@@ -2010,8 +1939,7 @@ function get_attachment_icon( $id = 0, $fullsize = false, $max_dims = false ) {
  * 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.
@@ -2037,8 +1965,7 @@ function get_attachment_innerHTML($id = 0, $fullsize = false, $max_dims = false)
  * 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
@@ -2054,8 +1981,7 @@ function get_link($bookmark_id, $output = OBJECT, $filter = 'raw') {
  * 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.
@@ -2075,8 +2001,7 @@ function sanitize_url( $url, $protocols = null ) {
  * 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.
@@ -2098,8 +2023,7 @@ function clean_url( $url, $protocols = null, $context = 'display' ) {
  * 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.
@@ -2113,8 +2037,7 @@ function js_escape( $text ) {
 /**
  * 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 ) {
@@ -2131,8 +2054,7 @@ function wp_specialchars( $string, $quote_style = ENT_NOQUOTES, $charset = false
  * 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
@@ -2154,8 +2076,7 @@ function attribute_escape( $text ) {
  * 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.
@@ -2189,8 +2110,7 @@ function register_sidebar_widget($name, $output_callback, $classname = '') {
  * 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.
@@ -2207,12 +2127,11 @@ function unregister_sidebar_widget($id) {
  * first element and the third for the name or just uses the first element of
  * the array for the name.
  *
- * Passes to {@link wp_register_widget_control()} after the argument list has
+ * Passes to wp_register_widget_control() after the argument list has
  * 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.
@@ -2245,11 +2164,10 @@ function register_widget_control($name, $control_callback, $width = '', $height
 }
 
 /**
- * Alias of {@link wp_unregister_widget_control()}.
+ * Alias of 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.
@@ -2263,8 +2181,7 @@ function unregister_widget_control($id) {
  * 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.
@@ -2311,8 +2228,7 @@ function delete_usermeta( $user_id, $meta_key, $meta_value = '' ) {
  * 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
@@ -2364,8 +2280,7 @@ function get_usermeta( $user_id, $meta_key = '' ) {
  * 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
@@ -2419,7 +2334,8 @@ function update_usermeta( $user_id, $meta_key, $meta_value ) {
  * multi-blog feature.
  *
  * @since 2.2.0
- * @deprecated 3.1.0
+ * @deprecated 3.1.0 Use get_users()
+ * @see get_users()
  *
  * @global wpdb $wpdb WordPress database abstraction object.
  * @uses $blog_id The Blog id of the blog for those that use more than one blog
@@ -2442,8 +2358,8 @@ function get_users_of_blog( $id = '' ) {
  * 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()
+ * @see add_theme_support()
  *
  * @param bool $add Optional, default is true. Add or remove links. Defaults to true.
  */
@@ -2460,8 +2376,7 @@ function automatic_feed_links( $add = true ) {
  * 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 ) {
@@ -2477,8 +2392,7 @@ function get_profile( $field, $user = false ) {
  * 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 ) {
@@ -2506,9 +2420,10 @@ function funky_javascript_callback($matches) {
  * Converts unicode characters to HTML numbered entities.
  *
  * @since 1.5.0
+ * @deprecated 3.0.0
+ *
  * @uses $is_macIE
  * @uses $is_winIE
- * @deprecated 3.0.0
  *
  * @param string $text Text to be made safe.
  * @return string Fixed text.
@@ -2530,8 +2445,7 @@ function funky_javascript_fix($text) {
  * 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
@@ -2546,8 +2460,7 @@ function is_taxonomy( $taxonomy ) {
  * 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
@@ -2563,9 +2476,10 @@ function is_term( $term, $taxonomy = '', $parent = 0 ) {
 /**
  * Is the current admin page generated by a plugin?
  *
+ * Use global $plugin_page and/or get_plugin_page_hookname() hooks.
+ *
  * @since 1.5.0
  * @deprecated 3.1.0
- * @deprecated Use global $plugin_page and/or get_plugin_page_hookname() hooks.
  *
  * @global $plugin_page
  *
@@ -2618,8 +2532,7 @@ function wp_timezone_supported() {
  * 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.
@@ -2855,8 +2768,7 @@ function wp_admin_bar_dashboard_view_site_menu( $wp_admin_bar ) {
  * 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
@@ -2872,9 +2784,10 @@ function is_blog_user( $blog_id = 0 ) {
  * Open the file handle for debugging.
  *
  * @since 0.71
- * @deprecated Use error_log()
+ * @deprecated 3.4.0 Use error_log()
+ * @see 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()' );
@@ -2885,9 +2798,10 @@ function debug_fopen( $filename, $mode ) {
  * Write contents to the file used for debugging.
  *
  * @since 0.71
- * @deprecated Use error_log() instead.
+ * @deprecated 3.4.0 Use error_log()
+ * @see 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()' );
@@ -2899,9 +2813,10 @@ function debug_fwrite( $fp, $string ) {
  * Close the debugging file handle.
  *
  * @since 0.71
- * @deprecated Use error_log()
+ * @deprecated 3.4.0 Use error_log()
+ * @see 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()' );
@@ -2915,8 +2830,7 @@ function debug_fclose( $fp ) {
  * 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.
@@ -2946,8 +2860,7 @@ function get_themes() {
  * 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.
@@ -2966,8 +2879,7 @@ function get_theme( $theme ) {
  * Retrieve current theme name.
  *
  * @since 1.5.0
- * @deprecated 3.4.0
- * @deprecated Use (string) wp_get_theme()
+ * @deprecated 3.4.0 Use wp_get_theme()
  * @see wp_get_theme()
  *
  * @return string
@@ -3013,8 +2925,7 @@ function clean_pre($matches) {
  * 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()
  * @see add_theme_support()
  *
  * @param callback $wp_head_callback Call on 'wp_head' action.
@@ -3036,8 +2947,7 @@ function add_custom_image_header( $wp_head_callback, $admin_head_callback, $admi
  * 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()
  * @see remove_theme_support()
  *
  * @return null|bool Whether support was removed.
@@ -3051,8 +2961,7 @@ function remove_custom_image_header() {
  * 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()
  * @see add_theme_support()
  *
  * @param callback $wp_head_callback Call on 'wp_head' action.
@@ -3075,6 +2984,7 @@ function add_custom_background( $wp_head_callback = '', $admin_head_callback = '
  * Remove custom background support.
  *
  * @since 3.1.0
+ * @deprecated 3.4.0 Use add_custom_background()
  * @see add_custom_background()
  *
  * @return null|bool Whether support was removed.
@@ -3088,8 +2998,7 @@ function remove_custom_background() {
  * 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.
@@ -3127,7 +3036,8 @@ function get_theme_data( $theme_file ) {
  * @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()
+ * @see update_post_cache()
  *
  * @param array $pages list of page objects
  */
@@ -3144,7 +3054,8 @@ function update_page_cache( &$pages ) {
  * associated with 'all_page_ids' and 'get_pages'.
  *
  * @since 2.0.0
- * @deprecated 3.4.0
+ * @deprecated 3.4.0 Use clean_post_cache
+ * @see clean_post_cache()
  *
  * @param int $id Page ID to clean
  */
@@ -3160,8 +3071,7 @@ function clean_page_cache( $id ) {
  * 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.
@@ -3176,8 +3086,7 @@ function wp_explain_nonce( $action ) {
  * 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.
@@ -3195,7 +3104,7 @@ function sticky_class( $post_id = null ) {
  * property with get_post_ancestors().
  *
  * @since 2.3.4
- * @deprecated 3.5.0
+ * @deprecated 3.5.0 Use get_post_ancestors()
  * @see get_post_ancestors()
  */
 function _get_post_ancestors( &$post ) {
@@ -3206,7 +3115,7 @@ function _get_post_ancestors( &$post ) {
  * 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.
@@ -3246,7 +3155,7 @@ function wp_load_image( $file ) {
  * 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.
@@ -3286,7 +3195,7 @@ function image_resize( $file, $max_w, $max_h, $crop = false, $suffix = null, $de
  * 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.
@@ -3302,8 +3211,7 @@ function wp_get_single_post( $postid = 0, $mode = OBJECT ) {
  * 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.
@@ -3331,7 +3239,7 @@ function _save_post_hook() {}
  * 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
@@ -3366,8 +3274,8 @@ function gd_edit_image_support($mime_type) {
  * 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()
+ * @see size_format()
  *
  * @param int $bytes An integer byte value.
  * @return string A shorthand byte value.
@@ -3393,8 +3301,8 @@ function wp_convert_bytes_to_hr( $bytes ) {
 /**
  * Formerly used internally to tidy up the search terms.
  *
- * @access private
  * @since 2.9.0
+ * @access private
  * @deprecated 3.7.0
  */
 function _search_terms_tidy( $t ) {
@@ -3427,8 +3335,8 @@ function rich_edit_exists() {
  * Old callback for tag link tooltips.
  *
  * @since 2.7.0
- * @deprecated 3.9.0
  * @access private
+ * @deprecated 3.9.0
  */
 function default_topic_count_text( $count ) {
 	return $count;
@@ -3454,8 +3362,8 @@ function format_to_post( $content ) {
  * 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()
+ * @see wpdb::esc_like()
  *
  * @param string $text The text to be escaped.
  * @return string text, safe for inclusion in LIKE query.
@@ -3614,7 +3522,8 @@ function wp_richedit_pre($text) {
  * 'htmledit_pre' filter is applied.
  *
  * @since 2.5.0
- * @deprecated 4.3.0
+ * @deprecated 4.3.0 Use format_for_editor()
+ * @see format_for_editor()
  *
  * @param string $output The text to be formatted.
  * @return string Formatted text after filter applied.
@@ -3640,7 +3549,8 @@ function wp_htmledit_pre($output) {
  * Retrieve permalink from post ID.
  *
  * @since 1.0.0
- * @deprecated 4.4.0
+ * @deprecated 4.4.0 Use get_permalink()
+ * @see get_permalink()
  *
  * @param int|WP_Post $post_id Optional. Post ID or WP_Post object. Default is global $post.
  * @return string|false
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 8b72bf9b27..9247726968 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.4-alpha-33672';
+$wp_version = '4.4-alpha-33673';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.