aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorng0 <ng0@n0.is>2019-11-19 17:33:36 +0000
committerng0 <ng0@n0.is>2019-11-19 17:33:36 +0000
commit522a4b35a04b2bc8f50b25db8b9a30ef4ab9d9e2 (patch)
tree3ae2a166a11248cfcfd6259280367bb07b86c03e
parent7c14b80a011e9e99b1cef0bfd96bae364edd5663 (diff)
parente1a38ded2280a26a714fe8d0f79cbe7adeb74067 (diff)
downloadgnunet-522a4b35a04b2bc8f50b25db8b9a30ef4ab9d9e2.tar.gz
gnunet-522a4b35a04b2bc8f50b25db8b9a30ef4ab9d9e2.zip
Merge branch 'master' of gnunet.org:gnunet
-rw-r--r--doc/handbook/chapters/installation.texi4
-rw-r--r--doc/handbook/chapters/keyconcepts.texi2
-rw-r--r--doc/handbook/chapters/philosophy.texi2
3 files changed, 4 insertions, 4 deletions
diff --git a/doc/handbook/chapters/installation.texi b/doc/handbook/chapters/installation.texi
index 53d49af6d..94e572c57 100644
--- a/doc/handbook/chapters/installation.texi
+++ b/doc/handbook/chapters/installation.texi
@@ -248,7 +248,7 @@ switch) which allows using GNS (the GNU name system) in the normal DNS
248resolution process. Unfortunately NSS expects it in a specific 248resolution process. Unfortunately NSS expects it in a specific
249location (probably @code{/lib}) which may differ from the installation 249location (probably @code{/lib}) which may differ from the installation
250prefix (see @code{--prefix} option in the previous section). This is 250prefix (see @code{--prefix} option in the previous section). This is
251why the pugin has to be installed manually. 251why the plugin has to be installed manually.
252 252
253Find the directory where nss plugins are installed on your system, e.g. 253Find the directory where nss plugins are installed on your system, e.g.
254 254
@@ -814,7 +814,7 @@ We are generally testing the code against MySQL 5.1 at this point.
814 814
815@itemize @bullet 815@itemize @bullet
816 816
817@item On up-to-date hardware wher 817@item On up-to-date hardware where
818mysql can be used comfortably, this module 818mysql can be used comfortably, this module
819will have better performance than the other database choices (according 819will have better performance than the other database choices (according
820to our tests). 820to our tests).
diff --git a/doc/handbook/chapters/keyconcepts.texi b/doc/handbook/chapters/keyconcepts.texi
index bdfa5b631..d2646fb82 100644
--- a/doc/handbook/chapters/keyconcepts.texi
+++ b/doc/handbook/chapters/keyconcepts.texi
@@ -103,7 +103,7 @@ involve flooding the network with traffic, particularly
103with queries that are, in the worst case, multiplied by the network. 103with queries that are, in the worst case, multiplied by the network.
104 104
105In order to ensure that freeloaders or attackers have a minimal impact 105In order to ensure that freeloaders or attackers have a minimal impact
106on the network, GNUnet's file-sharing implementation (@code{FS} tries 106on the network, GNUnet's file-sharing implementation (@code{FS}) tries
107to distinguish good (contributing) nodes from malicious (freeloading) 107to distinguish good (contributing) nodes from malicious (freeloading)
108nodes. In GNUnet, every file-sharing node keeps track of the behavior 108nodes. In GNUnet, every file-sharing node keeps track of the behavior
109of every other node it has been in contact with. Many requests 109of every other node it has been in contact with. Many requests
diff --git a/doc/handbook/chapters/philosophy.texi b/doc/handbook/chapters/philosophy.texi
index e57c20914..060871189 100644
--- a/doc/handbook/chapters/philosophy.texi
+++ b/doc/handbook/chapters/philosophy.texi
@@ -31,7 +31,7 @@ These are the GNUnet design principles, in order of importance:
31@itemize 31@itemize
32@item GNUnet must be implemented as 32@item GNUnet must be implemented as
33@uref{https://www.gnu.org/philosophy/free-sw.html, Free Software} --- 33@uref{https://www.gnu.org/philosophy/free-sw.html, Free Software} ---
34This means that you you have the four essential freedoms: to run 34This means that you have the four essential freedoms: to run
35the program, to study and change the program in source code form, 35the program, to study and change the program in source code form,
36to redistribute exact copies, and to distribute modified versions. 36to redistribute exact copies, and to distribute modified versions.
37(@uref{https://www.gnu.org/philosophy/free-sw.html}). 37(@uref{https://www.gnu.org/philosophy/free-sw.html}).