From: Mark A. Hershberger <mah@users.mediawiki.org>
Date: Sat, 12 Feb 2011 04:01:06 +0000 (+0000)
Subject: Fix up bug #26016 by applying the more descriptive comment suggested
X-Git-Tag: 1.31.0-rc.0~32031
X-Git-Url: http://git.cyclocoop.org//%27%40script%40/%27?a=commitdiff_plain;h=ad5cfd5c09d32048afebf2e5fae1069de3a08910;p=lhc%2Fweb%2Fwiklou.git

Fix up bug #26016 by applying the more descriptive comment suggested
there.  Code Reviewers: have at it!!
---

diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index c2147f567b..8a84e7f641 100644
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -373,8 +373,12 @@ $wgImgAuthPublicTest = true;
  *   - apibase              Use for the foreign API's URL
  *   - apiThumbCacheExpiry  How long to locally cache thumbs for
  *
- * The default is to initialise these arrays from the MW<1.11 backwards compatible settings:
- * $wgUploadPath, $wgThumbnailScriptPath, $wgSharedUploadDirectory, etc.
+ * If you leave $wgLocalFileRepo set to false, Setup will fill in appropriate values.
+ * Otherwise, set $wgLocalFileRepo to a repository structure as described above.
+ * If you set $wgUseInstantCommons to true, it will add an entry for Commons.
+ * If you set $wgForeignFileRepos to an array of repostory structures, those will
+ * be searched after the local file repo.
+ * Otherwise, you will only have access to local media files.
  */
 $wgLocalFileRepo = false;