making glossary nicer

2 files changed, 21 insertions, 21 deletions

diff --git a/glossary.rst b/glossary.rst
index c4906aef..7e8e9241 100644
--- a/glossary.rst
+++ b/glossary.rst
@@ -26,31 +26,31 @@ Taler Glossary
       trusted third party that verifies that the exchange is operating correctly
 
   bank
-      traditional financial service provider who offers wire :transfers: between accounts
+      traditional financial service provider who offers wire :term:`transfers <transfer>` between accounts
 
   coin
-      coins are individual token representing a certain amount of value, also known as the :denomination: of the coin
+      coins are individual token representing a certain amount of value, also known as the :term:`denomination` of the coin
 
   contract
       specification of the details of a transaction, specifies the payment obligations for the customer (i.e. the amount), the deliverables of the merchant and other related information, such as deadlines or locations
 
   denomination
-      unit of currency, specifies both the currency and the face value of a :coin:
+      unit of currency, specifies both the currency and the face value of a :term:`coin`
 
   denomination key
-      RSA key used by the exchange to certify that a given :coin: is valid and of a particular :denomination:
+      RSA key used by the exchange to certify that a given :term:`coin` is valid and of a particular :term:`denomination`
 
   deposit
-      operation by which a merchant passes coins to an exchange, expecting the exchange to credit his :bank: account in the future using a wire :transfer:
+      operation by which a merchant passes coins to an exchange, expecting the exchange to credit his :term:`bank` account in the future using a wire :term:`transfer`
 
-  dirty coin
-     a :coin: is dirty if its public key may be known to an entity other than the customer, thereby creating the danger of some entity being able to link multiple transactions of coin's owner if the coin is not refreshed first
+  dirty
+     a :term:`coin` is dirty if its public key may be known to an entity other than the customer, thereby creating the danger of some entity being able to link multiple transactions of coin's owner if the coin is not refreshed first
 
   extension
-     implementation of a :wallet: for browsers
+     implementation of a :term:`wallet` for browsers
 
   fresh coin
-     a :coin: is fresh if its public key is only known to the customer
+     a :term:`coin` is fresh if its public key is only known to the customer
 
   master key
      offline key used by the exchange to certify denomination keys and message signing keys
@@ -59,46 +59,46 @@ Taler Glossary
      key used by the exchange to sign online messages, other than coins
 
   owner
-     a :coin: is owned by the entity that knows the private key of the coin
+     a :term:`coin` is owned by the entity that knows the private key of the coin
 
   proof
      message that cryptographically demonstrates that a particular claim is correct
 
   reserve
-     funds set aside for future use; either the balance of a customer at the exchange ready for :withdrawal:, or the funds kept in the exchange's bank account to cover obligations from coins in circulation
+     funds set aside for future use; either the balance of a customer at the exchange ready for :term:`withdrawal`, or the funds kept in the exchange's bank account to cover obligations from coins in circulation
 
   refreshing
-     operation by which a :dirty: :coin: is converted into one or more :fresh: coins
+     operation by which a :term:`dirty` :term:`coin` is converted into one or more :fresh: coins
 
   refund
-     operation by which a merchant steps back from the right to funds that he obtained from a :deposit: operation, giving the right to the funds back to the customer
+     operation by which a merchant steps back from the right to funds that he obtained from a :term:`deposit` operation, giving the right to the funds back to the customer
 
   sharing
-     users can share ownership of a :coin: by sharing access to the coin's private key, thereby allowing all co-owners to spend the coin at any time.
+     users can share ownership of a :term:`coin` by sharing access to the coin's private key, thereby allowing all co-owners to spend the coin at any time.
 
   signing key
      see message signing key.
 
   spending
-     operation by which a customer gives a merchant the right to :deposit: coins in return for merchandise
+     operation by which a customer gives a merchant the right to :term:`deposit` coins in return for merchandise
 
   transfer
-     method of sending funds between :bank: accounts
+     method of sending funds between :term:`bank` accounts
 
   transaction
      method by which ownership is exclusively transferred from one entity to another
 
   transaction id
-     unique number by which a merchant identifies a :transaction:
+     unique number by which a merchant identifies a :term:`transaction`
 
   wallet
      software running on a customer's computer; withdraws, stores and spends coins
 
   wire transfer
-     see transfer
+     see :term:`transfer`
 
   wire transfer identifier
-     subject of a wire transfer; usually a random string to uniquely identify the transfer
+     subject of a wire :term:`transfer`; usually a random string to uniquely identify the :term:`transfer`
 
   withdrawal
-     operation by which a :wallet: can convert funds from a reserve to fresh coins
+     operation by which a :term:`wallet` can convert funds from a reserve to fresh coins
diff --git a/index.rst b/index.rst
index 0a20cf6a..60828a90 100644
--- a/index.rst
+++ b/index.rst
@@ -47,6 +47,7 @@ It focuses on how to install, configure and run the required software.
 .. toctree::
   :maxdepth: 2
 
+  global_licensing
   impl-exchange
   impl-merchant
 
@@ -111,4 +112,3 @@ Indices and tables
 
 * :doc:`glossary`
 * :ref:`search`
-