Index: includes/theme.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/theme.inc,v
retrieving revision 1.499
diff -u -p -r1.499 theme.inc
--- includes/theme.inc	15 Jul 2009 17:40:17 -0000	1.499
+++ includes/theme.inc	23 Jul 2009 02:52:05 -0000
@@ -1047,7 +1047,7 @@ function theme_get_settings($key = NULL)
     'toggle_favicon'                   =>  1,
     'toggle_name'                      =>  1,
     'toggle_search'                    =>  0,
-    'toggle_slogan'                    =>  0,
+    'toggle_slogan'                    =>  1,
     'toggle_node_user_picture'         =>  0,
     'toggle_comment_user_picture'      =>  0,
     'toggle_comment_user_verification' =>  1,
Index: modules/system/system.admin.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/system/system.admin.inc,v
retrieving revision 1.163
diff -u -p -r1.163 system.admin.inc
--- modules/system/system.admin.inc	20 Jul 2009 18:51:34 -0000	1.163
+++ modules/system/system.admin.inc	23 Jul 2009 02:52:12 -0000
@@ -1180,6 +1180,11 @@ function system_site_information_setting
     '#default_value' => 'Drupal',
     '#required' => TRUE
   );
+  $form['site_slogan'] = array(
+    '#type' => 'textfield',
+    '#title' => t('Site slogan'),
+    '#default_value' => '',
+  );
   $form['site_mail'] = array(
     '#type' => 'textfield',
     '#title' => t('E-mail address'),
@@ -1187,11 +1192,6 @@ function system_site_information_setting
     '#description' => t("The <em>From</em> address in automated e-mails sent during registration and new password requests, and other notifications. (Use an address ending in your site's domain to help prevent this e-mail being flagged as spam.)"),
     '#required' => TRUE,
   );
-  $form['site_slogan'] = array(
-    '#type' => 'textfield',
-    '#title' => t('Slogan'),
-    '#default_value' => '',
-  );
   $form['site_frontpage'] = array(
     '#type' => 'textfield',
     '#title' => t('Default front page'),
@@ -1205,7 +1205,7 @@ function system_site_information_setting
     '#type' => 'select', '#title' => t('Number of posts on front page'),
     '#default_value' => 10,
     '#options' => drupal_map_assoc(array(1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 15, 20, 25, 30)),
-    '#description' => t('The maximum number of posts displayed on overview pages like the frontpage.')
+    '#description' => t('The maximum number of posts displayed on overview pages like the front page.')
   );
   $form['site_403'] = array(
     '#type' => 'textfield',