docs: edit running.html, change "http://allmydata.org" to "http://tahoe-lafs.org...

diff --git a/CREDITS b/CREDITS
index bab3ea125ee83449a9a9735e8467f9607857d408..d45545052679dd7b997722db00b48f0b5a1a3afa 100644 (file)
--- a/CREDITS
+++ b/CREDITS
@@ -126,3 +126,6 @@ D: fixed bug in WUI with Python 2.5 and a system clock set far in the past
 N: Ravi Pinjala
 E: ravi@p-static.net
 D: converted docs from .txt to .rst
+
+N: Josh Wilcox
+D: docs

diff --git a/Makefile b/Makefile
index 52f45b3e99fe96d5e2e2fc376b58cce9aa7f2b49..11ca942f03723c3c2b933957d1945234745a1d1d 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -249,7 +249,7 @@ find-trailing-spaces:
 # support/lib/ directory is gone.
 
 fetch-and-unpack-deps:
-       test -f tahoe-deps.tar.gz || wget http://allmydata.org/source/tahoe/deps/tahoe-deps.tar.gz
+       test -f tahoe-deps.tar.gz || wget http://tahoe-lafs.org/source/tahoe/deps/tahoe-deps.tar.gz
        rm -rf tahoe-deps
        tar xzf tahoe-deps.tar.gz
 

diff --git a/NEWS b/NEWS
index 6d4e64a0e5e23b85bbcc0b034956293d766918da..144a5fe9c71ddb7369eb7df503a621c700931a07 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -427,9 +427,9 @@ The documentation for installing on Windows (docs/install.html) has been
 improved. (#773)
 
 For other changes not mentioned here, see
-<http://allmydata.org/trac/tahoe/query?milestone=1.6.0&keywords=!~news-done>.
+<http://tahoe-lafs.org/trac/tahoe/query?milestone=1.6.0&keywords=!~news-done>.
 To include the tickets mentioned above, go to
-<http://allmydata.org/trac/tahoe/query?milestone=1.6.0>.
+<http://tahoe-lafs.org/trac/tahoe/query?milestone=1.6.0>.
 
 
 * Release 1.5.0 (2009-08-01)
@@ -804,7 +804,7 @@ The cli might not correctly handle arguments which contain non-ascii
 characters in Tahoe v1.3 (although depending on your platform it
 might, especially if your platform can be configured to pass such
 characters on the command-line in utf-8 encoding).  See
-http://allmydata.org/trac/tahoe/ticket/565 for details.
+http://tahoe-lafs.org/trac/tahoe/ticket/565 for details.
 
 ** Web changes
 
@@ -906,9 +906,9 @@ libraries that Tahoe requires (foolscap, twisted, zfec, etc), so using the
 process. This can be useful if you want to build Tahoe while on an airplane,
 a desert island, or other bandwidth-limited environments.
 
-Similarly, allmydata.org now hosts a "tahoe-deps" tarball which contains the
+Similarly, tahoe-lafs.org now hosts a "tahoe-deps" tarball which contains the
 latest versions of all these dependencies. This tarball, located at
-http://allmydata.org/source/tahoe/deps/tahoe-deps.tar.gz, can be unpacked in
+http://tahoe-lafs.org/source/tahoe/deps/tahoe-deps.tar.gz, can be unpacked in
 the tahoe source tree (or in its parent directory), and the build process
 should satisfy its downloading needs from it instead of reaching out to PyPI.
 This can be useful if you want to build Tahoe from a darcs checkout while on
@@ -1008,7 +1008,7 @@ of existing mutable shares).
 
 Clients now declare which versions of the protocols they support. This is
 part of a new backwards-compatibility system:
