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	16 Nov 2007 11:17:43 -0000
@@ -52,62 +52,86 @@
     'required' => 0,
     'weight' => 0,
   );
-  $form['name'] = array('#type' => 'textfield',
+  $form['vocab_identification'] = array(
+    '#type' => 'fieldset',
+    '#title' => t('Identification'),
+    '#collapsible' => TRUE,
+  ); 
+  $form['vocab_identification']['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. <em>"Tags"</em>.'),
     '#required' => TRUE,
   );
-  $form['description'] = array('#type' => 'textarea',
+  $form['vocab_identification']['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 to be displayed on taxonomy/term pages and RSS feeds.'),
   );
-  $form['help'] = array('#type' => 'textfield',
+  $form['vocab_identification']['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. <em>"Enter a comma separated list of words".</em>'),
   );
-  $form['nodes'] = array('#type' => 'checkboxes',
+   $form['vocab_content_types'] = array(
+    '#type' => 'fieldset',
+    '#title' => t('Content types'),
+    '#collapsible' => TRUE,
+  );
+  $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)))),
+    '#description' => t('Select content types to categorize using this vocabulary.'),
   );
-  $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['vocab_settings'] = array(
+    '#type' => 'fieldset',
+    '#title' => t('Settings'),
+    '#collapsible' => 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']['required'] = array('#type' => 'checkbox',
+    '#title' => t('Required'),
+    '#default_value' => $edit['required'],
+    '#description' => t('At least one term in this vocabulary must be selected when submitting a post.'),
+  );
+  $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',
-    '#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']['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.'),
+    '#description' => t('Vocabularies are displayed in ascending order by weight.'),
+  );
+  $form['vocab_structure'] = array(
+    '#type' => 'fieldset',
+    '#title' => t('Structure'),
+    '#collapsible' => TRUE,
+    '#collapsed' => TRUE,
+  );
+  $form['vocab_structure']['hierarchy'] = array('#type' => 'checkbox',
+    '#title' => t('Hierarchy'),
+    '#default_value' => $edit['hierarchy'],
+    '#description' => t('Allows terms to have one or more children.'),
+  );
+  $form['vocab_structure']['parents'] = array('#type' => 'checkbox',
+    '#title' => t('Multiple parents'),
+    '#default_value' => $edit['hierarchy'],
+    '#description' => t('Allows terms to have more than one parent.'),
+  );
+  $form['vocab_structure']['relations'] = array('#type' => 'checkbox',
+    '#title' => t('Related terms'),
+    '#default_value' => $edit['relations'],
+    '#description' => t('Allows related terms in this vocabulary.'),
   );
-
   $form['submit'] = array('#type' => 'submit', '#value' => t('Save'));
   if (isset($edit['vid'])) {
     $form['delete'] = array('#type' => 'submit', '#value' => t('Delete'));
Index: modules/taxonomy/taxonomy.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/taxonomy/taxonomy.module,v
retrieving revision 1.391
diff -u -r1.391 taxonomy.module
--- modules/taxonomy/taxonomy.module	14 Nov 2007 13:39:58 -0000	1.391
+++ modules/taxonomy/taxonomy.module	16 Nov 2007 11:00:12 -0000
@@ -1174,7 +1174,7 @@
     case 'admin/content/taxonomy':
       return '<p>'. t('The taxonomy module allows content to be classified into categories and subcategories, or vocabularies and terms. Terms may be organized in controlled vocabularies (vocabularies with multiple lists of categories), in thesauri (controlled vocabularies that indicate the relationship of terms), in taxonomies (controlled vocabularies where relationships are indicated hierarchically), or in free vocabularies (vocabularies where tags are defined during content creation). To view and manage the terms of each vocabulary, click on the associated <em>list terms</em> link. To delete a vocabulary and all its terms, choose "edit vocabulary".') .'</p>';
     case 'admin/content/taxonomy/add/vocabulary':
-      return '<p>'. t("When you create a controlled vocabulary you are creating 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. For more complex implementations, you might create a hierarchical list of categories.") .'</p>';
+      return '<p>'. t('Free-tagging vocabularies allow tags to be created by users on the fly when posting content. Otherwise terms can only be created by users with the "administer taxonomy" permission; useful where you need more control over terms - short lists or complex hierarchies for example. For more information about the various options available, see the taxonomy help page.') .'</p>';
   }
 }