--- faq/faq.module	2007-03-09 05:50:12.000000000 -0500
+++ faq.module	2007-03-14 11:21:36.000000000 -0400
@@ -91,7 +91,7 @@
 
     if (arg(0) == 'faq' && is_numeric(arg(1))) {
       $items[] = array('path' => 'faq/'. arg(1), 
-	'title' => t('Frequently Asked Questions'),
+	#'title' => t('Frequently Asked Questions'),
 	'callback' => 'faq_page',
 	'callback arguments' => array(arg(1)),
 	'access' => user_access('view faq'),
@@ -210,6 +210,12 @@
     '#default_value' => variable_get('faq_more_link', t('>> more')),
     );
 
+  $form['questions']['description'] = array('#type' => 'textarea',
+    '#title' => t('Description'),
+    '#default_value' => variable_get('faq_description', ''),
+    '#description' => t('Your FAQ description.')
+  );
+
 
   $form['category'] = array('#type' => 'fieldset', 
     '#title' => t('Categories'), 
@@ -258,6 +264,7 @@
     variable_set('faq_category_display', $form_values['category_display']);
     variable_set('faq_use_teaser', $form_values['use_teaser']);
     variable_set('faq_more_link', $form_values['more_link']);
+    variable_set('faq_description', $form_values['description']);
     drupal_set_message(t('Configuration has been updated.'));
 
     if (variable_get('faq_use_categories', FALSE) && !module_exists("taxonomy")) {
@@ -353,7 +360,7 @@
 	    }
 
 	    if (taxonomy_term_count_nodes($term->tid)) {
-	      $output .= "<li>". l(t($term->name), "faq/$term->tid") ."</li>";
+	      $output .= "<li>". l(t($term->name), "faq/$term->tid") ."<p>". t($term->description) . "</p></li>";
 	    }
 
 	    while ($depth > 0) {
@@ -381,7 +388,8 @@
     }
   }
 
-  $output = '<div class="content"><div class="faq">'. $output. $output_answers ."</div></div>\n";
+  $faq_description = variable_get('faq_description', '');
+  $output = '<div class="content"><div class="faq"><p>'. t($faq_description). '</p>'. $output. $output_answers ."</div></div>\n";
 
   return $output;
 }
@@ -491,6 +499,7 @@
   }
 
   $output .= $header;
+  $output .= '<div class="faq_qa_description">' .t($term->description) . "</div>\n";
   $output .= '<div class="'.$class.'">' ."\n";
 
   while ($node = db_fetch_object($result)) {
@@ -527,7 +536,7 @@
       $output_answers .= $indent;
       $ans_depth++;
     }
-    $output_answers .= $header ."<dl>\n". $answers ."\n</dl>\n";
+    $output_answers .= "<dl>\n". $answers ."\n</dl>\n";
 	while ($ans_depth > 0) {
 	  $output_answers .= "</div>\n";
 	  $ans_depth--;