3 files changed, 11 insertions, 22 deletions
diff --git a/network/youtube-dl/youtube-dl.1 b/network/youtube-dl/youtube-dl.1
index d18c6e3c8084..f7097ecc021d 100644
--- a/network/youtube-dl/youtube-dl.1
+++ b/network/youtube-dl/youtube-dl.1
@@ -338,24 +338,7 @@ Use only video ID in file name
 .RE
 .TP
 .B \-o, \-\-output \f[I]TEMPLATE\f[]
-Output filename template.
-Use %(title)s to get the title, %(uploader)s for the uploader name,
-%(uploader_id)s for the uploader nickname if different, %(autonumber)s
-to get an automatically incremented number, %(ext)s for the filename
-extension, %(format)s for the format description (like "22 \- 1280x720"
-or "HD"), %(format_id)s for the unique id of the format (like
-YouTube\[aq]s itags: "137"), %(upload_date)s for the upload date
-(YYYYMMDD), %(extractor)s for the provider (youtube, metacafe, etc),
-%(id)s for the video id, %(playlist_title)s, %(playlist_id)s, or
-%(playlist)s (=title if present, ID otherwise) for the playlist the
-video is in, %(playlist_index)s for the position in the playlist.
-%(height)s and %(width)s for the width and height of the video format.
-%(resolution)s for a textual description of the resolution of the video
-format.
-%% for a literal percent.
-Use \- to output to stdout.
-Can also be used to download to a different directory, for example with
-\-o \[aq]/my/downloads/%(uploader)s /%(title)s\-%(id)s.%(ext)s\[aq] .
+Output filename template, see the "OUTPUT TEMPLATE" for all the info
 .RS
 .RE
 .TP
@@ -1305,8 +1288,14 @@ $\ youtube\-dl\ \-f\ \[aq]best[filesize<50M]\[aq]
 
 #\ Download\ best\ format\ available\ via\ direct\ link\ over\ HTTP/HTTPS\ protocol
 $\ youtube\-dl\ \-f\ \[aq](bestvideo+bestaudio/best)[protocol^=http]\[aq]
+
+#\ Download\ the\ best\ video\ format\ and\ the\ best\ audio\ format\ without\ merging\ them
+$\ youtube\-dl\ \-f\ \[aq]bestvideo,bestaudio\[aq]\ \-o\ \[aq]%(title)s.f%(format_id)s.%(ext)s\[aq]
 \f[]
 .fi
+.PP
+Note that in the last example, an output template is recommended as
+bestvideo and bestaudio may have the same file name.
 .SH VIDEO SELECTION
 .PP
 Videos can be filtered by their upload date using the options
diff --git a/network/youtube-dl/youtube-dl.SlackBuild b/network/youtube-dl/youtube-dl.SlackBuild
index 38a59fdda178..61ffa9a7fd3a 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.08.13}
+VERSION=${VERSION:-2016.08.22}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/network/youtube-dl/youtube-dl.info b/network/youtube-dl/youtube-dl.info
index 7d07260c1f40..673486b9a59b 100644
--- a/network/youtube-dl/youtube-dl.info
+++ b/network/youtube-dl/youtube-dl.info
@@ -1,8 +1,8 @@
 PRGNAM="youtube-dl"
-VERSION="2016.08.13"
+VERSION="2016.08.22"
 HOMEPAGE="https://rg3.github.io/youtube-dl"
-DOWNLOAD="https://github.com/rg3/youtube-dl/archive/2016.08.13.tar.gz"
-MD5SUM="389ab5dd0b6cf4dfc74f2768f8c1b97d"
+DOWNLOAD="https://github.com/rg3/youtube-dl/archive/2016.08.22.tar.gz"
+MD5SUM="f21ffd510fc40e4f1240df8ba177ecc0"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""