Index: src/wp-includes/feed.php
===================================================================
--- src/wp-includes/feed.php	(revision 26857)
+++ src/wp-includes/feed.php	(working copy)
@@ -19,7 +19,6 @@
  * @package WordPress
  * @subpackage Feed
  * @since 1.5.1
- * @uses apply_filters() Calls 'get_bloginfo_rss' hook with two parameters.
  * @see get_bloginfo() For the list of possible values to display.
  *
  * @param string $show See get_bloginfo() for possible values.
@@ -27,7 +26,17 @@
  */
 function get_bloginfo_rss($show = '') {
 	$info = strip_tags(get_bloginfo($show));
-	return apply_filters('get_bloginfo_rss', convert_chars($info), $show);
+	/**
+	 * Filter the bloginfo for use in RSS feeds.
+	 *
+	 * @since 2.2.0
+	 *
+	 * @see convert_chars()
+	 *
+	 * @param string $string Converted string value of the blog information.
+	 * @param string $show   The type of blog information to retrieve. @see get_bloginfo()
+	 */
+	return apply_filters( 'get_bloginfo_rss', convert_chars( $info ), $show );
 }
 
 /**
@@ -40,12 +49,21 @@
  * @package WordPress
  * @subpackage Feed
  * @since 0.71
- * @uses apply_filters() Calls 'bloginfo_rss' hook with two parameters.
  * @see get_bloginfo() For the list of possible values to display.
  *
  * @param string $show See get_bloginfo() for possible values.
  */
 function bloginfo_rss($show = '') {
+	/**
+	 * Filter the retrieved RSS bloginfo for use in feeds.
+	 *
+	 * @since 2.1.0
+	 *
+	 * @see get_bloginfo()
+	 *
+	 * @param string $string RSS container for the blog information.
+	 * @param string $show   The type of blog information to retrieve.
+	 */
 	echo apply_filters('bloginfo_rss', get_bloginfo_rss($show), $show);
 }
 
@@ -58,12 +76,19 @@
  * @package WordPress
  * @subpackage Feed
  * @since 2.5
- * @uses apply_filters() Calls 'default_feed' hook on the default feed string.
  *
  * @return string Default feed, or for example 'rss2', 'atom', etc.
  */
 function get_default_feed() {
-	$default_feed = apply_filters('default_feed', 'rss2');
+	/**
+	 * Filter the default feed type.
+	 *
+	 * @since 2.5.0
+	 *
+	 * @param string $feed_type Type of default feed. Possible values include 'rss2', 'atom'.
+	 *                          Default 'rss2'.
+	 */
+	$default_feed = apply_filters( 'default_feed', 'rss2' );
 	return 'rss' == $default_feed ? 'rss2' : $default_feed;
 }
 
@@ -73,8 +98,6 @@
  * @package WordPress
  * @subpackage Feed
  * @since 2.2.0
- * @uses apply_filters() Calls 'get_wp_title_rss' hook on title.
- * @uses wp_title() See function for $sep parameter usage.
  *
  * @param string $sep Optional.How to separate the title. See wp_title() for more info.
  * @return string Error message on failure or blog title on success.
@@ -83,6 +106,14 @@
 	$title = wp_title($sep, false);
 	if ( is_wp_error( $title ) )
 		return $title->get_error_message();
+	/**
+	 * Filter the blog title for a feed title.
+	 *
+	 * @since 2.2.0
+	 *
+	 * @param string $title The current RSS post title.
+	 * @param string $sep   Separator used by wp_title().
+	 */
 	$title = apply_filters( 'get_wp_title_rss', $title, $sep );
 	return $title;
 }
@@ -93,12 +124,21 @@
  * @package WordPress
  * @subpackage Feed
  * @since 2.2.0
- * @uses apply_filters() Calls 'wp_title_rss' on the blog title.
  * @see wp_title() $sep parameter usage.
  *
  * @param string $sep Optional.
  */
 function wp_title_rss( $sep = '»' ) {
+	/**
+	 * Filter the the blog title for display of a feed title.
+	 *
+	 * @since 2.2.0
+	 *
+	 * @see get_wp_title_rss()
+	 *
+	 * @param string $string The current retrieved post title.
+	 * @param string $sep    Separator used by wp_title().
+	 */
 	echo apply_filters( 'wp_title_rss', get_wp_title_rss( $sep ), $sep );
 }
 
@@ -108,13 +148,19 @@
  * @package WordPress
  * @subpackage Feed
  * @since 2.0.0
- * @uses apply_filters() Calls 'the_title_rss' on the post title.
  *
  * @return string Current post title.
  */
 function get_the_title_rss() {
 	$title = get_the_title();
-	$title = apply_filters('the_title_rss', $title);
+	/**
+	 * Filter the post title for a feed.
+	 *
+	 * @since 1.2.1
+	 *
+	 * @param string $title The current post title.
+	 */
+	$title = apply_filters( 'the_title_rss', $title );
 	return $title;
 }
 
