[GNUnet-SVN] [www] branch stable updated (8864e97 -> 5426981)

[gnunet]

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

xrs pushed a change to branch stable
in repository www.

    from 8864e97  Merge branch 'master' into stable
     add 322f00f  change peer id of alternativ groupchat server; fix text
     add 97cb360  update links to docs
     add 05eab47  stage robots
     add 38adf1f  fix makefile
     add 680deeb  Merge branch 'master' of ssh://git.gnunet.org/www
     new 5426981  Merge branch 'stable' of ssh://git.gnunet.org/www into stable

The 1 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:
 Makefile                                | 1 +
 common/navigation.j2.inc                | 8 ++++----
 static/{robots.txt => stage.robots.txt} | 4 ++--
 template/use.html.j2                    | 7 ++-----
 4 files changed, 9 insertions(+), 11 deletions(-)
 copy static/{robots.txt => stage.robots.txt} (91%)

diff --git a/Makefile b/Makefile
index 50fbc8a..f548aa7 100644
--- a/Makefile
+++ b/Makefile
@@ -15,6 +15,7 @@ all: css locale template
        cp -R dist rendered/
        cp -R static rendered/
        cp rendered/static/robots.txt rendered/robots.txt
+       cp rendered/static/stage.robots.txt rendered/stage.robots.txt
        cp rendered/static/robots.txt rendered/dist/robots.txt
        cp rendered/static/robots.txt rendered/en/robots.txt
        cp rendered/static/robots.txt rendered/de/robots.txt
diff --git a/common/navigation.j2.inc b/common/navigation.j2.inc
index 2b584b0..810c290 100644
--- a/common/navigation.j2.inc
+++ b/common/navigation.j2.inc
@@ -64,12 +64,12 @@
           <li><a class="dropdown-item" href="architecture.html">{{ _("System 
Architecture") }}</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://doxygen.gnunet.org";>{{ _("Source Code Documentation") }}</a></li>
+          <li><a class="dropdown-item" target="_blank" 
href="https://docs.gnunet.org/doxygen/";>{{ _("Source Code Documentation") 
}}</a></li>
           <!-- 
           /* Until there is no functional CI we don't show this */
           <li><a class="dropdown-item" href="https://gitlab.gnunet.org/"; 
target="_blank">{{ _("Continuous Integration") }}</a></li>
           -->
-          <li><a class="dropdown-item" target="_blank" 
href="https://tutorial.gnunet.org/";>{{ _("Development Tutorial") }}</a></li>
+          <li><a class="dropdown-item" target="_blank" 
href="https://docs.gnunet.org/tutorial/gnunet-tutorial.html";>{{ _("Development 
Tutorial") }}</a></li>
          <li><a class="dropdown-item" href="gnurl.html">libgnurl</a></li>
         </ul>
       </li>
@@ -87,8 +87,8 @@
          <li><a class="dropdown-item" href="use.html">{{ _("Use") }}</a></li>
          <li><a class="dropdown-item" href="video.html">{{ _("Videos") 
}}</a></li>
           <li><a class="dropdown-item" href="glossary.html">{{ _("Glossary") 
}}</a></li>
-         <li><a class="dropdown-item" target="_blank" 
href="https://docs.gnunet.org";>{{ _("Handbook") }}</a></li>
-    <li><a class="dropdown-item" target="_blank" 
href="https://rest.gnunet.org";>{{ _("REST API") }}</a></li>
+         <li><a class="dropdown-item" target="_blank" 
href="https://docs.gnunet.org/handbook/gnunet.html";>{{ _("Handbook") }}</a></li>
+    <li><a class="dropdown-item" target="_blank" 
href="https://rest.gnunet.org/";>{{ _("REST API") }}</a></li>
           <li><a class="dropdown-item" href="faq.html">{{ _("FAQ") }}</a></li>
           <li><a class="dropdown-item" href="https://bib.gnunet.org/date.html"; 
target="_blank">{{ _("Bibliography") }}</a></li>
        </ul>
diff --git a/static/robots.txt b/static/stage.robots.txt
similarity index 91%
copy from static/robots.txt
copy to static/stage.robots.txt
index 7ba4747..c708b60 100644
--- a/static/robots.txt
+++ b/static/stage.robots.txt
@@ -17,5 +17,5 @@
 # http://www.frobee.com/robots-txt-check
 
 User-agent: *
-Crawl-delay: 10
-sitemap: https://gnunet.org/en/sitemap.xml
+Disallow: /
+
diff --git a/template/use.html.j2 b/template/use.html.j2
index cfdd2e6..783e98d 100644
--- a/template/use.html.j2
+++ b/template/use.html.j2
@@ -155,7 +155,7 @@
                $ LD_LIBRARY_PATH=/path/to/gnunetlibs ./groupchat 
--config=/path/to/gnunet.conf 
--server=88RXABKJNMT426FY81N2DXN0M2X37SW5Q1NR005YPDZ1Q7A22CHG --port=t3ss 
--nick=YOURNICK<br>
          </code>
          <p>
-              (or as alternative server 
"YV6G9EP9K3X41BM3FJ3D29BDZR6358XNZ6KDZVV7DFW729YB0KCG" and port "welcome")
+              (or as alternative server 
"QYYZ9S0GMRS5GJGA415YEFB29RM1E4NJ4NX8DG0T8GYFDJVYHNJ0" and port "welcome")
          </p>
          <p>
               The peer and port in this example should work in real, because 
that peer is almost always online and running groupchat on that port.
@@ -355,16 +355,13 @@
           </code>
         </p>
         <p>
-          Here a service named 'http' is configured to be accessed on a remote 
and local host on port 80. The IP address is the default IP address for the 
exit interface. If you like to change to another private IP address range you 
can use can change
+          Here a service named 'http' is configured to be accessed on a remote 
and local host on port 80. The IP address is the default IP address for the 
exit interface. If you like to change to another private IP address range you 
can change the option in section 'exit':
         </p>
         <p>
           <code>
           IPV4ADDR = 169.254.86.1
           </code>
         </p>
-        <p>
-          in section 'exit'.
-        </p>
         <p>
           Now we have to add a GNS record to the namestore.
         </p>

-- 
To stop receiving notification emails like this one, please contact
address@hidden.