summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--modules/system/system.admin.inc9
-rw-r--r--modules/system/system.module2
2 files changed, 5 insertions, 6 deletions
diff --git a/modules/system/system.admin.inc b/modules/system/system.admin.inc
index c99cff5e2..a53ece88d 100644
--- a/modules/system/system.admin.inc
+++ b/modules/system/system.admin.inc
@@ -1274,14 +1274,13 @@ function system_site_information_settings_validate($form, &$form_state) {
function system_logging_settings() {
$form['error_level'] = array(
'#type' => 'radios',
- '#title' => t('Error reporting'),
+ '#title' => t('Display PHP messages'),
'#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('Errors and warnings'),
+ 2 => t('All messages'),
),
- '#description' => t('Display settings for error messages. Note that all error messages are always logged.'),
);
return system_settings_form($form);
diff --git a/modules/system/system.module b/modules/system/system.module
index 5a1297c1f..62d99c1ad 100644
--- a/modules/system/system.module
+++ b/modules/system/system.module
@@ -646,7 +646,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'),