@@ -136,7 +182,6 @@
  * @package WordPress
  * @subpackage Feed
  * @since 2.9.0
- * @uses apply_filters() Calls 'the_content_feed' on the content before processing.
  * @see get_the_content()
  *
  * @param string $feed_type The type of feed. rss2 | atom | rss | rdf
@@ -146,9 +191,19 @@
 	if ( !$feed_type )
 		$feed_type = get_default_feed();
 
-	$content = apply_filters('the_content', get_the_content());
+	/** This filter is documented in wp-admin/post-template.php */
+	$content = apply_filters( 'the_content', get_the_content() );
 	$content = str_replace(']]>', ']]>', $content);
-	return apply_filters('the_content_feed', $content, $feed_type);
+	/**
+	 * Filter the post content for use in feeds.
+	 *
+	 * @since 2.9.0
+	 *
+	 * @param string $content   The current post content.
+	 * @param string $feed_type Type of feed. Possible values include 'rss2', 'atom'.
+	 *                          Default 'rss2'.
+	 */
+	return apply_filters( 'the_content_feed', $content, $feed_type );
 }
 
 /**
@@ -157,7 +212,6 @@
  * @package WordPress
  * @subpackage Feed
  * @since 2.9.0
- * @uses apply_filters() Calls 'the_content_feed' on the content before processing.
  * @see get_the_content()
  *
  * @param string $feed_type The type of feed. rss2 | atom | rss | rdf
@@ -172,10 +226,16 @@
  * @package WordPress
  * @subpackage Feed
  * @since 0.71
- * @uses apply_filters() Calls 'the_excerpt_rss' hook on the excerpt.
  */
 function the_excerpt_rss() {
 	$output = get_the_excerpt();
+	/**
+	 * Filter the post excerpt for a feed.
+	 *
+	 * @since 1.2.1
+	 *
+	 * @param string $output The current post excerpt returned by get_the_excerpt().
+	 */
 	echo apply_filters('the_excerpt_rss', $output);
 }
 
@@ -185,9 +245,15 @@
  * @package WordPress
  * @subpackage Feed
  * @since 2.3.0
- * @uses apply_filters() Call 'the_permalink_rss' on the post permalink
  */
 function the_permalink_rss() {
+	/**
+	 * Filter the permalink to the post for use in feeds.
+	 *
+	 * @since 2.3.0
+	 *
+	 * @param string $string The current post permalink.
+	 */
 	echo esc_url( apply_filters('the_permalink_rss', get_permalink() ));
 }
 
@@ -198,6 +264,13 @@
  * @return none
  */
 function comments_link_feed() {
+	/**
+	 * Filter the permalink to the comments for the current post.
+	 *
+	 * @since 3.6.0
+	 *
+	 * @param string $string The current comment permalink with '#comments' appended.
+	 */
 	echo esc_url( apply_filters( 'comments_link_feed', get_comments_link() ) );
 }
 
@@ -239,6 +312,15 @@
  * @since 1.5.0
  */
 function comment_link() {
+	/**
+	 * Filter the current comment's permalink.
+	 *
+	 * @since 1.5.2
+	 *
+	 * @see get_comment_link()
+	 *
+	 * @param string $string The current comment permalink.
+	 */
 	echo esc_url( apply_filters( 'comment_link', get_comment_link() ) );
 }
 
@@ -248,13 +330,21 @@
  * @package WordPress
  * @subpackage Feed
  * @since 2.0.0
- * @uses apply_filters() Calls 'comment_author_rss' hook on comment author.
  * @uses get_comment_author()
  *
  * @return string Comment Author
  */
 function get_comment_author_rss() {
-	return apply_filters('comment_author_rss', get_comment_author() );
+	/**
+	 * Filter the current comment author for use in a feed.
+	 *
+	 * @since 1.5.2
+	 *
+	 * @see get_comment_author()
+	 *
+	 * @param string $string The current comment author.
+	 */
+	return apply_filters( 'comment_author_rss', get_comment_author() );
 }
 
 /**
@@ -274,12 +364,18 @@
  * @package WordPress
  * @subpackage Feed
  * @since 1.0.0
- * @uses apply_filters() Calls 'comment_text_rss' filter on comment content.
  * @uses get_comment_text()
  */
 function comment_text_rss() {
 	$comment_text = get_comment_text();
-	$comment_text = apply_filters('comment_text_rss', $comment_text);
+	/**
+	 * Filter the current comment content for use in a feed.
+	 *
+	 * @since 1.5.2
+	 *
+	 * @param string $comment_text The comment content.
+	 */
+	$comment_text = apply_filters( 'comment_text_rss', $comment_text );
 	echo $comment_text;
 }
 
@@ -293,7 +389,6 @@
  * @package WordPress
  * @subpackage Feed
  * @since 2.1.0
- * @uses apply_filters()
  *
  * @param string $type Optional, default is the type returned by get_default_feed().
  * @return string All of the post categories for displaying in the feed.
