Merge branch 'master' of git://git.videolan.org/vlc

[vlc] / doc / vlc.1

diff --git a/doc/vlc.1 b/doc/vlc.1
index 69fd8b909c3f009c42d8f724b11ea9bb0c34842c..45f0d0c3f9e9ecad5dacc87ef2d4b68c11d7e5dd 100644 (file)
--- a/doc/vlc.1
+++ b/doc/vlc.1
@@ -16,7 +16,7 @@
 .\" .sp <n>    insert n+1 empty lines
 .\" for manpage-specific macros, see man(7)
 .SH NAME
 .\" .sp <n>    insert n+1 empty lines
 .\" for manpage-specific macros, see man(7)
 .SH NAME

-vlc, wxvlc, svlc \- the VLC media player
+vlc, qvlc, svlc, nvlc, rvlc, cvlc \- the VLC media player

 .SH SYNOPSIS
 .B vlc
 .RI [ OPTIONS ]
 .SH SYNOPSIS
 .B vlc
 .RI [ OPTIONS ]


@@ -30,12 +30,12 @@ multimedia player and server.
 .B VLC
 follows the usual GNU command line syntax, with long
 options starting with two dashes (`-').
 .B VLC
 follows the usual GNU command line syntax, with long
 options starting with two dashes (`-').

-For a precise description of options, please use "vlc --help".
+For a precise description of options, please use "vlc \-\-help".

 
 The complete list of
 .B VLC
 options depends on what plugins are installed because they automatically
 
 The complete list of
 .B VLC
 options depends on what plugins are installed because they automatically

-add their own options. Please use "vlc --longhelp --advanced" for a
+add their own options. Please use "vlc \-\-longhelp \-\-advanced" for a

 complete list of available options.
 
 .SH ITEMS
 complete list of available options.
 
 .SH ITEMS


@@ -52,25 +52,24 @@ must have been prepared beforehand.
 .B vcd://[<device>][@{E|P|E|T|S}[<number>]]
 VCD device (for instance vcd:///dev/cdrom).
 .TP
 .B vcd://[<device>][@{E|P|E|T|S}[<number>]]
 VCD device (for instance vcd:///dev/cdrom).
 .TP

-.B udp:[@[<multicast address>][:<local port>]]
+.B udp://[@[<multicast address>][:<local port>]]

 UDP stream, such as one sent by VLS or another VLC.
 UDP stream, such as one sent by VLS or another VLC.

-Usually "udp:" is enough.
+Usually "udp://" is enough.

 .TP
 .B http://<server address>[:<server port>]/[<file>]
 HTTP stream
 .TP
 .B rtsp://<server address>[:<server port>]/<stream name>
 RTSP Video On Demand stream
 .TP
 .B http://<server address>[:<server port>]/[<file>]
 HTTP stream
 .TP
 .B rtsp://<server address>[:<server port>]/<stream name>
 RTSP Video On Demand stream

-.B vlc:<command>
-Execute a playlist command. Commands are :
+.TP
+.B vlc://<command>
+Execute a playlist command. Commands are:

 .B pause
 (pause execution of other items), and
 .B quit
 (close VLC).
 
 .SH SEE ALSO
 .B pause
 (pause execution of other items), and
 .B quit
 (close VLC).
 
 .SH SEE ALSO

-.BR vls (1)
-.PP

 Online documentation: http://www.videolan.org/doc/
 .PP
 .SH AUTHOR
 Online documentation: http://www.videolan.org/doc/
 .PP
 .SH AUTHOR