]> git.rkrishnan.org Git - tahoe-lafs/tahoe-lafs.git/commitdiff
remote-to-local-sync.rst: fixes to glossary.
authorDaira Hopwood <daira@jacaranda.org>
Tue, 19 May 2015 22:05:17 +0000 (23:05 +0100)
committerDaira Hopwood <daira@jacaranda.org>
Tue, 26 May 2015 18:23:21 +0000 (19:23 +0100)
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
docs/proposed/magic-folder/remote-to-local-sync.rst

index ff852177b0612c136239c44595e260c6adcaadcc..987f9734380a9a02a3e284efbc33b51adf99fd90 100644 (file)
@@ -27,12 +27,14 @@ design.
 
 *Glossary*
 
-Folder
+Object: a file or directory
 DMD: distributed mutable directory
+Folder: an abstract directory that is synchronized between clients.
+  (A folder is not the same as the directory corresponding to it on
+  any particular client, nor is it the same as a DMD.)
 Descendant: a direct or indirect child in a directory or folder tree
-Subpath
-Subfolder
-Object: a file or directory
+Subfolder: a folder that is a descendant of a magic folder
+Subpath: the path from a magic folder to one of its descendants
 
 
 *Detecting remote changes*