Merge "Allow more flexibility in RC feeds"

diff --combined includes/DefaultSettings.php
index 192782b,84a9e21..e156792
--- 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
@@@ -5611,7 -5608,7 +5611,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