10 files changed, 47 insertions, 253 deletions
diff --git a/api/api-common.rst b/api/api-common.rst
index 411f7df5..defabe69 100644
--- a/api/api-common.rst
+++ b/api/api-common.rst
@@ -455,7 +455,8 @@ Any piece of signed data, complies to the abstract data structure given below.
 
 The following list contains all the data structure that can be signed in
 Taler. Their definition is typically found in `src/include/taler_signatures.h`,
-within the :ref:`exchange's codebase <exchange-repo>`.
+within the
+`exchange's codebase <https://docs.taler.net/global-licensing.html#exchange-repo>`_.
 
 .. _TALER_WithdrawRequestPS:
 .. sourcecode:: c
diff --git a/api/api-merchant.rst b/api/api-merchant.rst
index 11ed325e..70ab906b 100644
--- a/api/api-merchant.rst
+++ b/api/api-merchant.rst
@@ -79,7 +79,8 @@ This frontend API is non-normative, and only gives an example of what a typical
       // maximum fees merchant agreed to cover as per the contract
       max_fee: Amount;
 
-      // The `merchant instance <instances-lab>`_ which is going to receive the final wire transfer.
+      // The `merchant instance <https://docs.taler.net/operate-merchant.html#instances-lab>`_
+      // which is going to receive the final wire transfer.
       instance: string;
 
       // Signature of `TALER_ContractPS`_
@@ -141,7 +142,7 @@ This frontend API is non-normative, and only gives an example of what a typical
   Returns a cooperative merchant page (called the execution page) that will
   send the ``taler-execute-payment`` to the wallet and react to failure or
   success of the actual payment. ``fulfillment_url`` is included in the `contract`_.
-  Furthermore, `https://docs.taler.net/integration-merchant.html#payprot`_
+  Furthermore, `<https://docs.taler.net/integration-merchant.html#payprot>`_
   documents the payment protocol between wallets and merchants.
 
   The wallet will inject an ``XMLHttpRequest`` request to the merchant's
@@ -332,7 +333,7 @@ The following API are made available by the merchant's `backend` to the merchant
   **Request:**
 
   :query id: ID of the transaction we want to trace (an integer)
-  :query instance: identificative token for the merchant instance which is to be tracked (optional). See `https://docs.taler.net/operate-merchant.html#instances-lab`_. This information is needed because the request has to be signed by the merchant, thus we need to pick the instance's private key.
+  :query instance: identificative token for the merchant instance which is to be tracked (optional). See `<https://docs.taler.net/operate-merchant.html#instances-lab>`_. This information is needed because the request has to be signed by the merchant, thus we need to pick the instance's private key.
 
   **Response:**
 
diff --git a/docs/example-essay-store.rst b/docs/example-essay-store.rst
index 8a32aa1d..4687083c 100644
--- a/docs/example-essay-store.rst
+++ b/docs/example-essay-store.rst
@@ -94,40 +94,47 @@ After the rendering, (part of) ``purchase.html`` will look like shown below.
 
 .. sourcecode:: html
 
-  ...
-  <script src="/static/web-common/taler-wallet-lib.js" type="application/javascript"></script>
-  <script src="/static/purchase.js" type="application/javascript"></script>
-  ...
-  <meta name="contract_url" value="https://shop.demo.taler.net/generate-contract?article_name=Appendix_A:_A_Note_on_Software">
-
-  ...
-  ...
-
-  <div id="ccfakeform" class="fade">
-    <p>
-    Oops, it looks like you don't have a Taler wallet installed.  Why don't you enter
-    all your credit card details before reading the article? <em>You can also
-    use GNU Taler to complete the purchase at any time.</em>
-    </p>
-  
-    <form>
-      First name<br> <input type="text"></input><br>
-      Family name<br> <input type="text"></input><br>
-      Age<br> <input type="text"></input><br>
-      Nationality<br> <input type="text"></input><br>
-      Gender<br> <input type="radio" name"gender">Male</input>
-      CC number<br> <input type="text"></input><br>
-      <input type="radio" name="gender">Female</input><br>
-    </form>
-    <form method="get" action="/cc-payment/{{ article_name }}">
-      <input type="submit"></input>
-    </form>
-  </div>
+  <html>
+    <head>
+      <!-- ... -->
+      <script src="/static/web-common/taler-wallet-lib.js" type="application/javascript"></script>
+      <script src="/static/purchase.js" type="application/javascript"></script>
+      <!-- ... -->
+      <meta name="contract_url" value="https://shop.demo.taler.net/generate-contract?article_name=Appendix_A:_A_Note_on_Software">
+
+    </head>
+    <body>
+      <!-- ... -->
+      <!-- ... -->
   
