[GNUnet-SVN] [gnunet] branch master updated (4eba76b72 -> 91f7da525)

[gnunet]

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

ng0 pushed a change to branch master
in repository gnunet.

    from 4eba76b72 assertion is excessively rigid
     new 697b2ed12 preface: rewrite footnotes to in-page text.
     new 552cb9172 installation: likewise.
     new c528cfef4 keyconcepts: likewise
     new d55141a33 user: likewise
     new e8606de55 developer: likewise.
     new c21f3c8f2 philosophy: likewise.
     new 247202ff3 philosophy: reformat paragraphs.
     new e1a8af411 Rename Makefile example (025.c) to resemble it being a 
Makefile (025.Makefile.am). Adjust doc/documentation/Makefile.am accordingly.
     new d1aeab21b contributing: Adjust note on prefered test languages. Remove 
footnote section as it is prefered to not have footnotes at all.
     new 91f7da525 Merge branch 'master' of gnunet.org:gnunet

The 10 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:
 doc/documentation/Makefile.am                      |  2 +-
 doc/documentation/chapters/contributing.texi       |  9 ++--
 doc/documentation/chapters/developer.texi          | 58 ++++++++++++----------
 doc/documentation/chapters/installation.texi       | 30 ++++++-----
 doc/documentation/chapters/keyconcepts.texi        | 37 ++++++++------
 doc/documentation/chapters/philosophy.texi         | 45 +++++++++--------
 doc/documentation/chapters/preface.texi            | 12 +++--
 doc/documentation/chapters/user.texi               |  5 +-
 doc/documentation/gnunet-c-tutorial.texi           |  2 +-
 .../tutorial-examples/{025.c => 025.Makefile.am}   |  0
 10 files changed, 110 insertions(+), 90 deletions(-)
 rename doc/documentation/tutorial-examples/{025.c => 025.Makefile.am} (100%)

diff --git a/doc/documentation/Makefile.am b/doc/documentation/Makefile.am
index 0032b22e9..7eed6efb6 100644
--- a/doc/documentation/Makefile.am
+++ b/doc/documentation/Makefile.am
@@ -103,7 +103,7 @@ gnunet_tutorial_examples =                                  
\
        tutorial-examples/022.c                                                 
\
        tutorial-examples/023.c                                                 
\
        tutorial-examples/024.c                                                 
\
-       tutorial-examples/025.c                                                 
\
+       tutorial-examples/025.Makefile.am                                       
\
        tutorial-examples/026.c
 
 info_TEXINFOS =                                                \
diff --git a/doc/documentation/chapters/contributing.texi 
b/doc/documentation/chapters/contributing.texi
index a92df45c3..ed1c19b30 100644
--- a/doc/documentation/chapters/contributing.texi
+++ b/doc/documentation/chapters/contributing.texi
@@ -85,11 +85,6 @@ URLs break in the PDF output when they contain linebreaks.
 @c We do this and the other thing.  This is done by foo.
 @c @end example
 
address@hidden Use @@address@hidden@} instead of putting an @@address@hidden@} 
to the
-footnote on a collected footnote-page.
-In a 200+ pages handbook it's better to have footnotes accessible
-without having to skip over to the end.
-
 @end itemize
 
 @node Contributing testcases
@@ -99,7 +94,9 @@ In the core of gnunet, we restrict new testcases to a small 
subset
 of languages, in order of preference:
 @enumerate
 @item C
address@hidden Bash (preferable portable without too much specifics to Bash)
address@hidden Portable Shell Scripts
address@hidden Bash Scripts
address@hidden Nim ?
 @item Python (@geq{}3.6)
 @end enumerate
 
diff --git a/doc/documentation/chapters/developer.texi 
b/doc/documentation/chapters/developer.texi
index e82e32b59..4038190a1 100644
--- a/doc/documentation/chapters/developer.texi
+++ b/doc/documentation/chapters/developer.texi
@@ -11,7 +11,8 @@ For developers, GNUnet is:
 @itemize @bullet
 @item developed by a community that believes in the GNU philosophy
 @item Free Software (Free as in Freedom), licensed under the
