12 files changed, 69 insertions, 212 deletions

diff --git a/misc/freebsd-doc-all/Makefile b/misc/freebsd-doc-all/Makefile
index 28e18fed3d03..3f28b8b7189f 100644
--- a/misc/freebsd-doc-all/Makefile
+++ b/misc/freebsd-doc-all/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	freebsd-doc-all
-PORTVERSION=	49071
+PORTVERSION=	49564
 PORTEPOCH=	1
 CATEGORIES=	misc docs
 
diff --git a/misc/freebsd-doc-de/pkg-plist.html b/misc/freebsd-doc-de/pkg-plist.html
index 6fce43a501fc..3b363887e245 100644
--- a/misc/freebsd-doc-de/pkg-plist.html
+++ b/misc/freebsd-doc-de/pkg-plist.html
@@ -2,6 +2,7 @@
 %%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd/article.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-update-server/article.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/leap-seconds/article.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/linux-users/article.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/nanobsd/article.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/new-users/article.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/port-mentor-guidelines/article.html
diff --git a/misc/freebsd-doc-de/pkg-plist.html-common b/misc/freebsd-doc-de/pkg-plist.html-common
index a8c3d6529910..1b2138e1e4b3 100644
--- a/misc/freebsd-doc-de/pkg-plist.html-common
+++ b/misc/freebsd-doc-de/pkg-plist.html-common
@@ -7,6 +7,7 @@
 %%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-update-server/imagelib/callouts/4.png
 %%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-update-server/imagelib/callouts/5.png
 %%DOCSDIR%%/%%DOCLANG%%/articles/leap-seconds/docbook.css
+%%DOCSDIR%%/%%DOCLANG%%/articles/linux-users/docbook.css
 %%DOCSDIR%%/%%DOCLANG%%/articles/nanobsd/docbook.css
 %%DOCSDIR%%/%%DOCLANG%%/articles/nanobsd/imagelib/callouts/1.png
 %%DOCSDIR%%/%%DOCLANG%%/articles/nanobsd/imagelib/callouts/2.png
@@ -116,76 +117,6 @@
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/imagelib/callouts/7.png
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/imagelib/callouts/8.png
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/imagelib/callouts/9.png
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/install/adduser1.png
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/install/adduser2.png
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/install/adduser3.png
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/install/boot-loader-menu.png
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/install/boot-mgr.png
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/install/config-country.png
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/install/config-keymap.png
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/install/console-saver1.png
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/install/console-saver2.png
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/install/console-saver3.png
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/install/console-saver4.png
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/install/disk-layout.png
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/install/disklabel-auto.png
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/install/disklabel-ed1.png
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/install/disklabel-ed2.png
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/install/disklabel-fs.png
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/install/disklabel-root1.png
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/install/disklabel-root2.png
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/install/disklabel-root3.png
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/install/dist-set.png
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/install/dist-set2.png
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/install/docmenu1.png
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/install/ed0-conf.png
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/install/ed0-conf2.png
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/install/edit-inetd-conf.png
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/install/example-dir1.png
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/install/example-dir2.png
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/install/example-dir3.png
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/install/example-dir4.png
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/install/example-dir5.png
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/install/fdisk-drive1.png
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/install/fdisk-drive2.png
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/install/fdisk-edit1.png
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/install/fdisk-edit2.png
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/install/ftp-anon1.png
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/install/ftp-anon2.png
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/install/hdwrconf.png
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/install/keymap.png
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/install/main-doc.png
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/install/main-keymap.png
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/install/main-options.png
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/install/main-std.png
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/install/main1.png
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/install/mainexit.png
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/install/media.png
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/install/mouse1.png
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/install/mouse2.png
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/install/mouse3.png
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/install/mouse4.png
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/install/mouse5.png
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/install/mouse6.png
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/install/mta-main.png
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/install/net-config-menu1.png
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/install/net-config-menu2.png
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/install/nfs-server-edit.png
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/install/ntp-config.png
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/install/options.png
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/install/pkg-cat.png
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/install/pkg-confirm.png
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/install/pkg-install.png
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/install/pkg-sel.png
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/install/probstart.png
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/install/routed.png
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/install/security.png
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/install/sysinstall-exit.png
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/install/timezone1.png
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/install/timezone2.png
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/install/timezone3.png
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/install/userconfig.png
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/install/userconfig2.png
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/mail/mutt1.png
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/mail/mutt2.png
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/mail/mutt3.png
diff --git a/misc/freebsd-doc-de/pkg-plist.html-split b/misc/freebsd-doc-de/pkg-plist.html-split
index 0a222d38a7a3..331f2138de7c 100644
--- a/misc/freebsd-doc-de/pkg-plist.html-split
+++ b/misc/freebsd-doc-de/pkg-plist.html-split
@@ -20,6 +20,17 @@
 %%DOCSDIR%%/%%DOCLANG%%/articles/leap-seconds/leapseconds-conclusion.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/leap-seconds/leapseconds-posix.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/leap-seconds/leapseconds-testing.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/linux-users/commands.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/linux-users/conclusion.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/linux-users/firewall.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/linux-users/index.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/linux-users/network.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/linux-users/procfs.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/linux-users/shells.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/linux-users/software.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/linux-users/startup.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/linux-users/trademarks.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/linux-users/updates.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/nanobsd/howto.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/nanobsd/index.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/nanobsd/ix01.html
