[GNUnet-SVN] [taler-merchant] 01/02: fix doc compilation error

[gnunet]

This is an automated email from the git hooks/post-receive script.

marcello pushed a commit to branch master
in repository merchant.

commit 7a62a58ef80dc3e2d546b60303d6554a46b01c38
Author: Marcello Stanisci <address@hidden>
AuthorDate: Tue May 30 21:44:44 2017 +0200

    fix doc compilation error
---
 doc/manual.texi  | 135 +++++++++++++++++++++++++++++--------------------------
 doc/version.texi |   4 +-
 2 files changed, 74 insertions(+), 65 deletions(-)

diff --git a/doc/manual.texi b/doc/manual.texi
index bc4742f..c4c28d2 100644
--- a/doc/manual.texi
+++ b/doc/manual.texi
@@ -741,69 +741,6 @@ reachable.  Production systems should be configured to bind
 to a UNIX domain socket or properly restrict access to the
 port.
 
address@hidden Configuration in Taler
-
-In Taler realm, any component obeys to the same pattern to get configuration
-values.  According to this pattern, once the component has been installed, the
-installation deploys default values in 
@address@hidden@}/share/taler/config.d/}, in
address@hidden files.  In order to override these defaults, the user can write 
a custom
address@hidden file and either pass it to the component at execution time, or 
name it
address@hidden and place it under @code{$HOME/.config/}.
-
-A config file is a text file containing `sections`, and each section contains
-its `values`. The right format follows::
-
address@hidden
-[section1]
-value1 = string
-value2 = 23
-
-[section2]
-value21 = string
-value22 = /path22
address@hidden smallexample
-
-Throughout any configuration file, it is possible to use @emph{$}-prefixed 
variables,
-like @code{$VAR}, especially when they represent filesystem paths.
-It is also possible to provide defaults values for those variables that are 
unset,
-by using the following syntax: @address@hidden:address@hidden
-However, there are two ways a user can set @emph{$}-prefixable variables:
-
-by defining them under a @code{[paths]} section, see example below,
-
address@hidden
-[paths]
-TALER_DEPLOYMENT_SHARED = ${HOME}/shared-data
-..
-[section-x]
-path-x = ${TALER_DEPLOYMENT_SHARED}/x
address@hidden smallexample
-
-or by setting them in the environment
-  
address@hidden
-$ export VAR=/x
address@hidden smallexample
-
-The configuration loader will give precedence to variables set under 
@code{[path]},
-though.
-
-The utility @code{taler-config}, which gets installed along with the exchange,
-serves to get and set configuration values without directly editing the 
@emph{.conf}.
-The option @code{-f} is particularly useful to resolve pathnames, when they use
-several levels of @emph{$}-expanded variables. See @code{taler-config --help}.
-
-Note that, in this stage of development, the file 
@code{$HOME/.config/taler.conf}
-can contain sections for @emph{all} the component. For example, both an 
exchange and
-a bank can read values from it.
-
-The repository @emph{git://taler.net/deployment} contains examples of 
configuration
-file used in our demos. See under @code{deployment/config}.
-
-Expectably, some components will not work just by using default values, as 
their
-work is often interdependent. For example, a merchant needs to know an exchange
-URL, or a database name.
-
 @node Testing
 @chapter Testing
 
@@ -912,11 +849,83 @@ $ taler-merchant-dbinit -r
 @chapter Advanced topics
 
 @menu
+* Configuration in Taler::  Configuration patterns
 * Using taler-config::      Introduction to the taler-config tool
 * Key management::          Managing the merchant's cryptographic keys
 * SEPA configuration::      Configuring a SEPA bank account
 @end menu
 
address@hidden Configuration in Taler
address@hidden Configuration in Taler
address@hidden configuration
+
+In Taler realm, any component obeys to the same pattern to get configuration
+values.  According to this pattern, once the component has been installed, the
+installation deploys default values in 
@address@hidden@}/share/taler/config.d/}, in
address@hidden files.  In order to override these defaults, the user can write 
a custom
address@hidden file and either pass it to the component at execution time, or 
name it
address@hidden and place it under @cite{$HOME/.config/}.
+
+
+A config file is a text file containing @cite{sections}, and each section 
contains
+its @cite{values}. The right format follows:
+
address@hidden
+[section1]
+value1 = string
+value2 = 23
+
+[section2]
+value21 = string
+value22 = /path22
address@hidden example
+
+Throughout any configuration file, it is possible to use @code{$}-prefixed 
variables,
+like @code{$VAR}, especially when they represent filesystem paths.
+It is also possible to provide defaults values for those variables that are 
unset,
+by using the following syntax: @address@hidden:address@hidden
+However, there are two ways a user can set @code{$}-prefixable variables:
+
+by defining them under a @code{[paths]} section, see example below,
+
address@hidden
+[paths]
+TALER_DEPLOYMENT_SHARED = address@hidden@}/shared-data
+..
+[section-x]
+path-x = address@hidden@}/x
address@hidden example
+
+or by setting them in the environment:
+
address@hidden
+$ export VAR=/x
address@hidden example
+
+The configuration loader will give precedence to variables set under 
@code{[path]},
+though.
+
+The utility @code{taler-config}, which gets installed along with the exchange, 
serves
+to get and set configuration values without directly editing the @cite{.conf}.
+The option @code{-f} is particularly useful to resolve pathnames, when they use
+several levels of @code{$}-expanded variables. See @code{taler-config --help}.
+
+Note that, in this stage of development, the file 
@code{$HOME/.config/taler.conf}
+can contain sections for @emph{all} the component. For example, both an 
exchange and
+a bank can read values from it.
+
+The repository @code{git://taler.net/deployment} contains examples of 
configuration
+file used in our demos. See under @code{deployment/config}.
+
address@hidden
address@hidden Note
+Expectably, some components will not work just by using default values, as 
their
+work is often interdependent. For example, a merchant needs to know an exchange
+URL, or a database name.
address@hidden quotation
address@hidden cartouche
+
+
 @node Using taler-config
 @section Using taler-config
 @cindex taler-config
diff --git a/doc/version.texi b/doc/version.texi
index b89dc6e..d4370a3 100644
--- a/doc/version.texi
+++ b/doc/version.texi
@@ -1,4 +1,4 @@
address@hidden UPDATED 29 March 2017
address@hidden UPDATED-MONTH March 2017
address@hidden UPDATED 30 May 2017
address@hidden UPDATED-MONTH May 2017
 @set EDITION 0.2.0
 @set VERSION 0.2.0

-- 
To stop receiving notification emails like this one, please contact
address@hidden