summaryrefslogtreecommitdiff
path: root/doc/git-annex.mdwn
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2011-07-01 15:39:30 -0400
committerGravatar Joey Hess <joey@kitenet.net>2011-07-01 15:39:30 -0400
commit6ba866ca738d6a63858916f84979cfd346bcb403 (patch)
treedeb3ff71df984965029813d647442664b012f9ed /doc/git-annex.mdwn
parent3efba481b50ad8de6efe5869db90ac69f5c022a9 (diff)
updates for web remote and removing URL backend
Diffstat (limited to 'doc/git-annex.mdwn')
-rw-r--r--doc/git-annex.mdwn14
1 files changed, 4 insertions, 10 deletions
diff --git a/doc/git-annex.mdwn b/doc/git-annex.mdwn
index a5ddf3172..92fd82454 100644
--- a/doc/git-annex.mdwn
+++ b/doc/git-annex.mdwn
@@ -277,13 +277,8 @@ Many git-annex commands will stage changes for later `git commit` by you.
* fromkey file
- This can be used to manually set up a file to link to a specified key
- in the key-value backend. How you determine an existing key in the backend
- varies. For the URL backend, the key is based on an URL to the content.
-
- Example:
-
- git annex fromkey --key=URL--http://www.archive.org/somefile somefile
+ This plumbing-level command can be used to manually set up a file
+ to link to a specified key in the key-value backend.
* dropkey [key ...]
@@ -299,8 +294,8 @@ Many git-annex commands will stage changes for later `git commit` by you.
* setkey file
- This plumbing-level command sets the annexed data for a key to the content of
- the specified file, and then removes the file.
+ This plumbing-level command sets the annexed data for a key to the
+ content of the specified file, and then removes the file.
Example:
@@ -402,7 +397,6 @@ Here are all the supported configuration settings.
Space-separated list of names of the key-value backends to use.
The first listed is used to store new files by default.
- (default: "WORM SHA1 URL")
* `remote.<name>.annex-cost`