aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey M․ <dstftw@gmail.com>2016-12-31 23:58:41 +0700
committerSergey M․ <dstftw@gmail.com>2016-12-31 23:58:41 +0700
commitdc48a3540487d6e3405721a586a4237dd9e5d19c (patch)
tree43bf625dfd2fbae02741ce4cc8ef87d16527284a
parent1ea0b727c4394612f49a6f781ed2028af17d86ea (diff)
release 2016.12.312016.12.31
-rw-r--r--ChangeLog2
-rw-r--r--README.md7
-rw-r--r--docs/supportedsites.md3
-rw-r--r--youtube_dl/version.py2
4 files changed, 9 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 24ded2ca2..93336e34d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,4 @@
-version <unreleased>
+version 2016.12.31
Core
+ Introduce --config-location option for custom configuration files (#6745,
diff --git a/README.md b/README.md
index 42ca50181..3bfa2c680 100644
--- a/README.md
+++ b/README.md
@@ -80,6 +80,9 @@ Alternatively, refer to the [developer instructions](#developer-instructions) fo
configuration in ~/.config/youtube-
dl/config (%APPDATA%/youtube-dl/config.txt
on Windows)
+ --config-location PATH Location of the configuration file; either
+ the path to the config or its containing
+ directory.
--flat-playlist Do not extract the videos of a playlist,
only list them.
--mark-watched Mark videos watched (YouTube only)
@@ -183,7 +186,7 @@ Alternatively, refer to the [developer instructions](#developer-instructions) fo
of SIZE.
--playlist-reverse Download playlist videos in reverse order
--xattr-set-filesize Set file xattribute ytdl.filesize with
- expected filesize (experimental)
+ expected file size (experimental)
--hls-prefer-native Use the native HLS downloader instead of
ffmpeg
--hls-prefer-ffmpeg Use ffmpeg instead of the native HLS
@@ -350,7 +353,7 @@ Alternatively, refer to the [developer instructions](#developer-instructions) fo
-u, --username USERNAME Login with this account ID
-p, --password PASSWORD Account password. If this option is left
out, youtube-dl will ask interactively.
- -2, --twofactor TWOFACTOR Two-factor auth code
+ -2, --twofactor TWOFACTOR Two-factor authentication code
-n, --netrc Use .netrc authentication data
--video-password PASSWORD Video password (vimeo, smotri, youku)
diff --git a/docs/supportedsites.md b/docs/supportedsites.md
index 0b3d794c6..5598210cd 100644
--- a/docs/supportedsites.md
+++ b/docs/supportedsites.md
@@ -263,7 +263,6 @@
- **francetvinfo.fr**
- **Freesound**
- **freespeech.org**
- - **FreeVideo**
- **Funimation**
- **FunnyOrDie**
- **Fusion**
@@ -659,6 +658,7 @@
- **Shahid**
- **Shared**: shared.sx
- **ShareSix**
+ - **ShowRoomLive**
- **Sina**
- **SixPlay**
- **skynewsarabia:article**
@@ -834,6 +834,7 @@
- **ViceShow**
- **Vidbit**
- **Viddler**
+ - **Videa**
- **video.google:search**: Google Video search
- **video.mit.edu**
- **VideoDetective**
diff --git a/youtube_dl/version.py b/youtube_dl/version.py
index 3082ebf66..ca2258ca6 100644
--- a/youtube_dl/version.py
+++ b/youtube_dl/version.py
@@ -1,3 +1,3 @@
from __future__ import unicode_literals
-__version__ = '2016.12.22'
+__version__ = '2016.12.31'