regen

man/zip_dir_add.man

diff --git a/man/zip_dir_add.man b/man/zip_dir_add.man
index 1b076ec..46bb513 100644
--- a/man/zip_dir_add.man
+++ b/man/zip_dir_add.man
@@ -51,7 +51,7 @@
 is the directory's name in the zip archive.
 The
 \fBflags\fR
-argument can be a combination of:
+argument can be any of:
 .RS
 .TP 22
 \fBZIP_FL_ENC_GUESS\fR

man/zip_file_add.man

diff --git a/man/zip_file_add.man b/man/zip_file_add.man
index 49b7130..62317cb 100644
--- a/man/zip_file_add.man
+++ b/man/zip_file_add.man
@@ -63,7 +63,7 @@
 zip_file_replace ).
 The
 \fBflags\fR
-argument can be a combination of:
+argument can be any of:
 .RS
 .TP 22
 \fBZIP_FL_OVERWRITE\fR

man/zip_file_get_comment.man

diff --git a/man/zip_file_get_comment.man b/man/zip_file_get_comment.man
index 23f4610..44abf5f 100644
--- a/man/zip_file_get_comment.man
+++ b/man/zip_file_get_comment.man
@@ -47,7 +47,7 @@
 \fBindex\fR
 in the zip archive.
 The name is in UTF-8 encoding unless
-\fBZIP_FL_NAME_RAW\fR
+\fBZIP_FL_ENC_RAW\fR
 was specified (see below).
 This pointer should not be modified or
 free(3)
@@ -69,21 +69,23 @@
 .PP
 Additionally, the following flags are supported:
 .RS
-.TP 22
-\fBZIP_FL_NAME_RAW\fR
+.TP 21
+\fBZIP_FL_ENC_RAW\fR
 Return the unmodified comment as it is in the ZIP archive.
-.TP 22
-\fBZIP_FL_NAME_GUESS\fR
+.TP 21
+\fBZIP_FL_ENC_GUESS\fR
 (Default.)
 Guess the encoding of the comment in the ZIP archive and convert it
 to UTF-8, if necessary.
-.TP 22
-\fBZIP_FL_NAME_STRICT\fR
-Follow the ZIP specification for file names and extend it to file comments,
-expecting them to be encoded in CP-437 in the ZIP archive.
-(ASCII is a subset of CP-437.)
+.TP 21
+\fBZIP_FL_ENC_STRICT\fR
+Follow the ZIP specification for file names and extend it to file
+comments, expecting them to be encoded in CP-437 in the ZIP archive
+(except if it is a UTF-8 comment from the special extra field).
 Convert it to UTF-8.
 .RE
+.I Note:
+ASCII is a subset of both CP-437 and UTF-8.
 .SH "RETURN VALUES"
 Upon successful completion, a pointer to the comment is returned,
 or

man/zip_file_rename.man

diff --git a/man/zip_file_rename.man b/man/zip_file_rename.man
index 14d2c0f..d7a1461 100644
--- a/man/zip_file_rename.man
+++ b/man/zip_file_rename.man
@@ -49,7 +49,7 @@
 \fBname.\fR
 The
 \fBflags\fR
-argument can be a combination of:
+argument can be any of:
 .RS
 .TP 22
 \fBZIP_FL_ENC_GUESS\fR

man/zip_file_set_comment.man

diff --git a/man/zip_file_set_comment.man b/man/zip_file_set_comment.man
index 984cea3..733eb58 100644
--- a/man/zip_file_set_comment.man
+++ b/man/zip_file_set_comment.man
@@ -58,7 +58,7 @@
 is 0, the file comment will be removed.
 The
 \fBflags\fR
-argument can be a combination of:
+argument can be any of:
 .RS
 .TP 22
 \fBZIP_FL_ENC_GUESS\fR

man/zip_get_archive_comment.man

diff --git a/man/zip_get_archive_comment.man b/man/zip_get_archive_comment.man
index 93b8009..1d521f8 100644
--- a/man/zip_get_archive_comment.man
+++ b/man/zip_get_archive_comment.man
@@ -44,7 +44,7 @@
 zip_get_archive_comment
 function returns the comment for the entire zip archive.
 The name is in UTF-8 encoding unless
-\fBZIP_FL_NAME_RAW\fR
+\fBZIP_FL_ENC_RAW\fR
 was specified (see below).
 This pointer should not be modified or
 free(3)
@@ -66,21 +66,22 @@
 .PP
 Additionally, the following flags are supported:
 .RS
