Merge pull request #236 from daira/2725.timezone-test.0

[tahoe-lafs/tahoe-lafs.git] / docs / about.rst

diff --git a/docs/about.rst b/docs/about.rst
index f11906eb8d74a4471b391e00a2f4bdd7ad25cff3..e6d5612d5e327056f3bad7b61b27ce5c6aba8f42 100644 (file)
--- a/docs/about.rst
+++ b/docs/about.rst
@@ -44,16 +44,13 @@ Here's how it works:
 
 A "storage grid" is made up of a number of storage servers.  A storage server
 has direct attached storage (typically one or more hard disks).  A "gateway"
-uses the storage servers and provides access to the filesystem over HTTP(S)
-or (S)FTP to tahoe clients.
-Note that you can find gateway nodes referred sometimes as client nodes. The
-Tahoe-LAFS architecture defines gateways as "nodes that provide access to
-files residing in storage nodes". You can see "clients" also referring to
-processes or programs connecting to a gateway node and performing operations
-on the grid (for exemple, the CLI binary).
-Gateways give access to files in the grid via protocols such as HTTP, FTP or
-SFTP. So, the gateways act as "clients" to other storage nodes at the same
-time that they are serving files to client programs (WebUI, (S)FTP clients).
+communicates with storage nodes, and uses them to provide access to the
+file store over protocols such as HTTP(S), SFTP or FTP.
+
+Note that you can find "client" used to refer to gateway nodes (which act as
+a client to storage servers), and also to processes or programs connecting to
+a gateway node and performing operations on the grid -- for example, a CLI
+command, Web browser, SFTP client, or FTP client.
 
 Users do not rely on storage servers to provide *confidentiality* nor
 *integrity* for their data -- instead all of the data is encrypted and
@@ -75,7 +72,7 @@ An alternate deployment mode is that the gateway runs on a remote machine and
 the user connects to it over HTTPS or SFTP.  This means that the operator of
 the gateway can view and modify the user's data (the user *relies on* the
 gateway for confidentiality and integrity), but the advantage is that the
-user can access the filesystem with a client that doesn't have the gateway
+user can access the file store with a client that doesn't have the gateway
 software installed, such as an Internet kiosk or cell phone.
 
 Access Control
@@ -115,22 +112,6 @@ To use Tahoe-LAFS, please see quickstart.rst_.
 License
 =======
 
-Copyright 2006-2012 The Tahoe-LAFS Software Foundation
-
-You may use this package under the GNU General Public License, version 2 or,
-at your option, any later version.  See the file COPYING.GPL_ for the terms
-of the GNU General Public License, version 2.
-
-You may use this package under the Transitive Grace Period Public Licence,
-version 1 or, at your option, any later version.  The Transitive Grace Period
-Public Licence has requirements similar to the GPL except that it allows you
-to wait for up to twelve months after you redistribute a derived work before
-releasing the source code of your derived work. See the file
-COPYING.TGPPL.rst_ for the terms of the Transitive Grace Period Public
-Licence, version 1.
-
-(You may choose to use this package under the terms of either licence, at
-your option.)
+Tahoe-LAFS is an open-source project; please see README.rst_ for details.
 
-.. _COPYING.GPL: ../COPYING.GPL
-.. _COPYING.TGPPL.rst: ../COPYING.TGPPL.rst
+.. _README.rst: ../README.rst