@@ -142,6 +153,8 @@
 %%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/doc-build-toolset.html
 %%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/doc-build.html
 %%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/docbook-markup.html
+%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/editor-config-emacs.html
+%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/editor-config-nano.html
 %%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/editor-config.html
 %%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/examples-docbook-article.html
 %%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/examples-formatted.html
@@ -155,6 +168,7 @@
 %%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/po-translations-building.html
 %%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/po-translations-creating.html
 %%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/po-translations-quick-start.html
+%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/po-translations-submitting.html
 %%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/po-translations-tips.html
 %%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/po-translations-translating.html
 %%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/po-translations.html
@@ -198,7 +212,6 @@
 %%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/xml-primer-marked-sections.html
 %%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/xml-primer-xml-escape.html
 %%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/xml-primer.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/ACPI-debug.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/SMTP-Auth.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/SMTP-dialup.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/acpi-overview.html
@@ -224,16 +237,13 @@
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/bibliography-userguides.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/bibliography.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/book-preface.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/boot-blocks.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/boot-init.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/boot-introduction.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/boot-kernel.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/boot-shutdown.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/boot-splash.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/boot.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall-final-warning.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall-hardware.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall-install-trouble.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall-netinstall.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall-partitioning.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall-post.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall-pre.html
@@ -278,7 +288,7 @@
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/dtrace-using.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/dtrace.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/editors.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/eresources-email.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/eresources-mail.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/eresources-news.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/eresources-web.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/eresources.html
@@ -303,18 +313,6 @@
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/getting-started.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/history.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/index.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/install-advanced.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/install-choosing.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/install-diff-media.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/install-final-warning.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/install-hardware.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/install-media.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/install-post.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/install-pre.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/install-start.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/install-steps.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/install-trouble.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/install.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/introduction.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/ipsec.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/ix01.html
@@ -391,6 +389,7 @@
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/network-samba.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/network-servers.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/network-usb-tethering.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/network-vlan.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/network-wireless.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/nutshell.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/one-time-passwords.html
@@ -446,7 +445,6 @@
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/tvcard.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/updating-upgrading-documentation.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/updating-upgrading-freebsdupdate.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/updating-upgrading-portsnap.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/updating-upgrading.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/usb-disks.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/userppp.html
@@ -454,9 +452,11 @@
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/using-bsdinstall.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/using-live-cd.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/using-localization.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/using-sysinstall.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/video-playback.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/virtualization-guest.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/virtualization-guest-parallels.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/virtualization-guest-virtualbox-guest-additions.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/virtualization-guest-virtualpc.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/virtualization-guest-vmware.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/virtualization-host-bhyve.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/virtualization-host-virtualbox.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/virtualization.html
diff --git a/misc/freebsd-doc-de/pkg-plist.pdf b/misc/freebsd-doc-de/pkg-plist.pdf
index a945da3c9de0..2f5fbdaeaeb6 100644
--- a/misc/freebsd-doc-de/pkg-plist.pdf
+++ b/misc/freebsd-doc-de/pkg-plist.pdf
@@ -2,6 +2,7 @@
 %%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd/article.pdf
 %%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-update-server/article.pdf
 %%DOCSDIR%%/%%DOCLANG%%/articles/leap-seconds/article.pdf
