Add "and"

--HG--
branch : HEAD
diff --git a/man/libzip.mdoc b/man/libzip.mdoc
index af42e8c..112c4d9 100644
--- a/man/libzip.mdoc
+++ b/man/libzip.mdoc
@@ -1,4 +1,4 @@
-.\" $NiH: libzip.mdoc,v 1.3 2005/06/09 18:45:05 wiz Exp $
+.\" $NiH: libzip.mdoc,v 1.4 2005/06/09 21:13:12 wiz Exp $
 .\"
 .\" libzip.mdoc -- general overview of available functions
 .\" Copyright (C) 2005 Dieter Baron and Thomas Klausner
@@ -94,4 +94,5 @@
 .Sh AUTHORS
 .An -nosplit
 .An Dieter Baron Aq dillo@giga.or.at
+and
 .An Thomas Klausner Aq tk@giga.or.at
diff --git a/man/zip_add.mdoc b/man/zip_add.mdoc
index 5b50c53..00416a7 100644
--- a/man/zip_add.mdoc
+++ b/man/zip_add.mdoc
@@ -1,4 +1,4 @@
-.\" $NiH: zip_add.mdoc,v 1.7 2005/06/09 19:51:22 wiz Exp $
+.\" $NiH: zip_add.mdoc,v 1.8 2005/06/09 21:13:12 wiz Exp $
 .\"
 .\" zip_add.mdoc -- add files to zip archive
 .\" Copyright (C) 2004, 2005 Dieter Baron and Thomas Klausner
@@ -119,4 +119,5 @@
 .Sh AUTHORS
 .An -nosplit
 .An Dieter Baron Aq dillo@giga.or.at
+and
 .An Thomas Klausner Aq tk@giga.or.at
diff --git a/man/zip_close.mdoc b/man/zip_close.mdoc
index 51966cb..b518092 100644
--- a/man/zip_close.mdoc
+++ b/man/zip_close.mdoc
@@ -1,4 +1,4 @@
-.\" $NiH: zip_close.mdoc,v 1.12 2005/06/09 19:51:22 wiz Exp $
+.\" $NiH: zip_close.mdoc,v 1.13 2005/06/09 21:13:12 wiz Exp $
 .\"
 .\" zip_close.mdoc -- close zip archive
 .\" Copyright (C) 2003, 2005 Dieter Baron and Thomas Klausner
@@ -103,4 +103,5 @@
 .Sh AUTHORS
 .An -nosplit
 .An Dieter Baron Aq dillo@giga.or.at
+and
 .An Thomas Klausner Aq tk@giga.or.at
diff --git a/man/zip_delete.mdoc b/man/zip_delete.mdoc
index fbab844..190547b 100644
--- a/man/zip_delete.mdoc
+++ b/man/zip_delete.mdoc
@@ -1,4 +1,4 @@
-.\" $NiH: zip_delete.mdoc,v 1.9 2005/06/09 19:51:22 wiz Exp $
+.\" $NiH: zip_delete.mdoc,v 1.10 2005/06/09 21:13:12 wiz Exp $
 .\"
 .\" zip_delete.mdoc -- delete files from zip archive
 .\" Copyright (C) 2003, 2005 Dieter Baron and Thomas Klausner
@@ -69,4 +69,5 @@
 .Sh AUTHORS
 .An -nosplit
 .An Dieter Baron Aq dillo@giga.or.at
+and
 .An Thomas Klausner Aq tk@giga.or.at
diff --git a/man/zip_error_get.mdoc b/man/zip_error_get.mdoc
index 08b332b..3eec42d 100644
--- a/man/zip_error_get.mdoc
+++ b/man/zip_error_get.mdoc
@@ -1,4 +1,4 @@
-.\" $NiH: zip_error_get.mdoc,v 1.6 2005/06/09 19:51:23 wiz Exp $
+.\" $NiH: zip_error_get.mdoc,v 1.7 2005/06/09 21:13:12 wiz Exp $
 .\"
 .\" zip_error_get.mdoc -- get error codes for archive or file
 .\" Copyright (C) 2004, 2005 Dieter Baron and Thomas Klausner
