Index: modules/field/modules/text/text.test
===================================================================
RCS file: /cvs/drupal/drupal/modules/field/modules/text/text.test,v
retrieving revision 1.14
diff -u -p -r1.14 text.test
--- modules/field/modules/text/text.test	16 Oct 2009 03:47:14 -0000	1.14
+++ modules/field/modules/text/text.test	20 Oct 2009 02:54:47 -0000
@@ -157,7 +157,7 @@ class TextFieldTestCase extends DrupalWe
     $this->drupalLogin($this->admin_user);
     foreach (filter_formats() as $format) {
       if ($format->format != filter_fallback_format()) {
-        $this->drupalPost('admin/config/content/formats/' . $format->format . '/delete', array(), t('Delete'));
+        $this->drupalPost('admin/config/content/formats/manage/' . $format->format . '/delete', array(), t('Delete'));
       }
     }
     $this->drupalLogin($this->web_user);
Index: modules/filter/filter.admin.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/filter/filter.admin.inc,v
retrieving revision 1.49
diff -u -p -r1.49 filter.admin.inc
--- modules/filter/filter.admin.inc	13 Oct 2009 15:39:41 -0000	1.49
+++ modules/filter/filter.admin.inc	20 Oct 2009 02:46:39 -0000
@@ -32,8 +32,8 @@ function filter_admin_overview($form) {
       $roles_markup = $roles ? implode(', ', $roles) : t('No roles may use this format');
     }
     $form['formats'][$id]['roles'] = array('#markup' => $roles_markup);
-    $form['formats'][$id]['configure'] = array('#markup' => l(t('configure'), 'admin/config/content/formats/' . $id));
-    $form['formats'][$id]['delete'] = array('#markup' => $form['formats'][$id]['#is_fallback'] ? '' : l(t('delete'), 'admin/config/content/formats/' . $id . '/delete'));
+    $form['formats'][$id]['configure'] = array('#markup' => l(t('configure'), 'admin/config/content/formats/manage/' . $id));
+    $form['formats'][$id]['delete'] = array('#markup' => $form['formats'][$id]['#is_fallback'] ? '' : l(t('delete'), 'admin/config/content/formats/manage/' . $id . '/delete'));
     $form['formats'][$id]['weight'] = array('#type' => 'weight', '#default_value' => $format->weight);
   }
   $form['submit'] = array('#type' => 'submit', '#value' => t('Save changes'));
