summaryrefslogtreecommitdiff
path: root/doc/design/assistant/syncing.mdwn
diff options
context:
space:
mode:
Diffstat (limited to 'doc/design/assistant/syncing.mdwn')
-rw-r--r--doc/design/assistant/syncing.mdwn5
1 files changed, 2 insertions, 3 deletions
diff --git a/doc/design/assistant/syncing.mdwn b/doc/design/assistant/syncing.mdwn
index b9c6016b2..7a445b353 100644
--- a/doc/design/assistant/syncing.mdwn
+++ b/doc/design/assistant/syncing.mdwn
@@ -36,10 +36,9 @@ all the other git clones, at both the git level and the key/value level.
that already has the content) and loop, until the git-annex branches catch
up and break the cycle.
- Possible solution: C could record a download intent. (Similar to a failed
+ Possible solution: C could record a deferred download. (Similar to a failed
download, but with an unknown source.) When C next receives a git-annex
- branch push, it could try to requeue downloads that it has such intents
- registered for. **done**
+ branch push, it could try to queue deferred downloads. **done**
Note that this solution won't cover use cases the other does. For example,
connect a USB drive A; B syncs files from it, and then should pass them to C.