5 files changed, 35 insertions, 27 deletions

diff --git a/README.1st b/README.1st
index d55709779..19880de63 100644
--- a/README.1st
+++ b/README.1st
@@ -1,8 +1,14 @@
-The following is a list of issues with GNUnet 0.11.0 that will need to
-be addressed before we might consider GNUnet usable.  Please keep this
-list in mind when trying out GNUnet 0.11.0!  Help would of course be
-welcome, an estimate of how much work is needed and the main impact
-are given with each item.
+WARNING!
+=======
+
+The following is a list of issues with GNUnet 0.11.0 that will need
+to be addressed before we might consider GNUnet deployable to larger
+audiences. Please keep this in mind when trying out GNUnet 0.11.0!
+
+GNUnet may however work fine for applications that aren't impeded by
+these known deficiencies. Help would of course be welcome to reduce
+this list, so an estimate of how much work is needed and the main 
+impact are given with each item.
 
 
 ats:
@@ -56,8 +62,8 @@ described above should also enable us to create more systematic tests.
 
 hello:
 * The current code may leak LAN IPs (in particular IPv6 with
-MAC) globally. We have started to put in some privisions to tag
-addresses as loopback/LAN/WAN, but need to systemtically ensure
+MAC) globally. We have started to put in some provisions to tag
+addresses as loopback/LAN/WAN, but need to systematically ensure
 that addresses are only propagated in a useful scope and avoid
 leaking "sensitive" address data globally.
 [3-6 PM, privacy]
@@ -122,7 +128,7 @@ correctness]
 util:
 * Event loop instantiations for various event loops (like glib,
 libev, libevent, etc.) should be created (and tested).  This
-will applications to be built with GNUnet using those various
+allows applications to be built with GNUnet using those various
 styles of event loop handling.  General support for abstracting
 the event loop is new in 0.11.0, we just need to make broader use
 of it. [1-3 PM, performance, usability]
@@ -185,9 +191,10 @@ gns:
 
 
 multicast:
-* implementation currently trivial and under-tested
+* implementation currently "trivial" (aka doing round-robin, not multicast)
+  and under-tested
 
-* still uses old NTR-style API, needs to transition to MQ API
+* still uses old NTR-style API, needs to transition to MQ API [DONE]
 
 
 psyc:
diff --git a/doc/documentation/chapters/developer.texi b/doc/documentation/chapters/developer.texi
index 0e06d0ac6..ada6d37a0 100644
--- a/doc/documentation/chapters/developer.texi
+++ b/doc/documentation/chapters/developer.texi
@@ -1388,7 +1388,7 @@ Note that the substitution placemark is replaced only when the
 corresponding field is available and only once. Specifying
 
 @example
-%u@atchar{}%h
+%u@@%h
 @end example
 
 doesn't work either. If you want to user username substitutions for
@@ -8093,11 +8093,7 @@ eliminate the need to first create a directory.
 
 Collections are also advertised using @code{KSBlock}s.
 
-@table @asis
-@item Attachment Size
-@item  ecrs.pdf 270.68 KB
-@item https://gnunet.org/sites/default/files/ecrs.pdf
-@end table
+@c https://gnunet.org/sites/default/files/ecrs.pdf
 
 @node File-sharing persistence directory structure
 @subsection File-sharing persistence directory structure
diff --git a/doc/documentation/gnunet.texi b/doc/documentation/gnunet.texi
index 049aa7120..223a739f8 100644
--- a/doc/documentation/gnunet.texi
+++ b/doc/documentation/gnunet.texi
@@ -6,7 +6,9 @@
 @documentencoding UTF-8
 @settitle GNUnet Reference Manual
 @exampleindent 2
-@urefbreakstyle before
+@c It seems as if this breaks some old garbage version of
+@c texinfo running on some systems. FIXME!!!
+@c @urefbreakstyle before
 @c %**end of header
 
 @include version.texi
diff --git a/doc/documentation/index.html b/doc/documentation/index.html
index 0c3b04e9d..660544ced 100644
--- a/doc/documentation/index.html
+++ b/doc/documentation/index.html
@@ -1,12 +1,14 @@
 <title>GNUnet - GNUnet Manuals and Handbooks</title>
 <h2>GNUnet - GNUnet Manuals and Handbooks</h2>
 
-<address>GNUnet e.V.</address>
-<address>Fakultät für Informatik -- I8</address>
-<address>Technische Universität München</address>
-<address>Boltzmannstraße 3</address>
-<address>85748 Garching</address>
-<address>GERMANY</address>
+<blockquote><address>
+GNUnet e.V.<br/>
+Fakultät für Informatik -- I8<br/>
+Technische Universität München<br/>
+Boltzmannstraße 3<br/>
+85748 Garching<br/>
+GERMANY<br/>
+</address></blockquote>
 
 <p>The following handbooks and manuals are available:</p>
 
diff --git a/src/util/resolver_api.c b/src/util/resolver_api.c
index 11b8134d6..84f541ba0 100644
--- a/src/util/resolver_api.c
+++ b/src/util/resolver_api.c
@@ -414,10 +414,11 @@ process_requests ()
   {
     /* nothing to do, release socket really soon if there is nothing
      * else happening... */
-    s_task =
-      GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_MILLISECONDS,
-                                    &shutdown_task,
-                                    NULL);
+    if (NULL == s_task)
+      s_task =
+        GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_MILLISECONDS,
+                                      &shutdown_task,
+                                      NULL);
     return;
   }
   if (GNUNET_NO != rh->was_transmitted)