Index: modules/filter/filter.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/filter/filter.module,v
retrieving revision 1.298
diff -u -p -r1.298 filter.module
--- modules/filter/filter.module	16 Oct 2009 19:06:23 -0000	1.298
+++ modules/filter/filter.module	20 Oct 2009 02:48:55 -0000
@@ -21,11 +21,11 @@ function filter_help($path, $arg) {
       $output = '<p>' . t('Use the list below to review the text formats available to each user role and to control the order of formats listed in the <em>Text format</em> fieldset. (The <em>Text format</em> fieldset is displayed below textareas when users with access to more than one text format create multi-line content.) All text formats are available to users in roles with the "administer filters" permission, and the special %fallback format is available to all users. You can configure access to other text formats on the <a href="@url">permissions page</a>.', array('%fallback' => filter_fallback_format_title(), '@url' => url('admin/config/people/permissions', array('fragment' => 'module-filter')))) . '</p>';
       $output .= '<p>' . t('Since text formats, if available, are presented in the same order as the list below, and the default format for each user is the first one on the list for which that user has access, it may be helpful to arrange the formats in descending order of your preference for their use. Remember that your changes will not be saved until you click the <em>Save changes</em> button at the bottom of the page.') . '</p>';
       return $output;
-    case 'admin/config/content/formats/%':
-      return '<p>' . t('Every <em>filter</em> performs one particular change on the user input, for example stripping out malicious HTML or making URLs clickable. Choose which filters you want to apply to text in this format. If you notice some filters are causing conflicts in the output, you can <a href="@rearrange">rearrange them</a>.', array('@rearrange' => url('admin/config/content/formats/' . $arg[4] . '/order'))) . '</p>';
-    case 'admin/config/content/formats/%/configure':
-      return '<p>' . t('If you cannot find the settings for a certain filter, make sure you have enabled it on the <a href="@url">edit tab</a> first.', array('@url' => url('admin/config/content/formats/' . $arg[4]))) . '</p>';
-    case 'admin/config/content/formats/%/order':
+    case 'admin/config/content/formats/manage/%':
+      return '<p>' . t('Every <em>filter</em> performs one particular change on the user input, for example stripping out malicious HTML or making URLs clickable. Choose which filters you want to apply to text in this format. If you notice some filters are causing conflicts in the output, you can <a href="@rearrange">rearrange them</a>.', array('@rearrange' => url('admin/config/content/formats/manage/' . $arg[5] . '/order'))) . '</p>';
+    case 'admin/config/content/formats/manage/%/configure':
+      return '<p>' . t('If you cannot find the settings for a certain filter, make sure you have enabled it on the <a href="@url">edit tab</a> first.', array('@url' => url('admin/config/content/formats/manage/' . $arg[5]))) . '</p>';
+    case 'admin/config/content/formats/manage/%/order':
       $output = '<p>' . t('Because of the flexible filtering system, you might encounter a situation where one filter prevents another from doing its job. For example: a word in an URL gets converted into a glossary term, before the URL can be converted to a clickable link. When this happens, rearrange the order of the filters.') . '</p>';
       $output .= '<p>' . t("Filters are executed from top-to-bottom. To change the order of the filters, modify the values in the <em>Weight</em> column or grab a drag-and-drop handle under the <em>Name</em> column and drag filters to new locations in the list. (Grab a handle by clicking and holding the mouse while hovering over a handle icon.) Remember that your changes will not be saved until you click the <em>Save configuration</em> button at the bottom of the page.") . '</p>';
       return $output;
@@ -89,44 +89,44 @@ function filter_menu() {
     'weight' => 1,
     'file' => 'filter.admin.inc',
   );
-  $items['admin/config/content/formats/%filter_format'] = array(
+  $items['admin/config/content/formats/manage/%filter_format'] = array(
     'type' => MENU_CALLBACK,
     'title callback' => 'filter_admin_format_title',
-    'title arguments' => array(4),
+    'title arguments' => array(5),
     'page callback' => 'filter_admin_format_page',
-    'page arguments' => array(4),
+    'page arguments' => array(5),
     'access arguments' => array('administer filters'),
     'file' => 'filter.admin.inc',
   );
-  $items['admin/config/content/formats/%filter_format/edit'] = array(
+  $items['admin/config/content/formats/manage/%filter_format/edit'] = array(
     'title' => 'Edit',
     'type' => MENU_DEFAULT_LOCAL_TASK,
     'weight' => 0,
   );
-  $items['admin/config/content/formats/%filter_format/configure'] = array(
+  $items['admin/config/content/formats/manage/%filter_format/configure'] = array(
     'title' => 'Configure',
     'page callback' => 'filter_admin_configure_page',
-    'page arguments' => array(4),
+    'page arguments' => array(5),
     'access arguments' => array('administer filters'),
     'type' => MENU_LOCAL_TASK,
     'weight' => 1,
     'file' => 'filter.admin.inc',
   );
-  $items['admin/config/content/formats/%filter_format/order'] = array(
+  $items['admin/config/content/formats/manage/%filter_format/order'] = array(
     'title' => 'Rearrange',
     'page callback' => 'filter_admin_order_page',
-    'page arguments' => array(4),
+    'page arguments' => array(5),
     'access arguments' => array('administer filters'),
     'type' => MENU_LOCAL_TASK,
     'weight' => 2,
     'file' => 'filter.admin.inc',
   );
-  $items['admin/config/content/formats/%filter_format/delete'] = array(
+  $items['admin/config/content/formats/manage/%filter_format/delete'] = array(
     'title' => 'Delete text format',
     'page callback' => 'drupal_get_form',
-    'page arguments' => array('filter_admin_delete', 4),
+    'page arguments' => array('filter_admin_delete', 5),
     'access callback' => '_filter_delete_format_access',
-    'access arguments' => array(4),
+    'access arguments' => array(5),
     'type' => MENU_CALLBACK,
     'file' => 'filter.admin.inc',
   );
@@ -283,7 +283,7 @@ function filter_permission() {
     if (!empty($permission)) {
       // Only link to the text format configuration page if the user who is
       // viewing this will have access to that page.
-      $format_name_replacement = user_access('administer filters') ? l($format->name, 'admin/config/content/formats/' . $format->format) : theme('placeholder', array('text' => $format->name));
+      $format_name_replacement = user_access('administer filters') ? l($format->name, 'admin/config/content/formats/manage/' . $format->format) : theme('placeholder', array('text' => $format->name));
       $perms[$permission] = array(
         'title' => t("Use the %text_format text format", array('%text_format' => $format->name)),
         'description' => t('Use !text_format in forms when entering or editing content. %warning', array('!text_format' => $format_name_replacement, '%warning' => t('Warning: This permission may have security implications depending on how the text format is configured.'))),
Index: modules/filter/filter.test
===================================================================
RCS file: /cvs/drupal/drupal/modules/filter/filter.test,v
retrieving revision 1.46
diff -u -p -r1.46 filter.test
--- modules/filter/filter.test	13 Oct 2009 15:39:41 -0000	1.46
+++ modules/filter/filter.test	20 Oct 2009 02:53:51 -0000
@@ -167,18 +167,18 @@ class FilterAdminTestCase extends Drupal
     // Edit text format.
     $format = $this->getFormat($edit['name']);
     $this->drupalGet('admin/config/content/formats');
-    $this->assertRaw('admin/config/content/formats/' . $format->format);
-    $this->drupalGet('admin/config/content/formats/' . $format->format);
+    $this->assertRaw('admin/config/content/formats/manage/' . $format->format);
+    $this->drupalGet('admin/config/content/formats/manage/' . $format->format);
     $this->drupalPost(NULL, array(), t('Save configuration'));
 
     // Delete text format.
     $this->drupalGet('admin/config/content/formats');
-    $this->assertRaw('admin/config/content/formats/' . $format->format . '/delete');
-    $this->drupalGet('admin/config/content/formats/' . $format->format . '/delete');
+    $this->assertRaw('admin/config/content/formats/manage/' . $format->format . '/delete');
+    $this->drupalGet('admin/config/content/formats/manage/' . $format->format . '/delete');
     $this->drupalPost(NULL, array(), t('Delete'));
 
     // Verify that deleted text format no longer exists.
-    $this->drupalGet('admin/config/content/formats/' . $format->format);
+    $this->drupalGet('admin/config/content/formats/manage/' . $format->format);
     $this->assertResponse(404, t('Deleted text format no longer exists.'));
   }
 
@@ -196,8 +196,8 @@ class FilterAdminTestCase extends Drupal
     // Check that the fallback format exists and cannot be deleted.
     $this->assertTrue(!empty($plain) && $plain == filter_fallback_format(), t('The fallback format is set to plain text.'));
     $this->drupalGet('admin/config/content/formats');
-    $this->assertNoRaw('admin/config/content/formats/' . $plain . '/delete', t('Delete link for the fallback format not found.'));
-    $this->drupalGet('admin/config/content/formats/' . $plain . '/delete');
+    $this->assertNoRaw('admin/config/content/formats/manage/' . $plain . '/delete', t('Delete link for the fallback format not found.'));
+    $this->drupalGet('admin/config/content/formats/manage/' . $plain . '/delete');
     $this->assertResponse(403, t('The fallback format cannot be deleted.'));
 
     // Verify access permissions to Full HTML format.
@@ -207,7 +207,7 @@ class FilterAdminTestCase extends Drupal
     // Add an additional tag.
     $edit = array();
     $edit['settings[filter_html][allowed_html]'] = '<a> <em> <strong> <cite> <code> <ul> <ol> <li> <dl> <dt> <dd> <quote>';
-    $this->drupalPost('admin/config/content/formats/' . $filtered . '/configure', $edit, t('Save configuration'));
+    $this->drupalPost('admin/config/content/formats/manage/' . $filtered . '/configure', $edit, t('Save configuration'));
     $this->assertText(t('The configuration options have been saved.'), t('Allowed HTML tag added.'));
 
     $this->assertRaw(htmlentities($edit['settings[filter_html][allowed_html]']), t('Tag displayed.'));
@@ -219,7 +219,7 @@ class FilterAdminTestCase extends Drupal
     $edit = array();
     $edit['weights[' . $second_filter . ']'] = 1;
     $edit['weights[' . $first_filter . ']'] = 2;
-    $this->drupalPost('admin/config/content/formats/' . $filtered . '/order', $edit, t('Save configuration'));
+    $this->drupalPost('admin/config/content/formats/manage/' . $filtered . '/order', $edit, t('Save configuration'));
     $this->assertText(t('The filter ordering has been saved.'), t('Order saved successfully.'));
 
     $result = db_query('SELECT * FROM {filter} WHERE format = :format ORDER BY weight ASC', array(':format' => $filtered));
@@ -249,7 +249,7 @@ class FilterAdminTestCase extends Drupal
       $this->assertFieldByName('filters[' . $first_filter . '][status]', '', t('Url filter found.'));
 
       // Delete new filter.
-      $this->drupalPost('admin/config/content/formats/' . $format->format . '/delete', array(), t('Delete'));
+      $this->drupalPost('admin/config/content/formats/manage/' . $format->format . '/delete', array(), t('Delete'));
       $this->assertRaw(t('Deleted text format %format.', array('%format' => $edit['name'])), t('Format successfully deleted.'));
     }
 
@@ -258,7 +258,7 @@ class FilterAdminTestCase extends Drupal
     $edit = array();
     $edit['roles[1]'] = 0;
     $edit['roles[2]'] = 1;
-    $this->drupalPost('admin/config/content/formats/' . $full, $edit, t('Save configuration'));
+    $this->drupalPost('admin/config/content/formats/manage/' . $full, $edit, t('Save configuration'));
     $this->assertRaw(t('The text format %format has been updated.', array('%format' => $format->name)), t('Full HTML format successfully updated.'));
 
     // Switch user.
@@ -302,20 +302,20 @@ class FilterAdminTestCase extends Drupal
     // Allowed tags.
     $edit = array();
     $edit['settings[filter_html][allowed_html]'] = '<a> <em> <strong> <cite> <code> <ul> <ol> <li> <dl> <dt> <dd>';
-    $this->drupalPost('admin/config/content/formats/' . $filtered . '/configure', $edit, t('Save configuration'));
+    $this->drupalPost('admin/config/content/formats/manage/' . $filtered . '/configure', $edit, t('Save configuration'));
     $this->assertText(t('The configuration options have been saved.'), t('Changes reverted.'));
 
     // Full HTML.
     $edit = array();
     $edit['roles[2]'] = FALSE;
-    $this->drupalPost('admin/config/content/formats/' . $full, $edit, t('Save configuration'));
+    $this->drupalPost('admin/config/content/formats/manage/' . $full, $edit, t('Save configuration'));
     $this->assertRaw(t('The text format %format has been updated.', array('%format' => $format->name)), t('Full HTML format successfully reverted.'));
 
     // Filter order.
     $edit = array();
     $edit['weights[' . $second_filter . ']'] = 2;
     $edit['weights[' . $first_filter . ']'] = 1;
-    $this->drupalPost('admin/config/content/formats/' . $filtered . '/order', $edit, t('Save configuration'));
+    $this->drupalPost('admin/config/content/formats/manage/' . $filtered . '/order', $edit, t('Save configuration'));
     $this->assertText(t('The filter ordering has been saved.'), t('Order successfully reverted.'));
   }
 
@@ -1024,11 +1024,11 @@ class FilterUnitTestCase extends DrupalU
     $f = _filter_htmlcorrector('test <!--this is a comment-->');
     $this->assertEqual($f, 'test <!--this is a comment-->', t('HTML corrector -- Do not touch HTML comments.'));
 
-    $f = _filter_htmlcorrector('test <!-- comment <p>another 
-    <strong>multiple</strong> line 
+    $f = _filter_htmlcorrector('test <!-- comment <p>another
+    <strong>multiple</strong> line
     comment</p> -->');
-    $this->assertEqual($f, 'test <!-- comment <p>another 
-    <strong>multiple</strong> line 
+    $this->assertEqual($f, 'test <!-- comment <p>another
+    <strong>multiple</strong> line
     comment</p> -->', t('HTML corrector -- Do not touch HTML comments.'));
 
     $f = _filter_htmlcorrector('test <!-- comment <p>another comment</p> -->');
@@ -1153,7 +1153,7 @@ class FilterHooksTestCase extends Drupal
     // Update text format.
     $edit = array();
     $edit['roles[2]'] = 1;
-    $this->drupalPost('admin/config/content/formats/' . $format_id, $edit, t('Save configuration'));
+    $this->drupalPost('admin/config/content/formats/manage/' . $format_id, $edit, t('Save configuration'));
     $this->assertRaw(t('The text format %format has been updated.', array('%format' => $name)), t('Format successfully updated.'));
     $this->assertText('hook_filter_format_update invoked.', t('hook_filter_format_update() was invoked.'));
 
@@ -1172,7 +1172,7 @@ class FilterHooksTestCase extends Drupal
     $this->assertNotNull($bid, t('New block found in database'));
 
     // Delete the text format.
-    $this->drupalPost('admin/config/content/formats/' . $format_id . '/delete', array(), t('Delete'));
+    $this->drupalPost('admin/config/content/formats/manage/' . $format_id . '/delete', array(), t('Delete'));
     $this->assertRaw(t('Deleted text format %format.', array('%format' => $name)), t('Format successfully deleted.'));
     $this->assertText('hook_filter_format_delete invoked.', t('hook_filter_format_delete() was invoked.'));
 
Index: modules/php/php.install
===================================================================
RCS file: /cvs/drupal/drupal/modules/php/php.install,v
retrieving revision 1.14
diff -u -p -r1.14 php.install
--- modules/php/php.install	20 Sep 2009 07:32:18 -0000	1.14
+++ modules/php/php.install	20 Oct 2009 02:49:23 -0000
@@ -34,7 +34,7 @@ function php_install() {
       ))
       ->execute();
 
-    drupal_set_message(t('A !php-code text format has been created.', array('!php-code' => l('PHP code', 'admin/config/content/formats/' . $format))));
+    drupal_set_message(t('A !php-code text format has been created.', array('!php-code' => l('PHP code', 'admin/config/content/formats/manage/' . $format))));
   }
 }
 
Index: modules/search/search.test
===================================================================
RCS file: /cvs/drupal/drupal/modules/search/search.test,v
retrieving revision 1.42
diff -u -p -r1.42 search.test
--- modules/search/search.test	19 Oct 2009 23:28:40 -0000	1.42
+++ modules/search/search.test	20 Oct 2009 02:50:22 -0000
@@ -468,7 +468,7 @@ class SearchCommentTestCase extends Drup
     $edit = array(
       'filters[filter_html_escape][status]' => 1,
     );
-    $this->drupalPost('admin/config/content/formats/1', $edit, t('Save configuration'));
+    $this->drupalPost('admin/config/content/formats/manage/1', $edit, t('Save configuration'));
     // Allow anonymous users to search content.
     $edit = array(
       DRUPAL_ANONYMOUS_RID . '[search content]' => 1,