From: Daira Hopwood <daira@jacaranda.org>
Date: Mon, 25 May 2015 22:35:20 +0000 (+0100)
Subject: Add deletion to Aether Dragons section.
X-Git-Url: https://git.rkrishnan.org/simplejson/components/install.html?a=commitdiff_plain;h=55cf5b00f7d33e23e05b99466ae0a998dfa5296a;p=tahoe-lafs%2Ftahoe-lafs.git

Add deletion to Aether Dragons section.

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

diff --git a/docs/proposed/magic-folder/remote-to-local-sync.rst b/docs/proposed/magic-folder/remote-to-local-sync.rst
index 7340bd8c..c8650ba6 100644
--- a/docs/proposed/magic-folder/remote-to-local-sync.rst
+++ b/docs/proposed/magic-folder/remote-to-local-sync.rst
@@ -698,8 +698,16 @@ conflict loop
 that alice has seen it)
 
 
-Aether Dragons: Handling renames
-''''''''''''''''''''''''''''''''
+Aether Dragons: Handling deletion and renames
+'''''''''''''''''''''''''''''''''''''''''''''
+
+*Deletion*
+
+deletion of a file is like overwriting it with a "deleted" marker
+
+[TODO: deletion of a directory?]
+
+*Renames*
 
 suppose that a subfolder of the Magic Folder is renamed on one of the
 Magic Folder clients. it is not clear how to handle this at all: