[GNUnet-SVN] [gnunet] 01/05: doc/documentation: Move book "terminology" into new book "preface".

[gnunet]

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

ng0 pushed a commit to branch master
in repository gnunet.

commit f1c528c2196d1bf1cc3a662a157ee0a0ffc15fbb
Author: Nils Gillmann <address@hidden>
AuthorDate: Mon May 14 07:10:32 2018 +0000

    doc/documentation: Move book "terminology" into new book "preface".
    
    Signed-off-by: Nils Gillmann <address@hidden>
---
 doc/documentation/Makefile.am               |  2 +-
 doc/documentation/chapters/preface.texi     | 64 +++++++++++++++++++++++++++++
 doc/documentation/chapters/terminology.texi | 23 -----------
 doc/documentation/gnunet.texi               | 12 ++----
 4 files changed, 69 insertions(+), 32 deletions(-)

diff --git a/doc/documentation/Makefile.am b/doc/documentation/Makefile.am
index 37c7fa961..0781b2fbb 100644
--- a/doc/documentation/Makefile.am
+++ b/doc/documentation/Makefile.am
@@ -112,7 +112,7 @@ info_TEXINFOS =                                             
\
 
 gnunet_TEXINFOS =                                              \
        chapters/developer.texi                                 \
-       chapters/terminology.texi                               \
+       chapters/preface.texi                           \
        chapters/installation.texi                              \
        chapters/philosophy.texi                                \
        chapters/user.texi                                      \
diff --git a/doc/documentation/chapters/preface.texi 
b/doc/documentation/chapters/preface.texi
new file mode 100644
index 000000000..b1fd14e6a
--- /dev/null
+++ b/doc/documentation/chapters/preface.texi
@@ -0,0 +1,64 @@
address@hidden Preface
address@hidden Prefacwe
+
address@hidden introductionary words here
+This collection of Manuals describes how to use GNUnet, a framework
+for secure peer-to-peer networking with the high-level goal to provide
+a strong foundation Free Software for a global, distributed network
+that provides security and privacy.  GNUnet in that sense aims to
+replace the current internet protocol stack.  Along with an
+application for secure publication of files, it has grown to include
+all kinds of basic applications for the foundation of a new internet.
+
address@hidden
+* About this book
+* Introduction
+* General Terminology::
+* Typography::
address@hidden menu
+
address@hidden About this book
address@hidden About this book
+
+The books (described as ``book'' or ``books'' in the following) bundled as
+the ``GNUnet Reference Manual'' are based on the historic work of all
+contributors to GNUnet's Documentation. The Documentation existed in
+various formats before it came to be in the format you are currently
+reading. It is our hope that the content is described in a way that does
+not require any academic background, although some concepts will require
+further reading.
+
+Our (long-term) goal with these books is to keep them self-contained. If
+you see references to Wikipedia and other external sources (except for
+our academic papers) it means that we are working on a solution to
+describe the explanations found there which fits our usecase and licensing.
+
+The first chapter (``Preface'') as well as the the second
+chapter (``Philosophy'') give an introduction to GNUnet as a project,
+what GNUnet tries to achieve, 
+
address@hidden Introduction
address@hidden Introduction
+
address@hidden In less than 2 printed pages describe the history of GNUnet here,
address@hidden what we have now and what's still missing (could be split into
address@hidden subchapters).
+
+GNUnet in its current version is the result of almost 20 years of work
+from many contributors, with many publications.
+
address@hidden General Terminology
address@hidden General 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
address@hidden 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/chapters/terminology.texi 
b/doc/documentation/chapters/terminology.texi
deleted file mode 100644
index 566a7b167..000000000
--- a/doc/documentation/chapters/terminology.texi
+++ /dev/null
@@ -1,23 +0,0 @@
address@hidden Terminology
address@hidden Terminology
-
address@hidden
-* General Terminology::
-* Typography::
address@hidden menu
-
address@hidden General Terminology
address@hidden General 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
address@hidden 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 2cd72373b..e914f11ba 100644
--- a/doc/documentation/gnunet.texi
+++ b/doc/documentation/gnunet.texi
@@ -88,8 +88,10 @@ This document is the Reference Manual for GNUnet version 
@value{VERSION}.
 @detailmenu
  --- The Detailed Node Listing ---
 
-Terminology
+Preface
 
+* About this book
+* Introduction
 * General Terminology::
 * Typography::
 
@@ -111,12 +113,6 @@ Philosophy
 * Backup of Identities and Egos::
 * Revocation::
 
address@hidden Vocabulary
address@hidden 
address@hidden * Definitions abbreviations and acronyms::
address@hidden * Words and characters::
address@hidden * Technical Assumptions::
-
 GNUnet Installation Handbook
 
 * Dependencies::
@@ -196,7 +192,7 @@ GNUnet Developer Handbook
 @end menu
 
 @c *********************************************************************
address@hidden chapters/terminology.texi
address@hidden chapters/preface.texi
 @c *********************************************************************
 
 @c *********************************************************************

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