Index: faq.admin.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/faq/Attic/faq.admin.inc,v
retrieving revision 1.1.2.3
diff -u -p -r1.1.2.3 faq.admin.inc
--- faq.admin.inc 10 Jul 2008 15:42:00 -0000 1.1.2.3
+++ faq.admin.inc 5 Sep 2008 12:42:43 -0000
@@ -255,11 +255,18 @@ function faq_categories_settings_form()
     $form['faq_category_advanced']['faq_omit_vocabulary'] = array(
       '#type' => 'select',
       '#title' => t('Omit vocabulary'),
-      '#description' => t("Terms from these vocabularies will be excluded from the FAQ pages."),
+      '#description' => t('Terms from these vocabularies will be excluded from the FAQ pages.'),
       '#default_value' => variable_get('faq_omit_vocabulary', 0),
       '#options' => $vocab_options,
       '#multiple' => TRUE,
     );
+
+    $form['faq_category_advanced']['faq_enable_term_links'] = array(
+      '#type' => 'checkbox',
+      '#title' => t('Enable FAQ taxonomy links'),
+      '#description' => t('Node links to taxonomy terms will be re-written to point at the FAQ pages instead.'),
+      '#default_value' => variable_get('faq_enable_term_links', 1),
+    );
   }

   return system_settings_form($form);
Index: faq.install
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/faq/Attic/faq.install,v
retrieving revision 1.1.4.16.2.17
diff -u -p -r1.1.4.16.2.17 faq.install
--- faq.install 20 Jul 2008 12:57:49 -0000 1.1.4.16.2.17
+++ faq.install 5 Sep 2008 12:42:43 -0000
@@ -75,6 +75,7 @@ function faq_uninstall() {
   variable_del('faq_category_listing');
   variable_del('faq_count');
   variable_del('faq_omit_vocabulary');
+  variable_del('faq_enable_term_links');
   variable_del('faq_disable_node_links');
   variable_del('faq_default_sorting');

Index: faq.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/faq/faq.module,v
retrieving revision 1.1.4.52.2.75
diff -u -p -r1.1.4.52.2.75 faq.module
--- faq.module 1 Sep 2008 11:02:55 -0000 1.1.4.52.2.75
+++ faq.module 5 Sep 2008 12:42:44 -0000
@@ -981,7 +981,7 @@ function faq_site_map() {
  * Change the term links on a node to point at the appropriate faq page.
  */
 function faq_link_alter(&$links, $node) {
-  if (!variable_get('faq_use_categories', FALSE) || !module_exists("taxonomy")) {
+  if (!variable_get('faq_use_categories', FALSE) || !module_exists("taxonomy") || !variable_get('faq_enable_term_links', 1)) {
     return;
   }
   $vocabularies = taxonomy_get_vocabularies('faq');