Index: modules/filter/filter.admin.inc =================================================================== RCS file: /cvs/drupal/drupal/modules/filter/filter.admin.inc,v retrieving revision 1.25 diff -u -r1.25 filter.admin.inc --- modules/filter/filter.admin.inc 8 Mar 2009 21:25:18 -0000 1.25 +++ modules/filter/filter.admin.inc 21 Mar 2009 06:44:52 -0000 @@ -32,8 +32,8 @@ $options[$id] = ''; $form[$id]['name'] = array('#markup' => $format->name); $form[$id]['roles'] = array('#markup' => $default ? t('All roles may use the default format') : ($roles ? implode(', ', $roles) : t('No roles may use this format'))); - $form[$id]['configure'] = array('#markup' => l(t('configure'), 'admin/settings/filter/' . $id)); - $form[$id]['delete'] = array('#markup' => $default ? '' : l(t('delete'), 'admin/settings/filter/delete/' . $id)); + $form[$id]['configure'] = array('#markup' => l(t('configure'), 'admin/settings/text-formats/' . $id)); + $form[$id]['delete'] = array('#markup' => $default ? '' : l(t('delete'), 'admin/settings/text-formats/delete/' . $id)); $form[$id]['weight'] = array('#type' => 'weight', '#default_value' => $format->weight); } $form['default'] = array('#type' => 'radios', '#options' => $options, '#default_value' => variable_get('filter_default_format', 1)); @@ -244,7 +244,7 @@ cache_clear_all($format . ':', 'cache_filter', TRUE); // If a new filter was added, return to the main list of filters. Otherwise, stay on edit filter page to show new changes. - $return = 'admin/settings/filter'; + $return = 'admin/settings/text-formats'; if (!empty($new)) { $return .= '/' . $format; } @@ -267,11 +267,11 @@ $form['format'] = array('#type' => 'hidden', '#value' => $format->format); $form['name'] = array('#type' => 'hidden', '#value' => $format->name); - return confirm_form($form, t('Are you sure you want to delete the text format %format?', array('%format' => $format->name)), 'admin/settings/filter', t('If you have any content left in this text format, it will be switched to the default text format. This action cannot be undone.'), t('Delete'), t('Cancel')); + return confirm_form($form, t('Are you sure you want to delete the text format %format?', array('%format' => $format->name)), 'admin/settings/text-formats', t('If you have any content left in this text format, it will be switched to the default text format. This action cannot be undone.'), t('Delete'), t('Cancel')); } else { drupal_set_message(t('The default format cannot be deleted.')); - drupal_goto('admin/settings/filter'); + drupal_goto('admin/settings/text-formats'); } } else { @@ -295,7 +295,7 @@ cache_clear_all($form_state['values']['format'] . ':', 'cache_filter', TRUE); drupal_set_message(t('Deleted text format %format.', array('%format' => $form_state['values']['name']))); - $form_state['redirect'] = 'admin/settings/filter'; + $form_state['redirect'] = 'admin/settings/text-formats'; return; } Index: modules/filter/filter.test =================================================================== RCS file: /cvs/drupal/drupal/modules/filter/filter.test,v retrieving revision 1.16 diff -u -r1.16 filter.test --- modules/filter/filter.test 15 Mar 2009 01:53:16 -0000 1.16 +++ modules/filter/filter.test 21 Mar 2009 06:44:52 -0000 @@ -28,15 +28,15 @@ // Change default filter. $edit = array(); $edit['default'] = $full; - $this->drupalPost('admin/settings/filter', $edit, t('Save changes')); + $this->drupalPost('admin/settings/text-formats', $edit, t('Save changes')); $this->assertText(t('Default format updated.'), t('Default filter updated successfully.')); - $this->assertNoRaw('admin/settings/filter/delete/' . $full, t('Delete link not found.')); + $this->assertNoRaw('admin/settings/text-formats/delete/' . $full, t('Delete link not found.')); // Add an additional tag. $edit = array(); $edit['allowed_html_1'] = ' '; $output .= '

' . t('Working with translation-enabled content types:') . '

'; $output .= '
  • ' . t('Use the Language drop down to select the appropriate language when creating or editing posts.') . '
    • '; $output .= '
  • ' . t('Provide new or edit current translations for existing posts via the Translation tab. Only visible while viewing a post as a user with the translate content permission, this tab allows translations to be added or edited using a specialized editing form that also displays the content being translated.') . '
    • '; $output .= '
  • ' . t('Update translations as needed, so that they accurately reflect changes in the content of the original post. The translation status flag provides a simple method for tracking outdated translations. After editing a post, for example, select the Flag translations as outdated check box to mark all of its translations as outdated and in need of revision. Individual translations may be marked for revision by selecting the This translation needs to be updated check box on the translation editing form.') . '
    • '; - $output .= '
  • ' . t('The Content management administration page displays the language of each post, and also allows filtering by language or translation status.', array('@content-node' => url('admin/content/node'))) . '
