From 3d161feebf1fce8035bbc55df897bf118848364e Mon Sep 17 00:00:00 2001
From: Happy-melon <happy-melon@users.mediawiki.org>
Date: Sat, 12 Mar 2011 18:14:33 +0000
Subject: [PATCH] Follow-up r83755: @deprecated @since is wrong, doesn't have
 the expected semantic meaning.

---
 includes/Article.php                 |  6 +++---
 includes/DefaultSettings.php         |  4 ++--
 includes/HTMLForm.php                |  2 +-
 includes/Linker.php                  | 26 +++++++++++++-------------
 includes/OutputPage.php              |  4 ++--
 includes/Title.php                   |  2 +-
 includes/User.php                    |  2 +-
 includes/specials/SpecialBlockip.php |  4 ++--
 8 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/includes/Article.php b/includes/Article.php
index 8290f21da0..434c574126 100644
--- a/includes/Article.php
+++ b/includes/Article.php
@@ -159,7 +159,7 @@ class Article {
 	 *
 	 * @param $text string article content containing redirect info
 	 * @return mixed false, Title of in-wiki target, or string with URL
-	 * @deprecated @since 1.17
+	 * @deprecated since 1.17
 	 */
 	public function followRedirectText( $text ) {
 		// recurse through to only get the final target
@@ -1936,7 +1936,7 @@ class Article {
 	}
 
 	/**
-	 * @deprecated @since 1.7 use Article::doEdit()
+	 * @deprecated since 1.7 use Article::doEdit()
 	 */
 	function insertNewArticle( $text, $summary, $isminor, $watchthis, $suppressRC = false, $comment = false, $bot = false ) {
 		wfDeprecated( __METHOD__ );
@@ -1970,7 +1970,7 @@ class Article {
 	}
 
 	/**
-	 * @deprecated @since 1.7 use Article::doEdit()
+	 * @deprecated since 1.7 use Article::doEdit()
 	 */
 	function updateArticle( $text, $summary, $minor, $watchthis, $forceBot = false, $sectionanchor = '' ) {
 		wfDeprecated( __METHOD__ );
diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index 70f3a3be40..a4da8a4da7 100644
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -3177,13 +3177,13 @@ $wgSecureLogin        = false;
 
 /**
  * Allow sysops to ban logged-in users
- * @deprecated @since 1.18
+ * @deprecated since 1.18
  */
 $wgSysopUserBans        = true;
 
 /**
  * Allow sysops to ban IP ranges
- * @deprecated @since 1.18; set $wgBlockCIDRLimit to array( 'IPv4' => 32, 'IPv6 => 128 ) instead.
+ * @deprecated since 1.18; set $wgBlockCIDRLimit to array( 'IPv4' => 32, 'IPv6 => 128 ) instead.
  */
 $wgSysopRangeBans       = true;
 
diff --git a/includes/HTMLForm.php b/includes/HTMLForm.php
index 1010229a10..7653e2a985 100644
--- a/includes/HTMLForm.php
+++ b/includes/HTMLForm.php
@@ -159,7 +159,7 @@ class HTMLForm {
 	/**
 	 * Add the HTMLForm-specific JavaScript, if it hasn't been
 	 * done already.
-	 * @deprecated @since 1.18 load modules with ResourceLoader instead
+	 * @deprecated since 1.18 load modules with ResourceLoader instead
 	 */
 	static function addJS() { }
 
diff --git a/includes/Linker.php b/includes/Linker.php
index a2438e71ef..599114ce4d 100644
--- a/includes/Linker.php
+++ b/includes/Linker.php
@@ -344,7 +344,7 @@ class Linker {
 	 * @param $trail String
 	 * @param $prefix String
 	 * @return string HTML of link
-	 * @deprecated @since 1.17
+	 * @deprecated since 1.17
 	 */
 	function makeSizeLinkObj( $size, $nt, $text = '', $query = '', $trail = '', $prefix = '' ) {
 		global $wgUser;
@@ -1765,7 +1765,7 @@ class Linker {
 	/* Deprecated methods */
 
 	/**
-	 * @deprecated @since 1.16 Use link()
+	 * @deprecated since 1.16 Use link()
 	 *
 	 * This function is a shortcut to makeLinkObj(Title::newFromText($title),...). Do not call
 	 * it if you already have a title object handy. See makeLinkObj for further documentation.
@@ -1792,7 +1792,7 @@ class Linker {
 	}
 
 	/**
-	 * @deprecated @since 1.16 Use link()
+	 * @deprecated since 1.16 Use link()
 	 *
 	 * This function is a shortcut to makeKnownLinkObj(Title::newFromText($title),...). Do not call
 	 * it if you already have a title object handy. See makeKnownLinkObj for further documentation.
@@ -1817,7 +1817,7 @@ class Linker {
 	}
 
 	/**
-	 * @deprecated @since 1.16 Use link()
+	 * @deprecated since 1.16 Use link()
 	 *
 	 * This function is a shortcut to makeBrokenLinkObj(Title::newFromText($title),...). Do not call
 	 * it if you already have a title object handy. See makeBrokenLinkObj for further documentation.
@@ -1840,7 +1840,7 @@ class Linker {
 	}
 
 	/**
-	 * @deprecated @since 1.16 Use link()
+	 * @deprecated since 1.16 Use link()
 	 *
 	 * This function is a shortcut to makeStubLinkObj(Title::newFromText($title),...). Do not call
 	 * it if you already have a title object handy. See makeStubLinkObj for further documentation.
@@ -1864,7 +1864,7 @@ class Linker {
 	}
 
 	/**
-	 * @deprecated @since 1.16 Use link()
+	 * @deprecated since 1.16 Use link()
 	 *
 	 * Make a link for a title which may or may not be in the database. If you need to
 	 * call this lots of times, pre-fill the link cache with a LinkBatch, otherwise each
@@ -1894,7 +1894,7 @@ class Linker {
 	}
 
 	/**
-	 * @deprecated @since 1.16 Use link()
+	 * @deprecated since 1.16 Use link()
 	 *
 	 * Make a link for a title which definitely exists. This is faster than makeLinkObj because
 	 * it doesn't have to do a database query. It's also valid for interwiki titles and special
@@ -1930,7 +1930,7 @@ class Linker {
 	}
 
 	/**
-	 * @deprecated @since 1.16 Use link()
+	 * @deprecated since 1.16 Use link()
 	 *
 	 * Make a red link to the edit page of a given title.
 	 *
@@ -1958,7 +1958,7 @@ class Linker {
 	}
 
 	/**
-	 * @deprecated @since 1.16 Use link()
+	 * @deprecated since 1.16 Use link()
 	 *
 	 * Make a brown link to a short article.
 	 *
@@ -1975,7 +1975,7 @@ class Linker {
 	}
 
 	/**
-	 * @deprecated @since 1.16 Use link()
+	 * @deprecated since 1.16 Use link()
 	 *
 	 * Make a coloured link.
 	 *
@@ -2005,7 +2005,7 @@ class Linker {
 
 	/**
 	 * Creates the HTML source for images
-	 * @deprecated @since 1.16 use makeImageLink2
+	 * @deprecated since 1.16 use makeImageLink2
 	 *
 	 * @param $title Title object
 	 * @param $label String: label text
@@ -2071,7 +2071,7 @@ class Linker {
 	}
 
 	/**
-	 * @deprecated @since 1.14
+	 * @deprecated since 1.14
 	 * Returns raw bits of HTML, use titleAttrib() and accesskey()
 	 */
 	public function tooltipAndAccesskey( $name ) {
@@ -2079,7 +2079,7 @@ class Linker {
 	}
 
 	/**
-	 * @deprecated @since 1.14
+	 * @deprecated since 1.14
 	 * Returns raw bits of HTML, use titleAttrib()
 	 */
 	public function tooltip( $name, $options = null ) {
diff --git a/includes/OutputPage.php b/includes/OutputPage.php
index b7e5e9d064..277225eab5 100644
--- a/includes/OutputPage.php
+++ b/includes/OutputPage.php
@@ -1092,7 +1092,7 @@ class OutputPage {
 
 	/**
 	 * Return whether user JavaScript is allowed for this page
-	 * @deprecated @since 1.18 Load modules with ResourceLoader, and origin and
+	 * @deprecated since 1.18 Load modules with ResourceLoader, and origin and
 	 *     trustworthiness is identified and enforced automagically. 
 	 * @return Boolean
 	 */
@@ -3075,7 +3075,7 @@ class OutputPage {
 	 * @param $modules Array: list of jQuery modules which should be loaded
 	 * @return Array: the list of modules which were not loaded.
 	 * @since 1.16
-	 * @deprecated @since 1.17
+	 * @deprecated since 1.17
 	 */
 	public function includeJQuery( $modules = array() ) {
 		return array();
diff --git a/includes/Title.php b/includes/Title.php
index a992bc99ee..a48cbae700 100644
--- a/includes/Title.php
+++ b/includes/Title.php
@@ -1955,7 +1955,7 @@ class Title {
 	 * Is this a *valid* .css or .js subpage of a user page?
 	 *
 	 * @return Bool
-	 * @deprecated @since 1.17
+	 * @deprecated since 1.17
 	 */
 	public function isValidCssJsSubpage() {
 		return $this->isCssJsSubpage();
diff --git a/includes/User.php b/includes/User.php
index 5418a0d3f2..c9d196db58 100644
--- a/includes/User.php
+++ b/includes/User.php
@@ -2697,7 +2697,7 @@ class User {
 	 * which will give them a chance to modify this key based on their own
 	 * settings.
 	 *
-	 * @deprecated @since 1.17 use the ParserOptions object to get the relevant options
+	 * @deprecated since 1.17 use the ParserOptions object to get the relevant options
 	 * @return String Page rendering hash
 	 */
 	function getPageRenderingHash() {
diff --git a/includes/specials/SpecialBlockip.php b/includes/specials/SpecialBlockip.php
index 6f4736e080..22f4edbec8 100644
--- a/includes/specials/SpecialBlockip.php
+++ b/includes/specials/SpecialBlockip.php
@@ -590,12 +590,12 @@ class IPBlockForm extends SpecialPage {
 		}
 	}
 
-	# @deprecated @since 1.18
+	# @deprecated since 1.18
 	public static function suppressUserName( $name, $userId, $dbw = null ) {
 		return RevisionDeleteUser::suppressUserName( $name, $userId, $dbw );
 	}
 
-	# @deprecated @since 1.18
+	# @deprecated since 1.18
 	public static function unsuppressUserName( $name, $userId, $dbw = null ) {
 		return RevisionDeleteUser::unsuppressUserName( $name, $userId, $dbw );
 	}
-- 
2.20.1