Merge branch 'master' into stable

2 files changed, 5 insertions, 1 deletions

diff --git a/news/2019-0.11.6.inc b/news/2019-0.11.6.inc
index 42953c00..8ffdf31c 100644
--- a/news/2019-0.11.6.inc
+++ b/news/2019-0.11.6.inc
@@ -61,6 +61,9 @@
       <tt>TRANSPORT</tt>, <tt>TESTBED</tt> and <tt>CADET</tt> tests now pass again on macOS.
     </li>
     <li>
+      <tt>CADET</tt>: Replaced enum <tt>GNUNET_CADET_ChannelOption</tt> with <tt>GNUNET_MQ_PriorityPreferences</tt> in preparation of API changed in the future.
+    </li>
+    <li>
       The GNS proxy Certification Authority is now generated using gnutls-certtool,
       if available, with opennssl/certtool as fallback.
     </li>
@@ -77,7 +80,7 @@
     </li>
     <li>
       There are known moderate implementation limitations in CADET that
-      negatively impact performance. Also CADET may unexpectedly deliver messages out-of-order.
+      negatively impact performance.
     </li>
     <li>
       There are known moderate design issues in FS that also impact
diff --git a/template/install-on-debian9.html.j2 b/template/install-on-debian9.html.j2
index 9641964b..338fa925 100644
--- a/template/install-on-debian9.html.j2
+++ b/template/install-on-debian9.html.j2
@@ -105,6 +105,7 @@
   <code>
     $ cd ~/gnunet_installation/gnunet<br>
     $ ./bootstrap<br>
+    $ export GNUNET_PREFIX=/usr/local # for example, other locations possible
     $ ./configure --prefix=$GNUNET_PREFIX --disable-documentation --with-microhttpd=/opt/libmicrohttpd<br>
     $ sudo addgroup gnunetdns<br>
     $ sudo adduser --system --group --disabled-login --home /var/lib/gnunet gnunet<br>