From a3e692ea1bfa153e4b38f0713241a59808a5655a Mon Sep 17 00:00:00 2001 From: Chad Horohoe Date: Sun, 11 Jul 2010 11:27:58 +0000 Subject: [PATCH] Doc fixes and message cleanups to r69238 --- includes/installer/Installer.i18n.php | 6 +++--- includes/installer/LocalSettingsGenerator.php | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/includes/installer/Installer.i18n.php b/includes/installer/Installer.i18n.php index 909ae54dff..45d1f9e403 100644 --- a/includes/installer/Installer.i18n.php +++ b/includes/installer/Installer.i18n.php @@ -404,9 +404,9 @@ to use images, sounds and other media found on the [http://commons.wikimedia.org access to the Internet. $1 For more information on this feature, including instructions on how to set it up for -wikis other than the Wikimedia Commons, consult [http://mediawiki.org/wiki/Manual:$wgForeignFileRepos the manual]', - 'config-instantcommons-good' => 'We were able to detect internet connectivity during the environment checks, so you should be able to enable this if you want to.', - 'config-instantcommons-bad' => '\'\'Unfortunately, we were unable to detect internet connectivity during the environment checks, so you might be unable to use this. If you are behind a proxy, see [http://www.mediawiki.org/wiki/Manual:$wgHTTPProxy this page]\'\'', +wikis other than the Wikimedia Commons, consult [http://mediawiki.org/wiki/Manual:$wgForeignFileRepos the manual].', // $1 is for indicating whether or not we should be able to use the feature + 'config-instantcommons-good' => 'We were able to detect internet connectivity during the environment checks. You can enable this feature if you want to.', + 'config-instantcommons-bad' => '\'\'Unfortunately, we were unable to detect internet connectivity during the environment checks, so you might be unable to use this feature. If your server is behind a proxy, you may need to do some [http://www.mediawiki.org/wiki/Manual:$wgHTTPProxy additional configuration]\'\'', 'config-cc-error' => 'The Creative Commons license chooser gave no result. Enter the license name manually.', 'config-cc-again' => 'Pick again...', diff --git a/includes/installer/LocalSettingsGenerator.php b/includes/installer/LocalSettingsGenerator.php index 85ee85877d..0a9266aeec 100644 --- a/includes/installer/LocalSettingsGenerator.php +++ b/includes/installer/LocalSettingsGenerator.php @@ -216,7 +216,7 @@ if ( \$wgCommandLineMode ) { {$magic}\$wgUseImageMagick = true; {$magic}\$wgImageMagickConvertCommand = \"{$this->values['wgImageMagickConvertCommand']}\"; -# InstantCommons, allows wiki to use images from http://commons.wikimedia.org +# InstantCommons allows wiki to use images from http://commons.wikimedia.org \$wgUseInstantCommons = {$this->values['wgUseInstantCommons']}; ## If you use ImageMagick (or any other shell command) on a -- 2.20.1