Merge "Update comment about enabled extensions"

diff --combined includes/installer/LocalSettingsGenerator.php
index 09b5929,137ab69..5a2dd1a
--- 1/includes/installer/LocalSettingsGenerator.php
--- 2/includes/installer/LocalSettingsGenerator.php
+++ b/includes/installer/LocalSettingsGenerator.php
@@@ -153,8 -153,9 +153,9 @@@ class LocalSettingsGenerator 
  
                if ( count( $this->extensions ) ) {
                        $localSettings .= "
- # Enabled Extensions. Most extensions are enabled by including the base extension file here
- # but check specific extension documentation for more details
+ # Enabled extensions. Most of the extensions are enabled by adding
+ # wfLoadExtensions('ExtensionName');
+ # to LocalSettings.php. Check specific extension documentation for more details.
  # The following extensions were automatically enabled:\n";
  
                        foreach ( $this->extensions as $extName ) {
@@@ -332,6 -333,9 +333,6 @@@ if ( !defined( 'MEDIAWIKI' ) ) 
  ## https://www.mediawiki.org/wiki/Manual:Short_URL
  \$wgScriptPath = \"{$this->values['wgScriptPath']}\";
  ${serverSetting}
 -## The relative URL path to the skins directory
 -\$wgStylePath = \"\$wgScriptPath/skins\";
 -\$wgResourceBasePath = \$wgScriptPath;
  
  ## The relative URL path to the logo.  Make sure you change this from the default,
  ## or else you'll overwrite your logo when you upgrade!