use testbed methods to alter underlaylinkmodel

[oweals/gnunet.git] / README

diff --git a/README b/README
index c1e7db2e5656a1b78c2aacdade92ae02b274a836..d95022de256f708f3317dc03cf44f40b8bb39b96 100644 (file)
--- a/README
+++ b/README
@@ -63,7 +63,7 @@ These are the direct dependencies for running GNUnet:
 - gettext
 - gnutls             >= 3.2.12      (highly recommended a gnutls
                                      linked against libunbound)
-- A curl build against gnutls, or gnurl:
+- curl (ideally built against gnutls) or gnurl:
   * libgnurl         >= 7.35.0      (recommended, available from
                                      https://gnunet.org/en/gnurl.html)
   or
@@ -74,8 +74,8 @@ These are the direct dependencies for running GNUnet:
   * libidn2 (prefered)
   or
   * libidn           >= 1.0
-- libmicrohttpd      >= 0.9.63      (strongly recommended for
-                                     a wide range of features)
+- libmicrohttpd      >= 0.9.63
+- libjansson
 - makeinfo           >= 4.8
 - make[*3]
 - nss                               (certutil binary, for
@@ -96,6 +96,7 @@ These are the direct dependencies for running GNUnet:
 - which                             (contrib/apparmor(?), gnunet-bugreport,
                                      and possibly more)
 - zlib
+- libsodium          >= 1.0.11      (for elliptic curve cryptography)
 
 These are the dependencies for GNUnet's testsuite:
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -121,10 +122,9 @@ These are the optional dependencies:
 - bluez                             (for bluetooth support)
 - grof                              (for linting of man pages)
 - libextractor       >= 0.6.1       (highly recommended[*5])
-- libjansson
-- libopus            >= 1.0.1       (for experimental conversation tool)
-- libpulse           >= 2.0         (for experimental conversation tool)
-- libogg             >= 1.3.0       (for experimental conversation tool)
+- libopus            >= 1.0.1       (for conversation tool)
+- libpulse           >= 2.0         (for conversation tool)
+- libogg             >= 1.3.0       (for conversation tool)
 - libnss                            (certtool binary (for convenient
                                      installation of GNS proxy))
 - libzbar            >= 0.10        (for gnunet-qr)
@@ -139,7 +139,9 @@ These are the optional dependencies:
 - miniupnpc
 - perl5                             (for some utilities)
 - TeX Live           >= 2012        (for gnunet-bcd[*])
-- texi2mdoc                         (for automatic mdoc generation [*2])
+- texi2mdoc                         (for automatic mdoc generation [*2], not
+                                     the texi2mdoc script distributed with
+                                     autogen but the texi2mdoc C application)
 
 Recommended autotools for compiling the Git version are:
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -157,10 +159,11 @@ Recommended autotools for compiling the Git version are:
      '--disable-documentation' to the configure script to change this.
 
 [*2] If you still prefer to have documentation, you can pass
-     '--with-section7' to build mdoc documentation (experimental
-     stages in gnunet). If this proves to be reliable, we will
-     include the mdoc output in the release tarballs.
-     Contrary to the name, texi2mdoc does not require texinfo,
+     '--enable-texi2mdoc-generation' to build the mdocml ("mandoc")
+     documentation (experimental stages in gnunet).
+     If this proves to be reliable, we will
+     include the mdocml output in the release tarballs.
+     Contrary to the name, texi2mdoc does not require Texinfo,
      It is a standalone ISO C utility.
 
 [*3] GNU make introduced the != operator in version 4.0.
@@ -548,7 +551,7 @@ Further Reading
 
 * Documentation
 
-  A HTML version of the GNUnet manual is deployed at
+  An HTML version of the GNUnet manual is deployed at
 
     https://docs.gnunet.org