@@ -78,4 +78,5 @@
 .Sh AUTHORS
 .An -nosplit
 .An Dieter Baron Aq dillo@giga.or.at
+and
 .An Thomas Klausner Aq tk@giga.or.at
diff --git a/man/zip_error_get_sys_type.mdoc b/man/zip_error_get_sys_type.mdoc
index 13e627e..d2a9ef4 100644
--- a/man/zip_error_get_sys_type.mdoc
+++ b/man/zip_error_get_sys_type.mdoc
@@ -1,4 +1,4 @@
-.\" $NiH: zip_error_get_sys_type.mdoc,v 1.3 2005/06/09 19:51:23 wiz Exp $
+.\" $NiH: zip_error_get_sys_type.mdoc,v 1.4 2005/06/09 21:13:12 wiz Exp $
 .\"
 .\" zip_error_get_sys_type.mdoc -- get type of error
 .\" Copyright (C) 2004, 2005 Dieter Baron and Thomas Klausner
@@ -66,4 +66,5 @@
 .Sh AUTHORS
 .An -nosplit
 .An Dieter Baron Aq dillo@giga.or.at
+and
 .An Thomas Klausner Aq tk@giga.or.at
diff --git a/man/zip_error_to_str.mdoc b/man/zip_error_to_str.mdoc
index 3d4b0fa..4754f4b 100644
--- a/man/zip_error_to_str.mdoc
+++ b/man/zip_error_to_str.mdoc
@@ -1,4 +1,4 @@
-.\" $NiH: zip_error_to_str.mdoc,v 1.6 2005/06/09 19:51:23 wiz Exp $
+.\" $NiH: zip_error_to_str.mdoc,v 1.7 2005/06/09 21:13:12 wiz Exp $
 .\"
 .\" zip_error_to_str.mdoc -- get string representation of zip error code
 .\" Copyright (C) 2003, 2004, 2005 Dieter Baron and Thomas Klausner
@@ -86,4 +86,5 @@
 .Sh AUTHORS
 .An -nosplit
 .An Dieter Baron Aq dillo@giga.or.at
+and
 .An Thomas Klausner Aq tk@giga.or.at
diff --git a/man/zip_errors.mdoc b/man/zip_errors.mdoc
index 410bf52..a2f1f86 100644
--- a/man/zip_errors.mdoc
+++ b/man/zip_errors.mdoc
@@ -1,4 +1,4 @@
-.\" $NiH: zip_errors.mdoc,v 1.4 2005/01/20 21:14:27 dillo Exp $
+.\" $NiH: zip_errors.mdoc,v 1.5 2005/06/09 21:13:12 wiz Exp $
 .\"
 .\" zip_errors.mdoc -- list of all libzip error codes
 .\" Copyright (C) 2004, 2005 Dieter Baron and Thomas Klausner
@@ -101,4 +101,5 @@
 .Sh AUTHORS
 .An -nosplit
 .An Dieter Baron Aq dillo@giga.or.at
+and
 .An Thomas Klausner Aq tk@giga.or.at
diff --git a/man/zip_fclose.mdoc b/man/zip_fclose.mdoc
index dd1255a..b4809a1 100644
--- a/man/zip_fclose.mdoc
+++ b/man/zip_fclose.mdoc
@@ -1,4 +1,4 @@
-.\" $NiH: zip_fclose.mdoc,v 1.7 2005/06/09 19:51:23 wiz Exp $
+.\" $NiH: zip_fclose.mdoc,v 1.8 2005/06/09 21:13:12 wiz Exp $
 .\"
 .\" zip_fclose.mdoc -- close file in zip archive
 .\" Copyright (C) 2003, 2005 Dieter Baron and Thomas Klausner
@@ -59,4 +59,5 @@
 .Sh AUTHORS
 .An -nosplit
 .An Dieter Baron Aq dillo@giga.or.at
+and
 .An Thomas Klausner Aq tk@giga.or.at
