From: Zooko O'Whielacronx Date: Tue, 9 Aug 2011 13:26:01 +0000 (-0700) Subject: doc: eliminate the phrase "rootcap" from doc/frontends/FTP-and-SFTP.rst X-Git-Tag: trac-5200~9 X-Git-Url: https://git.rkrishnan.org/?a=commitdiff_plain;h=43ba172f65aaa0386c58ff1554bd0d8c7427dc1c;p=tahoe-lafs%2Ftahoe-lafs.git doc: eliminate the phrase "rootcap" from doc/frontends/FTP-and-SFTP.rst Two different people have asked me for help, saying they couldn't figure out what a "rootcap" is. Hopefully just calling it a "cap" will make it easier for them to find out from the other docs what it is. --- diff --git a/docs/frontends/FTP-and-SFTP.rst b/docs/frontends/FTP-and-SFTP.rst index c2cbb0be..d0adefa0 100644 --- a/docs/frontends/FTP-and-SFTP.rst +++ b/docs/frontends/FTP-and-SFTP.rst @@ -42,16 +42,16 @@ sit at the same level as the web-API interface. Since Tahoe-LAFS does not use user accounts or passwords, the FTP/SFTP servers must be configured with a way to first authenticate a user (confirm that a prospective client has a legitimate claim to whatever authorities we -might grant a particular user), and second to decide what root directory cap +might grant a particular user), and second to decide what directory cap should be granted to the authenticated username. A username and password is used for this purpose. (The SFTP protocol is also capable of using client RSA or DSA public keys, but this is not currently implemented.) -Tahoe-LAFS provides two mechanisms to perform this user-to-rootcap -mapping. The first is a simple flat file with one account per line. The -second is an HTTP-based login mechanism, backed by simple PHP script and a -database. The latter form is used by allmydata.com to provide secure access -to customer rootcaps. +Tahoe-LAFS provides two mechanisms to perform this user-to-cap mapping. The +first is a simple flat file with one account per line. The second is an +HTTP-based login mechanism, backed by simple PHP script and a database. The +latter form is used by allmydata.com to provide secure access to customer +caps. Creating an Account File ======================== @@ -61,7 +61,7 @@ BASEDIR/private/ftp.accounts) in which each non-comment/non-blank line is a space-separated line of (USERNAME, PASSWORD, ROOTCAP), like so:: % cat BASEDIR/private/ftp.accounts - # This is a password line, (username, password, rootcap) + # This is a password line, (username, password, cap) alice password URI:DIR2:ioej8xmzrwilg772gzj4fhdg7a:wtiizszzz2rgmczv4wl6bqvbv33ag4kvbr6prz3u6w3geixa6m6a bob sekrit URI:DIR2:6bdmeitystckbl9yqlw7g56f4e:serp5ioqxnh34mlbmzwvkp3odehsyrr7eytt5f64we3k9hhcrcja