From: Daira Hopwood <daira@jacaranda.org>
Date: Thu, 28 May 2015 23:18:51 +0000 (+0100)
Subject: WIP.
X-Git-Url: https://git.rkrishnan.org/simplejson/%22news.html/something?a=commitdiff_plain;h=bb2480063ea02fc2e76eda4d13590e74089dd8b3;p=tahoe-lafs%2Ftahoe-lafs.git

WIP.

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 c531ea35..5df9ed2a 100644
--- a/docs/proposed/magic-folder/remote-to-local-sync.rst
+++ b/docs/proposed/magic-folder/remote-to-local-sync.rst
@@ -346,8 +346,8 @@ this procedure for an overwrite in response to a remote change:
 1. Write a temporary file, say ``.foo.tmp``.
 2. Use the procedure described in the `Fire Dragons_` section
    to obtain an initial classification as an overwrite or a
-   conflict. (This takes as input the *download metadata* from
-   the directory entry of the changed ``foo``.)
+   conflict. (This takes as input the ``last_downloaded_uri``
+   field from the directory entry of the changed ``foo``.)
 3. Set the ``mtime`` of the replacement file to be *T* seconds
    before the current local time.
 4. Perform a ''file replacement'' operation (explained below)