diff --git a/man/zip_file_strerror.mdoc b/man/zip_file_strerror.mdoc
index 4617377..e56d8af 100644
--- a/man/zip_file_strerror.mdoc
+++ b/man/zip_file_strerror.mdoc
@@ -1,4 +1,4 @@
-.\" $NiH: zip_file_strerror.mdoc,v 1.5 2005/06/09 19:51:23 wiz Exp $
+.\" $NiH: zip_file_strerror.mdoc,v 1.6 2005/06/09 21:13:12 wiz Exp $
 .\"
 .\" zip_file_strerror.mdoc -- get string representation for a zip error
 .\" Copyright (C) 2003, 2005 Dieter Baron and Thomas Klausner
@@ -78,4 +78,5 @@
 .Sh AUTHORS
 .An -nosplit
 .An Dieter Baron Aq dillo@giga.or.at
+and
 .An Thomas Klausner Aq tk@giga.or.at
diff --git a/man/zip_fopen.mdoc b/man/zip_fopen.mdoc
index dccd722..8b1c814 100644
--- a/man/zip_fopen.mdoc
+++ b/man/zip_fopen.mdoc
@@ -1,4 +1,4 @@
-.\" $NiH: zip_fopen.mdoc,v 1.12 2005/06/09 19:51:23 wiz Exp $
+.\" $NiH: zip_fopen.mdoc,v 1.13 2005/06/09 21:13:12 wiz Exp $
 .\"
 .\" zip_fopen.mdoc -- open file in zip archive for reading
 .\" Copyright (C) 2003, 2004, 2005 Dieter Baron and Thomas Klausner
@@ -122,4 +122,5 @@
 .Sh AUTHORS
 .An -nosplit
 .An Dieter Baron Aq dillo@giga.or.at
+and
 .An Thomas Klausner Aq tk@giga.or.at
diff --git a/man/zip_fread.mdoc b/man/zip_fread.mdoc
index 32d8d5d..ce190b3 100644
--- a/man/zip_fread.mdoc
+++ b/man/zip_fread.mdoc
@@ -1,4 +1,4 @@
-.\" $NiH: zip_fread.mdoc,v 1.7 2005/06/09 19:51:23 wiz Exp $
+.\" $NiH: zip_fread.mdoc,v 1.8 2005/06/09 21:13:12 wiz Exp $
 .\"
 .\" zip_fread.mdoc -- read from file
 .\" Copyright (C) 2003, 2005 Dieter Baron and Thomas Klausner
@@ -62,4 +62,5 @@
 .Sh AUTHORS
 .An -nosplit
 .An Dieter Baron Aq dillo@giga.or.at
+and
 .An Thomas Klausner Aq tk@giga.or.at
diff --git a/man/zip_get_name.mdoc b/man/zip_get_name.mdoc
index 8f4fd27..2965f83 100644
--- a/man/zip_get_name.mdoc
+++ b/man/zip_get_name.mdoc
@@ -1,4 +1,4 @@
-.\" $NiH: zip_get_name.mdoc,v 1.8 2005/06/09 18:50:27 wiz Exp $
+.\" $NiH: zip_get_name.mdoc,v 1.9 2005/06/09 21:13:12 wiz Exp $
 .\"
 .\" zip_get_name.mdoc -- get name of file by index
 .\" Copyright (C) 2003, 2004, 2005 Dieter Baron and Thomas Klausner
@@ -89,4 +89,5 @@
 .Sh AUTHORS
 .An -nosplit
 .An Dieter Baron Aq dillo@giga.or.at
+and
 .An Thomas Klausner Aq tk@giga.or.at
diff --git a/man/zip_get_num_files.mdoc b/man/zip_get_num_files.mdoc
index 302ee22..d4da66f 100644
--- a/man/zip_get_num_files.mdoc
+++ b/man/zip_get_num_files.mdoc
@@ -1,4 +1,4 @@
-.\" $NiH: zip_get_num_files.mdoc,v 1.3 2005/06/09 19:51:23 wiz Exp $
+.\" $NiH: zip_get_num_files.mdoc,v 1.4 2005/06/09 21:13:12 wiz Exp $
 .\"
 .\" zip_get_num_files.mdoc -- get number of files in archive
 .\" Copyright (C) 2003, 2005 Dieter Baron and Thomas Klausner
