3 files changed, 39 insertions, 11 deletions
diff --git a/network/youtube-dl/youtube-dl.1 b/network/youtube-dl/youtube-dl.1
index 771029d73c..5ad0f43835 100644
--- a/network/youtube-dl/youtube-dl.1
+++ b/network/youtube-dl/youtube-dl.1
@@ -109,7 +109,9 @@ Do not emit color codes in output
 .SS Network Options:
 .TP
 .B \-\-proxy \f[I]URL\f[]
-Use the specified HTTP/HTTPS proxy.
+Use the specified HTTP/HTTPS/SOCKS proxy.
+To enable experimental SOCKS proxy, specify a proper scheme.
+For example socks5://127.0.0.1:1080/.
 Pass in an empty string (\-\-proxy "") for direct connection
 .RS
 .RE
@@ -301,7 +303,12 @@ Set file xattribute ytdl.filesize with expected filesize (experimental)
 .RE
 .TP
 .B \-\-hls\-prefer\-native
-Use the native HLS downloader instead of ffmpeg (experimental)
+Use the native HLS downloader instead of ffmpeg
+.RS
+.RE
+.TP
+.B \-\-hls\-prefer\-ffmpeg
+Use ffmpeg instead of the native HLS downloader
 .RS
 .RE
 .TP
@@ -954,7 +961,7 @@ Allowed names are:
 .IP \[bu] 2
 \f[C]license\f[]: License name the video is licensed under
 .IP \[bu] 2
-\f[C]creator\f[]: The main artist who created the video
+\f[C]creator\f[]: The creator of the video
 .IP \[bu] 2
 \f[C]release_date\f[]: The date (YYYYMMDD) when the video was released
 .IP \[bu] 2
@@ -1048,6 +1055,17 @@ episode belongs to \- \f[C]episode\f[]: Title of the video episode \-
 \f[C]episode_number\f[]: Number of the video episode within a season \-
 \f[C]episode_id\f[]: Id of the video episode
 .PP
+Available for the media that is a track or a part of a music album: \-
+\f[C]track\f[]: Title of the track \- \f[C]track_number\f[]: Number of
+the track within an album or a disc \- \f[C]track_id\f[]: Id of the
+track \- \f[C]artist\f[]: Artist(s) of the track \- \f[C]genre\f[]:
+Genre(s) of the track \- \f[C]album\f[]: Title of the album the track
+belongs to \- \f[C]album_type\f[]: Type of the album \-
+\f[C]album_artist\f[]: List of all artists appeared on the album \-
+\f[C]disc_number\f[]: Number of the disc or other physical medium the
+track belongs to \- \f[C]release_year\f[]: Year (YYYY) when the album
+was released
+.PP
 Each aforementioned sequence when referenced in output template will be
 replaced by the actual value corresponding to the sequence name.
 Note that some of the sequences are not guaranteed to be present since
@@ -1192,7 +1210,8 @@ in use \- \f[C]vcodec\f[]: Name of the video codec in use \-
 \f[C]container\f[]: Name of the container format \- \f[C]protocol\f[]:
 The protocol that will be used for the actual download, lower\-case.
 \f[C]http\f[], \f[C]https\f[], \f[C]rtsp\f[], \f[C]rtmp\f[],
-\f[C]rtmpe\f[], \f[C]m3u8\f[], or \f[C]m3u8_native\f[]
+\f[C]rtmpe\f[], \f[C]m3u8\f[], or \f[C]m3u8_native\f[] \-
+\f[C]format_id\f[]: A short description of the format
 .PP
 Note that none of the aforementioned meta fields are guaranteed to be
 present since this solely depends on the metadata obtained by particular
@@ -1353,6 +1372,14 @@ guys (mailto:ubuntu-motu@lists.ubuntu.com?subject=outdated%20version%20of%20yout
 \- all they have to do is update the package to a somewhat recent
 version.
 See above for a way to update.
+.SS I\[aq]m getting an error when trying to use output template:
+\f[C]error:\ using\ output\ template\ conflicts\ with\ using\ title,\ video\ ID\ or\ auto\ number\f[]
+.PP
+Make sure you are not using \f[C]\-o\f[] with any of these options
+\f[C]\-t\f[], \f[C]\-\-title\f[], \f[C]\-\-id\f[], \f[C]\-A\f[] or
+\f[C]\-\-auto\-number\f[] set in command line or in a configuration
+file.
+Remove the latter if any.
 .SS Do I always have to pass \f[C]\-citw\f[]?
 .PP
 By default, youtube\-dl intends to have the best options (incidentally,
@@ -1398,7 +1425,8 @@ mplayer (http://mplayerhq.hu/) or mpv (https://mpv.io/) to be installed.
 .SS I have downloaded a video but how can I play it?
 .PP
 Once the video is fully downloaded, use any video player, such as
-vlc (http://www.videolan.org) or mplayer (http://www.mplayerhq.hu/).
+mpv (https://mpv.io/), vlc (http://www.videolan.org) or
+mplayer (http://www.mplayerhq.hu/).
 .SS I extracted a video URL with \f[C]\-g\f[], but it does not play on
 another machine / in my webbrowser.
 .PP
@@ -1748,7 +1776,7 @@ class\ YourExtractorIE(InfoExtractor):
 .RE
 .IP " 5." 4
 Add an import in
-\f[C]youtube_dl/extractor/__init__.py\f[] (https://github.com/rg3/youtube-dl/blob/master/youtube_dl/extractor/__init__.py).
+\f[C]youtube_dl/extractor/extractors.py\f[] (https://github.com/rg3/youtube-dl/blob/master/youtube_dl/extractor/extractors.py).
 .IP " 6." 4
 Run
 \f[C]python\ test/test_download.py\ TestDownload.test_YourExtractor\f[].
@@ -1798,7 +1826,7 @@ push (http://git-scm.com/docs/git-push) the result, like this:
 .IP
 .nf
 \f[C]
-$\ git\ add\ youtube_dl/extractor/__init__.py
+$\ git\ add\ youtube_dl/extractor/extractors.py
 $\ git\ add\ youtube_dl/extractor/yourextractor.py
 $\ git\ commit\ \-m\ \[aq][yourextractor]\ Add\ new\ extractor\[aq]
 $\ git\ push\ origin\ yourextractor
diff --git a/network/youtube-dl/youtube-dl.SlackBuild b/network/youtube-dl/youtube-dl.SlackBuild
index b13de2d20b..082c90b218 100644
--- a/network/youtube-dl/youtube-dl.SlackBuild
+++ b/network/youtube-dl/youtube-dl.SlackBuild
@@ -24,7 +24,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=youtube-dl
-VERSION=${VERSION:-2016.03.27}
+VERSION=${VERSION:-2016.05.10}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/network/youtube-dl/youtube-dl.info b/network/youtube-dl/youtube-dl.info
index 0b4a50178b..7ab946285d 100644
--- a/network/youtube-dl/youtube-dl.info
+++ b/network/youtube-dl/youtube-dl.info
@@ -1,8 +1,8 @@
 PRGNAM="youtube-dl"
-VERSION="2016.03.27"
+VERSION="2016.05.10"
 HOMEPAGE="https://rg3.github.io/youtube-dl"
-DOWNLOAD="https://github.com/rg3/youtube-dl/archive/2016.03.27.tar.gz"
-MD5SUM="67a22919f8acd2bf2e6ad17a51ccf436"
+DOWNLOAD="https://github.com/rg3/youtube-dl/archive/2016.05.10.tar.gz"
+MD5SUM="8ec3af8d910da0f6c438d049d8180888"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""