regen without insane line wrapping.

3 files changed, 108 insertions, 106 deletions

diff --git a/archivers/pax/files/cpio.cat1 b/archivers/pax/files/cpio.cat1
index 5c4c83d8458..4300cf5f04a 100644
--- a/archivers/pax/files/cpio.cat1
+++ b/archivers/pax/files/cpio.cat1
@@ -12,8 +12,8 @@ SSYYNNOOPPSSIISS
 
 DDEESSCCRRIIPPTTIIOONN
      The ccppiioo command copies files to and from a ccppiioo archive.  If the archive
-     is of the form: _[_[_u_s_e_r_@_]_h_o_s_t_:_]_f_i_l_e then the archive will be processed us-
-     ing rmt(8).
+     is of the form: _[_[_u_s_e_r_@_]_h_o_s_t_:_]_f_i_l_e then the archive will be processed
+     using rmt(8).
 
      The options are as follows:
 
@@ -78,16 +78,16 @@ DDEESSCCRRIIPPTTIIOONN
                      Read archive written with a block size of _b_y_t_e_s.
 
              --dd, ----mmaakkee--ddiirreeccttoorriieess
-                     Create any intermediate directories as needed during re-
-                     store.
+                     Create any intermediate directories as needed during
+                     restore.
 
              --EE _f_i_l_e, ----ppaatttteerrnn--ffiillee _f_i_l_e
                      Read list of file name patterns to extract or list from
                      _f_i_l_e.
 
              --ff, ----nnoonnmmaatthhiinngg
-                     Restore all files except those matching the _p_a_t_t_e_r_n_s giv-
-                     en on the command line.
+                     Restore all files except those matching the _p_a_t_t_e_r_n_s
+                     given on the command line.
 
              --FF _a_r_c_h_i_v_e, ----ffiillee _a_r_c_h_i_v_e
 
@@ -119,8 +119,8 @@ DDEESSCCRRIIPPTTIIOONN
                      tories will be created.
 
              --uu, ----uunnccoonnddiittiioonnaall
-                     Overwrite files even when the file in the archive is old-
-                     er than the one that will be overwritten.
+                     Overwrite files even when the file in the archive is
+                     older than the one that will be overwritten.
 
              --vv, ----vveerrbboossee
                      Be verbose about operations.  List filenames as they are
diff --git a/archivers/pax/files/pax.cat1 b/archivers/pax/files/pax.cat1
index ecc61dea9f9..0eb162f6451 100644
--- a/archivers/pax/files/pax.cat1
+++ b/archivers/pax/files/pax.cat1
@@ -48,18 +48,18 @@ DDEESSCCRRIIPPTTIIOONN
      --ww      _W_r_i_t_e.  ppaaxx writes an archive containing the _f_i_l_e operands to
              standard output using the specified archive format.  When no _f_i_l_e
              operands are specified, a list of files to copy with one per line
-             is read from standard input.  When a _f_i_l_e operand is also a di-
-             rectory, the entire file hierarchy rooted at that directory will
-             be included.
+             is read from standard input.  When a _f_i_l_e operand is also a
+             directory, the entire file hierarchy rooted at that directory
+             will be included.
 
      --rr --ww   _C_o_p_y.  ppaaxx copies the _f_i_l_e operands to the destination _d_i_r_e_c_t_o_r_y.
              When no _f_i_l_e operands are specified, a list of files to copy with
              one per line is read from the standard input.  When a _f_i_l_e oper-
              and is also a directory the entire file hierarchy rooted at that
              directory will be included.  The effect of the _c_o_p_y is as if the
-             copied files were written to an archive file and then subsequent-
-             ly extracted, except that there may be hard links between the
-             original and the copied files (see the --ll option below).
+             copied files were written to an archive file and then subse-
+             quently extracted, except that there may be hard links between
+             the original and the copied files (see the --ll option below).
 
              _W_a_r_n_i_n_g: The destination _d_i_r_e_c_t_o_r_y must not be one of the _f_i_l_e
              operands or a member of a file hierarchy rooted at one of the