@@ -60,4 +60,5 @@
 .Sh AUTHORS
 .An -nosplit
 .An Dieter Baron Aq dillo@giga.or.at
+and
 .An Thomas Klausner Aq tk@giga.or.at
diff --git a/man/zip_name_locate.mdoc b/man/zip_name_locate.mdoc
index d0c460d..5ff6c27 100644
--- a/man/zip_name_locate.mdoc
+++ b/man/zip_name_locate.mdoc
@@ -1,4 +1,4 @@
-.\" $NiH: zip_name_locate.mdoc,v 1.6 2005/06/09 19:51:23 wiz Exp $
+.\" $NiH: zip_name_locate.mdoc,v 1.7 2005/06/09 21:13:12 wiz Exp $
 .\"
 .\" zip_name_locate.mdoc -- get index of file by name
 .\" Copyright (C) 2003, 2005 Dieter Baron and Thomas Klausner
@@ -71,4 +71,5 @@
 .Sh AUTHORS
 .An -nosplit
 .An Dieter Baron Aq dillo@giga.or.at
+and
 .An Thomas Klausner Aq tk@giga.or.at
diff --git a/man/zip_open.mdoc b/man/zip_open.mdoc
index 5ef8918..cabafb2 100644
--- a/man/zip_open.mdoc
+++ b/man/zip_open.mdoc
@@ -1,4 +1,4 @@
-.\" $NiH: zip_open.mdoc,v 1.20 2005/06/09 19:51:23 wiz Exp $
+.\" $NiH: zip_open.mdoc,v 1.21 2005/06/09 21:13:12 wiz Exp $
 .\"
 .\" zip_open.mdoc -- open zip archive
 .\" Copyright (C) 2003, 2005 Dieter Baron and Thomas Klausner
@@ -132,4 +132,5 @@
 .Sh AUTHORS
 .An -nosplit
 .An Dieter Baron Aq dillo@giga.or.at
+and
 .An Thomas Klausner Aq tk@giga.or.at
diff --git a/man/zip_rename.mdoc b/man/zip_rename.mdoc
index 6fb75a3..92e5b30 100644
--- a/man/zip_rename.mdoc
+++ b/man/zip_rename.mdoc
@@ -1,4 +1,4 @@
-.\" $NiH: zip_rename.mdoc,v 1.6 2005/06/09 19:51:23 wiz Exp $
+.\" $NiH: zip_rename.mdoc,v 1.7 2005/06/09 21:13:12 wiz Exp $
 .\"
 .\" zip_rename.mdoc -- rename file in zip archive
 .\" Copyright (C) 2003, 2005 Dieter Baron and Thomas Klausner
@@ -74,4 +74,5 @@
 .Sh AUTHORS
 .An -nosplit
 .An Dieter Baron Aq dillo@giga.or.at
+and
 .An Thomas Klausner Aq tk@giga.or.at
diff --git a/man/zip_source_buffer.mdoc b/man/zip_source_buffer.mdoc
index a5cfb3c..9e8f555 100644
--- a/man/zip_source_buffer.mdoc
+++ b/man/zip_source_buffer.mdoc
@@ -1,4 +1,4 @@
-.\" $NiH: zip_source_buffer.mdoc,v 1.3 2005/06/09 19:51:23 wiz Exp $
+.\" $NiH: zip_source_buffer.mdoc,v 1.4 2005/06/09 21:13:12 wiz Exp $
 .\"
 .\" zip_source_buffer.mdoc -- create zip data source from buffer
 .\" Copyright (C) 2004, 2005 Dieter Baron and Thomas Klausner
@@ -88,4 +88,5 @@
 .Sh AUTHORS
 .An -nosplit
 .An Dieter Baron Aq dillo@giga.or.at
+and
 .An Thomas Klausner Aq tk@giga.or.at
