The fromkey command now takes the key as its first parameter. The --key option is no longer used.

2 files changed, 3 insertions, 6 deletions

diff --git a/doc/bugs/No_easy_way_to_re-inject_a_file_into_an_annex/comment_4_480a4f72445a636eab1b1c0f816d365c._comment b/doc/bugs/No_easy_way_to_re-inject_a_file_into_an_annex/comment_4_480a4f72445a636eab1b1c0f816d365c._comment
index 4a22d414b..787173b0a 100644
--- a/doc/bugs/No_easy_way_to_re-inject_a_file_into_an_annex/comment_4_480a4f72445a636eab1b1c0f816d365c._comment
+++ b/doc/bugs/No_easy_way_to_re-inject_a_file_into_an_annex/comment_4_480a4f72445a636eab1b1c0f816d365c._comment
@@ -4,5 +4,6 @@
  subject="comment 4"
  date="2011-05-14T16:29:35Z"
  content="""
-Although, if you really do want to shoot yourself in the foot, or know you have the old content, you can use `git-annex setkey`.
+Although, if you really do want to shoot yourself in the foot, or know you
+have the old content, you can use `git-annex setcontent`.
 """]]
diff --git a/doc/git-annex.mdwn b/doc/git-annex.mdwn
index abddaa0de..42997e534 100644
--- a/doc/git-annex.mdwn
+++ b/doc/git-annex.mdwn
@@ -318,7 +318,7 @@ subdirectories).
   This is meant to be called from git's pre-commit hook. `git annex init`
   automatically creates a pre-commit hook using this.
 
-* fromkey file
+* fromkey key file
 
   This plumbing-level command can be used to manually set up a file
   in the git repository to link to a specified key.
@@ -406,10 +406,6 @@ subdirectories).
   are in the annex, their backend is known and this option is not
   necessary.
 
-* --key=name
-
-  Specifies a key to operate on.
-
 * -c name=value
 
   Used to override git configuration settings. May be specified multiple times.