wording

diff --git a/doc/git-annex-required.mdwn b/doc/git-annex-required.mdwn
index bf9535cc437045a71385f6e6977cc3c44ae4fe96..9cb079a322af57b1853fc6cc2c02d22fbd9eba0f 100644 (file)
--- a/doc/git-annex-required.mdwn
+++ b/doc/git-annex-required.mdwn
@@ -9,7 +9,7 @@ git annex required `repository [expression]`
 # DESCRIPTION
 
 When run with an expression, configures the content that is required
-to be held in the archive.
+to be held in the repository.
 
 For example:
 

diff --git a/doc/git-annex-wanted.mdwn b/doc/git-annex-wanted.mdwn
index e8200e025e9a2555e4e0d329e2f51047ffce0ae2..f78aef0fc06ab60657a97bd66d590c068544a4a2 100644 (file)
--- a/doc/git-annex-wanted.mdwn
+++ b/doc/git-annex-wanted.mdwn
@@ -9,7 +9,7 @@ git annex wanted `repository [expression]`
 # DESCRIPTION
 
 When run with an expression, configures the content that is preferred
-to be held in the archive. See [[git-annex-preferred-content]](1)
+to be held in the repository. See [[git-annex-preferred-content]](1)
 
 For example:
 

diff --git a/doc/todo/git-annex_proxies.mdwn b/doc/todo/git-annex_proxies.mdwn
index a1769275973c3b45270cbd13263172e552144bd4..37a04880684c8cddc77b151e6db557e89027f10a 100644 (file)
--- a/doc/todo/git-annex_proxies.mdwn
+++ b/doc/todo/git-annex_proxies.mdwn
@@ -61,7 +61,8 @@ For June's work on [[design/passthrough_proxy]], implementation plan:
   other git-annex processes are currently using.
 
 * Implement upload with fanout and reporting back additional UUIDs over P2P
-  protocol. (started, but incomplete)
+  protocol. (done, but need to check for fencepost errors on resume of
+  incomplete upload with remotes at different points)
 
 * On upload to cluster, send to nodes where it's preferred content, and not
   to other nodes.