summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2010-12-29 17:01:56 -0400
committerGravatar Joey Hess <joey@kitenet.net>2010-12-29 17:01:56 -0400
commitde2f6137d3f38f822b0bfbf534e8f785459ea3cf (patch)
tree2014444a5e3dc001ed4000bb59794b317ba33f2d
parent25ffa04c5a116dc6ff4266dd738a93f03e7e6017 (diff)
wording
-rw-r--r--doc/copies.mdwn2
-rw-r--r--doc/trust.mdwn2
2 files changed, 2 insertions, 2 deletions
diff --git a/doc/copies.mdwn b/doc/copies.mdwn
index 5b3cbf515..98f315081 100644
--- a/doc/copies.mdwn
+++ b/doc/copies.mdwn
@@ -12,7 +12,7 @@ setting in `.gitattributes` files.
`git annex drop` attempts to check with other git remotes, to check that N
copies of the file exist. If enough repositories cannot be verified to have
it, it will retain the file content to avoid data loss. Note that
-[[trusted_remotes|trust]] are not explicitly checked.
+[[trusted_repositories|trust]] are not explicitly checked.
For example, consider three repositories: Server, Laptop, and USB. Both Server
and USB have a copy of a file, and N=1. If on Laptop, you `git annex get
diff --git a/doc/trust.mdwn b/doc/trust.mdwn
index b04a112ec..6ce43f30e 100644
--- a/doc/trust.mdwn
+++ b/doc/trust.mdwn
@@ -1,6 +1,6 @@
Normally, git-annex does not fully trust its stored [[location_tracking]]
information. When removing content, it will directly check
-that other repositories have [[copies]].
+that other repositories have enough [[copies]].
Generally that explicit checking is a good idea. Consider that the current
[[location_tracking]] information for a remote may not yet have propigated