From 1555fc3d9963f1e1b997d08c6f2a74992164461b Mon Sep 17 00:00:00 2001
From: Chad Horohoe <demon@users.mediawiki.org>
Date: Mon, 6 Jul 2009 01:43:34 +0000
Subject: [PATCH] Doc tweak. Clarify that MediaWiki:Sitenotice overrides
 $wgSiteNotice.

---
 includes/DefaultSettings.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index 123e015653..59ca34e9c7 100644
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -2046,8 +2046,9 @@ $wgSearchEverythingOnlyLoggedIn = false;
  * 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.
+ * MediaWiki:Sitenotice page, which will override this. You can also 
+ * provide a separate message for logged-out users using the 
+ * MediaWiki:Anonnotice page.
  */
 $wgSiteNotice = '';
 
-- 
2.20.1