Fix documentation of $wgTranscludeCacheExpiry

Fix for 937fc3b (SVN r98467)...

Also improve the one of $wgEnableScaryTranscluding while I'm at it.

Bug: 52006
Change-Id: Ia84c826f4f4d8fa18d3bf36f732e5b487544caa2

diff --git a/RELEASE-NOTES-1.22 b/RELEASE-NOTES-1.22
index d6204a7..64d970e 100644 (file)
--- a/RELEASE-NOTES-1.22
+++ b/RELEASE-NOTES-1.22
@@ -229,6 +229,7 @@ production.
   (jquery.makeCollapsible, jquery.tablesorter) after preview content is loaded.
 * (bug 51891) Fixed PHP notice on Special:PagesWithProp when no properties
   are defined.
+* (bug 52006) Corrected documentation of $wgTranscludeCacheExpiry.
 
 === API changes in 1.22 ===
 * (bug 25553) The JSON output formatter now leaves forward slashes unescaped

diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index 15f6987..86b0849 100644 (file)
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -3516,12 +3516,13 @@ $wgExpensiveParserFunctionLimit = 100;
 $wgPreprocessorCacheThreshold = 1000;
 
 /**
- * Enable interwiki transcluding.  Only when iw_trans=1.
+ * Enable interwiki transcluding.  Only when iw_trans=1 in the interwiki table.
  */
 $wgEnableScaryTranscluding = false;
 
 /**
- * (see next option $wgGlobalDatabase).
+ * Expiry time for transcluded templates cached in transcache database table.
+ * Only used $wgEnableInterwikiTranscluding is set to true.
  */
 $wgTranscludeCacheExpiry = 3600;