diff --git a/man/zip_source_file.mdoc b/man/zip_source_file.mdoc
index 4ed5ada..92be484 100644
--- a/man/zip_source_file.mdoc
+++ b/man/zip_source_file.mdoc
@@ -1,4 +1,4 @@
-.\" $NiH: zip_source_file.mdoc,v 1.5 2005/06/09 19:51:23 wiz Exp $
+.\" $NiH: zip_source_file.mdoc,v 1.6 2005/06/09 21:13:12 wiz Exp $
 .\"
 .\" zip_source_file.mdoc -- create data source from a file
 .\" Copyright (C) 2004, 2005 Dieter Baron and Thomas Klausner
@@ -95,4 +95,5 @@
 .Sh AUTHORS
 .An -nosplit
 .An Dieter Baron Aq dillo@giga.or.at
+and
 .An Thomas Klausner Aq tk@giga.or.at
diff --git a/man/zip_source_filep.mdoc b/man/zip_source_filep.mdoc
index 842e94e..9e7a3f0 100644
--- a/man/zip_source_filep.mdoc
+++ b/man/zip_source_filep.mdoc
@@ -1,4 +1,4 @@
-.\" $NiH: zip_source_filep.mdoc,v 1.4 2005/06/09 19:51:23 wiz Exp $
+.\" $NiH: zip_source_filep.mdoc,v 1.5 2005/06/09 21:13:12 wiz Exp $
 .\"
 .\" zip_source_filep.mdoc -- create data source from a file stream
 .\" Copyright (C) 2004, 2005 Dieter Baron and Thomas Klausner
@@ -90,4 +90,5 @@
 .Sh AUTHORS
 .An -nosplit
 .An Dieter Baron Aq dillo@giga.or.at
+and
 .An Thomas Klausner Aq tk@giga.or.at
diff --git a/man/zip_source_free.mdoc b/man/zip_source_free.mdoc
index e3f6e09..b51f128 100644
--- a/man/zip_source_free.mdoc
+++ b/man/zip_source_free.mdoc
@@ -1,4 +1,4 @@
-.\" $NiH: zip_source_free.mdoc,v 1.4 2005/06/09 19:51:23 wiz Exp $
+.\" $NiH: zip_source_free.mdoc,v 1.5 2005/06/09 21:13:12 wiz Exp $
 .\"
 .\" zip_source_free.mdoc -- free zip data source
 .\" Copyright (C) 2004, 2005 Dieter Baron and Thomas Klausner
@@ -63,4 +63,5 @@
 .Sh AUTHORS
 .An -nosplit
 .An Dieter Baron Aq dillo@giga.or.at
+and
 .An Thomas Klausner Aq tk@giga.or.at
diff --git a/man/zip_source_function.mdoc b/man/zip_source_function.mdoc
index dc7e08e..a4052fb 100644
--- a/man/zip_source_function.mdoc
+++ b/man/zip_source_function.mdoc
@@ -1,4 +1,4 @@
-.\" $NiH: zip_source_function.mdoc,v 1.11 2005/06/09 19:51:23 wiz Exp $
+.\" $NiH: zip_source_function.mdoc,v 1.12 2005/06/09 21:13:12 wiz Exp $
 .\"
 .\" zip_source_function.mdoc -- create data source from function
 .\" Copyright (C) 2004, 2005 Dieter Baron and Thomas Klausner
@@ -147,4 +147,5 @@
 .Sh AUTHORS
 .An -nosplit
 .An Dieter Baron Aq dillo@giga.or.at
+and
 .An Thomas Klausner Aq tk@giga.or.at
diff --git a/man/zip_source_zip.mdoc b/man/zip_source_zip.mdoc
index 46ffcdc..2a8167f 100644
--- a/man/zip_source_zip.mdoc
+++ b/man/zip_source_zip.mdoc
@@ -1,4 +1,4 @@
-.\" $NiH: zip_source_zip.mdoc,v 1.4 2005/06/09 19:51:23 wiz Exp $
+.\" $NiH: zip_source_zip.mdoc,v 1.5 2005/06/09 21:13:12 wiz Exp $
 .\"
 .\" zip_source_zip.mdoc -- create data source from zip file
 .\" Copyright (C) 2004, 2005 Dieter Baron and Thomas Klausner
