diff --git a/xorriso/xorriso.1 b/xorriso/xorriso.1 index d9aee92f..ab052e5b 100644 --- a/xorriso/xorriso.1 +++ b/xorriso/xorriso.1 @@ -9,7 +9,7 @@ .\" First parameter, NAME, should be all caps .\" Second parameter, SECTION, should be 1-8, maybe w/ subsection .\" other parameters are allowed: see man(7), man(1) -.TH XORRISO 1 "Version 1.4.7, Dec 13, 2016" +.TH XORRISO 1 "Version 1.4.7, Feb 22, 2017" .\" Please adjust this date whenever revising the manpage. .\" .\" Some roff macros, for reference: @@ -1538,7 +1538,10 @@ and re\-enables \-disk_pattern expansion. Allow or disallow overwriting of existing files in the ISO image by files with the same name. .br -With setting "off", name collisions cause FAILURE events. +With setting "off", name collisions with at least one non\-directory file +cause FAILURE events. Collisions of two directories lead to merging of their +file lists. +.br With setting "nondir", only directories are protected by such events, other existing file types get treated with \-rm before the new file gets added. Setting "on" enables automatic \-rm_r. I.e. a non\-directory can replace an diff --git a/xorriso/xorriso.info b/xorriso/xorriso.info index d2856610..c1a82091 100644 --- a/xorriso/xorriso.info +++ b/xorriso/xorriso.info @@ -1350,11 +1350,13 @@ File: xorriso.info, Node: SetInsert, Next: Manip, Prev: Insert, Up: Commands -overwrite "on"|"nondir"|"off" Allow or disallow overwriting of existing files in the ISO image by files with the same name. - With setting "off", name collisions cause FAILURE events. With - setting "nondir", only directories are protected by such events, - other existing file types get treated with -rm before the new file - gets added. Setting "on" enables automatic -rm_r. I.e. a - non-directory can replace an existing directory and all its + With setting "off", name collisions with at least one non-directory + file cause FAILURE events. Collisions of two directories lead to + merging of their file lists. + With setting "nondir", only directories are protected by such + events, other existing file types get treated with -rm before the + new file gets added. Setting "on" enables automatic -rm_r. I.e. + a non-directory can replace an existing directory and all its subordinates. If restoring of files is enabled, then the overwrite rule applies to the target file objects on disk as well, but "on" is downgraded @@ -5404,7 +5406,7 @@ File: xorriso.info, Node: CommandIdx, Next: ConceptIdx, Prev: Legal, Up: Top (line 66) * -sleep waits for a given time span: Scripting. (line 113) * -speed set write speed: SetWrite. (line 301) -* -split_size enables large file splitting: SetInsert. (line 143) +* -split_size enables large file splitting: SetInsert. (line 145) * -status shows current settings: Scripting. (line 44) * -status_history_max curbs -status history: Scripting. (line 52) * -stdio_sync controls stdio buffer: SetWrite. (line 386) @@ -5576,7 +5578,7 @@ File: xorriso.info, Node: ConceptIdx, Prev: CommandIdx, Up: Top * Insert, if different, -update_li: Insert. (line 124) * Insert, if different, -update_lxi: Insert. (line 128) * Insert, if different, -update_r: Insert. (line 110) -* Insert, large file splitting, -split_size: SetInsert. (line 143) +* Insert, large file splitting, -split_size: SetInsert. (line 145) * Insert, limit data file size, -file_size_limit: SetInsert. (line 7) * Insert, links or mount points, -follow: SetInsert. (line 69) * Insert, meaning of = with -add, -pathspecs: SetInsert. (line 115) @@ -5765,46 +5767,46 @@ Node: AqDrive28524 Node: Loading32638 Node: Insert52745 Node: SetInsert64248 -Node: Manip73567 -Node: CmdFind83526 -Node: Filter102298 -Node: Writing106920 -Node: SetWrite117076 -Node: Bootable141835 -Node: Jigdo167335 -Node: Charset171594 -Node: Exception174923 -Node: DialogCtl181052 -Node: Inquiry183654 -Node: Navigate192442 -Node: Verify200737 -Node: Restore210615 -Node: Emulation219228 -Node: Scripting229687 -Node: Frontend237470 -Node: Examples247096 -Node: ExDevices248274 -Node: ExCreate248935 -Node: ExDialog250235 -Node: ExGrowing251506 -Node: ExModifying252315 -Node: ExBootable252825 -Node: ExCharset253380 -Node: ExPseudo254276 -Node: ExCdrecord255203 -Node: ExMkisofs255523 -Node: ExGrowisofs256880 -Node: ExException258034 -Node: ExTime258492 -Node: ExIncBackup258950 -Node: ExRestore262976 -Node: ExRecovery263922 -Node: Files264494 -Node: Environ265828 -Node: Seealso266534 -Node: Bugreport267251 -Node: Legal267842 -Node: CommandIdx268854 -Node: ConceptIdx286188 +Node: Manip73680 +Node: CmdFind83639 +Node: Filter102411 +Node: Writing107033 +Node: SetWrite117189 +Node: Bootable141948 +Node: Jigdo167448 +Node: Charset171707 +Node: Exception175036 +Node: DialogCtl181165 +Node: Inquiry183767 +Node: Navigate192555 +Node: Verify200850 +Node: Restore210728 +Node: Emulation219341 +Node: Scripting229800 +Node: Frontend237583 +Node: Examples247209 +Node: ExDevices248387 +Node: ExCreate249048 +Node: ExDialog250348 +Node: ExGrowing251619 +Node: ExModifying252428 +Node: ExBootable252938 +Node: ExCharset253493 +Node: ExPseudo254389 +Node: ExCdrecord255316 +Node: ExMkisofs255636 +Node: ExGrowisofs256993 +Node: ExException258147 +Node: ExTime258605 +Node: ExIncBackup259063 +Node: ExRestore263089 +Node: ExRecovery264035 +Node: Files264607 +Node: Environ265941 +Node: Seealso266647 +Node: Bugreport267364 +Node: Legal267955 +Node: CommandIdx268967 +Node: ConceptIdx286301  End Tag Table diff --git a/xorriso/xorriso.texi b/xorriso/xorriso.texi index 1290859e..55a8b1ed 100644 --- a/xorriso/xorriso.texi +++ b/xorriso/xorriso.texi @@ -50,7 +50,7 @@ @c man .\" First parameter, NAME, should be all caps @c man .\" Second parameter, SECTION, should be 1-8, maybe w/ subsection @c man .\" other parameters are allowed: see man(7), man(1) -@c man .TH XORRISO 1 "Version 1.4.7, Dec 13, 2016" +@c man .TH XORRISO 1 "Version 1.4.7, Feb 22, 2017" @c man .\" Please adjust this date whenever revising the manpage. @c man .\" @c man .\" Some roff macros, for reference: @@ -1874,7 +1874,10 @@ and re-enables -disk_pattern expansion. Allow or disallow overwriting of existing files in the ISO image by files with the same name. @* -With setting "off", name collisions cause FAILURE events. +With setting "off", name collisions with at least one non-directory file +cause FAILURE events. Collisions of two directories lead to merging of their +file lists. +@* With setting "nondir", only directories are protected by such events, other existing file types get treated with -rm before the new file gets added. Setting "on" enables automatic -rm_r. I.e. a non-directory can replace an