diff --git a/wp-includes/author-template.php b/wp-includes/author-template.php
index f72297c3f..7cc6291c6 100644
--- a/wp-includes/author-template.php
+++ b/wp-includes/author-template.php
@@ -499,7 +499,7 @@ function wp_list_authors($args = '') {
 				$link .= ' ';
 				if (empty($feed_image))
 					$link .= '(';
-				$link .= '<a href="' . get_author_rss_link(0, $author->ID, $author->user_nicename) . '"';
+				$link .= '<a href="' . get_author_feed_link($author->ID) . '"';
 
 				if ( !empty($feed) ) {
 					$title = ' title="' . $feed . '"';
diff --git a/wp-includes/bookmark-template.php b/wp-includes/bookmark-template.php
index b2e5692e4..98d03a7ac 100644
--- a/wp-includes/bookmark-template.php
+++ b/wp-includes/bookmark-template.php
@@ -122,7 +122,7 @@ function _walk_bookmarks($bookmarks, $args = '' ) {
 			$output .= $between . $desc;
 
 		if ($show_rating) {
-			$output .= $between . get_linkrating($bookmark);
+			$output .= $between . sanitize_bookmark_field('link_rating', $bookmark->link_rating, $bookmark->link_id, 'display');
 		}
 
 		$output .= "$after\n";
diff --git a/wp-includes/canonical.php b/wp-includes/canonical.php
index 19bed3740..ecd48ce3b 100644
--- a/wp-includes/canonical.php
+++ b/wp-includes/canonical.php
@@ -126,7 +126,7 @@ function redirect_canonical($requested_url=null, $do_redirect=true) {
 				$redirect['query'] = remove_query_arg('cat', $redirect['query']);
 		} elseif ( is_author() && !empty($_GET['author']) ) {
 			$author = get_userdata(get_query_var('author'));
-			if ( false !== $author && $redirect_url = get_author_link(false, $author->ID, $author->user_nicename) )
+			if ( false !== $author && $redirect_url = get_author_posts_url($author->ID, $author->user_nicename) )
 				$redirect['query'] = remove_query_arg('author', $redirect['author']);
 		}
 
diff --git a/wp-includes/post-template.php b/wp-includes/post-template.php
index 6d23e7e3c..25e82efd9 100644
--- a/wp-includes/post-template.php
+++ b/wp-includes/post-template.php
@@ -386,9 +386,7 @@ function sticky_class( $post_id = null ) {
  * The formatted output of a list of pages.
  *
  * Displays page links for paginated posts (i.e. includes the <!--nextpage-->.
- * Quicktag one or more times). This works in much the same way as link_pages(),
- * the difference being that arguments are given in query string format. This
- * tag must be within The Loop.
+ * Quicktag one or more times). This tag must be within The Loop.
  *
  * The defaults for overwriting are:
  * 'next_or_number' - Default is 'number' (string). Indicates whether page