@@ -329,7 +424,16 @@
 			$the_list .= "\t\t<category><![CDATA[" . @html_entity_decode( $cat_name, ENT_COMPAT, get_option('blog_charset') ) . "]]></category>\n";
 	}
 
-	return apply_filters('the_category_rss', $the_list, $type);
+	/**
+	 * Filter all of the post categories for display in a feed.
+	 *
+	 * @since 2.2.0
+	 *
+	 * @param string $the_list All of the RSS post categories.
+	 * @param string $type     Type of feed. Possible values include 'rss2', 'atom'.
+	 *                         Default 'rss2'.
+	 */
+	return apply_filters( 'the_category_rss', $the_list, $type );
 }
 
 /**
@@ -379,7 +483,6 @@
  * @package WordPress
  * @subpackage Template
  * @since 1.5.0
- * @uses apply_filters() Calls 'rss_enclosure' hook on rss enclosure.
  * @uses get_post_custom() To get the current post enclosure metadata.
  */
 function rss_enclosure() {
@@ -395,7 +498,14 @@
 				$t = preg_split('/[ \t]/', trim($enclosure[2]) );
 				$type = $t[0];
 
-				echo apply_filters('rss_enclosure', '<enclosure url="' . trim(htmlspecialchars($enclosure[0])) . '" length="' . trim($enclosure[1]) . '" type="' . $type . '" />' . "\n");
+				/**
+				 * Filter the RSS enclosure HTML enclosure tag for the current post.
+				 *
+				 * @since 2.2.0
+				 *
+				 * @param string $string The link HTML tag with a URI and other attributes.
+				 */
+				echo apply_filters( 'rss_enclosure', '<enclosure url="' . trim(htmlspecialchars($enclosure[0])) . '" length="' . trim($enclosure[1]) . '" type="' . $type . '" />' . "\n" );
 			}
 		}
 	}
@@ -415,7 +525,6 @@
  * @package WordPress
  * @subpackage Template
  * @since 2.2.0
- * @uses apply_filters() Calls 'atom_enclosure' hook on atom enclosure.
  * @uses get_post_custom() To get the current post enclosure metadata.
  */
 function atom_enclosure() {
@@ -426,7 +535,14 @@
 		if ($key == 'enclosure') {
 			foreach ( (array) $val as $enc ) {
 				$enclosure = explode("\n", $enc);
-				echo apply_filters('atom_enclosure', '<link href="' . trim(htmlspecialchars($enclosure[0])) . '" rel="enclosure" length="' . trim($enclosure[1]) . '" type="' . trim($enclosure[2]) . '" />' . "\n");
+				/**
+				 * Filter the atom enclosure HTML link tag for the current post.
+				 *
+				 * @since 2.2.0
+				 *
+				 * @param string $string The link HTML tag with a URI and other attributes.
+				 */
+				echo apply_filters( 'atom_enclosure', '<link href="' . trim(htmlspecialchars($enclosure[0])) . '" rel="enclosure" length="' . trim($enclosure[1]) . '" type="' . trim($enclosure[2]) . '" />' . "\n" );
 			}
 		}
 	}
@@ -488,6 +604,16 @@
  */
 function self_link() {
 	$host = @parse_url(home_url());
+	/**
+	 * Filter a feed URL.
+	 *
+	 * @since 3.6.0
+	 *
+	 * @see set_url_scheme()
+	 * @see wp_unslash()
+	 *
+	 * @param string $string The link for the feed with set scheme.
+	 */
 	echo esc_url( apply_filters( 'self_link', set_url_scheme( 'http://' . $host['host'] . wp_unslash( $_SERVER['REQUEST_URI'] ) ) ) );
 }
 
@@ -512,6 +638,15 @@
 
 	$content_type = ( !empty($types[$type]) ) ? $types[$type] : 'application/octet-stream';
 
+	/**
+	 * Filter a feed content type.
+	 *
+	 * @since 2.8.0
+	 *
+	 * @param string $content_type Media type indicating the type of data that a feed contains.
+	 * @param string $type         Type of feed. Possible values include 'rss2', 'atom'.
+	 *                             Default 'rss2'.
+	 */
 	return apply_filters( 'feed_content_type', $content_type, $type );
 }
 
@@ -541,6 +676,14 @@
 
 	$feed->set_feed_url( $url );
 	$feed->set_cache_duration( apply_filters( 'wp_feed_cache_transient_lifetime', 12 * HOUR_IN_SECONDS, $url ) );
+	/**
+	 * Fires just before processing the SimplePie feed object.
+	 *
+	 * @since 3.0.0
+	 *
+	 * @param object &$feed SimplePie feed object, passed by reference.
+	 * @param mixed  $url   URL of feed to retrieve. If an array of URLs, the feeds are merged.
+	 */
 	do_action_ref_array( 'wp_feed_options', array( &$feed, $url ) );
 	$feed->init();
 	$feed->handle_content_type();