From a362200d479ef4876f198d01f8def9aca38bd09a Mon Sep 17 00:00:00 2001
From: Daniele Procida <daniele@vurt.org>
Date: Thu, 11 Mar 2021 17:22:54 +0000
Subject: [PATCH] Moved documentation topics to group them by theme.

Reordered items in:

* _templates/globaltoc.html
* contents.rst
---
 doc/en/_templates/globaltoc.html |  4 ++--
 doc/en/contents.rst              | 41 ++++++++++++++++++++++++++------
 2 files changed, 36 insertions(+), 9 deletions(-)

diff --git a/doc/en/_templates/globaltoc.html b/doc/en/_templates/globaltoc.html
index 25666d8db..4069e59eb 100644
--- a/doc/en/_templates/globaltoc.html
+++ b/doc/en/_templates/globaltoc.html
@@ -3,11 +3,11 @@
 <ul>
   <li><a href="{{ pathto('index') }}">Home</a></li>
   <li><a href="{{ pathto('getting-started') }}">Get started</a></li>
-  <li><a href="{{ pathto('contents') }}">Contents</a></li>
-  <li><a href="{{ pathto('reference') }}">API Reference</a></li>
   <li><a href="{{ pathto('example/index') }}">Examples</a></li>
   <li><a href="{{ pathto('customize') }}">Customize</a></li>
+  <li><a href="{{ pathto('reference') }}">API Reference</a></li>
   <li><a href="{{ pathto('plugin_list') }}">3rd party plugins</a></li>
+  <li><a href="{{ pathto('contents') }}">Complete table of contents</a></li>
   <li><a href="{{ pathto('changelog') }}">Changelog</a></li>
   <li><a href="{{ pathto('contributing') }}">Contributing</a></li>
   <li><a href="{{ pathto('backwards-compatibility') }}">Backwards Compatibility</a></li>
diff --git a/doc/en/contents.rst b/doc/en/contents.rst
index a439f1eda..1bcc7f12b 100644
--- a/doc/en/contents.rst
+++ b/doc/en/contents.rst
@@ -7,38 +7,65 @@ Full pytest documentation
 
 .. `Download latest version as EPUB <http://media.readthedocs.org/epub/pytest/latest/pytest.epub>`_
 
+
+Start here
+-----------
+
 .. toctree::
    :maxdepth: 2
 
    getting-started
+
+
+How-to guides
+-------------
+
+.. toctree::
+   :maxdepth: 2
+
    usage
    existingtestsuite
    assert
-   fixture
    mark
    monkeypatch
    tmpdir
    capture
-   warnings
-   doctest
    skipping
    parametrize
+   plugins
+   nose
+   bash-completion
+
+
+Reference guides
+-----------------
+
+.. toctree::
+   :maxdepth: 2
+
+   fixture
+   warnings
+   doctest
    cache
    unittest
-   nose
    xunit_setup
-   plugins
    plugin_list
    writing_plugins
    logging
+   customize
    reference
 
+
+Further topics
+-----------------
+
+.. toctree::
+   :maxdepth: 2
+
    goodpractices
    flaky
    pythonpath
-   customize
    example/index
-   bash-completion
 
    backwards-compatibility
    deprecations