@@ -80,9 +80,9 @@ OOPPEERRAANNDDSS
      members.  Archive members are selected using the pattern matching nota-
      tion described by fnmatch(3).  When the _p_a_t_t_e_r_n operand is not supplied,
      all members of the archive will be selected.  When a _p_a_t_t_e_r_n matches a
-     directory, the entire file hierarchy rooted at that directory will be se-
-     lected.  When a _p_a_t_t_e_r_n operand does not select at least one archive mem-
-     ber, ppaaxx will write these _p_a_t_t_e_r_n operands in a diagnostic message to
+     directory, the entire file hierarchy rooted at that directory will be
+     selected.  When a _p_a_t_t_e_r_n operand does not select at least one archive
+     member, ppaaxx will write these _p_a_t_t_e_r_n operands in a diagnostic message to
      standard error and then exit with a non-zero exit status.
 
      The _f_i_l_e operand specifies the pathname of a file to be copied or
@@ -94,8 +94,8 @@ OOPPTTIIOONNSS
      The following options are supported:
 
      --rr    Read an archive file from standard input and extract the specified
-           _f_i_l_e_s.  If any intermediate directories are needed in order to ex-
-           tract an archive member, these directories will be created as if
+           _f_i_l_e_s.  If any intermediate directories are needed in order to
+           extract an archive member, these directories will be created as if
            mkdir(2) was called with the bitwise inclusive OR of S_IRWXU,
            S_IRWXG, and S_IRWXO as the mode argument.  When the selected ar-
            chive format supports the specification of linked files and these
@@ -111,30 +111,31 @@ OOPPTTIIOONNSS
      --aa    Append _f_i_l_e_s to the end of an archive that was previously written.
            If an archive format is not specified with a --xx option, the format
            currently being used in the archive will be selected.  Any attempt
-           to append to an archive in a format different from the format al-
-           ready used in the archive will cause ppaaxx to exit immediately with a
-           non-zero exit status.  The blocking size used in the archive volume
-           where writing starts will continue to be used for the remainder of
-           that archive volume.
+           to append to an archive in a format different from the format
+           already used in the archive will cause ppaaxx to exit immediately with
+           a non-zero exit status.  The blocking size used in the archive vol-
+           ume where writing starts will continue to be used for the remainder
+           of that archive volume.
 
            _W_a_r_n_i_n_g: Many storage devices are not able to support the opera-
-           tions necessary to perform an append operation.  Any attempt to ap-
-           pend to an archive stored on such a device may damage the archive
+           tions necessary to perform an append operation.  Any attempt to
+           append to an archive stored on such a device may damage the archive
            or have other unpredictable results.  Tape drives in particular are
            more likely to not support an append operation.  An archive stored
            in a regular file system file or on a disk device will usually sup-
            port an append operation.
 
      --bb _b_l_o_c_k_s_i_z_e
-           When _w_r_i_t_i_n_g an archive, block the output at a positive decimal in-
-           teger number of bytes per write to the archive file.  The _b_l_o_c_k_s_i_z_e
-           must be a multiple of 512 bytes with a maximum of 32256 bytes.  A
-           _b_l_o_c_k_s_i_z_e can end with k or b to specify multiplication by 1024
-           (1K) or 512, respectively.  A pair of _b_l_o_c_k_s_i_z_e_s can be separated
-           by x to indicate a product.  A specific archive device may impose
-           additional restrictions on the size of blocking it will support.
-           When blocking is not specified, the default _b_l_o_c_k_s_i_z_e is dependent
-           on the specific archive format being used (see the --xx option).
+           When _w_r_i_t_i_n_g an archive, block the output at a positive decimal
+           integer number of bytes per write to the archive file.  The
+           _b_l_o_c_k_s_i_z_e must be a multiple of 512 bytes with a maximum of 32256
+           bytes.  A _b_l_o_c_k_s_i_z_e can end with k or b to specify multiplication
+           by 1024 (1K) or 512, respectively.  A pair of _b_l_o_c_k_s_i_z_e_s can be
+           separated by x to indicate a product.  A specific archive device
+           may impose additional restrictions on the size of blocking it will
+           support.  When blocking is not specified, the default _b_l_o_c_k_s_i_z_e is
+           dependent on the specific archive format being used (see the --xx
+           option).
 
      --cc    Match all file or archive members _e_x_c_e_p_t those specified by the
            _p_a_t_t_e_r_n and _f_i_l_e operands.
