Merge branch 'master' into solr-docs-reorg

Added appendices/index.rst to the contents.rst main TOC

Conflicts:
	doc/index.rst

ckan/public/base/javascript/main.js

@@ -35,7 +35,11 @@ this.ckan = this.ckan || {};
       ckan.i18n.load(data);
       ckan.module.initialize();
     });
-    jQuery('[data-target="popover"]').popover();
+
+    if (jQuery.fn.popover !== undefined) {
+      jQuery('[data-target="popover"]').popover();
+    }
+
   };
 
   /* Returns a full url for the current site with the provided path appended.

doc/conf.py

@@ -80,7 +80,7 @@
 #source_encoding = 'utf-8'
 
 # The master toctree document.
-master_doc = 'index'
+master_doc = 'contents'
 
 # General information about the project.
 project = u'CKAN'
@@ -237,7 +237,7 @@
 # Grouping the document tree into LaTeX files. List of tuples
 # (source start file, target name, title, author, document class [howto/manual]).
 latex_documents = [
-  ('index', 'ComprehensiveKnowledgeArchiveNetworkCKAN.tex', ur'Comprehensive Knowledge Archive Network (CKAN) Developer Documentation',
+  ('contents', 'ComprehensiveKnowledgeArchiveNetworkCKAN.tex', ur'Comprehensive Knowledge Archive Network (CKAN) Developer Documentation',
    ur'Open Knowledge Foundation', 'manual'),
 ]
 

doc/contents.rst

@@ -0,0 +1,19 @@
+======================
+Full table of contents
+======================
+
+.. toctree::
+
+   index
+   installing
+   upgrading
+   getting-started
+   features
+   extensions/index
+   theming
+   api
+   contributing
+   test
+   configuration
+   changelog
+   appendices/index

doc/index.rst

@@ -34,21 +34,3 @@ advanced documentation last:
   covering CKAN's config file options and the differences between CKAN
   releases.
 
-.. toctree::
-   :hidden:
-   :maxdepth: 2
-
-   user-guide
-   sysadmin-guide
-   installing
-   upgrading
-   getting-started
-   features
-   extensions/index
-   theming
-   api
-   contributing
-   test
-   configuration
-   changelog
-   appendices/index