(bug 9679) Improve documentation for $wgSiteNotice

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 1983ea2..51f5358 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -19,6 +19,7 @@ Those wishing to use the latest code instead of a branch release can obtain
 it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
 
 == Configuration changes since 1.10 ==
+
 * $wgThumbUpright - Adjust width of upright images when parameter 'upright' is
   used
 
@@ -158,7 +159,8 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
   and decodeBlob()
 * (bug 6743) Don't link broken image links to the upload form when uploads
   are disabled
-
+* (bug 9679) Improve documentation for $wgSiteNotice
+  
 == MediaWiki API changes since 1.10 ==
 
 (For ongoing development discussion, see http://www.mediawiki.org/wiki/API)

diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index 99da169..87babba 100644 (file)
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -1532,10 +1532,14 @@ $wgNamespacesToBeSearchedDefault = array(
        NS_MAIN           => true,
 );
 
-/** If set, a bold ugly notice will show up at the top of every page. */
+/**
+ * Site notice shown at the top of each page
+ *
+ * This message can contain wiki text, and can also be set through the
+ * MediaWiki:Sitenotice page. You can also provide a separate message for
+ * logged-out users using the MediaWiki:Anonnotice page.
 $wgSiteNotice = '';
 
-
 #
 # Images settings
 #