From 7de81fcc530bfad9023a1a89622c15e4443de5eb Mon Sep 17 00:00:00 2001
From: Philipp Hagemeister <phihag@phihag.de>
Date: Thu, 31 Dec 2015 16:50:53 +0100
Subject: [PATCH] release 2015.12.31

---
 README.md              |  2 +-
 docs/supportedsites.md | 16 +++++++++++-----
 youtube_dl/version.py  |  2 +-
 3 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/README.md b/README.md
index 3a4707227..4fc83b8e3 100644
--- a/README.md
+++ b/README.md
@@ -400,7 +400,7 @@ ## Post-processing Options:
                                      downloading, similar to find's -exec
                                      syntax. Example: --exec 'adb push {}
                                      /sdcard/Music/ && rm {}'
-    --convert-subtitles FORMAT       Convert the subtitles to other format
+    --convert-subs FORMAT            Convert the subtitles to other format
                                      (currently supported: srt|ass|vtt)
 
 # CONFIGURATION
diff --git a/docs/supportedsites.md b/docs/supportedsites.md
index 1646277ec..2297edc6b 100644
--- a/docs/supportedsites.md
+++ b/docs/supportedsites.md
@@ -28,6 +28,7 @@ # Supported sites
  - **AlJazeera**
  - **Allocine**
  - **AlphaPorno**
+ - **AnimalPlanet**
  - **anitube.se**
  - **AnySex**
  - **Aparat**
@@ -125,7 +126,7 @@ # Supported sites
  - **dailymotion:user**
  - **DailymotionCloud**
  - **daum.net**
- - **daum.net**
+ - **daum.net:clip**
  - **DBTV**
  - **DCN**
  - **dcn:live**
@@ -164,7 +165,7 @@ # Supported sites
  - **Eporner**
  - **EroProfile**
  - **Escapist**
- - **ESPN** (Currently broken)
+ - **ESPN**
  - **EsriVideo**
  - **Europa**
  - **EveryonesMixtape**
@@ -181,6 +182,7 @@ # Supported sites
  - **Flickr**
  - **Folketinget**: Folketinget (ft.dk; Danish parliament)
  - **FootyRoom**
+ - **FOX**
  - **Foxgay**
  - **FoxNews**: Fox News and Fox Business Video
  - **FoxSports**
@@ -259,7 +261,6 @@ # Supported sites
  - **JeuxVideo**
  - **Jove**
  - **jpopsuki.tv**
- - **Jukebox**
  - **JWPlatform**
  - **Kaltura**
  - **KanalPlay**: Kanal 5/9/11 Play
@@ -405,6 +406,7 @@ # Supported sites
  - **OnionStudios**
  - **Ooyala**
  - **OoyalaExternal**
+ - **OraTV**
  - **orf:fm4**: radio FM4
  - **orf:iptv**: iptv.ORF.at
  - **orf:oe1**: Radio Österreich 1
@@ -415,7 +417,7 @@ # Supported sites
  - **pcmag**
  - **Periscope**: Periscope
  - **PhilharmonieDeParis**: Philharmonie de Paris
- - **Phoenix**
+ - **phoenix.de**
  - **Photobucket**
  - **Pinkbike**
  - **Pladform**
@@ -535,7 +537,8 @@ # Supported sites
  - **SportBoxEmbed**
  - **SportDeutschland**
  - **Sportschau**
- - **Srf**
+ - **SRGSSR**
+ - **SRGSSRPlay**: srf.ch, rts.ch, rsi.ch, rtr.ch and swissinfo.ch play sites
  - **SSA**
  - **stanfordoc**: Stanford Open ClassRoom
  - **Steam**
@@ -646,6 +649,9 @@ # Supported sites
  - **VideoDetective**
  - **videofy.me**
  - **VideoMega**
+ - **videomore**
+ - **videomore:season**
+ - **videomore:video**
  - **VideoPremium**
  - **VideoTt**: video.tt - Your True Tube
  - **videoweed**: VideoWeed
diff --git a/youtube_dl/version.py b/youtube_dl/version.py
index a62baa305..cf6c4d74d 100644
--- a/youtube_dl/version.py
+++ b/youtube_dl/version.py
@@ -1,3 +1,3 @@
 from __future__ import unicode_literals
 
-__version__ = '2015.12.29'
+__version__ = '2015.12.31'