Changed wrong use of "resp." in docs

libisoburn/trunk/README

@@ -113,7 +113,7 @@ If you want to explictely allow only the use of libedit, then do
 Other deliberate dependency reduction options of ./configure are:
     --disable-libacl   avoid use of ACL functions like acl_to_text()
     --disable-xattr    avoid use of xattr functions like listxattr() on Linux
-                       resp. extattr_list_file() on FreeBSD
+                       or extattr_list_file() on FreeBSD
     --disable-zlib     avoid use of zlib functions like compress2()
     --disable-libjte   avoid use of libjte for -jigdo command
 
@@ -204,9 +204,9 @@ even if writing is intended.
 
 A list of rw-accessible drives can be obtained by
     xorriso -devices
-resp. by xorriso API call
+or by xorriso API call
     Xorriso_option_devices()
-resp. by libburn API call
+or by libburn API call
     burn_drive_scan()
 
 A possible source of problems are hald or other automounters. 

libisoburn/trunk/doc/comments

@@ -42,7 +42,7 @@ To build libisoburn go into its toplevel directory and execute:
 
 -  make
 
-To make the library and the xorriso application accessible for running resp.
+To make the library and the xorriso application accessible for running and
 software development:
 
 -  make install
@@ -73,7 +73,7 @@ extensions. Its API is described in libisofs/libisofs.h .
 
 For xorriso features see its man page xorriso/xorriso.1 or
 its GNU info document xorriso/xorriso.info.
