adjust standard preferred content to work better with git annex sync --all --content

backup: Use new "anything" terminal. This means that content that
is not unused, but has no associated file will be wanted by backup repos.

unwanted: "not anything" will result in any and all content moving
off of these repos.

incremental backup: Remove the "(include=* or unused)",
so it matches content that has no associated files
but is not unused.

client: Add a include=* to the expression. This limits it to matching
only files in the work tree. Without this change, sync --all --content
would match a key against the expression, and since it matches
exclude=archive/*, the client repo would have wanted the file content.
The "and not unused" would have kept unused objects out, but not
objects that were not known to be unused, or objects that another branch
referred to. In practice, everything would have flooded into client repos
without this change.

1 files changed, 6 insertions, 6 deletions

diff --git a/doc/preferred_content/standard_groups.mdwn b/doc/preferred_content/standard_groups.mdwn
index 80f512d87..8b0a5db77 100644
--- a/doc/preferred_content/standard_groups.mdwn
+++ b/doc/preferred_content/standard_groups.mdwn
@@ -19,10 +19,10 @@ The following standard groups are available:
 
 ### client
 
-All content is wanted, unless it's for a file in a "archive" directory,
-which has reached an archive repository, or is unused.
+All content in the current working tree is wanted, unless it's for a
+file in a "archive" directory, which has reached an archive repository.
 
-`(((exclude=*/archive/* and exclude=archive/*) or (not (copies=archive:1 or copies=smallarchive:1))) and not unused) or approxlackingcopies=1`
+`(include=* and ((exclude=*/archive/* and exclude=archive/*) or (not (copies=archive:1 or copies=smallarchive:1)))) or approxlackingcopies=1`
 
 ### transfer
 
@@ -49,14 +49,14 @@ will be added later.
 
 All content is wanted. Even content of old/deleted files.
 
-`include=* or unused`
+`anything`
 
 ### incremental backup
 
 Only wants content that's not already backed up to another backup
 or incremental backup repository.
 
-`((include=* or unused) and (not copies=backup:1) and (not copies=incrementalbackup:1)) or approxlackingcopies=1`
+`((not copies=backup:1) and (not copies=incrementalbackup:1)) or approxlackingcopies=1`
 
 ### small archive
 
@@ -123,4 +123,4 @@ Use for repositories that you don't want to exist. This will result
 in any content on them being moved away to other repositories. (Works
 best when the unwanted repository is also marked as untrusted or dead.)
 
-`exclude=*`
+`not anything`