[taler-docs] branch master updated (19ba661 -> fa7ce09)

[gnunet]

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

ttn pushed a change to branch master
in repository docs.

    from 19ba661  use list-of-dependencies.rst in Merchant Manual
     new 9506bae  s/download and install/install/
     new 436f455  new frag: installing-gnunet.rst
     new fa7ce09  use installing-gnunet.rst in Merchant Manual

The 3 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/installing-gnunet.rst | 21 +++++++++++++++++++++
 taler-merchant-manual.rst   | 22 +---------------------
 2 files changed, 22 insertions(+), 21 deletions(-)
 create mode 100644 frags/installing-gnunet.rst

diff --git a/frags/installing-gnunet.rst b/frags/installing-gnunet.rst
new file mode 100644
index 0000000..99ff472
--- /dev/null
+++ b/frags/installing-gnunet.rst
@@ -0,0 +1,21 @@
+Before you install GNUnet, you must download and install the dependencies
+mentioned in the previous section, otherwise the build may succeed, but could
+fail to export some of the tooling required by GNU Taler.
+
+To install GNUnet, unpack the tarball and change
+into the resulting directory, then proceed as follows:
+
+.. code-block:: console
+
+   $ ./configure [--prefix=GNUNETPFX]
+   $ # Each dependency can be fetched from non standard locations via
+   $ # the '--with-<LIBNAME>' option. See './configure --help'.
+   $ make
+   # make install
+   # ldconfig
+
+If you did not specify a prefix, GNUnet will install to ``/usr/local``,
+which requires you to run the last step as ``root``.
+The ``ldconfig`` command (also run as ``root``) makes the
+shared object libraries (``.so`` files)
+visible to the various installed programs.
diff --git a/taler-merchant-manual.rst b/taler-merchant-manual.rst
index de6012b..36bf7bb 100644
--- a/taler-merchant-manual.rst
+++ b/taler-merchant-manual.rst
@@ -311,27 +311,7 @@ Installing GNUnet
 
 .. index:: GNUnet
 
-Before you install GNUnet, you must download and install the dependencies
-mentioned in the previous section, otherwise the build may succeed, but could
-fail to export some of the tooling required by GNU Taler.
-
-To download and install GNUnet, unpack the tarball and change
-into the resulting directory, then proceed as follows:
-
-.. code-block:: console
-
-   $ ./configure [--prefix=GNUNETPFX]
-   $ # Each dependency can be fetched from non standard locations via
-   $ # the '--with-<LIBNAME>' option. See './configure --help'.
-   $ make
-   # make install
-   # ldconfig
-
-If you did not specify a prefix, GNUnet will install to ``/usr/local``,
-which requires you to run the last step as ``root``.
-The ``ldconfig`` command (also run as ``root``) makes the
-shared object libraries (``.so`` files)
-visible to the various installed programs.
+.. include:: frags/installing-gnunet.rst
 
 There is no need to actually run a GNUnet peer to use the Taler merchant
 backend -- all the merchant needs from GNUnet is a number of headers and

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