Ticket #1463: edit-description-of-K-of-N-tradeoff.darcs.patch

2 patches for repository /home/zooko/playground/tahoe-lafs/pristine:

Thu Aug  4 13:27:22 MDT 2011  zooko@zooko.com
  * doc: clean up formatting of doc/configuration.rst
  reflow to 77 chars line width, M-x white-space cleanup, blank link between name and definition

Thu Aug  4 13:34:09 MDT 2011  zooko@zooko.com
  * doc: edit the explanation of K-of-N tradeoffs

New patches:

[doc: clean up formatting of doc/configuration.rst
zooko@zooko.com**20110804192722
 Ignore-this: 7a98a3a8afb7e5441ff1f534211199ba
 reflow to 77 chars line width, M-x white-space cleanup, blank link between name and definition
] {
hunk ./docs/configuration.rst 16
 9.  `Backwards Compatibility Files`_
 10. `Example`_
 
-A Tahoe-LAFS node is configured by writing to files in its base directory. These
-files are read by the node when it starts, so each time you change them, you
-need to restart the node.
+A Tahoe-LAFS node is configured by writing to files in its base
+directory. These files are read by the node when it starts, so each time you
+change them, you need to restart the node.
 
 The node also writes state to its base directory, so it will create files on
 its own.
hunk ./docs/configuration.rst 29
 
 The main file is named "``tahoe.cfg``", and is an ".INI"-style configuration
 file (parsed by the Python stdlib 'ConfigParser' module: "``[name]``" section
-markers, lines with "``key.subkey: value``", rfc822-style continuations). There
-are also other files containing information that does not easily fit into this
-format. The "``tahoe create-node``" or "``tahoe create-client``" command will
-create an initial ``tahoe.cfg`` file for you. After creation, the node will
-never modify the ``tahoe.cfg`` file: all persistent state is put in other files.
+markers, lines with "``key.subkey: value``", rfc822-style
+continuations). There are also other files containing information that does
+not easily fit into this format. The "``tahoe create-node``" or "``tahoe
+create-client``" command will create an initial ``tahoe.cfg`` file for
+you. After creation, the node will never modify the ``tahoe.cfg`` file: all
+persistent state is put in other files.
 
 The item descriptions below use the following types:
 
hunk ./docs/configuration.rst 39
 ``boolean``
+
     one of (True, yes, on, 1, False, off, no, 0), case-insensitive
 
 ``strports string``
hunk ./docs/configuration.rst 43
-    a Twisted listening-port specification string, like "``tcp:80``"
-    or "``tcp:3456:interface=127.0.0.1``". For a full description of
-    the format, see `the Twisted strports documentation
+
+    a Twisted listening-port specification string, like "``tcp:80``" or
+    "``tcp:3456:interface=127.0.0.1``". For a full description of the format,
+    see `the Twisted strports documentation
     <http://twistedmatrix.com/documents/current/api/twisted.application.strports.html>`_.
 
 ``FURL string``
hunk ./docs/configuration.rst 50
+
     a Foolscap endpoint identifier, like
     ``pb://soklj4y7eok5c3xkmjeqpw@192.168.69.247:44801/eqpwqtzm``
 
hunk ./docs/configuration.rst 82
     filesystem access and node status as defined in `webapi.rst
     <frontends/webapi.rst>`_. This file contains a Twisted "strports"
     specification such as "``3456``" or "``tcp:3456:interface=127.0.0.1``".
-    The "``tahoe create-node``" or "``tahoe create-client``" commands set
-    the ``web.port`` to "``tcp:3456:interface=127.0.0.1``" by default; this
-    is overridable by the ``--webport`` option. You can make it use SSL by
+    The "``tahoe create-node``" or "``tahoe create-client``" commands set the
+    ``web.port`` to "``tcp:3456:interface=127.0.0.1``" by default; this is
+    overridable by the ``--webport`` option. You can make it use SSL by
     writing "``ssl:3456:privateKey=mykey.pem:certKey=cert.pem``" instead.
 
     If this is not provided, the node will not run a web server.
hunk ./docs/configuration.rst 91
 
 ``web.static = (string, optional)``
 
