1 files changed, 46 insertions, 40 deletions

diff --git a/doc/documentation/gnunet.texi b/doc/documentation/gnunet.texi
index 2cd72373b..50630d4fe 100644
--- a/doc/documentation/gnunet.texi
+++ b/doc/documentation/gnunet.texi
@@ -43,6 +43,14 @@ Foundation Web site at @url{http://www.gnu.org/licenses/gpl.html}.
 @end copying
 
 @c TODO: Improve this and improve https://directory.fsf.org/wiki/Gnunet
+@c NOTE FOR TRANSLATORS: Due to en.wikipedia.org being the wikipedia
+@c                       which is more up to date than others, refrain
+@c                       from using localized wikipedia unless you are
+@c                       sure the articles content is good enough. For
+@c                       example the german wikipedia entry for GNUnet
+@c                       is in a terrible shape, but the en.wikipedia.org
+@c                       entry is still acceptable (although in need of
+@c                       updates).
 
 @dircategory Networking
 @direntry
@@ -72,34 +80,39 @@ This document is the Reference Manual for GNUnet version @value{VERSION}.
 
 @menu
 
-* Terminology::                     Terminology used throughout the Manual
+* Preface::                         Chapter 0
 * Philosophy::                      About GNUnet
+* Key Concepts::                    Key concepts of GNUnet
 @c * Vocabulary::                      Vocabulary
-* GNUnet Installation Handbook::    How to install GNUnet
+* Installing GNUnet::               Installing GNUnet
 * Using GNUnet::                    Using GNUnet
 @c * Configuration Handbook::          Configuring GNUnet
 * GNUnet Contributors Handbook::    Contributing to GNUnet
 * GNUnet Developer Handbook::       Developing GNUnet
 * GNU Free Documentation License::  The license of this manual
-* GNU General Public License::      The license of this manual
+* GNU General Public License::
+* GNU Affero General Public License::
 * Concept Index::                   Concepts
 * Programming Index::               Data types, functions, and variables
 
 @detailmenu
  --- The Detailed Node Listing ---
 
-Terminology
+Preface
 
-* General Terminology::
+* About this book
+* Contributing to this book
+* Introduction
 * Typography::
 
 Philosophy
 
-* Design Goals::
-* Security and Privacy::
-* Versatility::
+* Design Principles::
+* Privacy and Anonymity::
 * Practicality::
-* Key Concepts::
+
+Key Concepts
+
 * Authentication::
 * Accounting to Encourage Resource Sharing::
 * Confidentiality::
@@ -111,32 +124,19 @@ Philosophy
 * Backup of Identities and Egos::
 * Revocation::
 
-@c Vocabulary
-@c 
-@c * Definitions abbreviations and acronyms::
-@c * Words and characters::
-@c * Technical Assumptions::
-
-GNUnet Installation Handbook
-
-* Dependencies::
-* Pre-installation notes::
-* Generic installation instructions::
-* Build instructions for Ubuntu 12.04 using Git::
-* Build instructions for software builds from source::
-* Build Instructions for Microsoft Windows Platforms::
-* Build instructions for Debian 7.5::
-* Installing GNUnet from Git on Ubuntu 14.4::
-* Build instructions for Debian 8::
-* Outdated build instructions for previous revisions::
-@c * Portable GNUnet::
-* The graphical configuration interface::
-* How to start and stop a GNUnet peer::
+Installing GNUnet
+* Installing dependencies::
+* Getting the Source Code::
+* Create @code{gnunet} user and group::
+* Preparing and Compiling the Source Code::
+* Installation::
+* MOVED FROM USER Checking the Installation::
+* MOVED FROM USER The graphical configuration interface::
+* MOVED FROM USER Config Leftovers::
 
 Using GNUnet
 
-* Checking the Installation::
-* First steps - File-sharing::
+* Start and stop GNUnet::
 * First steps - Using the GNU Name System::
 * First steps - Using GNUnet Conversation::
 * First steps - Using the GNUnet VPN::
@@ -144,18 +144,18 @@ Using GNUnet
 * The GNU Name System::
 * Using the Virtual Public Network::
 
-@c Configuration Handbook
-
 GNUnet Contributors Handbook
 
 * Contributing to GNUnet::
 * Licenses of contributions::
 * Copyright Assignment::
 * Contributing to the Reference Manual::
+* Contributing testcases::
 
 GNUnet Developer Handbook
 
 * Developer Introduction::
+* Internal dependencies::
 * Code overview::
 * System Architecture::
 * Subsystem stability::
@@ -163,6 +163,7 @@ GNUnet Developer Handbook
 * Build-system::
 * Developing extensions for GNUnet using the gnunet-ext template::
 * Writing testcases::
+* Building GNUnet and its dependencies::
 * TESTING library::
 * Performance regression analysis with Gauger::
 * TESTBED Subsystem::
@@ -196,15 +197,16 @@ GNUnet Developer Handbook
 @end menu
 
 @c *********************************************************************
-@include chapters/terminology.texi
+@include chapters/preface.texi
 @c *********************************************************************
 
 @c *********************************************************************
 @include chapters/philosophy.texi
 @c *********************************************************************
 
-@c WIP:
-@c @include chapters/vocabulary.texi
+@c *********************************************************************
+@include chapters/keyconcepts.texi
+@c *********************************************************************
 
 @c *********************************************************************
 @include chapters/installation.texi
@@ -214,9 +216,6 @@ GNUnet Developer Handbook
 @include chapters/user.texi
 @c *********************************************************************
 
-@c WIP:
-@c @include chapters/configuration.texi
-
 @include chapters/contributing.texi
 
 @c *********************************************************************
@@ -238,6 +237,12 @@ GNUnet Developer Handbook
 @include gpl-3.0.texi
 
 @c *********************************************************************
+@node GNU Affero General Public License
+@appendix GNU Affero General Public License
+@cindex license, GNU Affero General Public License
+@include agpl-3.0.texi
+
+@c *********************************************************************
 @node Concept Index
 @unnumbered Concept Index
 @printindex cp
@@ -246,6 +251,7 @@ GNUnet Developer Handbook
 @unnumbered Programming Index
 @syncodeindex tp fn
 @syncodeindex vr fn
+@syncodeindex pg fn
 @printindex fn
 
 @bye