--- modules/taxonomy/taxonomy.module	2009-11-20 06:14:13.000000000 +0100
+++ modules/taxonomy/taxonomy.module	2009-11-24 11:41:53.000000000 +0100
@@ -873,15 +873,28 @@ function taxonomy_term_load($tid) {
 function taxonomy_help($path, $arg) {
   switch ($path) {
     case 'admin/help#taxonomy':
-      $output = '<p>' . t('The taxonomy module allows you to categorize content using various systems of classification. Free-tagging vocabularies are created by users on the fly when they submit posts (as commonly found in blogs and social bookmarking applications). Controlled vocabularies allow for administrator-defined short lists of terms as well as complex hierarchies with multiple relationships between different terms. These methods can be applied to different content types and combined together to create a powerful and flexible method of classifying and presenting your content.') . '</p>';
-      $output .= '<p>' . t('For example, when creating a recipe site, you might want to classify posts by both the type of meal and preparation time. A vocabulary for each allows you to categorize using each criteria independently instead of creating a tag for every possible combination.') . '</p>';
-      $output .= '<p>' . t('Type of Meal: <em>Appetizer, Main Course, Salad, Dessert</em>') . '</p>';
-      $output .= '<p>' . t('Preparation Time: <em>0-30mins, 30-60mins, 1-2 hrs, 2hrs+</em>') . '</p>';
-      $output .= '<p>' . t("Each taxonomy term (often called a 'category' or 'tag' in other systems) automatically provides lists of posts and a corresponding RSS feed. These taxonomy/term URLs can be manipulated to generate AND and OR lists of posts classified with terms. In our recipe site example, it then becomes easy to create pages displaying 'Main courses', '30 minute recipes', or '30 minute main courses and appetizers' by using terms on their own or in combination with others. There are a significant number of contributed modules which you to alter and extend the behavior of the core module for both display and organization of terms.") . '</p>';
-      $output .= '<p>' . t("Terms can also be organized in parent/child relationships from the admin interface. An example would be a vocabulary grouping countries under their parent geo-political regions. The taxonomy module also enables advanced implementations of hierarchy, for example placing Turkey in both the 'Middle East' and 'Europe'.") . '</p>';
-      $output .= '<p>' . t('For more information, see the online handbook entry for <a href="@taxonomy">Taxonomy module</a>.', array('@taxonomy' => 'http://drupal.org/handbook/modules/taxonomy/')) . '</p>';
-      return $output;
-    case 'admin/structure/taxonomy':
+      $output = '<h3>' . t('About') . '</h3>';
+	  $output .= '<p>' . t('The taxonomy module helps classify the content of your website. To classify content you define <em>vocabularies</em> that contain related <em>terms</em>. There are <a href="@taxcontrib">many contributed modules</a> that extend the behavior of the taxonomy module for both display and organization of terms. For more information, see the online handbook entry for <a href="@taxonomy">Taxonomy module</a>.', array('@taxonomy' => 'http://drupal.org/handbook/modules/taxonomy/', '@taxcontrib' => 'http://drupal.org/project/modules?filters=tid:71&solrsort=sis_project_release_usage%20desc')) . '</p>';
+	  $output .= '<h3>' . t('Uses') . '</h3>';
+  	  $output .= '<dl>'; 
+	  $output .= '<dt>' . t('Creating content classification') . '</dt>'; 
+ 	  $output .= '<dd>' . t('Users with sufficient <a href="@perm">permissions</a> can create a classification system from the <a href="@taxo">Taxonomy page</a> by creating <em>vocabularies</em> and adding <em>terms</em>. The page listing the terms provides a drag-and-drop interface for controlling the order of the terms and sub-terms and creating a hierarchy within the vocabulary. A taxonomy vocabulary classifying music by genre with terms and sub-terms could look as follows:', array('@taxo' => url('admin/structure/taxonomy'), '@perm' => url('http://kempes/d7-boris/?q=admin/config/people/permissions', array('fragment'=>'module-taxonomy'))));  	  
+	  $output .= '<ul><li>' . t ('Music <em>vocabulary</em>');
+  	  $output .= '<ul><li>' . t('Jazz <em>term</em>') . '</li>';
+  	  $output .= '<ul><li>' . t('Swing <em>sub-term</em>') . '</li>';
+  	  $output .= '<li>' . t('Fusion <em>sub-term</em>') . '</li></ul></ul>';
+  	  $output .= '<ul><li>' . t('Rock <em>term</em>') . '</li>';
+  	  $output .= '<ul><li>' . t('Country rock <em>sub-term</em>') . '</li>';
+  	  $output .= '<li>' . t('Hard rock <em>sub-term</em>') . '</li></ul></ul></ul>';
+  	  $output .= t('You can assign a sub-term to multiple parent terms. For example <em>fusion</em> can be assigned to both <em>rock</em> and <em>jazz</em>. Contrary to these <em>controlled vocabularies</em> you can also use <em>free-tagging vocabularies</em> to organize content. These allow you to create terms on the fly when you tag content (as commonly found in blogs and social bookmarking applications).') . '</dd>';
+  	  $output .= '<dt>' . t('Assign vocabularies to content type') . '</dt>'; 
+ 	  $output .= '<dd>' . t('When the vocabularies and their terms are built they have to be made available to content type such as articles and blog entries. On the <a href="@ctedit">Content type page</a> you add a <em>Taxonomy term</em> field from the <em>Manage fields</em> tab. On the <em>Content type settings</em> page you can choose the desired vocabulary.', array('@ctedit' => url('admin/structure/types'))) . '</dd>';
+  	  $output .= '<dt>' . t('Classifying content') . '</dt>'; 
+ 	  $output .= '<dd>' . t('After the vocabulary is assigned to the content type, you can start classifying content. You will find the field with terms in the content editing form when you edit or <a href="@addnode">create content</a>.', array('@addnode' => url('node/add'))) . '</dd>';
+  	  $output .= '<dt>' . t('Viewing content and RSS feeds by terms') . '</dt>'; 
+ 	  $output .= '<dd>' . t('Each taxonomy term automatically provides a list of related content and a corresponding RSS feed. For example, if the taxonomy term <em>country rock</em> has id 123 then you find this list by navigating to the path <em>taxonomy/term/123</em>. The RSS feed you find at the path <em>taxonomy/term/123/feed</em>. Taxonomy is fully integrated in the contributed module <a href="@views">views</a> that allows you to generate custom lists of content.', array('@views' => 'http://drupal.org/project/views')) . '</dd>';
+      return $output;    
+	  case 'admin/structure/taxonomy':
       $output = '<p>' . t('Configure the vocabularies and terms for your site.') . '</p>';
       return $output;
     case 'admin/structure/taxonomy/%':
