Index: modules/color/color.install =================================================================== RCS file: /cvs/drupal/drupal/modules/color/color.install,v retrieving revision 1.3 diff -u -r1.3 color.install --- modules/color/color.install 19 May 2008 19:36:41 -0000 1.3 +++ modules/color/color.install 30 Aug 2008 14:00:04 -0000 @@ -18,14 +18,14 @@ } else { $requirements['gd']['severity'] = REQUIREMENT_ERROR; - $requirements['gd']['description'] = t('The GD library for PHP is enabled, but was compiled without PNG support. Please check the PHP image documentation for information on how to correct this.', array('@url' => 'http://www.php.net/manual/en/ref.image.php')); + $requirements['gd']['description'] = t('The GD library for PHP is enabled, but was compiled without PNG support. Please check the PHP image documentation for information on how to correct this.', array('@url' => 'http://www.php.net/manual/ref.image.php')); } } else { $requirements['gd'] = array( 'value' => t('Not installed'), 'severity' => REQUIREMENT_ERROR, - 'description' => t('The GD library for PHP is missing or outdated. Please check the PHP image documentation for information on how to correct this.', array('@url' => 'http://www.php.net/manual/en/ref.image.php')), + 'description' => t('The GD library for PHP is missing or outdated. Please check the PHP image documentation for information on how to correct this.', array('@url' => 'http://www.php.net/manual/ref.image.php')), ); } $requirements['gd']['title'] = t('GD library'); Index: modules/color/color.module =================================================================== RCS file: /cvs/drupal/drupal/modules/color/color.module,v retrieving revision 1.42 diff -u -r1.42 color.module --- modules/color/color.module 16 Jul 2008 21:59:26 -0000 1.42 +++ modules/color/color.module 30 Aug 2008 14:00:04 -0000 @@ -264,7 +264,7 @@ $usage = memory_get_usage(); $limit = parse_size(ini_get('memory_limit')); if ($usage + $required > $limit) { - drupal_set_message(t('There is not enough memory available to PHP to change this theme\'s color scheme. You need at least %size more. Check the PHP documentation for more information.', array('%size' => format_size($usage + $required - $limit), '@url' => 'http://www.php.net/manual/en/ini.core.php#ini.sect.resource-limits')), 'error'); + drupal_set_message(t('There is not enough memory available to PHP to change this theme\'s color scheme. You need at least %size more. Check the PHP documentation for more information.', array('%size' => format_size($usage + $required - $limit), '@url' => 'http://www.php.net/manual/ini.core.php#ini.sect.resource-limits')), 'error'); return; } } Index: modules/syslog/syslog.module =================================================================== RCS file: /cvs/drupal/drupal/modules/syslog/syslog.module,v retrieving revision 1.17 diff -u -r1.17 syslog.module --- modules/syslog/syslog.module 24 Jul 2008 06:52:35 -0000 1.17 +++ modules/syslog/syslog.module 30 Aug 2008 14:00:05 -0000 @@ -20,7 +20,7 @@ switch ($path) { case 'admin/help#syslog': $output = '

' . t("The syslog module enables Drupal to send messages to the operating system's logging facility.") . '

'; - $output .= '

' . t('Syslog is an operating system administrative logging tool, and provides valuable information for use in system management and security auditing. Most suited to medium and large sites, syslog provides filtering tools that allow messages to be routed by type and severity. On UNIX/Linux systems, the file /etc/syslog.conf defines this routing configuration; on Microsoft Windows, all messages are sent to the Event Log. For more information on syslog facilities, severity levels, and how to set up a syslog.conf file, see UNIX/Linux syslog.conf and PHP\'s openlog and syslog functions.', array('@syslog_conf' => url('http://www.rt.com/man/syslog.5.html'), '@php_openlog' => url('http://www.php.net/manual/en/function.openlog.php'), '@php_syslog' => url('http://www.php.net/manual/en/function.syslog.php'))) . '

'; + $output .= '

' . t('Syslog is an operating system administrative logging tool, and provides valuable information for use in system management and security auditing. Most suited to medium and large sites, syslog provides filtering tools that allow messages to be routed by type and severity. On UNIX/Linux systems, the file /etc/syslog.conf defines this routing configuration; on Microsoft Windows, all messages are sent to the Event Log. For more information on syslog facilities, severity levels, and how to set up a syslog.conf file, see UNIX/Linux syslog.conf and PHP\'s openlog and syslog functions.', array('@syslog_conf' => url('http://www.rt.com/man/syslog.5.html'), '@php_openlog' => url('http://www.php.net/manual/function.openlog.php'), '@php_syslog' => url('http://www.php.net/manual/function.syslog.php'))) . '

'; $output .= '

' . t('For more information, see the online handbook entry for Syslog module.', array('@syslog' => 'http://drupal.org/handbook/modules/syslog')) . '

'; return $output; } Index: sites/default/default.settings.php =================================================================== RCS file: /cvs/drupal/drupal/sites/default/default.settings.php,v retrieving revision 1.14 diff -u -r1.14 default.settings.php --- sites/default/default.settings.php 21 Aug 2008 19:36:39 -0000 1.14 +++ sites/default/default.settings.php 30 Aug 2008 14:00:05 -0000 @@ -200,7 +200,7 @@ * * To see what PHP settings are possible, including whether they can * be set at runtime (ie., when ini_set() occurs), read the PHP - * documentation at http://www.php.net/manual/en/ini.php#ini.list + * documentation at http://www.php.net/manual/ini.php#ini.list * and take a look at the .htaccess file to see which non-runtime * settings are used there. Settings defined here should not be * duplicated there so as to avoid conflict issues.