Import libarchive 3.4.0KIENTZLE

41 files changed, 325 insertions, 270 deletions

diff --git a/archivers/libarchive/files/doc/wiki/Makefile b/archivers/libarchive/files/doc/wiki/Makefile
index a8e2799e0a5..206afa130cc 100644
--- a/archivers/libarchive/files/doc/wiki/Makefile
+++ b/archivers/libarchive/files/doc/wiki/Makefile
@@ -11,6 +11,9 @@ ManPageArchiveEntryAcl3.wiki: ../mdoc2wiki.awk ../../libarchive/archive_entry_ac
 ManPageArchiveEntryLinkify3.wiki: ../mdoc2wiki.awk ../../libarchive/archive_entry_linkify.3
 	awk -f ../mdoc2wiki.awk < ../../libarchive/archive_entry_linkify.3 > ManPageArchiveEntryLinkify3.wiki
 
+ManPageArchiveEntryMisc3.wiki: ../mdoc2wiki.awk ../../libarchive/archive_entry_misc.3
+	awk -f ../mdoc2wiki.awk < ../../libarchive/archive_entry_misc.3 > ManPageArchiveEntryMisc3.wiki
+
 ManPageArchiveEntryPaths3.wiki: ../mdoc2wiki.awk ../../libarchive/archive_entry_paths.3
 	awk -f ../mdoc2wiki.awk < ../../libarchive/archive_entry_paths.3 > ManPageArchiveEntryPaths3.wiki
 
@@ -127,4 +130,4 @@ ManPageBsdtar1.wiki: ../mdoc2wiki.awk ../../tar/bsdtar.1
 
 ManPageBsdcpio1.wiki: ../mdoc2wiki.awk ../../cpio/bsdcpio.1
 	awk -f ../mdoc2wiki.awk < ../../cpio/bsdcpio.1 > ManPageBsdcpio1.wiki
-all: ManPageArchiveEntry3.wiki ManPageArchiveEntryAcl3.wiki ManPageArchiveEntryLinkify3.wiki ManPageArchiveEntryPaths3.wiki ManPageArchiveEntryPerms3.wiki ManPageArchiveEntryStat3.wiki ManPageArchiveEntryTime3.wiki ManPageArchiveRead3.wiki ManPageArchiveReadAddPassphrase3.wiki ManPageArchiveReadData3.wiki ManPageArchiveReadDisk3.wiki ManPageArchiveReadExtract3.wiki ManPageArchiveReadFilter3.wiki ManPageArchiveReadFormat3.wiki ManPageArchiveReadFree3.wiki ManPageArchiveReadHeader3.wiki ManPageArchiveReadNew3.wiki ManPageArchiveReadOpen3.wiki ManPageArchiveReadSetOptions3.wiki ManPageArchiveUtil3.wiki ManPageArchiveWrite3.wiki ManPageArchiveWriteBlocksize3.wiki ManPageArchiveWriteData3.wiki ManPageArchiveWriteDisk3.wiki ManPageArchiveWriteFilter3.wiki ManPageArchiveWriteFinishEntry3.wiki ManPageArchiveWriteFormat3.wiki ManPageArchiveWriteFree3.wiki ManPageArchiveWriteHeader3.wiki ManPageArchiveWriteNew3.wiki ManPageArchiveWriteOpen3.wiki ManPageArchiveWriteSetOptions3.wiki ManPageArchiveWriteSetPassphrase3.wiki ManPageCpio5.wiki ManPageLibarchive3.wiki ManPageLibarchiveChanges3.wiki ManPageLibarchiveFormats5.wiki ManPageLibarchiveInternals3.wiki ManPageMtree5.wiki ManPageTar5.wiki ManPageBsdtar1.wiki ManPageBsdcpio1.wiki
+all: ManPageArchiveEntry3.wiki ManPageArchiveEntryAcl3.wiki ManPageArchiveEntryLinkify3.wiki ManPageArchiveEntryMisc3.wiki ManPageArchiveEntryPaths3.wiki ManPageArchiveEntryPerms3.wiki ManPageArchiveEntryStat3.wiki ManPageArchiveEntryTime3.wiki ManPageArchiveRead3.wiki ManPageArchiveReadAddPassphrase3.wiki ManPageArchiveReadData3.wiki ManPageArchiveReadDisk3.wiki ManPageArchiveReadExtract3.wiki ManPageArchiveReadFilter3.wiki ManPageArchiveReadFormat3.wiki ManPageArchiveReadFree3.wiki ManPageArchiveReadHeader3.wiki ManPageArchiveReadNew3.wiki ManPageArchiveReadOpen3.wiki ManPageArchiveReadSetOptions3.wiki ManPageArchiveUtil3.wiki ManPageArchiveWrite3.wiki ManPageArchiveWriteBlocksize3.wiki ManPageArchiveWriteData3.wiki ManPageArchiveWriteDisk3.wiki ManPageArchiveWriteFilter3.wiki ManPageArchiveWriteFinishEntry3.wiki ManPageArchiveWriteFormat3.wiki ManPageArchiveWriteFree3.wiki ManPageArchiveWriteHeader3.wiki ManPageArchiveWriteNew3.wiki ManPageArchiveWriteOpen3.wiki ManPageArchiveWriteSetOptions3.wiki ManPageArchiveWriteSetPassphrase3.wiki ManPageCpio5.wiki ManPageLibarchive3.wiki ManPageLibarchiveChanges3.wiki ManPageLibarchiveFormats5.wiki ManPageLibarchiveInternals3.wiki ManPageMtree5.wiki ManPageTar5.wiki ManPageBsdtar1.wiki ManPageBsdcpio1.wiki
diff --git a/archivers/libarchive/files/doc/wiki/ManPageArchiveEntry3.wiki b/archivers/libarchive/files/doc/wiki/ManPageArchiveEntry3.wiki
index 195f6ce3ad7..83d692f01f0 100644
--- a/archivers/libarchive/files/doc/wiki/ManPageArchiveEntry3.wiki
+++ b/archivers/libarchive/files/doc/wiki/ManPageArchiveEntry3.wiki
@@ -36,7 +36,7 @@ it includes everything from
 '''struct stat''' 
 plus associated pathname, textual group and user names, etc. 
 These objects are used by 
-[[ManPageibarchive3]] 
+[[ManPageLibarchive3]] 
 to represent the metadata associated with a particular 
 entry in an archive. 
 === Create and Destroy=== 
@@ -64,16 +64,16 @@ object.
 Due to high number of functions, the accessor functions can be found in 
 man pages grouped by the purpose. 
 <dl> 
-<dt>[[ManPagerchiventrycl3]]</dt><dd> 
+<dt>[[ManPageArchiveEntryAcl3]]</dt><dd> 
 Access Control List manipulation 
-</dd><dt>[[ManPagerchiventryaths3]]</dt><dd> 
+</dd><dt>[[ManPageArchiveEntryPaths3]]</dt><dd> 
 Path name manipulation 
-</dd><dt>[[ManPagerchiventryerms3]]</dt><dd> 
+</dd><dt>[[ManPageArchiveEntryPerms3]]</dt><dd> 
 User, group and mode manipulation 
-</dd><dt>[[ManPagerchiventrytat3]]</dt><dd> 
+</dd><dt>[[ManPageArchiveEntryStat3]]</dt><dd> 
 Functions not in the other groups and copying to/from 
 ''struct'' stat. 
-</dd><dt>[[ManPagerchiventryime3]]</dt><dd> 
+</dd><dt>[[ManPageArchiveEntryTime3]]</dt><dd> 
 Time field manipulation 
 </dd></dl> 
 
@@ -107,11 +107,11 @@ narrow string for the same data, the previously-set wide string will
 be discarded in favor of the new data. 
 
 == SEE ALSO == 
-[[ManPagerchiventrycl3]], 
-[[ManPagerchiventryaths3]], 
-[[ManPagerchiventryerms3]], 
-[[ManPagerchiventryime3]] 
-[[ManPageibarchive3]], 
+[[ManPageArchiveEntryAcl3]], 
+[[ManPageArchiveEntryPaths3]], 
+[[ManPageArchiveEntryPerms3]], 
+[[ManPageArchiveEntryTime3]] 
+[[ManPageLibarchive3]], 
 == HISTORY == 
 The 
 '''libarchive''' 
diff --git a/archivers/libarchive/files/doc/wiki/ManPageArchiveEntryAcl3.wiki b/archivers/libarchive/files/doc/wiki/ManPageArchiveEntryAcl3.wiki
index db42a741433..158bc66ff34 100644
--- a/archivers/libarchive/files/doc/wiki/ManPageArchiveEntryAcl3.wiki
+++ b/archivers/libarchive/files/doc/wiki/ManPageArchiveEntryAcl3.wiki
@@ -345,7 +345,7 @@ or
 '''archive_entry_acl_next_w'''(). 
 The function returns either 0, if no non-extended ACLs are found. 
 In this case, the access permissions should be obtained by 
