- Patch #46827 by wulff: fixed incorrect links.

16 files changed, 32 insertions, 32 deletions

diff --git a/modules/block.module b/modules/block.module
index 7d8824d55..a39a9fdf2 100644
--- a/modules/block.module
+++ b/modules/block.module
@@ -30,8 +30,8 @@ function block_help($section) {
       $output .= '<p>'. t('An administrator defined block contains content supplied by the administrator. Each admin-defined block consists of a title, a description, and a body which can be as long as you wish. The Drupal engine will render the content of the block.') .'</p>';
       $output .= t('<p>You can</p>
 <ul>
-<li>enable throttle and configure blocks at <a href="%admin-block">administer &gt;&gt; block</a>.</li>
-<li>add a block at <a href="%admin-block-add">administer &gt;&gt; block &gt;&gt; add block</a>.</li>
+<li>enable throttle and configure blocks at <a href="%admin-block">administer &gt;&gt; blocks</a>.</li>
+<li>add a block at <a href="%admin-block-add">administer &gt;&gt; blocks &gt;&gt; add block</a>.</li>
 </ul>
 ', array('%admin-block' => url('admin/block'), '%admin-block-add' => url('admin/block/add')));
       $output .= '<p>'. t('For more information please read the configuration and customization handbook <a href="%block">Block page</a>.', array('%block' => 'http://www.drupal.org/handbook/modules/block/')) .'</p>';
diff --git a/modules/block/block.module b/modules/block/block.module
index 7d8824d55..a39a9fdf2 100644
--- a/modules/block/block.module
+++ b/modules/block/block.module
@@ -30,8 +30,8 @@ function block_help($section) {
       $output .= '<p>'. t('An administrator defined block contains content supplied by the administrator. Each admin-defined block consists of a title, a description, and a body which can be as long as you wish. The Drupal engine will render the content of the block.') .'</p>';
       $output .= t('<p>You can</p>
 <ul>
-<li>enable throttle and configure blocks at <a href="%admin-block">administer &gt;&gt; block</a>.</li>
-<li>add a block at <a href="%admin-block-add">administer &gt;&gt; block &gt;&gt; add block</a>.</li>
+<li>enable throttle and configure blocks at <a href="%admin-block">administer &gt;&gt; blocks</a>.</li>
+<li>add a block at <a href="%admin-block-add">administer &gt;&gt; blocks &gt;&gt; add block</a>.</li>
 </ul>
 ', array('%admin-block' => url('admin/block'), '%admin-block-add' => url('admin/block/add')));
       $output .= '<p>'. t('For more information please read the configuration and customization handbook <a href="%block">Block page</a>.', array('%block' => 'http://www.drupal.org/handbook/modules/block/')) .'</p>';
diff --git a/modules/book.module b/modules/book.module
index f29156225..9260c366a 100644
--- a/modules/book.module
+++ b/modules/book.module
@@ -1017,11 +1017,11 @@ function book_help($section) {
 <ul>
 <li>create new book pages: <a href="%node-add-book">create content &gt;&gt; book page</a>.</li>
 <li>administer individual books (choose a book from list): <a href="%admin-node-book">administer &gt;&gt; content &gt;&gt; books</a>.</li>
-<li>set workflow and other global book settings on the book configuration page: <a href="%admin-node-configure-types-book" title="book page content type">administer &gt;&gt; content &gt;&gt; configure &gt;&gt; content types &gt;&gt; book page</a>.</li>
-<li>enable the book navigation block: <a href="%admin-block">administer &gt;&gt; block</a>.</li>
+<li>set workflow and other global book settings on the book configuration page: <a href="%admin-settings-content-types-book-page" title="book page content type">administer &gt;&gt; settings &gt;&gt; content types &gt;&gt; configure book page</a>.</li>
+<li>enable the book navigation block: <a href="%admin-block">administer &gt;&gt; blocks</a>.</li>
 <li>control who can create, edit, and maintain book pages by setting access permissions: <a href="%admin-access">administer &gt;&gt; access control</a>.</li>
 </ul>
-', array('%node-add-book' => url('node/add/book'), '%admin-node-book' => url('admin/node/book'), '%admin-node-configure-types-book' => url('admin/node/configure/types/book'), '%admin-block' => url('admin/block'), '%admin-access' => url('admin/access')));
+', array('%node-add-book' => url('node/add/book'), '%admin-node-book' => url('admin/node/book'), '%admin-settings-content-types-book-page' => url('admin/settings/content-types/book'), '%admin-block' => url('admin/block'), '%admin-access' => url('admin/access')));
       $output .= '<p>'. t('For more information please read the configuration and customization handbook <a href="%book">Book page</a>.', array('%book' => 'http://www.drupal.org/handbook/modules/book/')) .'</p>';
       return $output;
     case 'admin/modules#description':
diff --git a/modules/book/book.module b/modules/book/book.module
index f29156225..9260c366a 100644
--- a/modules/book/book.module
+++ b/modules/book/book.module
@@ -1017,11 +1017,11 @@ function book_help($section) {
 <ul>
 <li>create new book pages: <a href="%node-add-book">create content &gt;&gt; book page</a>.</li>
 <li>administer individual books (choose a book from list): <a href="%admin-node-book">administer &gt;&gt; content &gt;&gt; books</a>.</li>
-<li>set workflow and other global book settings on the book configuration page: <a href="%admin-node-configure-types-book" title="book page content type">administer &gt;&gt; content &gt;&gt; configure &gt;&gt; content types &gt;&gt; book page</a>.</li>
-<li>enable the book navigation block: <a href="%admin-block">administer &gt;&gt; block</a>.</li>
+<li>set workflow and other global book settings on the book configuration page: <a href="%admin-settings-content-types-book-page" title="book page content type">administer &gt;&gt; settings &gt;&gt; content types &gt;&gt; configure book page</a>.</li>
+<li>enable the book navigation block: <a href="%admin-block">administer &gt;&gt; blocks</a>.</li>
 <li>control who can create, edit, and maintain book pages by setting access permissions: <a href="%admin-access">administer &gt;&gt; access control</a>.</li>
 </ul>
-', array('%node-add-book' => url('node/add/book'), '%admin-node-book' => url('admin/node/book'), '%admin-node-configure-types-book' => url('admin/node/configure/types/book'), '%admin-block' => url('admin/block'), '%admin-access' => url('admin/access')));
+', array('%node-add-book' => url('node/add/book'), '%admin-node-book' => url('admin/node/book'), '%admin-settings-content-types-book-page' => url('admin/settings/content-types/book'), '%admin-block' => url('admin/block'), '%admin-access' => url('admin/access')));
       $output .= '<p>'. t('For more information please read the configuration and customization handbook <a href="%book">Book page</a>.', array('%book' => 'http://www.drupal.org/handbook/modules/book/')) .'</p>';
       return $output;
     case 'admin/modules#description':
diff --git a/modules/menu.module b/modules/menu.module
index 131e4144f..178f64c5f 100644
--- a/modules/menu.module
+++ b/modules/menu.module
@@ -72,8 +72,8 @@ function menu_help($section) {
 ');
       $output .= t('<p>You can</p>
 <ul>
-<li>administer menus at <a href="%admin-menu"> administer &gt;&gt; menus</a>.</li>
-<li>turn menus blocks on and off in the <a href="%admin-block">administration &gt;&gt; block</a>.</li>
+<li>administer menus at <a href="%admin-menu">administer &gt;&gt; menus</a>.</li>
+<li>turn menus blocks on and off in the <a href="%admin-block">administer &gt;&gt; blocks</a>.</li>
 <li>add a menu at <a href="%admin-menu-menu-add">administer &gt;&gt; menus &gt;&gt; add menu</a>.</li>
 <li>add a menu item at <a href="%admin-menu-item-add">administer &gt;&gt; menus &gt;&gt; add menu item</a>.</li>
 </ul>
diff --git a/modules/menu/menu.module b/modules/menu/menu.module
index 131e4144f..178f64c5f 100644
--- a/modules/menu/menu.module
+++ b/modules/menu/menu.module
@@ -72,8 +72,8 @@ function menu_help($section) {
 ');
       $output .= t('<p>You can</p>
 <ul>
-<li>administer menus at <a href="%admin-menu"> administer &gt;&gt; menus</a>.</li>
-<li>turn menus blocks on and off in the <a href="%admin-block">administration &gt;&gt; block</a>.</li>
+<li>administer menus at <a href="%admin-menu">administer &gt;&gt; menus</a>.</li>
+<li>turn menus blocks on and off in the <a href="%admin-block">administer &gt;&gt; blocks</a>.</li>
 <li>add a menu at <a href="%admin-menu-menu-add">administer &gt;&gt; menus &gt;&gt; add menu</a>.</li>
 <li>add a menu item at <a href="%admin-menu-item-add">administer &gt;&gt; menus &gt;&gt; add menu item</a>.</li>
 </ul>
diff --git a/modules/node.module b/modules/node.module
index 5dddec218..63cc8b4b6 100644
--- a/modules/node.module
+++ b/modules/node.module
@@ -27,9 +27,9 @@ function node_help($section) {
       $output .= t('<p>You can</p>
 <ul>
 <li>search for content at <a href="%search">search</a>.</li>
-<li>administer nodes at <a href="%admin-node-configure-types">administer &gt;&gt; content &gt;&gt; configure &gt;&gt; content types</a>.</li>
+<li>administer nodes at <a href="%admin-settings-content-types">administer &gt;&gt; settings &gt;&gt; content types</a>.</li>
 </ul>
-', array('%search' => url('search'), '%admin-node-configure-types' => url('admin/node/configure/types')));
+', array('%search' => url('search'), '%admin-settings-content-types' => url('admin/settings/content-types')));
       $output .= '<p>'. t('For more information please read the configuration and customization handbook <a href="%node">Node page</a>.', array('%node' => 'http://www.drupal.org/handbook/modules/node/')) .'</p>';
       return $output;
     case 'admin/modules#description':
diff --git a/modules/node/node.module b/modules/node/node.module
index 5dddec218..63cc8b4b6 100644
--- a/modules/node/node.module
+++ b/modules/node/node.module
@@ -27,9 +27,9 @@ function node_help($section) {
       $output .= t('<p>You can</p>
 <ul>
 <li>search for content at <a href="%search">search</a>.</li>
-<li>administer nodes at <a href="%admin-node-configure-types">administer &gt;&gt; content &gt;&gt; configure &gt;&gt; content types</a>.</li>
+<li>administer nodes at <a href="%admin-settings-content-types">administer &gt;&gt; settings &gt;&gt; content types</a>.</li>
 </ul>
-', array('%search' => url('search'), '%admin-node-configure-types' => url('admin/node/configure/types')));
+', array('%search' => url('search'), '%admin-settings-content-types' => url('admin/settings/content-types')));
       $output .= '<p>'. t('For more information please read the configuration and customization handbook <a href="%node">Node page</a>.', array('%node' => 'http://www.drupal.org/handbook/modules/node/')) .'</p>';
       return $output;
     case 'admin/modules#description':
diff --git a/modules/page.module b/modules/page.module
index 92b5469b8..6f4deeb88 100644
--- a/modules/page.module
+++ b/modules/page.module
@@ -22,9 +22,9 @@ function page_help($section) {
 <li>read the page administration help at <a href="%admin-help-page">administer &gt;&gt; help &gt;&gt; page</a>.</li>
 <li>read the story administration help at <a href="%admin-help-story">administer &gt;&gt; help &gt;&gt; story</a>.</li>
 <li>create a page at <a href="%node-add-page">create content &gt;&gt; page</a>.</li>
-<li>administer page content type at <a href="%admin-node-configure-types-page">administer &gt;&gt; content &gt;&gt; configure &gt;&gt; content types &gt;&gt; configure page</a>.</li>
+<li>administer page content type at <a href="%admin-settings-content-types-page">administer &gt;&gt; settings &gt;&gt; content types &gt;&gt; configure page</a>.</li>
 </ul>
-', array('%admin-help-node' => url('admin/help/node'), '%admin-help-page' => url('admin/help/page'), '%admin-help-story' => url('admin/help/story'), '%node-add-page' => url('node/add/page'), '%admin-node-configure-types-page' => url('admin/node/configure/types/page')));
+', array('%admin-help-node' => url('admin/help/node'), '%admin-help-page' => url('admin/help/page'), '%admin-help-story' => url('admin/help/story'), '%node-add-page' => url('node/add/page'), '%admin-settings-content-types-page' => url('admin/settings/content-types/page')));
       $output .= '<p>'. t('For more information please read the configuration and customization handbook <a href="%page">Page page</a>.', array('%page' => 'http://www.drupal.org/handbook/modules/page/')) .'</p>';
       return $output;
     case 'admin/modules#description':
diff --git a/modules/page/page.module b/modules/page/page.module
index 92b5469b8..6f4deeb88 100644
--- a/modules/page/page.module
+++ b/modules/page/page.module
@@ -22,9 +22,9 @@ function page_help($section) {
 <li>read the page administration help at <a href="%admin-help-page">administer &gt;&gt; help &gt;&gt; page</a>.</li>
 <li>read the story administration help at <a href="%admin-help-story">administer &gt;&gt; help &gt;&gt; story</a>.</li>
 <li>create a page at <a href="%node-add-page">create content &gt;&gt; page</a>.</li>
-<li>administer page content type at <a href="%admin-node-configure-types-page">administer &gt;&gt; content &gt;&gt; configure &gt;&gt; content types &gt;&gt; configure page</a>.</li>
+<li>administer page content type at <a href="%admin-settings-content-types-page">administer &gt;&gt; settings &gt;&gt; content types &gt;&gt; configure page</a>.</li>
 </ul>
-', array('%admin-help-node' => url('admin/help/node'), '%admin-help-page' => url('admin/help/page'), '%admin-help-story' => url('admin/help/story'), '%node-add-page' => url('node/add/page'), '%admin-node-configure-types-page' => url('admin/node/configure/types/page')));
+', array('%admin-help-node' => url('admin/help/node'), '%admin-help-page' => url('admin/help/page'), '%admin-help-story' => url('admin/help/story'), '%node-add-page' => url('node/add/page'), '%admin-settings-content-types-page' => url('admin/settings/content-types/page')));
       $output .= '<p>'. t('For more information please read the configuration and customization handbook <a href="%page">Page page</a>.', array('%page' => 'http://www.drupal.org/handbook/modules/page/')) .'</p>';
       return $output;
     case 'admin/modules#description':
diff --git a/modules/story.module b/modules/story.module
index 5221db6d1..3692a491c 100644
--- a/modules/story.module
+++ b/modules/story.module
@@ -17,9 +17,9 @@ function story_help($section) {
       $output .= t('<p>You can</p>
 <ul>
 <li>post a story at <a href="%node-add-story">create content &gt;&gt; story</a>.</li>
-<li>configure story at <a href="%admin-node-configure-types"> administer &gt;&gt; content &gt;&gt; configure types &gt;&gt; story configure</a>.</li>
+<li>configure story at <a href="%admin-settings-content-types-story">administer &gt;&gt; settings &gt;&gt; content types &gt;&gt; configure story</a>.</li>
 </ul>
-', array('%node-add-story' => url('node/add/story'), '%admin-node-configure-types' => url('admin/node/configure/types')));
+', array('%node-add-story' => url('node/add/story'), '%admin-settings-content-types-story' => url('admin/settings/content-types/story')));
       $output .= '<p>'. t('For more information please read the configuration and customization handbook <a href="%story">Story page</a>.', array('%story' => 'http://www.drupal.org/handbook/modules/story/')) .'</p>';
       return $output;
     case 'admin/modules#description':
diff --git a/modules/story/story.module b/modules/story/story.module
index 5221db6d1..3692a491c 100644
--- a/modules/story/story.module
+++ b/modules/story/story.module
@@ -17,9 +17,9 @@ function story_help($section) {
       $output .= t('<p>You can</p>
 <ul>
 <li>post a story at <a href="%node-add-story">create content &gt;&gt; story</a>.</li>
-<li>configure story at <a href="%admin-node-configure-types"> administer &gt;&gt; content &gt;&gt; configure types &gt;&gt; story configure</a>.</li>
+<li>configure story at <a href="%admin-settings-content-types-story">administer &gt;&gt; settings &gt;&gt; content types &gt;&gt; configure story</a>.</li>
 </ul>
-', array('%node-add-story' => url('node/add/story'), '%admin-node-configure-types' => url('admin/node/configure/types')));
+', array('%node-add-story' => url('node/add/story'), '%admin-settings-content-types-story' => url('admin/settings/content-types/story')));
       $output .= '<p>'. t('For more information please read the configuration and customization handbook <a href="%story">Story page</a>.', array('%story' => 'http://www.drupal.org/handbook/modules/story/')) .'</p>';
       return $output;
     case 'admin/modules#description':
diff --git a/modules/taxonomy.module b/modules/taxonomy.module
index 8a197c60d..483724bbb 100644
--- a/modules/taxonomy.module
+++ b/modules/taxonomy.module
@@ -1206,8 +1206,8 @@ function taxonomy_help($section) {
       $output .= '<p>'. t('A controlled vocabulary is a set of terms to use for describing content (known as descriptors in indexing lingo). Drupal allows you to describe each piece of content (blog, story, etc.) using one or many of these terms. For simple implementations, you might create a set of categories without subcategories, similar to Slashdot\'s sections. For more complex implementations, you might create a hierarchical list of categories.  ') .'</p>';
       $output .= t('<p>You can</p>
 <ul>
-<li>add a vocabulary at <a href="%admin-taxonomy-add-vocabulary">administer &gt;&gt;  taxonomy &gt;&gt;  add vocabulary</a>.</li>
-<li>administer taxonomy at <a href="%admin-taxonomy">administer &gt;&gt;  taxonomy</a>.</li>
+<li>add a vocabulary at <a href="%admin-taxonomy-add-vocabulary">administer &gt;&gt; categories &gt;&gt;  add vocabulary</a>.</li>
+<li>administer taxonomy at <a href="%admin-taxonomy">administer &gt;&gt; categories</a>.</li>
 <li>restrict content access by category for specific users roles using the <a href="%external-http-drupal-org-project-taxonomy_access">taxonomy access module</a>.</li>
 <li>build a custom view of your categories using the <a href="%external-http-drupal-org-project-taxonomy_browser">taxonomy browser</a>.</li>
 </ul>
diff --git a/modules/taxonomy/taxonomy.module b/modules/taxonomy/taxonomy.module
index 8a197c60d..483724bbb 100644
--- a/modules/taxonomy/taxonomy.module
+++ b/modules/taxonomy/taxonomy.module
@@ -1206,8 +1206,8 @@ function taxonomy_help($section) {
       $output .= '<p>'. t('A controlled vocabulary is a set of terms to use for describing content (known as descriptors in indexing lingo). Drupal allows you to describe each piece of content (blog, story, etc.) using one or many of these terms. For simple implementations, you might create a set of categories without subcategories, similar to Slashdot\'s sections. For more complex implementations, you might create a hierarchical list of categories.  ') .'</p>';
       $output .= t('<p>You can</p>
 <ul>
-<li>add a vocabulary at <a href="%admin-taxonomy-add-vocabulary">administer &gt;&gt;  taxonomy &gt;&gt;  add vocabulary</a>.</li>
-<li>administer taxonomy at <a href="%admin-taxonomy">administer &gt;&gt;  taxonomy</a>.</li>
+<li>add a vocabulary at <a href="%admin-taxonomy-add-vocabulary">administer &gt;&gt; categories &gt;&gt;  add vocabulary</a>.</li>
+<li>administer taxonomy at <a href="%admin-taxonomy">administer &gt;&gt; categories</a>.</li>
 <li>restrict content access by category for specific users roles using the <a href="%external-http-drupal-org-project-taxonomy_access">taxonomy access module</a>.</li>
 <li>build a custom view of your categories using the <a href="%external-http-drupal-org-project-taxonomy_browser">taxonomy browser</a>.</li>
 </ul>
diff --git a/modules/user.module b/modules/user.module
index 7daec0a08..190e3abf5 100644
--- a/modules/user.module
+++ b/modules/user.module
@@ -1861,7 +1861,7 @@ function user_help($section) {
       $output .= t('<p>You can</p>
 <ul>
 <li>view your <a href="%user">user page</a>.</li>
-<li>administer user at <a href="%admin-user">administer &gt;&gt; user</a>.</li>
+<li>administer users at <a href="%admin-user">administer &gt;&gt; user</a>.</li>
 <li>allow users who have the "select different theme" permission to select themes from their user account by enabling themes in <a href="%admin-themes">administer &gt;&gt; themes</a>.</li>
 <li>read user profile help at <a href="%admin-help-profile">administer &gt;&gt; help &gt;&gt; profile</a>.</li>
 <li>read about distributed authentication in the system module help at <a href="%admin-help-system">administer &gt;&gt; help &gt;&gt; system</a>.</li>
diff --git a/modules/user/user.module b/modules/user/user.module
index 7daec0a08..190e3abf5 100644
--- a/modules/user/user.module
+++ b/modules/user/user.module
@@ -1861,7 +1861,7 @@ function user_help($section) {
       $output .= t('<p>You can</p>
 <ul>
 <li>view your <a href="%user">user page</a>.</li>
-<li>administer user at <a href="%admin-user">administer &gt;&gt; user</a>.</li>
+<li>administer users at <a href="%admin-user">administer &gt;&gt; user</a>.</li>
 <li>allow users who have the "select different theme" permission to select themes from their user account by enabling themes in <a href="%admin-themes">administer &gt;&gt; themes</a>.</li>
 <li>read user profile help at <a href="%admin-help-profile">administer &gt;&gt; help &gt;&gt; profile</a>.</li>
 <li>read about distributed authentication in the system module help at <a href="%admin-help-system">administer &gt;&gt; help &gt;&gt; system</a>.</li>