Merge "DefaultSettings: Fix doxygen warning for missing @endcond"

diff --combined includes/DefaultSettings.php
index 5e81d0f,99acd3f..ef80c63
--- 1/includes/DefaultSettings.php
--- 2/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@@ -52,6 -52,8 +52,8 @@@ if ( !defined( 'MEDIAWIKI' ) ) 
        die( 1 );
  }
  
+ /** @endcond */
+ 
  /**
   * wgConf hold the site configuration.
   * Not used for much in a default install.
@@@ -4226,18 -4228,6 +4228,18 @@@ $wgPasswordSalt = true
   */
  $wgMinimalPasswordLength = 1;
  
 +/**
 + * Specifies the maximal length of a user password (T64685).
 + *
 + * It is not recommended to make this greater than the default, as it can
 + * allow DoS attacks by users setting really long passwords. In addition,
 + * this should not be lowered too much, as it enforces weak passwords.
 + *
 + * @warning Unlike other password settings, user with passwords greater than
 + *      the maximum will not be able to log in.
 + */
 +$wgMaximalPasswordLength = 4096;
 +
  /**
   * Specifies if users should be sent to a password-reset form on login, if their
   * password doesn't meet the requirements of User::isValidPassword().
@@@ -5423,7 -5413,6 +5425,7 @@@ $wgDeprecationReleaseLimit = false
  
  /**
   * Only record profiling info for pages that took longer than this
 + * @deprecated since 1.25: set $wgProfiler['threshold'] instead.
   */
  $wgProfileLimit = 0.0;