From b22595da96013de18f4a2bab5e6333d75a650554 Mon Sep 17 00:00:00 2001
From: Théo Zimmermann
Date: Sun, 10 Jun 2018 21:50:39 +0200
Subject: Move indexes on top on the TOC. Closes #7764.

---
 doc/sphinx/index.rst | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/doc/sphinx/index.rst b/doc/sphinx/index.rst
index 136f9088b1..bd3bd93dd9 100644
--- a/doc/sphinx/index.rst
+++ b/doc/sphinx/index.rst
@@ -10,6 +10,18 @@
 Table of contents
 ------------------
 
+.. toctree::
+   :caption: Indexes
+
+   genindex
+   coq-cmdindex
+   coq-tacindex
+   coq-optindex
+   coq-exnindex
+
+.. No entries yet
+  * :index:`thmindex`
+
 .. toctree::
    :caption: The language
 
@@ -65,18 +77,6 @@ Table of contents
 
    zebibliography
 
-.. toctree::
-   :caption: Indexes
-	     
-   genindex
-   coq-cmdindex
-   coq-tacindex	      
-   coq-optindex	      
-   coq-exnindex	      
-   
-.. No entries yet
-  * :index:`thmindex`
-
 This material (the Coq Reference Manual) may be distributed only subject to the
 terms and conditions set forth in the Open Publication License, v1.0 or later
 (the latest version is presently available at
-- 
cgit v1.2.3


From 7f528cdb0ee42a40792d242357a239969f51cada Mon Sep 17 00:00:00 2001
From: Théo Zimmermann
Date: Mon, 11 Jun 2018 09:15:39 +0200
Subject: Add introduction and credits to the TOC.

Move credits to its own chapter (closes #6573).
---
 doc/sphinx/conf.py          | 1 -
 doc/sphinx/credits.rst      | 5 +++++
 doc/sphinx/index.rst        | 9 ++++++---
 doc/sphinx/introduction.rst | 2 ++
 4 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/doc/sphinx/conf.py b/doc/sphinx/conf.py
index 135c24aed9..8127d3df3f 100755
--- a/doc/sphinx/conf.py
+++ b/doc/sphinx/conf.py
@@ -104,7 +104,6 @@ exclude_patterns = [
     'Thumbs.db',
     '.DS_Store',
     'introduction.rst',
-    'credits.rst',
     'README.rst',
     'README.template.rst'
 ]
diff --git a/doc/sphinx/credits.rst b/doc/sphinx/credits.rst
index a756597986..2562dec468 100644
--- a/doc/sphinx/credits.rst
+++ b/doc/sphinx/credits.rst
@@ -1,3 +1,8 @@
+.. include:: preamble.rst
+.. include:: replaces.rst
+
+.. _credits:
+
 -------------------------------------------
 Credits
 -------------------------------------------
diff --git a/doc/sphinx/index.rst b/doc/sphinx/index.rst
index bd3bd93dd9..f3ae493817 100644
--- a/doc/sphinx/index.rst
+++ b/doc/sphinx/index.rst
@@ -1,10 +1,7 @@
-.. _introduction:
-
 .. include:: preamble.rst
 .. include:: replaces.rst
 
 .. include:: introduction.rst
-.. include:: credits.rst
 
 ------------------
 Table of contents
@@ -22,6 +19,12 @@ Table of contents
 .. No entries yet
   * :index:`thmindex`
 
+.. toctree::
+   :caption: Preamble
+
+   self
+   credits
+
 .. toctree::
    :caption: The language
 
diff --git a/doc/sphinx/introduction.rst b/doc/sphinx/introduction.rst
index 75ff72c4da..20e4069f45 100644
--- a/doc/sphinx/introduction.rst
+++ b/doc/sphinx/introduction.rst
@@ -1,3 +1,5 @@
+.. _introduction:
+
 ------------------------
 Introduction
 ------------------------
-- 
cgit v1.2.3