Merge pull request #1351 from kaedroho/docs-restructure-again

Further docs restructuring

docs/advanced_topics/deploying.rst

@@ -4,7 +4,7 @@ Deploying Wagtail
 On your server
 ~~~~~~~~~~~~~~
 
-Wagtail is straightforward to deploy on modern Linux-based distributions, but see the section on :doc:`performance </howto/performance>` for the non-Python services we recommend. If you are running Debian or Ubuntu, this installation script for our Vagrant box may be useful:
+Wagtail is straightforward to deploy on modern Linux-based distributions, but see the section on :doc:`performance </advanced_topics/performance>` for the non-Python services we recommend. If you are running Debian or Ubuntu, this installation script for our Vagrant box may be useful:
 
 `github.com/torchbox/wagtaildemo/blob/master/etc/install/install.sh <https://github.com/torchbox/wagtaildemo/blob/master/etc/install/install.sh>`_
 

docs/advanced_topics/index.rst

@@ -1,5 +1,5 @@
-How to
-======
+Advanced topics
+===============
 
 
 .. toctree::

docs/getting_started/index.rst

@@ -36,7 +36,7 @@ Your site is now accessible at ``http://localhost:8000``, with the admin backend
 
 There are a few optional packages which are not installed by default but are recommended to improve performance or add features to Wagtail, including:
 
- * :doc:`Elasticsearch </howto/performance>`.
+ * :doc:`Elasticsearch </advanced_topics/performance>`.
  * :ref:`image_feature_detection`.
 
 

docs/index.rst

@@ -13,11 +13,11 @@ Below are some useful links to help you get started with Wagtail.
 
 * **Creating your Wagtail site**
 
-  * :doc:`reference/pages/creating_pages`
-  * :doc:`reference/pages/writing_templates`
-  * :doc:`reference/images/index`
-  * :doc:`reference/search/index`
-  * :doc:`howto/third_party_tutorials`
+  * :doc:`topics/creating_pages`
+  * :doc:`topics/writing_templates`
+  * :doc:`topics/images/index`
+  * :doc:`topics/search/index`
+  * :doc:`advanced_topics/third_party_tutorials`
 
 
 * **Using Wagtail**
@@ -34,7 +34,8 @@ Index
    :titlesonly:
 
    getting_started/index
-   howto/index
+   topics/index
+   advanced_topics/index
    reference/index
    support
    editor_manual/index

docs/reference/index.rst

@@ -6,8 +6,6 @@ Reference
     :maxdepth: 2
 
     pages/index
-    images/index
-    search/index
     snippets
     form_builder
     contrib/index

docs/reference/pages/index.rst

@@ -11,12 +11,8 @@ The presentation of your content, the actual webpages, includes the normal use o
 .. toctree::
     :maxdepth: 2
 
-    theory
-    creating_pages
-    writing_templates
     model_recipes
     editing_api
-    streamfield
     model_reference
     queryset_reference
     advanced_topics/privacy

docs/topics/index.rst

@@ -0,0 +1,13 @@
+======
+Topics
+======
+
+.. toctree::
+    :maxdepth: 2
+
+    theory
+    creating_pages
+    writing_templates
+    images/index
+    search/index
+    streamfield