'; - $output .= '

' . t('Use the language switcher block provided by locale module to allow users to select a language. If available, both the site interface and site content are presented in the language selected.', array('@blocks' => url('admin/build/block'))) . '

'; + $output .= '
  • ' . t('The Content management administration page displays the language of each post, and also allows filtering by language or translation status.', array('@content-node' => url('admin/content/content'))) . '
    • '; + $output .= '

    ' . t('Use the language switcher block provided by locale module to allow users to select a language. If available, both the site interface and site content are presented in the language selected.', array('@blocks' => url('admin/build/blocks'))) . '

    '; $output .= '

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

    '; return $output; case 'node/%/translate': - $output = '

    ' . t('Translations of a piece of content are managed with translation sets. Each translation set has one source post and any number of translations in any of the enabled languages. All translations are tracked to be up to date or outdated based on whether the source post was modified significantly.', array('!languages' => url('admin/settings/language'))) . '

    '; + $output = '

    ' . t('Translations of a piece of content are managed with translation sets. Each translation set has one source post and any number of translations in any of the enabled languages. All translations are tracked to be up to date or outdated based on whether the source post was modified significantly.', array('!languages' => url('admin/settings/languages'))) . '

    '; return $output; } } @@ -100,7 +100,7 @@ // Add translation option to content type form. $form['workflow']['language_content_type']['#options'][TRANSLATION_ENABLED] = t('Enabled, with translation'); // Description based on text from locale.module. - $form['workflow']['language_content_type']['#description'] = t('Enable multilingual support for this content type. If enabled, a language selection field will be added to the editing form, allowing you to select from one of the enabled languages. You can also turn on translation for this content type, which lets you have content translated to any of the enabled languages. If disabled, new posts are saved with the default language. Existing content will not be affected by changing this option.', array('!languages' => url('admin/settings/language'))); + $form['workflow']['language_content_type']['#description'] = t('Enable multilingual support for this content type. If enabled, a language selection field will be added to the editing form, allowing you to select from one of the enabled languages. You can also turn on translation for this content type, which lets you have content translated to any of the enabled languages. If disabled, new posts are saved with the default language. Existing content will not be affected by changing this option.', array('!languages' => url('admin/settings/languages'))); } /** Index: modules/contact/contact.module =================================================================== RCS file: /cvs/drupal/drupal/modules/contact/contact.module,v retrieving revision 1.112 diff -u -r1.112 contact.module --- modules/contact/contact.module 8 Mar 2009 05:08:22 -0000 1.112 +++ modules/contact/contact.module 21 Mar 2009 06:44:52 -0000 @@ -16,18 +16,18 @@ $output .= '

    ' . t("Personal contact forms allow users to be contacted via e-mail, while keeping recipient e-mail addresses private. Users may enable or disable their personal contact forms by editing their My account page. If enabled, a Contact tab leading to their personal contact form is available on their user profile. Site administrators have access to all personal contact forms (even if they have been disabled). The Contact tab is only visible when viewing another user's profile (users do not see their own Contact tab).") . '

    '; $output .= '

    ' . t('The contact page provides a simple form for visitors to leave comments, feedback, or other requests. Messages are routed by selecting a category from a list of administrator-defined options; each category has its own set of e-mail recipients. Common categories for a business site include, for example, "Website feedback" (messages are forwarded to web site administrators) and "Product information" (messages are forwarded to members of the sales department). The actual e-mail addresses defined within a category are not displayed. Only users in roles with the access site-wide contact form permission may access the contact page.', array('@contact' => url('contact'))) . '

    '; $output .= '

    ' . t('A link to your site\'s contact page from the main Navigation menu is created, but is disabled by default. Create a similar link on another menu by adding a menu item pointing to the path "contact"', array('@contact' => url('contact'))) . '

    '; - $output .= '

    ' . t('Customize the contact page with additional information (like physical location, mailing address, and telephone number) using the contact form settings page. The settings page also provides configuration options for the maximum number of contact form submissions a user may perform per hour, and the default status of users\' personal contact forms.', array('@contact-settings' => url('admin/build/contact/settings'), '@contact' => url('contact'))) . '

    '; + $output .= '

    ' . t('Customize the contact page with additional information (like physical location, mailing address, and telephone number) using the contact form settings page. The settings page also provides configuration options for the maximum number of contact form submissions a user may perform per hour, and the default status of users\' personal contact forms.', array('@contact-settings' => url('admin/build/contact-form/settings'), '@contact' => url('contact'))) . '

    '; $output .= '

    ' . t('For more information, see the online handbook entry for Contact module.', array('@contact' => url('http://drupal.org/handbook/modules/contact/', array('absolute' => TRUE)))) . '

    '; return $output; - case 'admin/build/contact': - $output = '

    ' . t('This page lets you set up your site-wide contact form. To do so, add one or more categories. You can associate different recipients with each category to route e-mails to different people. For example, you can route website feedback to the webmaster and direct product information requests to the sales department. On the settings page, you can customize the information shown above the contact form. This can be useful to provide additional contact information such as your postal address and telephone number.', array('@settings' => url('admin/build/contact/settings'), '@form' => url('contact'))) . '

    '; + case 'admin/build/contact-form': + $output = '

    ' . t('This page lets you set up your site-wide contact form. To do so, add one or more categories. You can associate different recipients with each category to route e-mails to different people. For example, you can route website feedback to the webmaster and direct product information requests to the sales department. On the settings page, you can customize the information shown above the contact form. This can be useful to provide additional contact information such as your postal address and telephone number.', array('@settings' => url('admin/build/contact-form/settings'), '@form' => url('contact'))) . '

    '; if (!module_exists('menu')) { $menu_note = t('The menu item can be customized and configured only once the menu module has been enabled.', array('@modules-page' => url('admin/settings/modules'))); } else { $menu_note = ''; } - $output .= '

    ' . t('The contact module also adds a menu item (disabled by default) to the navigation block.', array('@menu-settings' => url('admin/build/menu'))) . ' ' . $menu_note . '

    '; + $output .= '

    ' . t('The contact module also adds a menu item (disabled by default) to the navigation block.', array('@menu-settings' => url('admin/build/menus'))) . ' ' . $menu_note . '

    '; return $output; } } @@ -52,18 +52,18 @@ * Implementation of hook_menu(). */ function contact_menu() { - $items['admin/build/contact'] = array( + $items['admin/build/contact-form'] = array( 'title' => 'Contact form', 'description' => 'Create a system contact form and set up categories for the form to use.', 'page callback' => 'contact_admin_categories', 'access arguments' => array('administer site-wide contact form'), ); - $items['admin/build/contact/list'] = array( + $items['admin/build/contact-form/list'] = array( 'title' => 'List', 'page callback' => 'contact_admin_categories', 'type' => MENU_DEFAULT_LOCAL_TASK, ); - $items['admin/build/contact/add'] = array( + $items['admin/build/contact-form/add'] = array( 'title' => 'Add category', 'page callback' => 'drupal_get_form', 'page arguments' => array('contact_admin_edit', 3), @@ -71,21 +71,21 @@ 'type' => MENU_LOCAL_TASK, 'weight' => 1, ); - $items['admin/build/contact/edit/%contact'] = array( + $items['admin/build/contact-form/edit/%contact'] = array( 'title' => 'Edit contact category', 'page callback' => 'drupal_get_form', 'page arguments' => array('contact_admin_edit', 3, 4), 'access arguments' => array('administer site-wide contact form'), 'type' => MENU_CALLBACK, ); - $items['admin/build/contact/delete/%contact'] = array( + $items['admin/build/contact-form/delete/%contact'] = array( 'title' => 'Delete contact', 'page callback' => 'drupal_get_form', 'page arguments' => array('contact_admin_delete', 4), 'access arguments' => array('administer site-wide contact form'), 'type' => MENU_CALLBACK, ); - $items['admin/build/contact/settings'] = array( + $items['admin/build/contact-form/settings'] = array( 'title' => 'Settings', 'page callback' => 'drupal_get_form', 'page arguments' => array('contact_admin_settings'), Index: modules/contact/contact.test =================================================================== RCS file: /cvs/drupal/drupal/modules/contact/contact.test,v retrieving revision 1.15 diff -u -r1.15 contact.test --- modules/contact/contact.test 8 Mar 2009 05:08:22 -0000 1.15 +++ modules/contact/contact.test 21 Mar 2009 06:44:52 -0000 @@ -31,7 +31,7 @@ $edit['contact_form_information'] = $contact_form_information; $edit['contact_hourly_threshold'] = 3; $edit['contact_default_status'] = TRUE; - $this->drupalPost('admin/build/contact/settings', $edit, t('Save configuration')); + $this->drupalPost('admin/build/contact-form/settings', $edit, t('Save configuration')); $this->assertText(t('The configuration options have been saved.'), t('Setting successfully saved.')); // Delete old categories to ensure that new categories are used. @@ -165,7 +165,7 @@ $edit['recipients'] = $recipients; $edit['reply'] = $reply; $edit['selected'] = ($selected ? '1' : '0'); - $this->drupalPost('admin/build/contact/add', $edit, t('Save')); + $this->drupalPost('admin/build/contact-form/add', $edit, t('Save')); } /** @@ -183,7 +183,7 @@ $edit['recipients'] = $recipients; $edit['reply'] = $reply; $edit['selected'] = ($selected ? '1' : '0'); - $this->drupalPost('admin/build/contact/edit/' . $category_id, $edit, t('Save')); + $this->drupalPost('admin/build/contact-form/edit/' . $category_id, $edit, t('Save')); return($category_id); } @@ -213,7 +213,7 @@ $categories = $this->getCategories(); foreach ($categories as $category) { $category_name = db_query("SELECT category FROM {contact} WHERE cid = :cid", array(':cid' => $category))->fetchField(); - $this->drupalPost('admin/build/contact/delete/' . $category, array(), t('Delete')); + $this->drupalPost('admin/build/contact-form/delete/' . $category, array(), t('Delete')); $this->assertRaw(t('Category %category has been deleted.', array('%category' => $category_name)), t('Category deleted sucessfully.')); } } @@ -280,7 +280,7 @@ $edit = array(); $edit['contact_default_status'] = TRUE; $edit['contact_hourly_threshold'] = $flood_control; - $this->drupalPost('admin/build/contact/settings', $edit, t('Save configuration')); + $this->drupalPost('admin/build/contact-form/settings', $edit, t('Save configuration')); $this->assertText(t('The configuration options have been saved.'), t('Setting successfully saved.')); // Reload variables. @@ -324,7 +324,7 @@ // Disable the personal contact form. $edit = array(); $edit['contact_default_status'] = FALSE; - $this->drupalPost('admin/build/contact/settings', $edit, t('Save configuration')); + $this->drupalPost('admin/build/contact-form/settings', $edit, t('Save configuration')); $this->assertText(t('The configuration options have been saved.'), t('Setting successfully saved.')); // Reload variables. Index: modules/contact/contact.pages.inc =================================================================== RCS file: /cvs/drupal/drupal/modules/contact/contact.pages.inc,v retrieving revision 1.16 diff -u -r1.16 contact.pages.inc --- modules/contact/contact.pages.inc 8 Mar 2009 05:08:22 -0000 1.16 +++ modules/contact/contact.pages.inc 21 Mar 2009 06:44:52 -0000 @@ -101,7 +101,7 @@ ); } else { - drupal_set_message(t('The contact form has not been configured. Add one or more categories to the form.', array('@add' => url('admin/build/contact/add'))), 'error'); + drupal_set_message(t('The contact form has not been configured. Add one or more categories to the form.', array('@add' => url('admin/build/contact-form/add'))), 'error'); } return $form; } Index: modules/contact/contact.admin.inc =================================================================== RCS file: /cvs/drupal/drupal/modules/contact/contact.admin.inc,v retrieving revision 1.8 diff -u -r1.8 contact.admin.inc --- modules/contact/contact.admin.inc 8 Mar 2009 05:08:22 -0000 1.8 +++ modules/contact/contact.admin.inc 21 Mar 2009 06:44:52 -0000 @@ -23,8 +23,8 @@ $record->category, $record->recipients, ($record->selected ? t('Yes') : t('No')), - l(t('edit'), 'admin/build/contact/edit/' . $record->cid), - l(t('delete'), 'admin/build/contact/delete/' . $record->cid), + l(t('edit'), 'admin/build/contact-form/edit/' . $record->cid), + l(t('delete'), 'admin/build/contact-form/delete/' . $record->cid), ); } @@ -122,16 +122,16 @@ if (empty($form_state['values']['cid']) || $form_state['values']['contact_op'] == 'add') { drupal_write_record('contact', $form_state['values']); drupal_set_message(t('Category %category has been added.', array('%category' => $form_state['values']['category']))); - watchdog('mail', 'Contact form: category %category added.', array('%category' => $form_state['values']['category']), WATCHDOG_NOTICE, l(t('view'), 'admin/build/contact')); + watchdog('mail', 'Contact form: category %category added.', array('%category' => $form_state['values']['category']), WATCHDOG_NOTICE, l(t('view'), 'admin/build/contact-form')); } else { drupal_write_record('contact', $form_state['values'], 'cid'); drupal_set_message(t('Category %category has been updated.', array('%category' => $form_state['values']['category']))); - watchdog('mail', 'Contact form: category %category updated.', array('%category' => $form_state['values']['category']), WATCHDOG_NOTICE, l(t('view'), 'admin/build/contact')); + watchdog('mail', 'Contact form: category %category updated.', array('%category' => $form_state['values']['category']), WATCHDOG_NOTICE, l(t('view'), 'admin/build/contact-form')); } - $form_state['redirect'] = 'admin/build/contact'; + $form_state['redirect'] = 'admin/build/contact-form'; return; } @@ -145,7 +145,7 @@ '#value' => $contact, ); - return confirm_form($form, t('Are you sure you want to delete %category?', array('%category' => $contact['category'])), 'admin/build/contact', t('This action cannot be undone.'), t('Delete'), t('Cancel')); + return confirm_form($form, t('Are you sure you want to delete %category?', array('%category' => $contact['category'])), 'admin/build/contact-form', t('This action cannot be undone.'), t('Delete'), t('Cancel')); } /** @@ -159,7 +159,7 @@ drupal_set_message(t('Category %category has been deleted.', array('%category' => $contact['category']))); watchdog('mail', 'Contact form: category %category deleted.', array('%category' => $contact['category']), WATCHDOG_NOTICE); - $form_state['redirect'] = 'admin/build/contact'; + $form_state['redirect'] = 'admin/build/contact-form'; return; } Index: update.php =================================================================== RCS file: /cvs/drupal/drupal/update.php,v retrieving revision 1.279 diff -u -r1.279 update.php --- update.php 9 Mar 2009 20:58:19 -0000 1.279 +++ update.php 21 Mar 2009 06:44:51 -0000 @@ -352,7 +352,7 @@ update_task_list(); // Report end result if (module_exists('dblog')) { - $log_message = ' All errors have been logged.'; + $log_message = ' All errors have been logged.'; } else { $log_message = ' All errors have been logged.'; @@ -424,7 +424,7 @@ $output .= "
      \n"; $output .= "
    1. Back up your database. This process will change your database values and in case of emergency you may need to revert to a backup.
      2. \n"; $output .= "
    2. Back up your code. Hint: when backing up module code, do not leave that backup in the 'modules' or 'sites/*/modules' directories as this may confuse Drupal's auto-discovery mechanism.
      3. \n"; - $output .= '
    3. Put your site into maintenance mode.
      4. ' . "\n"; + $output .= '
    4. Put your site into maintenance mode.
      5. ' . "\n"; $output .= "
    5. Install your new files in the appropriate location, as described in the handbook.
      6. \n"; $output .= "
    \n"; $output .= "

    When you have performed the steps above, you may proceed.

    \n"; Index: UPGRADE.txt =================================================================== RCS file: /cvs/drupal/drupal/UPGRADE.txt,v retrieving revision 1.13 diff -u -r1.13 UPGRADE.txt --- UPGRADE.txt 1 Jul 2008 20:36:39 -0000 1.13 +++ UPGRADE.txt 21 Mar 2009 06:44:51 -0000 @@ -43,7 +43,7 @@ 3. Place the site in "Offline" mode, to let the database updates run without interruption and avoid displaying errors to end users of the site. This - option is at http://www.example.com/?q=admin/settings/site-maintenance + option is at http://www.example.com/?q=admin/settings/maintenance (replace www.example.com with your installation's domain name and path). 4. If using a custom or contributed theme, switch @@ -103,7 +103,7 @@ 14. Finally, return your site to "Online" mode so your visitors may resume browsing. As in step #3, this option is available in your administration - screens at http://www.example.com/?q=admin/settings/site-maintenance + screens at http://www.example.com/?q=admin/settings/maintenance (replace www.example.com with your installation's domain name and path). For more information on upgrading visit Index: themes/garland/page.tpl.php =================================================================== RCS file: /cvs/drupal/drupal/themes/garland/page.tpl.php,v retrieving revision 1.24 diff -u -r1.24 page.tpl.php --- themes/garland/page.tpl.php 18 Feb 2009 14:28:25 -0000 1.24 +++ themes/garland/page.tpl.php 21 Mar 2009 06:44:52 -0000 @@ -23,7 +23,7 @@