--- content.module.orig	2006-08-21 11:02:42.000000000 +0200
+++ content.module	2006-08-23 17:32:50.751161800 +0200
@@ -58,32 +58,27 @@ function content_menu($may_cache) {
   $access = user_access('administer content types');
 
   // Only include administrative callbacks if we are viewing an admin page.
-  if (arg(0) == 'admin' && arg(1) == 'node' && arg(2) == 'types') {
+  if (arg(0) == 'admin' && arg(1) == 'settings' && arg(2) == 'content-types') {
     include_once(drupal_get_path('module', 'content') .'/content_admin.inc');
   }
 
   if ($may_cache) {
     $items[] = array(
-      'path' => 'admin/node/types',
-      'title' => t('content types'),
+      'path' => 'admin/settings/content-types/list',
+      'title' => t('list custom'),
       'callback' => '_content_admin_type_overview',
-      'access' => $access,
-    );
-    $items[] = array(
-      'path' => 'admin/node/types/list',
-      'title' => t('list'),
-      'type' => MENU_DEFAULT_LOCAL_TASK,
+      'type' => MENU_LOCAL_TASK | MENU_CALLBACK,
       'weight' => -10,
     );
     $items[] = array(
-      'path' => 'admin/node/types/add',
+      'path' => 'admin/settings/content-types/add',
       'title' => t('add content type'),
       'callback' => '_content_admin_type_edit',
       'access' => $access,
       'type' => MENU_LOCAL_TASK,
     );
     $items[] = array(
-      'path' => 'admin/node/types/fields',
+      'path' => 'admin/settings/content-types/fields',
       'title' => t('fields'),
       'callback' => '_content_admin_type_fields',
       'access' => $access,
@@ -100,21 +95,20 @@ function content_menu($may_cache) {
     }
   }
   else {
-    if (arg(0) == 'admin' && arg(1) == 'node' && arg(2) == 'types' && arg(3)) {
+    if (arg(0) == 'admin' && arg(1) == 'settings' && arg(2) == 'content-types' && arg(3)) {
 
       $type = content_types(arg(3));
 
       if ($type) {
         $items[] = array(
-          'path' => 'admin/node/types/'. arg(3),
-          'title' => t($type['label']),
-          'callback' => '_content_admin_type_edit',
+          'path' => 'admin/settings/content-types/'. arg(3) .'/settings',
+          'title' => t('settings'),
           'access' => $access,
-          'callback arguments' => array(arg(3)),
-          'type' => MENU_CALLBACK,
+          'type' => MENU_DEFAULT_LOCAL_TASK,
+          'weight' => -10,
         );
         $items[] = array(
-          'path' => 'admin/node/types/'. arg(3) .'/delete',
+          'path' => 'admin/settings/content-types/'. arg(3) .'/delete',
           'title' => t('delete'),
           'callback' => '_content_admin_type_delete',
           'access' => $access,
@@ -122,7 +116,7 @@ function content_menu($may_cache) {
           'type' => MENU_CALLBACK,
         );
         $items[] = array(
-          'path' => 'admin/node/types/'. arg(3) .'/duplicate',
+          'path' => 'admin/settings/content-types/'. arg(3) .'/duplicate',
           'title' => t('duplicate'),
           'callback' => '_content_admin_type_edit',
           'access' => $access,
@@ -131,14 +125,15 @@ function content_menu($may_cache) {
         );
 
         $items[] = array(
-          'path' => 'admin/node/types/'. arg(3) .'/edit',
+          'path' => 'admin/settings/content-types/'. arg(3) .'/edit',
           'title' => t('edit'),
-          'type' => MENU_DEFAULT_LOCAL_TASK,
-          'weight' => -10,
+          'callback' => '_content_admin_type_edit',
+          'callback arguments' => array(arg(3)),
+          'type' => MENU_LOCAL_TASK,
         );
 
         $items[] = array(
-          'path' => 'admin/node/types/'. arg(3) .'/fields',
+          'path' => 'admin/settings/content-types/'. arg(3) .'/fields',
           'title' => t('manage fields'),
           'callback' => '_content_admin_field_overview',
           'access' => $access,
@@ -147,7 +142,7 @@ function content_menu($may_cache) {
           'weight' => 1,
         );
         $items[] = array(
-          'path' => 'admin/node/types/'. arg(3) .'/add_field',
+          'path' => 'admin/settings/content-types/'. arg(3) .'/add_field',
           'title' => t('add field'),
           'callback' => '_content_admin_field_add',
           'access' => $access,
@@ -159,7 +154,7 @@ function content_menu($may_cache) {
         if (arg(4) == 'fields' && arg(5)
             && isset($type['fields'][arg(5)])) {
           $items[] = array(
-            'path' => 'admin/node/types/'. arg(3) .'/fields/'. arg(5),
+            'path' => 'admin/settings/content-types/'. arg(3) .'/fields/'. arg(5),
             'title' => t($type['fields'][arg(5)]['widget']['label']),
             'callback' => '_content_admin_field',
             'access' => $access,
@@ -167,7 +162,7 @@ function content_menu($may_cache) {
             'type' => MENU_CALLBACK,
           );
           $items[] = array(
-            'path' => 'admin/node/types/'. arg(3) .'/fields/'. arg(5) .'/remove',
+            'path' => 'admin/settings/content-types/'. arg(3) .'/fields/'. arg(5) .'/remove',
             'title' => t('remove field'),
             'callback' => '_content_admin_field_remove',
             'access' => $access,
--- content_admin.inc.orig	2006-08-21 19:01:48.000000000 +0200
+++ content_admin.inc	2006-08-23 17:36:59.855753900 +0200
@@ -17,13 +17,13 @@ function _content_admin_type_overview() 
   $rows = array();
   foreach ($types as $type) {
     $row = array();
-    $row[] = l(t($type['label']), 'admin/node/types/'. $type['type_name'] .'/fields');
+    $row[] = l(t($type['label']), 'admin/settings/content-types/'. $type['type_name'] .'/fields');
     $row[] = $type['type_name'];
     $row[] = $type['description'];
 
-    $row[] = l(t('edit'), 'admin/node/types/'. $type['type_name']);
-    $row[] = l(t('duplicate'), 'admin/node/types/'. $type['type_name'] .'/duplicate');
-    $row[] = l(t('delete'), 'admin/node/types/'. $type['type_name'] .'/delete');
+    $row[] = l(t('edit'), 'admin/settings/content-types/'. $type['type_name'] .'/edit');
+    $row[] = l(t('duplicate'), 'admin/settings/content-types/'. $type['type_name'] .'/duplicate');
+    $row[] = l(t('delete'), 'admin/settings/content-types/'. $type['type_name'] .'/delete');
 
     $rows[] = $row;
   }
@@ -184,7 +184,7 @@ function _content_admin_type_edit_submit
   content_clear_type_cache();
   menu_rebuild();
 
-  return 'admin/node/types/'. $form_values['type_name'];
+  return 'admin/settings/content-types/'. $form_values['type_name'];
 }
 
 /**
@@ -195,7 +195,7 @@ function _content_admin_type_delete($typ
 
   $form = array();
   $form['type_name'] = array('#type' => 'value', '#value' => $type_name);
-  return confirm_form('_content_admin_type_delete', $form, t('Are you sure you want to delete the content type %type?', array('%type' => theme('placeholder', $type['label']))), 'admin/node/types', t('If you have any content left in this content type, it will be permanently deleted. This action cannot be undone.'), t('Delete'), t('Cancel'));
+  return confirm_form('_content_admin_type_delete', $form, t('Are you sure you want to delete the content type %type?', array('%type' => theme('placeholder', $type['label']))), 'admin/settings/content-types', t('If you have any content left in this content type, it will be permanently deleted. This action cannot be undone.'), t('Delete'), t('Cancel'));
 }
 
 /**
@@ -217,7 +217,7 @@ function _content_admin_type_delete_subm
 
     drupal_set_message(t('Deleted content type %type.', array('%type' => theme('placeholder', $type['label']))));
     content_clear_type_cache();
-    return 'admin/node/types';
+    return 'admin/settings/content-types';
   }
 }
 
@@ -244,8 +244,8 @@ function _content_admin_field_overview($
     $row[] = $field['field_name'];
     $row[] = $field_types[$field['type']]['label'];
 
-    $row[] = l(t('configure'), 'admin/node/types/'. $type_name .'/fields/'. $field['field_name']);
-    $row[] = l(t('remove'), 'admin/node/types/'. $type_name .'/fields/'. $field['field_name'] .'/remove');
+    $row[] = l(t('configure'), 'admin/settings/content-types/'. $type_name .'/fields/'. $field['field_name']);
+    $row[] = l(t('remove'), 'admin/settings/content-types/'. $type_name .'/fields/'. $field['field_name'] .'/remove');
 
     $rows[] = $row;
   }
@@ -388,7 +388,7 @@ function _content_admin_field_add_existi
 
   drupal_set_message(t('Added field %label.', array('%label' => theme('placeholder', $prior_instance['label']))));
   content_clear_type_cache();
-  return 'admin/node/types/'. $form_values['type_name'] .'/fields';
+  return 'admin/settings/content-types/'. $form_values['type_name'] .'/fields';
 }
 
 /**
@@ -430,7 +430,7 @@ function _content_admin_field_add_new_su
   }
 
   drupal_set_message(t('Created field %label.', array('%label' => theme('placeholder', $form_values['label']))));
-  return 'admin/node/types/'. $form_values['type_name'] .'/fields/'. $field_name;
+  return 'admin/settings/content-types/'. $form_values['type_name'] .'/fields/'. $field_name;
 }
 
 /**
@@ -449,7 +449,7 @@ function _content_admin_field_remove($ty
     '#type' => 'value',
     '#value' => $field_name,
   );
-  return confirm_form('_content_admin_field_remove', $form, t('Are you sure you want to remove the field %field?', array('%field' => theme('placeholder', $field['widget']['label']))), 'admin/node/types/'. $type_name .'/fields', t('If you have any content left in this field, it will be lost. This action cannot be undone.'), t('Remove'), t('Cancel'));
+  return confirm_form('_content_admin_field_remove', $form, t('Are you sure you want to remove the field %field?', array('%field' => theme('placeholder', $field['widget']['label']))), 'admin/settings/content-types/'. $type_name .'/fields', t('If you have any content left in this field, it will be lost. This action cannot be undone.'), t('Remove'), t('Cancel'));
 }
 
 /**
@@ -487,7 +487,7 @@ function _content_admin_field_remove_sub
       drupal_set_message(t('The field %field no longer exists in any content type, so it was deleted.', array('%field' => theme('placeholder', $field['widget']['label']))));
     }
     content_clear_type_cache();
-    return 'admin/node/types/'. $form_values['type_name'] .'/fields';
+    return 'admin/settings/content-types/'. $form_values['type_name'] .'/fields';
   }
 }
 
@@ -663,7 +663,7 @@ function _content_admin_field_submit($fo
   }
   content_alter_db_field($prev_field, $prev_columns, $new_field, $new_columns);
 
-  return 'admin/node/types/'. $form_values['type_name'] .'/fields';
+  return 'admin/settings/content-types/'. $form_values['type_name'] .'/fields';
 }