Backport [19419], [20466] and partially [20468]

doc/vlc.1

@@ -45,7 +45,7 @@ recognizes several URL-style items:
 .B *.mpg, *.vob, *.avi, *.mp3, *.ogg
 Various multimedia file formats
 .TP
-.B dvd://[<device>][@<raw device>][@[<title>][,[<chapter>][,<angle>]]]
+.B dvd://[<device>][@<raw device>][@[<title>][:[<chapter>][:<angle>]]]
 DVD device (for instance dvd:///dev/dvd). The raw device is optional and
 must have been prepared beforehand.
 .TP
@@ -61,16 +61,15 @@ HTTP stream
 .TP
 .B rtsp://<server address>[:<server port>]/<stream name>
 RTSP Video On Demand stream
+.TP
 .B vlc:<command>
-Execute a playlist command. Commands are :
+Execute a playlist command. Commands are:
 .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