@@ -160,8 +161,8 @@ OOPPTTIIOONNSS
            is skipped.  If this line consists of a single period, the file or
            archive member is processed with no modification to its name.  Oth-
            erwise, its name is replaced with the contents of the line.  ppaaxx
-           will immediately exit with a non-zero exit status if <EOF> is en-
-           countered when reading a response or if _/_d_e_v_/_t_t_y cannot be opened
+           will immediately exit with a non-zero exit status if <EOF> is
+           encountered when reading a response or if _/_d_e_v_/_t_t_y cannot be opened
            for reading and writing.
 
      --jj    Use bzip2(1) for compression when reading or writing archive files.
@@ -207,10 +208,10 @@ OOPPTTIIOONNSS
            oo   Preserve the user ID and group ID.
 
            pp   `Preserve' the file mode bits.  This is intended to be used by
-               a _u_s_e_r with regular privileges who wants to preserve all as-
-               pects of the file other than the ownership.  The file times are
-               preserved by default, but two other flags are offered to dis-
-               able this and use the time of extraction instead.
+               a _u_s_e_r with regular privileges who wants to preserve all
+               aspects of the file other than the ownership.  The file times
+               are preserved by default, but two other flags are offered to
+               disable this and use the time of extraction instead.
 
            In the preceding list, `preserve' indicates that an attribute
            stored in the archive is given to the extracted file, subject to
@@ -231,16 +232,16 @@ OOPPTTIIOONNSS
 
      --ss _r_e_p_l_s_t_r
            Modify the file or archive member names specified by the _p_a_t_t_e_r_n or
-           _f_i_l_e operands according to the substitution expression _r_e_p_l_s_t_r, us-
-           ing the syntax of the ed(1) utility regular expressions.  The for-
-           mat of these regular expressions are:
+           _f_i_l_e operands according to the substitution expression _r_e_p_l_s_t_r,
+           using the syntax of the ed(1) utility regular expressions.  The
+           format of these regular expressions are:
                  /old/new/[gp]
            As in ed(1), oolldd is a basic regular expression and nneeww can contain
            an ampersand (&), \n (where n is a digit) back-references, or
            subexpression matching.  The oolldd string may also contain <newline>
            characters.  Any non-null character can be used as a delimiter (/
-           is shown here).  Multiple --ss expressions can be specified.  The ex-
-           pressions are applied in the order they are specified on the com-
+           is shown here).  Multiple --ss expressions can be specified.  The
+           expressions are applied in the order they are specified on the com-
            mand line, terminating with the first successful substitution.  The
            optional trailing gg continues to apply the substitution expression
            to the pathname substring which starts with the first character
@@ -290,16 +291,16 @@ OOPPTTIIOONNSS
                     Std 1003.2 (``POSIX.2'') standard.  The default blocksize
                     for this format is 5120 bytes.  Inode and device informa-
                     tion about a file (used for detecting file hard links by
-                    this format) which may be truncated by this format is de-
-                    tected by ppaaxx and is repaired.
+                    this format) which may be truncated by this format is
+                    detected by ppaaxx and is repaired.
 
            _b_c_p_i_o    The old binary cpio format.  The default blocksize for
                     this format is 5120 bytes.  This format is not very porta-
                     ble and should not be used when other formats are avail-
                     able.  Inode and device information about a file (used for
                     detecting file hard links by this format) which may be
-                    truncated by this format is detected by ppaaxx and is re-
-                    paired.
+                    truncated by this format is detected by ppaaxx and is
+                    repaired.
 
            _s_v_4_c_p_i_o  The AT&T System V.4 UNIX cpio.  The default blocksize for
                     this format is 5120 bytes.  Inode and device information
