? .DS_Store
? rewrite_permission_descriptions_00.patch
? rewrite_theme_pages_00.patch
? rewrite_theme_pages_01.patch
? modules/.DS_Store
? sites/.DS_Store
? sites/default/files
? sites/default/modules
? sites/default/private
? sites/default/settings.php
Index: modules/system/system.admin.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/system/system.admin.inc,v
retrieving revision 1.216
diff -u -p -r1.216 system.admin.inc
--- modules/system/system.admin.inc	19 Oct 2009 23:28:40 -0000	1.216
+++ modules/system/system.admin.inc	2 Nov 2009 09:59:15 -0000
@@ -287,7 +287,7 @@ function system_themes_form() {
     '#type' => 'select',
     '#options' => array(0 => t('Default theme')) + $options,
     '#title' => t('Administration theme'),
-    '#description' => t('Choose "Default theme" to always use the same theme as the rest of the site.'),
+    '#description' => t('Choose <em>Default theme</em> to always use the same theme as the rest of the site.'),
     '#default_value' => variable_get('admin_theme', 0),
   );
   $form['admin_theme']['node_admin_theme'] = array(
@@ -456,8 +456,7 @@ function system_theme_settings($form, &$
 
   $form['theme_settings'] = array(
     '#type' => 'fieldset',
-    '#title' => t('Toggle display'),
-    '#description' => t('Enable or disable the display of certain page elements.'),
+    '#title' => t('Display page elements'),
   );
   foreach ($toggles as $name => $title) {
     if ((!$key) || in_array($name, $features)) {
@@ -479,16 +478,13 @@ function system_theme_settings($form, &$
   if ((!$key) || in_array('logo', $features)) {
     $form['logo'] = array(
       '#type' => 'fieldset',
-      '#title' => t('Logo image settings'),
-      '#description' => t('If toggled on, the following logo will be displayed.'),
-      '#attributes' => array('class' => array('theme-settings-bottom')),
+      '#title' => t('Logo'),
     );
     $form['logo']['default_logo'] = array(
       '#type' => 'checkbox',
-      '#title' => t('Use the default logo'),
+      '#title' => t('Use the default logo.'),
       '#default_value' => theme_get_setting('default_logo', $key),
       '#tree' => FALSE,
-      '#description' => t('Check here if you want the theme to use the logo supplied with it.')
     );
     $form['logo']['settings'] = array(
       '#type' => 'container',
@@ -516,14 +512,13 @@ function system_theme_settings($form, &$
   if ((!$key) || in_array('favicon', $features)) {
     $form['favicon'] = array(
       '#type' => 'fieldset',
-      '#title' => t('Shortcut icon settings'),
+      '#title' => t('Shortcut icon'),
       '#description' => t("Your shortcut icon, or 'favicon', is displayed in the address bar and bookmarks of most browsers."),
     );
     $form['favicon']['default_favicon'] = array(
       '#type' => 'checkbox',
       '#title' => t('Use the default shortcut icon.'),
       '#default_value' => theme_get_setting('default_favicon', $key),
-      '#description' => t('Check here if you want the theme to use the default shortcut icon.')
     );
     $form['favicon']['settings'] = array(
       '#type' => 'container',
Index: modules/system/system.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/system/system.module,v
retrieving revision 1.832
diff -u -p -r1.832 system.module
--- modules/system/system.module	2 Nov 2009 03:27:20 -0000	1.832
+++ modules/system/system.module	2 Nov 2009 09:59:16 -0000
@@ -77,14 +77,10 @@ function system_help($path, $arg) {
     case 'admin/by-module':
       return '<p>' . t('This page shows you all available administration tasks for each module.') . '</p>';
     case 'admin/appearance':
-      $output = '<p>' . t('Set and configure the default theme for your website.  Alternative <a href="@themes">themes</a> are available.', array('@themes' => 'http://drupal.org/project/themes')) . '</p>';
+      $output = '<p>' . t('Select the themes to use for this website. You can <a href="!settings">configure</a> site-wide display settings or configure themes individually. Note that different themes have different regions available for displaying data.', array('!settings' => url('admin/appearance/settings'))) . '</p>';
       return $output;
-    case 'admin/appearance/settings/' . $arg[3]:
-      $reference = explode('.', $arg[3], 2);
-      $theme = array_pop($reference);
-      return '<p>' . t('These options control the display settings for the <code>%template</code> theme. When your site is displayed using this theme, these settings will be used. By clicking "Reset to defaults," you can choose to use the <a href="@global">global settings</a> for this theme.', array('%template' => $theme, '@global' => url('admin/appearance/settings'))) . '</p>';
     case 'admin/appearance/settings':
-      return '<p>' . t('These options control the default display settings for your entire site, across all themes. Unless they have been overridden by a specific theme, these settings will be used.') . '</p>';
+      return '<p>' . t('These global settings are applied to all themes on your site, unless specific themes override them.') . '</p>';
     case 'admin/config/modules':
       $output = '<p>' . t('Modules are plugins that extend Drupal\'s core functionality. To further extend your site\'s functionality, a number of <a href="@modules">contributed modules</a> are available for download.', array('@permissions' => url('admin/config/people/permissions'), '@modules' => 'http://drupal.org/project/modules')) . '</p>';
       $output .= '<p>' . t('Module-related tasks can be located on the <a href="@by-module">administration by module page</a>. New <a href="@permissions">module-related permissions</a> may also become available as new modules are enabled.', array('@by-module' => url('admin/by-module'), '@permissions' => url('admin/config/people/permissions'))) . '</p>';