From: Daira Hopwood Date: Tue, 19 May 2015 22:05:17 +0000 (+0100) Subject: remote-to-local-sync.rst: fixes to glossary. X-Git-Url: https://git.rkrishnan.org/simplejson/components/%3C?a=commitdiff_plain;h=d91bf392fdaa372ad0f22b37fee38b55ee48fea2;p=tahoe-lafs%2Ftahoe-lafs.git remote-to-local-sync.rst: fixes to glossary. Signed-off-by: Daira Hopwood --- diff --git a/docs/proposed/magic-folder/remote-to-local-sync.rst b/docs/proposed/magic-folder/remote-to-local-sync.rst index ff852177..987f9734 100644 --- a/docs/proposed/magic-folder/remote-to-local-sync.rst +++ b/docs/proposed/magic-folder/remote-to-local-sync.rst @@ -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*