+%%DOCSDIR%%/%%DOCLANG%%/articles/linux-users/article.pdf
 %%DOCSDIR%%/%%DOCLANG%%/articles/nanobsd/article.pdf
 %%DOCSDIR%%/%%DOCLANG%%/articles/new-users/article.pdf
 %%DOCSDIR%%/%%DOCLANG%%/articles/port-mentor-guidelines/article.pdf
diff --git a/misc/freebsd-doc-de/pkg-plist.ps b/misc/freebsd-doc-de/pkg-plist.ps
index 325c9d24ce32..db5b2385261b 100644
--- a/misc/freebsd-doc-de/pkg-plist.ps
+++ b/misc/freebsd-doc-de/pkg-plist.ps
@@ -2,6 +2,7 @@
 %%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd/article.ps
 %%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-update-server/article.ps
 %%DOCSDIR%%/%%DOCLANG%%/articles/leap-seconds/article.ps
+%%DOCSDIR%%/%%DOCLANG%%/articles/linux-users/article.ps
 %%DOCSDIR%%/%%DOCLANG%%/articles/nanobsd/article.ps
 %%DOCSDIR%%/%%DOCLANG%%/articles/new-users/article.ps
 %%DOCSDIR%%/%%DOCLANG%%/articles/port-mentor-guidelines/article.ps
diff --git a/misc/freebsd-doc-de/pkg-plist.txt b/misc/freebsd-doc-de/pkg-plist.txt
index dafc03a6e07a..39fd08479ec2 100644
--- a/misc/freebsd-doc-de/pkg-plist.txt
+++ b/misc/freebsd-doc-de/pkg-plist.txt
@@ -2,6 +2,7 @@
 %%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd/article.txt
 %%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-update-server/article.txt
 %%DOCSDIR%%/%%DOCLANG%%/articles/leap-seconds/article.txt
+%%DOCSDIR%%/%%DOCLANG%%/articles/linux-users/article.txt
 %%DOCSDIR%%/%%DOCLANG%%/articles/nanobsd/article.txt
 %%DOCSDIR%%/%%DOCLANG%%/articles/new-users/article.txt
 %%DOCSDIR%%/%%DOCLANG%%/articles/port-mentor-guidelines/article.txt
diff --git a/misc/freebsd-doc-en/Makefile b/misc/freebsd-doc-en/Makefile
index 8d42e00e6189..a1ed54dc1e0b 100644
--- a/misc/freebsd-doc-en/Makefile
+++ b/misc/freebsd-doc-en/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	freebsd-doc
-PORTVERSION=	49071
+PORTVERSION=	49564
 PORTEPOCH=	1
 CATEGORIES=	misc docs
 MASTER_SITES=	LOCAL/blackend
