Merge "Remove "Help/Project" profile from Special:Search"

diff --combined includes/DefaultSettings.php
index e156792,b7116e7..9df0e08
--- 1/includes/DefaultSettings.php
--- 2/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@@ -60,14 -60,11 +60,14 @@@ if ( !defined( 'MEDIAWIKI' ) ) 
  $wgConf = new SiteConfiguration;
  
  /**
 - * Class name to use for accessing Config.
 - * Currently only 'GlobalConfig' is available
 + * Registry of factory functions to create config objects:
 + * The 'main' key must be set, and the value should be a valid
 + * callable.
   * @since 1.23
   */
 -$wgConfigClass = 'GlobalConfig';
 +$wgConfigRegistry = array(
 +      'main' => 'GlobalVarConfig::newInstance'
 +);
  
  /**
   * MediaWiki version number
@@@ -5323,17 -5320,6 +5323,6 @@@ $wgNamespacesToBeSearchedDefault = arra
        NS_MAIN => true,
  );
  
- /**
-  * Namespaces to be searched when user clicks the "Help" tab
-  * on Special:Search.
-  *
-  * Same format as $wgNamespacesToBeSearchedDefault.
-  */
- $wgNamespacesToBeSearchedHelp = array(
-       NS_PROJECT => true,
-       NS_HELP => true,
- );
- 
  /**
   * If set to true the 'searcheverything' preference will be effective only for
   * logged-in users.
@@@ -5611,7 -5597,7 +5600,7 @@@ $wgRC2UDPOmitBots = false
   * The common options are:
   *   * 'uri' -- the address to which the notices are to be sent.
   *   * 'formatter' -- the class name (implementing RCFeedFormatter) which will
 - *     produce the text to send.
 + *     produce the text to send. This can also be an object of the class.
   *   * 'omit_bots' -- whether the bot edits should be in the feed
   *   * 'omit_anon' -- whether anonymous edits should be in the feed
   *   * 'omit_user' -- whether edits by registered users should be in the feed
@@@ -6189,7 -6175,6 +6178,7 @@@ $wgJobTypesExcludedFromDefaultQueue = a
   * may have a variable number of work items, as is the case with batch jobs.
   * This is used by runJobs.php and not jobs run via $wgJobRunRate.
   * These settings should be global to all wikis.
 + * @var float[]
   */
  $wgJobBackoffThrottling = array();
  
@@@ -7077,14 -7062,6 +7066,14 @@@ $wgCompiledFiles = array()
   */
  $wgPagePropsHaveSortkey = true;
  
 +/**
 + * Port where you have HTTPS running
 + * Supports HTTPS on non-standard ports
 + * @see bug 65184
 + * @since 1.24
 + */
 +$wgHttpsPort = 443;
 +
  /**
   * For really cool vim folding this needs to be at the end:
   * vim: foldmarker=@{,@} foldmethod=marker

diff --combined languages/i18n/en.json
index 2ed480e,006278e..85e1bdc
--- 1/languages/i18n/en.json
--- 2/languages/i18n/en.json
+++ b/languages/i18n/en.json
@@@ -882,12 -882,10 +882,10 @@@
        "searchmenu-new": "<strong>Create the page \"[[:$1]]\" on this wiki!</strong> {{PLURAL:$2|0=|See also the page found with your search.|See also the search results found.}}",
        "searchmenu-new-nocreate": "",
        "searchprofile-articles": "Content pages",
-       "searchprofile-project": "Help and Project pages",
        "searchprofile-images": "Multimedia",
        "searchprofile-everything": "Everything",
        "searchprofile-advanced": "Advanced",
        "searchprofile-articles-tooltip": "Search in $1",
-       "searchprofile-project-tooltip": "Search in $1",
        "searchprofile-images-tooltip": "Search for files",
        "searchprofile-everything-tooltip": "Search all of content (including talk pages)",
        "searchprofile-advanced-tooltip": "Search in custom namespaces",
@@@ -988,6 -986,7 +986,6 @@@
        "prefs-emailconfirm-label": "Email confirmation:",
        "youremail": "Email:",
        "username": "{{GENDER:$1|Username}}:",
 -      "uid": "{{GENDER:$1|User}} ID:",
        "prefs-memberingroups": "{{GENDER:$2|Member}} of {{PLURAL:$1|group|groups}}:",
        "prefs-memberingroups-type": "$1",
        "prefs-registration": "Registration time:",
@@@ -1819,10 -1818,8 +1817,10 @@@
        "watchnologin": "Not logged in",
        "addwatch": "Add to watchlist",
        "addedwatchtext": "The page \"[[:$1]]\" has been added to your [[Special:Watchlist|watchlist]].\nFuture changes to this page and its associated talk page will be listed there.",
 +      "addedwatchtext-short": "The page \"$1\" has been added to your watchlist.",
        "removewatch": "Remove from watchlist",
        "removedwatchtext": "The page \"[[:$1]]\" has been removed from [[Special:Watchlist|your watchlist]].",
 +      "removedwatchtext-short": "The page \"$1\" has been removed from your watchlist.",
        "watch": "Watch",
        "watchthispage": "Watch this page",
        "unwatch": "Unwatch",
@@@ -2471,7 -2468,9 +2469,7 @@@
        "interlanguage-link-title": "$1 – $2",
        "interlanguage-link-title-langonly": "$1",
        "common.css": "/* CSS placed here will be applied to all skins */",
 -      "cologneblue.css": "/* CSS placed here will affect users of the Cologne Blue skin */",
        "monobook.css": "/* CSS placed here will affect users of the MonoBook skin */",
 -      "modern.css": "/* CSS placed here will affect users of the Modern skin */",
        "vector.css": "/* CSS placed here will affect users of the Vector skin */",
        "print.css": "/* CSS placed here will affect the print output */",
        "noscript.css": "/* CSS placed here will affect users with JavaScript disabled */",
@@@ -2481,7 -2480,9 +2479,7 @@@
        "group-sysop.css": "/* CSS placed here will affect sysops only */",
        "group-bureaucrat.css": "/* CSS placed here will affect bureaucrats only */",
        "common.js": "/* Any JavaScript here will be loaded for all users on every page load. */",
 -      "cologneblue.js": "/* Any JavaScript here will be loaded for users using the Cologne Blue skin */",
        "monobook.js": "/* Any JavaScript here will be loaded for users using the MonoBook skin */",
 -      "modern.js": "/* Any JavaScript here will be loaded for users using the Modern skin */",
        "vector.js": "/* Any JavaScript here will be loaded for users using the Vector skin */",
        "group-autoconfirmed.js": "/* Any JavaScript here will be loaded for autoconfirmed users only */",
        "group-user.js": "/* Any JavaScript here will be loaded for registered users only */",
@@@ -2554,7 -2555,9 +2552,7 @@@
        "pageinfo-category-pages": "Number of pages",
        "pageinfo-category-subcats": "Number of subcategories",
        "pageinfo-category-files": "Number of files",
 -      "skinname-cologneblue": "Cologne Blue",
        "skinname-monobook": "MonoBook",
 -      "skinname-modern": "Modern",
        "skinname-vector": "Vector",
        "markaspatrolleddiff": "Mark as patrolled",
        "markaspatrolledlink": "[$1]",