summaryrefslogtreecommitdiff
path: root/frags
diff options
context:
space:
mode:
Diffstat (limited to 'frags')
-rw-r--r--frags/common-conf-syntax.rst16
-rw-r--r--frags/configuration-format.rst13
-rw-r--r--frags/legal.rst32
3 files changed, 30 insertions, 31 deletions
diff --git a/frags/common-conf-syntax.rst b/frags/common-conf-syntax.rst
index 27c8ba87..2ca15058 100644
--- a/frags/common-conf-syntax.rst
+++ b/frags/common-conf-syntax.rst
@@ -46,14 +46,14 @@ from `GNU autoconf
values are usually dependent on an ``INSTALL_PREFIX`` which is determined by
the ``--prefix`` option given to configure. The canonical values are:
- * LIBEXECDIR = $INSTALL_PREFIX/taler/libexec/
- * DOCDIR = $INSTALL_PREFIX/share/doc/taler/
- * ICONDIR = $INSTALL_PREFIX/share/icons/
- * LOCALEDIR = $INSTALL_PREFIX/share/locale/
- * PREFIX = $INSTALL_PREFIX/
- * BINDIR = $INSTALL_PREFIX/bin/
- * LIBDIR = $INSTALL_PREFIX/lib/taler/
- * DATADIR = $INSTALL_PREFIX/share/taler/
+* LIBEXECDIR = $INSTALL_PREFIX/taler/libexec/
+* DOCDIR = $INSTALL_PREFIX/share/doc/taler/
+* ICONDIR = $INSTALL_PREFIX/share/icons/
+* LOCALEDIR = $INSTALL_PREFIX/share/locale/
+* PREFIX = $INSTALL_PREFIX/
+* BINDIR = $INSTALL_PREFIX/bin/
+* LIBDIR = $INSTALL_PREFIX/lib/taler/
+* DATADIR = $INSTALL_PREFIX/share/taler/
Note that on some platforms, the given paths may differ depending
on how the system was compiled or installed, the above are just the
diff --git a/frags/configuration-format.rst b/frags/configuration-format.rst
index 489e98cb..5a74c775 100644
--- a/frags/configuration-format.rst
+++ b/frags/configuration-format.rst
@@ -11,7 +11,7 @@ In order to override these defaults, the user can write a custom configuration
file and either pass it to the component at execution time using the *-c*
option, or name it taler.conf and place it under $HOME/.config/ which is where
components will look by default. Note that the systemd service files pass ``-c
-/etc/taler/taler.conf``, thus making ``/etc/taler/taler.conf``
+/etc/taler/taler.conf``, thus making ``/etc/taler/taler.conf``
the primary location for the configuration.
A config file is a text file containing sections, and each section
@@ -35,9 +35,9 @@ variables that are unset, by using the following syntax:
``${VAR:-default}``. There are two ways a user can set the value
of ``$``-prefixable variables:
- (1) by defining them under a ``[paths]`` section:
+(1) by defining them under a ``[paths]`` section:
- .. code-block:: ini
+ .. code-block:: ini
[paths]
TALER_DEPLOYMENT_SHARED = ${HOME}/shared-data
@@ -45,11 +45,11 @@ of ``$``-prefixable variables:
[section-x]
path-x = ${TALER_DEPLOYMENT_SHARED}/x
- (2) or by setting them in the environment:
+(2) or by setting them in the environment:
- .. code-block:: console
+ .. code-block:: console
- $ export VAR=/x
+ $ export VAR=/x
The configuration loader will give precedence to variables set under
``[path]`` over environment variables.
@@ -62,4 +62,3 @@ pathnames, when they use several levels of ``$``-expanded variables. See
The repository ``git://git.taler.net/deployment`` contains example code
for generating configuration files under ``deployment/netzbon/``.
-
diff --git a/frags/legal.rst b/frags/legal.rst
index dcecfaa0..be9b7f91 100644
--- a/frags/legal.rst
+++ b/frags/legal.rst
@@ -35,14 +35,14 @@ no terms of service available.
To configure the terms of service response, there are two options
in the configuration file for the service:
-- ``TERMS_ETAG``: The current "Etag" to return for the terms of service.
- This value must be changed whenever the terms of service are
- updated. A common value to use would be a version number.
- Note that if you change the ``TERMS_ETAG``, you MUST also provide
- the respective files in ``TERMS_DIR`` (see below).
-- ``TERMS_DIR``: The directory that contains the terms of service.
- The files in the directory must be readable to the service
- process.
+- ``TERMS_ETAG``: The current "Etag" to return for the terms of service.
+ This value must be changed whenever the terms of service are
+ updated. A common value to use would be a version number.
+ Note that if you change the ``TERMS_ETAG``, you MUST also provide
+ the respective files in ``TERMS_DIR`` (see below).
+- ``TERMS_DIR``: The directory that contains the terms of service.
+ The files in the directory must be readable to the service
+ process.
Privacy Policy
@@ -58,14 +58,14 @@ is no privacy policy available.
To configure the privacy policy response, there are two options
in the configuration file for the service:
-- ``PRIVACY_ETAG``: The current "Etag" to return for the privacy policy.
- This value must be changed whenever the privacy policy is
- updated. A common value to use would be a version number.
- Note that if you change the ``PRIVACY_ETAG``, you MUST also provide
- the respective files in ``PRIVACY_DIR`` (see below).
-- ``PRIVACY_DIR``: The directory that contains the privacy policy.
- The files in the directory must be readable to the service
- process.
+- ``PRIVACY_ETAG``: The current "Etag" to return for the privacy policy.
+ This value must be changed whenever the privacy policy is
+ updated. A common value to use would be a version number.
+ Note that if you change the ``PRIVACY_ETAG``, you MUST also provide
+ the respective files in ``PRIVACY_DIR`` (see below).
+- ``PRIVACY_DIR``: The directory that contains the privacy policy.
+ The files in the directory must be readable to the service
+ process.
Legal policies directory layout