From 06b294904036087328b29079ff81e4f4af0a82ad Mon Sep 17 00:00:00 2001 From: Thomas Schmitt Date: Sun, 20 Sep 2015 12:51:53 +0000 Subject: [PATCH] Reacted on complaints of lintian spelling check --- .../trunk/frontend/frontend_pipes_xorriso.c | 2 +- libisoburn/trunk/xorriso/drive_mgt.c | 16 +- libisoburn/trunk/xorriso/iso_img.c | 4 +- libisoburn/trunk/xorriso/opts_a_c.c | 4 +- libisoburn/trunk/xorriso/opts_d_h.c | 6 +- libisoburn/trunk/xorriso/opts_p_z.c | 7 +- libisoburn/trunk/xorriso/sfile.c | 2 +- libisoburn/trunk/xorriso/sfile.h | 2 +- libisoburn/trunk/xorriso/xorrecord.1 | 21 +- libisoburn/trunk/xorriso/xorrecord.info | 66 ++--- libisoburn/trunk/xorriso/xorrecord.texi | 8 +- libisoburn/trunk/xorriso/xorriso.1 | 80 +++--- libisoburn/trunk/xorriso/xorriso.info | 251 +++++++++--------- libisoburn/trunk/xorriso/xorriso.texi | 80 +++--- libisoburn/trunk/xorriso/xorriso_private.h | 6 +- libisoburn/trunk/xorriso/xorriso_timestamp.h | 2 +- libisoburn/trunk/xorriso/xorrisofs.1 | 10 +- libisoburn/trunk/xorriso/xorrisofs.info | 58 ++-- libisoburn/trunk/xorriso/xorrisofs.texi | 10 +- 19 files changed, 320 insertions(+), 315 deletions(-) diff --git a/libisoburn/trunk/frontend/frontend_pipes_xorriso.c b/libisoburn/trunk/frontend/frontend_pipes_xorriso.c index 9c9a759f..9ffe642e 100644 --- a/libisoburn/trunk/frontend/frontend_pipes_xorriso.c +++ b/libisoburn/trunk/frontend/frontend_pipes_xorriso.c @@ -720,7 +720,7 @@ static int Sfile_destroy_argv(int *argc, char ***argv, int flag) The scope of a backslash (0 to 3 characters) is not affected. @param eaten returns the difference in length between input and output @param flag bit0= only determine *eaten, do not convert - bit1= allow to convert \000 to binary 0 + bit1= convert \000 to binary 0 */ static int Sfile_bsl_interpreter(char *text, int upto, int *eaten, int flag) { diff --git a/libisoburn/trunk/xorriso/drive_mgt.c b/libisoburn/trunk/xorriso/drive_mgt.c index d1a93e3b..98a2250c 100644 --- a/libisoburn/trunk/xorriso/drive_mgt.c +++ b/libisoburn/trunk/xorriso/drive_mgt.c @@ -290,7 +290,7 @@ int Xorriso_aquire_drive(struct XorrisO *xorriso, char *adr, char *show_adr, Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "FATAL", 0); {ret= 0; goto ex;} } else { - sprintf(xorriso->info_text, "No drive aquired on re-assessment"); + sprintf(xorriso->info_text, "No drive acquired on re-assessment"); Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "FATAL", 0); {ret= 0; goto ex;} } @@ -716,7 +716,7 @@ int Xorriso_give_up_drive(struct XorrisO *xorriso, int flag) do_eject= !!(flag&4); if((flag & 4) && !xorriso->indev_is_exclusive) { sprintf(xorriso->info_text, - "Will not eject medium in non-exclusively aquired input drive."); + "Will not eject medium in non-exclusively acquired input drive."); Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "WARNING", 0); do_eject= 0; } @@ -748,7 +748,7 @@ int Xorriso_give_up_drive(struct XorrisO *xorriso, int flag) do_eject= !!(flag&4); if((flag & 4) && !xorriso->outdev_is_exclusive) { sprintf(xorriso->info_text, - "Will not eject medium in non-exclusively aquired drive."); + "Will not eject medium in non-exclusively acquired drive."); Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "WARNING", 0); do_eject= 0; } @@ -784,7 +784,7 @@ int Xorriso_may_burn(struct XorrisO *xorriso, int flag) if(xorriso->outdev_is_exclusive) return(1); - sprintf(xorriso->info_text, "The output drive was not aquired exclusively."); + sprintf(xorriso->info_text, "The output drive was not acquired exclusively."); Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "FAILURE", 0); sprintf(xorriso->info_text, "A possible remedy is: -osirrox 'o_excl_on'"); if(xorriso->outdev[0]) { @@ -906,7 +906,7 @@ int Xorriso_toc_line(struct XorrisO *xorriso, int flag) /* @param flag bit1=report about output drive bit3=report to info channel (else to result channel) - bit4=do no report failure if no drive aquired + bit4=do no report failure if no drive acquired */ int Xorriso_media_product(struct XorrisO *xorriso, int flag) { @@ -957,7 +957,7 @@ int Xorriso_media_product(struct XorrisO *xorriso, int flag) bit1=report about output drive bit2=do not try to read ISO heads bit3=report to info channel (else to result channel) - bit4=do no report failure if no drive aquired + bit4=do no report failure if no drive acquired bit5=only report "Drive current" and "Drive type" bit6=report "Media product" with bit0 bit7=only report "Drive current" @@ -1841,7 +1841,7 @@ int Xorriso_list_speeds(struct XorrisO *xorriso, int flag) if(xorriso->out_drive_handle == NULL && xorriso->in_drive_handle == NULL) { Xorriso_msgs_submit(xorriso, 0, - "No drive aquired on attempt to list speeds", 0, "FAILURE", 0); + "No drive acquired on attempt to list speeds", 0, "FAILURE", 0); return(0); } if(xorriso->in_drive_handle != NULL) { @@ -3314,7 +3314,7 @@ int Xorriso_get_drive_handles(struct XorrisO *xorriso, *dinfo= (struct burn_drive_info *) xorriso->in_drive_handle; if(*dinfo==NULL && !(flag & 16)) { Xorriso_process_msg_queues(xorriso,0); - sprintf(xorriso->info_text, "No %s drive aquired %s", + sprintf(xorriso->info_text, "No %s drive acquired %s", (flag&2 ? "output" : "input"), attempt); Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "FAILURE", 0); } diff --git a/libisoburn/trunk/xorriso/iso_img.c b/libisoburn/trunk/xorriso/iso_img.c index 61a4ff2c..c2f2b93b 100644 --- a/libisoburn/trunk/xorriso/iso_img.c +++ b/libisoburn/trunk/xorriso/iso_img.c @@ -369,7 +369,7 @@ int Xorriso_get_volid(struct XorrisO *xorriso, char volid[33], int flag) bit1= do only report to fp bit2= is_default bit3= append -boot_image any next - bit4= eventually concentrate boot options + bit4= concentrate boot options */ int Xorriso_boot_item_status(struct XorrisO *xorriso, char *cat_path, char *bin_path, int platform_id, @@ -389,7 +389,7 @@ int Xorriso_boot_item_status(struct XorrisO *xorriso, char *cat_path, line= xorriso->result_line; if((flag & 16) && bin_path[0] != 0) { - /* Allow to concentrate boot options. */ + /* Concentrate boot options. */ memset(zeros, 0, 28); if(memcmp(id_string, zeros, 28) == 0 && memcmp(selection_crit, zeros, 20) == 0) diff --git a/libisoburn/trunk/xorriso/opts_a_c.c b/libisoburn/trunk/xorriso/opts_a_c.c index 9cb026b0..a8de4f77 100644 --- a/libisoburn/trunk/xorriso/opts_a_c.c +++ b/libisoburn/trunk/xorriso/opts_a_c.c @@ -652,7 +652,7 @@ unusable_size:; ret= Xorriso_blank_media(xorriso, mode_flag&3); if(ret==0) return(ret); - if(ret <= 0) { /* in case of success, above functions will have re-aquired */ + if(ret <= 0) { /* in case of success, above functions will have re-acquired */ aq_ret= Xorriso_reaquire_outdev(xorriso, 0); /* actually give up drive */ if(retindev[0] == 0) { - Xorriso_msgs_submit(xorriso, 0, "-toc_of 'in' : No input drive aquired", + Xorriso_msgs_submit(xorriso, 0, "-toc_of 'in' : No input drive acquired", 0, "NOTE", 0); return(2); } ret= Xorriso_toc(xorriso, toc_flag | 0); } else if(strncmp(which, "out", 3) == 0) { if(xorriso->outdev[0] == 0) { - Xorriso_msgs_submit(xorriso, 0, "-toc_of 'out' : No output drive aquired", + Xorriso_msgs_submit(xorriso, 0, + "-toc_of 'out' : No output drive acquired", 0, "NOTE", 0); return(2); } ret= Xorriso_toc(xorriso, toc_flag | 2); } else if(strncmp(which, "all", 3) == 0) { if(xorriso->indev[0] == 0 && xorriso->outdev[0] == 0) { - Xorriso_msgs_submit(xorriso, 0, "-toc_of 'all' : No drive aquired", + Xorriso_msgs_submit(xorriso, 0, "-toc_of 'all' : No drive acquired", 0, "NOTE", 0); return(2); } diff --git a/libisoburn/trunk/xorriso/sfile.c b/libisoburn/trunk/xorriso/sfile.c index 9758624d..37d533c9 100644 --- a/libisoburn/trunk/xorriso/sfile.c +++ b/libisoburn/trunk/xorriso/sfile.c @@ -461,7 +461,7 @@ int Sfile_off_t_text(char text[80], off_t num, int flag) The scope of a backslash (0 to 3 characters) is not affected. @param eaten returns the difference in length between input and output @param flag bit0= only determine *eaten, do not convert - bit1= allow to convert \000 to binary 0 + bit1= convert \000 to binary 0 */ int Sfile_bsl_interpreter(char *text, int upto, int *eaten, int flag) { diff --git a/libisoburn/trunk/xorriso/sfile.h b/libisoburn/trunk/xorriso/sfile.h index 41e84850..d0840d20 100644 --- a/libisoburn/trunk/xorriso/sfile.h +++ b/libisoburn/trunk/xorriso/sfile.h @@ -129,7 +129,7 @@ char *Sfile_datestr(time_t tim, short int flag); The scope of a backslash (0 to 3 characters) is not affected. @param eaten returns the difference in length between input and output @param flag bit0= only determine *eaten, do not convert - bit1= allow to convert \000 to binary 0 + bit1= convert \000 to binary 0 */ int Sfile_bsl_interpreter(char *text, int upto, int *eaten, int flag); diff --git a/libisoburn/trunk/xorriso/xorrecord.1 b/libisoburn/trunk/xorriso/xorrecord.1 index 2235eefd..e3b46e19 100644 --- a/libisoburn/trunk/xorriso/xorrecord.1 +++ b/libisoburn/trunk/xorriso/xorrecord.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 XORRECORD 1 "Version 1.4.1, Jul 30, 2015" +.TH XORRECORD 1 "Version 1.4.1, Sep 20, 2015" .\" Please adjust this date whenever revising the manpage. .\" .\" Some roff macros, for reference: @@ -412,18 +412,18 @@ The same as padsize=15s. This was once sufficient with older GNU/Linux kernels. Meanwhile one should at least use padsize=128k, if not padsize=300k. .TP \fB\-data\fR -Explicitely announce that the track source shall be recorded as data track, +Explicitly announce that the track source shall be recorded as data track, and not as audio track. This option has no effect with \fBxorrecord\fR, because there is no support for other track formats anyway. .TP \fB\-tao\fR -Explicitely demand that write type TAO shall be used for CD, or Incremental +Explicitly demand that write type TAO shall be used for CD, or Incremental for DVD\-R. Normally the program will choose the write type according to the given medium state, option \-multi, and track source. Demanding it explicitely prevents the start of a write run, if it is not appropriate to the situation. .TP \fB\-sao\fR -Explicitely demand that write type SAO shall be used for CD, or DAO for DVD\-R. +Explicitly demand that write type SAO shall be used for CD, or DAO for DVD\-R. This might prevent the write run, if it is not appropriate to the situation. .TP \fB\-dao\fR @@ -607,15 +607,20 @@ E.g.: modesty_on_drive=75 .br The optimal values depend on the buffer behavior of the drive. .br -There are also timing parameters "timeout_sec=", "min_usec=", "max_usec=". -Read the description of burn_drive_set_buffer_waiting() in libburn.h, -before setting them to non\-default values. +Parameter "timeout_sec=" defines after which time of unsuccessful waiting +the modesty shall be disabled because it does not work. +.br +Parameter "min_usec=" defines the initial sleeping period in microseconds. +If the drive buffer appears to be too full for sending more data, the +program will wait the given time and inquire the buffer fill state again. +If repeated inquiry shows not enough free space, the sleep time will +slowly be increased to what parameter "max_usec=" defines. .br Parameters, which are not mentioned with a modesty_on_drive= option, stay unchanged. Default is: .br - modesty_on_drive=off:min_percent=65:max_percent=95 + modesty_on_drive=off:min_percent=90:max_percent=95:timeout_sec=120:min_usec=5000:max_usec=25000 .TP \fBwrite_start_address=value\fR Set the block address on overwritable media where to start writing the track. diff --git a/libisoburn/trunk/xorriso/xorrecord.info b/libisoburn/trunk/xorriso/xorrecord.info index 4279e3bb..7447649d 100644 --- a/libisoburn/trunk/xorriso/xorrecord.info +++ b/libisoburn/trunk/xorriso/xorrecord.info @@ -397,18 +397,18 @@ padsize=size GNU/Linux kernels. Meanwhile one should at least use padsize=128k, if not padsize=300k. -data - Explicitely announce that the track source shall be recorded as - data track, and not as audio track. This option has no effect with + Explicitly announce that the track source shall be recorded as data + track, and not as audio track. This option has no effect with 'xorrecord', because there is no support for other track formats anyway. -tao - Explicitely demand that write type TAO shall be used for CD, or + Explicitly demand that write type TAO shall be used for CD, or Incremental for DVD-R. Normally the program will choose the write type according to the given medium state, option -multi, and track source. Demanding it explicitely prevents the start of a write run, if it is not appropriate to the situation. -sao - Explicitely demand that write type SAO shall be used for CD, or DAO + Explicitly demand that write type SAO shall be used for CD, or DAO for DVD-R. This might prevent the write run, if it is not appropriate to the situation. -dao @@ -566,13 +566,17 @@ modesty_on_drive=parameter[:parameters] are interpreted as "on:min_percent=". E.g.: modesty_on_drive=75 The optimal values depend on the buffer behavior of the drive. - There are also timing parameters "timeout_sec=", "min_usec=", - "max_usec=". Read the description of - burn_drive_set_buffer_waiting() in libburn.h, before setting them - to non-default values. + Parameter "timeout_sec=" defines after which time of unsuccessful + waiting the modesty shall be disabled because it does not work. + Parameter "min_usec=" defines the initial sleeping period in + microseconds. If the drive buffer appears to be too full for + sending more data, the program will wait the given time and inquire + the buffer fill state again. If repeated inquiry shows not enough + free space, the sleep time will slowly be increased to what + parameter "max_usec=" defines. Parameters, which are not mentioned with a modesty_on_drive= option, stay unchanged. Default is: - modesty_on_drive=off:min_percent=65:max_percent=95 + modesty_on_drive=off:min_percent=90:max_percent=95:timeout_sec=120:min_usec=5000:max_usec=25000 write_start_address=value Set the block address on overwritable media where to start writing the track. With DVD+RW, DVD-RAM or BD-RE, byte_offset must be @@ -881,12 +885,12 @@ File: xorrecord.info, Node: CommandIdx, Next: ConceptIdx, Prev: Legal, Up: T * minbuf= keep drive buffer hungry: SetBurn. (line 205) * padsize= add bytes to end of track: SetBurn. (line 144) * speed= set write speed: SetBurn. (line 189) -* stdio_sync= control stdio buffer: NonCdrecord. (line 93) +* stdio_sync= control stdio buffer: NonCdrecord. (line 97) * stream_recording= try to get full speed on DVD-RAM, BD: NonCdrecord. (line 39) * tsize= set a fixed track size: SetBurn. (line 126) * write_start_address= set block address for write start: NonCdrecord. - (line 87) + (line 91)  File: xorrecord.info, Node: ConceptIdx, Prev: CommandIdx, Up: Top @@ -943,11 +947,11 @@ File: xorrecord.info, Node: ConceptIdx, Prev: CommandIdx, Up: Top * Version, report, -version: Verbous. (line 8) * Write simulation , control, -dummy: SetBurn. (line 106) * Write start address, set, write_start_address=: NonCdrecord. - (line 87) + (line 91) * Write type, SAO/DAO, -dao: SetBurn. (line 172) * Write type, SAO/DAO, -sao: SetBurn. (line 168) * Write type, TAO, -tao: SetBurn. (line 162) -* Write, buffer syncing, stdio_sync=: NonCdrecord. (line 93) +* Write, buffer syncing, stdio_sync=: NonCdrecord. (line 97) * Write, drive buffer, -immed: SetBurn. (line 208) * Write, drive buffer, minbuf=: SetBurn. (line 205) * Write, drive buffer, modesty_on_drive=: NonCdrecord. (line 56) @@ -966,23 +970,23 @@ Node: Options5885 Node: DriveAddr6253 Node: Inquire7618 Node: SetBurn10487 -Node: Verbous20940 -Node: NonCdrecord22490 -Node: Examples27889 -Node: ExDevices28550 -Node: ExMedium28768 -Node: ExBlank29031 -Node: ExFormat29252 -Node: ExDeformat29770 -Node: ExIsoSingle30037 -Node: ExIsoMulti30321 -Node: ExIsoFly31955 -Node: ExAfio32626 -Node: Files33624 -Node: Seealso34180 -Node: Bugreport34543 -Node: Legal35134 -Node: CommandIdx36063 -Node: ConceptIdx39339 +Node: Verbous20937 +Node: NonCdrecord22487 +Node: Examples28241 +Node: ExDevices28902 +Node: ExMedium29120 +Node: ExBlank29383 +Node: ExFormat29604 +Node: ExDeformat30122 +Node: ExIsoSingle30389 +Node: ExIsoMulti30673 +Node: ExIsoFly32307 +Node: ExAfio32978 +Node: Files33976 +Node: Seealso34532 +Node: Bugreport34895 +Node: Legal35486 +Node: CommandIdx36415 +Node: ConceptIdx39691  End Tag Table diff --git a/libisoburn/trunk/xorriso/xorrecord.texi b/libisoburn/trunk/xorriso/xorrecord.texi index 517bf1e3..ddafe286 100644 --- a/libisoburn/trunk/xorriso/xorrecord.texi +++ b/libisoburn/trunk/xorriso/xorrecord.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 XORRECORD 1 "Version 1.4.1, Aug 29, 2015" +@c man .TH XORRECORD 1 "Version 1.4.1, Sep 20, 2015" @c man .\" Please adjust this date whenever revising the manpage. @c man .\" @c man .\" Some roff macros, for reference: @@ -579,14 +579,14 @@ kernels. Meanwhile one should at least use padsize=128k, if not padsize=300k. @item -data @kindex -data explicitely announce a data track @cindex Data track, announce, -data -Explicitely announce that the track source shall be recorded as data track, +Explicitly announce that the track source shall be recorded as data track, and not as audio track. This option has no effect with @command{xorrecord}, because there is no support for other track formats anyway. @c man .TP @item -tao @kindex -tao explicitely set write type TAO @cindex Write type, TAO, -tao -Explicitely demand that write type TAO shall be used for CD, or Incremental +Explicitly demand that write type TAO shall be used for CD, or Incremental for DVD-R. Normally the program will choose the write type according to the given medium state, option -multi, and track source. Demanding it explicitely prevents the start of a write run, if it is not appropriate to the situation. @@ -594,7 +594,7 @@ prevents the start of a write run, if it is not appropriate to the situation. @item -sao @kindex -sao explicitely set write type SAO/DAO @cindex Write type, SAO/DAO, -sao -Explicitely demand that write type SAO shall be used for CD, or DAO for DVD-R. +Explicitly demand that write type SAO shall be used for CD, or DAO for DVD-R. This might prevent the write run, if it is not appropriate to the situation. @c man .TP @item -dao diff --git a/libisoburn/trunk/xorriso/xorriso.1 b/libisoburn/trunk/xorriso/xorriso.1 index 7ccd6299..f99049c6 100644 --- a/libisoburn/trunk/xorriso/xorriso.1 +++ b/libisoburn/trunk/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.1, Sep 16, 2015" +.TH XORRISO 1 "Version 1.4.1, Sep 20, 2015" .\" Please adjust this date whenever revising the manpage. .\" .\" Some roff macros, for reference: @@ -34,7 +34,7 @@ with Rock Ridge extensions. .PP \fBxorriso\fR is a program which copies file objects from POSIX compliant -filesystems into Rock Ridge enhanced ISO 9660 filesystems and allows +filesystems into Rock Ridge enhanced ISO 9660 filesystems and performs session\-wise manipulation of such filesystems. It can load the management information of existing ISO images and it writes the session results to optical media or to filesystem objects. @@ -126,7 +126,7 @@ represent arbitrary media or from regular disk files. .PP This session usage model has been extended on CD media by the concept of \fBmulti\-session\fR , -which allows to add information to the CD and gives the mount programs +which adds information to the CD and gives the mount programs of the operating systems the addresses of the entry points of each session. The mount programs recognize block devices which represent CD media and will by default mount the image in the last session. @@ -151,7 +151,7 @@ See paragraph Creating, Growing, Modifying, Blind Growing below. .PP \fBxorriso\fR adopts the concept of multi\-session by loading an image directory tree if present, -by allowing to manipulate it by several actions, +by offering to manipulate it by several actions, and by writing the new image to the target medium. .br The first session of a \fBxorriso\fR run begins by the definition of @@ -177,11 +177,11 @@ unformatted DVD\-RW. These media provide a table of content which describes their existing sessions. See command \fB\-toc\fR. .br Similar to multi\-session media are DVD\-R DL and minimally blanked DVD\-RW. -They allow only a single session of which the size must be known in advance. +They record only a single session of which the size must be known in advance. \fBxorriso\fR will write onto them only if command \-close is set to "on". .br \fBOverwriteable media\fR are DVD\-RAM, DVD+RW, BD\-RE, and formatted DVD\-RW. -They allow random write access but do not provide information about their +They offer random write access but do not provide information about their session history. If they contain one or more ISO 9660 sessions and if the first session was written by \fBxorriso\fR, then a table of content can be emulated. Else only a single overall session will be visible. @@ -330,8 +330,8 @@ their path in the filesystem. E.g.: .br \-dev stdio:/dev/sdc .br -The default setting of \-drive_class allows to address files outside the -/dev tree without that prefix. E.g.: +The default setting of \-drive_class allows the user to address files outside +the /dev tree without that prefix. E.g.: .br \-dev /tmp/pseudo_drive .br @@ -369,7 +369,7 @@ drive. .br One may use command \fB\-ban_stdio_write\fR -to surely prevent this risk and to allow only MMC drives. +to surely prevent this risk and to restrict drive usage to MMC drives. .br One may prepend "mmc:" to a path to surely disallow any automatic "stdio:". .br @@ -458,8 +458,7 @@ only on GNU/Linux and FreeBSD. .PP \fBxattr\fR (aka EA, or extattr) are pairs of name and value which can be attached to file objects. AAIP is -able to represent them and \fBxorriso\fR allows to record and restore -pairs which +able to represent them and \fBxorriso\fR can record and restore pairs which have names out of the user namespace. I.e. those which begin with "user.", like "user.x" or "user.whatever". Name has to be a 0 terminated string. Value may be any array of bytes which does not exceed the size of 4095 bytes. @@ -533,7 +532,7 @@ quotations or an open quotation cause the next input line to be appended. Quoted input accepts any 8\-bit character except NUL (0) as the content of the quotes. Nevertheless it can be cumbersome for the user to produce those characters -directly. Therefore quoted input and program arguments allow optional +directly. Therefore quoted input and program arguments offer optional \fBBackslash Interpretation\fR which can represent all 8\-bit characters except NUL (0) via backslash codes as in $'...' of bash. @@ -562,7 +561,7 @@ availability of package readline\-dev at the time when \fBxorriso\fR was built from its sourcecode. .br -Readline allows to move the cursor over the text in the line by help of the +Readline lets the user move the cursor over the text in the line by help of the Left and the Right arrow keys. Text may be inserted at the cursor position. The Delete key removes the character under the cursor. Up and Down arrow keys navigate through @@ -951,8 +950,8 @@ if any occur despite the prescriptions of ECMA\-119. .TP \fB\-disk_dev_ino\fR "on"|"ino_only"|"off" Enable or disable processing of recorded file identification numbers -(dev_t and ino_t). If enabled they are stored as xattr and allow -to substantially accelerate file comparison. The root node gets a global start +(dev_t and ino_t). If enabled they are stored as xattr and can +substantially accelerate file comparison. The root node gets a global start timestamp. If during comparison a file with younger timestamps is found in the ISO image, then it is suspected to have inconsistent content. .br @@ -983,7 +982,7 @@ leading bytes replaced by '_'. iso_rr_paths with the long components will still be able to access the file paths with truncated components. To avoid confusion by having both truncated and untrancated names in the same directory, it is not possible -to change this setting after a drive was aquired. All file names get +to change this setting after a drive was acquired. All file names get truncated by the same length. .br File name patterns will only work if they match the truncated name. @@ -1450,13 +1449,13 @@ It also disables \-disk_pattern expansion for command \-add. and re\-enables \-disk_pattern expansion. .TP \fB\-overwrite\fR "on"|"nondir"|"off" -Allow or disallow to overwrite existing files in the +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 "nondir", only directories are protected by such events, other existing file types get treated with \-rm before the new file gets added. -Setting "on" allows automatic \-rm_r. I.e. a non\-directory can replace an +Setting "on" enables automatic \-rm_r. I.e. a non\-directory can replace an existing directory and all its subordinates. .br If restoring of files is enabled, then the overwrite rule applies to the @@ -2272,7 +2271,7 @@ prevent any suffix renaming. .br Attaching or detaching filters will not alter the state of \-changes_pending. If the filter manipulations shall be the only changes in a write run, then -explicitely execute \-changes_pending "yes". +explicitly execute \-changes_pending "yes". .TP \fB\-set_filter_r\fR name iso_rr_path [***] Like \-set_filter but affecting all data files below eventual directories. @@ -2967,7 +2966,7 @@ its option \-multi is missing. Set the write type for the next burn run. "auto" will select SAO with blank CD media, DAO with blank DVD\-R[W] if \-close is "on", and elsewise CD TAO or the equivalent write type of the particular DVD/BD media. -Choosing TAO or SAO/DAO explicitely might cause the burn run to fail if the +Choosing TAO or SAO/DAO explicitly might cause the burn run to fail if the desired write type is not possible with the given media state. .TP \fB\-padding\fR number["k"|"m"]|"included"|"appended" @@ -3330,7 +3329,7 @@ the partition table. 0 chooses a default value. Maximum is 255. the partition table. 0 chooses a default value. Maximum is 63. .br The product partition_sec_hd * partition_hd_cyl * 512 is the cylinder size. -It should be divisible by 2048 in order to allow exact alignment. +It should be divisible by 2048 in order to make exact alignment possible. With appended partitions and "appended_part_as=gpt" there is no limit for the number of cylinders. Else there may be at most 1024 of them. @@ -3368,9 +3367,8 @@ It will overwrite the first 512 bytes of any data provided by system_area=. Only a single boot file can be declared by mipsel_path=. .br \fBsparc_label=\fRtext causes the production of a SUN Disk Label with the -given text as ASCII label. This boot block format allows to append images -for partitions 2 to 8. Partition 1 will always be the ISO image. -See command \-append_partition. +given text as ASCII label. Partitions 2 to 8 may occupied by appended images. +Partition 1 will always be the ISO image. See command \-append_partition. The first 512 bytes of any data provided by system_area= will be overwritten. .br \fBgrub2_sparc_core=\fRiso_rr_path causes the content address and size @@ -3885,11 +3883,11 @@ to be the most recent real session then. Some read\-only drives and media show no usable session history at all. Command \-rom_toc_scan might help. .br -If input device and output device are both aquired and not the same, +If input device and output device are both acquired and not the same, then both tables\-of\-content get shown. .TP \fB\-toc_of\fR "in"|"out"|"all"[":short"] -Like command \-toc but explicitely choosing which drive's table\-of\-content +Like command \-toc but explicitly choosing which drive's table\-of\-content to show. "in" shows \-indev or \-dev, "out" shows \-outdev or \-dev, "all" shows the same as \-toc. .br @@ -3897,7 +3895,7 @@ If ":short" is appended to the drive choosing word, then only a short summary of drive state and medium content is printed. .br As further difference to \-toc, this command does not emit FAILURE events -if the desired drive is not aquired. +if the desired drive is not acquired. .TP \fB\-mount_cmd\fR drive entity id path Emit an appropriate command line for mounting the ISO session @@ -3922,7 +3920,7 @@ for direct execution of this command. Set options which influence \-mount and \-mount_cmd. Currently there is only option "exclusive" which is default and its counterpart "shared". The latter causes \fBxorriso\fR not to give up the affected drive with command \-mount. -On GNU/Linux it adds mount option "loop" which may allow to mount several +On GNU/Linux it adds mount option "loop" which may enable mounting of several sessions of the same block device at the same time. One should not write to a mounted optical medium, of course. Take care to umount all sessions before ejecting. @@ -4361,10 +4359,10 @@ recorded MD5 checksums. Severity "ALL" disables this event. tries to read the file given by disk_path as sector bitmap and to store such a map file after the scan run. The bitmap tells which blocks have been read successfully in previous runs. -It allows to do several scans on the same medium, even with intermediate -eject, in order to collect readable blocks whenever the drive is lucky enough -to produce them. The stored file contains a human readable TOC of tracks -and their start block addresses, followed by binary bitmap data. +It is the persistent memory for several scans on the same medium, even with +intermediate eject, in order to collect readable blocks whenever the drive +is lucky enough to produce them. The stored file contains a human readable +TOC of tracks and their start block addresses, followed by binary bitmap data. .br By default, untested blocks are not considered bad, but rather as intentionally unread. If you expect time_limit= or item_limit= to abort the run, then @@ -4477,7 +4475,7 @@ are owned by the effective user who runs \fBxorriso\fR. This happens by temporarily granting rwx permission to the owner. .br Option "sort_lba_on" may improve read performance with optical drives. It -allows to restore large numbers of hard links without exhausting +can restore large numbers of hard links without exhausting \-temp_mem_limit. It does not preserve directory mtime and it needs \-osirrox option auto_chmod_on in order to extract directories which offer no write permission. Default is "sort_lba_off". @@ -4485,7 +4483,7 @@ write permission. Default is "sort_lba_off". Option "o_excl_on" is the default unless the program was started with leafname "osirrox". On GNU/Linux it tries to avoid using drives which are mounted or in use by other libburn programs. -Option "o_excl_off" allows on GNU/Linux to access such drives. Drives which +Option "o_excl_off" on GNU/Linux enables access to such drives. Drives which get acquired while "o_excl_off" will refuse to get blanked, formatted, written, or ejected. But be aware that even harmless inquiries can spoil ongoing burns of CD\-R[W] and DVD\-R[W]. @@ -4519,9 +4517,9 @@ composed from iso_rr_path by replacing iso_rr_prefix by disk_prefix. \fB\-extract_cut\fR iso_rr_path byte_offset byte_count disk_path Copy a byte interval from a data file out of an ISO image into a newly created disk file. -The main purpose for this is to allow handling of large files if they -are not supported by mount \-t iso9660 and if the reading system is unable -to buffer them as a whole. +The main purpose for this is to offer a way of handling large files if they +are not supported by mount \-t iso9660 or if the target disk filesystem cannot +store large files. .br If the data bytes of iso_rr_path are stored in the loaded ISO image, and no filter is applied, @@ -4990,7 +4988,7 @@ wait for the user to hit the Enter key or to send a line via stdin. .TP \fB\-sleep\fR seconds -Wait for the given number of seconds before perfoming the next command. +Wait for the given number of seconds before performing the next command. Expect coarse granularity no better than 1/100 seconds. .TP \fB\-errfile_log\fR mode path|channel @@ -5517,7 +5515,7 @@ $ xorriso \-dev stdio:/dev/sdb ... .br If /dev/sdb is to be used frequently and /dev/sda is the system disk, then consider to place the following lines in a \fBxorriso\fR Startup File. -They allow to use /dev/sdb without prefix and protect disk /dev/sda +They allow you to use /dev/sdb without prefix and protect disk /dev/sda from \fBxorriso\fR: .br \-drive_class banned /dev/sda* @@ -5803,8 +5801,8 @@ program name pre\-select certain settings: .br \fBxorrecord\fR starts \fBxorriso\fR with \-as cdrecord emulation. .br -\fBosirrox\fR starts with \-osirrox "on:o_excl_off" which allows -to copy files from ISO image to disk and to apply command \-mount to +\fBosirrox\fR starts with \-osirrox "on:o_excl_off" which allows further +commands to copy files from ISO image to disk and to apply command \-mount to one or more of the existing ISO sessions. .SS .B Startup files: diff --git a/libisoburn/trunk/xorriso/xorriso.info b/libisoburn/trunk/xorriso/xorriso.info index 34c1732e..2f29981d 100644 --- a/libisoburn/trunk/xorriso/xorriso.info +++ b/libisoburn/trunk/xorriso/xorriso.info @@ -46,7 +46,7 @@ File: xorriso.info, Node: Overview, Next: Model, Prev: Top, Up: Top ********** 'xorriso' is a program which copies file objects from POSIX compliant -filesystems into Rock Ridge enhanced ISO 9660 filesystems and allows +filesystems into Rock Ridge enhanced ISO 9660 filesystems and performs session-wise manipulation of such filesystems. It can load the management information of existing ISO images and it writes the session results to optical media or to filesystem objects. @@ -104,8 +104,8 @@ images from devices that represent arbitrary media or from regular disk files. This session usage model has been extended on CD media by the concept -of *multi-session* , which allows to add information to the CD and gives -the mount programs of the operating systems the addresses of the entry +of *multi-session* , which adds information to the CD and gives the +mount programs of the operating systems the addresses of the entry points of each session. The mount programs recognize block devices which represent CD media and will by default mount the image in the last session. @@ -126,7 +126,7 @@ modifications. See paragraph Creating, Growing, Modifying, Blind Growing below. 'xorriso' adopts the concept of multi-session by loading an image -directory tree if present, by allowing to manipulate it by several +directory tree if present, by offering to manipulate it by several actions, and by writing the new image to the target medium. The first session of a 'xorriso' run begins by the definition of the input drive with the ISO image or by the definition of an output drive. The session @@ -155,11 +155,11 @@ There are two families of media in the MMC standard: unformatted DVD-RW. These media provide a table of content which describes their existing sessions. See command *-toc*. Similar to multi-session media are DVD-R DL and minimally blanked -DVD-RW. They allow only a single session of which the size must be known -in advance. 'xorriso' will write onto them only if command -close is -set to "on". +DVD-RW. They record only a single session of which the size must be +known in advance. 'xorriso' will write onto them only if command -close +is set to "on". *Overwriteable media* are DVD-RAM, DVD+RW, BD-RE, and formatted DVD-RW. -They allow random write access but do not provide information about +They offer random write access but do not provide information about their session history. If they contain one or more ISO 9660 sessions and if the first session was written by 'xorriso', then a table of content can be emulated. Else only a single overall session will be @@ -293,8 +293,8 @@ bundle the authorized users in a group like old "floppy". Filesystem objects of nearly any type can be addressed by prefix "stdio:" and their path in the filesystem. E.g.: -dev stdio:/dev/sdc -The default setting of -drive_class allows to address files outside the -/dev tree without that prefix. E.g.: +The default setting of -drive_class allows the user to address files +outside the /dev tree without that prefix. E.g.: -dev /tmp/pseudo_drive If path leads to a regular file or to a block device then the emulated drive is random access readable and can be used for the method of @@ -325,7 +325,7 @@ file or device by using its path with the "stdio:" prefix. By default any address in the /dev tree without prefix "stdio:" will work only if it leads to a MMC drive. One may use command *-ban_stdio_write* to surely prevent this risk and -to allow only MMC drives. +to restrict drive usage to MMC drives. One may prepend "mmc:" to a path to surely disallow any automatic "stdio:". By command -drive_class one may ban certain paths or allow access without prefix "stdio:" to other paths. @@ -398,11 +398,11 @@ only on GNU/Linux and FreeBSD. *xattr* (aka EA, or extattr) are pairs of name and value which can be attached to file objects. AAIP is able to represent them and 'xorriso' -allows to record and restore pairs which have names out of the user -namespace. I.e. those which begin with "user.", like "user.x" or -"user.whatever". Name has to be a 0 terminated string. Value may be -any array of bytes which does not exceed the size of 4095 bytes. xattr -processing happens only if it is enabled by command *-xattr*. +can record and restore pairs which have names out of the user namespace. +I.e. those which begin with "user.", like "user.x" or "user.whatever". +Name has to be a 0 terminated string. Value may be any array of bytes +which does not exceed the size of 4095 bytes. xattr processing happens +only if it is enabled by command *-xattr*. As with ACL, currently only 'xorriso' is able to retrieve xattr from AAIP enhanced images, to restore them to xattr capable file systems, or to print them. @@ -465,7 +465,7 @@ line to be appended. Quoted input accepts any 8-bit character except NUL (0) as the content of the quotes. Nevertheless it can be cumbersome for the user to produce those characters directly. Therefore quoted input and program -arguments allow optional *Backslash Interpretation* which can represent +arguments offer optional *Backslash Interpretation* which can represent all 8-bit characters except NUL (0) via backslash codes as in $'...' of bash. This is not enabled by default. See command -backslash_codes. @@ -494,10 +494,10 @@ services to make dialog more comfortable. it from the bash shell. Whether it is available in 'xorriso' depends on the availability of package readline-dev at the time when 'xorriso' was built from its sourcecode. -Readline allows to move the cursor over the text in the line by help of -the Left and the Right arrow keys. Text may be inserted at the cursor -position. The Delete key removes the character under the cursor. Up -and Down arrow keys navigate through the history of previous input +Readline lets the user move the cursor over the text in the line by help +of the Left and the Right arrow keys. Text may be inserted at the +cursor position. The Delete key removes the character under the cursor. +Up and Down arrow keys navigate through the history of previous input lines. See info readline for more info about libreadline. @@ -860,10 +860,10 @@ activate them only after image loading. -disk_dev_ino "on"|"ino_only"|"off" Enable or disable processing of recorded file identification numbers (dev_t and ino_t). If enabled they are stored as xattr and - allow to substantially accelerate file comparison. The root node - gets a global start timestamp. If during comparison a file with - younger timestamps is found in the ISO image, then it is suspected - to have inconsistent content. + can substantially accelerate file comparison. The root node gets a + global start timestamp. If during comparison a file with younger + timestamps is found in the ISO image, then it is suspected to have + inconsistent content. If device numbers and inode numbers of the disk filesystems are persistent and if no irregular alterations of timestamps or system clock happen, then potential content changes can be detected @@ -888,7 +888,7 @@ activate them only after image loading. the file paths with truncated components. To avoid confusion by having both truncated and untrancated names in the same directory, it is not possible to change this setting after a drive was - aquired. All file names get truncated by the same length. + acquired. All file names get truncated by the same length. File name patterns will only work if they match the truncated name. This might change in future. Linux kernels up to at least 4.1 misrepresent names of length 254 @@ -1275,12 +1275,12 @@ File: xorriso.info, Node: SetInsert, Next: Manip, Prev: Insert, Up: Commands "off" disables pathspecs of the form target=source and re-enables -disk_pattern expansion. -overwrite "on"|"nondir"|"off" - Allow or disallow to overwrite existing files in the ISO image by + 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" allows automatic -rm_r. I.e. a + 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 @@ -1937,7 +1937,7 @@ there are many small files. "--remove-all-filters+" to prevent any suffix renaming. Attaching or detaching filters will not alter the state of -changes_pending. If the filter manipulations shall be the only - changes in a write run, then explicitely execute -changes_pending + changes in a write run, then explicitly execute -changes_pending "yes". -set_filter_r name iso_rr_path [***] Like -set_filter but affecting all data files below eventual @@ -2514,7 +2514,7 @@ according to the setting of command -acl. Set the write type for the next burn run. "auto" will select SAO with blank CD media, DAO with blank DVD-R[W] if -close is "on", and elsewise CD TAO or the equivalent write type of the particular - DVD/BD media. Choosing TAO or SAO/DAO explicitely might cause the + DVD/BD media. Choosing TAO or SAO/DAO explicitly might cause the burn run to fail if the desired write type is not possible with the given media state. -padding number["k"|"m"]|"included"|"appended" @@ -2804,8 +2804,8 @@ Examples: *partition_sec_hd=*number gives the number of sectors per head for the partition table. 0 chooses a default value. Maximum is 63. The product partition_sec_hd * partition_hd_cyl * 512 is the - cylinder size. It should be divisible by 2048 in order to allow - exact alignment. With appended partitions and + cylinder size. It should be divisible by 2048 in order to make + exact alignment possible. With appended partitions and "appended_part_as=gpt" there is no limit for the number of cylinders. Else there may be at most 1024 of them. If the cylinder size is too small to stay below the limit, then @@ -2836,10 +2836,10 @@ Examples: data provided by system_area=. Only a single boot file can be declared by mipsel_path=. *sparc_label=*text causes the production of a SUN Disk Label with - the given text as ASCII label. This boot block format allows to - append images for partitions 2 to 8. Partition 1 will always be - the ISO image. See command -append_partition. The first 512 bytes - of any data provided by system_area= will be overwritten. + the given text as ASCII label. Partitions 2 to 8 may occupied by + appended images. Partition 1 will always be the ISO image. See + command -append_partition. The first 512 bytes of any data + provided by system_area= will be overwritten. *grub2_sparc_core=*iso_rr_path causes the content address and size of the given file to be written after the SUN Disk Label. Both numbers are counted in bytes. The address is written as 64 bit @@ -3257,16 +3257,16 @@ File: xorriso.info, Node: Inquiry, Next: Navigate, Prev: DialogCtl, Up: Comm sessions is supposed to be the most recent real session then. Some read-only drives and media show no usable session history at all. Command -rom_toc_scan might help. - If input device and output device are both aquired and not the + If input device and output device are both acquired and not the same, then both tables-of-content get shown. -toc_of "in"|"out"|"all"[":short"] - Like command -toc but explicitely choosing which drive's + Like command -toc but explicitly choosing which drive's table-of-content to show. "in" shows -indev or -dev, "out" shows -outdev or -dev, "all" shows the same as -toc. If ":short" is appended to the drive choosing word, then only a short summary of drive state and medium content is printed. As further difference to -toc, this command does not emit FAILURE - events if the desired drive is not aquired. + events if the desired drive is not acquired. -mount_cmd drive entity id path Emit an appropriate command line for mounting the ISO session indicated by drive, entity and id. The result will be different on @@ -3287,9 +3287,9 @@ File: xorriso.info, Node: Inquiry, Next: Navigate, Prev: DialogCtl, Up: Comm is only option "exclusive" which is default and its counterpart "shared". The latter causes 'xorriso' not to give up the affected drive with command -mount. On GNU/Linux it adds mount option - "loop" which may allow to mount several sessions of the same block - device at the same time. One should not write to a mounted optical - medium, of course. Take care to umount all sessions before + "loop" which may enable mounting of several sessions of the same + block device at the same time. One should not write to a mounted + optical medium, of course. Take care to umount all sessions before ejecting. -session_string drive entity id format Print to the result channel a text which gets composed according to @@ -3650,11 +3650,11 @@ transmission errors. tries to read the file given by disk_path as sector bitmap and to store such a map file after the scan run. The bitmap tells which blocks have been read successfully in previous runs. It - allows to do several scans on the same medium, even with - intermediate eject, in order to collect readable blocks - whenever the drive is lucky enough to produce them. The - stored file contains a human readable TOC of tracks and their - start block addresses, followed by binary bitmap data. + is the persistent memory for several scans on the same medium, + even with intermediate eject, in order to collect readable + blocks whenever the drive is lucky enough to produce them. + The stored file contains a human readable TOC of tracks and + their start block addresses, followed by binary bitmap data. By default, untested blocks are not considered bad, but rather as intentionally unread. If you expect time_limit= or item_limit= to abort the run, then consider to use @@ -3759,7 +3759,7 @@ The directory permissions on disk have to allow rwx. directories are owned by the effective user who runs 'xorriso'. This happens by temporarily granting rwx permission to the owner. Option "sort_lba_on" may improve read performance with optical - drives. It allows to restore large numbers of hard links without + drives. It can restore large numbers of hard links without exhausting -temp_mem_limit. It does not preserve directory mtime and it needs -osirrox option auto_chmod_on in order to extract directories which offer no write permission. Default is @@ -3767,7 +3767,7 @@ The directory permissions on disk have to allow rwx. Option "o_excl_on" is the default unless the program was started with leafname "osirrox". On GNU/Linux it tries to avoid using drives which are mounted or in use by other libburn programs. - Option "o_excl_off" allows on GNU/Linux to access such drives. + Option "o_excl_off" on GNU/Linux enables access to such drives. Drives which get acquired while "o_excl_off" will refuse to get blanked, formatted, written, or ejected. But be aware that even harmless inquiries can spoil ongoing burns of CD-R[W] and DVD-R[W]. @@ -3796,10 +3796,9 @@ The directory permissions on disk have to allow rwx. iso_rr_prefix by disk_prefix. -extract_cut iso_rr_path byte_offset byte_count disk_path Copy a byte interval from a data file out of an ISO image into a - newly created disk file. The main purpose for this is to allow - handling of large files if they are not supported by mount -t - iso9660 and if the reading system is unable to buffer them as a - whole. + newly created disk file. The main purpose for this is to offer a + way of handling large files if they are not supported by mount -t + iso9660 or if the target disk filesystem cannot store large files. If the data bytes of iso_rr_path are stored in the loaded ISO image, and no filter is applied, and byte_offset is a multiple of 2048, then a special run of -check_media is performed. It may be @@ -4171,7 +4170,7 @@ File: xorriso.info, Node: Scripting, Next: Frontend, Prev: Emulation, Up: Co Show text at beginning of output line and wait for the user to hit the Enter key or to send a line via stdin. -sleep seconds - Wait for the given number of seconds before perfoming the next + Wait for the given number of seconds before performing the next command. Expect coarse granularity no better than 1/100 seconds. -errfile_log mode path|channel @@ -4612,8 +4611,8 @@ devices: If /dev/sdb is to be used frequently and /dev/sda is the system disk, then consider to place the following lines in a 'xorriso' Startup File. -They allow to use /dev/sdb without prefix and protect disk /dev/sda from -'xorriso': +They allow you to use /dev/sdb without prefix and protect disk /dev/sda +from 'xorriso': -drive_class banned /dev/sda* -drive_class harmless /dev/sdb @@ -4889,9 +4888,9 @@ their program name pre-select certain settings: *xorrisofs* starts 'xorriso' with -as mkisofs emulation. *xorrecord* starts 'xorriso' with -as cdrecord emulation. -*osirrox* starts with -osirrox "on:o_excl_off" which allows to copy -files from ISO image to disk and to apply command -mount to one or more -of the existing ISO sessions. +*osirrox* starts with -osirrox "on:o_excl_off" which allows further +commands to copy files from ISO image to disk and to apply command +-mount to one or more of the existing ISO sessions. 11.2 Startup Files ================== @@ -5047,14 +5046,14 @@ File: xorriso.info, Node: CommandIdx, Next: ConceptIdx, Prev: Legal, Up: Top * -compare_l reports ISO/disk differences: Navigate. (line 144) * -compare_r reports ISO/disk differences: Navigate. (line 140) * -compliance controls standard compliance: SetWrite. (line 56) -* -concat copies ISO file content: Restore. (line 119) +* -concat copies ISO file content: Restore. (line 118) * -copyright_file sets copyright file name: SetWrite. (line 223) -* -cpax copies files to disk: Restore. (line 101) +* -cpax copies files to disk: Restore. (line 100) * -cpr inserts like with cp -r: Insert. (line 143) -* -cpx copies files to disk: Restore. (line 90) +* -cpx copies files to disk: Restore. (line 89) * -cp_clone copies ISO directory tree: Insert. (line 175) -* -cp_rx copies file trees to disk: Restore. (line 104) -* -cp_rx copies file trees to disk <1>: Restore. (line 112) +* -cp_rx copies file trees to disk: Restore. (line 103) +* -cp_rx copies file trees to disk <1>: Restore. (line 111) * -cut_out inserts piece of data file: Insert. (line 118) * -data_cache_size adjusts read cache size: Loading. (line 312) * -dev acquires one drive for input and output: AqDrive. (line 12) @@ -5135,7 +5134,7 @@ File: xorriso.info, Node: CommandIdx, Next: ConceptIdx, Prev: Legal, Up: Top * -md5 controls handling of MD5 sums: Loading. (line 173) * -mkdir creates ISO directory: Insert. (line 156) * -modesty_on_drive keep drive buffer hungry: SetWrite. (line 320) -* -mount issues mount command for ISO session: Restore. (line 147) +* -mount issues mount command for ISO session: Restore. (line 146) * -mount_cmd composes mount command line: Inquiry. (line 49) * -mount_cmd controls mount command: Inquiry. (line 64) * -msg_op perform operations on program messages: Frontend. (line 27) @@ -5155,7 +5154,7 @@ File: xorriso.info, Node: CommandIdx, Next: ConceptIdx, Prev: Legal, Up: Top * -pacifier controls pacifier text form: Emulation. (line 166) * -padding sets amount or mode of image padding: SetWrite. (line 394) * -page set terminal geometry: DialogCtl. (line 18) -* -paste_in copies file into disk file: Restore. (line 115) +* -paste_in copies file into disk file: Restore. (line 114) * -pathspecs sets meaning of = with -add: SetInsert. (line 115) * -path_list inserts paths from disk file: Insert. (line 75) * -pkt_output consolidates text output: Frontend. (line 7) @@ -5319,7 +5318,7 @@ File: xorriso.info, Node: ConceptIdx, Prev: CommandIdx, Up: Top * Emulation, pacifier form, -pacifier: Emulation. (line 166) * Examples: Examples. (line 6) * extattr, _definition: Extras. (line 66) -* File content, copy, -concat: Restore. (line 119) +* File content, copy, -concat: Restore. (line 118) * File names, curb length, -file_name_limit: Loading. (line 237) * File names, if neither Rock Ridge nor Joliet: Loading. (line 205) * Filter, apply to file tree, -set_filter_r: Filter. (line 84) @@ -5474,14 +5473,14 @@ File: xorriso.info, Node: ConceptIdx, Prev: CommandIdx, Up: Top * Relocation directory, set name, -rr_reloc_dir: SetWrite. (line 144) * Rename, in ISO image, -move: Manip. (line 31) * Rename, in ISO image, -mv: Manip. (line 37) -* Restore, copy file into disk file, -paste_in: Restore. (line 115) +* Restore, copy file into disk file, -paste_in: Restore. (line 114) * Restore, copy file piece to disk, -extract_cut: Restore. (line 80) * Restore, copy file to disk, -extract_single: Restore. (line 73) * Restore, copy file tree to disk, -extract: Restore. (line 62) -* Restore, copy file trees to disk, -cp_rx: Restore. (line 104) -* Restore, copy file trees to disk, -cp_rx <1>: Restore. (line 112) -* Restore, copy files to disk, -cpax: Restore. (line 101) -* Restore, copy files to disk, -cpx: Restore. (line 90) +* Restore, copy file trees to disk, -cp_rx: Restore. (line 103) +* Restore, copy file trees to disk, -cp_rx <1>: Restore. (line 111) +* Restore, copy files to disk, -cpax: Restore. (line 100) +* Restore, copy files to disk, -cpx: Restore. (line 89) * Restore, copy files to disk, -extract_l: Restore. (line 76) * Restore, enable ISO-to-disk, -osirrox: Restore. (line 18) * Result layout, more shell-like, -sh_style_result: Scripting. @@ -5489,7 +5488,7 @@ File: xorriso.info, Node: ConceptIdx, Prev: CommandIdx, Up: Top * Rock Ridge, _definition: Extras. (line 6) * Session, altered start address, -displacement: Loading. (line 57) * Session, info string, -session_string: Inquiry. (line 73) -* Session, issue mount command, -mount: Restore. (line 147) +* Session, issue mount command, -mount: Restore. (line 146) * Session, log when written, -session_log: Scripting. (line 134) * Session, mount command line, -mount_cmd: Inquiry. (line 49) * Session, mount parameters, -mount_opts: Inquiry. (line 64) @@ -5547,58 +5546,58 @@ File: xorriso.info, Node: ConceptIdx, Prev: CommandIdx, Up: Top Tag Table: Node: Top415 Node: Overview1369 -Node: Model3404 -Node: Media6317 -Node: Methods9003 -Node: Drives11589 -Node: Extras15144 -Node: Processing19620 -Node: Dialog23255 -Node: Commands24941 -Node: ArgSort26618 -Node: AqDrive28112 -Node: Loading31167 -Node: Insert50158 -Node: SetInsert60383 -Node: Manip69231 -Node: CmdFind79014 -Node: Filter97109 -Node: Writing101732 -Node: SetWrite111887 -Node: Bootable134832 -Node: Jigdo157368 -Node: Charset161627 -Node: Exception164954 -Node: DialogCtl171083 -Node: Inquiry173685 -Node: Navigate182130 -Node: Verify190425 -Node: Restore200287 -Node: Emulation208908 -Node: Scripting219318 -Node: Frontend227099 -Node: Examples236734 -Node: ExDevices237912 -Node: ExCreate238573 -Node: ExDialog239873 -Node: ExGrowing241144 -Node: ExModifying241953 -Node: ExBootable242463 -Node: ExCharset243018 -Node: ExPseudo243914 -Node: ExCdrecord244837 -Node: ExMkisofs245157 -Node: ExGrowisofs246514 -Node: ExException247668 -Node: ExTime248126 -Node: ExIncBackup248584 -Node: ExRestore252610 -Node: ExRecovery253556 -Node: Files254128 -Node: Seealso255445 -Node: Bugreport256160 -Node: Legal256751 -Node: CommandIdx257763 -Node: ConceptIdx274732 +Node: Model3406 +Node: Media6310 +Node: Methods8997 +Node: Drives11583 +Node: Extras15160 +Node: Processing19628 +Node: Dialog23263 +Node: Commands24952 +Node: ArgSort26629 +Node: AqDrive28123 +Node: Loading31178 +Node: Insert50165 +Node: SetInsert60390 +Node: Manip69241 +Node: CmdFind79024 +Node: Filter97119 +Node: Writing101741 +Node: SetWrite111896 +Node: Bootable134840 +Node: Jigdo157365 +Node: Charset161624 +Node: Exception164951 +Node: DialogCtl171080 +Node: Inquiry173682 +Node: Navigate182132 +Node: Verify190427 +Node: Restore200304 +Node: Emulation208917 +Node: Scripting219327 +Node: Frontend227109 +Node: Examples236744 +Node: ExDevices237922 +Node: ExCreate238583 +Node: ExDialog239883 +Node: ExGrowing241154 +Node: ExModifying241963 +Node: ExBootable242473 +Node: ExCharset243028 +Node: ExPseudo243924 +Node: ExCdrecord244851 +Node: ExMkisofs245171 +Node: ExGrowisofs246528 +Node: ExException247682 +Node: ExTime248140 +Node: ExIncBackup248598 +Node: ExRestore252624 +Node: ExRecovery253570 +Node: Files254142 +Node: Seealso255476 +Node: Bugreport256191 +Node: Legal256782 +Node: CommandIdx257794 +Node: ConceptIdx274763  End Tag Table diff --git a/libisoburn/trunk/xorriso/xorriso.texi b/libisoburn/trunk/xorriso/xorriso.texi index b69dab36..e866b033 100644 --- a/libisoburn/trunk/xorriso/xorriso.texi +++ b/libisoburn/trunk/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.1, Sep 16, 2015" +@c man .TH XORRISO 1 "Version 1.4.1, Sep 20, 2015" @c man .\" Please adjust this date whenever revising the manpage. @c man .\" @c man .\" Some roff macros, for reference: @@ -121,7 +121,7 @@ with Rock Ridge extensions. @c man .PP @command{xorriso} is a program which copies file objects from POSIX compliant -filesystems into Rock Ridge enhanced ISO 9660 filesystems and allows +filesystems into Rock Ridge enhanced ISO 9660 filesystems and performs session-wise manipulation of such filesystems. It can load the management information of existing ISO images and it writes the session results to optical media or to filesystem objects. @@ -225,7 +225,7 @@ represent arbitrary media or from regular disk files. @cindex Multi-session, _definition This session usage model has been extended on CD media by the concept of @strong{multi-session} , -which allows to add information to the CD and gives the mount programs +which adds information to the CD and gives the mount programs of the operating systems the addresses of the entry points of each session. The mount programs recognize block devices which represent CD media and will by default mount the image in the last session. @@ -252,7 +252,7 @@ See paragraph Creating, Growing, Modifying, Blind Growing below. @sp 1 @command{xorriso} adopts the concept of multi-session by loading an image directory tree if present, -by allowing to manipulate it by several actions, +by offering to manipulate it by several actions, and by writing the new image to the target medium. @c man .br The first session of a @command{xorriso} run begins by the definition of @@ -283,12 +283,12 @@ unformatted DVD-RW. These media provide a table of content which describes their existing sessions. See command @strong{-toc}. @* Similar to multi-session media are DVD-R DL and minimally blanked DVD-RW. -They allow only a single session of which the size must be known in advance. +They record only a single session of which the size must be known in advance. @command{xorriso} will write onto them only if command -close is set to "on". @* @cindex Overwriteable media, _definition @strong{Overwriteable media} are DVD-RAM, DVD+RW, BD-RE, and formatted DVD-RW. -They allow random write access but do not provide information about their +They offer random write access but do not provide information about their session history. If they contain one or more ISO 9660 sessions and if the first session was written by @command{xorriso}, then a table of content can be emulated. Else only a single overall session will be visible. @@ -461,8 +461,8 @@ their path in the filesystem. E.g.: @* -dev stdio:/dev/sdc @* -The default setting of -drive_class allows to address files outside the -/dev tree without that prefix. E.g.: +The default setting of -drive_class allows the user to address files outside +the /dev tree without that prefix. E.g.: @* -dev /tmp/pseudo_drive @* @@ -502,7 +502,7 @@ drive. @* One may use command @strong{-ban_stdio_write} -to surely prevent this risk and to allow only MMC drives. +to surely prevent this risk and to restrict drive usage to MMC drives. @* One may prepend "mmc:" to a path to surely disallow any automatic "stdio:". @c man .br @@ -606,8 +606,7 @@ only on GNU/Linux and FreeBSD. @cindex extattr, _definition @strong{xattr} (aka EA, or extattr) are pairs of name and value which can be attached to file objects. AAIP is -able to represent them and @command{xorriso} allows to record and restore -pairs which +able to represent them and @command{xorriso} can record and restore pairs which have names out of the user namespace. I.e. those which begin with "user.", like "user.x" or "user.whatever". Name has to be a 0 terminated string. Value may be any array of bytes which does not exceed the size of 4095 bytes. @@ -691,7 +690,7 @@ quotations or an open quotation cause the next input line to be appended. Quoted input accepts any 8-bit character except NUL (0) as the content of the quotes. Nevertheless it can be cumbersome for the user to produce those characters -directly. Therefore quoted input and program arguments allow optional +directly. Therefore quoted input and program arguments offer optional @strong{Backslash Interpretation} which can represent all 8-bit characters except NUL (0) via backslash codes as in $'...' of bash. @@ -725,7 +724,7 @@ availability of package readline-dev at the time when @command{xorriso} was built from its sourcecode. @* -Readline allows to move the cursor over the text in the line by help of the +Readline lets the user move the cursor over the text in the line by help of the Left and the Right arrow keys. Text may be inserted at the cursor position. The Delete key removes the character under the cursor. Up and Down arrow keys navigate through @@ -1198,8 +1197,8 @@ if any occur despite the prescriptions of ECMA-119. @kindex -disk_dev_ino fast incremental backup @cindex Backup, enable fast incremental, -disk_dev_ino Enable or disable processing of recorded file identification numbers -(dev_t and ino_t). If enabled they are stored as xattr and allow -to substantially accelerate file comparison. The root node gets a global start +(dev_t and ino_t). If enabled they are stored as xattr and can +substantially accelerate file comparison. The root node gets a global start timestamp. If during comparison a file with younger timestamps is found in the ISO image, then it is suspected to have inconsistent content. @* @@ -1232,7 +1231,7 @@ leading bytes replaced by '_'. iso_rr_paths with the long components will still be able to access the file paths with truncated components. To avoid confusion by having both truncated and untrancated names in the same directory, it is not possible -to change this setting after a drive was aquired. All file names get +to change this setting after a drive was acquired. All file names get truncated by the same length. @* File name patterns will only work if they match the truncated name. @@ -1777,13 +1776,13 @@ and re-enables -disk_pattern expansion. @item -overwrite "on"|"nondir"|"off" @kindex -overwrite enables overwriting in ISO @cindex Insert, enable overwriting, -overwrite -Allow or disallow to overwrite existing files in the +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" allows automatic -rm_r. I.e. a non-directory can replace an +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 @@ -2691,7 +2690,7 @@ prevent any suffix renaming. @* Attaching or detaching filters will not alter the state of -changes_pending. If the filter manipulations shall be the only changes in a write run, then -explicitely execute -changes_pending "yes". +explicitly execute -changes_pending "yes". @c man .TP @item -set_filter_r name iso_rr_path [***] @kindex -set_filter_r applies filter to file tree @@ -3481,7 +3480,7 @@ its option -multi is missing. Set the write type for the next burn run. "auto" will select SAO with blank CD media, DAO with blank DVD-R[W] if -close is "on", and elsewise CD TAO or the equivalent write type of the particular DVD/BD media. -Choosing TAO or SAO/DAO explicitely might cause the burn run to fail if the +Choosing TAO or SAO/DAO explicitly might cause the burn run to fail if the desired write type is not possible with the given media state. @c man .TP @item -padding number["k"|"m"]|"included"|"appended" @@ -3870,7 +3869,7 @@ the partition table. 0 chooses a default value. Maximum is 255. the partition table. 0 chooses a default value. Maximum is 63. @* The product partition_sec_hd * partition_hd_cyl * 512 is the cylinder size. -It should be divisible by 2048 in order to allow exact alignment. +It should be divisible by 2048 in order to make exact alignment possible. With appended partitions and "appended_part_as=gpt" there is no limit for the number of cylinders. Else there may be at most 1024 of them. @@ -3911,9 +3910,8 @@ Only a single boot file can be declared by mipsel_path=. @* @cindex SUN Disk Label, production @strong{sparc_label=}text causes the production of a SUN Disk Label with the -given text as ASCII label. This boot block format allows to append images -for partitions 2 to 8. Partition 1 will always be the ISO image. -See command -append_partition. +given text as ASCII label. Partitions 2 to 8 may occupied by appended images. +Partition 1 will always be the ISO image. See command -append_partition. The first 512 bytes of any data provided by system_area= will be overwritten. @* @strong{grub2_sparc_core=}iso_rr_path causes the content address and size @@ -4497,12 +4495,12 @@ to be the most recent real session then. Some read-only drives and media show no usable session history at all. Command -rom_toc_scan might help. @* -If input device and output device are both aquired and not the same, +If input device and output device are both acquired and not the same, then both tables-of-content get shown. @c man .TP @item -toc_of "in"|"out"|"all"[":short"] @kindex -toc_of shows list of sessions -Like command -toc but explicitely choosing which drive's table-of-content +Like command -toc but explicitly choosing which drive's table-of-content to show. "in" shows -indev or -dev, "out" shows -outdev or -dev, "all" shows the same as -toc. @* @@ -4510,7 +4508,7 @@ If ":short" is appended to the drive choosing word, then only a short summary of drive state and medium content is printed. @* As further difference to -toc, this command does not emit FAILURE events -if the desired drive is not aquired. +if the desired drive is not acquired. @c man .TP @item -mount_cmd drive entity id path @kindex -mount_cmd composes mount command line @@ -4539,7 +4537,7 @@ for direct execution of this command. Set options which influence -mount and -mount_cmd. Currently there is only option "exclusive" which is default and its counterpart "shared". The latter causes @command{xorriso} not to give up the affected drive with command -mount. -On GNU/Linux it adds mount option "loop" which may allow to mount several +On GNU/Linux it adds mount option "loop" which may enable mounting of several sessions of the same block device at the same time. One should not write to a mounted optical medium, of course. Take care to umount all sessions before ejecting. @@ -5061,10 +5059,10 @@ recorded MD5 checksums. Severity "ALL" disables this event. tries to read the file given by disk_path as sector bitmap and to store such a map file after the scan run. The bitmap tells which blocks have been read successfully in previous runs. -It allows to do several scans on the same medium, even with intermediate -eject, in order to collect readable blocks whenever the drive is lucky enough -to produce them. The stored file contains a human readable TOC of tracks -and their start block addresses, followed by binary bitmap data. +It is the persistent memory for several scans on the same medium, even with +intermediate eject, in order to collect readable blocks whenever the drive +is lucky enough to produce them. The stored file contains a human readable +TOC of tracks and their start block addresses, followed by binary bitmap data. @* By default, untested blocks are not considered bad, but rather as intentionally unread. If you expect time_limit= or item_limit= to abort the run, then @@ -5189,7 +5187,7 @@ are owned by the effective user who runs @command{xorriso}. This happens by temporarily granting rwx permission to the owner. @* Option "sort_lba_on" may improve read performance with optical drives. It -allows to restore large numbers of hard links without exhausting +can restore large numbers of hard links without exhausting -temp_mem_limit. It does not preserve directory mtime and it needs -osirrox option auto_chmod_on in order to extract directories which offer no write permission. Default is "sort_lba_off". @@ -5197,7 +5195,7 @@ write permission. Default is "sort_lba_off". Option "o_excl_on" is the default unless the program was started with leafname "osirrox". On GNU/Linux it tries to avoid using drives which are mounted or in use by other libburn programs. -Option "o_excl_off" allows on GNU/Linux to access such drives. Drives which +Option "o_excl_off" on GNU/Linux enables access to such drives. Drives which get acquired while "o_excl_off" will refuse to get blanked, formatted, written, or ejected. But be aware that even harmless inquiries can spoil ongoing burns of CD-R[W] and DVD-R[W]. @@ -5239,9 +5237,9 @@ composed from iso_rr_path by replacing iso_rr_prefix by disk_prefix. @cindex Restore, copy file piece to disk, -extract_cut Copy a byte interval from a data file out of an ISO image into a newly created disk file. -The main purpose for this is to allow handling of large files if they -are not supported by mount -t iso9660 and if the reading system is unable -to buffer them as a whole. +The main purpose for this is to offer a way of handling large files if they +are not supported by mount -t iso9660 or if the target disk filesystem cannot +store large files. @* If the data bytes of iso_rr_path are stored in the loaded ISO image, and no filter is applied, @@ -5786,7 +5784,7 @@ or to send a line via stdin. @item -sleep seconds @kindex -sleep waits for a given time span @cindex Program, wait a time span, -sleep -Wait for the given number of seconds before perfoming the next command. +Wait for the given number of seconds before performing the next command. Expect coarse granularity no better than 1/100 seconds. @c man .TP @item -errfile_log mode path|channel @@ -6427,7 +6425,7 @@ $ xorriso -dev stdio:/dev/sdb ... @sp 1 If /dev/sdb is to be used frequently and /dev/sda is the system disk, then consider to place the following lines in a @command{xorriso} Startup File. -They allow to use /dev/sdb without prefix and protect disk /dev/sda +They allow you to use /dev/sdb without prefix and protect disk /dev/sda from @command{xorriso}: @* @sp 1 @@ -6789,8 +6787,8 @@ program name pre-select certain settings: @* @strong{xorrecord} starts @command{xorriso} with -as cdrecord emulation. @* -@strong{osirrox} starts with -osirrox "on:o_excl_off" which allows -to copy files from ISO image to disk and to apply command -mount to +@strong{osirrox} starts with -osirrox "on:o_excl_off" which allows further +commands to copy files from ISO image to disk and to apply command -mount to one or more of the existing ISO sessions. @c man .SS @c man .B Startup files: diff --git a/libisoburn/trunk/xorriso/xorriso_private.h b/libisoburn/trunk/xorriso/xorriso_private.h index c55e7745..ae356fbf 100644 --- a/libisoburn/trunk/xorriso/xorriso_private.h +++ b/libisoburn/trunk/xorriso/xorriso_private.h @@ -157,7 +157,7 @@ struct XorrisO { /* the global context of xorriso */ bit6= omit content check if bit5 check is conclusive bit7= omit dev check with bit5 bit8= store output charset in xattr "isofs.cs" - bit9= allow to set input charset from xattr "isofs.cs" + bit9= set input charset from xattr "isofs.cs" */ int do_md5; /* bit0= read MD5 array @@ -304,7 +304,7 @@ struct XorrisO { /* the global context of xorriso */ char *in_charset; /* The charset to interpret the filename bytes */ int indev_is_exclusive; char indev_off_adr[SfileadrL]; /* Result of burn_drive_convert_fs_adr(indev) - when indev gets aquired. */ + when indev gets acquired. */ time_t isofs_st_out; /* A time point at least 1 second before image composition began. To be stored with image as @@ -335,7 +335,7 @@ struct XorrisO { /* the global context of xorriso */ */ int outdev_is_exclusive; char outdev_off_adr[SfileadrL]; /* Result of burn_drive_convert_fs_adr(outdev) - when outdev gets aquired. */ + when outdev gets acquired. */ int grow_blindly_msc2; /* if >= 0 this causes growing from drive to drive. The value is used as block address offset for diff --git a/libisoburn/trunk/xorriso/xorriso_timestamp.h b/libisoburn/trunk/xorriso/xorriso_timestamp.h index 21eb213a..b339a031 100644 --- a/libisoburn/trunk/xorriso/xorriso_timestamp.h +++ b/libisoburn/trunk/xorriso/xorriso_timestamp.h @@ -1 +1 @@ -#define Xorriso_timestamP "2015.09.20.124012" +#define Xorriso_timestamP "2015.09.20.125159" diff --git a/libisoburn/trunk/xorriso/xorrisofs.1 b/libisoburn/trunk/xorriso/xorrisofs.1 index b6703989..667fc905 100644 --- a/libisoburn/trunk/xorriso/xorrisofs.1 +++ b/libisoburn/trunk/xorriso/xorrisofs.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 XORRISOFS 1 "Version 1.4.1, Sep 13, 2015" +.TH XORRISOFS 1 "Version 1.4.1, Sep 20, 2015" .\" Please adjust this date whenever revising the manpage. .\" .\" Some roff macros, for reference: @@ -354,7 +354,7 @@ simultaneous production of more image content. \fB--emul-toc\fR Write a second superblock with the first session into random\-access files. If further sessions get appended and the first superblock gets updated, -then the second superblock will not be overwritten. This allows to still +then the second superblock will not be overwritten. So it is still possible to mount the first session and to find the start blocks of the further sessions. .br The price is 64 KiB extra space consumption. If \-partition_offset is non\-zero, @@ -574,7 +574,7 @@ operating systems which mount the image. Option \-D disables this deep directory relocation, and thus violates ISO 9660 specs. .br -xorrisofs has \-D set by default. If given explicitely then it overrides +xorrisofs has \-D set by default. If given explicitly then it overrides the options \-rr_reloc_dir and \-hide\-rr\-moved. .TP \fB\-disable-deep-relocation\fR @@ -915,7 +915,7 @@ FreeBSD AvgLiveCD wiki. .PP For CD booting via boot facilities other than PC\-BIOS and EFI, and for booting from USB sticks or hard disks, see the next section -about the Sytem Area. +about the System Area. .br .TP \fB\-b\fR iso_rr_path @@ -1179,7 +1179,7 @@ Set the number of sectors per head for the MBR partition table. 0 chooses a default value. Maximum is 63. .br The product partition_sec_hd * partition_hd_cyl * 512 is the cylinder size. -It should be divisible by 2048 in order to allow exact alignment. +It should be divisible by 2048 in order to make exact alignment possible. With appended partitions and \-appended_part_as_gpt there is no limit for the number of cylinders. Else there may be at most 1024 of them. If the cylinder size is too small to stay below the limit, diff --git a/libisoburn/trunk/xorriso/xorrisofs.info b/libisoburn/trunk/xorriso/xorrisofs.info index f8489e32..eda5a5d8 100644 --- a/libisoburn/trunk/xorriso/xorrisofs.info +++ b/libisoburn/trunk/xorriso/xorrisofs.info @@ -351,8 +351,8 @@ File: xorrisofs.info, Node: SetProduct, Next: SetCompl, Prev: SetInsert, Up: Write a second superblock with the first session into random-access files. If further sessions get appended and the first superblock gets updated, then the second superblock will not be overwritten. - This allows to still mount the first session and to find the start - blocks of the further sessions. + So it is still possible to mount the first session and to find the + start blocks of the further sessions. The price is 64 KiB extra space consumption. If -partition_offset is non-zero, then it is 128 KiB plus twice the partition setup. --no-emul-toc @@ -537,7 +537,7 @@ File: xorrisofs.info, Node: SetExtras, Next: SetHide, Prev: SetCompl, Up: Op Option -D disables this deep directory relocation, and thus violates ISO 9660 specs. - xorrisofs has -D set by default. If given explicitely then it + xorrisofs has -D set by default. If given explicitly then it overrides the options -rr_reloc_dir and -hide-rr-moved. -disable-deep-relocation Alias of -D. @@ -825,7 +825,7 @@ FreeBSD AvgLiveCD wiki. For CD booting via boot facilities other than PC-BIOS and EFI, and for booting from USB sticks or hard disks, see the next section about -the Sytem Area. +the System Area. -b iso_rr_path Specify the boot image file which shall be mentioned in the current @@ -1037,8 +1037,8 @@ Examples: Set the number of sectors per head for the MBR partition table. 0 chooses a default value. Maximum is 63. The product partition_sec_hd * partition_hd_cyl * 512 is the - cylinder size. It should be divisible by 2048 in order to allow - exact alignment. With appended partitions and + cylinder size. It should be divisible by 2048 in order to make + exact alignment possible. With appended partitions and -appended_part_as_gpt there is no limit for the number of cylinders. Else there may be at most 1024 of them. If the cylinder size is too small to stay below the limit, then @@ -2229,28 +2229,28 @@ Node: Options6725 Node: Loading7452 Node: SetInsert9752 Node: SetProduct14161 -Node: SetCompl19331 -Node: SetExtras21923 -Node: SetHide31287 -Node: ImageId32591 -Node: Bootable36762 -Node: SystemArea41929 -Node: Charset56501 -Node: Jigdo57526 -Node: Miscellaneous61803 -Node: Examples63448 -Node: ExSimple63942 -Node: ExGraft64425 -Node: ExMkisofs65725 -Node: ExGrowisofs66991 -Node: ExIncBackup68181 -Node: ExIncBckAcc71342 -Node: ExBootable73031 -Node: Files77213 -Node: Seealso78308 -Node: Bugreport78957 -Node: Legal79548 -Node: CommandIdx80445 -Node: ConceptIdx95313 +Node: SetCompl19337 +Node: SetExtras21929 +Node: SetHide31292 +Node: ImageId32596 +Node: Bootable36767 +Node: SystemArea41935 +Node: Charset56515 +Node: Jigdo57540 +Node: Miscellaneous61817 +Node: Examples63462 +Node: ExSimple63956 +Node: ExGraft64439 +Node: ExMkisofs65739 +Node: ExGrowisofs67005 +Node: ExIncBackup68195 +Node: ExIncBckAcc71356 +Node: ExBootable73045 +Node: Files77227 +Node: Seealso78322 +Node: Bugreport78971 +Node: Legal79562 +Node: CommandIdx80459 +Node: ConceptIdx95327  End Tag Table diff --git a/libisoburn/trunk/xorriso/xorrisofs.texi b/libisoburn/trunk/xorriso/xorrisofs.texi index d2cac9f3..6942fff0 100644 --- a/libisoburn/trunk/xorriso/xorrisofs.texi +++ b/libisoburn/trunk/xorriso/xorrisofs.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 XORRISOFS 1 "Version 1.4.1, Sep 13, 2015" +@c man .TH XORRISOFS 1 "Version 1.4.1, Sep 20, 2015" @c man .\" Please adjust this date whenever revising the manpage. @c man .\" @c man .\" Some roff macros, for reference: @@ -533,7 +533,7 @@ simultaneous production of more image content. @cindex Table-of-content, emulation, @minus{}@minus{}emul-toc Write a second superblock with the first session into random-access files. If further sessions get appended and the first superblock gets updated, -then the second superblock will not be overwritten. This allows to still +then the second superblock will not be overwritten. So it is still possible to mount the first session and to find the start blocks of the further sessions. @* The price is 64 KiB extra space consumption. If -partition_offset is non-zero, @@ -819,7 +819,7 @@ operating systems which mount the image. Option -D disables this deep directory relocation, and thus violates ISO 9660 specs. @* -xorrisofs has -D set by default. If given explicitely then it overrides +xorrisofs has -D set by default. If given explicitly then it overrides the options -rr_reloc_dir and -hide-rr-moved. @c man .TP @item -disable-deep-relocation @@ -1252,7 +1252,7 @@ FreeBSD AvgLiveCD wiki. @sp 1 For CD booting via boot facilities other than PC-BIOS and EFI, and for booting from USB sticks or hard disks, see the next section -about the Sytem Area. +about the System Area. @* @table @asis @sp 1 @@ -1579,7 +1579,7 @@ Set the number of sectors per head for the MBR partition table. 0 chooses a default value. Maximum is 63. @* The product partition_sec_hd * partition_hd_cyl * 512 is the cylinder size. -It should be divisible by 2048 in order to allow exact alignment. +It should be divisible by 2048 in order to make exact alignment possible. With appended partitions and -appended_part_as_gpt there is no limit for the number of cylinders. Else there may be at most 1024 of them. If the cylinder size is too small to stay below the limit,