diff options
| author | Diego 'Flameeyes' Pettenò <flameeyes@gmail.com> | 2007-04-03 00:38:22 +0200 |
|---|---|---|
| committer | Diego 'Flameeyes' Pettenò <flameeyes@gmail.com> | 2007-04-03 00:38:22 +0200 |
| commit | 0ed2cd4f34189ec303dfac5a30de0abae0decba8 (patch) | |
| tree | 7a8d08d25ca7c81daa9d6cd65fd4f633fd676b41 /doc/man | |
| parent | 6081bc9a06ee97333769f77a9e5c18a15afb29da (diff) | |
| parent | 3dd7d925c2feb7868a49e7a1a0b953a5aab233f0 (diff) | |
| download | xine-lib-0ed2cd4f34189ec303dfac5a30de0abae0decba8.tar.gz xine-lib-0ed2cd4f34189ec303dfac5a30de0abae0decba8.tar.bz2 | |
Merge changes happened in 1.1 development.
Diffstat (limited to 'doc/man')
| -rw-r--r-- | doc/man/.hgignore (renamed from doc/man/.cvsignore) | 0 | ||||
| -rw-r--r-- | doc/man/en/.hgignore (renamed from doc/man/en/.cvsignore) | 0 | ||||
| -rw-r--r-- | doc/man/en/xine.5 | 4 |
3 files changed, 2 insertions, 2 deletions
diff --git a/doc/man/.cvsignore b/doc/man/.hgignore index 282522db0..282522db0 100644 --- a/doc/man/.cvsignore +++ b/doc/man/.hgignore diff --git a/doc/man/en/.cvsignore b/doc/man/en/.hgignore index 282522db0..282522db0 100644 --- a/doc/man/en/.cvsignore +++ b/doc/man/en/.hgignore diff --git a/doc/man/en/xine.5 b/doc/man/en/xine.5 index 817ca120b..0c4cedc12 100644 --- a/doc/man/en/xine.5 +++ b/doc/man/en/xine.5 @@ -31,7 +31,7 @@ to read from. Valid MRLs may be plain file names or one of the following: .TP \(bu CD and DVD: .br -.BI dvd:/[<DVD_image>|<device_name>][/<title>.<part>] +.BI dvd:/[<DVD_image>|<DVD_directory>|<device_name>][/<title>.<part>] .br .BI vcd://[<CD_image>|<device_name>][@[letter]<number>] .br @@ -52,7 +52,7 @@ to read from. Valid MRLs may be plain file names or one of the following: .br .BI dvbt://<channel_name>:<tuning_parameters> .br -.BI pvr://... "for WinTV PVR 250 and 350)" +.BR pvr:/<tmp_files_path>!<saved_files_path>!<max_page_age> " (for WinTV PVR 250 and 350)" .LP .TP \(bu Network: |