WP Merge with revision 8075

git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@1328 7be80a69-a1ef-0310-a953-fb0f7c49ff36

1 files changed, 14 insertions, 1 deletions

diff --git a/wp-rss.php b/wp-rss.php
index 58a3e47..67d3d98 100644
--- a/wp-rss.php
+++ b/wp-rss.php
@@ -1,7 +1,20 @@
 <?php
+/**
+ * Outputs the RSS feed RDF format using the feed-rss.php
+ * file in wp-includes folder.
+ *
+ * This file only sets the feed format and includes the
+ * feed-rss.php.
+ *
+ * This file is no longer used in WordPress and while it is
+ * not deprecated now. This file will most likely be
+ * deprecated or removed in a later version.
+ *
+ * @package WordPress
+ */
 
 if (empty($wp)) {
-	require_once('./wp-config.php');
+	require_once('./wp-load.php');
 	wp('feed=rss');
 }