diff --git a/misc/freebsd-doc-en/distinfo b/misc/freebsd-doc-en/distinfo
index 9c14071857e7..09b0ceea7eb3 100644
--- a/misc/freebsd-doc-en/distinfo
+++ b/misc/freebsd-doc-en/distinfo
@@ -1,2 +1,3 @@
-SHA256 (freebsd-doc-49071.tar.gz) = a5ea42f8f5f8f05ea9e71a3992f17a53f75308d8719066b9998bc8ed14e2be10
-SIZE (freebsd-doc-49071.tar.gz) = 49784305
+TIMESTAMP = 1477384803
+SHA256 (freebsd-doc-49564.tar.gz) = 19eb6e0b2dea1a07f0912427dc0a2bedf575575c77149b511043b3d42fe2b47a
+SIZE (freebsd-doc-49564.tar.gz) = 51024456
diff --git a/misc/freebsd-doc-en/pkg-plist.html-split b/misc/freebsd-doc-en/pkg-plist.html-split
index 13cc32308c10..de49f1804527 100644
--- a/misc/freebsd-doc-en/pkg-plist.html-split
+++ b/misc/freebsd-doc-en/pkg-plist.html-split
@@ -43,6 +43,7 @@
 %%DOCSDIR%%/%%DOCLANG%%/articles/committers-guide/tracking.license.grants.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/committers-guide/trademarks.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/contributing/contrib-how.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/contributing/ideas-contributing.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/contributing/index.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/contributing/ix01.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/contributing/ports-contributing.html
@@ -767,6 +768,7 @@
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/network-samba.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/network-servers.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/network-usb-tethering.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/network-vlan.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/network-wireless.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/nutshell.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/one-time-passwords.html
@@ -830,7 +832,7 @@
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/using-localization.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/video-playback.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/virtualization-guest-parallels.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/virtualization-guest-virtualbox-guest-additions.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/virtualization-guest-virtualbox.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/virtualization-guest-virtualpc.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/virtualization-guest-vmware.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/virtualization-host-bhyve.html
@@ -901,6 +903,7 @@
 %%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/dads-sh-exec.html
 %%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/dads-sysctl.html
 %%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/dads-use-posix-standards.html
+%%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/dads-verbose-logs.html
 %%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/distfile-survey.html
 %%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/gnome-components.html
 %%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/handbook.html
@@ -1008,6 +1011,7 @@
 %%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/uses-horde.html
 %%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/uses-iconv.html
 %%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/uses-imake.html
+%%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/uses-kde.html
 %%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/uses-kmod.html
 %%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/uses-lha.html
 %%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/uses-libarchive.html