-[[ManPagerchiventryode3]] 
+[[ManPageArchiveEntryMode3]] 
 or set using 
 [[chmod(2)|http://www.freebsd.org/cgi/man.cgi?query=chmod&sektion=2]]. 
 Otherwise, the function returns the same value as 
@@ -456,5 +456,5 @@ and flags on success or NULL on error.
 '''archive_entry_acl_types'''() 
 returns a bitmask of ACL entry types or 0 if archive entry has no ACL entries. 
 == SEE ALSO == 
-[[ManPagerchiventry3]], 
-[[ManPageibarchive3]] 
+[[ManPageArchiveEntry3]], 
+[[ManPageLibarchive3]] 
diff --git a/archivers/libarchive/files/doc/wiki/ManPageArchiveEntryLinkify3.wiki b/archivers/libarchive/files/doc/wiki/ManPageArchiveEntryLinkify3.wiki
index 1e35c5984c0..a94b398c97e 100644
--- a/archivers/libarchive/files/doc/wiki/ManPageArchiveEntryLinkify3.wiki
+++ b/archivers/libarchive/files/doc/wiki/ManPageArchiveEntryLinkify3.wiki
@@ -64,7 +64,7 @@ The
 '''archive_entry_linkresolver_set_strategy'''() 
 function selects the optimal hardlink strategy for the given format. 
 The format code can be obtained from 
-[[ManPagerchiveormat3]]. 
+[[ManPageArchiveFormat3]]. 
 The function can be called more than once, but it is recommended to 
 flush all deferred entries first. 
 
@@ -194,4 +194,4 @@ on
 [[malloc(3)|http://www.freebsd.org/cgi/man.cgi?query=malloc&sektion=3]] 
 failures. 
 == SEE ALSO == 
-[[ManPagerchiventry3]] 
+[[ManPageArchiveEntry3]] 
diff --git a/archivers/libarchive/files/doc/wiki/ManPageArchiveEntryMisc3.wiki b/archivers/libarchive/files/doc/wiki/ManPageArchiveEntryMisc3.wiki
new file mode 100644
index 00000000000..9987c945067
--- /dev/null
+++ b/archivers/libarchive/files/doc/wiki/ManPageArchiveEntryMisc3.wiki
@@ -0,0 +1,40 @@
+ARCHIVE_ENTRY_MISC(3) manual page 
+== NAME == 
+'''archive_entry_symlink_type''', 
+'''archive_entry_set_symlink_type''' 
+- miscellaneous functions for manipulating properties of archive_entry. 
+== LIBRARY == 
+Streaming Archive Library (libarchive, -larchive) 
+== SYNOPSIS == 
+'''<nowiki>#include <archive_entry.h></nowiki>''' 
+<br> 
+''int'' 
+<br> 
+'''archive_entry_symlink_type'''(''struct archive_entry *a''); 
+<br> 
+''void'' 
+<br> 
+'''archive_entry_set_symlink_type'''(''struct archive_entry *a'', ''int''); 
+== DESCRIPTION == 
+The function 
+'''archive_entry_symlink_type'''() 
+returns and the function 
+'''archive_entry_set_symlink_type'''() 
+sets the type of the symbolic link stored in an archive entry. These functions 
+have special meaning on operating systems that support multiple symbolic link 
+types (e.g. Microsoft Windows). 
+
+Supported values are: 
+<dl> 
+<dt>AE_SYMLINK_TYPE_UNDEFINED</dt><dd> 
+Symbolic link target type is not defined (default on unix systems) 
+</dd><dt>AE_SYMLINK_TYPE_FILE</dt><dd> 
+Symbolic link points to a file 
+</dd><dt>AE_SYMLINK_TYPE_DIRECTORY</dt><dd> 
+Symbolic link points to a directory 
+</dd></dl> 
+== SEE ALSO == 
+[[ManPageArchiveEntry3]], 
+[[ManPageArchiveEntryPaths3]], 
+[[ManPageArchiveEntryStat3]], 
+[[ManPageLibarchive3]] 
diff --git a/archivers/libarchive/files/doc/wiki/ManPageArchiveEntryPaths3.wiki b/archivers/libarchive/files/doc/wiki/ManPageArchiveEntryPaths3.wiki
index 3ab6833be05..ea8a8f29253 100644
--- a/archivers/libarchive/files/doc/wiki/ManPageArchiveEntryPaths3.wiki
+++ b/archivers/libarchive/files/doc/wiki/ManPageArchiveEntryPaths3.wiki
@@ -127,7 +127,7 @@ Streaming Archive Library (libarchive, -larchive)
 '''archive_entry_update_symlink_utf8'''(''struct archive_entry *a'', ''const char *path''); 
 == DESCRIPTION == 
 Path names supported by 
-[[ManPagerchiventry3]]: 
+[[ManPageArchiveEntry3]]: 
 <dl> 
 <dt>hardlink</dt><dd> 
 Destination of the hardlink. 
@@ -140,7 +140,7 @@ the destination for that.
 Path in the archive 
 </dd><dt>sourcepath</dt><dd> 
 Path on the disk for use by 
-[[ManPagerchiveeadisk3]]. 
+[[ManPageArchiveReadDisk3]]. 
 </dd><dt>symlink</dt><dd> 
 Destination of the symbolic link. 
 </dd></dl> 
@@ -171,5 +171,5 @@ It doesn't have a corresponding get accessor function.
 is an alias for  
 '''archive_entry_copy_XXX'''(). 
 == SEE ALSO == 
-[[ManPagerchiventry3]] 
-[[ManPageibarchive3]], 
+[[ManPageArchiveEntry3]] 
+[[ManPageLibarchive3]], 
diff --git a/archivers/libarchive/files/doc/wiki/ManPageArchiveEntryPerms3.wiki b/archivers/libarchive/files/doc/wiki/ManPageArchiveEntryPerms3.wiki
index c9e28b75f01..39c67c3c548 100644
--- a/archivers/libarchive/files/doc/wiki/ManPageArchiveEntryPerms3.wiki
+++ b/archivers/libarchive/files/doc/wiki/ManPageArchiveEntryPerms3.wiki
@@ -207,11 +207,11 @@ every name that is recognized.
 [[strtofflags(3)|http://www.freebsd.org/cgi/man.cgi?query=strtofflags&sektion=3]], 
 which stops parsing at the first unrecognized name.) 
 == SEE ALSO == 
-[[ManPagerchiventry3]], 
-[[ManPagerchiventrycl3]], 
-[[ManPagerchiveeadisk3]], 
-[[ManPagerchiveriteisk3]] 
-[[ManPageibarchive3]], 
+[[ManPageArchiveEntry3]], 
+[[ManPageArchiveEntryAcl3]], 
+[[ManPageArchiveReadDisk3]], 
+[[ManPageArchiveWriteDisk3]] 
+[[ManPageLibarchive3]], 
 == BUGS == 
 The platform types 
 ''uid_t'' 
diff --git a/archivers/libarchive/files/doc/wiki/ManPageArchiveEntryStat3.wiki b/archivers/libarchive/files/doc/wiki/ManPageArchiveEntryStat3.wiki
index 55bfdef6fc4..e96169f1c32 100644
--- a/archivers/libarchive/files/doc/wiki/ManPageArchiveEntryStat3.wiki
+++ b/archivers/libarchive/files/doc/wiki/ManPageArchiveEntryStat3.wiki
@@ -258,7 +258,7 @@ The functions
 and 
 '''archive_entry_ino64'''() 
 are used by 
-[[ManPagerchiventryinkify3]] 
+[[ManPageArchiveEntryLinkify3]] 
 to find hardlinks. 
 The pair of device and inode is supposed to identify hardlinked files. 
 
@@ -301,8 +301,8 @@ platforms.
 Some archive formats use the combined form, while other formats use 
 the split form. 
 == SEE ALSO == 
-[[ManPagerchiventrycl3]], 
-[[ManPagerchiventryerms3]], 
-[[ManPagerchiventryime3]], 
-[[ManPageibarchive3]], 
+[[ManPageArchiveEntryAcl3]], 
+[[ManPageArchiveEntryPerms3]], 
+[[ManPageArchiveEntryTime3]], 
+[[ManPageLibarchive3]], 
 [[stat(2)|http://www.freebsd.org/cgi/man.cgi?query=stat&sektion=2]] 
diff --git a/archivers/libarchive/files/doc/wiki/ManPageArchiveEntryTime3.wiki b/archivers/libarchive/files/doc/wiki/ManPageArchiveEntryTime3.wiki
index 2425c1c3332..bff82575627 100644
--- a/archivers/libarchive/files/doc/wiki/ManPageArchiveEntryTime3.wiki
+++ b/archivers/libarchive/files/doc/wiki/ManPageArchiveEntryTime3.wiki
@@ -111,7 +111,7 @@ These functions create and manipulate the time fields in an
 Supported time fields are atime (access time), birthtime (creation time), 
 ctime (last time an inode property was changed) and mtime (modification time). 
 
-[[ManPageibarchive3]] 
+[[ManPageLibarchive3]] 
 provides a high-resolution interface. 
 The timestamps are truncated automatically depending on the archive format 
 (for archiving) or the filesystem capabilities (for restoring). 
@@ -124,8 +124,8 @@ The current state can be queried using
 '''XXX_is_set'''(). 
 Unset time fields have a second and nanosecond field of 0. 
 == SEE ALSO == 
-[[ManPagerchiventry3]] 
-[[ManPageibarchive3]], 
+[[ManPageArchiveEntry3]] 
+[[ManPageLibarchive3]], 
 == HISTORY == 
 The 
 '''libarchive''' 
diff --git a/archivers/libarchive/files/doc/wiki/ManPageArchiveRead3.wiki b/archivers/libarchive/files/doc/wiki/ManPageArchiveRead3.wiki
index 69b6c479aa8..0b6e08d283d 100644
--- a/archivers/libarchive/files/doc/wiki/ManPageArchiveRead3.wiki
+++ b/archivers/libarchive/files/doc/wiki/ManPageArchiveRead3.wiki
@@ -15,7 +15,7 @@ headers and associated data, then close the archive and release all
 resources. 
 === Create archive object=== 
 See 
-[[ManPagerchiveeadew3]]. 
+[[ManPageArchiveReadNew3]]. 
 
 To read an archive, you must first obtain an initialized 
 '''struct archive''' 
@@ -23,9 +23,9 @@ object from
 '''archive_read_new'''(). 
 === Enable filters and formats=== 
 See 
-[[ManPagerchiveeadilter3]] 
+[[ManPageArchiveReadFilter3]] 
 and 
-[[ManPagerchiveeadormat3]]. 
+[[ManPageArchiveReadFormat3]]. 
 
 You can then modify this object for the desired operations with the 
 various 
@@ -49,10 +49,10 @@ to enable auto-detect for all formats and compression types
 currently supported by the library. 
 === Set options=== 
 See 
-[[ManPagerchiveeadetptions3]]. 
+[[ManPageArchiveReadSetOptions3]]. 
 === Open archive=== 
 See 
-[[ManPagerchiveeadpen3]]. 
+[[ManPageArchiveReadOpen3]]. 
 
 Once you have prepared the 
 '''struct archive''' 
@@ -72,10 +72,10 @@ callback functions are free to read whatever block size is
 most appropriate for the medium. 
 === Consume archive=== 
 See 
-[[ManPagerchiveeadeader3]], 
-[[ManPagerchiveeadata3]] 
+[[ManPageArchiveReadHeader3]], 
+[[ManPageArchiveReadData3]] 
 and 
-[[ManPagerchiveeadxtract3]]. 
+[[ManPageArchiveReadExtract3]]. 
 
 Each archive entry consists of a header followed by a certain 
 amount of data. 
@@ -112,7 +112,7 @@ In particular, many applications will want to override the
 pathname, file permissions, or ownership. 
 === Release resources=== 
 See 
-[[ManPagerchiveeadree3]]. 
+[[ManPageArchiveReadFree3]]. 
 
 Once you have finished reading data from the archive, you 
 should call 
@@ -174,16 +174,16 @@ myclose(struct archive *a, void *client_data)
 ```
 == SEE ALSO == 
 [[ManPageBsdtar1]], 
-[[ManPageibarchive3]], 
-[[ManPagerchiveeadew3]], 
-[[ManPagerchiveeadata3]], 
-[[ManPagerchiveeadxtract3]], 
-[[ManPagerchiveeadilter3]], 
-[[ManPagerchiveeadormat3]], 
-[[ManPagerchiveeadeader3]], 
-[[ManPagerchiveeadpen3]], 
-[[ManPagerchiveeadetptions3]], 
-[[ManPagerchivetil3]], 
+[[ManPageLibarchive3]], 
+[[ManPageArchiveReadNew3]], 
+[[ManPageArchiveReadData3]], 
+[[ManPageArchiveReadExtract3]], 
+[[ManPageArchiveReadFilter3]], 
+[[ManPageArchiveReadFormat3]], 
+[[ManPageArchiveReadHeader3]], 
+[[ManPageArchiveReadOpen3]], 
+[[ManPageArchiveReadSetOptions3]], 
+[[ManPageArchiveUtil3]], 
 [[ManPageTar5]] 
 == HISTORY == 
 The 
diff --git a/archivers/libarchive/files/doc/wiki/ManPageArchiveReadAddPassphrase3.wiki b/archivers/libarchive/files/doc/wiki/ManPageArchiveReadAddPassphrase3.wiki
index 3f70ec9aa61..466505c5522 100644
--- a/archivers/libarchive/files/doc/wiki/ManPageArchiveReadAddPassphrase3.wiki
+++ b/archivers/libarchive/files/doc/wiki/ManPageArchiveReadAddPassphrase3.wiki
@@ -37,6 +37,6 @@ function failed.
 </dd></dl> 
 == SEE ALSO == 
 [[ManPageBsdtar1]], 
-[[ManPageibarchive3]], 
-[[ManPagerchiveead3]], 
-[[ManPagerchiveeadetptions3]] 
+[[ManPageLibarchive3]], 
+[[ManPageArchiveRead3]], 
+[[ManPageArchiveReadSetOptions3]] 
diff --git a/archivers/libarchive/files/doc/wiki/ManPageArchiveReadData3.wiki b/archivers/libarchive/files/doc/wiki/ManPageArchiveReadData3.wiki
index e6c7afc295b..da4647cf141 100644
--- a/archivers/libarchive/files/doc/wiki/ManPageArchiveReadData3.wiki
+++ b/archivers/libarchive/files/doc/wiki/ManPageArchiveReadData3.wiki
@@ -89,13 +89,13 @@ and
 functions. 
 == SEE ALSO == 
 [[ManPageBsdtar1]], 
-[[ManPageibarchive3]], 
-[[ManPagerchiveead3]], 
-[[ManPagerchiveeadxtract3]], 
-[[ManPagerchiveeadilter3]], 
-[[ManPagerchiveeadormat3]], 
-[[ManPagerchiveeadeader3]], 
-[[ManPagerchiveeadpen3]], 
-[[ManPagerchiveeadetptions3]], 
-[[ManPagerchivetil3]], 
+[[ManPageLibarchive3]], 
+[[ManPageArchiveRead3]], 
+[[ManPageArchiveReadExtract3]], 
+[[ManPageArchiveReadFilter3]], 
+[[ManPageArchiveReadFormat3]], 
+[[ManPageArchiveReadHeader3]], 
+[[ManPageArchiveReadOpen3]], 
+[[ManPageArchiveReadSetOptions3]], 
+[[ManPageArchiveUtil3]], 
 [[ManPageTar5]] 
diff --git a/archivers/libarchive/files/doc/wiki/ManPageArchiveReadDisk3.wiki b/archivers/libarchive/files/doc/wiki/ManPageArchiveReadDisk3.wiki
index 752181e182d..06288ef960b 100644
--- a/archivers/libarchive/files/doc/wiki/ManPageArchiveReadDisk3.wiki
+++ b/archivers/libarchive/files/doc/wiki/ManPageArchiveReadDisk3.wiki
@@ -173,7 +173,7 @@ object with information about a particular file.
 The 
 '''archive_entry''' 
 object must have already been created with 
-[[ManPagerchiventryew3]] 
+[[ManPageArchiveEntryNew3]] 
 and at least one of the source path or path fields must already be set. 
 (If both are set, the source path will be used.) 
 
@@ -203,7 +203,7 @@ object.
 More information about the 
 ''struct'' archive 
 object and the overall design of the library can be found in the 
-[[ManPageibarchive3]] 
+[[ManPageLibarchive3]] 
 overview. 
 == EXAMPLE == 
 The following illustrates basic usage of the library by 
@@ -267,12 +267,12 @@ and
 '''archive_error_string'''() 
 functions. 
 == SEE ALSO == 
-[[ManPagerchiveead3]], 
-[[ManPagerchivetil3]], 
-[[ManPagerchiverite3]], 
-[[ManPagerchiveriteisk3]], 
+[[ManPageArchiveRead3]], 
+[[ManPageArchiveUtil3]], 
+[[ManPageArchiveWrite3]], 
+[[ManPageArchiveWriteDisk3]], 
 [[ManPageBsdtar1]], 
-[[ManPageibarchive3]] 
+[[ManPageLibarchive3]] 
 == HISTORY == 
 The 
 '''libarchive''' 
@@ -313,7 +313,7 @@ to look up such information.
 
 This API should provide a set of methods for walking a directory tree. 
 That would make it a direct parallel of the 
-[[ManPagerchiveead3]] 
+[[ManPageArchiveRead3]] 
 API. 
 When such methods are implemented, the 
 "hybrid" 
diff --git a/archivers/libarchive/files/doc/wiki/ManPageArchiveReadExtract3.wiki b/archivers/libarchive/files/doc/wiki/ManPageArchiveReadExtract3.wiki
index b33adeba7a0..e3ec018be18 100644
--- a/archivers/libarchive/files/doc/wiki/ManPageArchiveReadExtract3.wiki
+++ b/archivers/libarchive/files/doc/wiki/ManPageArchiveReadExtract3.wiki
@@ -24,34 +24,34 @@ Streaming Archive Library (libarchive, -larchive)
 <dl> 
 <dt>'''archive_read_extract'''(), '''archive_read_extract_set_skip_file'''()</dt><dd> 
 A convenience function that wraps the corresponding 
-[[ManPagerchiveriteisk3]] 
+[[ManPageArchiveWriteDisk3]] 
 interfaces. 
 The first call to 
 '''archive_read_extract'''() 
 creates a restore object using 
-[[ManPagerchiveriteiskew3]] 
+[[ManPageArchiveWriteDiskNew3]] 
 and 
-[[ManPagerchiveriteiskettandardookup3]], 
+[[ManPageArchiveWriteDiskSetStandardLookup3]], 
 then transparently invokes 
-[[ManPagerchiveriteisketptions3]], 
-[[ManPagerchiveriteeader3]], 
-[[ManPagerchiveriteata3]], 
+[[ManPageArchiveWriteDiskSetOptions3]], 
+[[ManPageArchiveWriteHeader3]], 
+[[ManPageArchiveWriteData3]], 
 and 
-[[ManPagerchiveriteinishntry3]] 
+[[ManPageArchiveWriteFinishEntry3]] 
 to create the entry on disk and copy data into it. 
 The 
 ''flags'' 
 argument is passed unmodified to 
-[[ManPagerchiveriteisketptions3]]. 
+[[ManPageArchiveWriteDiskSetOptions3]]. 
 </dd><dt>'''archive_read_extract2'''()</dt><dd> 
 This is another version of 
 '''archive_read_extract'''() 
 that allows you to provide your own restore object. 
 In particular, this allows you to override the standard lookup functions 
 using 
-[[ManPagerchiveriteisketroupookup3]], 
+[[ManPageArchiveWriteDiskSetGroupLookup3]], 
 and 
-[[ManPagerchiveriteisketserookup3]]. 
+[[ManPageArchiveWriteDiskSetUserLookup3]]. 
 Note that 
 '''archive_read_extract2'''() 
 does not accept a 
@@ -91,12 +91,12 @@ and
 functions. 
 == SEE ALSO == 
 [[ManPageBsdtar1]], 
-[[ManPageibarchive3]], 
-[[ManPagerchiveead3]], 
-[[ManPagerchiveeadata3]], 
-[[ManPagerchiveeadilter3]], 
-[[ManPagerchiveeadormat3]], 
-[[ManPagerchiveeadpen3]], 
-[[ManPagerchiveeadetptions3]], 
-[[ManPagerchivetil3]], 
+[[ManPageLibarchive3]], 
+[[ManPageArchiveRead3]], 
+[[ManPageArchiveReadData3]], 
+[[ManPageArchiveReadFilter3]], 
+[[ManPageArchiveReadFormat3]], 
+[[ManPageArchiveReadOpen3]], 
+[[ManPageArchiveReadSetOptions3]], 
+[[ManPageArchiveUtil3]], 
 [[ManPageTar5]] 
diff --git a/archivers/libarchive/files/doc/wiki/ManPageArchiveReadFilter3.wiki b/archivers/libarchive/files/doc/wiki/ManPageArchiveReadFilter3.wiki
index 0a8d8287943..9005be9991c 100644
--- a/archivers/libarchive/files/doc/wiki/ManPageArchiveReadFilter3.wiki
+++ b/archivers/libarchive/files/doc/wiki/ManPageArchiveReadFilter3.wiki
@@ -136,8 +136,8 @@ and
 '''archive_error_string'''() 
 functions. 
 == SEE ALSO == 
-[[ManPageibarchive3]], 
-[[ManPagerchiveead3]], 
-[[ManPagerchiveeadata3]], 
-[[ManPagerchiveeadormat3]], 
-[[ManPagerchiveeadormat3]] 
+[[ManPageLibarchive3]], 
+[[ManPageArchiveRead3]], 
+[[ManPageArchiveReadData3]], 
+[[ManPageArchiveReadFormat3]], 
+[[ManPageArchiveReadFormat3]] 
diff --git a/archivers/libarchive/files/doc/wiki/ManPageArchiveReadFormat3.wiki b/archivers/libarchive/files/doc/wiki/ManPageArchiveReadFormat3.wiki
index 645300bf751..0d2955476db 100644
--- a/archivers/libarchive/files/doc/wiki/ManPageArchiveReadFormat3.wiki
+++ b/archivers/libarchive/files/doc/wiki/ManPageArchiveReadFormat3.wiki
@@ -150,11 +150,11 @@ and
 functions. 
 == SEE ALSO == 
 [[ManPageBsdtar1]], 
-[[ManPageibarchive3]], 
-[[ManPagerchiveeadata3]], 
-[[ManPagerchiveeadilter3]], 
-[[ManPagerchiveeadetptions3]], 
-[[ManPagerchivetil3]], 
+[[ManPageLibarchive3]], 
+[[ManPageArchiveReadData3]], 
+[[ManPageArchiveReadFilter3]], 
+[[ManPageArchiveReadSetOptions3]], 
+[[ManPageArchiveUtil3]], 
 [[ManPageTar5]] 
 == BUGS == 
 Many traditional archiver programs treat 
diff --git a/archivers/libarchive/files/doc/wiki/ManPageArchiveReadFree3.wiki b/archivers/libarchive/files/doc/wiki/ManPageArchiveReadFree3.wiki
index 10f372d8640..90b094922ac 100644
--- a/archivers/libarchive/files/doc/wiki/ManPageArchiveReadFree3.wiki
+++ b/archivers/libarchive/files/doc/wiki/ManPageArchiveReadFree3.wiki
@@ -58,11 +58,11 @@ and
 '''archive_error_string'''() 
 functions. 
 == SEE ALSO == 
-[[ManPageibarchive3]], 
-[[ManPagerchiveeadew3]], 
-[[ManPagerchiveeadata3]], 
-[[ManPagerchiveeadilter3]], 
-[[ManPagerchiveeadormat3]], 
-[[ManPagerchiveeadpen3]], 
-[[ManPagerchiveeadetptions3]], 
-[[ManPagerchivetil3]] 
+[[ManPageLibarchive3]], 
+[[ManPageArchiveReadNew3]], 
+[[ManPageArchiveReadData3]], 
+[[ManPageArchiveReadFilter3]], 
+[[ManPageArchiveReadFormat3]], 
+[[ManPageArchiveReadOpen3]], 
+[[ManPageArchiveReadSetOptions3]], 
+[[ManPageArchiveUtil3]] 
diff --git a/archivers/libarchive/files/doc/wiki/ManPageArchiveReadHeader3.wiki b/archivers/libarchive/files/doc/wiki/ManPageArchiveReadHeader3.wiki
index 30611b28403..7eb59499f56 100644
--- a/archivers/libarchive/files/doc/wiki/ManPageArchiveReadHeader3.wiki
+++ b/archivers/libarchive/files/doc/wiki/ManPageArchiveReadHeader3.wiki
@@ -51,13 +51,13 @@ and
 functions. 
 == SEE ALSO == 
 [[ManPageBsdtar1]], 
-[[ManPageibarchive3]], 
-[[ManPagerchiveead3]], 
-[[ManPagerchiveeadata3]], 
-[[ManPagerchiveeadxtract3]], 
-[[ManPagerchiveeadilter3]], 
-[[ManPagerchiveeadormat3]], 
-[[ManPagerchiveeadpen3]], 
-[[ManPagerchiveeadetptions3]], 
-[[ManPagerchivetil3]], 
+[[ManPageLibarchive3]], 
+[[ManPageArchiveRead3]], 
+[[ManPageArchiveReadData3]], 
+[[ManPageArchiveReadExtract3]], 
+[[ManPageArchiveReadFilter3]], 
+[[ManPageArchiveReadFormat3]], 
+[[ManPageArchiveReadOpen3]], 
+[[ManPageArchiveReadSetOptions3]], 
+[[ManPageArchiveUtil3]], 
 [[ManPageTar5]] 
diff --git a/archivers/libarchive/files/doc/wiki/ManPageArchiveReadNew3.wiki b/archivers/libarchive/files/doc/wiki/ManPageArchiveReadNew3.wiki
index 41b3c2bec53..70c3cfd3fd7 100644
--- a/archivers/libarchive/files/doc/wiki/ManPageArchiveReadNew3.wiki
+++ b/archivers/libarchive/files/doc/wiki/ManPageArchiveReadNew3.wiki
@@ -20,13 +20,13 @@ is returned on error.
 A complete description of the 
 '''struct archive''' 
 object can be found in the overview manual page for 
-[[ManPageibarchive3]]. 
+[[ManPageLibarchive3]]. 
 == SEE ALSO == 
 [[ManPageBsdtar1]], 
-[[ManPageibarchive3]], 
-[[ManPagerchiveeadata3]], 
-[[ManPagerchiveeadilter3]], 
-[[ManPagerchiveeadormat3]], 
-[[ManPagerchiveeadetptions3]], 
-[[ManPagerchivetil3]], 
+[[ManPageLibarchive3]], 
+[[ManPageArchiveReadData3]], 
+[[ManPageArchiveReadFilter3]], 
+[[ManPageArchiveReadFormat3]], 
+[[ManPageArchiveReadSetOptions3]], 
+[[ManPageArchiveUtil3]], 
 [[ManPageTar5]] 
diff --git a/archivers/libarchive/files/doc/wiki/ManPageArchiveReadOpen3.wiki b/archivers/libarchive/files/doc/wiki/ManPageArchiveReadOpen3.wiki
index baa3c5ce5a9..d2f6b333e51 100644
--- a/archivers/libarchive/files/doc/wiki/ManPageArchiveReadOpen3.wiki
+++ b/archivers/libarchive/files/doc/wiki/ManPageArchiveReadOpen3.wiki
@@ -92,7 +92,7 @@ A complete description of the
 and 
 '''struct archive_entry''' 
 objects can be found in the overview manual page for 
-[[ManPageibarchive3]]. 
+[[ManPageLibarchive3]]. 
 == CLIENT CALLBACKS == 
 The callback functions must match the following prototypes: 
 <ul> 
@@ -180,11 +180,11 @@ and
 functions. 
 == SEE ALSO == 
 [[ManPageBsdtar1]], 
-[[ManPageibarchive3]], 
-[[ManPagerchiveead3]], 
-[[ManPagerchiveeadata3]], 
-[[ManPagerchiveeadilter3]], 
-[[ManPagerchiveeadormat3]], 
-[[ManPagerchiveeadetptions3]], 
-[[ManPagerchivetil3]], 
+[[ManPageLibarchive3]], 
+[[ManPageArchiveRead3]], 
+[[ManPageArchiveReadData3]], 
+[[ManPageArchiveReadFilter3]], 
+[[ManPageArchiveReadFormat3]], 
+[[ManPageArchiveReadSetOptions3]], 
+[[ManPageArchiveUtil3]], 
 [[ManPageTar5]] 
diff --git a/archivers/libarchive/files/doc/wiki/ManPageArchiveReadSetOptions3.wiki b/archivers/libarchive/files/doc/wiki/ManPageArchiveReadSetOptions3.wiki
index aef201eb521..b2bca417c4b 100644
--- a/archivers/libarchive/files/doc/wiki/ManPageArchiveReadSetOptions3.wiki
+++ b/archivers/libarchive/files/doc/wiki/ManPageArchiveReadSetOptions3.wiki
@@ -182,6 +182,6 @@ and
 functions. 
 == SEE ALSO == 
 [[ManPageBsdtar1]], 
-[[ManPageibarchive3]], 
-[[ManPagerchiveriteetptions3]], 
-[[ManPagerchiveead3]] 
+[[ManPageLibarchive3]], 
+[[ManPageArchiveWriteSetOptions3]], 
+[[ManPageArchiveRead3]] 
diff --git a/archivers/libarchive/files/doc/wiki/ManPageArchiveUtil3.wiki b/archivers/libarchive/files/doc/wiki/ManPageArchiveUtil3.wiki
index 48341524eac..2f07b658add 100644
--- a/archivers/libarchive/files/doc/wiki/ManPageArchiveUtil3.wiki
+++ b/archivers/libarchive/files/doc/wiki/ManPageArchiveUtil3.wiki
@@ -79,7 +79,7 @@ Streaming Archive Library (libarchive, -larchive)
 These functions provide access to various information about the 
 '''struct archive''' 
 object used in the 
-[[ManPageibarchive3]] 
+[[ManPageLibarchive3]] 
 library. 
 <dl> 
 <dt>'''archive_clear_error'''()</dt><dd> 
@@ -111,9 +111,9 @@ to
 </dd><dt>'''archive_file_count'''()</dt><dd> 
 Returns a count of the number of files processed by this archive object. 
 The count is incremented by calls to 
-[[ManPagerchiveriteeader3]] 
+[[ManPageArchiveWriteHeader3]] 
 or 
-[[ManPagerchiveeadexteader3]]. 
+[[ManPageArchiveReadNextHeader3]]. 
 </dd><dt>'''archive_filter_code'''()</dt><dd> 
 Returns a numeric code identifying the indicated filter. 
 See 
@@ -202,9 +202,9 @@ Field-width specifiers and other printf features are
 not uniformly supported and should not be used. 
 </dd></dl> 
 == SEE ALSO == 
-[[ManPagerchiveead3]], 
-[[ManPagerchiverite3]], 
-[[ManPageibarchive3]], 
+[[ManPageArchiveRead3]], 
+[[ManPageArchiveWrite3]], 
+[[ManPageLibarchive3]], 
 [[printf(3)|http://www.freebsd.org/cgi/man.cgi?query=printf&sektion=3]] 
 == HISTORY == 
 The 
diff --git a/archivers/libarchive/files/doc/wiki/ManPageArchiveWrite3.wiki b/archivers/libarchive/files/doc/wiki/ManPageArchiveWrite3.wiki
index 892e74ea668..01349133c08 100644
--- a/archivers/libarchive/files/doc/wiki/ManPageArchiveWrite3.wiki
+++ b/archivers/libarchive/files/doc/wiki/ManPageArchiveWrite3.wiki
@@ -15,7 +15,7 @@ object, set any desired options, initialize the archive, append entries, then
 close the archive and release all resources. 
 === Create archive object=== 
 See 
-[[ManPagerchiveriteew3]]. 
+[[ManPageArchiveWriteNew3]]. 
 
 To write an archive, you must first obtain an initialized 
 '''struct archive''' 
@@ -23,10 +23,10 @@ object from
 '''archive_write_new'''(). 
 === Enable filters and formats, configure block size and padding=== 
 See 
-[[ManPagerchiveriteilter3]], 
-[[ManPagerchiveriteormat3]] 
+[[ManPageArchiveWriteFilter3]], 
+[[ManPageArchiveWriteFormat3]] 
 and 
-[[ManPagerchiveritelocksize3]]. 
+[[ManPageArchiveWriteBlocksize3]]. 
 
 You can then modify this object for the desired operations with the 
 various 
@@ -40,10 +40,10 @@ functions to enable the corresponding compression and format
 support. 
 === Set options=== 
 See 
-[[ManPagerchiveriteetptions3]]. 
+[[ManPageArchiveWriteSetOptions3]]. 
 === Open archive=== 
 See 
-[[ManPagerchiveritepen3]]. 
+[[ManPageArchiveWriteOpen3]]. 
 
 Once you have prepared the 
 '''struct archive''' 
@@ -59,9 +59,9 @@ specify a filename, file descriptor,
 object, or a block of memory from which to write the archive data. 
 === Produce archive=== 
 See 
-[[ManPagerchiveriteeader3]] 
+[[ManPageArchiveWriteHeader3]] 
 and 
-[[ManPagerchiveriteata3]]. 
+[[ManPageArchiveWriteData3]]. 
 
 Individual archive entries are written in a three-step 
 process: 
@@ -78,7 +78,7 @@ field, which specifies the type of object and
 field, which specifies the size of the data portion of the object. 
 === Release resources=== 
 See 
-[[ManPagerchiveriteree3]]. 
+[[ManPageArchiveWriteFree3]]. 
 
 After all entries have been written, use the 
 '''archive_write_free'''() 
@@ -180,8 +180,8 @@ int main(int argc, const char **argv)
 ```
 == SEE ALSO == 
 [[ManPageBsdtar1]], 
-[[ManPageibarchive3]], 
-[[ManPagerchiveriteetptions3]], 
+[[ManPageLibarchive3]], 
+[[ManPageArchiveWriteSetOptions3]], 
 [[ManPageCpio5]], 
 [[ManPageMtree5]], 
 [[ManPageTar5]] 
diff --git a/archivers/libarchive/files/doc/wiki/ManPageArchiveWriteBlocksize3.wiki b/archivers/libarchive/files/doc/wiki/ManPageArchiveWriteBlocksize3.wiki
index 8bdfd7db57e..7975a5a3e16 100644
--- a/archivers/libarchive/files/doc/wiki/ManPageArchiveWriteBlocksize3.wiki
+++ b/archivers/libarchive/files/doc/wiki/ManPageArchiveWriteBlocksize3.wiki
@@ -86,8 +86,8 @@ and
 functions. 
 == SEE ALSO == 
 [[ManPageBsdtar1]], 
-[[ManPageibarchive3]], 
-[[ManPagerchiveriteetptions3]], 
+[[ManPageLibarchive3]], 
+[[ManPageArchiveWriteSetOptions3]], 
 [[ManPageCpio5]], 
 [[ManPageMtree5]], 
 [[ManPageTar5]] 
diff --git a/archivers/libarchive/files/doc/wiki/ManPageArchiveWriteData3.wiki b/archivers/libarchive/files/doc/wiki/ManPageArchiveWriteData3.wiki
index 5d4ec6ecc26..7cde09f5e8b 100644
--- a/archivers/libarchive/files/doc/wiki/ManPageArchiveWriteData3.wiki
+++ b/archivers/libarchive/files/doc/wiki/ManPageArchiveWriteData3.wiki
@@ -53,9 +53,9 @@ Clients should treat any value less than zero as an error
 and consider any non-negative value as success. 
 == SEE ALSO == 
 [[ManPageBsdtar1]], 
-[[ManPageibarchive3]], 
-[[ManPagerchiveriteinishntry3]], 
-[[ManPagerchiveriteetptions3]], 
+[[ManPageLibarchive3]], 
+[[ManPageArchiveWriteFinishEntry3]], 
+[[ManPageArchiveWriteSetOptions3]], 
 [[ManPageCpio5]], 
 [[ManPageMtree5]], 
 [[ManPageTar5]] 
diff --git a/archivers/libarchive/files/doc/wiki/ManPageArchiveWriteDisk3.wiki b/archivers/libarchive/files/doc/wiki/ManPageArchiveWriteDisk3.wiki
index d0cd70b0983..d3e1a4e1624 100644
--- a/archivers/libarchive/files/doc/wiki/ManPageArchiveWriteDisk3.wiki
+++ b/archivers/libarchive/files/doc/wiki/ManPageArchiveWriteDisk3.wiki
@@ -202,10 +202,10 @@ and
 More information about the 
 ''struct'' archive 
 object and the overall design of the library can be found in the 
-[[ManPageibarchive3]] 
+[[ManPageLibarchive3]] 
 overview. 
 Many of these functions are also documented under 
-[[ManPagerchiverite3]]. 
+[[ManPageArchiveWrite3]]. 
 == RETURN VALUES == 
 Most functions return 
 '''ARCHIVE_OK''' 
@@ -238,10 +238,10 @@ and
 '''archive_error_string'''() 
 functions. 
 == SEE ALSO == 
-[[ManPagerchiveead3]], 
-[[ManPagerchiverite3]], 
+[[ManPageArchiveRead3]], 
+[[ManPageArchiveWrite3]], 
 [[ManPageBsdtar1]], 
-[[ManPageibarchive3]] 
+[[ManPageLibarchive3]] 
 == HISTORY == 
 The 
 '''libarchive''' 
diff --git a/archivers/libarchive/files/doc/wiki/ManPageArchiveWriteFilter3.wiki b/archivers/libarchive/files/doc/wiki/ManPageArchiveWriteFilter3.wiki
index 84a427bcc4d..e82588f2e76 100644
--- a/archivers/libarchive/files/doc/wiki/ManPageArchiveWriteFilter3.wiki
+++ b/archivers/libarchive/files/doc/wiki/ManPageArchiveWriteFilter3.wiki
@@ -125,10 +125,10 @@ and
 functions. 
 == SEE ALSO == 
 [[ManPageBsdtar1]], 
-[[ManPageibarchive3]], 
-[[ManPagerchiverite3]], 
-[[ManPagerchiveriteormat3]], 
-[[ManPagerchiveriteetptions3]], 
+[[ManPageLibarchive3]], 
+[[ManPageArchiveWrite3]], 
+[[ManPageArchiveWriteFormat3]], 
+[[ManPageArchiveWriteSetOptions3]], 
 [[ManPageCpio5]], 
 [[ManPageMtree5]], 
 [[ManPageTar5]] 
diff --git a/archivers/libarchive/files/doc/wiki/ManPageArchiveWriteFinishEntry3.wiki b/archivers/libarchive/files/doc/wiki/ManPageArchiveWriteFinishEntry3.wiki
index 7896d36be1f..6d33560e675 100644
--- a/archivers/libarchive/files/doc/wiki/ManPageArchiveWriteFinishEntry3.wiki
+++ b/archivers/libarchive/files/doc/wiki/ManPageArchiveWriteFinishEntry3.wiki
@@ -42,9 +42,9 @@ and
 functions. 
 == SEE ALSO == 
 [[ManPageBsdtar1]], 
-[[ManPageibarchive3]], 
-[[ManPagerchiveriteata3]], 
-[[ManPagerchiveriteetptions3]], 
+[[ManPageLibarchive3]], 
+[[ManPageArchiveWriteData3]], 
+[[ManPageArchiveWriteSetOptions3]], 
 [[ManPageCpio5]], 
 [[ManPageMtree5]], 
 [[ManPageTar5]] 
diff --git a/archivers/libarchive/files/doc/wiki/ManPageArchiveWriteFormat3.wiki b/archivers/libarchive/files/doc/wiki/ManPageArchiveWriteFormat3.wiki
index 697fb115a4a..60fa69c54b6 100644
--- a/archivers/libarchive/files/doc/wiki/ManPageArchiveWriteFormat3.wiki
+++ b/archivers/libarchive/files/doc/wiki/ManPageArchiveWriteFormat3.wiki
@@ -165,7 +165,7 @@ Supported extensions: .7z, .zip, .jar, .cpio, .iso, .a, .ar, .tar, .tgz, .tar.gz
 </dt> <dd> 
 Set the format as specified. 
 More details on the formats supported by libarchive can be found in the 
-[[ManPageibarchiveormats5]] 
+[[ManPageLibarchiveFormats5]] 
 manual page. 
 </dd></dl> 
 == RETURN VALUES == 
@@ -181,10 +181,10 @@ and
 functions. 
 == SEE ALSO == 
 [[ManPageBsdtar1]], 
-[[ManPageibarchive3]], 
-[[ManPagerchiverite3]], 
-[[ManPagerchiveriteetptions3]], 
+[[ManPageLibarchive3]], 
+[[ManPageArchiveWrite3]], 
+[[ManPageArchiveWriteSetOptions3]], 
 [[ManPageCpio5]], 
-[[ManPageibarchiveormats5]], 
+[[ManPageLibarchiveFormats5]], 
 [[ManPageMtree5]], 
 [[ManPageTar5]] 
diff --git a/archivers/libarchive/files/doc/wiki/ManPageArchiveWriteFree3.wiki b/archivers/libarchive/files/doc/wiki/ManPageArchiveWriteFree3.wiki
index 4ca2cf9c798..1d94a56b16f 100644
--- a/archivers/libarchive/files/doc/wiki/ManPageArchiveWriteFree3.wiki
+++ b/archivers/libarchive/files/doc/wiki/ManPageArchiveWriteFree3.wiki
@@ -66,8 +66,8 @@ and
 functions. 
 == SEE ALSO == 
 [[ManPageBsdtar1]], 
-[[ManPageibarchive3]], 
-[[ManPagerchiveriteetptions3]], 
+[[ManPageLibarchive3]], 
+[[ManPageArchiveWriteSetOptions3]], 
 [[ManPageCpio5]], 
 [[ManPageMtree5]], 
 [[ManPageTar5]] 
diff --git a/archivers/libarchive/files/doc/wiki/ManPageArchiveWriteHeader3.wiki b/archivers/libarchive/files/doc/wiki/ManPageArchiveWriteHeader3.wiki
index 22547ea2468..412db20eddd 100644
--- a/archivers/libarchive/files/doc/wiki/ManPageArchiveWriteHeader3.wiki
+++ b/archivers/libarchive/files/doc/wiki/ManPageArchiveWriteHeader3.wiki
@@ -15,7 +15,7 @@ Build and write a header using the data in the provided
 '''struct archive_entry''' 
 structure. 
 See 
-[[ManPagerchiventry3]] 
+[[ManPageArchiveEntry3]] 
 for information on creating and populating 
 '''struct archive_entry''' 
 objects. 
@@ -37,8 +37,8 @@ and
 functions. 
 == SEE ALSO == 
 [[ManPageBsdtar1]], 
-[[ManPageibarchive3]], 
-[[ManPagerchiveriteetptions3]], 
+[[ManPageLibarchive3]], 
+[[ManPageArchiveWriteSetOptions3]], 
 [[ManPageCpio5]], 
 [[ManPageMtree5]], 
 [[ManPageTar5]] 
diff --git a/archivers/libarchive/files/doc/wiki/ManPageArchiveWriteNew3.wiki b/archivers/libarchive/files/doc/wiki/ManPageArchiveWriteNew3.wiki
index 3feb06718e5..b8c311f7012 100644
--- a/archivers/libarchive/files/doc/wiki/ManPageArchiveWriteNew3.wiki
+++ b/archivers/libarchive/files/doc/wiki/ManPageArchiveWriteNew3.wiki
@@ -20,12 +20,12 @@ is returned on error.
 A complete description of the 
 '''struct archive''' 
 object can be found in the overview manual page for 
-[[ManPageibarchive3]]. 
+[[ManPageLibarchive3]]. 
 == SEE ALSO == 
 [[ManPageBsdtar1]], 
-[[ManPageibarchive3]], 
-[[ManPagerchiverite3]], 
-[[ManPagerchiveriteetptions3]], 
+[[ManPageLibarchive3]], 
+[[ManPageArchiveWrite3]], 
+[[ManPageArchiveWriteSetOptions3]], 
 [[ManPageCpio5]], 
 [[ManPageMtree5]], 
 [[ManPageTar5]] 
diff --git a/archivers/libarchive/files/doc/wiki/ManPageArchiveWriteOpen3.wiki b/archivers/libarchive/files/doc/wiki/ManPageArchiveWriteOpen3.wiki
index aebd23975e0..369d7554a6d 100644
--- a/archivers/libarchive/files/doc/wiki/ManPageArchiveWriteOpen3.wiki
+++ b/archivers/libarchive/files/doc/wiki/ManPageArchiveWriteOpen3.wiki
@@ -101,13 +101,13 @@ have specifically set the block size.
 More information about the 
 ''struct'' archive 
 object and the overall design of the library can be found in the 
-[[ManPageibarchive3]] 
+[[ManPageLibarchive3]] 
 overview. 
 
 Note that the convenience forms above vary in how 
 they block the output. 
 See 
-[[ManPagerchiveritelocksize3]] 
+[[ManPageArchiveWriteBlocksize3]] 
 if you need to control the block size used for writes 
 or the end-of-file padding behavior. 
 == CLIENT CALLBACKS == 
@@ -196,13 +196,13 @@ and
 functions. 
 == SEE ALSO == 
 [[ManPageBsdtar1]], 
-[[ManPageibarchive3]], 
-[[ManPagerchiverite3]], 
-[[ManPagerchiveritelocksize3]], 
-[[ManPagerchiveriteilter3]], 
-[[ManPagerchiveriteormat3]], 
-[[ManPagerchiveriteew3]], 
-[[ManPagerchiveriteetptions3]], 
+[[ManPageLibarchive3]], 
+[[ManPageArchiveWrite3]], 
+[[ManPageArchiveWriteBlocksize3]], 
+[[ManPageArchiveWriteFilter3]], 
+[[ManPageArchiveWriteFormat3]], 
+[[ManPageArchiveWriteNew3]], 
+[[ManPageArchiveWriteSetOptions3]], 
 [[ManPageCpio5]], 
 [[ManPageMtree5]], 
 [[ManPageTar5]] 
diff --git a/archivers/libarchive/files/doc/wiki/ManPageArchiveWriteSetOptions3.wiki b/archivers/libarchive/files/doc/wiki/ManPageArchiveWriteSetOptions3.wiki
index 7c78d80dc30..f2c60fc073e 100644
--- a/archivers/libarchive/files/doc/wiki/ManPageArchiveWriteSetOptions3.wiki
+++ b/archivers/libarchive/files/doc/wiki/ManPageArchiveWriteSetOptions3.wiki
@@ -422,9 +422,9 @@ and
 functions. 
 == SEE ALSO == 
 [[ManPageBsdtar1]], 
-[[ManPageibarchive3]], 
-[[ManPagerchiveeadetptions3]], 
-[[ManPagerchiverite3]] 
+[[ManPageLibarchive3]], 
+[[ManPageArchiveReadSetOptions3]], 
+[[ManPageArchiveWrite3]] 
 == HISTORY == 
 The 
 '''libarchive''' 
diff --git a/archivers/libarchive/files/doc/wiki/ManPageArchiveWriteSetPassphrase3.wiki b/archivers/libarchive/files/doc/wiki/ManPageArchiveWriteSetPassphrase3.wiki
index ec9791d8fbf..4f6a97cc846 100644
--- a/archivers/libarchive/files/doc/wiki/ManPageArchiveWriteSetPassphrase3.wiki
+++ b/archivers/libarchive/files/doc/wiki/ManPageArchiveWriteSetPassphrase3.wiki
@@ -37,6 +37,6 @@ function.
 </dd></dl> 
 == SEE ALSO == 
 [[ManPageBsdtar1]], 
-[[ManPageibarchive3]], 
-[[ManPagerchiverite3]], 
-[[ManPagerchiveriteetptions3]] 
+[[ManPageLibarchive3]], 
+[[ManPageArchiveWrite3]], 
+[[ManPageArchiveWriteSetOptions3]] 
diff --git a/archivers/libarchive/files/doc/wiki/ManPageBsdcpio1.wiki b/archivers/libarchive/files/doc/wiki/ManPageBsdcpio1.wiki
index 087d46e5366..2821c9eab68 100644
--- a/archivers/libarchive/files/doc/wiki/ManPageBsdcpio1.wiki
+++ b/archivers/libarchive/files/doc/wiki/ManPageBsdcpio1.wiki
@@ -115,10 +115,10 @@ The POSIX.1 tar format.
 The default format is 
 ''odc''. 
 See 
-[[ManPageibarchiveormats5]] 
+[[ManPageLibarchiveFormats5]] 
 for more complete information about the 
 formats currently supported by the underlying 
-[[ManPageibarchive3]] 
+[[ManPageLibarchive3]] 
 library. 
 </dd><dt>-h, --help</dt><dd> 
 Print usage information. 
@@ -370,9 +370,9 @@ standard syntax.
 [[gzip(1)|http://www.freebsd.org/cgi/man.cgi?query=gzip&sektion=1]], 
 [[mt(1)|http://www.freebsd.org/cgi/man.cgi?query=mt&sektion=1]], 
 [[pax(1)|http://www.freebsd.org/cgi/man.cgi?query=pax&sektion=1]], 
-[[ManPageibarchive3]], 
+[[ManPageLibarchive3]], 
 [[ManPageCpio5]], 
-[[ManPageibarchiveormats5]], 
+[[ManPageLibarchiveFormats5]], 
 [[ManPageTar5]] 
 == STANDARDS == 
 There is no current POSIX standard for the cpio command; it appeared 
@@ -402,7 +402,7 @@ actually predates
 even though it was not well-known outside of AT&T until some time later. 
 
 This is a complete re-implementation based on the 
-[[ManPageibarchive3]] 
+[[ManPageLibarchive3]] 
 library. 
 == BUGS == 
 The cpio archive format has several basic limitations: 
diff --git a/archivers/libarchive/files/doc/wiki/ManPageBsdtar1.wiki b/archivers/libarchive/files/doc/wiki/ManPageBsdtar1.wiki
index 45eb3bc899a..4e521eebbee 100644
--- a/archivers/libarchive/files/doc/wiki/ManPageBsdtar1.wiki
+++ b/archivers/libarchive/files/doc/wiki/ManPageBsdtar1.wiki
@@ -189,15 +189,28 @@ options and before extracting any files.
 </dd><dt>--clear-nochange-fflags</dt><dd> 
 (x mode only) 
 Before removing file system objects to replace them, clear platform-specific 
-file flags that might prevent removal. 
+file attributes or file flags that might prevent removal. 
 </dd><dt>--exclude ''pattern''</dt><dd> 
 Do not process files or directories that match the 
 specified pattern. 
 Note that exclusions take precedence over patterns or filenames 
 specified on the command line. 
+</dd><dt>--exclude-vcs</dt><dd> 
+Do not process files or directories internally used by the 
+version control systems 
+Sq CVS, 
+Sq RCS, 
+Sq SCCS, 
+Sq SVN, 
+Sq Arch, 
+Sq Bazaar, 
+Sq Mercurial 
+and 
+Sq Darcs. 
 </dd><dt>--fflags</dt><dd> 
 (c, r, u, x modes only) 
-Archive or extract file flags. This is the reverse of 
+Archive or extract platform-specific file attributes or file flags. 
+This is the reverse of 
 --no-fflags 
 and the default behavior in c, r, and u modes or if 
 '''tar''' 
@@ -212,7 +225,7 @@ Supported formats include
 and 
 "ustar". 
 Other formats may also be supported; see 
-[[ManPageibarchiveormats5]] 
+[[ManPageLibarchiveFormats5]] 
 for more information about currently-supported formats. 
 In r and u modes, when extending an existing archive, the format specified 
 here must be compatible with the format of the existing archive on disk. 
@@ -370,8 +383,8 @@ Do not extract modification time.
 By default, the modification time is set to the time stored in the archive. 
 </dd><dt>--mac-metadata</dt><dd> 
 (c, r, u and x mode only) 
-Mac OS X specific. Archive or extract extended ACLs and extended attributes 
-using 
+Mac OS X specific. Archive or extract extended ACLs and extended file 
+attributes using 
 [[copyfile(3)|http://www.freebsd.org/cgi/man.cgi?query=copyfile&sektion=3]] 
 in AppleDouble format. This is the reverse of 
 --no-mac-metadata. 
@@ -379,8 +392,7 @@ and the default behavior in c, r, and u modes or if
 '''tar''' 
 is run in x mode as root. 
 </dd><dt>-n, --norecurse, --no-recursion</dt><dd> 
-(c, r, u modes only) 
-Do not recursively archive the contents of directories. 
+Do not operate recursively on the content of directories. 
 </dd><dt>--newer ''date''</dt><dd> 
 (c, r, u modes only) 
 Only include files and directories newer than the specified date. 
@@ -427,21 +439,21 @@ and the default behavior if
 is run as non-root in x mode (on Mac OS X as any user in c, r, u and x modes). 
 </dd><dt>--no-fflags</dt><dd> 
 (c, r, u, x modes only) 
-Do not archive or extract file flags. This is the reverse of 
+Do not archive or extract file attributes or file flags. This is the reverse of 
 --fflags 
 and the default behavior if 
 '''tar''' 
 is run as non-root in x mode. 
 </dd><dt>--no-mac-metadata</dt><dd> 
 (x mode only) 
-Mac OS X specific. Do not archive or extract ACLs and extended attributes using 
+Mac OS X specific. Do not archive or extract ACLs and extended file attributes 
+using 
 [[copyfile(3)|http://www.freebsd.org/cgi/man.cgi?query=copyfile&sektion=3]] 
 in AppleDouble format. This is the reverse of 
 --mac-metadata. 
 and the default behavior if 
 '''tar''' 
 is run as non-root in x mode. 
-</dd><dt>-n, --norecurse, --no-recursion</dt><dd> 
 </dd><dt>--no-same-owner</dt><dd> 
 (x mode only) 
 Do not extract owner and group IDs. 
@@ -452,8 +464,8 @@ and the default behavior if
 is run as non-root. 
 </dd><dt>--no-same-permissions</dt><dd> 
 (x mode only) 
-Do not extract full permissions (SGID, SUID, sticky bit, ACLs, 
-extended attributes or extended file flags). 
+Do not extract full permissions (SGID, SUID, sticky bit, 
+file attributes or file flags, extended file attributes and ACLs). 
 This is the reverse of 
 -p 
 and the default behavior if 
@@ -461,7 +473,7 @@ and the default behavior if
 is run as non-root. 
 </dd><dt>--no-xattrs</dt><dd> 
 (c, r, u, x modes only) 
-Do not archive or extract extended attributes. This is the reverse of 
+Do not archive or extract extended file attributes. This is the reverse of 
 --xattrs 
 and the default behavior if 
 '''tar''' 
@@ -649,13 +661,13 @@ This option suppresses these behaviors.
 </dd><dt>-p, --insecure, --preserve-permissions</dt><dd> 
 (x mode only) 
 Preserve file permissions. 
-Attempt to restore the full permissions, including owner, file modes, ACLs, 
-extended attributes and extended file flags, if available, for each item 
-extracted from the archive. This is te reverse of 
+Attempt to restore the full permissions, including file modes, file attributes 
+or file flags, extended file attributes and ACLs, if available, for each item 
+extracted from the archive. This is the reverse of 
 --no-same-permissions 
 and the default if 
 '''tar''' 
-is being run by root and can be partially overridden by also specifying 
+is being run as root. It can be partially overridden by also specifying 
 --no-acls, 
 --no-fflags, 
 --no-mac-metadata 
@@ -826,7 +838,7 @@ See
 for more information about the handling of exclusions. 
 </dd><dt>--xattrs</dt><dd> 
 (c, r, u, x modes only) 
-Archive or extract extended attributes. This is the reverse of 
+Archive or extract extended file attributes. This is the reverse of 
 --no-xattrs 
 and the default behavior in c, r, and u modes or if 
 '''tar''' 
@@ -1003,9 +1015,9 @@ For more details, see the explanation of the
 and 
 '''archive_write_set_options'''() 
 API calls that are described in 
-[[ManPagerchiveead3]] 
+[[ManPageArchiveRead3]] 
 and 
-[[ManPagerchiverite3]]. 
+[[ManPageArchiveWrite3]]. 
 == COMPATIBILITY == 
 The bundled-arguments format is supported for compatibility 
 with historic implementations. 
@@ -1148,8 +1160,8 @@ components, or symlinks to other directories.
 [[pax(1)|http://www.freebsd.org/cgi/man.cgi?query=pax&sektion=1]], 
 [[shar(1)|http://www.freebsd.org/cgi/man.cgi?query=shar&sektion=1]], 
 [[xz(1)|http://www.freebsd.org/cgi/man.cgi?query=xz&sektion=1]], 
-[[ManPageibarchive3]], 
-[[ManPageibarchiveormats5]], 
+[[ManPageLibarchive3]], 
+[[ManPageLibarchiveFormats5]], 
 [[ManPageTar5]] 
 == STANDARDS == 
 There is no current POSIX standard for the tar command; it appeared 
@@ -1181,7 +1193,7 @@ beginning with
 FreeBSD 1.0. 
 
 This is a complete re-implementation based on the 
-[[ManPageibarchive3]] 
+[[ManPageLibarchive3]] 
 library. 
 It was first released with 
 FreeBSD 5.4 
diff --git a/archivers/libarchive/files/doc/wiki/ManPageLibarchive3.wiki b/archivers/libarchive/files/doc/wiki/ManPageLibarchive3.wiki
index 2d7ae34b925..3cb828b9443 100644
--- a/archivers/libarchive/files/doc/wiki/ManPageLibarchive3.wiki
+++ b/archivers/libarchive/files/doc/wiki/ManPageLibarchive3.wiki
@@ -117,19 +117,19 @@ More detailed information can be found in the individual manual
 pages for each API or utility function. 
 == READING AN ARCHIVE == 
 See 
-[[ManPagerchiveead3]]. 
+[[ManPageArchiveRead3]]. 
 == WRITING AN ARCHIVE == 
 See 
-[[ManPagerchiverite3]]. 
+[[ManPageArchiveWrite3]]. 
 == WRITING ENTRIES TO DISK == 
 The 
-[[ManPagerchiveriteisk3]] 
+[[ManPageArchiveWriteDisk3]] 
 API allows you to write 
-[[ManPagerchiventry3]] 
+[[ManPageArchiveEntry3]] 
 objects to disk using the same API used by 
-[[ManPagerchiverite3]]. 
+[[ManPageArchiveWrite3]]. 
 The 
-[[ManPagerchiveriteisk3]] 
+[[ManPageArchiveWriteDisk3]] 
 API is used internally by 
 '''archive_read_extract'''('';'') 
 using it directly can provide greater control over how entries 
@@ -139,21 +139,21 @@ archive-to-archive copy and archive-to-disk extraction
 operations. 
 == READING ENTRIES FROM DISK == 
 The 
-[[ManPagerchiveeadisk3]] 
+[[ManPageArchiveReadDisk3]] 
 supports for populating 
-[[ManPagerchiventry3]] 
+[[ManPageArchiveEntry3]] 
 objects from information in the filesystem. 
 This includes the information accessible from the 
 [[stat(2)|http://www.freebsd.org/cgi/man.cgi?query=stat&sektion=2]] 
 system call as well as ACLs, extended attributes, 
 and other metadata. 
 The 
-[[ManPagerchiveeadisk3]] 
+[[ManPageArchiveReadDisk3]] 
 API also supports iterating over directory trees, 
 which allows directories of files to be read using 
 an API compatible with 
 the 
-[[ManPagerchiveead3]] 
+[[ManPageArchiveRead3]] 
 API. 
 == DESCRIPTION == 
 Detailed descriptions of each function are provided by the 
@@ -168,7 +168,7 @@ The
 structure contains a complete description of a single archive 
 entry. 
 It uses an opaque interface that is fully documented in 
-[[ManPagerchiventry3]]. 
+[[ManPageArchiveEntry3]]. 
 
 Users familiar with historic formats should be aware that the newer 
 variants have eliminated most restrictions on the length of textual fields. 
@@ -216,14 +216,14 @@ and
 functions can be used to obtain more information. 
 == ENVIRONMENT == 
 There are character set conversions within the 
-[[ManPagerchiventry3]] 
+[[ManPageArchiveEntry3]] 
 functions that are impacted by the currently-selected locale. 
 == SEE ALSO == 
 [[ManPageBsdtar1]], 
-[[ManPagerchiventry3]], 
-[[ManPagerchiveead3]], 
-[[ManPagerchivetil3]], 
-[[ManPagerchiverite3]], 
+[[ManPageArchiveEntry3]], 
+[[ManPageArchiveRead3]], 
+[[ManPageArchiveUtil3]], 
+[[ManPageArchiveWrite3]], 
 [[ManPageTar5]] 
 == HISTORY == 
 The 
diff --git a/archivers/libarchive/files/doc/wiki/ManPageLibarchiveChanges3.wiki b/archivers/libarchive/files/doc/wiki/ManPageLibarchiveChanges3.wiki
index ce9814e13f3..c73e9b21d37 100644
--- a/archivers/libarchive/files/doc/wiki/ManPageLibarchiveChanges3.wiki
+++ b/archivers/libarchive/files/doc/wiki/ManPageLibarchiveChanges3.wiki
@@ -292,13 +292,13 @@ ARCHIVE_DEFAULT_BYTES_PER_BLOCK
 ```
 </dd></dl> 
 == SEE ALSO == 
-[[ManPageibarchive3]], 
-[[ManPagerchiveead3]], 
-[[ManPagerchiveeadilter3]], 
-[[ManPagerchiveeadormat3]], 
-[[ManPagerchiveeadetptions3]], 
-[[ManPagerchiverite3]], 
-[[ManPagerchiveriteilter3]], 
-[[ManPagerchiveriteormat3]], 
-[[ManPagerchiveriteetptions3]], 
-[[ManPagerchivetil3]] 
+[[ManPageLibarchive3]], 
+[[ManPageArchiveRead3]], 
+[[ManPageArchiveReadFilter3]], 
+[[ManPageArchiveReadFormat3]], 
+[[ManPageArchiveReadSetOptions3]], 
+[[ManPageArchiveWrite3]], 
+[[ManPageArchiveWriteFilter3]], 
+[[ManPageArchiveWriteFormat3]], 
+[[ManPageArchiveWriteSetOptions3]], 
+[[ManPageArchiveUtil3]] 
diff --git a/archivers/libarchive/files/doc/wiki/ManPageLibarchiveFormats5.wiki b/archivers/libarchive/files/doc/wiki/ManPageLibarchiveFormats5.wiki
index 7623d919822..54663b2094d 100644
--- a/archivers/libarchive/files/doc/wiki/ManPageLibarchiveFormats5.wiki
+++ b/archivers/libarchive/files/doc/wiki/ManPageLibarchiveFormats5.wiki
@@ -4,7 +4,7 @@ LIBARCHIVE-FORMATS(5) manual page
 - archive formats supported by the libarchive library 
 == DESCRIPTION == 
 The 
-[[ManPageibarchive3]] 
+[[ManPageLibarchive3]] 
 library reads and writes a variety of streaming archive formats. 
 Generally speaking, all of these archive formats consist of a series of 
 "entries". 
@@ -21,7 +21,7 @@ to support, though many programs do use libarchive convenience
 functions to enable all supported formats. 
 === Tar Formats=== 
 The 
-[[ManPageibarchive3]] 
+[[ManPageLibarchive3]] 
 library can read most tar archives. 
 It can write POSIX-standard 
 "ustar" 
@@ -40,7 +40,7 @@ subsequent entries.
 <dl> 
 <dt>'''gnutar'''</dt><dd> 
 The 
-[[ManPageibarchive3]] 
+[[ManPageLibarchive3]] 
 library can read most GNU-format tar archives. 
 It currently supports the most popular GNU extensions, including 
 modern long filename and linkname support, as well as atime and ctime data. 
@@ -50,12 +50,12 @@ It can read GNU sparse file entries, including the new POSIX-based
 formats. 
 
 The 
-[[ManPageibarchive3]] 
+[[ManPageLibarchive3]] 
 library can write GNU tar format, including long filename 
 and linkname support, as well as atime and ctime data. 
 </dd><dt>'''pax'''</dt><dd> 
 The 
-[[ManPageibarchive3]] 
+[[ManPageLibarchive3]] 
 library can read and write POSIX-compliant pax interchange format 
 archives. 
 Pax interchange format archives are an extension of the older ustar 
@@ -379,7 +379,7 @@ although many of the keywords cannot currently be stored in an
 '''archive_entry''' 
 object. 
 When writing, libarchive supports use of the 
-[[ManPagerchiveriteetptions3]] 
+[[ManPageArchiveWriteSetOptions3]] 
 interface to specify which keywords should be included in the 
 output. 
 If libarchive was compiled with access to suitable 
diff --git a/archivers/libarchive/files/doc/wiki/ManPageLibarchiveInternals3.wiki b/archivers/libarchive/files/doc/wiki/ManPageLibarchiveInternals3.wiki
index a980ba4ce33..c7841683462 100644
--- a/archivers/libarchive/files/doc/wiki/ManPageLibarchiveInternals3.wiki
+++ b/archivers/libarchive/files/doc/wiki/ManPageLibarchiveInternals3.wiki
@@ -13,15 +13,15 @@ make it easy to add new archive and compression formats.
 Externally, libarchive exposes most operations through an 
 opaque, object-style interface. 
 The 
-[[ManPagerchiventry3]] 
+[[ManPageArchiveEntry3]] 
 objects store information about a single filesystem object. 
 The rest of the library provides facilities to write 
-[[ManPagerchiventry3]] 
+[[ManPageArchiveEntry3]] 
 objects to archive files, 
 read them from archive files, 
 and write them to disk. 
 (There are plans to add a facility to read 
-[[ManPagerchiventry3]] 
+[[ManPageArchiveEntry3]] 
 objects from disk as well.) 
 
 The read and write APIs each have four layers: a public API 
@@ -37,7 +37,7 @@ an archive or disk writer, and then use a single set of
 code to select and write entries, regardless of the target. 
 == READ ARCHITECTURE == 
 From the outside, clients use the 
-[[ManPagerchiveead3]] 
+[[ManPageArchiveRead3]] 
 API to manipulate an 
 '''archive''' 
 object to read entries and bodies from an archive stream. 
@@ -50,9 +50,9 @@ The API has four layers:
 The lowest layer is the I/O layer. 
 This layer can be overridden by clients, but most clients use 
 the packaged I/O callbacks provided, for example, by 
-[[ManPagerchiveeadpenemory3]], 
+[[ManPageArchiveReadOpenMemory3]], 
 and 
-[[ManPagerchiveeadpend3]]. 
+[[ManPageArchiveReadOpenFd3]]. 
 The compression layer calls the I/O layer to 
 read bytes and decompresses them for the format layer. 
 The format layer unpacks a stream of uncompressed bytes and 
@@ -319,11 +319,11 @@ Fortunately, such archives are very rare, and libarchive can read
 most ZIP archives, though it cannot always extract as much information 
 as a dedicated ZIP program. 
 == SEE ALSO == 
-[[ManPagerchiventry3]], 
-[[ManPagerchiveead3]], 
-[[ManPagerchiverite3]], 
-[[ManPagerchiveriteisk3]] 
-[[ManPageibarchive3]], 
+[[ManPageArchiveEntry3]], 
+[[ManPageArchiveRead3]], 
+[[ManPageArchiveWrite3]], 
+[[ManPageArchiveWriteDisk3]] 
+[[ManPageLibarchive3]], 
 == HISTORY == 
 The 
 '''libarchive'''