[taler-docs] branch master updated (9aa87cc -> 21f5c93)

[gnunet]

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

ttn pushed a change to branch master
in repository docs.

    from 9aa87cc  sync doc with code
     new fb57dd8  Add fragment that describes common FOO.conf(5) syntax
     new 21f5c93  remove text; instead, include ../frags/common-conf-syntax.rst

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 frags/common-conf-syntax.rst | 32 ++++++++++++++++++++++++++++++++
 manpages/taler.conf.5.rst    | 32 +-------------------------------
 2 files changed, 33 insertions(+), 31 deletions(-)
 create mode 100644 frags/common-conf-syntax.rst

diff --git a/frags/common-conf-syntax.rst b/frags/common-conf-syntax.rst
new file mode 100644
index 0000000..3d83717
--- /dev/null
+++ b/frags/common-conf-syntax.rst
@@ -0,0 +1,32 @@
+The configuration file is line-oriented.
+Blank lines and whitespace at the beginning and end of a line are ignored.
+Comments start with ``#`` or ``%`` in the first column
+(after any beginning-of-line whitespace) and go to the end of the line.
+
+The file is split into sections.
+Every section begins with “[SECTIONNAME]” and
+contains a number of options of the form “OPTION=VALUE”.
+There may be whitespace around the ``=`` (equal sign).
+Section names and options are *case-insensitive*.
+
+The values, however, are *case-sensitive*.
+In particular, boolean values are one of ``YES`` or ``NO``.
+Values can include whitespace by surrounding
+the entire value with ``"`` (double quote).
+Note, however, that there are no escape characters in such strings;
+all characters between the double quotes (including other double quotes)
+are taken verbatim.
+
+Values that represent filenames can begin with a ``/bin/sh``-like
+variable reference.
+This can be simple, such as ``$TMPDIR/foo``, or complex,
+such as ``${TMPDIR:-${TMP:-/tmp}}/foo``.
+See ``[PATHS]`` (below).
+
+Values that represent a time duration are represented as a series
+of one or more ``NUMBER UNIT`` pairs, e.g. ``60 s``, ``4 weeks 1 day``,
+``5 years 2 minutes``.
+
+Values that represent an amount are in the usual amount syntax:
+``CURRENCY:VALUE.FRACTION``, e.g. ``EUR:1.50``.
+The ``FRACTION`` portion may extend up to 8 places.
diff --git a/manpages/taler.conf.5.rst b/manpages/taler.conf.5.rst
index ff98db6..dd41297 100644
--- a/manpages/taler.conf.5.rst
+++ b/manpages/taler.conf.5.rst
@@ -12,37 +12,7 @@ taler.conf(5)
 Description
 ===========
 
-The configuration file is line-oriented.
-Blank lines and whitespace at the beginning and end of a line are ignored.
-Comments start with ``#`` or ``%`` in the first column
-(after any beginning-of-line whitespace) and go to the end of the line.
-
-The file is split into sections.
-Every section begins with “[SECTIONNAME]” and
-contains a number of options of the form “OPTION=VALUE”.
-There may be whitespace around the ``=`` (equal sign).
-Section names and options are *case-insensitive*.
-
-The values, however, are *case-sensitive*.
-In particular, boolean values are one of ``YES`` or ``NO``.
-Values can include whitespace by surrounding
-the entire value with ``"`` (double quote).
-Note, however, that there are no escape characters in such strings;
-all characters between the double quotes (including other double quotes)
-are taken verbatim.
-
-Values that represent filenames can begin with a ``/bin/sh``-like
-variable reference.
-This can be simple, such as ``$TMPDIR/foo``, or complex,
-such as ``${TMPDIR:-${TMP:-/tmp}}/foo``.
-See ``[PATHS]`` (below).
-
-Values that represent a time duration are represented as a series of one or
-more ``NUMBER UNIT`` pairs, e.g. ``60 s``, ``4 weeks 1 day``, ``5 years 2 
minutes``.
-
-Values that represent an amount are in the usual amount syntax:
-``CURRENCY:VALUE.FRACTION``, e.g. ``EUR:1.50``.
-The ``FRACTION`` portion may extend up to 8 places.
+.. include:: ../frags/common-conf-syntax.rst
 
 Files containing default values for many of the options described below
 are installed under ``$TALER_PREFIX/share/taler/config.d/``.

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.