webapp and assistant glacier support

1 files changed, 15 insertions, 8 deletions

diff --git a/doc/preferred_content.mdwn b/doc/preferred_content.mdwn
index ac2cd1ecf..499cf628e 100644
--- a/doc/preferred_content.mdwn
+++ b/doc/preferred_content.mdwn
@@ -92,7 +92,7 @@ to "standard", and put it in one of these groups:
 
 All content is preferred, unless it's in a "archive" directory.
 
-`exclude=*/archive/*`
+`exclude=*/archive/* and exclude=archive/*`
 
 ### transfer
 
@@ -104,7 +104,7 @@ USB drive used in a sneakernet.
 The preferred content expression for these causes them to get and retain
 data until all clients have a copy.
 
-`not (inallgroup=client and copies=client:2) and exclude=*/archive/*`
+`not (inallgroup=client and copies=client:2) and exclude=*/archive/* and exclude=archive/*`
 
 The "copies=client:2" part of the above handles the case where
 there is only one client repository. It makes a transfer repository
@@ -112,17 +112,24 @@ speculatively  prefer content in this case, even though it as of yet
 has nowhere to transfer it to. Presumably, another client repository
 will be added later.
 
-### archive
+### backup
+
+All content is preferred.
+
+### small archive
+
+Only prefers content that's located in an "archive" directory, and
+only if it's not already been archived somewhere else.
+
+`(include=*/archive/* or include=archive/*) and not (copies=archive:1 or copies=smallarchive:1)`
+
+### full archive
 
 All content is preferred, unless it's already been archived somewhere else.
 
-`not copies=archive:1`
+`not (copies=archive:1 or copies=smallarchive:1)`
 
 Note that if you want to archive multiple copies (not a bad idea!),
 you should instead configure all your archive repositories with a
 version of the above preferred content expression with a larger
 number of copies.
-
-### backup
-
-All content is preferred.