-    This controls where the ``/static`` portion of the URL space is served. The
-    value is a directory name (``~username`` is allowed, and non-absolute names
-    are interpreted relative to the node's basedir), which can contain HTML
-    and other files. This can be used to serve a Javascript-based frontend to
-    the Tahoe-LAFS node, or other services.
+    This controls where the ``/static`` portion of the URL space is
+    served. The value is a directory name (``~username`` is allowed, and
+    non-absolute names are interpreted relative to the node's basedir), which
+    can contain HTML and other files. This can be used to serve a
+    Javascript-based frontend to the Tahoe-LAFS node, or other services.
 
hunk ./docs/configuration.rst 97
-    The default value is "``public_html``", which will serve ``BASEDIR/public_html`` .
-    With the default settings, ``http://127.0.0.1:3456/static/foo.html`` will
-    serve the contents of ``BASEDIR/public_html/foo.html`` .
+    The default value is "``public_html``", which will serve
+    ``BASEDIR/public_html`` .  With the default settings,
+    ``http://127.0.0.1:3456/static/foo.html`` will serve the contents of
+    ``BASEDIR/public_html/foo.html`` .
 
 ``tub.port = (integer, optional)``
 
hunk ./docs/configuration.rst 121
 
     If you don't provide ``tub.location``, the node will try to figure out a
     useful one by itself, by using tools like "``ifconfig``" to determine the
-    set of IP addresses on which it can be reached from nodes both near and far.
-    It will also include the TCP port number on which it is listening (either
-    the one specified by ``tub.port``, or whichever port was assigned by the
-    kernel when ``tub.port`` is left unspecified).
+    set of IP addresses on which it can be reached from nodes both near and
+    far.  It will also include the TCP port number on which it is listening
+    (either the one specified by ``tub.port``, or whichever port was assigned
+    by the kernel when ``tub.port`` is left unspecified).
 
     You might want to override this value if your node lives behind a
     firewall that is doing inbound port forwarding, or if you are using other
hunk ./docs/configuration.rst 158
         tub.port = 8098
         tub.location = external-firewall.example.com:7912
 
-    * Run a node behind a Tor proxy (perhaps via ``torsocks``), in client-only
-      mode (i.e. we can make outbound connections, but other nodes will not
-      be able to connect to us). The literal '``unreachable.example.org``' will
-      not resolve, but will serve as a reminder to human observers that this
-      node cannot be reached. "Don't call us.. we'll call you"::
+    * Run a node behind a Tor proxy (perhaps via ``torsocks``), in
+      client-only mode (i.e. we can make outbound connections, but other
+      nodes will not be able to connect to us). The literal
+      '``unreachable.example.org``' will not resolve, but will serve as a
+      reminder to human observers that this node cannot be reached. "Don't
+      call us.. we'll call you"::
 
         tub.port = 8098
         tub.location = unreachable.example.org:0
hunk ./docs/configuration.rst 189
 
 ``log_gatherer.furl = (FURL, optional)``
 
-    If provided, this contains a single FURL string that is used to contact
-    a "log gatherer", which will be granted access to the logport. This can
-    be used to gather operational logs in a single place. Note that in
-    previous releases of Tahoe-LAFS, if an old-style
-    ``BASEDIR/log_gatherer.furl`` file existed it would also be used in
-    addition to this value, allowing multiple log gatherers to be used at
-    once. As of Tahoe-LAFS v1.9.0, an old-style file is ignored and a
-    warning will be emitted if one is detected. This means that as of
-    Tahoe-LAFS v1.9.0 you can have at most one log gatherer per node. See
-    ticket `#1423`_ about lifting this restriction and letting you have
-    multiple log gatherers.
+    If provided, this contains a single FURL string that is used to contact a
+    "log gatherer", which will be granted access to the logport. This can be
+    used to gather operational logs in a single place. Note that in previous
+    releases of Tahoe-LAFS, if an old-style ``BASEDIR/log_gatherer.furl``
+    file existed it would also be used in addition to this value, allowing
+    multiple log gatherers to be used at once. As of Tahoe-LAFS v1.9.0, an
+    old-style file is ignored and a warning will be emitted if one is
+    detected. This means that as of Tahoe-LAFS v1.9.0 you can have at most
+    one log gatherer per node. See ticket `#1423`_ about lifting this
+    restriction and letting you have multiple log gatherers.
 
     .. _`#1423`: http://tahoe-lafs.org/trac/tahoe-lafs/ticket/1423
 
hunk ./docs/configuration.rst 206
 
 ``timeout.disconnect = (integer in seconds, optional)``
 
-    If ``timeout.keepalive`` is provided, it is treated as an integral number of
-    seconds, and sets the Foolscap "keepalive timer" to that value. For each
-    connection to another node, if nothing has been heard for a while, we
-    will attempt to provoke the other end into saying something. The duration
-    of silence that passes before sending the PING will be between KT and
-    2*KT. This is mainly intended to keep NAT boxes from expiring idle TCP
-    sessions, but also gives TCP's long-duration keepalive/disconnect timers
-    some traffic to work with. The default value is 240 (i.e. 4 minutes).
+    If ``timeout.keepalive`` is provided, it is treated as an integral number
+    of seconds, and sets the Foolscap "keepalive timer" to that value. For
+    each connection to another node, if nothing has been heard for a while,
+    we will attempt to provoke the other end into saying something. The
+    duration of silence that passes before sending the PING will be between
+    KT and 2*KT. This is mainly intended to keep NAT boxes from expiring idle
+    TCP sessions, but also gives TCP's long-duration keepalive/disconnect
+    timers some traffic to work with. The default value is 240 (i.e. 4
+    minutes).
 
     If timeout.disconnect is provided, this is treated as an integral number
     of seconds, and sets the Foolscap "disconnect timer" to that value. For
hunk ./docs/configuration.rst 221
     each connection to another node, if nothing has been heard for a while,
     we will drop the connection. The duration of silence that passes before
     dropping the connection will be between DT-2*KT and 2*DT+2*KT (please see
-    ticket `#521`_ for more details). If we are sending a large amount of data
-    to the other end (which takes more than DT-2*KT to deliver), we might
-    incorrectly drop the connection. The default behavior (when this value is
-    not provided) is to disable the disconnect timer.
+    ticket `#521`_ for more details). If we are sending a large amount of
+    data to the other end (which takes more than DT-2*KT to deliver), we
+    might incorrectly drop the connection. The default behavior (when this
+    value is not provided) is to disable the disconnect timer.
 
     See ticket `#521`_ for a discussion of how to pick these timeout values.
     Using 30 minutes means we'll disconnect after 22 to 68 minutes of
hunk ./docs/configuration.rst 258
 
     The default value is the ``tmp`` directory in the node's base directory
     (i.e. ``BASEDIR/tmp``), but it can be placed elsewhere. This directory is
-    used for files that usually (on a Unix system) go into ``/tmp``. The string
-    will be interpreted relative to the node's base directory.
+    used for files that usually (on a Unix system) go into ``/tmp``. The
+    string will be interpreted relative to the node's base directory.
 
 
 Client Configuration
hunk ./docs/configuration.rst 269
 
 ``introducer.furl = (FURL string, mandatory)``
 
-    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 base directory when it starts,
-    whereupon it should be published to everyone who wishes to attach a
-    client to that grid
+    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 base directory when
+    it starts, whereupon it should be published to everyone who wishes to
+    attach a client to that grid
 
 ``helper.furl = (FURL string, optional)``
 
hunk ./docs/configuration.rst 299
 
     These three values set the default encoding parameters. Each time a new
     file is uploaded, erasure-coding is used to break the ciphertext into
-    separate pieces. There will be ``N`` (i.e. ``shares.total``) pieces created,
-    and the file will be recoverable if any ``k`` (i.e. ``shares.needed``)
-    pieces are retrieved. The default values are 3-of-10 (i.e.
-    ``shares.needed = 3``, ``shares.total = 10``). Setting ``k`` to 1 is
-    equivalent to simple replication (uploading ``N`` copies of the file).
+    separate pieces. There will be ``N`` (i.e. ``shares.total``) pieces
+    created, and the file will be recoverable if any ``k``
+    (i.e. ``shares.needed``) pieces are retrieved. The default values are
+    3-of-10 (i.e.  ``shares.needed = 3``, ``shares.total = 10``). Setting
+    ``k`` to 1 is equivalent to simple replication (uploading ``N`` copies of
+    the file).
 
     These values control the tradeoff between storage overhead, performance,
hunk ./docs/configuration.rst 307
-    and reliability. To a first approximation, a 1MB file will use (1MB * ``N``/``k``)
-    of backend storage space (the actual value will be a bit more, because of
-    other forms of overhead). Up to ``N``-``k`` shares can be lost before the file
-    becomes unrecoverable, so assuming there are at least ``N`` servers, up to
-    ``N``-``k`` servers can be offline without losing the file. So large ``N``/``k``
-    ratios are more reliable, and small ``N``/``k`` ratios use less disk space.
-    Clearly, ``k`` must never be greater than ``N``.
+    and reliability. To a first approximation, a 1MB file will use (1MB *
+    ``N``/``k``) of backend storage space (the actual value will be a bit
+    more, because of other forms of overhead). Up to ``N``-``k`` shares can
+    be lost before the file becomes unrecoverable, so assuming there are at
+    least ``N`` servers, up to ``N``-``k`` servers can be offline without
+    losing the file. So large ``N``/``k`` ratios are more reliable, and small
+    ``N``/``k`` ratios use less disk space.  Clearly, ``k`` must never be
+    greater than ``N``.
 
hunk ./docs/configuration.rst 316
-    Large values of ``N`` will slow down upload operations slightly, since more
-    servers must be involved, and will slightly increase storage overhead due
-    to the hash trees that are created. Large values of ``k`` will cause
-    downloads to be marginally slower, because more servers must be involved.
-    ``N`` cannot be larger than 256, because of the 8-bit erasure-coding
-    algorithm that Tahoe-LAFS uses.
+    Large values of ``N`` will slow down upload operations slightly, since
+    more servers must be involved, and will slightly increase storage
+    overhead due to the hash trees that are created. Large values of ``k``
+    will cause downloads to be marginally slower, because more servers must
+    be involved.  ``N`` cannot be larger than 256, because of the 8-bit
+    erasure-coding algorithm that Tahoe-LAFS uses.
 
hunk ./docs/configuration.rst 323
-    ``shares.happy`` allows you control over the distribution of your immutable
-    file. For a successful upload, shares are guaranteed to be initially
-    placed on at least ``shares.happy`` distinct servers, the correct
-    functioning of any ``k`` of which is sufficient to guarantee the availability
-    of the uploaded file. This value should not be larger than the number of
-    servers on your grid.
+    ``shares.happy`` allows you control over the distribution of your
+    immutable file. For a successful upload, shares are guaranteed to be
+    initially placed on at least ``shares.happy`` distinct servers, the
+    correct functioning of any ``k`` of which is sufficient to guarantee the
+    availability of the uploaded file. This value should not be larger than
+    the number of servers on your grid.
 
     A value of ``shares.happy`` <= ``k`` is allowed, but does not provide any
     redundancy if some servers fail or lose shares.
hunk ./docs/configuration.rst 379
 
 ``enabled = (boolean, optional)``
 
-    If this is ``True``, the node will run a storage server, offering space to
-    other clients. If it is ``False``, the node will not run a storage server,
-    meaning that no shares will be stored on this node. Use ``False`` for
-    clients who do not wish to provide storage service. The default value is
-    ``True``.
+    If this is ``True``, the node will run a storage server, offering space
+    to other clients. If it is ``False``, the node will not run a storage
+    server, meaning that no shares will be stored on this node. Use ``False``
+    for clients who do not wish to provide storage service. The default value
+    is ``True``.
 
 ``readonly = (boolean, optional)``
 
hunk ./docs/configuration.rst 389
     If ``True``, the node will run a storage server but will not accept any
     shares, making it effectively read-only. Use this for storage servers
-    that are being decommissioned: the ``storage/`` directory could be mounted
-    read-only, while shares are moved to other servers. Note that this
-    currently only affects immutable shares. Mutable shares (used for
+    that are being decommissioned: the ``storage/`` directory could be
+    mounted read-only, while shares are moved to other servers. Note that
+    this currently only affects immutable shares. Mutable shares (used for
     directories) will be written and modified anyway. See ticket `#390
     <http://tahoe-lafs.org/trac/tahoe-lafs/ticket/390>`_ for the current
     status of this bug. The default value is ``False``.
hunk ./docs/configuration.rst 441
 
 ``enabled = (boolean, optional)``
 
-    If ``True``, the node will run a helper (see `<helper.rst>`_ for details).
-    The helper's contact FURL will be placed in ``private/helper.furl``, from
-    which it can be copied to any clients that wish to use it. Clearly nodes
-    should not both run a helper and attempt to use one: do not create
-    ``helper.furl`` and also define ``[helper]enabled`` in the same node.
-    The default is ``False``.
+    If ``True``, the node will run a helper (see `<helper.rst>`_ for
+    details).  The helper's contact FURL will be placed in
+    ``private/helper.furl``, from which it can be copied to any clients that
+    wish to use it. Clearly nodes should not both run a helper and attempt to
+    use one: do not create ``helper.furl`` and also define
+    ``[helper]enabled`` in the same node.  The default is ``False``.
 
 
 Running An Introducer
hunk ./docs/configuration.rst 452
 =====================
 
-The introducer node uses a different ``.tac`` file (named "``introducer.tac``"),
-and pays attention to the ``[node]`` section, but not the others.
+The introducer node uses a different ``.tac`` file (named
+"``introducer.tac``"), and pays attention to the ``[node]`` section, but not
+the others.
 
 The Introducer node maintains some different state than regular client nodes.
 
hunk ./docs/configuration.rst 459
 ``BASEDIR/introducer.furl``
+
   This is generated the first time the introducer node is started, and used
   again on subsequent runs, to give the introduction service a persistent
hunk ./docs/configuration.rst 462
-  long-term identity. This file should be published and copied into new client
-  nodes before they are started for the first time.
+  long-term identity. This file should be published and copied into new
+  client nodes before they are started for the first time.
 
 
 Other Files in BASEDIR
hunk ./docs/configuration.rst 481
 This section describes these other files.
 
 ``private/node.pem``
-  This contains an SSL private-key certificate. The node
-  generates this the first time it is started, and re-uses it on subsequent
-  runs. This certificate allows the node to have a cryptographically-strong
-  identifier (the Foolscap "TubID"), and to establish secure connections to
-  other nodes.
+
+  This contains an SSL private-key certificate. The node generates this the
+  first time it is started, and re-uses it on subsequent runs. This
+  certificate allows the node to have a cryptographically-strong identifier
+  (the Foolscap "TubID"), and to establish secure connections to other nodes.
 
 ``storage/``
hunk ./docs/configuration.rst 488
-  Nodes that host StorageServers will create this directory to hold shares
-  of files on behalf of other clients. There will be a directory underneath
-  it for each StorageIndex for which this node is holding shares. There is
-  also an "incoming" directory where partially-completed shares are held
-  while they are being received.
+
+  Nodes that host StorageServers will create this directory to hold shares of
+  files on behalf of other clients. There will be a directory underneath it
+  for each StorageIndex for which this node is holding shares. There is also
+  an "incoming" directory where partially-completed shares are held while
+  they are being received.
 
 ``tahoe-client.tac``
hunk ./docs/configuration.rst 496
+
   This file defines the client, by constructing the actual Client instance
   each time the node is started. It is used by the "``twistd``" daemonization
hunk ./docs/configuration.rst 499
-  program (in the ``-y`` mode), which is run internally by the "``tahoe start``"
-  command. This file is created by the "``tahoe create-node``" or
+  program (in the ``-y`` mode), which is run internally by the "``tahoe
+  start``" command. This file is created by the "``tahoe create-node``" or
   "``tahoe create-client``" commands.
 
 ``tahoe-introducer.tac``
hunk ./docs/configuration.rst 504
+
   This file is used to construct an introducer, and is created by the
   "``tahoe create-introducer``" command.
 
hunk ./docs/configuration.rst 509
 ``tahoe-key-generator.tac``
+
   This file is used to construct a key generator, and is created by the
   "``tahoe create-key-gernerator``" command.
 
hunk ./docs/configuration.rst 514
 ``tahoe-stats-gatherer.tac``
-  This file is used to construct a statistics gatherer, and is created by
-  the "``tahoe create-stats-gatherer``" command.
+
+  This file is used to construct a statistics gatherer, and is created by the
+  "``tahoe create-stats-gatherer``" command.
 
 ``private/control.furl``
hunk ./docs/configuration.rst 519
+
   This file contains a FURL that provides access to a control port on the
   client node, from which files can be uploaded and downloaded. This file is
   created with permissions that prevent anyone else from reading it (on
hunk ./docs/configuration.rst 528
   debugging and testing use.
 
 ``private/logport.furl``
+
   This file contains a FURL that provides access to a 'log port' on the
   client node, from which operational logs can be retrieved. Do not grant
   logport access to strangers, because occasionally secret information may be
hunk ./docs/configuration.rst 535
   placed in the logs.
 
 ``private/helper.furl``
+
   If the node is running a helper (for use by other clients), its contact
   FURL will be placed here. See `<helper.rst>`_ for more details.
 
hunk ./docs/configuration.rst 540
 ``private/root_dir.cap`` (optional)
+
   The command-line tools will read a directory cap out of this file and use
   it, if you don't specify a '--dir-cap' option or if you specify
   '--dir-cap=root'.
hunk ./docs/configuration.rst 546
 
 ``private/convergence`` (automatically generated)
+
   An added secret for encrypting immutable files. Everyone who has this same
   string in their ``private/convergence`` file encrypts their immutable files
   in the same way when uploading them. This causes identical files to
hunk ./docs/configuration.rst 557
   contents of a file, then they can use brute-force to learn the remaining
   contents.
 
-  So the set of people who know your ``private/convergence`` string is the set
-  of people who converge their storage space with you when you and they upload
-  identical immutable files, and it is also the set of people who could mount
-  such an attack.
+  So the set of people who know your ``private/convergence`` string is the
+  set of people who converge their storage space with you when you and they
+  upload identical immutable files, and it is also the set of people who
+  could mount such an attack.
 
hunk ./docs/configuration.rst 562
-  The content of the ``private/convergence`` file is a base-32 encoded string.
-  If the file doesn't exist, then when the Tahoe-LAFS client starts up it will
-  generate a random 256-bit string and write the base-32 encoding of this
-  string into the file. If you want to converge your immutable files with as
-  many people as possible, put the empty string (so that ``private/convergence``
-  is a zero-length file).
+  The content of the ``private/convergence`` file is a base-32 encoded
+  string.  If the file doesn't exist, then when the Tahoe-LAFS client starts
+  up it will generate a random 256-bit string and write the base-32 encoding
+  of this string into the file. If you want to converge your immutable files
+  with as many people as possible, put the empty string (so that
+  ``private/convergence`` is a zero-length file).
 
 
 Other files
hunk ./docs/configuration.rst 574
 ===========
 
 ``logs/``
-  Each Tahoe-LAFS node creates a directory to hold the log messages produced as
-  the node runs. These logfiles are created and rotated by the "``twistd``"
-  daemonization program, so ``logs/twistd.log`` will contain the most recent
-  messages, ``logs/twistd.log.1`` will contain the previous ones,
+
+  Each Tahoe-LAFS node creates a directory to hold the log messages produced
+  as the node runs. These logfiles are created and rotated by the
+  "``twistd``" daemonization program, so ``logs/twistd.log`` will contain the
+  most recent messages, ``logs/twistd.log.1`` will contain the previous ones,
   ``logs/twistd.log.2`` will be older still, and so on. ``twistd`` rotates
hunk ./docs/configuration.rst 580
-  logfiles after they grow beyond 1MB in size. If the space consumed by logfiles
-  becomes troublesome, they should be pruned: a cron job to delete all files
-  that were created more than a month ago in this ``logs/`` directory should be
-  sufficient.
+  logfiles after they grow beyond 1MB in size. If the space consumed by
+  logfiles becomes troublesome, they should be pruned: a cron job to delete
+  all files that were created more than a month ago in this ``logs/``
+  directory should be sufficient.
 
 ``my_nodeid``
hunk ./docs/configuration.rst 586
+
   this is written by all nodes after startup, and contains a base32-encoded
   (i.e. human-readable) NodeID that identifies this specific node. This
   NodeID is the same string that gets displayed on the web page (in the
hunk ./docs/configuration.rst 597
 Example
 =======
 
-The following is a sample ``tahoe.cfg`` file, containing values for some of the
-keys described in the previous section. Note that this is not a recommended
-configuration (most of these are not the default values), merely a legal one.
+The following is a sample ``tahoe.cfg`` file, containing values for some of
+the keys described in the previous section. Note that this is not a
+recommended configuration (most of these are not the default values), merely
+a legal one.
 
 ::
 
hunk ./docs/configuration.rst 635
 =======================
 
 Tahoe-LAFS releases before v1.3.0 had no ``tahoe.cfg`` file, and used
-distinct files for each item. This is no longer supported and if you
-have configuration in the old format you must manually convert it to
-the new format for Tahoe-LAFS to detect it. See
-`<historical/configuration.rst>`_.
+distinct files for each item. This is no longer supported and if you have
+configuration in the old format you must manually convert it to the new
+format for Tahoe-LAFS to detect it. See `<historical/configuration.rst>`_.
}
[doc: edit the explanation of K-of-N tradeoffs
zooko@zooko.com**20110804193409
 Ignore-this: ab6f4e35a995c2099340b5c9c5d30f40
] {
hunk ./docs/configuration.rst 79
 ``web.port = (strports string, optional)``
 
     This controls where the node's webserver should listen, providing
-    filesystem access and node status as defined in `webapi.rst
-    <frontends/webapi.rst>`_. This file contains a Twisted "strports"
+    filesystem access and node status as defined in
+    `<frontends/webapi.rst>`_. This file contains a Twisted "strports"
     specification such as "``3456``" or "``tcp:3456:interface=127.0.0.1``".
     The "``tahoe create-node``" or "``tahoe create-client``" commands set the
     ``web.port`` to "``tcp:3456:interface=127.0.0.1``" by default; this is
hunk ./docs/configuration.rst 299
 
     These three values set the default encoding parameters. Each time a new
     file is uploaded, erasure-coding is used to break the ciphertext into
-    separate pieces. There will be ``N`` (i.e. ``shares.total``) pieces
+    separate shares. There will be ``N`` (i.e. ``shares.total``) shares
     created, and the file will be recoverable if any ``k``
hunk ./docs/configuration.rst 301
-    (i.e. ``shares.needed``) pieces are retrieved. The default values are
+    (i.e. ``shares.needed``) shares are retrieved. The default values are
     3-of-10 (i.e.  ``shares.needed = 3``, ``shares.total = 10``). Setting
     ``k`` to 1 is equivalent to simple replication (uploading ``N`` copies of
     the file).
hunk ./docs/configuration.rst 306
 
-    These values control the tradeoff between storage overhead, performance,
-    and reliability. To a first approximation, a 1MB file will use (1MB *
+    These values control the tradeoff between storage overhead and
+    reliability. To a first approximation, a 1MB file will use (1MB *
     ``N``/``k``) of backend storage space (the actual value will be a bit
     more, because of other forms of overhead). Up to ``N``-``k`` shares can
hunk ./docs/configuration.rst 310
-    be lost before the file becomes unrecoverable, so assuming there are at
-    least ``N`` servers, up to ``N``-``k`` servers can be offline without
-    losing the file. So large ``N``/``k`` ratios are more reliable, and small
-    ``N``/``k`` ratios use less disk space.  Clearly, ``k`` must never be
-    greater than ``N``.
+    be lost before the file becomes unrecoverable.  So large ``N``/``k``
+    ratios are more reliable, and small ``N``/``k`` ratios use less disk
+    space. ``N`` cannot be larger than 256, because of the 8-bit
+    erasure-coding algorithm that Tahoe-LAFS uses. ``k`` can not be greater
+    than ``N``. See `<performance.rst>`_ for more details.
 
hunk ./docs/configuration.rst 316
-    Large values of ``N`` will slow down upload operations slightly, since
-    more servers must be involved, and will slightly increase storage
-    overhead due to the hash trees that are created. Large values of ``k``
-    will cause downloads to be marginally slower, because more servers must
-    be involved.  ``N`` cannot be larger than 256, because of the 8-bit
-    erasure-coding algorithm that Tahoe-LAFS uses.
-
-    ``shares.happy`` allows you control over the distribution of your
-    immutable file. For a successful upload, shares are guaranteed to be
-    initially placed on at least ``shares.happy`` distinct servers, the
-    correct functioning of any ``k`` of which is sufficient to guarantee the
-    availability of the uploaded file. This value should not be larger than
-    the number of servers on your grid.
+    ``shares.happy`` allows you control over how well to "spread out" the
+    shares of an immutable file. For a successful upload, shares are
+    guaranteed to be initially placed on at least ``shares.happy`` distinct
+    servers, the correct functioning of any ``k`` of which is sufficient to
+    guarantee the availability of the uploaded file. This value should not be
+    larger than the number of servers on your grid.
 
     A value of ``shares.happy`` <= ``k`` is allowed, but does not provide any
     redundancy if some servers fail or lose shares.
}

Context:

[test_runner.py: fix a bug in CreateNode.do_create introduced in changeset [5114] when the tahoe.cfg file has been written with CRLF line endings. refs #1385
david-sarah@jacaranda.org**20110804003032
 Ignore-this: 7b7afdcf99da6671afac2d42828883eb
] 
[test_client.py: repair Basic.test_error_on_old_config_files. refs #1385
david-sarah@jacaranda.org**20110803235036
 Ignore-this: 31e2a9c3febe55948de7e144353663e
] 
[test_checker.py: increase timeout for TooParallel.test_immutable again. The ARM buildslave took 38 seconds, so 40 seconds is too close to the edge; make it 80.
david-sarah@jacaranda.org**20110803214042
 Ignore-this: 2d8026a6b25534e01738f78d6c7495cb
] 
[test_runner.py: fix RunNode.test_introducer to not rely on the mtime of introducer.furl to detect when the node has restarted. Instead we detect when node.url has been written. refs #1385
david-sarah@jacaranda.org**20110803180917
 Ignore-this: 11ddc43b107beca42cb78af88c5c394c
] 
[Further improve error message about old config files. refs #1385
david-sarah@jacaranda.org**20110803174546
 Ignore-this: 9d6cc3c288d9863dce58faafb3855917
] 
[Slightly improve error message about old config files (avoid unnecessary Unicode escaping). refs #1385
david-sarah@jacaranda.org**20110803163848
 Ignore-this: a3e3930fba7ccf90b8db3d2ed5829df4
] 
[test_checker.py: increase timeout for TooParallel.test_immutable (was consistently failing on ARM buildslave).
david-sarah@jacaranda.org**20110803163213
 Ignore-this: d0efceaf12628e8791862b80c85b5d56
] 
[Fix the bug that prevents an introducer from starting when introducer.furl already exists. Also remove some dead code that used to read old config files, and rename 'warn_about_old_config_files' to reflect that it's not a warning. refs #1385
david-sarah@jacaranda.org**20110803013212
 Ignore-this: 2d6cd14bd06a7493b26f2027aff78f4d
] 
[test_runner.py: modify RunNode.test_introducer to test that starting an introducer works when the introducer.furl file already exists. refs #1385
david-sarah@jacaranda.org**20110803012704
 Ignore-this: 8cf7f27ac4bfbb5ad8ca4a974106d437
] 
[verifier: correct a bug introduced in changeset [5106] that caused us to only verify the first block of a file. refs #1395
david-sarah@jacaranda.org**20110802172437
 Ignore-this: 87fb77854a839ff217dce73544775b11
] 
[test_repairer: add a deterministic test of share data corruption that always flips the bits of the last byte of the share data. refs #1395
david-sarah@jacaranda.org**20110802175841
 Ignore-this: 72f54603785007e88220c8d979e08be7
] 
[verifier: serialize the fetching of blocks within a share so that we don't use too much RAM
zooko@zooko.com**20110802063703
 Ignore-this: debd9bac07dcbb6803f835a9e2eabaa1
 
 Shares are still verified in parallel, but within a share, don't request a
 block until the previous block has been verified and the memory we used to hold
 it has been freed up.
 
 Patch originally due to Brian. This version has a mockery-patchery-style test
 which is "low tech" (it implements the patching inline in the test code instead
 of using an extension of the mock.patch() function from the mock library) and
 which unpatches in case of exception.
 
 fixes #1395
] 
[add docs about timing-channel attacks
Brian Warner <warner@lothar.com>**20110802044541
 Ignore-this: 73114d5f5ed9ce252597b707dba3a194
] 
['test-coverage' now needs PYTHONPATH=. to find TOP/twisted/plugins/
Brian Warner <warner@lothar.com>**20110802041952
 Ignore-this: d40f1f4cb426ea1c362fc961baedde2
] 
[reject old-style (pre-Tahoe-LAFS-v1.3) configuration files
zooko@zooko.com**20110801232423
 Ignore-this: b58218fcc064cc75ad8f05ed0c38902b
 Check for the existence of any of them and if any are found raise exception which will abort the startup of the node.
 This is a backwards-incompatible change for anyone who is still using old-style configuration files.
 fixes #1385
] 
[whitespace-cleanup
zooko@zooko.com**20110725015546
 Ignore-this: 442970d0545183b97adc7bd66657876c
] 
[tests: use fileutil.write() instead of open() to ensure timely close even without CPython-style reference counting
zooko@zooko.com**20110331145427
 Ignore-this: 75aae4ab8e5fa0ad698f998aaa1888ce
 Some of these already had an explicit close() but I went ahead and replaced them with fileutil.write() as well for the sake of uniformity.
] 
[remove nodeid from WriteBucketProxy classes and customers
warner@lothar.com**20110801224317
 Ignore-this: e55334bb0095de11711eeb3af827e8e8
 refs #1363
] 
[remove get_serverid() from ReadBucketProxy and customers, including Checker
warner@lothar.com**20110801224307
 Ignore-this: 837aba457bc853e4fd413ab1a94519cb
 and debug.py dump-share commands
 refs #1363
] 
[Address Kevan's comment in #776 about Options classes missed when adding 'self.command_name'. refs #776, #1359
david-sarah@jacaranda.org**20110801221317
 Ignore-this: 8881d42cf7e6a1d15468291b0cb8fab9
] 
[docs/frontends/webapi.rst: change some more instances of 'delete' or 'remove' to 'unlink', change some section titles, and use two blank lines between all sections. refs #776, #1104
david-sarah@jacaranda.org**20110801220919
 Ignore-this: 572327591137bb05c24c44812d4b163f
] 
[cleanup: implement rm as a synonym for unlink rather than vice-versa. refs #776
david-sarah@jacaranda.org**20110801220108
 Ignore-this: 598dcbed870f4f6bb9df62de9111b343
] 
[docs/webapi.rst: address Kevan's comments about use of 'delete' on ref #1104
david-sarah@jacaranda.org**20110801205356
 Ignore-this: 4fbf03864934753c951ddeff64392491
] 
[docs: some changes of 'delete' or 'rm' to 'unlink'. refs #1104
david-sarah@jacaranda.org**20110713002722
 Ignore-this: 304d2a330d5e6e77d5f1feed7814b21c
] 
[WUI: change the label of the button to unlink a file from 'del' to 'unlink'. Also change some internal names to 'unlink', and allow 't=unlink' as a synonym for 't=delete' in the web-API interface. Incidentally, improve a test to check for the rename button as well as the unlink button. fixes #1104
david-sarah@jacaranda.org**20110713001218
 Ignore-this: 3eef6b3f81b94a9c0020a38eb20aa069
] 
[src/allmydata/web/filenode.py: delete a stale comment that was made incorrect by changeset [3133].
david-sarah@jacaranda.org**20110801203009
 Ignore-this: b3912e95a874647027efdc97822dd10e
] 
[fix typo introduced during rebasing of 'remove get_serverid from
Brian Warner <warner@lothar.com>**20110801200341
 Ignore-this: 4235b0f585c0533892193941dbbd89a8
 DownloadStatus.add_dyhb_request and customers' patch, to fix test failure.
] 
[remove get_serverid from DownloadStatus.add_dyhb_request and customers
zooko@zooko.com**20110801185401
 Ignore-this: db188c18566d2d0ab39a80c9dc8f6be6
 This patch is a rebase of a patch originally written by Brian. I didn't change any of the intent of Brian's patch, just ported it to current trunk.
 refs #1363
] 
[remove get_serverid from DownloadStatus.add_block_request and customers
zooko@zooko.com**20110801185344
 Ignore-this: 8bfa8201d6147f69b0fbe31beea9c1e
 This is a rebase of a patch Brian originally wrote. I haven't changed the intent of that patch, just ported it to trunk.
 refs #1363
] 
[apply zooko's advice: storage_client get_known_servers() returns a frozenset, caller sorts
warner@lothar.com**20110801174452
 Ignore-this: 2aa13ea6cbed4e9084bd604bf8633692
 refs #1363
] 
[test_immutable.Test: rewrite to use NoNetworkGrid, now takes 2.7s not 97s
warner@lothar.com**20110801174444
 Ignore-this: 54f30b5d7461d2b3514e2a0172f3a98c
 remove now-unused ShareManglingMixin
 refs #1363
] 
[DownloadStatus.add_known_share wants to be used by Finder, web.status
warner@lothar.com**20110801174436
 Ignore-this: 1433bcd73099a579abe449f697f35f9
 refs #1363
] 
[replace IServer.name() with get_name(), and get_longname()
warner@lothar.com**20110801174428
 Ignore-this: e5a6f7f6687fd7732ddf41cfdd7c491b
 
 This patch was originally written by Brian, but was re-recorded by Zooko to use
 darcs replace instead of hunks for any file in which it would result in fewer
 total hunks.
 refs #1363
] 
[upload.py: apply David-Sarah's advice rename (un)contacted(2) trackers to first_pass/second_pass/next_pass
zooko@zooko.com**20110801174143
 Ignore-this: e36e1420bba0620a0107bd90032a5198
 This patch was written by Brian but was re-recorded by Zooko (with David-Sarah looking on) to use darcs replace instead of editing to rename the three variables to their new names.
 refs #1363
] 
[Coalesce multiple Share.loop() calls, make downloads faster. Closes #1268.
Brian Warner <warner@lothar.com>**20110801151834
 Ignore-this: 48530fce36c01c0ff708f61c2de7e67a
] 
[src/allmydata/_auto_deps.py: 'i686' is another way of spelling x86.
david-sarah@jacaranda.org**20110801034035
 Ignore-this: 6971e0621db2fba794d86395b4d51038
] 
[tahoe_rm.py: better error message when there is no path. refs #1292
david-sarah@jacaranda.org**20110122064212
 Ignore-this: ff3bb2c9f376250e5fd77eb009e09018
] 
[test_cli.py: Test for error message when 'tahoe rm' is invoked without a path. refs #1292
david-sarah@jacaranda.org**20110104105108
 Ignore-this: 29ec2f2e0251e446db96db002ad5dd7d
] 
[src/allmydata/__init__.py: suppress a spurious warning from 'bin/tahoe --version[-and-path]' about twisted-web and twisted-core packages.
david-sarah@jacaranda.org**20110801005209
 Ignore-this: 50e7cd53cca57b1870d9df0361c7c709
] 
[test_cli.py: use to_str on fields loaded using simplejson.loads in new tests. refs #1304
david-sarah@jacaranda.org**20110730032521
 Ignore-this: d1d6dfaefd1b4e733181bf127c79c00b
] 
[cli: make 'tahoe cp' overwrite mutable files in-place
Kevan Carstensen <kevan@isnotajoke.com>**20110729202039
 Ignore-this: b2ad21a19439722f05c49bfd35b01855
] 
[SFTP: write an error message to standard error for unrecognized shell commands. Change the existing message for shell sessions to be written to standard error, and refactor some duplicated code. Also change the lines of the error messages to end in CRLF, and take into account Kevan's review comments. fixes #1442, #1446
david-sarah@jacaranda.org**20110729233102
 Ignore-this: d2f2bb4664f25007d1602bf7333e2cdd
] 
[src/allmydata/scripts/cli.py: fix pyflakes warning.
david-sarah@jacaranda.org**20110728021402
 Ignore-this: 94050140ddb99865295973f49927c509
] 
[Fix the help synopses of CLI commands to include [options] in the right place. fixes #1359, fixes #636
david-sarah@jacaranda.org**20110724225440
 Ignore-this: 2a8e488a5f63dabfa9db9efd83768a5
] 
[encodingutil: argv and output encodings are always the same on all platforms. Lose the unnecessary generality of them being different. fixes #1120
david-sarah@jacaranda.org**20110629185356
 Ignore-this: 5ebacbe6903dfa83ffd3ff8436a97787
] 
[docs/man/tahoe.1: add man page. fixes #1420
david-sarah@jacaranda.org**20110724171728
 Ignore-this: fc7601ec7f25494288d6141d0ae0004c
] 
[Update the dependency on zope.interface to fix an incompatiblity between Nevow and zope.interface 3.6.4. fixes #1435
david-sarah@jacaranda.org**20110721234941
 Ignore-this: 2ff3fcfc030fca1a4d4c7f1fed0f2aa9
] 
[frontends/ftpd.py: remove the check for IWriteFile.close since we're now guaranteed to be using Twisted >= 10.1 which has it.
david-sarah@jacaranda.org**20110722000320
 Ignore-this: 55cd558b791526113db3f83c00ec328a
] 
[Update the dependency on Twisted to >= 10.1. This allows us to simplify some documentation: it's no longer necessary to install pywin32 on Windows, or apply a patch to Twisted in order to use the FTP frontend. fixes #1274, #1438. refs #1429
david-sarah@jacaranda.org**20110721233658
 Ignore-this: 81b41745477163c9b39c0b59db91cc62
] 
[misc/build_helpers/run_trial.py: undo change to block pywin32 (it didn't work because run_trial.py is no longer used). refs #1334
david-sarah@jacaranda.org**20110722035402
 Ignore-this: 5d03f544c4154f088e26c7107494bf39
] 
[misc/build_helpers/run_trial.py: ensure that pywin32 is not on the sys.path when running the test suite. Includes some temporary debugging printouts that will be removed. refs #1334
david-sarah@jacaranda.org**20110722024907
 Ignore-this: 5141a9f83a4085ed4ca21f0bbb20bb9c
] 
[docs/running.rst: use 'tahoe run ~/.tahoe' instead of 'tahoe run' (the default is the current directory, unlike 'tahoe start').
david-sarah@jacaranda.org**20110718005949
 Ignore-this: 81837fbce073e93d88a3e7ae3122458c
] 
[docs/running.rst: say to put the introducer.furl in tahoe.cfg.
david-sarah@jacaranda.org**20110717194315
 Ignore-this: 954cc4c08e413e8c62685d58ff3e11f3
] 
[README.txt: say that quickstart.rst is in the docs directory.
david-sarah@jacaranda.org**20110717192400
 Ignore-this: bc6d35a85c496b77dbef7570677ea42a
] 
[setup: remove the dependency on foolscap's "secure_connections" extra, add a dependency on pyOpenSSL
zooko@zooko.com**20110717114226
 Ignore-this: df222120d41447ce4102616921626c82
 fixes #1383
] 
[test_sftp.py cleanup: remove a redundant definition of failUnlessReallyEqual.
david-sarah@jacaranda.org**20110716181813
 Ignore-this: 50113380b368c573f07ac6fe2eb1e97f
] 
[docs: add missing link in NEWS.rst
zooko@zooko.com**20110712153307
 Ignore-this: be7b7eb81c03700b739daa1027d72b35
] 
[contrib: remove the contributed fuse modules and the entire contrib/ directory, which is now empty
zooko@zooko.com**20110712153229
 Ignore-this: 723c4f9e2211027c79d711715d972c5
 Also remove a couple of vestigial references to figleaf, which is long gone.
 fixes #1409 (remove contrib/fuse)
] 
[add Protovis.js-based download-status timeline visualization
Brian Warner <warner@lothar.com>**20110629222606
 Ignore-this: 477ccef5c51b30e246f5b6e04ab4a127
 
 provide status overlap info on the webapi t=json output, add decode/decrypt
 rate tooltips, add zoomin/zoomout buttons
] 
[add more download-status data, fix tests
Brian Warner <warner@lothar.com>**20110629222555
 Ignore-this: e9e0b7e0163f1e95858aa646b9b17b8c
] 
[prepare for viz: improve DownloadStatus events
Brian Warner <warner@lothar.com>**20110629222542
 Ignore-this: 16d0bde6b734bb501aa6f1174b2b57be
 
 consolidate IDownloadStatusHandlingConsumer stuff into DownloadNode
] 
[docs: fix error in crypto specification that was noticed by Taylor R Campbell <campbell+tahoe@mumble.net>
zooko@zooko.com**20110629185711
 Ignore-this: b921ed60c1c8ba3c390737fbcbe47a67
] 
[setup.py: don't make bin/tahoe.pyscript executable. fixes #1347
david-sarah@jacaranda.org**20110130235809
 Ignore-this: 3454c8b5d9c2c77ace03de3ef2d9398a
] 
[Makefile: remove targets relating to 'setup.py check_auto_deps' which no longer exists. fixes #1345
david-sarah@jacaranda.org**20110626054124
 Ignore-this: abb864427a1b91bd10d5132b4589fd90
] 
[Makefile: add 'make check' as an alias for 'make test'. Also remove an unnecessary dependency of 'test' on 'build' and 'src/allmydata/_version.py'. fixes #1344
david-sarah@jacaranda.org**20110623205528
 Ignore-this: c63e23146c39195de52fb17c7c49b2da
] 
[Rename test_package_initialization.py to (much shorter) test_import.py .
Brian Warner <warner@lothar.com>**20110611190234
 Ignore-this: 3eb3dbac73600eeff5cfa6b65d65822
 
 The former name was making my 'ls' listings hard to read, by forcing them
 down to just two columns.
] 
[tests: fix tests to accomodate [20110611153758-92b7f-0ba5e4726fb6318dac28fb762a6512a003f4c430]
zooko@zooko.com**20110611163741
 Ignore-this: 64073a5f39e7937e8e5e1314c1a302d1
 Apparently none of the two authors (stercor, terrell), three reviewers (warner, davidsarah, terrell), or one committer (me) actually ran the tests. This is presumably due to #20.
 fixes #1412
] 
[wui: right-align the size column in the WUI
zooko@zooko.com**20110611153758
 Ignore-this: 492bdaf4373c96f59f90581c7daf7cd7
 Thanks to Ted "stercor" Rolle Jr. and Terrell Russell.
 fixes #1412
] 
[docs: three minor fixes
zooko@zooko.com**20110610121656
 Ignore-this: fec96579eb95aceb2ad5fc01a814c8a2
 CREDITS for arc for stats tweak
 fix link to .zip file in quickstart.rst (thanks to ChosenOne for noticing)
 English usage tweak
] 
[docs/running.rst: fix stray HTML (not .rst) link noticed by ChosenOne.
david-sarah@jacaranda.org**20110609223719
 Ignore-this: fc50ac9c94792dcac6f1067df8ac0d4a
] 
[server.py:  get_latencies now reports percentiles _only_ if there are sufficient observations for the interpretation of the percentile to be unambiguous.
wilcoxjg@gmail.com**20110527120135
 Ignore-this: 2e7029764bffc60e26f471d7c2b6611e
 interfaces.py:  modified the return type of RIStatsProvider.get_stats to allow for None as a return value
 NEWS.rst, stats.py: documentation of change to get_latencies
 stats.rst: now documents percentile modification in get_latencies
 test_storage.py:  test_latencies now expects None in output categories that contain too few samples for the associated percentile to be unambiguously reported.
 fixes #1392
] 
[corrected "k must never be smaller than N" to "k must never be greater than N"
secorp@allmydata.org**20110425010308
 Ignore-this: 233129505d6c70860087f22541805eac
] 
[docs: revert link in relnotes.txt from NEWS.rst to NEWS, since the former did not exist at revision 5000.
david-sarah@jacaranda.org**20110517011214
 Ignore-this: 6a5be6e70241e3ec0575641f64343df7
] 
[docs: convert NEWS to NEWS.rst and change all references to it.
david-sarah@jacaranda.org**20110517010255
 Ignore-this: a820b93ea10577c77e9c8206dbfe770d
] 
[docs: remove out-of-date docs/testgrid/introducer.furl and containing directory. fixes #1404
david-sarah@jacaranda.org**20110512140559
 Ignore-this: 784548fc5367fac5450df1c46890876d
] 
[scripts/common.py: don't assume that the default alias is always 'tahoe' (it is, but the API of get_alias doesn't say so). refs #1342
david-sarah@jacaranda.org**20110130164923
 Ignore-this: a271e77ce81d84bb4c43645b891d92eb
] 
[setup: don't catch all Exception from check_requirement(), but only PackagingError and ImportError
zooko@zooko.com**20110128142006
 Ignore-this: 57d4bc9298b711e4bc9dc832c75295de
 I noticed this because I had accidentally inserted a bug which caused AssertionError to be raised from check_requirement().
] 
[M-x whitespace-cleanup
zooko@zooko.com**20110510193653
 Ignore-this: dea02f831298c0f65ad096960e7df5c7
] 
[docs: fix typo in running.rst, thanks to arch_o_median
zooko@zooko.com**20110510193633
 Ignore-this: ca06de166a46abbc61140513918e79e8
] 
[relnotes.txt: don't claim to work on Cygwin (which has been untested for some time). refs #1342
david-sarah@jacaranda.org**20110204204902
 Ignore-this: 85ef118a48453d93fa4cddc32d65b25b
] 
[relnotes.txt: forseeable -> foreseeable. refs #1342
david-sarah@jacaranda.org**20110204204116
 Ignore-this: 746debc4d82f4031ebf75ab4031b3a9
] 
[replace remaining .html docs with .rst docs
zooko@zooko.com**20110510191650
 Ignore-this: d557d960a986d4ac8216d1677d236399
 Remove install.html (long since deprecated).
 Also replace some obsolete references to install.html with references to quickstart.rst.
 Fix some broken internal references within docs/historical/historical_known_issues.txt.
 Thanks to Ravi Pinjala and Patrick McDonald.
 refs #1227
] 
[docs: FTP-and-SFTP.rst: fix a minor error and update the information about which version of Twisted fixes #1297
zooko@zooko.com**20110428055232
 Ignore-this: b63cfb4ebdbe32fb3b5f885255db4d39
] 
[munin tahoe_files plugin: fix incorrect file count
francois@ctrlaltdel.ch**20110428055312
 Ignore-this: 334ba49a0bbd93b4a7b06a25697aba34
 fixes #1391
] 
[Fix a test failure in test_package_initialization on Python 2.4.x due to exceptions being stringified differently than in later versions of Python. refs #1389
david-sarah@jacaranda.org**20110411190738
 Ignore-this: 7847d26bc117c328c679f08a7baee519
] 
[tests: add test for including the ImportError message and traceback entry in the summary of errors from importing dependencies. refs #1389
david-sarah@jacaranda.org**20110410155844
 Ignore-this: fbecdbeb0d06a0f875fe8d4030aabafa
] 
[allmydata/__init__.py: preserve the message and last traceback entry (file, line number, function, and source line) of ImportErrors in the package versions string. fixes #1389
david-sarah@jacaranda.org**20110410155705
 Ignore-this: 2f87b8b327906cf8bfca9440a0904900
] 
[remove unused variable detected by pyflakes
zooko@zooko.com**20110407172231
 Ignore-this: 7344652d5e0720af822070d91f03daf9
] 
[allmydata/__init__.py: Nicer reporting of unparseable version numbers in dependencies. fixes #1388
david-sarah@jacaranda.org**20110401202750
 Ignore-this: 9c6bd599259d2405e1caadbb3e0d8c7f
] 
[update FTP-and-SFTP.rst: the necessary patch is included in Twisted-10.1
Brian Warner <warner@lothar.com>**20110325232511
 Ignore-this: d5307faa6900f143193bfbe14e0f01a
] 
[control.py: remove all uses of s.get_serverid()
warner@lothar.com**20110227011203
 Ignore-this: f80a787953bd7fa3d40e828bde00e855
] 
[web: remove some uses of s.get_serverid(), not all
warner@lothar.com**20110227011159
 Ignore-this: a9347d9cf6436537a47edc6efde9f8be
] 
[immutable/downloader/fetcher.py: remove all get_serverid() calls
warner@lothar.com**20110227011156
 Ignore-this: fb5ef018ade1749348b546ec24f7f09a
] 
[immutable/downloader/fetcher.py: fix diversity bug in server-response handling
warner@lothar.com**20110227011153
 Ignore-this: bcd62232c9159371ae8a16ff63d22c1b
 
 When blocks terminate (either COMPLETE or CORRUPT/DEAD/BADSEGNUM), the
 _shares_from_server dict was being popped incorrectly (using shnum as the
 index instead of serverid). I'm still thinking through the consequences of
 this bug. It was probably benign and really hard to detect. I think it would
 cause us to incorrectly believe that we're pulling too many shares from a
 server, and thus prefer a different server rather than asking for a second
 share from the first server. The diversity code is intended to spread out the
 number of shares simultaneously being requested from each server, but with
 this bug, it might be spreading out the total number of shares requested at
 all, not just simultaneously. (note that SegmentFetcher is scoped to a single
 segment, so the effect doesn't last very long).
] 
[immutable/downloader/share.py: reduce get_serverid(), one left, update ext deps
warner@lothar.com**20110227011150
 Ignore-this: d8d56dd8e7b280792b40105e13664554
 
 test_download.py: create+check MyShare instances better, make sure they share
 Server objects, now that finder.py cares
] 
[immutable/downloader/finder.py: reduce use of get_serverid(), one left
warner@lothar.com**20110227011146
 Ignore-this: 5785be173b491ae8a78faf5142892020
] 
[immutable/offloaded.py: reduce use of get_serverid() a bit more
warner@lothar.com**20110227011142
 Ignore-this: b48acc1b2ae1b311da7f3ba4ffba38f
] 
[immutable/upload.py: reduce use of get_serverid()
warner@lothar.com**20110227011138
 Ignore-this: ffdd7ff32bca890782119a6e9f1495f6
] 
[immutable/checker.py: remove some uses of s.get_serverid(), not all
warner@lothar.com**20110227011134
 Ignore-this: e480a37efa9e94e8016d826c492f626e
] 
[add remaining get_* methods to storage_client.Server, NoNetworkServer, and
warner@lothar.com**20110227011132
 Ignore-this: 6078279ddf42b179996a4b53bee8c421
 MockIServer stubs
] 
[upload.py: rearrange _make_trackers a bit, no behavior changes
warner@lothar.com**20110227011128
 Ignore-this: 296d4819e2af452b107177aef6ebb40f
] 
[happinessutil.py: finally rename merge_peers to merge_servers
warner@lothar.com**20110227011124
 Ignore-this: c8cd381fea1dd888899cb71e4f86de6e
] 
[test_upload.py: factor out FakeServerTracker
warner@lothar.com**20110227011120
 Ignore-this: 6c182cba90e908221099472cc159325b
] 
[test_upload.py: server-vs-tracker cleanup
warner@lothar.com**20110227011115
 Ignore-this: 2915133be1a3ba456e8603885437e03
] 
[happinessutil.py: server-vs-tracker cleanup
warner@lothar.com**20110227011111
 Ignore-this: b856c84033562d7d718cae7cb01085a9
] 
[upload.py: more tracker-vs-server cleanup
warner@lothar.com**20110227011107
 Ignore-this: bb75ed2afef55e47c085b35def2de315
] 
[upload.py: fix var names to avoid confusion between 'trackers' and 'servers'
warner@lothar.com**20110227011103
 Ignore-this: 5d5e3415b7d2732d92f42413c25d205d
] 
[refactor: s/peer/server/ in immutable/upload, happinessutil.py, test_upload
warner@lothar.com**20110227011100
 Ignore-this: 7ea858755cbe5896ac212a925840fe68
 
 No behavioral changes, just updating variable/method names and log messages.
 The effects outside these three files should be minimal: some exception
 messages changed (to say "server" instead of "peer"), and some internal class
 names were changed. A few things still use "peer" to minimize external
 changes, like UploadResults.timings["peer_selection"] and
 happinessutil.merge_peers, which can be changed later.
] 
[storage_client.py: clean up test_add_server/test_add_descriptor, remove .test_servers
warner@lothar.com**20110227011056
 Ignore-this: efad933e78179d3d5fdcd6d1ef2b19cc
] 
[test_client.py, upload.py:: remove KiB/MiB/etc constants, and other dead code
warner@lothar.com**20110227011051
 Ignore-this: dc83c5794c2afc4f81e592f689c0dc2d
] 
[test: increase timeout on a network test because Francois's ARM machine hit that timeout
zooko@zooko.com**20110317165909
 Ignore-this: 380c345cdcbd196268ca5b65664ac85b
 I'm skeptical that the test was proceeding correctly but ran out of time. It seems more likely that it had gotten hung. But if we raise the timeout to an even more extravagant number then we can be even more certain that the test was never going to finish.
] 
[docs/configuration.rst: add a "Frontend Configuration" section
Brian Warner <warner@lothar.com>**20110222014323
 Ignore-this: 657018aa501fe4f0efef9851628444ca
 
 this points to docs/frontends/*.rst, which were previously underlinked
] 
[web/filenode.py: avoid calling req.finish() on closed HTTP connections. Closes #1366
"Brian Warner <warner@lothar.com>"**20110221061544
 Ignore-this: 799d4de19933f2309b3c0c19a63bb888
] 
[Add unit tests for cross_check_pkg_resources_versus_import, and a regression test for ref #1355. This requires a little refactoring to make it testable.
david-sarah@jacaranda.org**20110221015817
 Ignore-this: 51d181698f8c20d3aca58b057e9c475a
] 
[allmydata/__init__.py: .name was used in place of the correct .__name__ when printing an exception. Also, robustify string formatting by using %r instead of %s in some places. fixes #1355.
david-sarah@jacaranda.org**20110221020125
 Ignore-this: b0744ed58f161bf188e037bad077fc48
] 
[Refactor StorageFarmBroker handling of servers
Brian Warner <warner@lothar.com>**20110221015804
 Ignore-this: 842144ed92f5717699b8f580eab32a51
 
 Pass around IServer instance instead of (peerid, rref) tuple. Replace
 "descriptor" with "server". Other replacements:
 
  get_all_servers -> get_connected_servers/get_known_servers
  get_servers_for_index -> get_servers_for_psi (now returns IServers)
 
 This change still needs to be pushed further down: lots of code is now
 getting the IServer and then distributing (peerid, rref) internally.
 Instead, it ought to distribute the IServer internally and delay
 extracting a serverid or rref until the last moment.
 
 no_network.py was updated to retain parallelism.
] 
[TAG allmydata-tahoe-1.8.2
warner@lothar.com**20110131020101] 
Patch bundle hash:
289e14cd175598c285b9c7c59b476ea38b41d91f