? .DS_Store
? .swp
? logging_errors_cleanup_00.patch
? modules/.DS_Store
? sites/.DS_Store
? sites/default/files
? sites/default/settings.php
Index: modules/system/system.admin.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/system/system.admin.inc,v
retrieving revision 1.129
diff -u -p -r1.129 system.admin.inc
--- modules/system/system.admin.inc	26 Feb 2009 07:30:28 -0000	1.129
+++ modules/system/system.admin.inc	7 Mar 2009 18:00:07 -0000
@@ -1277,11 +1277,10 @@ function system_logging_settings() {
     '#title' => t('Error reporting'),
     '#default_value' => 2,
     '#options' => array(
-      0 => t('Site in production: do not display any errors.'),
-      1 => t('Site in development: display functional errors only.'),
-      2 => t('For developers: display all errors.'),
+      0 => t('None'),
+      1 => t('Functional errors only'),
+      2 => t('All errors'),
     ),
-    '#description' => t('Display settings for error messages. Note that all error messages are always logged.'),
   );
 
   return system_settings_form($form);
Index: modules/system/system.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/system/system.module,v
retrieving revision 1.668
diff -u -p -r1.668 system.module
--- modules/system/system.module	22 Feb 2009 17:55:30 -0000	1.668
+++ modules/system/system.module	7 Mar 2009 18:00:07 -0000
@@ -637,7 +637,7 @@ function system_menu() {
     'access arguments' => array('administer site configuration'),
   );
   $items['admin/settings/logging'] = array(
-    'title' => 'Logging, errors and alerts',
+    'title' => 'Logging and errors',
     'description' => "Settings for logging and alerts modules. Various modules can route Drupal's system events to different destinations, such as syslog, database, email, etc.",
     'page callback' => 'drupal_get_form',
     'page arguments' => array('system_logging_settings'),