-  <div id="talerwait">
-    <em>Processing payment with GNU Taler, please wait <span id="action-indicator"></span></em>
-  </div>
-  ...
+      <div id="ccfakeform" class="fade">
+        <p>
+        Oops, it looks like you don't have a Taler wallet installed.  Why don't you enter
+        all your credit card details before reading the article? <em>You can also
+        use GNU Taler to complete the purchase at any time.</em>
+        </p>
+        <form>
+          First name<br> <input type="text"></input><br>
+          Family name<br> <input type="text"></input><br>
+          Age<br> <input type="text"></input><br>
+          Nationality<br> <input type="text"></input><br>
+          Gender<br> <input type="radio" name="gender">Male</input>
+          CC number<br> <input type="text"></input><br>
+          <input type="radio" name="gender">Female</input><br>
+        </form>
+
+        <form method="get" action="/cc-payment/{{ article_name }}">
+          <input type="submit"></input>
+        </form>
+      </div>
+    
+      <div id="talerwait">
+        <em>Processing payment with GNU Taler, please wait <span id="action-indicator"></span></em>
+      </div>
+      <!-- ... -->
+    </body>
+  </html>
+
 
 The script ``purchase.js`` is now in charge of implementing the behaviour we seek.
 It needs to register two handlers: one called whenever the wallet is detected in the
