summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2014-03-29 14:39:10 -0400
committerGravatar Joey Hess <joey@kitenet.net>2014-03-29 14:39:10 -0400
commitbce30628d5e6df5b64c482bc5fe161576efaaa79 (patch)
treea62a6f6f3e55170ca48cc1a9e90808b5f0311ed7
parent1d352f4c12136e6f6dd89fbfd68bc4f9ca9a5467 (diff)
update for required content
-rw-r--r--doc/copies.mdwn3
-rw-r--r--doc/internals.mdwn7
-rw-r--r--doc/preferred_content.mdwn2
3 files changed, 11 insertions, 1 deletions
diff --git a/doc/copies.mdwn b/doc/copies.mdwn
index 205d2d5b1..3e0ebc6c6 100644
--- a/doc/copies.mdwn
+++ b/doc/copies.mdwn
@@ -30,3 +30,6 @@ refuse to do so.
With N=2, in order to drop the file content from Laptop, it would need access
to both USB and Server.
+
+For more complicated requirements about which repositories contain which
+content, see [[required_content]].
diff --git a/doc/internals.mdwn b/doc/internals.mdwn
index 0c5124d0b..bf0fa668c 100644
--- a/doc/internals.mdwn
+++ b/doc/internals.mdwn
@@ -150,6 +150,13 @@ Files matching the expression are preferred to be retained in the
repository, while files not matching it are preferred to be stored
somewhere else.
+## `required-content.log`
+
+Used to indicate which repositories are required to contain which file
+contents.
+
+File format is identical to preferred-content.log.
+
## `group-preferred-content.log`
Contains standard preferred content settings for groups. (Overriding or
diff --git a/doc/preferred_content.mdwn b/doc/preferred_content.mdwn
index af76a0e7b..9829fc687 100644
--- a/doc/preferred_content.mdwn
+++ b/doc/preferred_content.mdwn
@@ -1,7 +1,7 @@
git-annex tries to ensure that the configured number of [[copies]] of your
data always exist, and leaves it up to you to use commands like `git annex
get` and `git annex drop` to move the content to the repositories you want
-to contain it. But sometimes, it can be good to have more fine-grained
+to contain it. But often, it can be good to have more fine-grained
control over which content is wanted by which repositories. Configuring
this allows the git-annex assistant as well as
`git annex get --auto`, `git annex drop --auto`, `git annex sync --content`,