From 6a3973c637eacac034d54699c46473f9a34fe7e2 Mon Sep 17 00:00:00 2001
From: Daira Hopwood <daira@jacaranda.org>
Date: Tue, 19 May 2015 23:05:17 +0100
Subject: [PATCH] remote-to-local-sync.rst: fixes to glossary.

Signed-off-by: Daira Hopwood <daira@jacaranda.org>
---
 docs/proposed/magic-folder/remote-to-local-sync.rst | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/docs/proposed/magic-folder/remote-to-local-sync.rst b/docs/proposed/magic-folder/remote-to-local-sync.rst
index 096eb13a..0272b611 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*
-- 
2.45.2