-http://allmydata.org/trac/tahoe/wiki/Versioning .
+http://tahoe-lafs.org/trac/tahoe/wiki/Versioning .
 
 The version strings for human inspection (as displayed on the Welcome web
 page, and included in logs) now includes a platform identifer (frequently

diff --git a/README.txt b/README.txt
index 24220f6c91d0a52f6c4dc89ec58e71b313ad2a3e..560161935ac4cca63ed7e6f596dc68a902fcbec3 100644 (file)
--- a/README.txt
+++ b/README.txt
@@ -22,7 +22,7 @@ the Transitive Grace Period Public Licence, version 1.0.
 
 See `TGPPL.PDF`_ for why the TGPPL exists, graphically illustrated on three slides.
 
-.. _quickstart.html: http://allmydata.org/source/tahoe-lafs/trunk/docs/quickstart.html
+.. _quickstart.html: http://tahoe-lafs.org/source/tahoe-lafs/trunk/docs/quickstart.html
 .. _COPYING.GPL: http://tahoe-lafs.org/trac/dupfilefind/browser/COPYING.GPL
 .. _COPYING.TGPPL.html: http://tahoe-lafs.org/source/dupfilefind/trunk/COPYING.TGPPL.html
 .. _TGPPL.PDF: http://tahoe-lafs.org/~zooko/tgppl.pdf

diff --git a/docs/running.html b/docs/running.html
index c20a2b7b31cd33d26d3de251d9619303542787d2..81c6280d0df4c79ee8309c0089daa482ef906bce 100644 (file)
--- a/docs/running.html
+++ b/docs/running.html
@@ -11,25 +11,35 @@
   <body>
     <h1>How To Run Tahoe-LAFS</h1>
 
-    <p>This is how to run a Tahoe-LAFS client or a complete Tahoe-LAFS grid. First you
-    have to install the Tahoe-LAFS software, as documented in <a
-    href="install.html">install.html</a>.</p>
+    <p>This is how to run a Tahoe-LAFS client to connect to an
+    existing grid, or how to set up a complete Tahoe-LAFS grid. First
+    you have to install the Tahoe-LAFS software, as documented
+    in <a href="install.html">install.html</a>.</p>
 
     <p>The <code>tahoe</code> program in the <code>bin</code> directory is
     used to create, start, and stop nodes. Each node lives in a separate base
     directory, in which there is a configuration file named <code>tahoe.cfg</code>. Nodes
     read and write files within this base directory.</p>
 
-    <p>A grid consists of a set of <em>storage nodes</em> and <em>client nodes</em>
-    running the Tahoe-LAFS code. There is also an <em>introducer node</em> that
-    is responsible for getting the other nodes talking to each other.</p>
+    <p>A grid consists of a set of <em>storage nodes</em>
+    and <em>client nodes</em> (also known as <em>gateway nodes</em>)
+    running the Tahoe-LAFS code. There is also an <em>introducer
+    node</em> that is responsible for getting the other nodes talking
+    to each other. Which grid of storage servers your client will
+    connect to is determined solely by the introducer—if you configure
+    your node to connect to a certain introducer then your node will
+    only use those storage servers provided by that introducer. If you
+    configure your node to connect to a new introducer of your own
+    creation (see below), then your node will not connect to any
+    storage servers until you've created some storage servers and told them
+    to register themselves with that introducer.</p>
 
     <p>If you're getting started we recommend you try connecting to
     the <a href="http://tahoe-lafs.org/trac/tahoe-lafs/wiki/TestGrid">the
-    public test grid</a> as you only need to create a client node.
-    When you want to create your own grid you'll need to create the
-    introducer and several initial storage nodes (see the note about
-    small grids below).</p>
+    public test grid</a>—you will need to create only a gateway node
+    to do that.  When you want to create your own grid you'll need to
+    create the introducer and several initial storage nodes (see the
+    note about small grids below).</p>
 
     <p>If the Tahoe-LAFS <code>bin</code> directory is not on your PATH, then
     in all the command lines below, specify the full path to <code>bin/tahoe</code>.</p>
@@ -116,11 +126,11 @@
     <h3>The SFTP and FTP frontends</h3>
 
     <p>You can access your Tahoe-LAFS grid via any <a href="http://en.wikipedia.org/wiki/SSH_file_transfer_protocol">SFTP</a> or
-    <a href="http://en.wikipedia.org/wiki/File_Transfer_Protocol">FTP</a> client. 
+    <a href="http://en.wikipedia.org/wiki/File_Transfer_Protocol">FTP</a> client.
     See <a href="frontends/FTP-and-SFTP.rst">FTP-and-SFTP.rst</a> for how to set this up.
     On most Unix platforms, you can also use SFTP to plug Tahoe-LAFS into your computer's
     local filesystem via <code>sshfs</code>.
-    
+
     <p>The <a href="http://tahoe-lafs.org/trac/tahoe-lafs/wiki/SftpFrontend">SftpFrontend</a> page
     on the wiki has more information about using SFTP with Tahoe-LAFS.</p>
 

diff --git a/setup.py b/setup.py
index cd20d9d90b5e52aa22e88ce597aa1a06cd5af44b..eaaf67a839ae33b27d2f40facd54476908d8bcb3 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -3,7 +3,7 @@
 
 # Tahoe-LAFS -- secure, distributed storage grid
 #
-# Copyright © 2008-2010 Allmydata, Inc.
+# Copyright © 2008-2011 Allmydata, Inc.
 #
 # This file is part of Tahoe-LAFS.
 #