@@ -308,10 +309,11 @@ OOPPTTIIOONNSS
                     by ppaaxx and is repaired.
 
            _s_v_4_c_r_c   The AT&T System V.4 UNIX cpio with file crc checksums.
-                    The default blocksize for this format is 5120 bytes.  In-
-                    ode and device information about a file (used for detect-
-                    ing file hard links by this format) which may be truncated
-                    by this format is detected by ppaaxx and is repaired.
+                    The default blocksize for this format is 5120 bytes.
+                    Inode and device information about a file (used for
+                    detecting file hard links by this format) which may be
+                    truncated by this format is detected by ppaaxx and is
+                    repaired.
 
            _t_a_r      The old BSD tar format as found in 4.3BSD.  The default
                     blocksize for this format is 10240 bytes.  Pathnames
@@ -349,11 +351,11 @@ OOPPTTIIOONNSS
            _W_a_r_n_i_n_g: Only use this option when writing an archive to a device
            which supports an end of file read condition based on last (or
            largest) write offset (such as a regular file or a tape drive).
-           The use of this option with a floppy or hard disk is not recommend-
-           ed.
+           The use of this option with a floppy or hard disk is not recom-
+           mended.
 
-     --DD    This option is the same as the --uu option, except that the file in-
-           ode change time is checked instead of the file modification time.
+     --DD    This option is the same as the --uu option, except that the file
+           inode change time is checked instead of the file modification time.
            The file inode change time can be used to select files whose inode
            information (e.g. uid, gid, etc.) is newer than a copy of the file
            in the destination _d_i_r_e_c_t_o_r_y.
@@ -363,10 +365,10 @@ OOPPTTIIOONNSS
            flawed archives to _l_i_m_i_t.  With a positive _l_i_m_i_t, ppaaxx will attempt
            to recover from an archive read error and will continue processing
            starting with the next file stored in the archive.  A _l_i_m_i_t of 0
-           will cause ppaaxx to stop operation after the first read error is de-
-           tected on an archive volume.  A _l_i_m_i_t of NONE will cause ppaaxx to at-
-           tempt to recover from read errors forever.  The default _l_i_m_i_t is a
-           small positive number of retries.
+           will cause ppaaxx to stop operation after the first read error is
+           detected on an archive volume.  A _l_i_m_i_t of NONE will cause ppaaxx to
+           attempt to recover from read errors forever.  The default _l_i_m_i_t is
+           a small positive number of retries.
 
            _W_a_r_n_i_n_g: Using this option with NONE should be used with extreme
            caution as ppaaxx may get stuck in an infinite loop on a very badly
@@ -374,8 +376,8 @@ OOPPTTIIOONNSS
 
      --GG _g_r_o_u_p
            Select a file based on its _g_r_o_u_p name, or when starting with a ##, a
-           numeric gid.  A '\' can be used to escape the ##.  Multiple --GG op-
-           tions may be supplied and checking stops with the first match.
+           numeric gid.  A '\' can be used to escape the ##.  Multiple --GG
+           options may be supplied and checking stops with the first match.
 
      --HH    Follow only command line symbolic links while performing a physical
            file system traversal.
@@ -431,8 +433,8 @@ OOPPTTIIOONNSS
            modification or both) are used in the comparison.  If neither is
            specified, the default is to use file modification time only.  The
            _m specifies the comparison of file modification time (the time when
-           the file was last written).  The _c specifies the comparison of in-
-           ode change time (the time when the file inode was last changed;
+           the file was last written).  The _c specifies the comparison of
+           inode change time (the time when the file inode was last changed;
            e.g. a change of owner, group, mode, etc).  When _c and _m are both
            specified, then the modification and inode change times are both
            compared.  The inode change time comparison is useful in selecting
@@ -454,8 +456,8 @@ OOPPTTIIOONNSS
            59), and ssss is the seconds (from 00 to 61).  Only the minute field
            mmmm is required; the others will default to the current system val-
            ues.  The ssss field may be added independently of the other fields.
