From bbe0f745a457924d5c3eb2e29a6875dc5f35f798 Mon Sep 17 00:00:00 2001 From: Thomas Schmitt Date: Tue, 4 Dec 2007 21:02:17 +0000 Subject: [PATCH] Polished man page --- libisoburn/trunk/test/xorriso.1 | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/libisoburn/trunk/test/xorriso.1 b/libisoburn/trunk/test/xorriso.1 index 99075635..be0343fa 100644 --- a/libisoburn/trunk/test/xorriso.1 +++ b/libisoburn/trunk/test/xorriso.1 @@ -327,13 +327,14 @@ permissions of the existing files in the image do not apply to your write operations. They are intended to be in effect with the read-only mounted image. .PP If the iso_rr_path of a newly inserted file leads to an existing -file object in the ISO image, then the following -.B collision handling +file object in the ISO image, then the following collision handling happens: .br If both objects are directories then they get merged by recursively inserting the subobjects from filesystem into ISO image. -If other file types collide then the setting of command -overwrite decides. +If other file types collide then the setting of command +.B \-overwrite +decides. .br Renaming of files has similar collision handling, but directories can only be replaced, not merged. @@ -378,8 +379,12 @@ Insert the given files or directory trees from filesystem into the ISO image. .br If -graft-points is set then pattern expansion is always disabled and -character '=' has a special meaning. It eventually divides the ISO image path -from the disk path: iso_rr_path=disk_path . '=' can be escaped by '\\'. +character '=' has a special meaning. It eventually separates the ISO image path +from the disk path: +.br +iso_rr_path=disk_path +.br +The separator '=' can be escaped by '\\'. If iso_rr_path does not begin with '/' then -cd is prepended. If disk_path does not begin with '/' then -cdx is prepended. .br @@ -395,7 +400,7 @@ The resulting words are used as both, iso_rr_path and disk path. Eventually Like -add but read the pathspecs from file disk_path. One pathspec per line. .TP -> \fB\-cp_r\fR disk_path [...] iso_rr_path +> \fB\-cp_r\fR disk_path [***] iso_rr_path Insert the given files or directory trees from filesystem into the ISO image. Use the same rules for generating the ISO addresses as @@ -748,11 +753,15 @@ List files in the ISO image which match shell patterns (i.e. with wildcards '*' If a pattern does not begin with '/' then it is compared with addresses relative to -cd, the current working directory in the ISO image. Note that this resembles rather shell command ls -d than command ls. +.br +Pattern expansion may be disabled by command -iso_rr_pattern. .TP \fB\-lsx\fR disk_pattern [***] List files on local filesystem which match shell patterns. Patterns which do not begin with '/' are used relative to -cdx, the current working directory in the local filesystem. +.br +Pattern expansion may be disabled by command -disk_pattern. .TP \fB\-ls_l\fR iso_rr_pattern [***] Like -ls but also list some of the file attributes.