summaryrefslogtreecommitdiff
path: root/doc/git-annex.mdwn
diff options
context:
space:
mode:
authorGravatar Joey Hess <joeyh@joeyh.name>2014-12-18 00:57:41 -0400
committerGravatar Joey Hess <joeyh@joeyh.name>2014-12-18 00:57:41 -0400
commit1ee12c6c3cd3e0d9228eaf302621a2551e9a7194 (patch)
tree4b7d05783f5934bba30b8e5bcf2c0a2c02ad67a8 /doc/git-annex.mdwn
parentabf7122a822fd714cde899670491f16d2a7258b8 (diff)
update for torrents
Diffstat (limited to 'doc/git-annex.mdwn')
-rw-r--r--doc/git-annex.mdwn5
1 files changed, 4 insertions, 1 deletions
diff --git a/doc/git-annex.mdwn b/doc/git-annex.mdwn
index 8a2633e15..140a5aa22 100644
--- a/doc/git-annex.mdwn
+++ b/doc/git-annex.mdwn
@@ -225,9 +225,12 @@ subdirectories).
alternate locations from which the file can be downloaded. In this mode,
addurl can be used both to add new files, or to add urls to existing files.
- When quvi is installed, urls are automatically tested to see if they
+ When `quvi` is installed, urls are automatically tested to see if they
point to a video hosting site, and the video is downloaded instead.
+ Urls to torrent files (including magnet links) will cause the content of
+ the torrent to be downloaded, using `aria2c`.
+
* `rmurl file url`
Record that the file is no longer available at the url.