-           If the century is not specified, it defaults to 1900 for years be-
-           tween 69 and 99, or 2000 for years between 0 and 68.  Time ranges
+           If the century is not specified, it defaults to 1900 for years
+           between 69 and 99, or 2000 for years between 0 and 68.  Time ranges
            are relative to the current time, so
                  --TT _1_2_3_4_/_c_m
            would select all files with a modification or inode change time of
@@ -464,13 +466,13 @@ OOPPTTIIOONNSS
 
      --UU _u_s_e_r
            Select a file based on its _u_s_e_r name, or when starting with a ##, a
-           numeric uid.  A '\' can be used to escape the ##.  Multiple --UU op-
-           tions may be supplied and checking stops with the first match.
+           numeric uid.  A '\' can be used to escape the ##.  Multiple --UU
+           options may be supplied and checking stops with the first match.
 
      --XX    When traversing the file hierarchy specified by a pathname, do not
            descend into directories that have a different device ID.  See the
-           st_dev field as described in stat(2) for more information about de-
-           vice ID's.
+           st_dev field as described in stat(2) for more information about
+           device ID's.
 
      --YY    This option is the same as the --DD option, except that the inode
            change time is checked using the pathname created after all the
diff --git a/archivers/pax/files/tar.cat1 b/archivers/pax/files/tar.cat1
index 49515625d4f..18b58a2e566 100644
--- a/archivers/pax/files/tar.cat1
+++ b/archivers/pax/files/tar.cat1
@@ -54,8 +54,8 @@ DDEESSCCRRIIPPTTIIOONN
                    rmt(8).
 
      --hh, ----ddeerreeffeerreennccee
-                   Follow symbolic links as if they were normal files or di-
-                   rectories.
+                   Follow symbolic links as if they were normal files or
+                   directories.
 
      --jj,, ----bbzziipp22,, ----bbuunnzziipp22
                    Use bzip2(1) for compression of the archive.  This option
@@ -71,8 +71,8 @@ DDEESSCCRRIIPPTTIIOONN
                    Do not preserve modification time.
 
      --OO            When creating and appending to an archive, write old-style
-                   (non-POSIX) archives.  When extracting from an archive, ex-
-                   tract to standard output.
+                   (non-POSIX) archives.  When extracting from an archive,
+                   extract to standard output.
 
      --oo, ----ppoorrttaabbiilliittyy, ----oolldd--aarrcchhiivvee
                    Don't write directory information that the older (V7) style
@@ -92,26 +92,26 @@ DDEESSCCRRIIPPTTIIOONN
                    matched.
 
      --ss _r_e_p_l_s_t_r    Modify the file or archive member names specified by the
-                   _p_a_t_t_e_r_n or _f_i_l_e operands according to the substitution ex-
-                   pression _r_e_p_l_s_t_r, using the syntax of the ed(1) utility
+                   _p_a_t_t_e_r_n or _f_i_l_e operands according to the substitution
+                   expression _r_e_p_l_s_t_r, using the syntax of the ed(1) utility
                    regular expressions.  The format of these regular expres-
                    sions are:
                          /old/new/[gp]
                    As in ed(1), oolldd is a basic regular expression and nneeww can
                    contain an ampersand (&), \n (where n is a digit) back-ref-
-                   erences, or subexpression matching.  The oolldd string may al-
-                   so contain <newline> characters.  Any non-null character
+                   erences, or subexpression matching.  The oolldd string may
+                   also contain <newline> characters.  Any non-null character
                    can be used as a delimiter (/ is shown here).  Multiple --ss
                    expressions can be specified.  The expressions are applied
                    in the order they are specified on the command line, termi-
