Merge "Improve some timeout docs"

diff --combined includes/DefaultSettings.php
index d07136b,1f3b5e3..5d95964
--- 1/includes/DefaultSettings.php
--- 2/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@@ -755,6 -755,8 +755,8 @@@ $wgCopyUploadProxy = false
   * timeout longer than the default $wgHTTPTimeout. False means fallback
   * to default.
   *
+  * @var int|bool
+  *
   * @since 1.22
   */
  $wgCopyUploadTimeout = false;
@@@ -3235,6 -3237,14 +3237,6 @@@ $wgHTMLFormAllowTableFormat = true
   */
  $wgUseMediaWikiUIEverywhere = false;
  
 -/**
 - * Temporary variable that determines whether the EditPage class should use OOjs UI or not.
 - * This will be removed later and OOjs UI will become the only option.
 - *
 - * @since 1.29
 - */
 -$wgOOUIEditPage = true;
 -
  /**
   * Whether to label the store-to-database-and-show-to-others button in the editor
   * as "Save page"/"Save changes" if false (the default) or, if true, instead as
@@@ -4893,7 -4903,7 +4895,7 @@@ $wgDefaultUserOptions = 
        'date' => 'default',
        'diffonly' => 0,
        'disablemail' => 0,
 -      'editfont' => 'default',
 +      'editfont' => 'monospace',
        'editondblclick' => 0,
        'editsectiononrightclick' => 0,
        'enotifminoredits' => 0,
@@@ -8271,6 -8281,7 +8273,7 @@@ $wgShellLocale = 'C.UTF-8'
  
  /**
   * Timeout for HTTP requests done internally, in seconds.
+  * @var int
   */
  $wgHTTPTimeout = 25;