Stop pointing folks at [client]introducer.furl in the docs

docs/configuration.rst

@@ -398,13 +398,13 @@ This section controls *when* Tor and I2P are used. The ``[tor]`` and
 ``[i2p]`` sections (described later) control *how* Tor/I2P connections are
 managed.
 
-All Tahoe nodes need to make a connection to the Introducer; the ``[client]
-introducer.furl`` setting (described below) indicates where the Introducer
-lives. Tahoe client nodes must also make connections to storage servers:
-these targets are specified in announcements that come from the Introducer.
-Both are expressed as FURLs (a Foolscap URL), which include a list of
-"connection hints". Each connection hint describes one (of perhaps many)
-network endpoints where the service might live.
+All Tahoe nodes need to make a connection to the Introducer; the
+``private/introducers.yaml`` file (described below) configures where the
+Introducer lives. Tahoe client nodes must also make connections to storage
+servers: these targets are specified in announcements that come from the
+Introducer.  Both are expressed as FURLs (a Foolscap URL), which include a
+list of "connection hints". Each connection hint describes one (of perhaps
+many) network endpoints where the service might live.
 
 Connection hints include a type, and look like:
 
@@ -580,6 +580,8 @@ Client Configuration
 
 ``introducer.furl = (FURL string, mandatory)``
 
+    DEPRECATED.  See :ref:`introducer-definitions`.
+
     This FURL tells the client how to connect to the introducer. Each
     Tahoe-LAFS grid is defined by an introducer. The introducer's FURL is
     created by the introducer node and written into its private base
@@ -965,29 +967,28 @@ This section describes these other files.
   with as many people as possible, put the empty string (so that
   ``private/convergence`` is a zero-length file).
 
-Additional Introducer Definitions
-=================================
+.. _introducer-definitions:
 
-The ``private/introducers.yaml`` file defines additional Introducers. The
-first introducer is defined in ``tahoe.cfg``, in ``[client]
-introducer.furl``. To use two or more Introducers, choose a locally-unique
-"petname" for each one, then define their FURLs in
-``private/introducers.yaml`` like this::
+Introducer Definitions
+======================
+
+The ``private/introducers.yaml`` file defines Introducers.
+Choose a locally-unique "petname" for each one then define their FURLs in ``private/introducers.yaml`` like this::
 
   introducers:
     petname2:
-      furl: FURL2
+      furl: "FURL2"
     petname3:
-      furl: FURL3
+      furl: "FURL3"
 
 Servers will announce themselves to all configured introducers. Clients will
 merge the announcements they receive from all introducers. Nothing will
 re-broadcast an announcement (i.e. telling introducer 2 about something you
 heard from introducer 1).
 
-If you omit the introducer definitions from both ``tahoe.cfg`` and
-``introducers.yaml``, the node will not use an Introducer at all. Such
-"introducerless" clients must be configured with static servers (described
+If you omit the introducer definitions from ``introducers.yaml``,
+the node will not use an Introducer at all.
+Such "introducerless" clients must be configured with static servers (described
 below), or they will not be able to upload and download files.
 
 Static Server Definitions
@@ -1152,7 +1153,6 @@ a legal one.
   timeout.disconnect = 1800
 
   [client]
-  introducer.furl = pb://ok45ssoklj4y7eok5c3xkmj@tcp:tahoe.example:44801/ii3uumo
   helper.furl = pb://ggti5ssoklj4y7eok5c3xkmj@tcp:helper.tahoe.example:7054/kk8lhr
 
   [storage]
@@ -1163,6 +1163,11 @@ a legal one.
   [helper]
   enabled = True
 
+To be introduced to storage servers, here is a sample ``private/introducers.yaml`` which can be used in conjunction::
+
+  introducers:
+    examplegrid:
+      furl: "pb://ok45ssoklj4y7eok5c3xkmj@tcp:tahoe.example:44801/ii3uumo"
 
 Old Configuration Files
 =======================

docs/historical/configuration.rst

@@ -20,7 +20,7 @@ Config setting                   File                                 Comment
 ``[node]log_gatherer.furl``      ``BASEDIR/log_gatherer.furl``        (one per line)
 ``[node]timeout.keepalive``      ``BASEDIR/keepalive_timeout``
 ``[node]timeout.disconnect``     ``BASEDIR/disconnect_timeout``
-``[client]introducer.furl``      ``BASEDIR/introducer.furl``
+                                 ``BASEDIR/introducer.furl``          ``BASEDIR/private/introducers.yaml``
 ``[client]helper.furl``          ``BASEDIR/helper.furl``
 ``[client]key_generator.furl``   ``BASEDIR/key_generator.furl``
 ``[client]stats_gatherer.furl``  ``BASEDIR/stats_gatherer.furl``

docs/running.rst

@@ -65,9 +65,9 @@ Running a Client
 To construct a client node, run “``tahoe create-client``”, which will create
 ``~/.tahoe`` to be the node's base directory. Acquire the ``introducer.furl``
 (see below if you are running your own introducer, or use the one from the
-`TestGrid page`_), and paste it after ``introducer.furl =`` in the
-``[client]`` section of ``~/.tahoe/tahoe.cfg``. Then use “``tahoe run
-~/.tahoe``”. After that, the node should be off and running. The first thing
+`TestGrid page`_), and write it to ``~/.tahoe/private/introducers.yaml``
+(see :ref:`introducer-definitions`). Then use “``tahoe run ~/.tahoe``”.
+After that, the node should be off and running. The first thing
 it will do is connect to the introducer and get itself connected to all other
 nodes on the grid.