@@ -115,4 +115,5 @@
 .Sh AUTHORS
 .An -nosplit
 .An Dieter Baron Aq dillo@giga.or.at
+and
 .An Thomas Klausner Aq tk@giga.or.at
diff --git a/man/zip_stat.mdoc b/man/zip_stat.mdoc
index 1f24368..2d99903 100644
--- a/man/zip_stat.mdoc
+++ b/man/zip_stat.mdoc
@@ -1,4 +1,4 @@
-.\" $NiH: zip_stat.mdoc,v 1.8 2005/06/09 19:51:23 wiz Exp $
+.\" $NiH: zip_stat.mdoc,v 1.9 2005/06/09 21:13:12 wiz Exp $
 .\"
 .\" zip_stat.mdoc -- get information about file
 .\" Copyright (C) 2003, 2004, 2005 Dieter Baron and Thomas Klausner
@@ -114,4 +114,5 @@
 .Sh AUTHORS
 .An -nosplit
 .An Dieter Baron Aq dillo@giga.or.at
+and
 .An Thomas Klausner Aq tk@giga.or.at
diff --git a/man/zip_unchange.mdoc b/man/zip_unchange.mdoc
index 0d31492..8e77d01 100644
--- a/man/zip_unchange.mdoc
+++ b/man/zip_unchange.mdoc
@@ -1,4 +1,4 @@
-.\" $NiH: zip_unchange.mdoc,v 1.9 2005/06/09 19:51:23 wiz Exp $
+.\" $NiH: zip_unchange.mdoc,v 1.10 2005/06/09 21:13:12 wiz Exp $
 .\"
 .\" zip_unchange.mdoc -- undo changes to file in zip archive
 .\" Copyright (C) 2003, 2005 Dieter Baron and Thomas Klausner
@@ -69,4 +69,5 @@
 .Sh AUTHORS
 .An -nosplit
 .An Dieter Baron Aq dillo@giga.or.at
+and
 .An Thomas Klausner Aq tk@giga.or.at
diff --git a/man/zip_unchange_all.mdoc b/man/zip_unchange_all.mdoc
index 629dde2..6fb4515 100644
--- a/man/zip_unchange_all.mdoc
+++ b/man/zip_unchange_all.mdoc
@@ -1,4 +1,4 @@
-.\" $NiH: zip_unchange_all.mdoc,v 1.8 2005/06/09 20:41:00 wiz Exp $
+.\" $NiH: zip_unchange_all.mdoc,v 1.9 2005/06/09 21:13:12 wiz Exp $
 .\"
 .\" zip_unchange_all.mdoc -- undo changes to all files in zip archive
 .\" Copyright (C) 2003, 2005 Dieter Baron and Thomas Klausner
@@ -58,4 +58,5 @@
 .Sh AUTHORS
 .An -nosplit
 .An Dieter Baron Aq dillo@giga.or.at
+and
 .An Thomas Klausner Aq tk@giga.or.at
diff --git a/man/zipmerge.mdoc b/man/zipmerge.mdoc
index 97a170f..acabbea 100644
--- a/man/zipmerge.mdoc
+++ b/man/zipmerge.mdoc
@@ -1,4 +1,4 @@
-.\" $NiH: zipmerge.mdoc,v 1.4 2005/06/09 19:51:23 wiz Exp $
+.\" $NiH: zipmerge.mdoc,v 1.5 2005/06/09 21:13:13 wiz Exp $
 .\"
 .\" zipmerge.mdoc -- merge zip archives
 .\" Copyright (C) 2004, 2005 Dieter Baron and Thomas Klausner
@@ -83,4 +83,5 @@
 .Sh AUTHORS
 .An -nosplit
 .An Dieter Baron Aq dillo@giga.or.at
+and
 .An Thomas Klausner Aq tk@giga.or.at