[GNUnet-SVN] [gnunet] branch master updated (2e86e3173 -> a40c86500)

[gnunet]

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

ng0 pushed a change to branch master
in repository gnunet.

    from 2e86e3173 deq from correct queue
     new 70da18cd2 doc/documentation/gnunet.texi: Bump the date.
     new 2977de549 docs
     new 56caf2296 po/POTFILES.in  This file was marked as having changes. if 
this is incorrect, please revert it.
     new 8682c673e Merge branch 'master' of gnunet.org:gnunet
     new a40c86500 Merge branch 'master' of gnunet.org:gnunet

The 5 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:
 doc/documentation/Makefile.am               |  2 ++
 doc/documentation/chapters/terminology.texi | 21 +++++++++++++++++++++
 doc/documentation/gnunet.texi               | 11 ++++++++++-
 3 files changed, 33 insertions(+), 1 deletion(-)
 create mode 100644 doc/documentation/chapters/terminology.texi

diff --git a/doc/documentation/Makefile.am b/doc/documentation/Makefile.am
index 305e25b2a..991b1926b 100644
--- a/doc/documentation/Makefile.am
+++ b/doc/documentation/Makefile.am
@@ -112,6 +112,7 @@ info_TEXINFOS =                                             
\
 
 gnunet_TEXINFOS =                                              \
        chapters/developer.texi                                 \
+       chapters/terminology.texi                               \
        chapters/installation.texi                              \
        chapters/philosophy.texi                                \
        chapters/user.texi                                      \
@@ -140,6 +141,7 @@ DISTCLEANFILES =                                            
\
        chapter/philosophy.cps                                  \
        chapters/user.cps                                       \
        chapters/configuration.cps                              \
+       chapters/terminology.cps                                \
        chapters/vocabulary.cps                                 \
        fdl-1.3.cps                                             \
        gpl-3.0.cps
diff --git a/doc/documentation/chapters/terminology.texi 
b/doc/documentation/chapters/terminology.texi
new file mode 100644
index 000000000..fa9b08479
--- /dev/null
+++ b/doc/documentation/chapters/terminology.texi
@@ -0,0 +1,21 @@
address@hidden Terminology
address@hidden Terminology
+
address@hidden
+* Terminology::
+* Typography::
address@hidden menu
+
address@hidden Terminology
address@hidden Terminology
+
+In the following Manual we may use words that can not be found in the 
Appendix. Since we
+want to keep the Manual selfcontained, we will explain words here.
+
address@hidden Typography
address@hidden Typography
+
+When giving examples for commands, shell prompts are used to show if the 
command should/can
+be issued as root, or if "normal" user privileges are sufficient. We use a 
@code{#}
+for root's shell prompt, a @code{%} for users' shell prompt, assuming they use 
the C-shell
+or tcsh and a @code{$} for bourne shell and derivatives.
diff --git a/doc/documentation/gnunet.texi b/doc/documentation/gnunet.texi
index 223a739f8..b977a9a14 100644
--- a/doc/documentation/gnunet.texi
+++ b/doc/documentation/gnunet.texi
@@ -21,7 +21,7 @@
 @c @set OPENPGP-SIGNING-KEY-ID
 
 @copying
-Copyright @copyright{} 2001-2017 GNUnet e.V.
+Copyright @copyright{} 2001-2018 GNUnet e.V.
 
 Permission is granted to copy, distribute and/or modify this document
 under the terms of the GNU Free Documentation License, Version 1.3 or
@@ -87,6 +87,11 @@ This document is the Reference Manual for GNUnet version 
@value{VERSION}.
 @detailmenu
  --- The Detailed Node Listing ---
 
+Terminology and Typography
+
+* Terminology
+* Typography
+
 Philosophy
 
 * Design Goals::
@@ -190,6 +195,10 @@ GNUnet Developer Handbook
 @end menu
 
 @c *********************************************************************
address@hidden chapters/terminology.texi
address@hidden 
*********************************************************************
+
address@hidden 
*********************************************************************
 @include chapters/philosophy.texi
 @c *********************************************************************
 

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