From c1ec785b483194b1a1e18cf9007e4be65e2f862d Mon Sep 17 00:00:00 2001 From: Zooko O'Whielacronx Date: Fri, 28 Jan 2011 07:07:00 -0800 Subject: [PATCH] docs: edit running.html, change "http://allmydata.org" to "http://tahoe-lafs.org" in NEWS and README.txt, add Josh Wilcox to CREDITS for his contribution of doc patches --- CREDITS | 3 +++ Makefile | 2 +- NEWS | 12 ++++++------ README.txt | 2 +- docs/running.html | 34 ++++++++++++++++++++++------------ setup.py | 2 +- 6 files changed, 34 insertions(+), 21 deletions(-) diff --git a/CREDITS b/CREDITS index bab3ea12..d4554505 100644 --- 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 52f45b3e..11ca942f 100644 --- 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 6d4e64a0..144a5fe9 100644 --- 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 -. +. To include the tickets mentioned above, go to -. +. * 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 24220f6c..56016193 100644 --- 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 c20a2b7b..81c6280d 100644 --- a/docs/running.html +++ b/docs/running.html @@ -11,25 +11,35 @@

How To Run Tahoe-LAFS

-

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 install.html.

+

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 install.html.

The tahoe program in the bin 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 tahoe.cfg. Nodes read and write files within this base directory.

-

A grid consists of a set of storage nodes and client nodes - running the Tahoe-LAFS code. There is also an introducer node that - is responsible for getting the other nodes talking to each other.

+

A grid consists of a set of storage nodes + and client nodes (also known as gateway nodes) + running the Tahoe-LAFS code. There is also an introducer + node 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.

If you're getting started we recommend you try connecting to the the - public test grid 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).

+ public test grid—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).

If the Tahoe-LAFS bin directory is not on your PATH, then in all the command lines below, specify the full path to bin/tahoe.

@@ -116,11 +126,11 @@

The SFTP and FTP frontends

You can access your Tahoe-LAFS grid via any SFTP or - FTP client. + FTP client. See FTP-and-SFTP.rst 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 sshfs. - +

The SftpFrontend page on the wiki has more information about using SFTP with Tahoe-LAFS.

diff --git a/setup.py b/setup.py index cd20d9d9..eaaf67a8 100644 --- 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. # -- 2.37.2