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.15 -r1.16
--- openacs-4/packages/faq/www/one-faq.adp	29 Mar 2005 22:13:11 -0000	1.15
+++ openacs-4/packages/faq/www/one-faq.adp	8 Jun 2006 01:29:22 -0000	1.16
@@ -59,3 +59,14 @@
 </if>
 </td></tr>
 </table>
+
+<if @gc_comments@ not nil>
+  <p>#faq.lt_Comments_on_this_faq#
+    <ul>
+      @gc_comments;noquote@
+    </ul>
+  </p>
+</if>
+<if @gc_link@ not nil>
+  <p>@gc_link;noquote@</p>
+</if>
Index: openacs-4/packages/faq/www/one-faq.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/faq/www/one-faq.tcl,v
diff -u -N -r1.6 -r1.7
--- openacs-4/packages/faq/www/one-faq.tcl	5 Apr 2005 15:46:05 -0000	1.6
+++ openacs-4/packages/faq/www/one-faq.tcl	8 Jun 2006 01:29:22 -0000	1.7
@@ -89,4 +89,14 @@
                         -url [ad_conn url]?faq_id=$faq_id \
                         ]
 
+set return_url "[ad_conn url]?faq_id=$faq_id"
+
+if { [apm_package_installed_p "general-comments"] && [ad_parameter "GeneralCommentsP" -package_id [ad_conn package_id]] } {
+    set gc_link [general_comments_create_link $faq_id $return_url]
+    set gc_comments [general_comments_get_comments $faq_id $return_url]
+} else {
+    set gc_link ""
+    set gc_comments ""
+}
+
 ad_return_template