misc fixes

16 files changed, 33 insertions, 14 deletions

diff --git a/core/api-challenger.rst b/core/api-challenger.rst
index 45fc5df8..914d8d01 100644
--- a/core/api-challenger.rst
+++ b/core/api-challenger.rst
@@ -88,6 +88,7 @@ Using the ``/info`` endpoint the client can then finally obtain the (now)
 verified address of the user.
 
 .. contents:: Table of Contents
+  :local:
 
 .. include:: tos.rst
 
diff --git a/core/api-common.rst b/core/api-common.rst
index bdf3ad81..51f2ab9f 100644
--- a/core/api-common.rst
+++ b/core/api-common.rst
@@ -24,6 +24,8 @@
 Conventions for Taler RESTful APIs
 ==================================
 
+.. contents:: Table of Contents
+  :local:
 
 -------------------------
 HTTP Request and Response
diff --git a/core/api-mailbox.rst b/core/api-mailbox.rst
index 33db482d..34d27ded 100644
--- a/core/api-mailbox.rst
+++ b/core/api-mailbox.rst
@@ -29,6 +29,9 @@ for all details not specified in the individual requests.
 The `glossary <https://docs.taler.net/glossary.html#glossary>`_
 defines all specific terms used in this section.
 
+.. contents:: Table of Contents
+  :local:
+
 .. include:: tos.rst
 
 -------------------------
diff --git a/core/api-sync.rst b/core/api-sync.rst
index 51d2b674..c2c86c23 100644
--- a/core/api-sync.rst
+++ b/core/api-sync.rst
@@ -103,6 +103,7 @@ user's location profiles by linking client IP addresses and client
 keys.
 
 .. contents:: Table of Contents
+  :local:
 
 
 .. include:: tos.rst
diff --git a/core/api-taldir.rst b/core/api-taldir.rst
index 1639e36d..4da9bb02 100644
--- a/core/api-taldir.rst
+++ b/core/api-taldir.rst
@@ -34,6 +34,8 @@ for all details not specified in the individual requests.
 The `glossary <https://docs.taler.net/glossary.html#glossary>`_
 defines all specific terms used in this section.
 
+.. contents:: Table of Contents
+  :local:
 
 .. include:: tos.rst
 
diff --git a/core/index.rst b/core/index.rst
index d6a20244..8a764c10 100644
--- a/core/index.rst
+++ b/core/index.rst
@@ -32,7 +32,7 @@ protocols using JSON.
 
 
 .. toctree::
-  :maxdepth: 2
+  :maxdepth: 1
 
   api-overview
   api-common
diff --git a/design-documents/046-mumimo-contracts.rst b/design-documents/046-mumimo-contracts.rst
index 5bc3d25a..fcb7f2b1 100644
--- a/design-documents/046-mumimo-contracts.rst
+++ b/design-documents/046-mumimo-contracts.rst
@@ -472,10 +472,7 @@ consumes an available discount token, that contract should be moved up in the
 list.
 
 Which specific alternative contract was chosen by the user is indicated in the
-subcontract index field of the :ref:`TALER_DepositRequestPS`.
-
-FIXME-DOLD: Should we also sign over this in the
-:ref:`TALER_DepositConfirmationPS`?
+subcontract index field of the :ref:`TALER_DepositRequestPS <taler_depositrequestps>`.
 
 
 Output Commitments
@@ -483,8 +480,9 @@ Output Commitments
 
 When a contract has outputs, the wallet must send an array of blinded tokens,
 coins or tax receipts together with the payment request.  The order in the
-array must match the order in the outputs field of the contract.  For currency outputs, one array element must include all of the required planchets for a batch withdrawal,
-but of course not the reserve signature.
+array must match the order in the outputs field of the contract.  For currency
+outputs, one array element must include all of the required planchets for a
+batch withdrawal, but of course not the reserve signature.
 
   .. note::
 
@@ -492,10 +490,7 @@ but of course not the reserve signature.
      batch-withdraw API to only use a single reserve signature.
 
 This array of blinded values is hashed to create the output commitment hash
