From bb2480063ea02fc2e76eda4d13590e74089dd8b3 Mon Sep 17 00:00:00 2001
From: Daira Hopwood <daira@jacaranda.org>
Date: Fri, 29 May 2015 00:18:51 +0100
Subject: [PATCH] WIP.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
---
docs/proposed/magic-folder/remote-to-local-sync.rst | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
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)
--
2.45.2