? .DS_Store
? .swp
? cache_api_07.patch
? cleanup_term_form_ui_00.patch
? clear_cache_06.patch
? synonym_collapsing_00.patch
? synonym_collapsing_01.patch
? synonym_collapsing_02.patch
? tmp.diff
? vocabulary_checkboxes_00.patch
? vocabulary_checkboxes_01.patch
? vocabulary_checkboxes_02.patch
? modules/.DS_Store
? sites/.DS_Store
? sites/default/files
? sites/default/settings.php
Index: modules/taxonomy/taxonomy.admin.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/taxonomy/taxonomy.admin.inc,v
retrieving revision 1.55
diff -u -p -r1.55 taxonomy.admin.inc
--- modules/taxonomy/taxonomy.admin.inc	20 Jun 2009 18:32:04 -0000	1.55
+++ modules/taxonomy/taxonomy.admin.inc	28 Jun 2009 09:32:01 -0000
@@ -700,23 +700,17 @@ function taxonomy_form_term(&$form_state
     return array_merge($form, taxonomy_term_confirm_parents($form_state, $vocabulary));
   }
 
-  $form['identification'] = array(
-    '#type' => 'fieldset',
-    '#title' => t('Identification'),
-    '#collapsible' => TRUE,
-  );
-  $form['identification']['name'] = array(
+  $form['name'] = array(
     '#type' => 'textfield',
-    '#title' => t('Term name'),
+    '#title' => t('Name'),
     '#default_value' => $edit['name'],
     '#maxlength' => 255,
-    '#description' => t('The name of this term.'),
     '#required' => TRUE);
-  $form['identification']['description'] = array(
+  $form['description'] = array(
     '#type' => 'textarea',
     '#title' => t('Description'),
     '#default_value' => $edit['description'],
-    '#description' => t('A description of the term. To be displayed on taxonomy/term pages and RSS feeds.'));
+  );
 
   $form['vocabulary_machine_name'] = array(
     '#type' => 'textfield',
@@ -726,9 +720,9 @@ function taxonomy_form_term(&$form_state
 
   field_attach_form('taxonomy_term', (object) $edit, $form, $form_state);
 
-  $form['advanced'] = array(
+  $form['relationships'] = array(
     '#type' => 'fieldset',
-    '#title' => t('Advanced options'),
+    '#title' => t('Relationships'),
     '#collapsible' => TRUE,
     '#collapsed' => $vocabulary->hierarchy < 2,
   );
@@ -747,15 +741,15 @@ function taxonomy_form_term(&$form_state
     }
     $exclude[] = $edit['tid'];
 
-    $form['advanced']['parent'] = _taxonomy_term_select(t('Parents'), $parent, $vocabulary->vid, t('Parent terms') . '.', 1, '<' . t('root') . '>', $exclude);
-    $form['advanced']['relations'] = _taxonomy_term_select(t('Related terms'), array_keys(taxonomy_get_related($edit['tid'])), $vocabulary->vid, NULL, 1, '<' . t('none') . '>', array($edit['tid']));
+    $form['relationships']['parent'] = _taxonomy_term_select(t('Parents'), $parent, $vocabulary->vid, NULL, 1, '<' . t('root') . '>', $exclude);
+    $form['relationships']['similar'] = _taxonomy_term_select(t('Similar terms'), array_keys(taxonomy_get_related($edit['tid'])), $vocabulary->vid, NULL, 1, '<' . t('none') . '>', array($edit['tid']));
   }
-  $form['advanced']['synonyms'] = array(
+  $form['relationships']['synonyms'] = array(
     '#type' => 'textarea',
     '#title' => t('Synonyms'),
     '#default_value' => implode("\n", taxonomy_get_synonyms($edit['tid'])),
     '#description' => t('Synonyms of this term, one synonym per line.'));
-  $form['advanced']['weight'] = array(
+  $form['relationships']['weight'] = array(
     '#type' => 'textfield',
     '#title' => t('Weight'),
     '#size' => 6,