-GNU Affero General Public 
address@hidden@uref{https://www.gnu.org/licenses/licenses.html#AGPL, 
https://www.gnu.org/licenses/licenses.html#AGPL}}
+GNU Affero General Public License
+(@uref{https://www.gnu.org/licenses/licenses.html#AGPL})
 @item A set of standards, including coding conventions and
 architectural rules
 @item A set of layered protocols, both specifying the communication
@@ -136,7 +137,7 @@ It can be accessed at
 Anyone can report bugs.
 
 @item Our site installation of the
address@hidden Integration} system @code{Buildbot} is used
+Continuous Integration (CI) system @code{Buildbot} is used
 to check GNUnet builds automatically on a range of platforms.
 The web interface of this CI is exposed at
 @uref{https://gnunet.org/buildbot/, https://gnunet.org/buildbot/}.
@@ -1230,7 +1231,11 @@ right set of features. We called this specialized set of 
libcurl
 by GNUnet and some of its dependencies.
 
 We download libgnurl and its digital signature from the GNU fileserver,
-assuming @env{TMPDIR} address@hidden might be @file{/tmp}, @env{TMPDIR}, 
@env{TMP} or any other location. For consistency we assume @env{TMPDIR} points 
to @file{/tmp} for the remainder of this section.}
+assuming @env{TMPDIR} exists.
+
+Note: TMPDIR might be @file{/tmp}, @env{TMPDIR}, @env{TMP} or any other
+location. For consistency we assume @env{TMPDIR} points to @file{/tmp}
+for the remainder of this section.
 
 @example
 cd \$TMPDIR
@@ -1898,9 +1903,9 @@ random links are to be given
 @item @code{GNUNET_TESTBED_TOPOLOGY_SCALE_FREE}: Connects peers in a
 topology where peer connectivity follows power law - new peers are
 connected with high probability to well connected peers.
address@hidden Emergence of Scaling in Random Networks. Science 286,
+(See Emergence of Scaling in Random Networks. Science 286,
 509-512, 1999
-(@uref{https://gnunet.org/git/bibliography.git/plain/docs/emergence_of_scaling_in_random_networks__barabasi_albert_science_286__1999.pdf,
 pdf})}
+(@uref{https://gnunet.org/git/bibliography.git/plain/docs/emergence_of_scaling_in_random_networks__barabasi_albert_science_286__1999.pdf,
 pdf}))
 
 @item @code{GNUNET_TESTBED_TOPOLOGY_FROM_FILE}: The topology information
 is loaded from a file. The path to the file has to be given.
@@ -2294,7 +2299,8 @@ subsystem.
 @node CORE must be started
 @subsubsection CORE must be started
 
-A uncomplicated issue is bug 
address@hidden@uref{https://gnunet.org/bugs/view.php?id=3993, 
https://gnunet.org/bugs/view.php?id=3993}}:
+A uncomplicated issue is bug #3993
+(@uref{https://gnunet.org/bugs/view.php?id=3993, 
https://gnunet.org/bugs/view.php?id=3993}):
 Your configuration MUST somehow ensure that for each peer the
 @code{CORE} service is started when the peer is setup, otherwise
 @code{TESTBED} may fail to connect peers when the topology is initialized,
@@ -3941,11 +3947,8 @@ considers Bob's address to be valid, the connection 
itself is not
 considered 'established'. In particular, Alice may have many addresses
 for Bob that Alice considers valid.
 
address@hidden TODO: reference Footnotes so that I don't have to duplicate the
address@hidden footnotes or add them to an index at the end. Is this possible at
address@hidden all in Texinfo?
 The @code{PONG} message is protected with a nonce/challenge against replay
address@hidden@uref{http://en.wikipedia.org/wiki/Replay_attack, replay}}
+attacks (@uref{http://en.wikipedia.org/wiki/Replay_attack, replay})
 and uses an expiration time for the signature (but those are almost
 implementation details).
 
@@ -4773,23 +4776,24 @@ then adds fundamental security to the connections:
 
 @itemize @bullet
 @item confidentiality with so-called perfect forward secrecy; we use
address@hidden@uref{http://en.wikipedia.org/wiki/Elliptic_curve_Diffie%E2%80%93Hellman,
 Elliptic-curve Diffie---Hellman}}
+ECDHE
+(@uref{http://en.wikipedia.org/wiki/Elliptic_curve_Diffie%E2%80%93Hellman, 
Elliptic-curve Diffie---Hellman})
 powered by Curve25519
address@hidden@uref{http://cr.yp.to/ecdh.html, Curve25519}} for the key
+(@uref{http://cr.yp.to/ecdh.html, Curve25519}) for the key
 exchange and then use symmetric encryption, encrypting with both AES-256
address@hidden@uref{http://en.wikipedia.org/wiki/Rijndael, AES-256}} and
-Twofish @address@hidden://en.wikipedia.org/wiki/Twofish, Twofish}}
+(@uref{http://en.wikipedia.org/wiki/Rijndael, AES-256}) and
+Twofish (@uref{http://en.wikipedia.org/wiki/Twofish, Twofish})
 @item @uref{http://en.wikipedia.org/wiki/Authentication, authentication}
 is achieved by signing the ephemeral keys using Ed25519
address@hidden@uref{http://ed25519.cr.yp.to/, Ed25519}}, a deterministic
+(@uref{http://ed25519.cr.yp.to/, Ed25519}), a deterministic
 variant of ECDSA
address@hidden@uref{http://en.wikipedia.org/wiki/ECDSA, ECDSA}}
+(@uref{http://en.wikipedia.org/wiki/ECDSA, ECDSA})
 @item integrity protection (using SHA-512
address@hidden@uref{http://en.wikipedia.org/wiki/SHA-2, SHA-512}} to do
+(@uref{http://en.wikipedia.org/wiki/SHA-2, SHA-512}) to do
 encrypt-then-MAC
address@hidden@uref{http://en.wikipedia.org/wiki/Authenticated_encryption, 
encrypt-then-MAC}})
+(@uref{http://en.wikipedia.org/wiki/Authenticated_encryption, 
encrypt-then-MAC}))
 @item Replay
address@hidden@uref{http://en.wikipedia.org/wiki/Replay_attack, replay}}
+(@uref{http://en.wikipedia.org/wiki/Replay_attack, replay})
 protection (using nonces, timestamps, challenge-response,
 message counters and ephemeral keys)
 @item liveness (keep-alive messages, timeout)
@@ -5037,7 +5041,8 @@ public-private key pair and signs the corresponding
 @code{EphemeralKeyMessage} with its long-term key (which we usually call
 the peer's identity; the hash of the public long term key is what results
 in a @code{struct GNUNET_PeerIdentity} in all GNUnet APIs. The ephemeral
-key is ONLY used for an 
address@hidden@uref{http://en.wikipedia.org/wiki/Elliptic_curve_Diffie%E2%80%93Hellman,
 Elliptic-curve Diffie---Hellman}}
+key is ONLY used for an ECDHE
+(@uref{http://en.wikipedia.org/wiki/Elliptic_curve_Diffie%E2%80%93Hellman, 
Elliptic-curve Diffie---Hellman})
 exchange by the CORE service to establish symmetric session keys. A peer
 will use the same @code{EphemeralKeyMessage} for all peers for
 @code{REKEY_FREQUENCY}, which is usually 12 hours. After that time, it
@@ -5094,10 +5099,11 @@ All functions related to the key exchange and 
encryption/decryption of
 messages can be found in @file{gnunet-service-core_kx.c} (except for the
 cryptographic primitives, which are in @file{util/crypto*.c}).
 Given the key material from ECDHE, a Key derivation function
address@hidden@uref{https://en.wikipedia.org/wiki/Key_derivation_function, Key 
derivation function}}
+(@uref{https://en.wikipedia.org/wiki/Key_derivation_function, Key derivation 
function})
 is used to derive two pairs of encryption and decryption keys for AES-256
 and TwoFish, as well as initialization vectors and authentication keys
-(for address@hidden@uref{https://en.wikipedia.org/wiki/HMAC, HMAC}}).
+(for HMAC
+(@uref{https://en.wikipedia.org/wiki/HMAC, HMAC})).
 The HMAC is computed over the encrypted payload.
 Encrypted messages include an iv_seed and the HMAC in the header.
 
@@ -5523,15 +5529,15 @@ Let's close with a couple examples.
 @table @asis
 
 @item Average: 10, std dev: 1 Here the estimate would be
-2^10 = 1024 peers. @footnote{The range in which we can be 95% sure is:
+2^10 = 1024 peers. (The range in which we can be 95% sure is:
 [2^8, 2^12] = [256, 4096]. We can be very (>99.7%) sure that the network
 is not a hundred peers and absolutely sure that it is not a million peers,
-but somewhere around a thousand.}
+but somewhere around a thousand.)
 
 @item Average 22, std dev: 0.2 Here the estimate would be
-2^22 = 4 Million peers. @footnote{The range in which we can be 99.7% sure
+2^22 = 4 Million peers. (The range in which we can be 99.7% sure
 is: [2^21.4, 2^22.6] = [2.8M, 6.3M]. We can be sure that the network size
-is around four million, with absolutely way of it being 1 million.}
+is around four million, with absolutely way of it being 1 million.)
 
 @end table
 
diff --git a/doc/documentation/chapters/installation.texi 
b/doc/documentation/chapters/installation.texi
index 559a97f96..6bf67ee97 100644
--- a/doc/documentation/chapters/installation.texi
+++ b/doc/documentation/chapters/installation.texi
@@ -224,8 +224,9 @@ This section describes a quick, casual way to check if your 
GNUnet
 installation works. However, if it does not, we do not cover
 steps for recovery --- for this, please study the instructions
 provided in the developer handbook as well as the system-specific
-instruction in the source code address@hidden system specific
-instructions are not provided as part of this handbook!}.
+instruction in the source code repository.
+Please note that the system specific instructions are not provided
+as part of this handbook!.
 
 
 @menu
@@ -258,19 +259,16 @@ Currently these interfaces cover:
 @subsection Statistics
 @c %**end of header
 
-First, you should launch GNUnet address@hidden you should also
-start gnunet, via gnunet-arm or the system provided method}.
+We assume that you have started gnunet via @code{gnunet-arm} or via your
+system-provided method for starting services.
+First, you should launch GNUnet gtk.
 You can do this from the command-line by typing
 
 @example
 gnunet-statistics-gtk
 @end example
 
-If your address@hidden term ``peer'' is a common word used in
-federated and distributed networks to describe a participating device
-which is connected to the network. Thus, your Personal Computer or
-whatever it is you are looking at the Gtk+ interface describes a
-``Peer'' or a ``Node''.}  is running correctly, you should see a bunch
+If your peer is running correctly, you should see a bunch
 of lines, all of which should be ``significantly'' above zero (at
 least if your peer has been running for more than a few seconds). The
 lines indicate how many other peers your peer is connected to (via
@@ -284,6 +282,12 @@ of storage available and used by your peer. Note that 
"Traffic" is
 plotted cumulatively, so you should see a strict upwards trend in the
 traffic.
 
+The term ``peer'' is a common word used in
+federated and distributed networks to describe a participating device
+which is connected to the network. Thus, your Personal Computer or
+whatever it is you are looking at the Gtk+ interface describes a
+``Peer'' or a ``Node''.
+
 @node Peer Information
 @subsection Peer Information
 @c %**end of header
@@ -1240,13 +1244,15 @@ ProxyPassReverse https://gnunet.foo.org:4433/
 
 @noindent
 More information about the apache mod_proxy configuration can be found
-in the Apache 
address@hidden@uref{http://httpd.apache.org/docs/2.2/mod/mod_proxy.html#proxypass,
 http://httpd.apache.org/docs/2.2/mod/mod_proxy.html#proxypass}}
+in the
address@hidden://httpd.apache.org/docs/2.2/mod/mod_proxy.html#proxypass, Apache 
documentation}.
 
 @node Reverse Proxy - Configure your nginx HTTPS webserver
 @subsubsection Reverse Proxy - Configure your nginx HTTPS webserver
 
 Since nginx does not support chunked encoding, you first of all have to
-install the @code{chunkin} 
address@hidden@uref{http://wiki.nginx.org/HttpChunkinModule, 
http://wiki.nginx.org/HttpChunkinModule}}
+install the @code{chunkin}
address@hidden://wiki.nginx.org/HttpChunkinModule, module}.
 
 To enable chunkin add:
 
@@ -1491,7 +1497,7 @@ sections.
 @subsubsection Configuring the GNS nsswitch plugin
 
 The Name Service Switch (NSS) is a facility in Unix-like operating systems
address@hidden accurate: NSS is a functionality of the GNU C Library}
+(in most cases provided by the GNU C Library)
 that provides a variety of sources for common configuration databases and
 name resolution mechanisms.
 A superuser (system administrator) usually configures the
diff --git a/doc/documentation/chapters/keyconcepts.texi 
b/doc/documentation/chapters/keyconcepts.texi
index 55f79f1c7..b4a60024c 100644
--- a/doc/documentation/chapters/keyconcepts.texi
+++ b/doc/documentation/chapters/keyconcepts.texi
@@ -81,11 +81,14 @@ Binding messages expire after at most a week (the timeout 
can be
 shorter if the user configures the node appropriately).
 This expiration ensures that the network will eventually get rid of
 outdated advertisements.
address@hidden A. Ferreira, Christian Grothoff, and Paul Ruth.
+
+For more information, refer to the following paper:
+
+Ronaldo A. Ferreira, Christian Grothoff, and Paul Ruth.
 A Transport Layer Abstraction for Peer-to-Peer Networks
 Proceedings of the 3rd International Symposium on Cluster Computing
 and the Grid (GRID 2003), 2003.
-(@uref{https://gnunet.org/git/bibliography.git/plain/docs/transport.pdf, 
https://gnunet.org/git/bibliography.git/plain/docs/transport.pdf})}
+(@uref{https://gnunet.org/git/bibliography.git/plain/docs/transport.pdf, 
https://gnunet.org/git/bibliography.git/plain/docs/transport.pdf})
 
 @cindex Accounting to Encourage Resource Sharing
 @node Accounting to Encourage Resource Sharing
@@ -118,10 +121,11 @@ effective priority to satisfy their resource constraints. 
This way,
 GNUnet's economic model ensures that nodes that are not currently
 considered to have a surplus in contributions will not be served if
 the network load is high.
address@hidden Grothoff. An Excess-Based Economic Model for Resource
+
+For more information, refer to the following paper:
+Christian Grothoff. An Excess-Based Economic Model for Resource
 Allocation in Peer-to-Peer Networks. Wirtschaftsinformatik, June 2003.
-(@uref{https://gnunet.org/git/bibliography.git/plain/docs/ebe.pdf, 
https://gnunet.org/git/bibliography.git/plain/docs/ebe.pdf})}
address@hidden 2009?
+(@uref{https://gnunet.org/git/bibliography.git/plain/docs/ebe.pdf, 
https://gnunet.org/git/bibliography.git/plain/docs/ebe.pdf})
 
 @cindex Confidentiality
 @node Confidentiality
@@ -154,10 +158,11 @@ Providing anonymity for users is the central goal for the 
anonymous
 file-sharing application. Many other design decisions follow in the
 footsteps of this requirement.
 Anonymity is never absolute. While there are various
-scientific address@hidden Díaz, Stefaan Seys, Joris Claessens,
+scientific metrics
+(Claudia Díaz, Stefaan Seys, Joris Claessens,
 and Bart Preneel. Towards measuring anonymity.
 2002.
-(@uref{https://gnunet.org/git/bibliography.git/plain/docs/article-89.pdf, 
https://gnunet.org/git/bibliography.git/plain/docs/article-89.pdf})}
+(@uref{https://gnunet.org/git/bibliography.git/plain/docs/article-89.pdf, 
https://gnunet.org/git/bibliography.git/plain/docs/article-89.pdf}))
 that can help quantify the level of anonymity that a given mechanism
 provides, there is no such thing as "complete anonymity".
 GNUnet's file-sharing implementation allows users to select for each
@@ -165,7 +170,7 @@ operation (publish, search, download) the desired level of 
anonymity.
 The metric used is the amount of cover traffic available to hide the
 request.
 While this metric is not as good as, for example, the theoretical metric
-given in scientific address@hidden,
+given in scientific metrics,
 it is probably the best metric available to a peer with a purely local
 view of the world that does not rely on unreliable external information.
 The default anonymity level is @code{1}, which uses anonymous routing but
@@ -215,10 +220,12 @@ GNUnet we do not have to indirect the replies if we don't 
think we need
 more traffic to hide our own actions.
 
 This increases the efficiency of the network as we can indirect less under
-higher address@hidden Bennett and Christian Grothoff.
+higher load.
+Refer to the following paper for more:
+Krista Bennett and Christian Grothoff.
 GAP --- practical anonymous networking. In Proceedings of
 Designing Privacy Enhancing Technologies, 2003.
-(@uref{https://gnunet.org/git/bibliography.git/plain/docs/aff.pdf, 
https://gnunet.org/git/bibliography.git/plain/docs/aff.pdf})}
+(@uref{https://gnunet.org/git/bibliography.git/plain/docs/aff.pdf, 
https://gnunet.org/git/bibliography.git/plain/docs/aff.pdf})
 
 @cindex Deniability
 @node Deniability
@@ -240,11 +247,13 @@ encryption on the network layer (link encryption, 
confidentiality,
 authentication) and again on the application layer (provided
 by @command{gnunet-publish}, @command{gnunet-download},
 @command{gnunet-search} and @command{gnunet-gtk}).
address@hidden Grothoff, Krista Grothoff, Tzvetan Horozov,
+
+Refer to the following paper for more:
+Christian Grothoff, Krista Grothoff, Tzvetan Horozov,
 and Jussi T. Lindgren.
 An Encoding for Censorship-Resistant Sharing.
 2009.
-(@uref{https://gnunet.org/git/bibliography.git/plain/docs/ecrs.pdf, 
https://gnunet.org/git/bibliography.git/plain/docs/ecrs.pdf})}
+(@uref{https://gnunet.org/git/bibliography.git/plain/docs/ecrs.pdf, 
https://gnunet.org/git/bibliography.git/plain/docs/ecrs.pdf})
 
 @cindex Peer Identities
 @node Peer Identities
@@ -271,11 +280,11 @@ You can find your peer identity by running 
@command{gnunet-peerinfo -s}.
 @c FIXME: Explain or link to an explanation of the concept of public keys
 @c and private keys.
 @c FIXME: Rewrite for the latest GNS changes.
address@hidden Wachs, Martin Schanzenbach, and Christian Grothoff.
+GNS (Matthias Wachs, Martin Schanzenbach, and Christian Grothoff.
 A Censorship-Resistant, Privacy-Enhancing and Fully Decentralized Name
 System. In proceedings of 13th International Conference on Cryptology and
 Network Security (CANS 2014). 2014.
address@hidden://gnunet.org/git/bibliography.git/plain/docs/gns2014wachs.pdf, 
https://gnunet.org/git/bibliography.git/plain/docs/gns2014wachs.pdf}}
address@hidden://gnunet.org/git/bibliography.git/plain/docs/gns2014wachs.pdf, 
https://gnunet.org/git/bibliography.git/plain/docs/gns2014wachs.pdf})
 zones are similar to those of DNS zones, but instead of a hierarchy of
 authorities to governing their use, GNS zones are controlled by a private
 key.
diff --git a/doc/documentation/chapters/philosophy.texi 
b/doc/documentation/chapters/philosophy.texi
index 6d80d77ae..e57c20914 100644
--- a/doc/documentation/chapters/philosophy.texi
+++ b/doc/documentation/chapters/philosophy.texi
@@ -30,14 +30,12 @@ These are the GNUnet design principles, in order of 
importance:
 
 @itemize
 @item GNUnet must be implemented as
address@hidden://www.gnu.org/philosophy/free-sw.html, Free Software}
address@hidden To footnote or not to footnote, that's the question.
address@hidden means that you you have the four essential freedoms: to run
address@hidden://www.gnu.org/philosophy/free-sw.html, Free Software} ---
+This means that you you have the four essential freedoms: to run
 the program, to study and change the program in source code form,
 to redistribute exact copies, and to distribute modified versions.
-Refer to @uref{https://www.gnu.org/philosophy/free-sw.html, 
https://www.gnu.org/philosophy/free-sw.html}}
+(@uref{https://www.gnu.org/philosophy/free-sw.html}).
 @item GNUnet must minimize the amount of personally identifiable information 
exposed.
address@hidden TODO: Explain 'fully' in the terminology section.
 @item GNUnet must be fully distributed and resilient to external attacks and 
rogue participants.
 @item GNUnet must be self-organizing and not depend on administrators or 
centralized infrastructure.
 @item GNUnet must inform the user which other participants have to be trusted 
when establishing private communications.
@@ -53,28 +51,31 @@ Refer to @uref{https://www.gnu.org/philosophy/free-sw.html, 
https://www.gnu.org/
 @node Privacy and Anonymity
 @section Privacy and Anonymity
 
-The GNUnet protocols minimize the leakage of personally identifiable 
information of participants and
-do not allow adversaries to control, track, monitor or censor users 
activities. The
-GNUnet protocols also make it as hard as possible to disrupt operations by 
participating in the network with malicious intent. 
+The GNUnet protocols minimize the leakage of personally identifiable
+information of participants and do not allow adversaries to control,
+track, monitor or censor users activities. The GNUnet protocols also
+make it as hard as possible to disrupt operations by participating in
+the network with malicious intent.
 
-Analyzing participant's activities becomes more difficult as the number of 
peers and
-applications that generate traffic on the network grows, even if the additional
-traffic generated is not related to anonymous communication. This is one of 
the reasons why GNUnet is developed as a peer-to-peer
-framework where many applications share the lower layers of an
-increasingly complex protocol stack. The GNUnet architecture encourages many
-different forms of peer-to-peer applications.
+Analyzing participant's activities becomes more difficult as the
+number of peers and applications that generate traffic on the network
+grows, even if the additional traffic generated is not related to
+anonymous communication. This is one of the reasons why GNUnet is
+developed as a peer-to-peer framework where many applications share
+the lower layers of an increasingly complex protocol stack. The GNUnet
+architecture encourages many different forms of peer-to-peer
+applications.
 
 @cindex Practicality
 @node Practicality
 @section Practicality
 
-Whereever possible GNUnet allows the peer to adjust its operations
-and functionalities to specific use cases. A GNUnet peer running on
-a mobile device with limited battery for example might choose not to
+Whereever possible GNUnet allows the peer to adjust its operations and
+functionalities to specific use cases. A GNUnet peer running on a
+mobile device with limited battery for example might choose not to
 relay traffic for other participants.
 
-For certain applications like file-sharing GNUnet allows participants to trade 
degrees of anonymity in
-exchange for increased efficiency. However, it is not possible for any
-user's efficiency requirements to compromise the anonymity
-of any other user.
-
+For certain applications like file-sharing GNUnet allows participants
+to trade degrees of anonymity in exchange for increased
+efficiency. However, it is not possible for any user's efficiency
+requirements to compromise the anonymity of any other user.
diff --git a/doc/documentation/chapters/preface.texi 
b/doc/documentation/chapters/preface.texi
index 29cf924a2..386cefa6d 100644
--- a/doc/documentation/chapters/preface.texi
+++ b/doc/documentation/chapters/preface.texi
@@ -1,7 +1,6 @@
 @node Preface
 @chapter Preface
 
address@hidden introductionary words here
 This collection of manuals describes how to use GNUnet, a framework
 for secure peer-to-peer networking with the high-level goal to provide
 a strong foundation Free Software for a global, distributed network
@@ -98,8 +97,9 @@ simple P2P chat.  In 2007, we created
 @uref{https://gnu.org/s/libmicrohttpd, GNU libmicrohttpd}
 to support a pluggable transport based on HTTP.  In 2009, the
 architecture was radically modularized into the multi-process system
-that exists today.  Coincidentally, the first version of the address@hidden: 
Automatic Restart Manager}
-service was implemented a day before systemd was announced.  From 2009
+that exists today.  Coincidentally, the first version of the ARM
+service (ARM: Automatic Restart Manager)
+was implemented a day before systemd was announced.  From 2009
 to 2014 work progressed rapidly thanks to a significant research grant
 from the Deutsche Forschungsgesellschaft.  This resulted in particular
 in the creation of the R5N DHT, CADET, ATS and the GNU Name System.
@@ -110,7 +110,7 @@ In 2013, we launched @uref{https://taler.net, GNU Taler} to 
address
 the challenge of convenient
 and privacy-preserving online payments.  In 2015, the
 @c TODO: Maybe even markup for the E if it renders in most outputs.
address@hidden://pep.foundation/, address@hidden easy privacy} project
address@hidden://pep.foundation/, pEp} (pretty Easy privacy) project
 announced that they will use GNUnet as the technology for their
 meta-data protection layer, ultimately resulting in GNUnet e.V.
 entering into a formal long-term collaboration with the pEp
@@ -156,7 +156,9 @@ where any developer can become a member.  GNUnet e.V. 
serves as a
 legal entity to hold the copyrights to GNUnet.  GNUnet e.V. may also
 choose to pay for project resources, and can collect donations.
 GNUnet e.V. may also choose to adjust the license of the
-software (with the constraint that it has to remain free 
software)@footnote{For example in 2018 we switched from GPL3 to AGPL3. In 
practice these changes do not happen very often.}
+software (with the constraint that it has to remain free software).
+In 2018 we switched from GPL3 to AGPL3, in practice these changes do
+not happen very often.
 
 
 @node Typography
diff --git a/doc/documentation/chapters/user.texi 
b/doc/documentation/chapters/user.texi
index f18b6b432..5aa3a62bf 100644
--- a/doc/documentation/chapters/user.texi
+++ b/doc/documentation/chapters/user.texi
@@ -259,9 +259,8 @@ Note that this requires having @command{LaTeX} installed on 
your system.
 If you are using a Debian GNU/Linux based operating system, the
 following command should install the required components.
 Keep in mind that this @b{requires 3GB} of downloaded data and possibly
address@hidden address@hidden's note:
address@hidden size `guix build texlive`} in summer 2018 returns a DAG
-size of 5032.4 MiB} when unpacked.
address@hidden more} when unpacked. On a GNU Guix based system texlive 2017 has
+returns a DAG size of 5032.4 MiB.
 @b{We welcome any help in identifying the required components of the
 TexLive Distribution. This way we could just state the required components
 without pulling in the full distribution of TexLive.}
diff --git a/doc/documentation/gnunet-c-tutorial.texi 
b/doc/documentation/gnunet-c-tutorial.texi
index fb6e717ae..a41075a17 100644
--- a/doc/documentation/gnunet-c-tutorial.texi
+++ b/doc/documentation/gnunet-c-tutorial.texi
@@ -1483,7 +1483,7 @@ service SERVICE should contain a rule similar to this:
 @c must be improved.
 
 @example
address@hidden tutorial-examples/025.c
address@hidden tutorial-examples/025.Makefile.am
 @end example
 
 @noindent
diff --git a/doc/documentation/tutorial-examples/025.c 
b/doc/documentation/tutorial-examples/025.Makefile.am
similarity index 100%
rename from doc/documentation/tutorial-examples/025.c
rename to doc/documentation/tutorial-examples/025.Makefile.am

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