From 877f4c45d3c42045cca9295a92f336e551c7eab8 Mon Sep 17 00:00:00 2001 From: Philipp Hagemeister Date: Tue, 27 Nov 2012 16:28:21 +0100 Subject: [PATCH] Fix output format doc --- README.md | 6 +++--- youtube-dl.1 | 13 +++++++++---- 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index f251788ce..f49194a0b 100644 --- a/README.md +++ b/README.md @@ -117,9 +117,9 @@ The `-o` option allows users to indicate a template for the output file names. T - `uploader`: The sequence will be replaced by the nickname of the person who uploaded the video. - `upload_date`: The sequence will be replaced by the upload date in YYYYMMDD format. - `title`: The sequence will be replaced by the video title. -ext`: The sequence will be replaced by the appropriate extension (like flv or mp4). -epoch`: The sequence will be replaced by the Unix epoch when creating the file. -autonumber`: The sequence will be replaced by a five-digit number that will be increased with each download, starting at zero. + - `ext`: The sequence will be replaced by the appropriate extension (like flv or mp4). + - `epoch`: The sequence will be replaced by the Unix epoch when creating the file. + - `autonumber`: The sequence will be replaced by a five-digit number that will be increased with each download, starting at zero. The current default template is `%(id)s.%(ext)s`, but that will be switchted to `%(title)s-%(id)s.%(ext)s` (which can be requested with `-t` at the moment). diff --git a/youtube-dl.1 b/youtube-dl.1 index b94b9d419..2f7f25f31 100644 --- a/youtube-dl.1 +++ b/youtube-dl.1 @@ -164,10 +164,15 @@ person who uploaded the video. in YYYYMMDD format. .IP \[bu] 2 \f[C]title\f[]: The sequence will be replaced by the video title. -ext\f[C]:\ The\ sequence\ will\ be\ replaced\ by\ the\ appropriate\ extension\ (like\ flv\ or\ mp4).\ epoch\f[]: -The sequence will be replaced by the Unix epoch when creating the file. -autonumber`: The sequence will be replaced by a five-digit number that -will be increased with each download, starting at zero. +.IP \[bu] 2 +\f[C]ext\f[]: The sequence will be replaced by the appropriate extension +(like flv or mp4). +.IP \[bu] 2 +\f[C]epoch\f[]: The sequence will be replaced by the Unix epoch when +creating the file. +.IP \[bu] 2 +\f[C]autonumber\f[]: The sequence will be replaced by a five-digit +number that will be increased with each download, starting at zero. .PP The current default template is \f[C]%(id)s.%(ext)s\f[], but that will be switchted to \f[C]%(title)s-%(id)s.%(ext)s\f[] (which can be