--auto is no longer a global option; only get, drop, and copy accept it.

Not a behavior change unless you were passing it to a command that ignored it.

5 files changed, 22 insertions, 6 deletions

diff --git a/doc/git-annex-copy.mdwn b/doc/git-annex-copy.mdwn
index 7de0fbc25..e61cd1281 100644
--- a/doc/git-annex-copy.mdwn
+++ b/doc/git-annex-copy.mdwn
@@ -22,6 +22,12 @@ Copies the content of files from or to another remote.
   Use this option to copy the content of files from the local repository
   to the specified remote.
 
+* `--auto`
+
+  Rather than copying all files, only copy files that don't yet have
+  the desired number of copies, or that are preferred content of the
+  destination repository. See [[git-annex-preferred-content]](1)
+
 * `--fast`
 
   Avoid contacting the remote to check if it has every file when copying
diff --git a/doc/git-annex-drop.mdwn b/doc/git-annex-drop.mdwn
index 41daf3858..3fd13467c 100644
--- a/doc/git-annex-drop.mdwn
+++ b/doc/git-annex-drop.mdwn
@@ -22,6 +22,12 @@ safe to do so.
   this option can specifiy a remote from which the files'
   contents should be removed.
 
+* `--auto`
+
+  Rather than trying to drop all specified files, drop only files that
+  are not preferred content of the repository.
+  See [[git-annex-preferred-content]](1)
+
 * `--force`
 
   Use this option with care! It bypasses safety checks, and forces
diff --git a/doc/git-annex-get.mdwn b/doc/git-annex-get.mdwn
index cb5b73956..a72c79912 100644
--- a/doc/git-annex-get.mdwn
+++ b/doc/git-annex-get.mdwn
@@ -14,6 +14,12 @@ or transferring them from some kind of key-value store.
 
 # OPTIONS
 
+* `--auto`
+
+  Rather than getting all files, get only files that don't yet have
+  the desired number of copies, or that are preferred content of the
+  repository. See [[git-annex-preferred-content]](1)
+
 * `--from=remote`
 
   Normally git-annex will choose which remotes to get the content
diff --git a/doc/git-annex-preferred-content.mdwn b/doc/git-annex-preferred-content.mdwn
index 6d5321ca2..9ea19ce09 100644
--- a/doc/git-annex-preferred-content.mdwn
+++ b/doc/git-annex-preferred-content.mdwn
@@ -36,6 +36,10 @@ when a repository in the group has its preferred content set to
 
 [[git-annex]](1)
 
+[[git-annex-vicfg]](1)
+
+[[git-annex-wanted]](1)
+
 # AUTHOR
 
 Joey Hess <id@joeyh.name>
diff --git a/doc/git-annex.mdwn b/doc/git-annex.mdwn
index a7d6c341b..316d33537 100644
--- a/doc/git-annex.mdwn
+++ b/doc/git-annex.mdwn
@@ -653,12 +653,6 @@ may not be explicitly listed on their individual man pages.
   Enable less expensive, but also less thorough versions of some commands.
   What is avoided depends on the command.
 
-* `--auto`
-
-  Enable automatic mode. Commands that get, drop, or move file contents
-  will only do so when needed to help satisfy the setting of numcopies,
-  and preferred content configuration.
-
 * `--quiet`
 
   Avoid the default verbose display of what is done; only show errors