Merge from 1.1; update PO files; make buildable.

--HG--
rename : include/xine.h.in => include/xine.h
rename : src/xine-utils/attributes.h => include/xine/attributes.h
rename : src/xine-engine/buffer.h => include/xine/buffer.h
rename : m4/_xine.m4 => m4/types.m4
rename : po/libxine1.pot => po/libxine2.pot
rename : src/libfaad/xine_faad_decoder.c => src/audio_dec/xine_faad_decoder.c
rename : src/libspucc/cc_decoder.h => src/spu_dec/cc_decoder.h
rename : src/libspucmml/xine_cmml_decoder.c => src/spu_dec/cmml_decoder.c
rename : src/libspudec/xine_spu_decoder.c => src/spu_dec/spu_decoder.c
rename : src/libspudvb/xine_spudvb_decoder.c => src/spu_dec/spudvb_decoder.c
rename : src/libspucc/xine_cc_decoder.c => src/spu_dec/xine_cc_decoder.c
rename : src/libmpeg2/mpeg2.h => src/video_dec/libmpeg2/mpeg2.h

1 files changed, 34 insertions, 21 deletions

diff --git a/doc/man/en/xine.5 b/doc/man/en/xine.5
index 3d3975ec4..9fa19c0cc 100644
--- a/doc/man/en/xine.5
+++ b/doc/man/en/xine.5
@@ -32,60 +32,73 @@ to read from. Valid MRLs may be plain file names or one of the following
 .TP
 \(bu CD and DVD:
 .br
-.BI dvd:/[<device_name>][/<title>.<part>]
+.BI dvd:/[ device_name ][/ title [. part ]]
 .br
-.BI dvd:/<DVD_image_file_or_directory>[/<title>.<part>]
+.BI dvd:/ DVD_image_file [/ title [. part ]]
 .br
-.BI vcd://[<CD_image>|<device_name>][@[letter]<number>]
+.BI dvd:/ DVD_directory [/ title [. part ]]
 .br
-.BI vcdo://<track_number>
+	(use the path of the directory which contains VIDEO_TS)
 .br
-.BI cdda:/[<device>][/<track-number>]
+.BI vcd://[ CD_image_or_device_name ][@[ letter ] number ]
+.br
+.BI vcdo:// track_number
+.br
+.BI cdda:/[ device ][/ track_number ]
 .LP
 .TP
 \(bu Video devices:
 .br
-.BI v4l://[<tuner_device>/<frequency>]
+.BI v4l://[ tuner_device / frequency ]
+.br
+.BI dvb:// channel_number
 .br
-.BI dvb://<number_or_channel_name>
+	(nth channel in your channels.conf)
 .br
-.BI dvbc://<channel_name>:<tuning_parameters>
+.BI dvb:// channel_name
 .br
-.BI dvbs://<channel_name>:<tuning_parameters>
+.BI dvbc:// channel_name : tuning_parameters
 .br
-.BI dvbt://<channel_name>:<tuning_parameters>
+.BI dvbs:// channel_name : tuning_parameters
 .br
-.BI dvba://<channel_name>:<tuning_parameters>
+.BI dvbt:// channel_name : tuning_parameters
 .br
-.BR pvr:/<tmp_files_path>!<saved_files_path>!<max_page_age> " (for WinTV PVR 250 and 350)"
+.BI dvba:// channel_name : tuning_parameters
+.br
+.BI pvr:/ tmp_files_path ! saved_files_path ! max_page_age
+.br
+	(for WinTV PVR 250 and 350)
 .LP
 .TP
 \(bu Network:
 .br
-.BI http://<host>...
+.BI http:// host...
+.br
+.BI tcp:// host [: port ]
 .br
-.BR tcp://<host>[:<port>] " (default port is 7658)"
+.BI udp:// host [: port [?iface= interface ]]
 .br
-.BR udp://<host>[:<port>[?iface=<interface>]] " (default port is 7658)"
+.BI rtp:// host [: port [?iface= interface ]]
 .br
-.BR rtp://<host>[:<port>[?iface=<interface>]] " (default port is 7658)"
+	(default port for tcp, udp and rtp is 7658)
 .br
 .BI smb://...
 .br
-.BI mms://<host>...
+.BI mms:// host...
 .br
-.BI pnm://<host>...
+.BI pnm:// host...
 .br
-.BR rtsp://<host>... " (requires Real codecs)"
+.BI rtsp:// host... "\fR  (requires Real codecs)"
 .br
 .LP
 Additional input plugins will provide additional MRL types. The ones listed
 above are available with stock libxine.
 
 \fBNOTE:\fP where a file name is required, the \fIfull path must be
-provided\fP - from a shell, you can use \fB"$PWD/file"\fP or
+provided\fP - from a shell, you can normally use \fB"$PWD/file"\fP or
 \fB"$(pwd)/file"\fP or \fB"\`pwd\`/file"\fP if the file is in the current
-directory. (Which one depends on your shell; all three work in bash.)
+directory. (Which one depends on your shell; all three work in bash. Also,
+certain characters need to be encoded.)
 
 As of xine-lib 1.1.3, the DVD title number may be 0 (select navigation) and
 the chapter number may be 0 (full title).