Make @deprecated documentation more consistent (see: http://svn.wikimedia.org/doc...

diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index 88d87e5..bfafcce 100644 (file)
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -2985,7 +2985,7 @@ $wgArticleCountMethod = null;
 
 /**
  * Backward compatibility setting, will set $wgArticleCountMethod if it is null.
- * @deprecated in 1.19; use $wgArticleCountMethod instead
+ * @deprecated since 1.19; use $wgArticleCountMethod instead
  */
 $wgUseCommaCount = false;
 
@@ -3138,7 +3138,7 @@ $wgDefaultUserOptions = array(
 
 /**
  * Whether or not to allow and use real name fields.
- * @deprecated in 1.16, use $wgHiddenPrefs[] = 'realname' below to disable real
+ * @deprecated since 1.16, use $wgHiddenPrefs[] = 'realname' below to disable real
  * names
  */
 $wgAllowRealName = true;

diff --git a/includes/GlobalFunctions.php b/includes/GlobalFunctions.php
index bc4a824..3536597 100644 (file)
--- a/includes/GlobalFunctions.php
+++ b/includes/GlobalFunctions.php
@@ -610,7 +610,7 @@ function wfMsgForContentNoTrans( $key ) {
 /**
  * Get a message from the language file, for the UI elements
  *
- * @deprecated in 1.18; use wfMessage()
+ * @deprecated since 1.18; use wfMessage()
  */
 function wfMsgNoDB( $key ) {
        wfDeprecated( __FUNCTION__ );
@@ -622,7 +622,7 @@ function wfMsgNoDB( $key ) {
 /**
  * Get a message from the language file, for the content
  *
- * @deprecated in 1.18; use wfMessage()
+ * @deprecated since 1.18; use wfMessage()
  */
 function wfMsgNoDBForContent( $key ) {
        wfDeprecated( __FUNCTION__ );
@@ -660,7 +660,7 @@ function wfMsgReal( $key, $args, $useDB = true, $forContent = false, $transform
 /**
  * This function provides the message source for messages to be edited which are *not* stored in the database.
  *
- * @deprecated in 1.18; use wfMessage()
+ * @deprecated since 1.18; use wfMessage()
  * @param $key String
  */
 function wfMsgWeirdKey( $key ) {
@@ -3174,7 +3174,7 @@ function wfBoolToStr( $value ) {
 /**
  * Load an extension messages file
  *
- * @deprecated in 1.16, warnings in 1.18, remove in 1.20
+ * @deprecated since 1.16, warnings in 1.18, remove in 1.20
  * @codeCoverageIgnore
  */
 function wfLoadExtensionMessages() {
@@ -3268,7 +3268,7 @@ function wfWaitForSlaves( $maxLag = false, $wiki = false ) {
 
 /**
  * Used to be used for outputting text in the installer/updater
- * @deprecated Warnings in 1.19, removal in 1.20
+ * @deprecated since 1.18, warnings in 1.19, remove in 1.20
  */
 function wfOut( $s ) {
        wfDeprecated( __METHOD__ );

diff --git a/includes/SpecialPage.php b/includes/SpecialPage.php
index 866cbec..c2434d8 100644 (file)
--- a/includes/SpecialPage.php
+++ b/includes/SpecialPage.php
@@ -109,7 +109,7 @@ class SpecialPage {
         * an associative record to $wgSpecialPages. This avoids autoloading SpecialPage.
         *
         * @param $page SpecialPage
-        * @deprecated in 1.7, warnings in 1.17, might be removed in 1.20
+        * @deprecated since 1.7, warnings in 1.17, might be removed in 1.20
         */
        static function addPage( &$page ) {
                wfDeprecated( __METHOD__ );

diff --git a/includes/User.php b/includes/User.php
index 0a79150..93ff7df 100644 (file)
--- a/includes/User.php
+++ b/includes/User.php
@@ -2355,8 +2355,8 @@ class User {
        /**
         * Get the current skin, loading it if required
         * @return Skin The current skin
-        * @todo: FIXME : need to check the old failback system [AV]
-        * @deprecated Use ->getSkin() in the most relevant outputting context you have
+        * @todo FIXME : need to check the old failback system [AV]
+        * @deprecated since 1.18 Use ->getSkin() in the most relevant outputting context you have
         */
        function getSkin() {
                return RequestContext::getMain()->getSkin();

diff --git a/includes/api/ApiParse.php b/includes/api/ApiParse.php
index 1510e04..ba90e10 100644 (file)
--- a/includes/api/ApiParse.php
+++ b/includes/api/ApiParse.php
@@ -369,7 +369,8 @@ class ApiParse extends ApiBase {
        }
 
        /**
-        * @deprecated No modern skin generates langlinks this way, please use langlinks data to generate your own html
+        * @deprecated since 1.18 No modern skin generates language links this way, please use language links
+        *                        data to generate your own HTML.
         */
        private function languagesHtml( $languages ) {
                global $wgContLang, $wgHideInterlanguageLinks;