remove f2f, clarify bootstrap

1 files changed, 13 insertions, 36 deletions

diff --git a/users/configuration.rst b/users/configuration.rst
index 5d99db0..fcdcf17 100644
--- a/users/configuration.rst
+++ b/users/configuration.rst
@@ -340,49 +340,26 @@ exists (!). An alternative name for the \"gnunetdns\" group can be
 specified using the ``--with-gnunetdns=GRPNAME`` configure option.
 
 
-.. _Configuring-the-Friend_002dto_002dFriend-_0028F2F_0029-mode:
-
-Configuring the Friend-to-Friend (F2F) mode
+Configuring dropshipped HELLOs to bootstrap
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-GNUnet knows three basic modes of operation:
-
--  In standard \"peer-to-peer\" mode, your peer will connect to any
-   peer.
-
--  In the pure \"friend-to-friend\" mode, your peer will ONLY connect to
-   peers from a list of friends specified in the configuration.
-
--  Finally, in mixed mode, GNUnet will only connect to arbitrary peers
-   if it has at least a specified number of connections to friends.
-
-When configuring any of the F2F (\"friend-to-friend\") modes, you first
-need to create a file with the peer identities of your friends. Ask your
-friends to run
+GNUnet by default tries to bootstrap using included hellos and a hostlist
+server.
+The HELLOs that GNUnet tries to bootstrap with can be found in the directory
+``$PREFIX/share/gnunet/hellos``.
+The use of the HELLOs in this folder can be controlled with the configuration
+setting ``USE_INCLUDED_HELLOS`` of the ``peerstore`` service:
 
 .. code-block:: text
 
-   $ gnunet-peerinfo -sq
-
-The resulting output of this command needs to be added to your
-``friends`` file, which is simply a plain text file with one line per
-friend with the output from the above command.
-
-You then specify the location of your ``friends`` file in the
-``FRIENDS`` option of the \"topology\" section.
-
-Once you have created the ``friends`` file, you can tell GNUnet to only
-connect to your friends by setting the ``FRIENDS-ONLY`` option (again in
-the \"topology\" section) to YES.
-
-If you want to run in mixed-mode, set \"FRIENDS-ONLY\" to NO and
-configure a minimum number of friends to have (before connecting to
-arbitrary peers) under the \"MINIMUM-FRIENDS\" option.
+   $ gnunet-config -s peerstore -o USE_INCLUDED_HELLOS
 
-If you want to operate in normal P2P-only mode, simply set
-``MINIMUM-FRIENDS`` to zero and ``FRIENDS_ONLY`` to NO. This is the
-default.
+Note, however, that once the included HELLOs have been parsed, the ``peerstore``
+will cache them locally in its databse. To purge included HELLOs in this case,
+the database will have to be deleted.
 
+Unless you want to establish a private network, you should not have to touch
+this option.
 
 .. _Configuring-the-hostlist-to-bootstrap: