Index: openacs-4/packages/faq/www/one-faq.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/faq/www/one-faq.adp,v
diff -u -N -r1.13 -r1.14
--- openacs-4/packages/faq/www/one-faq.adp	10 Mar 2005 18:27:41 -0000	1.13
+++ openacs-4/packages/faq/www/one-faq.adp	14 Mar 2005 13:44:46 -0000	1.14
@@ -22,7 +22,9 @@
 <if @separate_p@ false>
     <li>
       <a href="#@one_question.entry_id@">@one_question.question;noquote@</a>
+<if @use_categories_p@>
       <a href="categories/categorize?object_id=@one_question.entry_id@">Categorize</a>
+</if>
     </li>
 </if>
 </multiple>
Index: openacs-4/packages/faq/www/admin/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/faq/www/admin/index.adp,v
diff -u -N -r1.11 -r1.12
--- openacs-4/packages/faq/www/admin/index.adp	1 Mar 2005 14:32:58 -0000	1.11
+++ openacs-4/packages/faq/www/admin/index.adp	14 Mar 2005 13:44:47 -0000	1.12
@@ -8,7 +8,7 @@
   <li><a href="faq-add-edit">#faq.Create_a_new_FAQ#</a></lI>
 
 <li><a href=configure?<%=[export_url_vars return_url]%>>#faq.Configure#</a>
-<if @use_categories_p@>
+<if @use_categories_p@ and @category_container@ eq "package_id">
    <li><a href="@category_map_url@" class="action_link">#faq.Site_wide_categories#</a>
 </if>
 </ul>
Index: openacs-4/packages/faq/www/admin/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/faq/www/admin/index.tcl,v
diff -u -N -r1.9 -r1.10
--- openacs-4/packages/faq/www/admin/index.tcl	1 Mar 2005 00:01:36 -0000	1.9
+++ openacs-4/packages/faq/www/admin/index.tcl	14 Mar 2005 13:44:47 -0000	1.10
@@ -82,6 +82,7 @@
 
 # for categories
 set use_categories_p [parameter::get -parameter "EnableCategoriesP"]
+set category_container [parameter::get -parameter "CategoryContainer"]
 set category_map_url [export_vars -base "[site_node::get_package_url -package_key categories]cadmin/one-object" { { object_id $package_id } }]
 
 set return_url [ns_conn url]