manual and source repository groups

2 files changed, 28 insertions, 1 deletions

diff --git a/doc/assistant/release_notes.mdwn b/doc/assistant/release_notes.mdwn
index d53c7384c..3bf33f8ea 100644
--- a/doc/assistant/release_notes.mdwn
+++ b/doc/assistant/release_notes.mdwn
@@ -1,4 +1,8 @@
-## version 3.20130107 and 3.20130114
+## 3.20130122
+
+This is primarily a bugfix release.
+
+## version 3.20130107, 3.20130114
 
 These are bugfix releases.
 
diff --git a/doc/preferred_content.mdwn b/doc/preferred_content.mdwn
index 6538bcc80..1def63b6d 100644
--- a/doc/preferred_content.mdwn
+++ b/doc/preferred_content.mdwn
@@ -126,3 +126,26 @@ 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.
+
+### source
+
+Use for repositories where files are often added, but that do not need to
+retain files for local use. For example, a repository on a camera, where
+it's desirable to remove photos as soon as they're transferred elsewhere.
+
+The preferred content expression for these causes them to only retain
+data until a copy has been sent to some other repository.
+
+`not (copies=1)`
+
+### manual
+
+This gives you full manual control over what content is stored in the
+repository. This allows using the [[assistant]] without it trying to keep a
+local copy of every file. Instead, you can manually run `git annex get`,
+`git annex drop`, etc to manage content.
+
+Only content that is present is preferred. Content in "archive"
+directories is never preferred.
+
+`present and exclude=archive/*`