Merge branch 'master' of https://gnunet.org/git/gnunet

diff --cc doc/documentation/gnunet.texi
index 0d539a9d73c5e8fd1ad832977502c9715fdd702e,563333050427fc3858617712eede61d290639f9c..5ba6f6b1515165ced6a85395d827b845ff6437cc
--- 1/doc/documentation/gnunet.texi
--- 2/doc/documentation/gnunet.texi
+++ b/doc/documentation/gnunet.texi
@@@ -82,8 -82,8 +82,9 @@@ This document is the Reference Manual f
  
  * Preface::                         Chapter 0
  * Philosophy::                      About GNUnet
+ * Key Concepts::                    Key concepts of GNUnet
  @c * Vocabulary::                      Vocabulary
 +* Installing GNUnet::             Installing GNUnet
  * Using GNUnet::                    Using GNUnet
  @c * Configuration Handbook::          Configuring GNUnet
  * GNUnet Contributors Handbook::    Contributing to GNUnet
@@@ -121,12 -122,9 +123,11 @@@ Key Concept
  * Backup of Identities and Egos::
  * Revocation::
  
 +Installing GNUnet
 +
  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::
@@@ -195,10 -194,10 +197,14 @@@ GNUnet Developer Handboo
  @include chapters/philosophy.texi
  @c *********************************************************************
  
+ @c *********************************************************************
+ @include chapters/keyconcepts.texi
+ @c *********************************************************************
+ 
 +@c *********************************************************************
 +@include chapters/installation.texi
 +@c *********************************************************************
 +
  @c *********************************************************************
  @include chapters/user.texi
  @c *********************************************************************