fix structure

6 files changed, 25 insertions, 22 deletions

diff --git a/checklists/checklist-release.rst b/checklists/checklist-release.rst
index a51c165d..eaefd0b9 100644
--- a/checklists/checklist-release.rst
+++ b/checklists/checklist-release.rst
@@ -17,7 +17,7 @@ For exchange:
 - |releasecheck| make dist for release
 - |releasecheck| verify dist builds from source
 - |releasecheck| upgrade 'demo.taler.net'
-- |releasecheck| run :doc:`demo upgrade checklist <checklist-demo-upgrade>`
+- |releasecheck| run :doc:`demo upgrade checklist </checklists/checklist-demo-upgrade>`
 - |releasecheck| tag repo.
 - |releasecheck| use 'deployment.git/packaging/\*-docker/' to build Debian and Ubuntu packages
 - |releasecheck| upload packages to 'deb.taler.net' (note: only Florian/Christian can sign)
@@ -36,7 +36,7 @@ For merchant (C backend):
 - |releasecheck| make dist for release.
 - |releasecheck| verify dist builds from source
 - |releasecheck| upgrade 'demo.taler.net'
-- |releasecheck| run :doc:`demo upgrade checklist <checklist-demo-upgrade>`
+- |releasecheck| run :doc:`demo upgrade checklist </checklists/checklist-demo-upgrade>`
 - |releasecheck| tag repo.
 - |releasecheck| use 'deployment.git/packaging/\*-docker/' to build Debian and Ubuntu packages
 - |releasecheck| upload packages to 'deb.taler.net' (note: only Florian/Christian can sign)
@@ -54,7 +54,7 @@ For sync:
 - |releasecheck| make dist for release
 - |releasecheck| verify dist builds from source
 - |releasecheck| upgrade 'demo.taler.net'
-- |releasecheck| run :doc:`demo upgrade checklist <checklist-demo-upgrade>`
+- |releasecheck| run :doc:`demo upgrade checklist </checklists/checklist-demo-upgrade>`
 - |releasecheck| tag repo.
 - |releasecheck| use 'deployment.git/packaging/\*-docker/' to build Debian and Ubuntu packages
 - |releasecheck| upload packages to 'deb.taler.net' (note: only Florian/Christian can sign)
@@ -83,7 +83,7 @@ For taler-twister:
 - |releasecheck| make dist for release.
 - |releasecheck| verify dist builds from source
 - |releasecheck| upgrade 'demo.taler.net'
-- |releasecheck| run :doc:`demo upgrade checklist <checklist-demo-upgrade>`
+- |releasecheck| run :doc:`demo upgrade checklist </checklists/checklist-demo-upgrade>`
 - |releasecheck| tag repo.
 - |releasecheck| Upload triplet to ftp-upload.gnu.org/incoming/ftp or /incoming/alpha
 
@@ -92,7 +92,7 @@ For libeufin:
 - |releasecheck| update SPA of bank
 - |releasecheck| build libeufin
 - |releasecheck| upgrade 'demo.taler.net'
-- |releasecheck| run :doc:`demo upgrade checklist <checklist-demo-upgrade>`
+- |releasecheck| run :doc:`demo upgrade checklist </checklists/checklist-demo-upgrade>`
 - |releasecheck| make dist for release.
 - |releasecheck| verify dist builds from source
 - |releasecheck| tag repo.
@@ -104,7 +104,7 @@ For libeufin:
 For Python merchant frontend:
 
 - |releasecheck| upgrade 'demo.taler.net'
-- |releasecheck| run :doc:`demo upgrade checklist <checklist-demo-upgrade>`
+- |releasecheck| run :doc:`demo upgrade checklist </checklists/checklist-demo-upgrade>`
 - |releasecheck| change 'demo.taler.net' deployment to use new tag.
 
 Wallet-core:
@@ -122,14 +122,14 @@ Wallet-core:
 Android-Wallet:
 
 - |releasecheck| build wallet
-- |releasecheck| run :doc:`demo upgrade checklist <checklist-demo-upgrade>`
+- |releasecheck| run :doc:`demo upgrade checklist </checklists/checklist-demo-upgrade>`
 - |releasecheck| tag repo.
 - |releasecheck| upload new wallet release to app store
 
 Webextension-Wallet:
 
 - |releasecheck| build wallet
-- |releasecheck| run :doc:`demo upgrade checklist <checklist-demo-upgrade>`
+- |releasecheck| run :doc:`demo upgrade checklist </checklists/checklist-demo-upgrade>`
 - |releasecheck| tag repo.
 - |releasecheck| upload new wallet release to app store
 
diff --git a/taler-auditor-manual.rst b/taler-auditor-manual.rst
index bb8e7741..cbc2aeff 100644
--- a/taler-auditor-manual.rst
+++ b/taler-auditor-manual.rst
@@ -20,6 +20,10 @@
 Auditor Operator Manual
 #######################
 
+.. contents:: Table of Contents
+  :depth: 1
+
+
 Introduction
 ============
 
diff --git a/taler-developer-manual.rst b/taler-developer-manual.rst
index 2e12f48a..1aa5cc8d 100644
--- a/taler-developer-manual.rst
+++ b/taler-developer-manual.rst
@@ -645,6 +645,11 @@ Developers and operators MUST NOT make changes to database schema
 outside of this versioning.  All tables of a GNU Taler component should live in their own schema.
 
 
+QA Plans
+========
+
+.. include:: checklists/qa-0.9.4.rst
+
 
 Releases
 ========
diff --git a/taler-merchant-api-tutorial.rst b/taler-merchant-api-tutorial.rst
index 2bb95457..02062464 100644
--- a/taler-merchant-api-tutorial.rst
+++ b/taler-merchant-api-tutorial.rst
@@ -22,6 +22,9 @@
 Merchant API Tutorial
 #####################
 
+.. contents:: Table of Contents
+  :depth: 2
+
 Introduction
 ============
 
@@ -68,13 +71,8 @@ If you want to look at some simple, running examples, check out these:
    process.
 
 
-.. contents:: Table of Contents
-  :maxdepth: 1
-  :glob:
-
-
 Architecture overview
-=====================
+---------------------
 
 The Taler software stack for a merchant consists of the following main
 components:
diff --git a/taler-merchant-pos-terminal.rst b/taler-merchant-pos-terminal.rst
index 1627cef8..3077b63f 100644
--- a/taler-merchant-pos-terminal.rst
+++ b/taler-merchant-pos-terminal.rst
@@ -27,8 +27,7 @@ The GNU Taler merchant point of sale (POS) App allows sellers to
 * let the customer make a Taler payment via QR code or NFC
 
 .. contents:: Table of Contents
-  :maxdepth: 1
-  :glob:
+  :depth: 1
 
 
 Android App
diff --git a/taler-user-guide.rst b/taler-user-guide.rst
index fbc3b1c6..a74eae22 100644
--- a/taler-user-guide.rst
+++ b/taler-user-guide.rst
@@ -19,6 +19,9 @@
 User Guide
 ##########
 
+.. contents:: Table of Contents
+  :depth: 1
+
 Introduction
 ============
 
@@ -38,12 +41,6 @@ an account at the bank.  Some operations also require access to the merchant
 backend.
 
 
-.. contents:: Table of Contents
-  :maxdepth: 1
-  :glob:
-
-
-
 Withdrawing from bank accounts
 ==============================