summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2012-07-05 11:05:24 -0600
committerGravatar Joey Hess <joey@kitenet.net>2012-07-05 11:05:24 -0600
commite8df726d07657c82c012a02697282c2bc642e742 (patch)
tree43412e90af9a4eab198a00239a8f6fe9169edd06
parent6af319d8cdefb4589d9cd354dbc49006bb7d68ea (diff)
parentbd2c4c982d79d72c67da838c71c869194d26ea4d (diff)
Merge branch 'master' into assistant
-rw-r--r--doc/design/assistant/syncing.mdwn2
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/design/assistant/syncing.mdwn b/doc/design/assistant/syncing.mdwn
index 61434088d..76e2e1832 100644
--- a/doc/design/assistant/syncing.mdwn
+++ b/doc/design/assistant/syncing.mdwn
@@ -18,7 +18,7 @@ all the other git clones, at both the git level and the key/value level.
* enqueue Transfers (Uploads) as new files are added to the annex by
Watcher. **done**
* enqueue Tranferrs (Downloads) as new dangling symlinks are noticed by
- Watcher.
+ Watcher. **done**
* Write basic Transfer handling thread. Multiple such threads need to be
able to be run at once. Each will need its own independant copy of the
Annex state monad.