[www] branch master updated (29cc702 -> 269af3f)

[gnunet]

This is an automated email from the git hooks/post-receive script.

martin-schanzenbach pushed a change to branch master
in repository www.

    from 29cc702  Fix missing space in required packages
     new 050ef70  update roadmap and add to nav
     new 1d94b6e  Merge branch 'master' of ssh://gnunet.org/www into master
     new 269af3f  update roadmap

The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 common/navigation.j2.inc |  4 +---
 template/roadmap.html.j2 | 58 +++++++++++++++++++++++++++---------------------
 2 files changed, 34 insertions(+), 28 deletions(-)

diff --git a/common/navigation.j2.inc b/common/navigation.j2.inc
index 16c602d..4d4827b 100644
--- a/common/navigation.j2.inc
+++ b/common/navigation.j2.inc
@@ -60,9 +60,7 @@
         <ul class="dropdown-menu" aria-labelledby="navbarMain">
           <li><a class="dropdown-item" href="{{ 
url_localized('architecture.html') }}">{{ _("System Architecture") }}</a></li>
 
-<!-- TODO fill with content
-
-          <li><a class="dropdown-item" href="{{ url_localized('roadmap.html') 
}}">{{ _("Roadmap") }}</a></li>-->
+          <li><a class="dropdown-item" href="{{ url_localized('roadmap.html') 
}}">{{ _("Roadmap") }}</a></li>
           <li><a class="dropdown-item" href="https://bugs.gnunet.org"; 
target="_blank">{{ _("Bug Tracker") }}</a></li>
           <li><a class="dropdown-item" href="https://git.gnunet.org"; 
target="_blank">{{ _("Source Code") }}</a></li>
           <li><a class="dropdown-item" target="_blank" 
href="https://docs.gnunet.org/doxygen/";>{{ _("Source Code Documentation") 
}}</a></li>
diff --git a/template/roadmap.html.j2 b/template/roadmap.html.j2
index 51cc6fc..31f95e4 100644
--- a/template/roadmap.html.j2
+++ b/template/roadmap.html.j2
@@ -4,25 +4,24 @@
   <div class="row">
     <div class="container text-center">
       <h1>{{ _("Roadmap") }}</h1>
-      <section>
-        <p>
-         This is our roadmap.
-        </p>
-      </section>
     </div>
+    <p>
+      This is our roadmap. We distinguish between short, medium and long term 
goals.
+      The roadmap is subject to change and its primary purpose it to indicate 
the current work in progress and future work as well as the path to a stable 
release. Goals which are currently actively development are marked in 
<b>bold</b>.
+    </p>
     <ul class="timeline">
       <li>
         <section class="item-preview">
           <header>
             <h3>Short term</h3>
             <p class="item-date">
-            0.13.x
+            &lt;0.15
             </p>
             <p class="item-abstract">
-            <ul>
-              <li>Setup and use names and numbers registration (GANA) for 
GNUnet
-              subsystems.</li>
-              <li>GNU Name System technical specification.</li>
+            <ul class="fa-ul">
+              <li><span class="fa-li"><i class="far 
fa-check-square"></i></span><a href="https://gana.gnunet.org";>Setup and use 
names and numbers registration (GANA) for GNUnet
+              subsystems.</a></li>
+              <li><span class="fa-li"><i class="far 
fa-check-square"></i></span><a href="https://lsd.gnunet.org/lsd0001/";>GNU Name 
System technical specification.</a></li>
              </ul>
             </p>
           </header>
@@ -34,17 +33,26 @@
           <header>
             <h3>Medium term</h3>
             <p class="item-date">
-            0.14 and beyond
+            &ge;0.15
             </p>
             <p class="item-abstract">
-            <ul>
-              <li>TNG: Transport rewrite complete including basic service, 
communicators and NAT.</li>
-              <li>CORE/CADET performance and correctness improvements.</li>
-              <li>DHT improvements including signed paths and stability 
improvements.</li>
-              <li>SET improvements to code quality and correctness.</li>
-              <li>CONVERSATION improvements to performance, latency hiding and 
usability.</li>
-              <li>Stable and usable documentation.</li>
-              <li>GNUnet packages available and up-to-date in 
distributions.</li>
+            <ul class="fa-ul">
+              <li><span class="fa-li"><i class="far 
fa-square"></i></span><b>TNG</b>: Transport rewrite. [<a 
href="https://bugs.gnunet.org/view_all_bug_page.php?filter=5fb21ae8dd583";>Open 
issues</a>]
+                <ul class="fa-ul">
+                  <li><span class="fa-li"><i class="far 
fa-square"></i></span><b>TNG service</b></li>
+                  <li><span class="fa-li"><i class="far 
fa-square"></i></span><b>TCP communicator</b></li>
+                  <li><span class="fa-li"><i class="far 
fa-square"></i></span><b>UDP communicator</b></li>
+                  <li><span class="fa-li"><i class="far 
fa-square"></i></span><b>UNIX Domain Socket communicator</b></li>
+                  <li><span class="fa-li"><i class="far 
fa-square"></i></span>NAT</li>
+                </ul>
+              </li>
+              <li><span class="fa-li"><i class="far 
fa-square"></i></span>CORE/CADET: Performance and correctness improvements.</li>
+              <li><span class="fa-li"><i class="far fa-square"></i></span>DHT: 
Improvements including signed paths and stability improvements. Technical 
specification.</li>
+              <li><span class="fa-li"><i class="far fa-square"></i></span>SET 
improvements to code quality and correctness.</li>
+              <li><span class="fa-li"><i class="far 
fa-square"></i></span>CONVERSATION improvements to performance, latency hiding 
and usability.</li>
+              <li><span class="fa-li"><i class="far 
fa-square"></i></span>RECLAIM: Technical specification.</li>
+              <li><span class="fa-li"><i class="far 
fa-square"></i></span><b>Stable and usable documentation.</b></li>
+              <li><span class="fa-li"><i class="far 
fa-square"></i></span><b>GNUnet packages available and up-to-date in 
distributions.</b></li>
              </ul>
             </p>
           </header>
@@ -59,12 +67,12 @@
             1.x
             </p>
             <p class="item-abstract">
-            <ul>
-              <li>Stable release.</li>
-              <li>Onion routing with RPS</li>
-              <li>Mix network, pEp integration on top of mix network</li>
-              <li>Collaborative filtering / news distribution</li>
-              <li>Improved FS design, proper integration with GNS</li>
+            <ul class="fa-ul">
+              <li><span class="fa-li"><i class="far 
fa-square"></i></span>Stable release.</li>
+              <li><span class="fa-li"><i class="far 
fa-square"></i></span>Onion routing with RPS</li>
+              <li><span class="fa-li"><i class="far fa-square"></i></span>Mix 
network, pEp integration on top of mix network</li>
+              <li><span class="fa-li"><i class="far 
fa-square"></i></span>Collaborative filtering / news distribution</li>
+              <li><span class="fa-li"><i class="far 
fa-square"></i></span>Improved FS design, proper integration with GNS</li>
              </ul>
             </p>
           </header>

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.