From 7053baca034341cd19bdbde69c3e631f6a8d41a8 Mon Sep 17 00:00:00 2001
From: Alexandre Emsenhuber <ialex.wiki@gmail.com>
Date: Sat, 11 May 2013 22:04:21 +0200
Subject: [PATCH] Remove "will be removed in ..." comments

All of them are wrong, since 1.20 is out for a while now, and
these methods are still here.

Change-Id: I3b59b61490c9aea5252e25623b0b282295dcc3f6
---
 includes/OutputPage.php           | 1 -
 includes/Preferences.php          | 2 +-
 includes/Title.php                | 6 +++---
 includes/parser/ParserOptions.php | 2 +-
 4 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/includes/OutputPage.php b/includes/OutputPage.php
index 746cd0e709..bb4604fadd 100644
--- a/includes/OutputPage.php
+++ b/includes/OutputPage.php
@@ -1296,7 +1296,6 @@ class OutputPage extends ContextSource {
 	 * Return whether user JavaScript is allowed for this page
 	 * @deprecated since 1.18 Load modules with ResourceLoader, and origin and
 	 *     trustworthiness is identified and enforced automagically.
-	 *     Will be removed in 1.20.
 	 * @return Boolean
 	 */
 	public function isUserJsAllowed() {
diff --git a/includes/Preferences.php b/includes/Preferences.php
index 972e2c6725..bb386f2a4c 100644
--- a/includes/Preferences.php
+++ b/includes/Preferences.php
@@ -1476,7 +1476,7 @@ class Preferences {
 	}
 
 	/**
-	 * @deprecated in 1.19; will be removed in 1.20.
+	 * @deprecated in 1.19
 	 * @param $user User
 	 * @return array
 	 */
diff --git a/includes/Title.php b/includes/Title.php
index 70e8cd442f..c97056f7ca 100644
--- a/includes/Title.php
+++ b/includes/Title.php
@@ -2242,7 +2242,7 @@ class Title {
 	 * Protect css subpages of user pages: can $wgUser edit
 	 * this page?
 	 *
-	 * @deprecated in 1.19; will be removed in 1.20. Use getUserPermissionsErrors() instead.
+	 * @deprecated in 1.19; use getUserPermissionsErrors() instead.
 	 * @return Bool
 	 */
 	public function userCanEditCssSubpage() {
@@ -2256,7 +2256,7 @@ class Title {
 	 * Protect js subpages of user pages: can $wgUser edit
 	 * this page?
 	 *
-	 * @deprecated in 1.19; will be removed in 1.20. Use getUserPermissionsErrors() instead.
+	 * @deprecated in 1.19; use getUserPermissionsErrors() instead.
 	 * @return Bool
 	 */
 	public function userCanEditJsSubpage() {
@@ -2349,7 +2349,7 @@ class Title {
 	/**
 	 * Update the title protection status
 	 *
-	 * @deprecated in 1.19; will be removed in 1.20. Use WikiPage::doUpdateRestrictions() instead.
+	 * @deprecated in 1.19; use WikiPage::doUpdateRestrictions() instead.
 	 * @param $create_perm String Permission required for creation
 	 * @param string $reason Reason for protection
 	 * @param string $expiry Expiry timestamp
diff --git a/includes/parser/ParserOptions.php b/includes/parser/ParserOptions.php
index 2bd5a5d2eb..b01f162877 100644
--- a/includes/parser/ParserOptions.php
+++ b/includes/parser/ParserOptions.php
@@ -312,7 +312,7 @@ class ParserOptions {
 	function setAllowSpecialInclusion( $x )     { return wfSetVar( $this->mAllowSpecialInclusion, $x ); }
 	function setTidy( $x )                      { return wfSetVar( $this->mTidy, $x ); }
 
-	/** @deprecated in 1.19; will be removed in 1.20 */
+	/** @deprecated in 1.19 */
 	function setSkin( $x )                      { wfDeprecated( __METHOD__, '1.19' ); }
 	function setInterfaceMessage( $x )          { return wfSetVar( $this->mInterfaceMessage, $x ); }
 	function setTargetLanguage( $x )            { return wfSetVar( $this->mTargetLanguage, $x, true ); }
-- 
2.20.1