Index: modules/system/system.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/system/system.module,v
retrieving revision 1.854
diff -u -r1.854 system.module
--- modules/system/system.module	2 Dec 2009 15:09:16 -0000	1.854
+++ modules/system/system.module	4 Dec 2009 13:23:37 -0000
@@ -584,6 +584,7 @@
     'access arguments' => array('access administration pages'),
     'file' => 'system.admin.inc',
   );
+  
   // Appearance.
   $items['admin/appearance'] = array(
     'title' => 'Appearance',
@@ -696,15 +697,22 @@
     'file' => 'system.admin.inc',
   );
 
-  // Actions.
-  $items['admin/config/system/actions'] = array(
+  // Workflow.
+  $items['admin/config/workflow'] = array(
+    'title' => 'Workflow',
+    'description' => 'Editorial workflow and automation tools.',
+    'page callback' => 'system_admin_menu_block_page',
+    'access arguments' => array('access administration pages'),
+    'file' => 'system.admin.inc',
+  );
+  $items['admin/config/workflow/actions'] = array(
     'title' => 'Actions',
     'description' => 'Manage the actions defined for your site.',
     'access arguments' => array('administer actions'),
     'page callback' => 'system_actions_manage',
     'file' => 'system.admin.inc',
   );
-  $items['admin/config/system/actions/manage'] = array(
+  $items['admin/config/workflow/actions/manage'] = array(
     'title' => 'Manage actions',
     'description' => 'Manage the actions defined for your site.',
     'page callback' => 'system_actions_manage',
@@ -712,7 +720,7 @@
     'weight' => -2,
     'file' => 'system.admin.inc',
   );
-  $items['admin/config/system/actions/configure'] = array(
+  $items['admin/config/workflow/actions/configure'] = array(
     'title' => 'Configure an advanced action',
     'page callback' => 'drupal_get_form',
     'page arguments' => array('system_actions_configure'),
@@ -720,7 +728,7 @@
     'type' => MENU_CALLBACK,
     'file' => 'system.admin.inc',
   );
-  $items['admin/config/system/actions/delete/%actions'] = array(
+  $items['admin/config/workflow/actions/delete/%actions'] = array(
     'title' => 'Delete action',
     'description' => 'Delete an action.',
     'page callback' => 'drupal_get_form',
@@ -729,7 +737,7 @@
     'type' => MENU_CALLBACK,
     'file' => 'system.admin.inc',
   );
-  $items['admin/config/system/actions/orphan'] = array(
+  $items['admin/config/workflow/actions/orphan'] = array(
     'title' => 'Remove orphans',
     'page callback' => 'system_actions_remove_orphans',
     'access arguments' => array('administer actions'),
@@ -938,7 +946,8 @@
     'access arguments' => array('administer site configuration'),
     'file' => 'system.admin.inc',
   );
-
+  
+  // Search.
   $items['admin/config/search'] = array(
     'title' => 'Search and metadata',
     'description' => 'Local site search, metadata and SEO.',
@@ -962,6 +971,8 @@
     'type' => MENU_CALLBACK,
     'file' => 'system.admin.inc',
   );
+  
+  // Content authoring.
   $items['admin/config/content'] = array(
     'title' => 'Content authoring',
     'description' => 'Settings related to formatting and authoring content.',
@@ -989,7 +1000,7 @@
     'file' => 'system.admin.inc',
     'weight' => -10,
   );
-
+  
   // Reports.
   $items['admin/reports'] = array(
     'title' => 'Reports',
Index: modules/simpletest/tests/actions.test
===================================================================
RCS file: /cvs/drupal/drupal/modules/simpletest/tests/actions.test,v
retrieving revision 1.11
diff -u -r1.11 actions.test
--- modules/simpletest/tests/actions.test	10 Nov 2009 17:27:53 -0000	1.11
+++ modules/simpletest/tests/actions.test	4 Dec 2009 13:23:36 -0000
@@ -22,14 +22,14 @@
     // Make a POST request to admin/config/system/actions/manage.
     $edit = array();
     $edit['action'] = md5('system_goto_action');
-    $this->drupalPost('admin/config/system/actions/manage', $edit, t('Create'));
+    $this->drupalPost('admin/config/workflow/actions/manage', $edit, t('Create'));
 
     // Make a POST request to the individual action configuration page.
     $edit = array();
     $action_label = $this->randomName();
     $edit['actions_label'] = $action_label;
     $edit['url'] = 'admin';
-    $this->drupalPost('admin/config/system/actions/configure/' . md5('system_goto_action'), $edit, t('Save'));
+    $this->drupalPost('admin/config/workflow/actions/configure/' . md5('system_goto_action'), $edit, t('Save'));
 
     // Make sure that the new complex action was saved properly.
     $this->assertText(t('The action has been successfully saved.'), t("Make sure we get a confirmation that we've successfully saved the complex action."));
@@ -37,7 +37,7 @@
 
     // Make another POST request to the action edit page.
     $this->clickLink(t('configure'));
-    preg_match('|admin/config/system/actions/configure/(\d+)|', $this->getUrl(), $matches);
+    preg_match('|admin/config/workflow/actions/configure/(\d+)|', $this->getUrl(), $matches);
     $aid = $matches[1];
     $edit = array();
     $new_action_label = $this->randomName();
@@ -53,11 +53,11 @@
     // Make sure that deletions work properly.
     $this->clickLink(t('delete'));
     $edit = array();
-    $this->drupalPost("admin/config/system/actions/delete/$aid", $edit, t('Delete'));
+    $this->drupalPost("admin/config/workflow/actions/delete/$aid", $edit, t('Delete'));
 
     // Make sure that the action was actually deleted.
     $this->assertRaw(t('Action %action was deleted', array('%action' => $new_action_label)), t('Make sure that we get a delete confirmation message.'));
-    $this->drupalGet('admin/config/system/actions/manage');
+    $this->drupalGet('admin/config/workflow/actions/manage');
     $this->assertNoText($new_action_label, t("Make sure the action label does not appear on the overview page after we've deleted the action."));
     $exists = db_query('SELECT aid FROM {actions} WHERE callback = :callback', array(':callback' => 'drupal_goto_action'))->fetchField();
     $this->assertFalse($exists, t('Make sure the action is gone from the database after being deleted.'));