Index: captcha.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/captcha/captcha.module,v
retrieving revision 1.42.2.21
diff -u -b -B -r1.42.2.21 captcha.module
--- captcha.module	17 Aug 2007 20:57:23 -0000	1.42.2.21
+++ captcha.module	19 Aug 2007 18:57:05 -0000
@@ -23,10 +23,11 @@
 function captcha_help($section = 'admin/help#captcha') {
   switch ($section) {
     case 'admin/user/captcha':
+    case 'admin/user/captcha/captcha':
+    case 'admin/user/captcha/captcha/settings':
     case 'admin/help#captcha':
       return '<p>' . t('A captcha is a tool to fight automated spam submission of forms (e.g. user registration forms, comment forms, guestbook forms, etc.) by malicious users. A captcha is an extra field (or several fields) on a form presented to the user. It embodies a challenge, which should be easy for a normal human to solve (e.g. a simple math problem), but hard enough to keep automated scripts and spam bots out. Users with the \'skip captcha\' <a href="@perm">permission</a> won\'t be offered a captcha. Be sure to grant this permission to the trusted users (e.g. site administrators).', array('@perm' => url('admin/user/access'))) . '</p>';
   }
-  return $output;
 }
 
 /**
@@ -50,14 +51,21 @@
       'path' => 'admin/user/captcha/captcha',
       'title' => t('Captcha'),
       'type' => MENU_DEFAULT_LOCAL_TASK,
+      'weight' => -20,
+    );
+    $items[] = array(
+      'path' => 'admin/user/captcha/captcha/settings',
+      'title' => t('General settings'),
+      'type' => MENU_DEFAULT_LOCAL_TASK,
+      'weight' => 0,
     );
     $items[] = array(
-      'path' => 'admin/user/captcha/examples',
+      'path' => 'admin/user/captcha/captcha/examples',
       'title' => t('Examples'),
       'description' => t('An overview of the available captcha types with examples.'),
       'callback' => 'captcha_examples',
       'type' => MENU_LOCAL_TASK,
-      'weight' => 20,
+      'weight' => 5,
     );
   }
   return $items;
@@ -503,7 +511,7 @@
           $form['captcha'] = array_merge($form['captcha'], $captcha['form']);
           $form['captcha']['more_examples'] = array(
             '#type' => 'markup',
-            '#value' => l(t('10 more examples of this captcha type.'), "admin/user/captcha/examples/$module/$challenge"),
+            '#value' => l(t('10 more examples of this captcha type.'), "admin/user/captcha/captcha/examples/$module/$challenge"),
           );
           // return rendered form
           $id = "captcha_examples_$module_$challenge";