-(``h_outputs``) in the :ref:`TALER_DepositRequestPS`.
-
-FIXME-DOLD: Should we also sign over this in the
-:ref:`TALER_DepositConfirmationPS`?
+(``h_outputs``) in the :ref:`TALER_DepositRequestPS <taler_depositrequestps>`.
 
 
 
diff --git a/index.rst b/index.rst
index e97fe2b9..bd3b30d6 100644
--- a/index.rst
+++ b/index.rst
@@ -50,7 +50,7 @@ Documentation Overview
 
 .. toctree::
   :numbered:
-  :maxdepth: 2
+  :maxdepth: 1
 
   core/index
   taler-user-guide
diff --git a/taler-auditor-manual.rst b/taler-auditor-manual.rst
index cbc2aeff..94e86a8d 100644
--- a/taler-auditor-manual.rst
+++ b/taler-auditor-manual.rst
@@ -22,6 +22,7 @@ Auditor Operator Manual
 
 .. contents:: Table of Contents
   :depth: 1
+  :local:
 
 
 Introduction
diff --git a/taler-challenger-manual.rst b/taler-challenger-manual.rst
index 3e4871cb..a7a7169f 100644
--- a/taler-challenger-manual.rst
+++ b/taler-challenger-manual.rst
@@ -20,6 +20,11 @@
 Challenger Operator Manual
 ##########################
 
+.. contents:: Table of Contents
+  :depth: 2
+  :local:
+
+
 Introduction
 ============
 
diff --git a/taler-exchange-manual.rst b/taler-exchange-manual.rst
index dcbdba2c..57db7095 100644
--- a/taler-exchange-manual.rst
+++ b/taler-exchange-manual.rst
@@ -21,7 +21,8 @@ Exchange Operator Manual
 ########################
 
 .. contents:: Table of Contents
-  :depth: 2
+  :depth: 1
+  :local:
 
 
 Introduction
diff --git a/taler-merchant-api-tutorial.rst b/taler-merchant-api-tutorial.rst
index 02062464..15e21e21 100644
--- a/taler-merchant-api-tutorial.rst
+++ b/taler-merchant-api-tutorial.rst
@@ -24,6 +24,7 @@ Merchant API Tutorial
 
 .. contents:: Table of Contents
   :depth: 2
+  :local:
 
 Introduction
 ============
diff --git a/taler-merchant-manual.rst b/taler-merchant-manual.rst
index 9925df0e..48605a55 100644
--- a/taler-merchant-manual.rst
+++ b/taler-merchant-manual.rst
@@ -22,7 +22,8 @@ Merchant Backend Operator Manual
 ################################
 
 .. contents:: Table of Contents
-  :depth: 2
+  :depth: 1
+  :local:
 
 
 Introduction
diff --git a/taler-merchant-pos-terminal.rst b/taler-merchant-pos-terminal.rst
index 3077b63f..efc487cb 100644
--- a/taler-merchant-pos-terminal.rst
+++ b/taler-merchant-pos-terminal.rst
@@ -28,6 +28,7 @@ The GNU Taler merchant point of sale (POS) App allows sellers to
 
 .. contents:: Table of Contents
   :depth: 1
+  :local:
 
 
 Android App
diff --git a/taler-user-guide.rst b/taler-user-guide.rst
index a74eae22..127218fb 100644
--- a/taler-user-guide.rst
+++ b/taler-user-guide.rst
@@ -21,6 +21,7 @@ User Guide
 
 .. contents:: Table of Contents
   :depth: 1
+  :local:
 
 Introduction
 ============
diff --git a/taler-wallet.rst b/taler-wallet.rst
index 5a10adc0..1d1a3991 100644
--- a/taler-wallet.rst
+++ b/taler-wallet.rst
@@ -19,6 +19,10 @@ Wallet Manual
 
 The GNU Taler wallet allows customers to withdraw and spend digital cash.
 
+.. contents:: Table of Contents
+  :depth: 1
+  :local:
+
 
 WebExtension Wallet
 ===================