-.TP 22
-\fBZIP_FL_NAME_RAW\fR
+.TP 21
+\fBZIP_FL_ENC_RAW\fR
 Return the unmodified archive comment as it is in the ZIP archive.
-.TP 22
-\fBZIP_FL_NAME_GUESS\fR
+.TP 21
+\fBZIP_FL_ENC_GUESS\fR
 (Default.)
 Guess the encoding of the archive comment in the ZIP archive and convert it
 to UTF-8, if necessary.
-.TP 22
-\fBZIP_FL_NAME_STRICT\fR
-Follow the ZIP specification for file names and extend it to the archive comment,
-thus also expecting it in CP-437 encoding.
-(ASCII is a subset of CP-437.)
+.TP 21
+\fBZIP_FL_ENC_STRICT\fR
+Follow the ZIP specification for file names and extend it to the
+archive comment, thus also expecting it in CP-437 encoding.
 Convert it to UTF-8.
 .RE
+.I Note:
+ASCII is a subset of both CP-437 and UTF-8.
 .SH "RETURN VALUES"
 Upon successful completion, a pointer to the comment is returned,
 or

man/zip_get_name.man

diff --git a/man/zip_get_name.man b/man/zip_get_name.man
index 65a16b8..bfb7976 100644
--- a/man/zip_get_name.man
+++ b/man/zip_get_name.man
@@ -47,9 +47,8 @@
 in
 \fBarchive.\fR
 The name is in UTF-8 encoding unless
-\fBZIP_FL_NAME_RAW\fR
+\fBZIP_FL_ENC_RAW\fR
 was specified (see below).
-(ASCII is a subset of UTF-8.)
 .PP
 If
 \fBflags\fR
@@ -62,21 +61,22 @@
 .PP
 Additionally, the following flags are supported:
 .RS
-.TP 22
-\fBZIP_FL_NAME_RAW\fR
+.TP 21
+\fBZIP_FL_ENC_RAW\fR
 Return the unmodified names as it is in the ZIP archive.
-.TP 22
-\fBZIP_FL_NAME_GUESS\fR
+.TP 21
+\fBZIP_FL_ENC_GUESS\fR
 (Default.)
 Guess the encoding of the name in the ZIP archive and convert it
 to UTF-8, if necessary.
-.TP 22
-\fBZIP_FL_NAME_STRICT\fR
+.TP 21
+\fBZIP_FL_ENC_STRICT\fR
 Follow the ZIP specification and expect CP-437 encoded names in
-the ZIP archive.
-(ASCII is a subset of CP-437.)
+the ZIP archive (except if they are explicitly marked as UTF-8).
 Convert it to UTF-8.
 .RE
+.I Note:
+ASCII is a subset of both CP-437 and UTF-8.
 .SH "RETURN VALUES"
 Upon successful completion, a pointer to the name is returned.
 Otherwise,

man/zip_name_locate.man

diff --git a/man/zip_name_locate.man b/man/zip_name_locate.man
index 5c3901a..da9fcb1 100644
--- a/man/zip_name_locate.man
+++ b/man/zip_name_locate.man
@@ -29,7 +29,7 @@
 .\" OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
 .\" IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.TH ZIP_NAME_LOCATE 3 "February 15, 2012" NiH
+.TH ZIP_NAME_LOCATE 3 "June 23, 2012" NiH
 .SH "NAME"
 zip_name_locate \- get index of file by name
 .SH "LIBRARY"
@@ -63,21 +63,21 @@
 \fBZIP_FL_NODIR\fR
 Ignore directory part of file name in archive.
 .TP 15
-\fBZIP_FL_NAME_RAW\fR
+\fBZIP_FL_ENC_RAW\fR
 Compare against the unmodified names as it is in the ZIP archive.
 .TP 15
-\fBZIP_FL_NAME_GUESS\fR
+\fBZIP_FL_ENC_GUESS\fR
 (Default.)
 Guess the encoding of the name in the ZIP archive and convert it
 to UTF-8, if necessary, before comparing.
 .TP 15
-\fBZIP_FL_NAME_STRICT\fR
+\fBZIP_FL_ENC_STRICT\fR
 Follow the ZIP specification and expect CP-437 encoded names in
-the ZIP archive.
-(ASCII is a subset of CP-437.)
+the ZIP archive (except if they are explicitly marked as UTF-8).
 Convert it to UTF-8 before comparing.
 .RE
-.RE
+.I Note:
+ASCII is a subset of both CP-437 and UTF-8.
 .SH "RETURN VALUES"
 zip_name_locate
 returns the index of the file named