Merge remote-tracking branch 'origin/master'

ckan · Mar 20, 2012 · cced74c · cced74c
2 parents 05efec6 + 4dae5b4
commit cced74c
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 0 deletions.
diff --git a/doc/commenting.rst b/doc/commenting.rst
@@ -0,0 +1,23 @@
+=======================
+Comments and Commenting
+=======================
+
+In a default CKAN install commenting is disabled. To enable it you have to
+install and enable the disqus (commenting) extension:
+
+https://github.com/okfn/ckanext-disqus/
+
+Please read and follow the instructions there (as well as the standard
+:doc:`extensions` documentation).
+
+Important Note
+--------------
+
+Once installed and enabled, the presence of comments on a given page is
+configured by your theme (see the documentation in the disqus extension for
+details).
+
+In the default CKAN theme (as of v1.6.1), comments will be shown only on dataset
+and resource pages (and recent comments only on the
+:doc:`administrative-dashboard`).
+
diff --git a/doc/index.rst b/doc/index.rst
@@ -29,6 +29,7 @@ Customizing and Extending
    :maxdepth: 2
 
    theming
+   commenting
    extensions
    writing-extensions
    forms