Merge "Documentation fixes for Password API-related changes"

diff --combined includes/User.php
index a887e36,2aabf24..b44e5e5
--- 1/includes/User.php
--- 2/includes/User.php
+++ b/includes/User.php
@@@ -38,6 -38,14 +38,6 @@@ define( 'MW_USER_VERSION', 10 )
   */
  define( 'EDIT_TOKEN_SUFFIX', '+\\' );
  
 -/**
 - * Thrown by User::setPassword() on error.
 - * @ingroup Exception
 - */
 -class PasswordError extends MWException {
 -      // NOP
 -}
 -
  /**
   * The User object encapsulates all of the user-specific settings (user_id,
   * name, rights, password, email address, options, last login time). Client
@@@ -4606,10 -4614,10 +4606,10 @@@ class User implements IDBAccessObject 
         * @param bool|string $salt Optional salt, may be random or the user ID.
         *  If unspecified or false, will generate one automatically
         * @return string Password hash
-        * @deprecated since 1.23, use Password class
+        * @deprecated since 1.24, use Password class
         */
        public static function crypt( $password, $salt = false ) {
-               wfDeprecated( __METHOD__, '1.23' );
+               wfDeprecated( __METHOD__, '1.24' );
                $hash = self::getPasswordFactory()->newFromPlaintext( $password );
                return $hash->toString();
        }
@@@ -4623,10 -4631,10 +4623,10 @@@
         * @param string|bool $userId User ID for old-style password salt
         *
         * @return bool
-        * @deprecated since 1.23, use Password class
+        * @deprecated since 1.24, use Password class
         */
        public static function comparePasswords( $hash, $password, $userId = false ) {
-               wfDeprecated( __METHOD__, '1.23' );
+               wfDeprecated( __METHOD__, '1.24' );
  
                // Check for *really* old password hashes that don't even have a type
                // The old hash format was just an md5 hex hash, with no type information