Index: modules/taxonomy/taxonomy.admin.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/taxonomy/taxonomy.admin.inc,v
retrieving revision 1.7
diff -u -r1.7 taxonomy.admin.inc
--- modules/taxonomy/taxonomy.admin.inc	12 Nov 2007 19:06:33 -0000	1.7
+++ modules/taxonomy/taxonomy.admin.inc	15 Nov 2007 23:29:26 -0000
@@ -52,62 +52,80 @@
     'required' => 0,
     'weight' => 0,
   );
-  $form['name'] = array('#type' => 'textfield',
+  $form['vocab_attributes'] = array(
+    '#type' => 'fieldset',
+    '#title' => t('Identification'),
+    '#collapsible' => TRUE,
+  );
+  $form['vocab_attributes']['name'] = array('#type' => 'textfield',
     '#title' => t('Vocabulary name'),
     '#default_value' => $edit['name'],
     '#maxlength' => 255,
-    '#description' => t('The name for this vocabulary. Example: "Topic".'),
+    '#description' => t('The name for this vocabulary. Example: "Tags".'),
     '#required' => TRUE,
   );
-  $form['description'] = array('#type' => 'textarea',
+  $form['vocab_attributes']['description'] = array('#type' => 'textarea',
     '#title' => t('Description'),
     '#default_value' => $edit['description'],
-    '#description' => t('Description of the vocabulary; can be used by modules.'),
+    '#description' => t('Description of the vocabulary; displayed on taxonomy/term pages and rss feeds.'),
   );
-  $form['help'] = array('#type' => 'textfield',
+  $form['vocab_attributes']['help'] = array('#type' => 'textfield',
     '#title' => t('Help text'),
     '#maxlength' => 255,
     '#default_value' => $edit['help'],
-    '#description' => t('Instructions to present to the user when choosing a term.'),
+    '#description' => t('Instructions to present to the user when selecting terms.'),
+  );
+   $form['vocab_content_types'] = array(
+    '#type' => 'fieldset',
+    '#title' => t('Content types'),
+    '#collapsible' => TRUE,
   );
-  $form['nodes'] = array('#type' => 'checkboxes',
+  $form['vocab_content_types']['nodes'] = array('#type' => 'checkboxes',
     '#title' => t('Content types'),
     '#default_value' => $edit['nodes'],
     '#options' => node_get_types('names'),
     '#description' => t('A list of content types you would like to categorize using this vocabulary.'),
   );
-  $form['hierarchy'] = array('#type' => 'radios',
-    '#title' => t('Hierarchy'),
-    '#default_value' => $edit['hierarchy'],
-    '#options' => array(t('Disabled'), t('Single'), t('Multiple')),
-    '#description' => t('Allows <a href="@help-url">a tree-like hierarchy</a> between terms of this vocabulary.', array('@help-url' => url('admin/help/taxonomy', array('absolute' => TRUE)))),
+  $form['vocab_settings'] = array(
+    '#type' => 'fieldset',
+    '#title' => t('Settings'),
+    '#collapsible' => TRUE,
   );
-  $form['relations'] = array('#type' => 'checkbox',
-    '#title' => t('Related terms'),
-    '#default_value' => $edit['relations'],
-    '#description' => t('Allows <a href="@help-url">related terms</a> in this vocabulary.', array('@help-url' => url('admin/help/taxonomy', array('absolute' => TRUE)))),
-  );
-  $form['tags'] = array('#type' => 'checkbox',
+  $form['vocab_settings']['tags'] = array('#type' => 'checkbox',
     '#title' => t('Free tagging'),
     '#default_value' => $edit['tags'],
     '#description' => t('Content is categorized by typing terms instead of choosing from a list.'),
   );
-  $form['multiple'] = array('#type' => 'checkbox',
+  $form['vocab_settings']['multiple'] = array('#type' => 'checkbox',
     '#title' => t('Multiple select'),
     '#default_value' => $edit['multiple'],
     '#description' => t('Allows posts to have more than one term from this vocabulary (always true for free tagging).'),
   );
-  $form['required'] = array('#type' => 'checkbox',
+  $form['vocab_settings']['required'] = array('#type' => 'checkbox',
     '#title' => t('Required'),
     '#default_value' => $edit['required'],
     '#description' => t('If enabled, every post <strong>must</strong> have at least one term in this vocabulary.'),
   );
-  $form['weight'] = array('#type' => 'weight',
+  $form['vocab_settings']['hierarchy'] = array('#type' => 'checkbox',
+    '#title' => t('Hierarchy'),
+    '#default_value' => $edit['hierarchy'],
+    '#description' => t('Allows terms to have one or more children.'),
+  );
+  $form['vocab_settings']['parents'] = array('#type' => 'checkbox',
+    '#title' => t('Multiple parents'),
+    '#default_value' => $edit['hierarchy'],
+    '#description' => t('Allows terms to have more than one parent.'),
+  );
+  $form['vocab_settings']['relations'] = array('#type' => 'checkbox',
+    '#title' => t('Related terms'),
+    '#default_value' => $edit['relations'],
+    '#description' => t('Allows related terms in this vocabulary.'),
+  );
+  $form['vocab_settings']['weight'] = array('#type' => 'weight',
     '#title' => t('Weight'),
     '#default_value' => $edit['weight'],
     '#description' => t('In listings, the heavier vocabularies will sink and the lighter vocabularies will be positioned nearer the top.'),
   );
-
   $form['submit'] = array('#type' => 'submit', '#value' => t('Save'));
   if (isset($edit['vid'])) {
     $form['delete'] = array('#type' => 'submit', '#value' => t('Delete'));