[GNUnet-SVN] [gnunet] branch master updated (4ab7c1f14 -> e34b18243)

[gnunet]

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

ng0 pushed a change to branch master
in repository gnunet.

    from 4ab7c1f14 documentation: contribution: +
     new 4beaa6b7d do not build vocabulary chapter for now
     new e34b18243 guix-env.scm: it is python2

The 2 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:
 contrib/packages/guix/guix-env.scm |  2 +-
 doc/documentation/gnunet.texi      | 17 ++++++++++-------
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/contrib/packages/guix/guix-env.scm 
b/contrib/packages/guix/guix-env.scm
index da4a60b73..8f45512e1 100644
--- a/contrib/packages/guix/guix-env.scm
+++ b/contrib/packages/guix/guix-env.scm
@@ -129,7 +129,7 @@
          ("mysql" ,mysql)
          ("zlib" ,zlib)
          ("perl" ,perl)
-         ("python" ,python) ; tests and gnunet-qr
+         ("python-2" ,python-2) ; tests and gnunet-qr
          ("jansson" ,jansson)
          ("nss" ,nss)
          ("glib" ,glib "bin")
diff --git a/doc/documentation/gnunet.texi b/doc/documentation/gnunet.texi
index 4ea6354f3..049aa7120 100644
--- a/doc/documentation/gnunet.texi
+++ b/doc/documentation/gnunet.texi
@@ -71,7 +71,7 @@ This document is the Reference Manual for GNUnet version 
@value{VERSION}.
 @menu
 
 * Philosophy::                      About GNUnet
-* Vocabulary::                      Vocabulary
address@hidden * Vocabulary::                      Vocabulary
 * GNUnet Installation Handbook::    How to install GNUnet
 * Using GNUnet::                    Using GNUnet
 @c * Configuration Handbook::          Configuring GNUnet
@@ -103,11 +103,11 @@ Philosophy
 * Backup of Identities and Egos::
 * Revocation::
 
-Vocabulary
-
-* Definitions abbreviations and acronyms::
-* Words and characters::
-* Technical Assumptions::
address@hidden Vocabulary
address@hidden 
address@hidden * Definitions abbreviations and acronyms::
address@hidden * Words and characters::
address@hidden * Technical Assumptions::
 
 GNUnet Installation Handbook
 
@@ -191,7 +191,8 @@ GNUnet Developer Handbook
 @include chapters/philosophy.texi
 @c *********************************************************************
 
address@hidden chapters/vocabulary.texi
address@hidden WIP:
address@hidden @include chapters/vocabulary.texi
 
 @c *********************************************************************
 @include chapters/installation.texi
@@ -201,12 +202,14 @@ GNUnet Developer Handbook
 @include chapters/user.texi
 @c *********************************************************************
 
address@hidden WIP:
 @c @include chapters/configuration.texi
 
 @include chapters/contributing.texi
 
 @c *********************************************************************
 @include chapters/developer.texi
address@hidden For now in its own Book:
 @c @include gnunet-c-tutorial.texi
 @c *********************************************************************
 

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