From: Daira Hopwood <daira@jacaranda.org>
Date: Mon, 28 Dec 2015 19:28:26 +0000 (+0000)
Subject: Documentation for Magic Folder.
X-Git-Url: https://git.rkrishnan.org/components/architecture.txt?a=commitdiff_plain;h=8315d9e44c093f24c8f3f7d155186a853416a5b1;p=tahoe-lafs%2Ftahoe-lafs.git

Documentation for Magic Folder.

Signed-off-by: Daira Hopwood <daira@jacaranda.org>
---

diff --git a/docs/configuration.rst b/docs/configuration.rst
index 6c38d136..e632075e 100644
--- a/docs/configuration.rst
+++ b/docs/configuration.rst
@@ -68,7 +68,7 @@ Client/server nodes provide one or more of the following services:
 * web-API service
 * SFTP service
 * FTP service
-* drop-upload service
+* Magic Folder service
 * helper service
 * storage service.
 
@@ -453,16 +453,16 @@ SFTP, FTP
     instructions on configuring these services, and the ``[sftpd]`` and
     ``[ftpd]`` sections of ``tahoe.cfg``.
 
-Drop-Upload
+Magic Folder
 
     A node running on Linux or Windows can be configured to automatically
     upload files that are created or changed in a specified local directory.
-    See `drop-upload.rst`_ for details.
+    See `magic-folder.rst`_ for details.
 
 .. _download-status.rst: frontends/download-status.rst
 .. _CLI.rst: frontends/CLI.rst
 .. _FTP-and-SFTP.rst: frontends/FTP-and-SFTP.rst
-.. _drop-upload.rst: frontends/drop-upload.rst
+.. _magic-folder.rst: frontends/magic-folder.rst
 
 
 Storage Server Configuration
diff --git a/docs/magic-folder-howto.rst b/docs/magic-folder-howto.rst
index 8a99409d..0992ce22 100644
--- a/docs/magic-folder-howto.rst
+++ b/docs/magic-folder-howto.rst
@@ -37,7 +37,7 @@ Linux
 Install ``git`` from your distribution's package manager.
 Then run these commands::
 
-  git clone -b 2438.magic-folder-stable.5 https://github.com/tahoe-lafs/tahoe-lafs.git
+  git clone -b 2438.magic-folder-stable.8 https://github.com/tahoe-lafs/tahoe-lafs.git
   cd tahoe-lafs
   python setup.py test
 
@@ -223,7 +223,7 @@ other directory will be renamed to a filename ending in ``.backup``.
 Deleting a directory will have no effect.
 
 For other known issues and limitations, see
-https://github.com/tahoe-lafs/tahoe-lafs/blob/2438.magic-folder-stable.5/docs/frontends/magic-folder.rst#known-issues-and-limitations
+https://github.com/tahoe-lafs/tahoe-lafs/blob/2438.magic-folder-stable.8/docs/frontends/magic-folder.rst#known-issues-and-limitations
 
 As mentioned earlier, it is also possible to run the nodes on
 different machines, to synchronize between three or more clients,