content: New command line way to view and configure a repository's preferred content settings.

2 files changed, 12 insertions, 4 deletions

diff --git a/doc/git-annex.mdwn b/doc/git-annex.mdwn
index 29a5a6225..4be3b4a48 100644
--- a/doc/git-annex.mdwn
+++ b/doc/git-annex.mdwn
@@ -306,6 +306,14 @@ subdirectories).
 
   Removes a repository from a group.
 
+* content repository [expression]
+
+  When run with an expression, configures the content that is preferred
+  to be held in the archive. See PREFERRED CONTENT below.
+
+  Without an expression, displays the current preferred content setting
+  of the repository.
+
 * vicfg
 
   Opens EDITOR on a temp file containing most of the above configuration
diff --git a/doc/preferred_content.mdwn b/doc/preferred_content.mdwn
index 23081fc30..6bf56c2e3 100644
--- a/doc/preferred_content.mdwn
+++ b/doc/preferred_content.mdwn
@@ -6,10 +6,10 @@ control over which repositories prefer to have which content. Configuring
 this allows `git annex get --auto`, `git annex drop --auto`, etc to do
 smarter things.
 
-Currently, preferred content settings can only be edited using `git
-annex vicfg`. Each repository can have its own settings, and other
-repositories may also try to honor those settings. So there's no local
-`.git/config` setting it.
+Preferred content settings can be edited using `git
+annex vicfg`, or viewed and set at the command line with `git annex content`.
+Each repository can have its own settings, and other repositories may also
+try to honor those settings. So there's no local `.git/config` setting it.
 
 The idea is that you write an expression that files are matched against.
 If a file matches, it's preferred to have its content stored in the