diff --git a/misc/freebsd-doc-zh_tw/pkg-plist.html-common b/misc/freebsd-doc-zh_tw/pkg-plist.html-common
index 10bd2008b6c8..06954c580ecc 100644
--- a/misc/freebsd-doc-zh_tw/pkg-plist.html-common
+++ b/misc/freebsd-doc-zh_tw/pkg-plist.html-common
@@ -40,6 +40,12 @@
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/advanced-networking/net-routing.png
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/advanced-networking/pxe-nfs.png
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/advanced-networking/static-routes.png
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/basics/disk-layout.png
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/basics/example-dir1.png
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/basics/example-dir2.png
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/basics/example-dir3.png
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/basics/example-dir4.png
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/basics/example-dir5.png
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall/bsdinstall-adduser1.png
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall/bsdinstall-adduser2.png
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall/bsdinstall-adduser3.png
@@ -112,76 +118,6 @@
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/imagelib/callouts/7.png
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/imagelib/callouts/8.png
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/imagelib/callouts/9.png
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/install/adduser1.png
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/install/adduser2.png
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/install/adduser3.png
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/install/boot-loader-menu.png
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/install/boot-mgr.png
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/install/config-country.png
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/install/config-keymap.png
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/install/console-saver1.png
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/install/console-saver2.png
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/install/console-saver3.png
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/install/console-saver4.png
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/install/disk-layout.png
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/install/disklabel-auto.png
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/install/disklabel-ed1.png
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/install/disklabel-ed2.png
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/install/disklabel-fs.png
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/install/disklabel-root1.png
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/install/disklabel-root2.png
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/install/disklabel-root3.png
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/install/dist-set.png
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/install/dist-set2.png
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/install/docmenu1.png
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/install/ed0-conf.png
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/install/ed0-conf2.png
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/install/edit-inetd-conf.png
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/install/example-dir1.png
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/install/example-dir2.png
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/install/example-dir3.png
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/install/example-dir4.png
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/install/example-dir5.png
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/install/fdisk-drive1.png
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/install/fdisk-drive2.png
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/install/fdisk-edit1.png
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/install/fdisk-edit2.png
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/install/ftp-anon1.png
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/install/ftp-anon2.png
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/install/hdwrconf.png
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/install/keymap.png
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/install/main-doc.png
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/install/main-keymap.png
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/install/main-options.png
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/install/main-std.png
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/install/main1.png
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/install/mainexit.png
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/install/media.png
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/install/mouse1.png
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/install/mouse2.png
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/install/mouse3.png
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/install/mouse4.png
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/install/mouse5.png
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/install/mouse6.png
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/install/mta-main.png
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/install/net-config-menu1.png
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/install/net-config-menu2.png
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/install/nfs-server-edit.png
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/install/ntp-config.png
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/install/options.png
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/install/pkg-cat.png
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/install/pkg-confirm.png
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/install/pkg-install.png
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/install/pkg-sel.png
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/install/probstart.png
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/install/routed.png
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/install/security.png
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/install/sysinstall-exit.png
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/install/timezone1.png
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/install/timezone2.png
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/install/timezone3.png
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/install/userconfig.png
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/install/userconfig2.png
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/mail/mutt1.png
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/mail/mutt2.png
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/mail/mutt3.png
diff --git a/misc/freebsd-doc-zh_tw/pkg-plist.html-split b/misc/freebsd-doc-zh_tw/pkg-plist.html-split
index ab3515c32126..2c833099eeb0 100644
--- a/misc/freebsd-doc-zh_tw/pkg-plist.html-split
+++ b/misc/freebsd-doc-zh_tw/pkg-plist.html-split
@@ -140,7 +140,7 @@
 %%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/ix01.html
 %%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/legalnotice.html
 %%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/make-includes.html
-%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/overview-quick-start.html
+%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/overview-doc.html
 %%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/overview.html
 %%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/po-translations-building.html
 %%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/po-translations-creating.html
@@ -191,10 +191,7 @@
 %%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/xml-primer-marked-sections.html
 %%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/xml-primer-xml-escape.html
 %%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/xml-primer.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/ACPI-debug.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/MAC-examplehttpd.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/SMTP-Auth.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/SMTP-UUCP.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/SMTP-dialup.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/acpi-overview.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/adding-swap-space.html