diff --git a/exchange-db-generate.sh b/docs/exchange-db-generate.sh
index b296e0c9..b296e0c9 100755
--- a/exchange-db-generate.sh
+++ b/docs/exchange-db-generate.sh
diff --git a/exchange-db.png b/docs/exchange-db.png
index ddc25591..ddc25591 100644
--- a/exchange-db.png
+++ b/docs/exchange-db.png
diff --git a/api/global_licensing.rst b/docs/global-licensing.rst
index 7a5e8226..7a5e8226 100644
--- a/api/global_licensing.rst
+++ b/docs/global-licensing.rst
diff --git a/docs/global_licensing.rst b/docs/global_licensing.rst
deleted file mode 100644
index 7a5e8226..00000000
--- a/docs/global_licensing.rst
+++ /dev/null
@@ -1,215 +0,0 @@
-===========================
-Taler licensing information
-===========================
-
-This file gives an overview of all Taler component's licensing and of
-runtime dependencies thereof. For "component" here is meant a set of
-source files which can be retrieved from a single repository.  If
-components consist of sources under different licensing regimes, i.e.
-because we want to enable third party developments to easily integrate
-with Taler, those are described as well.
-
-All components are generally released under Lesser GPL, GPL or Affero
-GPL.  The main strategy is for libraries that third parties may need
-to integrate with Taler to be under LGPL, standalone binaries and
-testcases to be under GPL, and Web servers implementing Web services
-to be under AGPL.
-
-+++++++++++++++++++++++++
-API (git://taler.net/api)
-+++++++++++++++++++++++++
-
-The specification has been jointly developed by INRIA and by individuals
-being under the juridical subject called 'GNUnet e.V.'. For each source
-file, the header indicated whose is holding the copyright, since some
-parts have been taken "verbatim" from the GNUnet e.V. foundation, and
-some other have been developed at INRIA "ex novo".
-
-Generally, GNU GPLv3 license is used for them; see COPYING.GPL.
-
-
---------------------
-Runtime dependencies
---------------------
-This component has no runtime dependencies as it is supposed to generate
-HTML.
-
-
-++++++++++++++++++++++++++++++++++++++++++++++++++++++
-Firefox/Android/Python Wallet (git://taler.net/wallet)
-++++++++++++++++++++++++++++++++++++++++++++++++++++++
-
-This project includes contributions from INRIA and GNUnet
-e.V. developers.  Please refer to each source file to obtain
-information about the copyright holder. The GNU GPLv3 is used as the
-license for Wallets.  Some components may be under the LGPL.
-
---------------------
-Runtime dependencies
---------------------
-
-The following list encompasses all the runtime dependencies for this
-project, and gives the copyright holder for each of them:
-
-* libgnunetutil: GPLv3+, GNUnet e.V.
-* libgnunetjson: GPLv3+, GNUnet e.V.
-* libgcrypt: LGPL, Free Software Foundation
-* libunistring: LGPL, Free Software Foundation
-* Python:   Python Software Foundation License, LGPL-Compatible, Python Software Foundation
-* Mozilla Firefox:   Mozilla Public License, LGPL-Compatible, Mozilla Foundation
-
-
-+++++++++++++++++++++++++++++++++++++++++++++++++++
-WebExtensions Wallet (git://taler.net/wallet-webex)
-+++++++++++++++++++++++++++++++++++++++++++++++++++
-
-The TypeScript code was developed 100% at INRIA, but the project
-involves compiling libgnunetutil and libtalerutil to JavaScript, and
-thus depends on software from GNUnet e.V.
-
-Each source carries its own copyright holder(s), but it is generally
-licensed under GPLv3+.
-
---------------------
-Runtime dependencies
---------------------
-
-The following list encompasses all the runtime dependencies for this
-project, and gives the copyright holder for each of them:
-
-* libgnunetutil: GPLv3+, GNUnet e.V.
-* libgnunetjson: GPLv3+, GNUnet e.V.
-* libgcrypt: LGPL, Free Software Foundation
-* libunistring: LGPL, Free Software Foundation
-
-Note that these dependencies are compiled into the extension and do
-not appear as separate binary files.
-
-
-+++++++++++++++++++++++++++++++++++
-Merchant (git://taler.net/merchant)
-+++++++++++++++++++++++++++++++++++
-
-This project contains code under two different licenses, and whose
-copyright is held by INRIA and/or GNUnet e.V..  Please refer to each
-source file to know which party holds the copyright.
-
-Source files are located in the following directories:
-
-* src/lib/
-* src/backend/
-* src/backenddb/
-* src/include/
-* src/tests/
-* examples/blog/
-* examples/shop/
-* copylib/
-
-In examples/blog/articles/ we included a book by Richard Stallman.
-It comes with its own permissive license (see COPYING in the
-directory).
-
-
-The merchant's backend (i.e. all the code in src/backend/) is under
-the GNU Affero GPL as it depends on libgnunetutil.  Note that the use
-of the Affero GPL has little impact as the backend is not supposed to
-be directly accessible to the Internet).  The license for this code is
-in COPYING.GPL and COPYING.AGPL.
-
-The merchant's frontend logic (i.e. JavaScript interacting with
-the wallet, sample code for a shop) is under the GNU LGPL (but
-we may choose to change this to be in the public domain or
-BSD-licensed if necessary; the code is so short that there is
-anyway the question whether it is copyrightable).  Under this same
-license, it comes the merchant library (src/lib/) as it can be linked
-with more diverse licensed software.  The license text for this code
-is in COPYING.LGPL.
-
-
-
---------------------
-Runtime dependencies
---------------------
-
-The following list encompasses all the runtime dependencies for this
-project, and gives the copyright holder for each of them:
-
-* libjansson: MIT License, AGPL- and LGPL-Compatible, owned by Petri Lehtinen and other individuals
-* libgcrypt: LGPL, owned by Free Software Foundation
-* postgresql: PostgreSQL License, AGPL- and LGPL-Compatible, owned by The PostgreSQL Global Development Group
-* libgnunetutil (in all of its variants): GPLv3+, owned by GNUnet e.V.
-* PHP:  PHP License, AGPL- and LGPL-Compatible, owned by The PHP Group
-
-+++++++++++++++++++++++++++
-Bank (git://taler.net/bank)
-+++++++++++++++++++++++++++
-
----------
-Licensing
----------
-
-This project has been developed by INRIA.  For each source file, the
-header indicated whose is holding the copyright.  The licensing plan
-for the bank is to use the Affero GPLv3+.
-
-Source files of interest are located in the following directories:
-(The repository holds also scaffolded files autogenerated by Django,
-which do not have legal significance in this context.)
-
-* TalerBank/Bank/
-* TalerBank/Bank/templates/
-* TalerBank/my-static/
-* website/
-
---------------------
-Runtime dependencies
---------------------
-
-The following list encompasses all the runtime dependencies for this
-project, and gives the copyright holder for each of them:
-
-* Django:   BSD License, AGPL-Compatible, owned by Django Software Foundation
-* validictory:   BSD License, AGPL-Compatible, owned by James Turk
-* django-simple-math-captcha:   Apache Software License, LGPL-Compatible (FIXME), Brandon Taylor
-* requests:   Apache2 License, AGPL-Compatible, owned by Kenneth Reitz
-* Python:   Python Software Foundation License, AGPL-Compatible, Python Software Foundation
-* PHP:   PHP License, AGPL-Compatible, owned by The PHP Group
-
-
-.. _exchange-repo:
-
-+++++++++++++++++++++++++++++++++++
-Exchange (git://taler.net/exchange)
-+++++++++++++++++++++++++++++++++++
-
-This component is based on code initially developed in Munich for
-GNUnet e.V.  Most recent improvements and maintenance has been done at
-Inria.  The copyright is thus shared between both institutions.
-
-The licensing for exported libraries to access the exchange is LGPL,
-the exchange itself is under AGPL, and testcases and standalone
-binaries are under GPL.
-
-
---------------------
-Runtime dependencies
---------------------
-
-The following list encompasses all the runtime dependencies for this
-project, and gives the copyright holder for each of them:
-
-* libjansson: MIT License, AGPL- and LGPL-Compatible, owned by Petri Lehtinen and other individuals
-* libgcrypt: LGPL, owned by Free Software Foundation
-* postgresql: PostgreSQL License, AGPL- and LGPL-Compatible, owned by The PostgreSQL Global Development Group
-* libgnunetutil (in all of its variants): GPLv3+, owned by GNUnet e.V.
-* libgnunetjson: GPLv3+, GNUnet e.V.
-
-
-+++++++++++++++++++++++++++++++++++++++++
-Web includes (git://taler.net/web-common)
-+++++++++++++++++++++++++++++++++++++++++
-
-All copyright owned by INRIA (but questionable whether creativity
-threshold for copyright is even met).
-
-Sources are licensed under the GNU LGPL.
diff --git a/docs/index.rst b/docs/index.rst
index a4982149..b577ad03 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -51,7 +51,7 @@ It focuses on how to install, configure and run the required software.
 .. toctree::
   :maxdepth: 2
 
-  global_licensing
+  global-licensing
   configuration-basics
   operate-exchange
   operate-merchant
diff --git a/releases.rst b/docs/releases.rst
index d0191ba0..d0191ba0 100644
--- a/releases.rst
+++ b/docs/releases.rst
diff --git a/versioning.rst b/docs/versioning.rst
index 14336da0..14336da0 100644
--- a/versioning.rst
+++ b/docs/versioning.rst