-For the corresponding C language API see libisoburn/xorriso.h (resp.
+For the corresponding C language API see libisoburn/xorriso.h (or
 xorriso/xorriso.h in the build directory).
 The implementation this API is part of libisoburn.
 The xorriso command line tool gets installed as dynamically linked

libisoburn/trunk/doc/partition_offset.wiki

@@ -22,8 +22,8 @@ extend the unclaimed area into vital blocks of the ISO image.
 Meanwhile Debian
 [http://cdimage.debian.org/cdimage/daily-builds/daily/current/ daily]
 and [http://cdimage.debian.org/cdimage/weekly-builds/ weekly] builds make
-use of this feature with their bootable ISO images for i386 and amd64. E.g. 
+use of this feature with their bootable ISO images for i386. E.g. 
-[http://cdimage.debian.org/cdimage/daily-builds/daily/current/i386/iso-cd/debian-testing-i386-businesscard.iso debian-testing-i386-businesscard.iso].
+[http://cdimage.debian.org/cdimage/daily-builds/daily/current/i386/iso-cd/debian-testing-i386-netinst.iso debian-testing-i386-netinst.iso].
 
 According to a
 [http://syslinux.zytor.com/archives/2011-March/016201.html thread of march 2011]
@@ -51,12 +51,12 @@ with 16 * 2kB partition offset. Isohybrid MBR patching was done by xorriso.
 Details:
 
 The first 32 kB of an ISO 9660 image are called System Area and may host any
-byte pattern. In the case of RIPLinux-9.3-non-X.iso only the first 512 bytes
+byte pattern. The first 512 bytes of RIPLinux-9.3-non-X.iso contain the
-are non-zero. But to avoid any assumptions, all 32 kB get copied here.
+isohybrid capable MBR, which will be re-used in this example.
 {{{
-  dd if=RIPLinux-9.3-non-X.iso bs=1K count=32 of=RIPLinux-9.3-non-X.sysarea
+  dd if=RIPLinux-9.3-non-X.iso bs=512 count=1 of=RIPLinux-9.3-non-X.mbr
 }}}
-Normally the System Area file with its MBR is provided by the Syslinux
+Normally the isohybrid MBR is provided by the Syslinux
 installation under the name isohdp[fp]x*.bin .
 E.g. /usr/lib/syslinux/isohdpfx.bin
 
@@ -68,7 +68,7 @@ The files of the image are made accessible for reading
 A new ISO image gets composed. The first three lines of arguments are taken
 from the prescriptions of ISOLINUX wiki and adapted to the names used in
 RIPLinux-9.3-non-X.iso.
-Option -isohybrid-mbr imports the copied System Area and patches the MBR
+Option -isohybrid-mbr imports the copied MBR and patches it
 according to rules published by hpa on Syslinux mailing list.
 Option -partition_offset 16 causes the first partition to start at 2 kB block
 number 16. It also prepares the image to be mountable by this partition, too.
@@ -77,7 +77,7 @@ number 16. It also prepares the image to be mountable by this partition, too.
      -o new_image.iso \
      -b boot/isolinux/isolinux.bin -c boot/boot.cat \
      -no-emul-boot -boot-load-size 4 -boot-info-table \
-     -isohybrid-mbr RIPLinux-9.3-non-X.sysarea \
+     -isohybrid-mbr RIPLinux-9.3-non-X.mbr \
      -partition_offset 16 \
      /mnt
 }}}
@@ -177,7 +177,7 @@ Open questions:
 
 - Shall the partition of an isohybrid image be marked bootable ?
 Currently xorriso keeps the 0x80 mark of an imported MBR
-resp. the 0x80 mark which xorriso sets by its own MBR
+and the 0x80 mark which xorriso sets by its own MBR
 preparations.
   - If not to be marked bootable:
     What equipment would the partition need to justify having the mark ?
@@ -196,7 +196,7 @@ int iso_write_opts_set_part_offset(IsoWriteOpts *opts,
 int iso_write_opts_set_system_area(IsoWriteOpts *opts, char data[32768],
                                    int options, int flag);
 }}}
-resp. by libisoburn calls
+or by libisoburn calls
 {{{
 int isoburn_igopt_set_part_offset(struct isoburn_imgen_opts  *opts,
                                   uint32_t block_offset_2k,
@@ -212,7 +212,7 @@ int isoburn_igopt_set_system_area(struct isoburn_imgen_opts *o,
 int isoburn_igopt_get_system_area(struct isoburn_imgen_opts *o,
                                   char data[32768], int *options);
 }}}
-resp. by xorriso options
+or by xorriso options
 {{{
   -boot_image any partition_offset=(2kb_block_adr)
   -boot_image any partition_sec_hd=(number)

libisoburn/trunk/frontend/xorriso-tcltk

@@ -102,7 +102,7 @@ set reply_conn ""
 set cmd_pipe_adr ""
 set reply_pipe_adr ""
 
-# The command to send (resp. the command most recently sent)
+# The command to send (or the command most recently sent)
 set cmdline ""
 # Wether to clear the cmdline after sending
 set cmdline_clear true
@@ -1632,7 +1632,7 @@ proc isodir_up {} {
 }
 
 
-# Rename resp. move the files which are selected in the .isolist box.
+# Rename or move the files which are selected in the .isolist box.
 # The target is defined by the .isomanip_move_target text field.
 # Called when the "Move to:" button is hit.
 #
@@ -4425,7 +4425,7 @@ The GUI window is separated into three main areas:
   Either toggle in the address of the hard disk directory,
   or click on the \"/\" button to the right of the text field to get
   a file browser.
-- Hit the Return key in the text field resp. double click on a name in the
+- Hit the Return key in the text field or double click on a name in the
   browser to schedule the disk directory for writing to the medium.
   You may of course insert several directories or files that way.
 - Close the browser and click the \"Write ISO session\" button in the
@@ -4603,7 +4603,7 @@ which asks for the target of appending to script. Address \"-\" means
 standard error. Else it must not yet exist or be a writable data file.
 
 The \"Log pipes\" switch controls whether all xorriso commands and replies
-shall be logged to standard error resp. to the file that has been given
+shall be logged to standard error or to the file that has been given
 with program argument --pipe_log_file.
 Caution: This log is verbous.
 
@@ -5160,7 +5160,7 @@ directory.
 This reads the content of all data files which are underneath the current ISO
 directory and which have MD5 checksums in the ISO image. 
 ISO images bear MD5 checksums for each data file if they were produced
-by xorriso with -md5 \"on\" resp. -for_backup. This frontend enables
+by xorriso with -md5 \"on\" or -for_backup. This frontend enables
 this feature on startup."
   }
   if {$what == "isolist"} {
@@ -5191,7 +5191,7 @@ of the \"Delete\" button, and the subject of the \"Verify\" button."
 This reads the content of all data files which are selected or underneath
 selected directories and which have MD5 checksums in the ISO image. 
 ISO images bear MD5 checksums for each data file if they were produced
-by xorriso with -md5 \"on\" resp. -for_backup. This frontend enables
+by xorriso with -md5 \"on\" or -for_backup. This frontend enables
 this feature on startup."
   }
   if {$what == "Delete"} {
@@ -5230,7 +5230,7 @@ Useful to create a target directory before moving the selection."
     return \
 "The text field between the \"Move to:\" button and the \"Make dir\" button
 serves both buttons by providing the target address for renaming
-resp. directory creation.
+or directory creation, respectively.
 
 If you hit the Return key in this field, it will trigger \"Mode to:\"."
   }
@@ -5320,8 +5320,8 @@ its content and bring it into effect by hitting the Return key.\n"
   if {$have_bwidget == 1} { 
 
     set text "${text}
-In the tree display click on the \"+\" resp. \"-\" nodes to open resp.
+In the tree display click on the \"+\" or \"-\" nodes to open or
-close directories.
+close directories, respectively.
 
 Double click on an item to bring it into effect with the associated
 text field. I.e. double clicking also hits the Return key in that field.\n"

libisoburn/trunk/libisoburn/libisoburn.h

@@ -53,7 +53,7 @@ Macros ISO_* and functions iso_*() are documented in <libisofs/libisofs.h>
                              Usage model
 
 There may be an input drive and an output drive. Either of them may be missing
-with the consequence that no reading resp. writing is possible.
+with the consequence that no reading or no writing is possible.
 Both drive roles can be fulfilled by the same drive.
 
 Input can be a random access readable libburn drive:
@@ -61,7 +61,7 @@ Input can be a random access readable libburn drive:
 Output can be any writeable libburn drive:
   writeable optical media in burner, writeable file objects (no directories).
 
-libburn demands rw-permissions to drive device file resp. file object.
+libburn demands rw-permissions to drive device file or file object.
 
 If the input drive provides a suitable ISO RockRidge image, then its tree
 may be loaded into memory and can then be manipulated by libisofs API calls.
@@ -149,7 +149,7 @@ must provide definitions for uint32_t and uint8_t.
 This can be achieved either:
 - by using autotools which will define HAVE_STDINT_H or HAVE_INTTYPES_H 
   according to its ./configure tests,
-- or by defining the macros HAVE_STDINT_H resp. HAVE_INTTYPES_H according
+- or by defining the macros HAVE_STDINT_H or HAVE_INTTYPES_H according
   to the local situation,
 - or by appropriately defining uint32_t and uint8_t by other means,
   e.g. by including inttypes.h before including libisofs.h and libisoburn.h
@@ -389,7 +389,7 @@ int isoburn_set_msgs_submit(int (*msgs_submit)(void *handle, int error_code,
                                void *submit_handle, int submit_flag, int flag);
 
 
-/** Acquire a target drive by its filesystem path resp. libburn persistent
+/** Acquire a target drive by its filesystem path or libburn persistent
     address.
     Wrapper for: burn_drive_scan_and_grab()
     @since 0.1.0
@@ -399,7 +399,8 @@ int isoburn_set_msgs_submit(int (*msgs_submit)(void *handle, int error_code,
                   The returned array should be freed via burn_drive_info_free()
                   when the drive is no longer needed. But before this is done
                   one has to call isoburn_drive_release(drive_infos[0].drive).
-    @param adr    The persistent address of the desired drive.
+    @param adr    The persistent address of the desired drive or the path
+                  to a file object.
     @param load   1 attempt to load the disc tray. 0 no attempt,rather failure.
     @return       1 = success , 0 = drive not found , <0 = other error
 */
@@ -407,7 +408,7 @@ int isoburn_drive_scan_and_grab(struct burn_drive_info *drive_infos[],
                                 char* adr, int load);
 
 
-/** Acquire a target drive by its filesystem path resp. libburn persistent
+/** Acquire a target drive by its filesystem path or libburn persistent
     address. This is a modern successor of isoburn_drive_scan_and_grab().  
     Wrapper for: burn_drive_scan_and_grab()
     @since 0.1.2
@@ -417,7 +418,8 @@ int isoburn_drive_scan_and_grab(struct burn_drive_info *drive_infos[],
                   The returned array should be freed via burn_drive_info_free()
                   when the drive is no longer needed. But before this is done
                   one has to call isoburn_drive_release(drive_infos[0].drive).
-    @param adr    The persistent address of the desired drive.
+    @param adr    The persistent address of the desired drive or the path
+                  to a file object.
     @param flag   bit0= attempt to load the disc tray.
                         Else: failure if not loaded.
                   bit1= regard overwriteable media as blank
@@ -839,7 +841,7 @@ int isoburn_ropt_get_data_cache(struct isoburn_read_opts *o,
 
 /** Which existing ISO 9660 extensions in the image to read or not to read.
     Whether to read the content of an existing image at all.
-    The bits can be combined by | resp. inquired by &.
+    The bits can be combined by | and inquired by &.
     @since 0.1.0
     @param ext Bitfield:
                bit0= norock
@@ -1474,7 +1476,7 @@ int isoburn_igopt_get_effective_lba(struct isoburn_imgen_opts *o, int *lba);
 int isoburn_igopt_get_data_start(struct isoburn_imgen_opts *o, int *lba);
 
 
-/** Set resp. get parameters "name" and "timestamp" for a scdbackup checksum
+/** Set or get parameters "name" and "timestamp" for a scdbackup checksum
     tag. It will be appended to the libisofs session tag if the image starts at
     LBA 0. See isoburn_disc_track_lba_nwa. The scdbackup tag can be used
     to verify the image by command scdbackup_verify $device -auto_end.
@@ -1585,7 +1587,7 @@ int isoburn_igopt_get_system_area(struct isoburn_imgen_opts *o,
     The additional volume descriptor set and trees will allow to mount the
     ISO image at the start of the first partition, while it is still possible
     to mount it via the normal first volume descriptor set and tree at the
-    start of the image resp. storage device.
+    start of the image or storage device.
     This makes few sense on optical media. But on USB sticks it creates a
     conventional partition table which makes it mountable on e.g. Linux via
     /dev/sdb and /dev/sdb1 alike.
@@ -1682,7 +1684,7 @@ int isoburn_igopt_detach_jte(struct isoburn_imgen_opts *opts,
                              void **libjte_handle);
 
 
-/** Set resp. get the number of trailing zero byte blocks to be written by
+/** Set or get the number of trailing zero byte blocks to be written by
     libisofs. The image size counter of the emerging ISO image will include
     them. Eventual checksums will take them into respect.
     They will be written immediately before the eventual image checksum area
@@ -1795,7 +1797,7 @@ int isoburn_igopt_set_partition_img(struct isoburn_imgen_opts *opts,
            image_paths[] of the same index is not NULL.
     @param image_paths
            Its elements get filled with either NULL or a pointer to a string
-           with a file address resp. an empty text.
+           with a file address or an empty text.
     @return
            <0 = error
             0 = no partition image set
@@ -2336,7 +2338,7 @@ int isoburn_prepare_blind_grow(struct burn_drive *in_drive,
     call described here.
     If this call returns 0 or 1 then the write thread of libisofs has ended.
     @since 0.1.0
-    @param input_drive   The drive resp. in_drive which was used with the
+    @param input_drive   The drive or in_drive which was used with the
                          preparation call.
     @param output_drive  The out_drive used with isoburn_prepare_new_image(),
                          NULL if none.
@@ -2430,7 +2432,7 @@ int isoburn_activate_session(struct burn_drive *d);
     This call is not mandatory. But without it, messages from the ending
     threads might appear after the application ended its write procedure.
     @since 0.1.0
-    @param input_drive   The drive resp. in_drive which was used with the
+    @param input_drive   The drive or in_drive which was used with the
                          preparation call.
     @param output_drive  The out_drive used with isoburn_prepare_new_image(),
                          NULL if none.

libisoburn/trunk/releng/README

@@ -72,7 +72,7 @@ go to directory ./releng, and execute
 or if you want to use an installed xorriso program:
 
   ./run_all_auto -x $(which xorriso)
-resp.
+
   ./run_all_auto -x $(type -p xorriso)
 
 There are several options which work with run_all_auto and any single test.
@@ -215,7 +215,7 @@ Your test must not start if no file
 exists, i.e. if the current working directory is not ./releng.
 If your test creates own files on disk, then it must do this underneath
 directory
-   ./releng_generated_data/$test_name (resp. $GEN_DATA_DIR, see below).
+   ./releng_generated_data/$test_name (or $GEN_DATA_DIR, see below).
 
 In case of failure, issue a line to stdout that begins by the word "FAIL",
 followed by " : " and the name of the test (e.g. $SELF, see below).

libisoburn/trunk/xorriso/README_gnu_xorriso

@@ -105,7 +105,7 @@ If you want to explictely allow only the use of libedit, then do
 Other deliberate dependency reduction options of ./configure are:
     --disable-libacl   avoid use of ACL functions like acl_to_text()
     --disable-xattr    avoid use of xattr functions like listxattr() on Linux
-                       resp. extattr_list_file() on FreeBSD
+                       or extattr_list_file() on FreeBSD
     --disable-zlib     avoid use of zlib functions like compress2() 
                        this also avoids the use of libjte and option -jigdo.
 

libisoburn/trunk/xorriso/make_xorriso_1.c

@@ -3,8 +3,9 @@
   ( cd xorriso ; cc -g -Wall -o make_xorriso_1 make_xorriso_1.c )
 */
 /*
-   Specialized converter from xorriso/xorriso.texi to xorriso/xorriso.1
+   Specialized converter from xorriso/xorriso.texi to xorriso/xorriso.1,
-   resp. from xorriso/xorrisofs.texi to xorriso/xorrisofs.1
+   or from xorriso/xorrisofs.texi to xorriso/xorrisofs.1,
+   or from xorriso/xorrecord.texi to xorriso/xorrecord.1.
 
    The conversion rules are described at the beginning of xorriso/xorriso.texi
 

libisoburn/trunk/xorriso/xorriso_timestamp.h

@@ -1 +1 @@
-#define Xorriso_timestamP "2015.07.31.165816"
+#define Xorriso_timestamP "2015.07.31.171227"

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, Jun 30, 2015"
+.TH XORRISOFS 1 "Version 1.4.1, Jul 30, 2015"
 .\" Please adjust this date whenever revising the manpage.
 .\"
 .\" Some roff macros, for reference:
@@ -607,8 +607,8 @@ restore them on the same systems when extracting files from the ISO image.
 \fB--xattr\fR
 .br
 Enable recording and loading of GNU/Linux or FreeBSD extended attributes in
-user namespace (see man getfattr, man attr,
+user namespace (see man getfattr and man attr,
-resp. man getextattr, man 9 extattr).
+man getextattr and man 9 extattr, respectively).
 They will not be in effect with mounted ISO images. But xorriso can
 restore them on the same systems when extracting files from the ISO image.
 .TP
@@ -639,7 +639,7 @@ If disk_path is not an empty string, then append a scdbackup checksum record
 to the end of this file. record_name is a word that gets part of tag
 and record.
 .br
-Program scdbackup_verify will recognize and verify tag resp. record.
+Program scdbackup_verify will recognize and verify tag and file record.
 .TP
 \fB\-J\fR
 .br
@@ -1706,7 +1706,7 @@ sums against the current file content on hard disk.
 .br
 .sp 1
 With \fBmount\fR option \fB\-o "sbsector="\fR on GNU/Linux
-resp. \fB\-s\fR on FreeBSD or NetBSD
+or \fB\-s\fR on FreeBSD or NetBSD
 it is possible to access the session trees which represent the older backup
 versions. With CD media, GNU/Linux mount accepts session numbers directly by
 its option "session=".
@@ -1988,7 +1988,7 @@ please send electronic mail to the public list <bug\-xorriso@gnu.org>.
 If more privacy is desired, mail to <scdbackup@gmx.net>.
 .br
 Please describe what you expect \fBxorriso\fR to do,
-the program arguments resp. commands by which you tried to achieve it,
+the program arguments or dialog commands by which you tried to achieve it,
 the messages of \fBxorriso\fR, and the undesirable outcome of your
 program run.
 .br

libisoburn/trunk/xorriso/xorrisofs.info

@@ -560,10 +560,10 @@ File: xorrisofs.info,  Node: SetExtras,  Next: SetHide,  Prev: SetCompl,  Up: Op
 --xattr
 
      Enable recording and loading of GNU/Linux or FreeBSD extended
-     attributes in user namespace (see man getfattr, man attr, resp.
+     attributes in user namespace (see man getfattr and man attr, man
-     man getextattr, man 9 extattr).  They will not be in effect with
+     getextattr and man 9 extattr, respectively).  They will not be in
-     mounted ISO images.  But xorriso can restore them on the same
+     effect with mounted ISO images.  But xorriso can restore them on
-     systems when extracting files from the ISO image.
+     the same systems when extracting files from the ISO image.
 --md5
 
      Enable recording of MD5 checksums for the overall ISO image and for
@@ -586,7 +586,7 @@ File: xorrisofs.info,  Node: SetExtras,  Next: SetHide,  Prev: SetCompl,  Up: Op
      disk_path is not an empty string, then append a scdbackup checksum
      record to the end of this file.  record_name is a word that gets
      part of tag and record.
-     Program scdbackup_verify will recognize and verify tag resp.
+     Program scdbackup_verify will recognize and verify tag and file
      record.
 -J
 
@@ -1502,10 +1502,10 @@ failure will not spoil the old medium, of course.
 --old-root-no-ino .  In this case an update run will compare recorded
 MD5 sums against the current file content on hard disk.
 
-   With *mount* option *-o "sbsector="* on GNU/Linux resp.  *-s* on
+   With *mount* option *-o "sbsector="* on GNU/Linux or *-s* on FreeBSD
-FreeBSD or NetBSD it is possible to access the session trees which
+or NetBSD it is possible to access the session trees which represent the
-represent the older backup versions.  With CD media, GNU/Linux mount
+older backup versions.  With CD media, GNU/Linux mount accepts session
-accepts session numbers directly by its option "session=".
+numbers directly by its option "session=".
 Multi-session media and most overwriteable media written by xorriso can
 tell the sbsectors of their sessions by xorriso option -toc:
 
@@ -1741,8 +1741,8 @@ please send electronic mail to the public list <bug-xorriso@gnu.org>.
 If more privacy is desired, mail to <scdbackup@gmx.net>.
 
    Please describe what you expect 'xorriso' to do, the program
-arguments resp.  commands by which you tried to achieve it, the messages
+arguments or dialog commands by which you tried to achieve it, the
-of 'xorriso', and the undesirable outcome of your program run.
+messages of 'xorriso', and the undesirable outcome of your program run.
 
    Expect to get asked more questions before solutions can be proposed.
 
@@ -2218,26 +2218,26 @@ Node: SetInsert9752
 Node: SetProduct14161
 Node: SetCompl19331
 Node: SetExtras21923
-Node: SetHide30601
+Node: SetHide30618
-Node: ImageId31905
+Node: ImageId31922
-Node: Bootable36076
+Node: Bootable36093
-Node: SystemArea41243
+Node: SystemArea41260
-Node: Charset55815
+Node: Charset55832
-Node: Jigdo56840
+Node: Jigdo56857
-Node: Miscellaneous61117
+Node: Miscellaneous61134
-Node: Examples62762
+Node: Examples62779
-Node: ExSimple63256
+Node: ExSimple63273
-Node: ExGraft63739
+Node: ExGraft63756
-Node: ExMkisofs65039
+Node: ExMkisofs65056
-Node: ExGrowisofs66305
+Node: ExGrowisofs66322
-Node: ExIncBackup67495
+Node: ExIncBackup67512
-Node: ExIncBckAcc70660
+Node: ExIncBckAcc70673
-Node: ExBootable72349
+Node: ExBootable72362
-Node: Files76531
+Node: Files76544
-Node: Seealso77626
+Node: Seealso77639
-Node: Bugreport78275
+Node: Bugreport78288
-Node: Legal78863
+Node: Legal78879
-Node: CommandIdx79760
+Node: CommandIdx79776
-Node: ConceptIdx94555
+Node: ConceptIdx94571
 
 End Tag Table

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, Jun 30, 2015"
+@c man .TH XORRISOFS 1 "Version 1.4.1, Jul 30, 2015"
 @c man .\" Please adjust this date whenever revising the manpage.
 @c man .\"
 @c man .\" Some roff macros, for reference:
@@ -861,8 +861,8 @@ restore them on the same systems when extracting files from the ISO image.
 @cindex xattr, record and load, @minus{}@minus{}xattr
 @*
 Enable recording and loading of GNU/Linux or FreeBSD extended attributes in
-user namespace (see man getfattr, man attr,
+user namespace (see man getfattr and man attr,
-resp. man getextattr, man 9 extattr).
+man getextattr and man 9 extattr, respectively).
 They will not be in effect with mounted ISO images. But xorriso can
 restore them on the same systems when extracting files from the ISO image.
 @c man .TP
@@ -899,7 +899,7 @@ If disk_path is not an empty string, then append a scdbackup checksum record
 to the end of this file. record_name is a word that gets part of tag
 and record.
 @*
-Program scdbackup_verify will recognize and verify tag resp. record.
+Program scdbackup_verify will recognize and verify tag and file record.
 @c man .TP
 @item -J
 @kindex -J   enable production of Joliet directory tree
@@ -2258,7 +2258,7 @@ sums against the current file content on hard disk.
 @sp 1
 @c man .sp 1
 With @strong{mount} option @strong{-o "sbsector="} on GNU/Linux
-resp. @strong{-s} on FreeBSD or NetBSD
+or @strong{-s} on FreeBSD or NetBSD
 it is possible to access the session trees which represent the older backup
 versions. With CD media, GNU/Linux mount accepts session numbers directly by
 its option "session=".
@@ -2621,7 +2621,7 @@ If more privacy is desired, mail to @email{scdbackup@@gmx.net}.
 @*
 @sp 1
 Please describe what you expect @command{xorriso} to do,
-the program arguments resp. commands by which you tried to achieve it,
+the program arguments or dialog commands by which you tried to achieve it,
 the messages of @command{xorriso}, and the undesirable outcome of your
 program run.
 @*