@@ -203,10 +200,8 @@
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/audit-administration.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/audit-config.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/audit-inline-glossary.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/audit-install.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/audit.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/backup-basics.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/basics-daemons.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/basics-devices.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/basics-more-information.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/basics-processes.html
@@ -221,11 +216,9 @@
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/bibliography-userguides.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/bibliography.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/book-preface.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/boot-blocks.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/boot-init.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/boot-introduction.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/boot-kernel.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/boot-shutdown.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/boot-splash.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/boot.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall-final-warning.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall-hardware.html
@@ -240,25 +233,22 @@
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/common-tasks.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/config-network-setup.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/config-tuning.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/configtuning-appconfig.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/configtuning-configfiles.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/configtuning-core-configuration.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/configtuning-cron.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/configtuning-disk.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/configtuning-kernel-limits.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/configtuning-rcd.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/configtuning-starting-services.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/configtuning-sysctl.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/configtuning-syslog.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/configtuning-virtual-hosts.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/consoles.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/creating-cds.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/creating-dvds.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/ctm.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/current-stable.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/desktop-browsers.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/desktop-finance.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/desktop-productivity.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/desktop-summary.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/desktop-viewers.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/desktop.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/device-hints.html
@@ -270,7 +260,6 @@
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/disks-encrypting.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/disks-growing.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/disks-hast.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/disks-naming.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/disks-virtual.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/disks.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/dtrace-enable.html
@@ -278,14 +267,12 @@
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/dtrace-using.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/dtrace.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/editors.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/eresources-email.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/eresources-mail.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/eresources-news.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/eresources-shell.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/eresources-web.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/eresources.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/filesystems-linux.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/filesystems.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/firewalls-apps.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/firewalls-concepts.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/firewalls-ipf.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/firewalls-ipfw.html
@@ -311,7 +298,7 @@
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/ix01.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/jails-application.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/jails-build.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/jails-intro.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/jails-ezjail.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/jails-terms.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/jails-tuning.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/jails.html
@@ -322,7 +309,6 @@
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/kernelconfig-devices.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/kernelconfig-trouble.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/kernelconfig.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/l10n-basics.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/l10n-compiling.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/l10n.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/lang-setup.html
@@ -330,20 +316,13 @@
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/linuxemu-advanced.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/linuxemu-lbc-install.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/linuxemu.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/mac-biba.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/mac-bsdextended.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/mac-ifoff.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/mac-implementing.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/mac-initial.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/mac-inline-glossary.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/mac-labelingpolicies.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/mac-lomac.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/mac-mls.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/mac-modules.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/mac-partition.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/mac-portacl.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/mac-planning.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/mac-policies.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/mac-troubleshoot.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/mac-understandlabel.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/mac-userlocked.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/mac.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/mail-advanced.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/mail-agents.html
@@ -359,9 +338,9 @@
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/mirrors.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/mount-unmount.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/multimedia.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/mythtv.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/network-aggregation.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/network-apache.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/network-atm.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/network-bluetooth.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/network-bridging.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/network-communication.html
@@ -372,16 +351,15 @@
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/network-inetd.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/network-ipv6.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/network-iscsi.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/network-isdn.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/network-ldap.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/network-natd.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/network-nfs.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/network-nis.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/network-ntp.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/network-plip.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/network-routing.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/network-samba.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/network-servers.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/network-usb-tethering.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/network-vlan.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/network-wireless.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/nutshell.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/one-time-passwords.html
@@ -389,42 +367,39 @@
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/openssl.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/outgoing-only.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/permissions.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/pgpkeys-core.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/pgpkeys-developers.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/pgpkeys.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/pkgng-intro.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/ports-broken.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/ports-finding-applications.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/ports-nextsteps.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/ports-overview.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/ports-poudriere.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/ports-using.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/ports.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/ppp-and-slip.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/ppp-troubleshoot.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/ppp.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/pppoa.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/pppoe.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/printing-advanced.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/printing-intro-setup.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/printing-intro-spooler.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/printing-lpd-alternatives.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/printing-troubleshooting.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/printing-using.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/printing-connections.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/printing-direct.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/printing-lpd.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/printing-other.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/printing-pdls.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/printing.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/quotas.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/scanners.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/security-accounting.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/security-advisories.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/security-intro.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/security-portaudit.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/security-pkg.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/security-resourcelimits.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/security-sudo.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/security.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/sendmail.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/serial.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/serialcomms.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/serialconsole-setup.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/shells.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/slip.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/small-lan.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/snapshots.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/sound-mp3.html
@@ -447,14 +422,20 @@
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/using-live-cd.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/using-localization.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/video-playback.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/virtualization-guest.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/virtualization-host.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/virtualization-guest-parallels.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/virtualization-guest-virtualbox.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/virtualization-guest-virtualpc.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/virtualization-guest-vmware.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/virtualization-host-bhyve.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/virtualization-host-virtualbox.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/virtualization.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/x-compiz-fusion.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/x-config.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/x-fonts.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/x-install.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/x-understanding.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/x-xdm.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/x11-understanding.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/x11-wm.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/x11.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/zfs-advanced.html