[GNUnet-SVN] [gnunet] 02/02: Merge branch 'master' of https://gnunet.org/git/gnunet

[gnunet]

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

lurchi pushed a commit to branch master
in repository gnunet.

commit 7540ebcd02d9bfe0a690689a1f57952eda5b5c81
Merge: fbf7f994a b5b8184a3
Author: lurchi <address@hidden>
AuthorDate: Thu Jun 28 01:29:14 2018 +0200

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

 .../chapters/{philosophy.texi => keyconcepts.texi} | 154 +---
 doc/documentation/chapters/philosophy.texi         | 446 +---------
 doc/documentation/chapters/user.texi               | 896 +++++++++++----------
 doc/documentation/gnunet.texi                      |  24 +-
 src/cadet/gnunet-service-cadet.c                   |  12 +-
 src/cadet/gnunet-service-cadet_peer.c              |   2 +
 src/conversation/gnunet-conversation.c             |   7 +
 7 files changed, 533 insertions(+), 1008 deletions(-)

diff --cc doc/documentation/gnunet.texi
index 0d539a9d7,563333050..5ba6f6b15
--- a/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::
@@@ -196,10 -195,10 +198,14 @@@ GNUnet Developer Handboo
  @c *********************************************************************
  
  @c *********************************************************************
+ @include chapters/keyconcepts.texi
+ @c *********************************************************************
+ 
+ @c *********************************************************************
 address@hidden chapters/installation.texi
 address@hidden 
*********************************************************************
 +
 address@hidden 
*********************************************************************
  @include chapters/user.texi
  @c *********************************************************************
  

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