aboutsummaryrefslogtreecommitdiff
path: root/doc/git-annex.mdwn
diff options
context:
space:
mode:
authorGravatar Joey Hess <joeyh@joeyh.name>2017-11-28 14:05:58 -0400
committerGravatar Joey Hess <joeyh@joeyh.name>2017-11-28 14:05:58 -0400
commitbf5de3a6f3d50028f7ac47c6cde759a6f5110b08 (patch)
treeebb31f3b8bd5cb3e69c409f68d4937c0fee7ad19 /doc/git-annex.mdwn
parent6edfba9a7514432e5168d62d7550af7432ce2475 (diff)
documentation update for youtube-dl
Code not updated yet. This commit was sponsored by Thomas Hochstein on Patreon.
Diffstat (limited to 'doc/git-annex.mdwn')
-rw-r--r--doc/git-annex.mdwn15
1 files changed, 12 insertions, 3 deletions
diff --git a/doc/git-annex.mdwn b/doc/git-annex.mdwn
index c3aa8b991..6dc06557c 100644
--- a/doc/git-annex.mdwn
+++ b/doc/git-annex.mdwn
@@ -1315,10 +1315,19 @@ Here are all the supported configuration settings.
Options to pass when running wget or curl.
For example, to force IPv4 only, set it to "-4"
-* `annex.quvi-options`
+* `annex.youtube-dl-options`
- Options to pass to quvi when using it to find the url to download for a
- video.
+ Options to pass to youtube-dl when using it to find the url to download
+ for a video.
+
+ Some options may break git-annex's integration with youtube-dl. For
+ example, the --output option could cause it to store files somewhere
+ git-annex won't find them. Avoid any options that cause youtube-dl
+ to download more than one file, or to store the file anywhere
+ other than the current working directory.
+
+ Note that git-annex runs youtube-dl with --ignore-config, to avoid
+ any configuration file settings that break its integration.
* `annex.aria-torrent-options`