release 2016.12.31

diff --git a/ChangeLog b/ChangeLog
index 24ded2ca2ba63d1d2cd5c0ae898bd7301c43cbc7..93336e34d28829ed9d294506e5f960793087e73c 100644 (file)
--- 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 42ca50181538fbc75817504b99af42844bdaccb2..3bfa2c680f8af0e9a359c11224248e29f0fd02e0 100644 (file)
--- 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 0b3d794c6b5ba3aebfac336c62c80a404f5ff5e2..5598210cd817efd920f1ddcd92f48323b2ca4175 100644 (file)
--- 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 3082ebf66700b167b8a77863cd6beaa9a049d7f4..ca2258ca6beaf5eced5e715b5596ed6d21fc5910 100644 (file)
--- 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'