From: lurchi Date: Wed, 27 Jun 2018 23:29:14 +0000 (+0200) Subject: Merge branch 'master' of https://gnunet.org/git/gnunet X-Git-Tag: v0.11.0~332^2 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=7540ebcd02d9bfe0a690689a1f57952eda5b5c81;p=oweals%2Fgnunet.git Merge branch 'master' of https://gnunet.org/git/gnunet --- 7540ebcd02d9bfe0a690689a1f57952eda5b5c81 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:: @@@ -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 *********************************************************************