From: Aryeh Gregor <simetrical@users.mediawiki.org>
Date: Tue, 29 Apr 2008 01:43:08 +0000 (+0000)
Subject: Update documentation links in auto-generated LocalSettings.php
X-Git-Tag: 1.31.0-rc.0~48021
X-Git-Url: https://git.cyclocoop.org/%7B%24admin_url%7Dmembres/cotisations/rappels.php?a=commitdiff_plain;h=d6a075ec1dd00f0744ce1ac9080ceff04eb0ba29;p=lhc%2Fweb%2Fwiklou.git

Update documentation links in auto-generated LocalSettings.php
---

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 60df56f483..445ac50a30 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -92,7 +92,9 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
   otherwise just "log in", consistently across skins
 * Special:Shortpages and Special:Longpages now returns pages in all content 
   namespaces, not just NS_MAIN.
-* (bug 889) Improve conflict-handling between shared upload repository (commons) and local one
+* (bug 889) Improve conflict-handling between shared upload repository
+  and local one
+* Update documentation links in auto-generated LocalSettings.php
 
 === Bug fixes in 1.13 ===
 
diff --git a/config/index.php b/config/index.php
index d3aea0d8c1..1ca13b40f8 100644
--- a/config/index.php
+++ b/config/index.php
@@ -1576,6 +1576,9 @@ function writeLocalSettings( $conf ) {
 # See includes/DefaultSettings.php for all configurable settings
 # and their default values, but don't forget to make changes in _this_
 # file, not there.
+#
+# Further documentation for configuration settings may be found at:
+# http://www.mediawiki.org/wiki/Manual:Configuration_settings
 
 # If you customize your file layout, set \$IP to the directory that contains
 # the other MediaWiki files. It will be used as a base to locate files.
@@ -1617,11 +1620,6 @@ if ( \$wgCommandLineMode ) {
 \$wgEmergencyContact = \"{$slconf['EmergencyContact']}\";
 \$wgPasswordSender = \"{$slconf['PasswordSender']}\";
 
-## For a detailed description of the following switches see
-## http://www.mediawiki.org/wiki/Extension:Email_notification 
-## and http://www.mediawiki.org/wiki/Extension:Email_notification
-## There are many more options for fine tuning available see
-## /includes/DefaultSettings.php
 ## UPO means: this is also a user preference option
 \$wgEnotifUserTalk = $enotifusertalk; # UPO
 \$wgEnotifWatchlist = $enotifwatchlist; # UPO