12 files changed, 88 insertions, 88 deletions

diff --git a/doc/handbook/chapters/developer.texi b/doc/handbook/chapters/developer.texi
index 9bb74c3de..1bf7a7b24 100644
--- a/doc/handbook/chapters/developer.texi
+++ b/doc/handbook/chapters/developer.texi
@@ -392,9 +392,9 @@ etc.).
 @item @file{transport/} --- transport service
 The transport service is responsible for managing the
 basic P2P communication. It uses plugins to support P2P communication
-over TCP, UDP, HTTP, HTTPS and other protocols.The transport service
+over TCP, UDP, HTTP, HTTPS and other protocols. The transport service
 validates peer addresses, enforces bandwidth restrictions, limits the
-total number of connections and enforces connectivity restrictions (i.e.
+total number of connections and enforces connectivity restrictions (e.g.
 friends-only).
 @item @file{peerinfo-tool/} --- gnunet-peerinfo
 This directory contains the gnunet-peerinfo binary which can be used to
@@ -746,21 +746,21 @@ Here you can find some rules to help you write code for GNUnet.
 
 @itemize @bullet
 @item services and daemons use their directory name in
-@code{GNUNET_log_setup} (i.e. 'core') and log using
+@code{GNUNET_log_setup} (e.g. 'core') and log using
 plain 'GNUNET_log'.
 @item command-line tools use their full name in
-@code{GNUNET_log_setup} (i.e. 'gnunet-publish') and log using
+@code{GNUNET_log_setup} (e.g. 'gnunet-publish') and log using
 plain 'GNUNET_log'.
 @item service access libraries log using
 '@code{GNUNET_log_from}' and use '@code{DIRNAME-api}' for the
-component (i.e. 'core-api')
+component (e.g. 'core-api')
 @item pure libraries (without associated service) use
 '@code{GNUNET_log_from}' with the component set to their
 library name (without lib or '@file{.so}'),
-which should also be their directory name (i.e. '@file{nat}')
+which should also be their directory name (e.g. '@file{nat}')
 @item plugins should use '@code{GNUNET_log_from}'
 with the directory name and the plugin name combined to produce
-the component name (i.e. 'transport-tcp').
+the component name (e.g. 'transport-tcp').
 @item logging should be unified per-file by defining a
 @code{LOG} macro with the appropriate arguments,
 along these lines:
@@ -832,14 +832,14 @@ test
 @subsubsection src/ directories
 
 @itemize @bullet
-@item gnunet-NAME: end-user applications (i.e., gnunet-search, gnunet-arm)
-@item gnunet-service-NAME: service processes with accessor library (i.e.,
+@item gnunet-NAME: end-user applications (like gnunet-search or gnunet-arm)
+@item gnunet-service-NAME: service processes with accessor library (e.g.
 gnunet-service-arm)
 @item libgnunetNAME: accessor library (_service.h-header) or standalone
 library (_lib.h-header)
-@item gnunet-daemon-NAME: daemon process without accessor library (i.e.,
+@item gnunet-daemon-NAME: daemon process without accessor library (e.g.
 gnunet-daemon-hostlist) and no GNUnet management port
-@item libgnunet_plugin_DIR_NAME: loadable plugins (i.e.,
+@item libgnunet_plugin_DIR_NAME: loadable plugins (e.g.
 libgnunet_plugin_transport_tcp)
 @end itemize
 
@@ -2305,7 +2305,7 @@ for new developers):
 @itemize @bullet
 @item logging (common_logging.c)
 @item memory allocation (common_allocation.c)
-@item endianess conversion (common_endian.c)
+@item endianness conversion (common_endian.c)
 @item internationalization (common_gettext.c)
 @item String manipulation (string.c)
 @item file access (disk.c)
@@ -4287,7 +4287,7 @@ which will warn you if you don't have the necessary libraries.
 @c work!@ Finally you just have to be sure that you have the correct drivers
 @c for your Bluetooth device installed and that your device is on and in a
 @c discoverable mode. The Windows Bluetooth Stack supports only the RFCOMM
-@c protocol so we cannot turn on your device programatically!
+@c protocol so we cannot turn on your device programmatically!
 
 @c FIXME: Change to unique title
 @node How does it work2?
@@ -4638,7 +4638,7 @@ simply use the socket.
 @c implementation follows the same principles as the GNU/Linux one:
 
 @c @itemize @bullet
-@c @item It has a initalization part where it initializes the
+@c @item It has a initialization part where it initializes the
 @c Windows Sockets, creates a RFCOMM socket which will be binded and switched
 @c to the listening mode and registers a SDP service. In the Microsoft
 @c Bluetooth API there are two ways to work with the SDP:
@@ -5023,7 +5023,7 @@ key of the other peer
 ephemeral key of the other peer, but we are waiting for the other peer to
 confirm it's authenticity (ability to decode) via challenge-response.
 @item @code{KX_STATE_UP} The connection is fully up from the point of
-view of the sender (now performing keep-alives)
+view of the sender (now performing keep-alive)
 @item @code{KX_STATE_REKEY_SENT} The sender has initiated a rekeying
 operation; the other peer has so far failed to confirm a working
 connection using the new ephemeral key
@@ -5653,7 +5653,7 @@ download. The client component is basically a HTTP client
 (based on libcurl) which can download hostlists from one or more websites.
 The hostlist format is a binary blob containing a sequence of HELLO
 messages. Note that any HTTP server can theoretically serve a hostlist,
-the build-in hostlist server makes it simply convenient to offer this
+the built-in hostlist server makes it simply convenient to offer this
 service.
 
 
@@ -5895,7 +5895,7 @@ The size of the list of URLs is restricted, so if an additional server is
 added and the list is full, the URL with the worst quality ranking
 (determined through successful downloads and number of HELLOs e.g.) is
 discarded. During shutdown the list of URLs is saved to a file for
-persistance and loaded on startup. URLs from the configuration file are
+persistence and loaded on startup. URLs from the configuration file are
 never discarded.
 
 @node Usage
@@ -6155,7 +6155,7 @@ To disconnect from NAMESTORE, clients use
 @code{GNUNET_NAMESTORE_disconnect} and specify the handle to disconnect.
 
 NAMESTORE internally uses the ECDSA private key to refer to zones. These
-private keys can be obtained from the IDENTITY subsytem.
+private keys can be obtained from the IDENTITY subsystem.
 Here @emph{egos} @emph{can be used to refer to zones or the default ego
 assigned to the GNS subsystem can be used to obtained the master zone's
 private key.}
@@ -6640,7 +6640,7 @@ The size of an element's data is limited to around 62 KB.
 Sets created by a local client can be modified and reused for multiple
 operations. As each set operation requires potentially expensive special
 auxiliary data to be computed for each element of a set, a set can only
-participate in one type of set operation (i.e. union or intersection).
+participate in one type of set operation (either union or intersection).
 The type of a set is determined upon its creation.
 If a the elements of a set are needed for an operation of a different
 type, all of the set's element must be copied to a new set of appropriate
@@ -6811,7 +6811,7 @@ the client.
 
 
 
-Each listener also requires a seperate client connection. By sending the
+Each listener also requires a separate client connection. By sending the
 @code{GNUNET_SERVICE_SET_LISTEN} message, the client notifies the service
 of the application id and operation type it is interested in. A client
 rejects an incoming request by sending @code{GNUNET_SERVICE_SET_REJECT}
@@ -7147,7 +7147,7 @@ the client.
 @node Listeners for Intersection
 @subsubsection Listeners for Intersection
 
-Each listener also requires a seperate client connection. By sending the
+Each listener also requires a separate client connection. By sending the
 @code{GNUNET_SERVICE_SETI_LISTEN} message, the client notifies the service
 of the application id and operation type it is interested in. A client
 rejects an incoming request by sending @code{GNUNET_SERVICE_SETI_REJECT}
@@ -7409,7 +7409,7 @@ the client.
 @node Listeners for Union
 @subsubsection Listeners for Union
 
-Each listener also requires a seperate client connection. By sending the
+Each listener also requires a separate client connection. By sending the
 @code{GNUNET_SERVICE_SETU_LISTEN} message, the client notifies the service
 of the application id and operation type it is interested in. A client
 rejects an incoming request by sending @code{GNUNET_SERVICE_SETU_REJECT}
@@ -7832,7 +7832,7 @@ performance).
 Third, an optional Bloom filter can be specified to exclude known results;
 replies that hash to the bits set in the Bloom filter are considered
 invalid. False-positives can be eliminated by sending the same query
-again with a different Bloom filter mutator value, which parameterizes
+again with a different Bloom filter mutator value, which parametrizes
 the hash function that is used.
 Finally, an optional application-specific "eXtended query" (xquery) can
 be specified to further constrain the results. It is entirely up to
@@ -9030,14 +9030,13 @@ particular key has been revoked. The service responds with a
 @code{QueryResponseMessage} which simply contains a bit that says if the
 given public key is still valid, or if it has been revoked.
 
-The second possible interaction is for a client to revoke a key by
-passing a @code{RevokeMessage} to the service. The @code{RevokeMessage}
-contains the ECDSA public key to be revoked, a signature by the
-corresponding private key and the proof-of-work, The service responds
-with a @code{RevocationResponseMessage} which can be used to indicate
-that the @code{RevokeMessage} was invalid (i.e. proof of work incorrect),
-or otherwise indicates that the revocation has been processed
-successfully.
+The second possible interaction is for a client to revoke a key by passing a
+@code{RevokeMessage} to the service. The @code{RevokeMessage} contains the
+ECDSA public key to be revoked, a signature by the corresponding private key
+and the proof-of-work. The service responds with a
+@code{RevocationResponseMessage} which can be used to indicate that the
+@code{RevokeMessage} was invalid (e.g. the proof of work is incorrect), or
+otherwise to indicate that the revocation has been processed successfully.
 
 @node The REVOCATION Peer-to-Peer Protocol
 @subsection The REVOCATION Peer-to-Peer Protocol
@@ -9615,9 +9614,9 @@ In order to address the above issues, we want to:
       TRANSPORT shall create bi-directional channels from this whenever
       possible.
 @item DV should no longer be a plugin, but part of TRANSPORT.
-@item TRANSPORT should provide communicators help communicating (i.e. in the
-      case of uni-directional communicators or the need for out-of-band
-      signalling for NAT traversal). We call this functionality
+@item TRANSPORT should provide communicators help communicating, for example
+      in the case of uni-directional communicators or the need for out-of-band
+      signalling for NAT traversal. We call this functionality
       @emph{backchannels}.
 @item Transport manipulation should be signalled to CORE on a per-message basis
       instead of an approximate bandwidth.
@@ -9715,8 +9714,8 @@ by layer. For example, CADET will always strictly implement reliable and
 in-order delivery of messages, while the same options are only advisory for
 TRANSPORT and CORE: they should try (using ACKs on unreliable communicators,
 not changing the message order themselves), but if messages are lost anyway
-(i.e. because a TCP is dropped in the middle), or if messages are reordered
-(i.e. because they took dierent paths over the network and arrived in a
+(e.g. because a TCP is dropped in the middle), or if messages are reordered
+(e.g. because they took different paths over the network and arrived in a
 different order) TRANSPORT and CORE do not have to correct this. Whether a
 preference is strict or loose is thus dened by the respective layer.
 
@@ -9728,8 +9727,8 @@ The API for communicators is defined in
 Each communicator must specify its (global) communication characteristics, which
 for now only say whether the communication is reliable (e.g. TCP, HTTPS) or
 unreliable (e.g. UDP, WLAN). Each communicator must specify a unique address
-prex, or NULL if the communicator cannot establish outgoing connections (i.e.
-is only acting as a TCP server).
+prex, or NULL if the communicator cannot establish outgoing connections
+(for example because it is only acting as a TCP server).
 A communicator must tell TRANSPORT which addresses it is reachable under.
 Addresses may be added or removed at any time. A communicator may have zero
 addresses (transmission only).
@@ -9810,7 +9809,7 @@ properties designed for application level usage:
 @item MESSENGER allows detection for dropped messages by chaining them (messages 
       refer to the last message by their hash) improving accountability
 @item MESSENGER allows requesting messages from other peers explicitly to ensure
-      availibility
+      availability
 @item MESSENGER provides confidentiality by padding messages to few different
       sizes (512 bytes, 4096 bytes, 32768 bytes and maximal message size from 
       CADET)
@@ -9825,13 +9824,13 @@ Also MESSENGER provides multiple features with privacy in mind:
 @itemize @bullet
 @item MESSENGER allows deleting messages from all peers in the group by the 
       original sender (uses the MESSENGER provided verification)
-@item MESSENGER allows using the publically known anonymous ego instead of any
+@item MESSENGER allows using the publicly known anonymous ego instead of any
       unique identifying ego
 @item MESSENGER allows your node to decide between acting as host of the used 
       messaging room (sharing your peer's identity with all nodes in the group) 
       or acting as guest (sharing your peer's identity only with the nodes you
       explicitly open a connection to)
-@item MESSENGER handles members independantly of the peer's identity making 
+@item MESSENGER handles members independently of the peer's identity making 
       forwarded messages indistinguishable from directly received ones (
       complicating the tracking of messages and identifying its origin)
 @item MESSENGER allows names of members being not unique (also names are 
@@ -9977,7 +9976,7 @@ check for completion of a member session requires this information.
 
 A member session is a triple of the room key, the member ID and the public key 
 of the member's ego. Member sessions allow that a member can change their ID or 
-their ego once at a time without loosing the ability to delete old messages or 
+their ego once at a time without losing the ability to delete old messages or 
 identifying the original sender of a message. On every change of ID or EGO a 
 session will be marked as closed. So every session chain will only contain one 
 open session with the current ID and public key.
diff --git a/doc/handbook/chapters/installation.texi b/doc/handbook/chapters/installation.texi
index 40a23e738..24431e20f 100644
--- a/doc/handbook/chapters/installation.texi
+++ b/doc/handbook/chapters/installation.texi
@@ -171,7 +171,7 @@ group. In addition the group @code{gnunetdns} may be needed (see below).
 
 Create user @code{gnunet} who is member of the group @code{gnunet}
 (automatically created) and specify a home directory where the GNUnet
-services will store persistant data such as information about peers.
+services will store persistent data such as information about peers.
 @example
 $ sudo useradd --system --home-dir /var/lib/gnunet --create-home gnunet
 @end example
@@ -431,7 +431,7 @@ For the @emph{multi-user setup} first the system services need to be started
 as the system user, i.e. the user @code{gnunet} needs to execute
 @code{gnunet-arm -s}. This should be done by the system's init system.
 Then the user who wants to start GNUnet applications has to run
-@code{gnunet-arm -s} too. It is recommented to automate this, e.g. using
+@code{gnunet-arm -s} too. It is recommended to automate this, e.g. using
 the user's crontab.
 
 @node gnunet-gtk
@@ -1355,7 +1355,7 @@ The interface channel depends on the wlan network that the card is
 connected to. If no connection has been made since the start of the
 computer, it is usually the first channel of the card.
 Peers will only find each other and communicate if they are on the same
-channel. Channels must be set manually, i.e. using:
+channel. Channels must be set manually, e.g. by using:
 
 @example
 iwconfig wlan0 channel 1
@@ -1369,7 +1369,7 @@ proxy forwards the HTTP request he receives with a certain URL to another
 webserver, here a GNUnet peer.
 
 So if you have a running Apache or nginx webserver you can configure it to
-be a GNUnet reverse proxy. Especially if you have a well-known webiste
+be a GNUnet reverse proxy. Especially if you have a well-known website
 this improves censorship resistance since it looks as normal surfing
 behaviour.
 
@@ -1944,12 +1944,13 @@ Python installation and its dependencies.
 
 Another way to install Ascension on Debian is to install the python3-ascension
 package. It can be found within the above mentioned Ascension git repository.
-This also adds a system user ascension and runs a GNUnet peer in the
-background. Attention: This only works if a recent version of GNUnet is
+This also adds a system user called ascension and runs a GNUnet peer in the
+background. Please note: This only works if a recent version of GNUnet is
 installed on your system. The version number of Ascension is chosen according
-to the required feature level of GNUnet. I.e. Ascension 0.11.5 is only
-compatible with GNUnet 0.11.5 and upwards. As Debian's packages for GNUnet are
-outdated even in experimental, you will need to install GNUnet manually
+to the required feature level of GNUnet: Ascension 0.11.5 is only
+compatible with GNUnet 0.11.5 or later and so on.
+As Debian's packages for GNUnet are outdated even in experimental,
+you will need to install GNUnet manually
 @xref{Installing GNUnet}.
 
 Please check @xref{Migrating an existing DNS zone into GNS}, for usage manual
@@ -2034,11 +2035,11 @@ Furthermore, you can serve as a DNS, IPv4 or IPv6 exit to the Internet.
 Being a DNS exit is usually pretty harmless. However, enabling IPv4 or
 IPv6-exit without further precautions may enable adversaries to access
 your local network, send spam, attack other systems from your Internet
-connection and to other mischief that will appear to come from your
+connection and do other mischiefs that will appear to come from your
 machine. This may or may not get you into legal trouble.
 If you want to allow IPv4 or IPv6-exit functionality, you should strongly
 consider adding additional firewall rules manually to protect your local
-network and to restrict outgoing TCP traffic (i.e. by not allowing access
+network and to restrict outgoing TCP traffic (e.g. by not allowing access
 to port 25). While we plan to improve exit-filtering in the future,
 you're currently on your own here.
 Essentially, be prepared for any kind of IP-traffic to exit the respective
@@ -2159,7 +2160,7 @@ run as use "gnunet" (and with option "-c /etc/gnunet.conf" so that it
 modifies the system configuration). As always, gnunet-setup should be run
 after the GNUnet peer was stopped using "gnunet-arm -e". Distributors
 might want to include a wrapper for gnunet-setup that allows the
-desktop-user to "sudo" (i.e. using gtksudo) to the "gnunet" user account
+desktop-user to "sudo" (e.g. using gtksudo) to the "gnunet" user account
 and then runs "gnunet-arm -e", "gnunet-setup" and "gnunet-arm -s" in
 sequence.
 
@@ -2175,7 +2176,7 @@ Sane defaults should exist in your
 you could simply start without any configuration. If you want to
 configure your peer later, you need to stop it before invoking the
 @code{gnunet-setup} tool to customize further and to test your
-configuration (@code{gnunet-setup} has build-in test functions).
+configuration (@code{gnunet-setup} has built-in test functions).
 
 The most important option you might have to still set by hand is in
 [PATHS]. Here, you use the option "GNUNET_HOME" to specify the path where
diff --git a/doc/handbook/chapters/keyconcepts.texi b/doc/handbook/chapters/keyconcepts.texi
index f429997bf..49129acf5 100644
--- a/doc/handbook/chapters/keyconcepts.texi
+++ b/doc/handbook/chapters/keyconcepts.texi
@@ -242,7 +242,7 @@ against identification.
 
 The messaging service allows the use of an anonymous ego for the signing and
 verification process of messages instead of a unique ego. This anonymous ego is
-a publically known key pair which is shared between all peers in GNUnet.
+a publicly known key pair which is shared between all peers in GNUnet.
 
 Using this ego only ensures that individual messages alone can't identify its 
 sender inside of a messenger room. It should be clarified that the route of 
diff --git a/doc/handbook/chapters/philosophy.texi b/doc/handbook/chapters/philosophy.texi
index 060871189..785a65e42 100644
--- a/doc/handbook/chapters/philosophy.texi
+++ b/doc/handbook/chapters/philosophy.texi
@@ -70,7 +70,7 @@ applications.
 @node Practicality
 @section Practicality
 
-Whereever possible GNUnet allows the peer to adjust its operations and
+Wherever 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.
diff --git a/doc/handbook/chapters/preface.texi b/doc/handbook/chapters/preface.texi
index 62ced08a4..d1afdf756 100644
--- a/doc/handbook/chapters/preface.texi
+++ b/doc/handbook/chapters/preface.texi
@@ -85,7 +85,7 @@ book which explains GNUnet in the least complicated way to you.
 
 Even when you don't want to or can't learn Texinfo, you can contribute.
 Send us an Email or join our IRC chat room on freenode and talk with
-us about the documentation (the prefered way to reach out is the
+us about the documentation (the preferred way to reach out is the
 mailinglist, since you can communicate with us without waiting on
 someone in the chatroom).
 One way or another you can help shape the understanding of GNUnet
@@ -144,7 +144,7 @@ and privacy-preserving online payments.  In 2015, the
 @c XXX: but the correct version would lead to problems with
 @c XXX: some of our outputs and/or older versions of texinfo
 @c XXX: and devices that display versions on consoles etc.
-@c XXX: This is why we keep the pEp until proven that p(tripple bar)p
+@c XXX: This is why we keep the pEp until proven that p(triple bar)p
 @c XXX: does not create broken outputs.
 @uref{https://pep.foundation/, pretty Easy privacy} (pEp) project
 announced that they will use GNUnet as the technology for their
diff --git a/doc/handbook/chapters/user.texi b/doc/handbook/chapters/user.texi
index b5889891b..409a89e47 100644
--- a/doc/handbook/chapters/user.texi
+++ b/doc/handbook/chapters/user.texi
@@ -71,7 +71,7 @@ $ gnunet-arm -e
 ``.pin'' is a default zone which points to a zone managed by gnunet.org.
 Use @code{gnunet-config -s gns} to view the GNS configuration, including
 all configured zones that are operated by other users.  The respective
-configuration entry names start with a ``.'', i.e. ``.pin''.
+configuration entry names start with a ``.'', e.g. ``.pin''.
 
 You can configure any number of top-level domains, and point them to
 the respective zones of your friends!  For this, simply obtain the
@@ -109,7 +109,7 @@ rules - GO0T87F9BPMF8NKD5A54L2AH1T0GRML539TPFSRMCEA98182QD30
 @subsection The GNS Tab
 
 
-Maintaing your zones is through the NAMESTORE service and is discussed
+Maintaining your zones is through the NAMESTORE service and is discussed
 here.  You can manage your zone using @command{gnunet-identity} and
 @command{gnunet-namestore}, or most conveniently using
 @command{gnunet-namestore-gtk}.
@@ -1620,7 +1620,7 @@ under "*.friend.gnu".
 BOX records are there to integrate information from TLSA or
 SRV records under the main label. In DNS, TLSA and SRV records
 use special names of the form @code{_port._proto.(label.)*tld} to
-indicate the port number and protocol (i.e. tcp or udp) for which
+indicate the port number and protocol (like TCP or UDP) for which
 the TLSA or SRV record is valid. This causes various problems, and
 is elegantly solved in GNS by integrating the protocol and port
 numbers together with the respective value into a "BOX" record.
@@ -1633,7 +1633,7 @@ are BOXed up.
 @subsubsection LEHO
 
 The LEgacy HOstname of a server. Some webservers expect a specific
-hostname to provide a service (virtiual hosting). Also SSL
+hostname to provide a service (virtual hosting). Also SSL
 certificates usually contain DNS names. To provide the expected
 legacy DNS name for a server, the LEHO record can be used.
 To mitigate the just mentioned issues the GNS proxy has to be used.
@@ -1700,7 +1700,7 @@ be useful if you do not want to start resolution in the DNS root zone
 (due to issues such as censorship or availability).
 
 Note that you would typically want to use a relative name for the
-nameserver, i.e.
+nameserver, like so:
 
 @example
 Name: pet; RRType: GNS2DNS; Value: gnunet.org@@ns-joker.+@
@@ -2244,7 +2244,7 @@ that subnet to the GNUnet exit's TUN interface.
 
 When running a local service, you should make sure that the local
 service is (also) bound to the IP address of your EXIT interface
-(i.e. 169.254.86.1). It will NOT work if your local service is
+(e.g. 169.254.86.1). It will NOT work if your local service is
 just bound to loopback. You may also want to create a "VPN" record
 in your zone of the GNU Name System to make it easy for others to
 access your service via a name instead of just the full service
@@ -2315,7 +2315,7 @@ and restart your peer, your Internet traffic should be tunneled
 over the GNUnet VPN.
 
 The GNUnet VPN uses DNS-ALG to hijack your IP traffic. Whenever an
-application resolves a hostname (i.e. 'gnunet.org'), the
+application resolves a hostname (like 'gnunet.org'), the
 "gnunet-daemon-pt" will instruct the "gnunet-service-dns" to intercept
 the request (possibly route it over GNUnet as well) and replace the
 normal answer with an IP in the range of the VPN's interface.
@@ -2325,8 +2325,8 @@ destination.
 
 For applications that do not use DNS, you can also manually create
 such a mapping using the gnunet-vpn command-line tool. Here, you
-specify the desired address family of the result (i.e. "-4"), and the
-intended target IP on the Internet ("-i 131.159.74.67") and
+specify the desired address family of the result (e.g. "-4"), and the
+intended target IP on the Internet (e.g. "-i 131.159.74.67") and
 "gnunet-vpn" will tell you which IP address in the range of your
 VPN tunnel was mapped.
 
@@ -2404,7 +2404,7 @@ $ gnunet-peerinfo -s
 
 A ROOMKEY gets entered in readable text form. The service will then hash the 
 entered ROOMKEY and use the result as shared secret for transmission through 
-the CADET submodule. You can also optionally leave out the '-r' paramter and 
+the CADET submodule. You can also optionally leave out the '-r' parameter and 
 the ROOMKEY to use the zeroed hash instead.
 
 If no IDENTITY is provided you will not send any name to others, you will be 
@@ -2478,7 +2478,7 @@ $ gnunet-messenger [-e IDENTITY] -d PEERIDENTITY -r ROOMKEY -p
 @end example
 
 Notice that you can only send such encrypted messages to members who use an ego
-which is not publically known as the anonymous ego to ensure transparency. If 
+which is not publicly known as the anonymous ego to ensure transparency. If 
 any user could decrypt these messages they would not be private. So as receiver
 of such messages the IDENTITY is required and it has to match a local ego.
 
diff --git a/doc/index.html b/doc/index.html
index 93c0e7d9e..bf8683780 100644
--- a/doc/index.html
+++ b/doc/index.html
@@ -2,7 +2,7 @@
   <head>
     <title>GNUnet - GNUnet Manuals and Handbooks</title>
     <meta charset="utf-8">
-    <meta name="keywords" content="gnunet,GNUnet,Manual,Manuals,preview,developer-preview,inofficial,GNU">
+    <meta name="keywords" content="gnunet,GNUnet,Manual,Manuals,preview,developer-preview,unofficial,GNU">
     <meta name="description" content="The GNUnet Manuals">
     <link href="style.css" rel="stylesheet">
     <meta name="viewport" content="width=device-width, initial-scale=1">
diff --git a/doc/man/gnunet-config.1 b/doc/man/gnunet-config.1
index f6166cbca..3d243af89 100644
--- a/doc/man/gnunet-config.1
+++ b/doc/man/gnunet-config.1
@@ -39,13 +39,13 @@
 .Op Fl s Ar SECTION | Fl -section= Ns Ar SECTION
 .Op Fl V Ar VALUE | Fl -value Ar VALUE
 .Op Fl v | -version
-.Op Fl W | -rewrite
+.Op Fl w | -rewrite
 .Sh DESCRIPTION
 .Nm
 can be used to read or modify GNUnet configuration files.
 .Bl -tag -width indent
 .It Fl b Ar BACKEND | Fl -supported-backend= Ns Ar BACKEND
-Tests whether the specified BACKEND is supported by the current installation.  The backend must match the name of a plugin, i.e. "namestore_postgres" for the Postgres database backend of the "NAMESTORE" service. If the BACKEND is supported, gnunet-config will return a status code of 0 (success), otherwise 77 (unsupported).  When this option is specified, no other options may be specified. Specifying this option together with other options will cause gnunet-config to return a status code of 1 (error).
+Tests whether the specified BACKEND is supported by the current installation.  The backend must match the name of a plugin, e.g. "namestore_postgres" for the Postgres database backend of the "NAMESTORE" service. If the BACKEND is supported, gnunet-config will return a status code of 0 (success), otherwise 77 (unsupported).  When this option is specified, no other options may be specified. Specifying this option together with other options will cause gnunet-config to return a status code of 1 (error).
 .It Fl c Ar FILENAME | Fl -config= Ns Ar FILENAME
 Use the configuration file FILENAME.
 .It Fl f | -filename
@@ -69,8 +69,8 @@ Configuration value to store in the given section under the given option.
 Must only be given together with -s and -o options.
 .It Fl v | -version
 Print GNUnet version number.
-.It Fl W | -rewrite
-Consider differences to defaults only.
+.It Fl w | -rewrite
+Write to file the full configuration, including default values, instead of just the differences.
 .El
 .Sh SEE ALSO
 The full documentation for gnunet is maintained as a Texinfo manual.
diff --git a/doc/man/gnunet-datastore.1 b/doc/man/gnunet-datastore.1
index 81347dcae..842ba62a0 100644
--- a/doc/man/gnunet-datastore.1
+++ b/doc/man/gnunet-datastore.1
@@ -41,7 +41,7 @@
 .Nm
 can be used to backup and restore or merge GNUnet datastores.
 This is useful if a datastore is to be migrated between
-SQL databases, i.e. from sqlite to postgres or vice versa.
+SQL databases, e.g. from sqlite to postgres or vice versa.
 gnunet-datastore will dump the entire contents of the database
 or insert a dump file into the database.
 .Bl -tag -width indent
diff --git a/doc/man/gnunet-namestore.1 b/doc/man/gnunet-namestore.1
index b9bbff027..73bbe5a5c 100644
--- a/doc/man/gnunet-namestore.1
+++ b/doc/man/gnunet-namestore.1
@@ -109,7 +109,7 @@ Create a record that is a shadow record.
 Shadow records are only used once all other records of the same type
 under the same label have expired.
 .It Fl t Ar TYPE | Fl -type= Ns Ar TYPE
-Type of the record to add/delete/display (i.e. "A", "AAAA", "NS", "PKEY", "MX" etc.).
+Type of the record to add/delete/display ("A"; "AAAA"; "NS"; "PKEY"; "MX"; etc.).
 .It Fl u Ar URI | Fl -uri= Ns Ar URI
 Add PKEY record from gnunet://gns/-URI to our zone; the record type is
 always PKEY, if no expiration is given FOREVER is used
diff --git a/doc/release_policy.rfc.txt b/doc/release_policy.rfc.txt
index 8fd89f73c..41c98ec93 100644
--- a/doc/release_policy.rfc.txt
+++ b/doc/release_policy.rfc.txt
@@ -42,7 +42,7 @@ document the current release model:
     mostly we rather explicitly declare certain bugs as "not critical")
   - Whenever API changes happen the person making that changes should update
     dependencies or at least work with people who hack on the dependencies to
-    cooridnate the adjustments
+    coordinate the adjustments
   o buildbots are happy (if running)
   o static analysis is happy (if available, false-positives => ignore)
   o documentation is reasonably up-to-date
@@ -57,7 +57,7 @@ For further information see: https://trunkbaseddevelopment.com/
 
 II. Evaluation Criteria 
 =======================
-(what are criterias to interprete the results as success if we review
+(what are criteria to interpret the results as success if we review
 the problem and solution after a year or so)
 
 III. Concerns (of team members)
@@ -74,7 +74,7 @@ code. I don't have a magic bullet to motivate you to write more tests,
 or to improve existing tests. -CG
 
   Your argument is good. Two or three of us thought that the problem is about
-  missing releases which we feld demotivating. We thought, we were stucked
+  missing releases which we feld demotivating. We thought, we were stuck
   somewhere. But as you state, it is us not doing the necessary work. What I
   still find useful is to document the release process. In consequence I
   changed the problem statement. -xrs
@@ -125,7 +125,7 @@ leaves of the dependency graph, that is great.  However, occasionally
 there are architectural changes. Not of the type where the graph
 changes, but where key API assumptions change. We recently had one for
 the GNU Name System with the dropping of ".gnu".  Before, CADET
-changed the semantics and paramter for 'port'.  In the future, CORE
+changed the semantics and parameter for 'port'.  In the future, CORE
 will introduce protocol versioning.  Whenever such a change happens,
 it usually falls upon the person making that change to update
 dependencies as well (or at least to work with people who hack on the
@@ -175,7 +175,7 @@ Note that none of this really adds up to a "release policy".
 V. Previous Versions
 ====================
 (if we found some flaws in the solution, and we want to change the
-release policy, we document the old ones here als previous versions.
+release policy, we document the old ones here as previous versions.
 the goal is establish a learn process.)
 
 IV. References
diff --git a/doc/tutorial/tutorial.texi b/doc/tutorial/tutorial.texi
index e1d70c492..0a011c0c8 100644
--- a/doc/tutorial/tutorial.texi
+++ b/doc/tutorial/tutorial.texi
@@ -282,7 +282,7 @@ Assuming all dependencies are installed, the following commands will
 compile and install GNUnet in your home directory. You can specify the
 directory where GNUnet will be installed by changing the
 @code{--prefix} value when calling @command{./configure}.  If
-you do not specifiy a prefix, GNUnet is installed in the directory
+you do not specify a prefix, GNUnet is installed in the directory
 @file{/usr/local}. When developing new applications you may want
 to enable verbose logging by adding @code{--enable-logging=verbose}:
 
@@ -940,7 +940,7 @@ with the service, a connection must be created:
 As a result a @code{GNUNET\_MQ\_Handle} is returned
 which can to used henceforth to transmit messages to the service.
 The complete MQ API can be found in @file{gnunet\_mq\_lib.h}.
-The @code{hanlders} array in the example above is incomplete.
+The @code{handlers} array in the example above is incomplete.
 Here is where you will define which messages you expect to
 receive from the service, and which functions handle them.
 The @code{error\_cb} is a function that is to be called whenever
@@ -1060,7 +1060,7 @@ functions, typically called @code{run}, @code{client\_connect\_cb} and
 @code{client\_disconnect\_cb} as well as an array of message handlers
 that will be called for incoming messages from clients.
 
-A minimal version of the three central service funtions would look
+A minimal version of the three central service functions would look
 like this:
 
 @example
@@ -1093,7 +1093,7 @@ forget to call @code{GNUNET\_SERVICE\_client\_continue()}?
 @node Interacting directly with other Peers using the CORE Service
 @section Interacting directly with other Peers using the CORE Service
 
-FIXME: This section still needs to be updated to the lastest API!
+FIXME: This section still needs to be updated to the latest API!
 
 One of the most important services in GNUnet is the @code{CORE} service
 managing connections between peers and handling encryption between peers.
@@ -1349,7 +1349,7 @@ sent. This does not guarantee that the data is accessible to others peers,
 or even that is has been stored, only that the service has requested to
 a neighboring peer the retransmission of the PUT request towards its final
 destination. Currently there is no feedback about whether or not the data
-has been sucessfully stored or where it has been stored. In order to
+has been successfully stored or where it has been stored. In order to
 improve the availablilty of the data and to compensate for possible
 errors, peers leaving and other unfavorable events, just make several
 PUT requests!
@@ -1504,7 +1504,7 @@ GET request, a PUT request or a response (a reply to a GET).
 Since the different events have different associated data,
 the API gets 3 different callbacks (one for each message type)
 and optional type and key parameters, to allow for filtering of
-messages. When an event happens, the appropiate callback is
+messages. When an event happens, the appropriate callback is
 called with all the information about the event.
 
 @example