From e367127957d37b51720ebc6f8cea5430ef67e863 Mon Sep 17 00:00:00 2001 From: Unknown Date: Wed, 2 Sep 2020 23:48:21 +0200 Subject: [PATCH] [skip travis] minor fixes --- README.md | 20 ++++++++------------ devscripts/make_readme.py | 4 ++-- docs/supportedsites.md | 3 +-- 3 files changed, 11 insertions(+), 16 deletions(-) diff --git a/README.md b/README.md index 5e4cd3a44..188d12920 100644 --- a/README.md +++ b/README.md @@ -82,8 +82,8 @@ Then simply type this in the global configuration file /etc/youtube-dlc.conf: Do not read the user configuration in ~/.config/youtube- - dl/config (%APPDATA%/youtube-dlc/config.txt - on Windows) + dlc/config (%APPDATA%/youtube- + dlc/config.txt on Windows) --config-location PATH Location of the configuration file; either the path to the config or its containing directory. @@ -258,8 +258,8 @@ Then simply type this option) --cookies FILE File to read cookies from and dump cookie jar in - --cache-dir DIR Location in the filesystem where youtube-dlc - can store some downloaded information + --cache-dir DIR Location in the filesystem where youtube- + dlc can store some downloaded information permanently. By default $XDG_CACHE_HOME/youtube-dlc or ~/.cache/youtube-dlc . At the moment, only @@ -308,7 +308,8 @@ Then simply type this files in the current directory to debug problems --print-traffic Display sent and read HTTP traffic - -C, --call-home Contact the youtube-dlc server for debugging + -C, --call-home Contact the youtube-dlc server for + debugging --no-call-home Do NOT contact the youtube-dlc server for debugging @@ -381,8 +382,8 @@ Then simply type this a list of available MSOs --ap-username USERNAME Multiple-system operator account login --ap-password PASSWORD Multiple-system operator account password. - If this option is left out, youtube-dlc will - ask interactively. + If this option is left out, youtube-dlc + will ask interactively. --ap-list-mso List all supported multiple-system operators @@ -442,8 +443,3 @@ Then simply type this --convert-subs FORMAT Convert the subtitles to other format (currently supported: srt|ass|vtt|lrc) -# COPYRIGHT - -youtube-dlc is released into the public domain by the copyright holders. - -This README file was originally written by [Daniel Bolton](https://github.com/dbbolton) and is likewise released into the public domain. diff --git a/devscripts/make_readme.py b/devscripts/make_readme.py index 8fbce0796..dc3aa9a74 100755 --- a/devscripts/make_readme.py +++ b/devscripts/make_readme.py @@ -14,7 +14,7 @@ with io.open(README_FILE, encoding='utf-8') as f: oldreadme = f.read() header = oldreadme[:oldreadme.index('# OPTIONS')] -footer = oldreadme[oldreadme.index('# CONFIGURATION'):] +#footer = oldreadme[oldreadme.index('# CONFIGURATION'):] options = helptext[helptext.index(' General Options:') + 19:] options = re.sub(r'(?m)^ (\w.+)$', r'## \1', options) @@ -23,4 +23,4 @@ options = '# OPTIONS\n' + options + '\n' with io.open(README_FILE, 'w', encoding='utf-8') as f: f.write(header) f.write(options) - f.write(footer) + #f.write(footer) diff --git a/docs/supportedsites.md b/docs/supportedsites.md index e42498b2d..fc9d46d37 100644 --- a/docs/supportedsites.md +++ b/docs/supportedsites.md @@ -6,7 +6,6 @@ - **23video** - **24video** - **3qsdn**: 3Q SDN - - **3sat** - **4tube** - **56.com** - **5min** @@ -1155,7 +1154,7 @@ - **Zaq1** - **Zattoo** - **ZattooLive** - - **ZDF** + - **ZDF-3sat** - **ZDFChannel** - **zingmp3**: mp3.zing.vn - **Zype**