Documentation for Magic Folder.

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

diff --git a/docs/configuration.rst b/docs/configuration.rst
index 6c38d136cc138a711fbb13b25b8b708d5ac0bf52..e632075e7ebd75d1d46cc6c03a842763a306b77b 100644 (file)
--- 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
 * web-API service
 * SFTP service
 * FTP service

-* drop-upload service
+* Magic Folder service

 * helper service
 * storage 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``.
 
     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.
 
     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
 
 .. _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
 
 
 Storage Server Configuration

diff --git a/docs/magic-folder-howto.rst b/docs/magic-folder-howto.rst
index 8a99409d9c25b20170ec32ba69d339fc5398716b..0992ce22ca557bc48cae99e626d5841d80ddde14 100644 (file)
--- 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::
 
 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
 
   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
 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,
 
 As mentioned earlier, it is also possible to run the nodes on
 different machines, to synchronize between three or more clients,