summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorDarren Salt <linux@youmustbejoking.demon.co.uk>2010-01-26 02:05:39 +0000
committerDarren Salt <linux@youmustbejoking.demon.co.uk>2010-01-26 02:05:39 +0000
commitaba6adc0529ceed3406faabdc682efab035ef5ca (patch)
tree7d9ab537c721cc0f8d218a08e91cf7a3b9bb7f01 /doc
parentdcc02769693d66bbb703b082c3cde9174ade4a37 (diff)
parent7a6f9b2927283b12d3438ad4fc60054650ac1554 (diff)
downloadxine-lib-aba6adc0529ceed3406faabdc682efab035ef5ca.tar.gz
xine-lib-aba6adc0529ceed3406faabdc682efab035ef5ca.tar.bz2
Merge from 1.1.
Diffstat (limited to 'doc')
-rw-r--r--doc/man/en/xine.52
1 files changed, 2 insertions, 0 deletions
diff --git a/doc/man/en/xine.5 b/doc/man/en/xine.5
index ab5c2833b..dd3621575 100644
--- a/doc/man/en/xine.5
+++ b/doc/man/en/xine.5
@@ -51,6 +51,8 @@ to read from. Valid MRLs may be plain file names or one of the following
.br
.BI v4l://[ tuner_device / frequency ]
.br
+.BI v4l2:// tuner_device
+.br
.BI dvb:// channel_number
.br
(nth channel in your channels.conf)