-                   nating with the first successful substitution.  The option-
-                   al trailing gg continues to apply the substitution expres-
-                   sion to the pathname substring which starts with the first
-                   character following the end of the last successful substi-
-                   tution.  The first unsuccessful substitution stops the op-
-                   eration of the gg option.  The optional trailing pp will
-                   cause the final result of a successful substitution to be
-                   written to standard error in the following format:
+                   nating with the first successful substitution.  The
+                   optional trailing gg continues to apply the substitution
+                   expression to the pathname substring which starts with the
+                   first character following the end of the last successful
+                   substitution.  The first unsuccessful substitution stops
+                   the operation of the gg option.  The optional trailing pp
+                   will cause the final result of a successful substitution to
+                   be written to standard error in the following format:
                          <original pathname> >> <new pathname>
                    File or archive member names that substitute to the empty
                    string are not selected and will be skipped.
@@ -120,8 +120,8 @@ DDEESSCCRRIIPPTTIIOONN
 
      --ww, ----iinntteerraaccttiivvee, ----ccoonnffiirrmmaattiioonn
                    Interactively rename files.  This option causes ttaarr to
-                   prompt the user for the filename to use when storing or ex-
-                   tracting files in an archive.
+                   prompt the user for the filename to use when storing or
+                   extracting files in an archive.
 
      --zz, ----ggzziipp, ----gguunnzziipp
                    Compress archive using gzip.
@@ -141,13 +141,13 @@ DDEESSCCRRIIPPTTIIOONN
      --HH            Follow symlinks given on command line only.
 
      --PP, ----aabbssoolluuttee--ppaatthhss
-                   Do not strip leading slashes (`/') from pathnames.  The de-
-                   fault is to strip leading slashes.
+                   Do not strip leading slashes (`/') from pathnames.  The
+                   default is to strip leading slashes.
 
      --TT _f_i_l_e, ----ffiilleess--ffrroomm _f_i_l_e
-                   Read the names of files to archive or extract from the giv-
-                   en file, one per line.  A line may also specify the posi-
-                   tional argument ``--CC _d_i_r_e_c_t_o_r_y''.
+                   Read the names of files to archive or extract from the
+                   given file, one per line.  A line may also specify the
+                   positional argument ``--CC _d_i_r_e_c_t_o_r_y''.
 
      --XX _f_i_l_e, ----eexxcclluuddee--ffrroomm _f_i_l_e
                    Exclude files listed in the given file.
@@ -164,8 +164,8 @@ DDEESSCCRRIIPPTTIIOONN
      ----uunnlliinnkk      Remove files before creating them.
 
      ----uussee--ccoommpprreessss--pprrooggrraamm _p_r_o_g_r_a_m
-                   Use the named program as the program to decompress the in-
-                   put.
+                   Use the named program as the program to decompress the
+                   input.
 
      ----ffoorrccee--llooccaall
                    Do not interpret filenames that contain a `:' as remote
@@ -190,17 +190,17 @@ DDIIAAGGNNOOSSTTIICCSS
 
      Whenever ttaarr cannot create a file or a link when extracting an archive or
      cannot find a file while writing an archive, or cannot preserve the user
-     ID, group ID, file mode, or access and modification times when the --pp op-
-     tion is specified, a diagnostic message is written to standard error and
-     a non-zero exit value will be returned, but processing will continue.  In
-     the case where ttaarr cannot create a link to a file, ttaarr will not create a
-     second copy of the file.
+     ID, group ID, file mode, or access and modification times when the --pp
+     option is specified, a diagnostic message is written to standard error
+     and a non-zero exit value will be returned, but processing will continue.
+     In the case where ttaarr cannot create a link to a file, ttaarr will not create
+     a second copy of the file.
 
      If the extraction of a file from an archive is prematurely terminated by
-     a signal or error, ttaarr may have only partially extracted the file the us-
-     er wanted.  Additionally, the file modes of extracted files and directo-
-     ries may have incorrect file bits, and the modification and access times
-     may be wrong.
+     a signal or error, ttaarr may have only partially extracted the file the
+     user wanted.  Additionally, the file modes of extracted files and direc-
+     tories may have incorrect file bits, and the modification and access
+     times may be wrong.
 
      If the creation of an archive is prematurely terminated by a signal or
      error, ttaarr may have only partially created the archive which may violate