From 06298408ff0f41e4b6c2e74ba49613accc73afee Mon Sep 17 00:00:00 2001
From: Daira Hopwood <daira@jacaranda.org>
Date: Wed, 4 Nov 2015 15:29:01 +0000
Subject: [PATCH] Clearer names (and fix a formatting issue).

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

diff --git a/docs/proposed/magic-folder/remote-to-local-sync.rst b/docs/proposed/magic-folder/remote-to-local-sync.rst
index b41de7bf..1bb848b5 100644
--- a/docs/proposed/magic-folder/remote-to-local-sync.rst
+++ b/docs/proposed/magic-folder/remote-to-local-sync.rst
@@ -775,7 +775,7 @@ Now we are ready to describe the algorithm for determining whether a
 download for the file ``foo`` is an overwrite or a conflict (refining
 step 2 of the procedure from the `Earth Dragons`_ section).
 
-Let ``last_downloaded_uri`` be the field of that name obtained from
+Let ``dmd_last_downloaded_uri`` be the field of that name obtained from
 the directory entry metadata for ``foo`` in Bob's DMD (this field
 may be absent). Then the algorithm is:
 
@@ -791,15 +791,15 @@ may be absent). Then the algorithm is:
     table when the file was last uploaded);
   * the ``last_uploaded_uri`` field of the ``local_files`` table
     for this file, which is the URI under which the file was last
-    uploaded.
+    uploaded. Call this ``db_entry.last_uploaded_uri``.
 
 * 2c. If any of the following are true, then classify as a conflict:
 
-  * i. there are pending notifications of changes to ``foo``;
-  * ii. the last-uploaded statinfo is either absent (i.e. there is
+  * i\. there are pending notifications of changes to ``foo``;
+  * ii\. the last-uploaded statinfo is either absent (i.e. there is
     no entry in the database for this path), or different from the
     current statinfo;
-  * iii. either ``last_downloaded_uri`` or ``last_uploaded_uri``
+  * iii\. either ``dmd_last_downloaded_uri`` or ``db_entry.last_uploaded_uri``
     (or both) are absent, or they are different.
 
   Otherwise, classify as an overwrite.
-- 
2.45.2