From: umherirrender <umherirrender_de.wp@web.de>
Date: Fri, 5 Oct 2012 19:30:46 +0000 (+0200)
Subject: Add version number to deprecated setting
X-Git-Tag: 1.31.0-rc.0~22101^2
X-Git-Url: https://git.cyclocoop.org/%242?a=commitdiff_plain;h=d73e90c99cdbc86827f0000192b2736cb35750e0;p=lhc%2Fweb%2Fwiklou.git

Add version number to deprecated setting

Fix one doc

Change-Id: I527639c3694d7b72d9f3bff62fb8b0b7eb6ee126
---

diff --git a/docs/memcached.txt b/docs/memcached.txt
index 3872edc830..971a611a0d 100644
--- a/docs/memcached.txt
+++ b/docs/memcached.txt
@@ -198,7 +198,7 @@ Revision text:
 	expriry: $wgRevisionCacheExpiry
 
 Sessions:
-	controlled by: $wgSessionsInMemcached
+	controlled by: $wgSessionsInObjectCache
 	key: $wgBDname:session:$id
 	ex: wikidb:session:38d7c5b8d3bfc51egf40c69bc40f8be3
 	stores: $SESSION, useful when using a multi-sever wiki
diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index e25bc3e2c0..fb6b0bf8ee 100644
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -1762,7 +1762,7 @@ $wgDBAhandler = 'db3';
 /**
  * Deprecated alias for $wgSessionsInObjectCache.
  *
- * @deprecated Use $wgSessionsInObjectCache
+ * @deprecated since 1.20; Use $wgSessionsInObjectCache
  */
 $wgSessionsInMemcached = false;
 
@@ -2077,13 +2077,13 @@ $wgHTCPMulticastRouting = array();
  * setting is ignored. If $wgHTCPMulticastRouting is not set and this setting
  * is, it is used to populate $wgHTCPMulticastRouting.
  *
- * @deprecated in favor of $wgHTCPMulticastRouting
+ * @deprecated since 1.20 in favor of $wgHTCPMulticastRouting
  */
 $wgHTCPMulticastAddress = false;
 
 /**
  * HTCP multicast port.
- * @deprecated in favor of $wgHTCPMulticastRouting
+ * @deprecated since 1.20 in favor of $wgHTCPMulticastRouting
  * @see $wgHTCPMulticastAddress
  */
 $wgHTCPPort = 4827;
@@ -4285,7 +4285,9 @@ $wgSecretKey = false;
  */
 $wgProxyList = array();
 
-/** deprecated */
+/**
+ * @deprecated since 1.14
+ */
 $wgProxyKey = false;
 
 /** @} */ # end of proxy scanner settings