Merge "Add 'since <version>' to @deprecated annotations"

diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index b6860b9..2c63b6f 100644 (file)
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -1625,10 +1625,10 @@ $wgAllDBsAreLocalhost = false;
  * $wgSharedPrefix is the table prefix for the shared database. It defaults to
  * $wgDBprefix.
  *
- * @deprecated In new code, use the $wiki parameter to wfGetLB() to access
- *   remote databases. Using wfGetLB() allows the shared database to reside on
- *   separate servers to the wiki's own database, with suitable configuration
- *   of $wgLBFactoryConf.
+ * @deprecated since 1.21 In new code, use the $wiki parameter to wfGetLB() to
+ *   access remote databases. Using wfGetLB() allows the shared database to
+ *   reside on separate servers to the wiki's own database, with suitable
+ *   configuration of $wgLBFactoryConf.
  */
 $wgSharedDB = null;
 

diff --git a/includes/Namespace.php b/includes/Namespace.php
index 78c4643..bfd41b6 100644 (file)
--- a/includes/Namespace.php
+++ b/includes/Namespace.php
@@ -90,7 +90,7 @@ class MWNamespace {
 
        /**
         * @see self::isSubject
-        * @deprecated Please use the more consistently named isSubject (since 1.19)
+        * @deprecated since 1.19 Please use the more consistently named isSubject
         * @return bool
         */
        public static function isMain( $index ) {

diff --git a/includes/db/ORMTable.php b/includes/db/ORMTable.php
index a06c12c..51b81da 100644 (file)
--- a/includes/db/ORMTable.php
+++ b/includes/db/ORMTable.php
@@ -888,7 +888,7 @@ class ORMTable extends DBAccessBase implements IORMTable {
        /**
         * @see ORMTable::newRowFromFromDBResult
         *
-        * @deprecated use newRowFromDBResult instead
+        * @deprecated since 1.20 use newRowFromDBResult instead
         * @since 1.20
         *
         * @param stdClass $result
@@ -915,7 +915,7 @@ class ORMTable extends DBAccessBase implements IORMTable {
        /**
         * @see ORMTable::newRow
         *
-        * @deprecated use newRow instead
+        * @deprecated since 1.20 use newRow instead
         * @since 1.20
         *
         * @param array $data

diff --git a/includes/site/MediaWikiSite.php b/includes/site/MediaWikiSite.php
index 248066b..2a86b31 100644 (file)
--- a/includes/site/MediaWikiSite.php
+++ b/includes/site/MediaWikiSite.php
@@ -39,7 +39,7 @@ class MediaWikiSite extends Site {
 
        /**
         * @since 1.21
-        * @deprecated Just use the constructor or the factory Site::newForType
+        * @deprecated since 1.21 Just use the constructor or the factory Site::newForType
         *
         * @param int $globalId
         *