Update to r45038 of the FreeBSD docset.

Approved by:	doceng (implicit)

30 files changed, 491 insertions, 505 deletions

diff --git a/misc/freebsd-doc-all/Makefile b/misc/freebsd-doc-all/Makefile
index 40e1211976e3..56df0c029104 100644
--- a/misc/freebsd-doc-all/Makefile
+++ b/misc/freebsd-doc-all/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	freebsd-doc-all
-PORTVERSION=	44807
+PORTVERSION=	45038
 PORTEPOCH=	1
 CATEGORIES=	misc docs
 MASTER_SITES=	#empty
diff --git a/misc/freebsd-doc-bn/pkg-plist.common b/misc/freebsd-doc-bn/pkg-plist.common
index b006210cde2f..2752ed04a38c 100644
--- a/misc/freebsd-doc-bn/pkg-plist.common
+++ b/misc/freebsd-doc-bn/pkg-plist.common
@@ -1,6 +1,6 @@
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/new-users
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles
-%%DOCSDIR%%/%%DOCLANG_PREFIX%%
-@dirrm %%DOCSDIR%%/%%DOCLANG%%
+%%DOCSDIR%%/bn
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/new-users
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%
 @dirrmtry %%DOCSDIR%%
diff --git a/misc/freebsd-doc-da/pkg-plist.common b/misc/freebsd-doc-da/pkg-plist.common
index 8abc4426a759..42ea7a94a930 100644
--- a/misc/freebsd-doc-da/pkg-plist.common
+++ b/misc/freebsd-doc-da/pkg-plist.common
@@ -1,6 +1,6 @@
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/pxe
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/ipsec-must
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles
-%%DOCSDIR%%/%%DOCLANG_PREFIX%%
-@dirrm %%DOCSDIR%%/%%DOCLANG%%
+%%DOCSDIR%%/da
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/ipsec-must
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/pxe
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%
 @dirrmtry %%DOCSDIR%%
diff --git a/misc/freebsd-doc-de/pkg-plist.common b/misc/freebsd-doc-de/pkg-plist.common
index 36471da28e84..c282a4b1e2e3 100644
--- a/misc/freebsd-doc-de/pkg-plist.common
+++ b/misc/freebsd-doc-de/pkg-plist.common
@@ -1,39 +1,39 @@
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/imagelib/callouts
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/imagelib
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/handbook/virtualization
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/handbook/vinum
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/handbook/security
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/handbook/mail
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/handbook/install
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/handbook/imagelib/callouts
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/handbook/imagelib
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/handbook/geom
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/handbook/advanced-networking
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/handbook
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/imagelib/callouts
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/imagelib
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/faq
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/developers-handbook/sockets
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/developers-handbook
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/books
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/solid-state
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/port-mentor-guidelines
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/new-users
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/nanobsd/imagelib/callouts
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/nanobsd/imagelib
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/nanobsd
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/linux-comparison
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/laptop
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-update-server/imagelib/callouts
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-update-server/imagelib
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-update-server
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/contributing-ports
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/contributing
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles
-%%DOCSDIR%%/%%DOCLANG_PREFIX%%
-@dirrm %%DOCSDIR%%/%%DOCLANG%%
+%%DOCSDIR%%/de
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/contributing
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/contributing-ports
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-update-server/imagelib/callouts
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-update-server/imagelib
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-update-server
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/laptop
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/linux-comparison
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/nanobsd/imagelib/callouts
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/nanobsd/imagelib
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/nanobsd
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/new-users
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/port-mentor-guidelines
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/solid-state
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/developers-handbook/sockets
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/developers-handbook
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/faq
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/imagelib/callouts
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/imagelib
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/handbook/advanced-networking
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/handbook/geom
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/handbook/imagelib/callouts
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/handbook/imagelib
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/handbook/install
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/handbook/mail
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/handbook/security
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/handbook/vinum
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/handbook/virtualization
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/handbook
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/imagelib/callouts
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/imagelib
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%
 @dirrmtry %%DOCSDIR%%
diff --git a/misc/freebsd-doc-de/pkg-plist.html-split b/misc/freebsd-doc-de/pkg-plist.html-split
index c4cbb02a5ea6..46b5f039beba 100644
--- a/misc/freebsd-doc-de/pkg-plist.html-split
+++ b/misc/freebsd-doc-de/pkg-plist.html-split
@@ -413,7 +413,6 @@
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/network-inetd.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/network-ipv6.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/network-isdn.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
diff --git a/misc/freebsd-doc-el/pkg-plist.common b/misc/freebsd-doc-el/pkg-plist.common
index 1e306303b0aa..10be8b3e08e9 100644
--- a/misc/freebsd-doc-el/pkg-plist.common
+++ b/misc/freebsd-doc-el/pkg-plist.common
@@ -1,34 +1,34 @@
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/handbook/virtualization
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/handbook/security
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/handbook/mail
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/handbook/install
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/handbook/imagelib/callouts
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/handbook/imagelib
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/handbook/geom
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/handbook/advanced-networking
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/handbook
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/faq
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/books
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/releng-packages
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/releng
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/problem-reports
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/new-users
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/nanobsd/imagelib/callouts
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/nanobsd/imagelib
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/nanobsd
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/mailing-list-faq
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/linux-users
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/laptop
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/greek-language-support
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/gjournal-desktop
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-questions
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/cvs-freebsd
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/contributing
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/compiz-fusion
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/bsdl-gpl
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles
-%%DOCSDIR%%/%%DOCLANG_PREFIX%%
-@dirrm %%DOCSDIR%%/%%DOCLANG%%
+%%DOCSDIR%%/el
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/bsdl-gpl
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/compiz-fusion
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/contributing
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/cvs-freebsd
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-questions
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/gjournal-desktop
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/greek-language-support
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/laptop
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/linux-users
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/mailing-list-faq
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/nanobsd/imagelib/callouts
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/nanobsd/imagelib
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/nanobsd
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/new-users
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/problem-reports
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/releng
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/releng-packages
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/faq
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/handbook/advanced-networking
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/handbook/geom
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/handbook/imagelib/callouts
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/handbook/imagelib
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/handbook/install
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/handbook/mail
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/handbook/security
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/handbook/virtualization
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/handbook
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%
 @dirrmtry %%DOCSDIR%%
diff --git a/misc/freebsd-doc-en/Makefile b/misc/freebsd-doc-en/Makefile
index 0d864f8c6464..0d543ce93f4d 100644
--- a/misc/freebsd-doc-en/Makefile
+++ b/misc/freebsd-doc-en/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	freebsd-doc
-PORTVERSION=	44807
+PORTVERSION=	45038
 PORTEPOCH=	1
 CATEGORIES=	misc docs
 MASTER_SITES=	LOCAL/blackend
@@ -26,6 +26,7 @@ MAKE_ARGS=	FORMATS="${DOCFORMAT}" \
 MAKE_JOBS_UNSAFE=	yes
 DESTDIRNAME=	${STAGEDIR}${PREFIX}/${DOCBASE}
 PLIST=		${WRKDIR}/pkg-plist
+NEED_ROOT=	yes
 
 DOCLANG?=		en_US.ISO8859-1
 DOCLANG_PREFIX?=	${DOCLANG:C/_.*$//}
diff --git a/misc/freebsd-doc-en/distinfo b/misc/freebsd-doc-en/distinfo
index dcdd9f51a8b0..af8ca3141516 100644
--- a/misc/freebsd-doc-en/distinfo
+++ b/misc/freebsd-doc-en/distinfo
@@ -1,2 +1,2 @@
-SHA256 (freebsd-doc-44807.tar.gz) = 1e5acc5667ccf574df7aaab1303adcb0fb412ee8b05099b963834aa30aa65474
-SIZE (freebsd-doc-44807.tar.gz) = 32775374
+SHA256 (freebsd-doc-45038.tar.gz) = 16332a25926f44c482b21ddc93024f410f74e4969432ee8b1d928b3d98ff8b9a
+SIZE (freebsd-doc-45038.tar.gz) = 32859933
diff --git a/misc/freebsd-doc-en/pkg-plist.common b/misc/freebsd-doc-en/pkg-plist.common
index f600564a6698..1112bf0dd87c 100644
--- a/misc/freebsd-doc-en/pkg-plist.common
+++ b/misc/freebsd-doc-en/pkg-plist.common
@@ -1,89 +1,86 @@
-%%DOCSDIR%%/handbook
-%%DOCSDIR%%/faq
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/imagelib/callouts
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/imagelib
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/pmake
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/handbook/virtualization
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/handbook/security
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/handbook/mail
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/handbook/install
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/handbook/imagelib/callouts
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/handbook/imagelib
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/handbook/geom
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/handbook/advanced-networking
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/handbook
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/imagelib/callouts
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/imagelib
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/faq
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/developers-handbook/sockets
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/developers-handbook
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/dev-model
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/design-44bsd
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/arch-handbook/imagelib/callouts
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/arch-handbook/imagelib
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/arch-handbook
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/books
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/wp-toolbox
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/vm-design
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/solid-state
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/serial-uart
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/remote-install/imagelib/callouts
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/remote-install/imagelib
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/remote-install
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/releng-packages
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/releng
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/relaydelay
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/rc-scripting/imagelib/callouts
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/rc-scripting/imagelib
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/rc-scripting
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/problem-reports
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/pr-guidelines
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/portbuild
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/port-mentor-guidelines
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/pgpkeys
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/pam
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/p4-primer
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/new-users
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/nanobsd/imagelib/callouts
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/nanobsd/imagelib
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/nanobsd
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/mh
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/mailing-list-faq
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/linux-users
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/linux-emulation
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/linux-comparison
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/ldap-auth
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/laptop
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/ipsec-must
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/hubs
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/gjournal-desktop
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/geom-class
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-update-server/imagelib/callouts
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-update-server/imagelib
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-update-server
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-questions
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/fonts
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/filtering-bridges
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/fbsd-from-scratch
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/cvs-freebsd
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/custom-gcc
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/cups
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/contributors
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/contributing-ports
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/contributing
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/console-server
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/compiz-fusion
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/committers-guide/imagelib/callouts
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/committers-guide/imagelib
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/committers-guide
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/casestudy-argentina.com
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/building-products
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/bsdl-gpl
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles
-%%DOCSDIR%%/%%DOCLANG_PREFIX%%
-@dirrm %%DOCSDIR%%/%%DOCLANG%%
+%%DOCSDIR%%/en
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/bsdl-gpl
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/building-products
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/casestudy-argentina.com
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/committers-guide/imagelib/callouts
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/committers-guide/imagelib
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/committers-guide
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/compiz-fusion
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/console-server
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/contributing
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/contributing-ports
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/contributors
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/cups
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/custom-gcc
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/fbsd-from-scratch
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/filtering-bridges
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/fonts
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-questions
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-update-server/imagelib/callouts
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-update-server/imagelib
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-update-server
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/geom-class
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/gjournal-desktop
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/hubs
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/ipsec-must
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/laptop
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/ldap-auth
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/linux-comparison
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/linux-emulation
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/linux-users
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/mailing-list-faq
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/mh
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/nanobsd/imagelib/callouts
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/nanobsd/imagelib
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/nanobsd
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/new-users
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/p4-primer
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/pam
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/pgpkeys
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/port-mentor-guidelines
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/portbuild
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/pr-guidelines
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/problem-reports
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/rc-scripting/imagelib/callouts
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/rc-scripting/imagelib
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/rc-scripting
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/relaydelay
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/releng
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/releng-packages
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/remote-install/imagelib/callouts
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/remote-install/imagelib
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/remote-install
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/serial-uart
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/solid-state
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/vm-design
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/wp-toolbox
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/arch-handbook/imagelib/callouts
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/arch-handbook/imagelib
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/arch-handbook
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/design-44bsd
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/dev-model
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/developers-handbook/sockets
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/developers-handbook
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/faq
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/imagelib/callouts
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/imagelib
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/handbook/advanced-networking
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/handbook/geom
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/handbook/imagelib/callouts
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/handbook/imagelib
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/handbook/install
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/handbook/mail
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/handbook/security
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/handbook/virtualization
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/handbook
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/pmake
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/imagelib/callouts
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/imagelib
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%
 @dirrmtry %%DOCSDIR%%
diff --git a/misc/freebsd-doc-en/pkg-plist.html b/misc/freebsd-doc-en/pkg-plist.html
index 239f07065685..e63364de152f 100644
--- a/misc/freebsd-doc-en/pkg-plist.html
+++ b/misc/freebsd-doc-en/pkg-plist.html
@@ -9,7 +9,6 @@
 %%DOCSDIR%%/%%DOCLANG%%/articles/contributors/article.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/cups/article.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/custom-gcc/article.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/cvs-freebsd/article.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd/article.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/fbsd-from-scratch/article.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/filtering-bridges/article.html
diff --git a/misc/freebsd-doc-en/pkg-plist.html-common b/misc/freebsd-doc-en/pkg-plist.html-common
index f621124945d2..41050a853ad8 100644
--- a/misc/freebsd-doc-en/pkg-plist.html-common
+++ b/misc/freebsd-doc-en/pkg-plist.html-common
@@ -15,7 +15,6 @@
 %%DOCSDIR%%/%%DOCLANG%%/articles/contributors/docbook.css
 %%DOCSDIR%%/%%DOCLANG%%/articles/cups/docbook.css
 %%DOCSDIR%%/%%DOCLANG%%/articles/custom-gcc/docbook.css
-%%DOCSDIR%%/%%DOCLANG%%/articles/cvs-freebsd/docbook.css
 %%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd/docbook.css
 %%DOCSDIR%%/%%DOCLANG%%/articles/fbsd-from-scratch/docbook.css
 %%DOCSDIR%%/%%DOCLANG%%/articles/filtering-bridges/docbook.css
@@ -152,6 +151,7 @@
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall/bsdinstall-adduser2.png
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall/bsdinstall-adduser3.png
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall/bsdinstall-boot-loader-menu.png
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall/bsdinstall-boot-options-menu.png
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall/bsdinstall-choose-mode.png
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall/bsdinstall-config-components.png
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall/bsdinstall-config-crashdump.png
@@ -180,6 +180,7 @@
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall/bsdinstall-mainexit.png
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall/bsdinstall-netinstall-files.png
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall/bsdinstall-netinstall-mirrorselect.png
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall/bsdinstall-newboot-loader-menu.png
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall/bsdinstall-part-entire-part.png
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall/bsdinstall-part-guided-disk.png
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall/bsdinstall-part-guided-manual.png
diff --git a/misc/freebsd-doc-en/pkg-plist.html-split b/misc/freebsd-doc-en/pkg-plist.html-split
index 3a71f62a787b..45948bb850dd 100644
--- a/misc/freebsd-doc-en/pkg-plist.html-split
+++ b/misc/freebsd-doc-en/pkg-plist.html-split
@@ -103,10 +103,6 @@
 %%DOCSDIR%%/%%DOCLANG%%/articles/custom-gcc/performance-imparct.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/custom-gcc/prerequisites.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/custom-gcc/trademarks.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/cvs-freebsd/first-setup.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/cvs-freebsd/freebsdspecific.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/cvs-freebsd/index.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/cvs-freebsd/trademarks.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd/comparing-bsd-and-linux.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd/index.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd/trademarks.html
@@ -588,6 +584,7 @@
 %%DOCSDIR%%/%%DOCLANG%%/books/faq/acknowledgments.html
 %%DOCSDIR%%/%%DOCLANG%%/books/faq/admin.html
 %%DOCSDIR%%/%%DOCLANG%%/books/faq/advanced.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/all-about-zfs.html
 %%DOCSDIR%%/%%DOCLANG%%/books/faq/applications.html
 %%DOCSDIR%%/%%DOCLANG%%/books/faq/bibliography.html
 %%DOCSDIR%%/%%DOCLANG%%/books/faq/compatibility-drives.html
@@ -595,7 +592,6 @@
 %%DOCSDIR%%/%%DOCLANG%%/books/faq/compatibility-other.html
 %%DOCSDIR%%/%%DOCLANG%%/books/faq/compatibility-processors.html
 %%DOCSDIR%%/%%DOCLANG%%/books/faq/disks.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/funnies.html
 %%DOCSDIR%%/%%DOCLANG%%/books/faq/hardware.html
 %%DOCSDIR%%/%%DOCLANG%%/books/faq/index.html
 %%DOCSDIR%%/%%DOCLANG%%/books/faq/install.html
@@ -709,7 +705,6 @@
 %%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
diff --git a/misc/freebsd-doc-en/pkg-plist.pdf b/misc/freebsd-doc-en/pkg-plist.pdf
index db222176c145..0be37e9dd053 100644
--- a/misc/freebsd-doc-en/pkg-plist.pdf
+++ b/misc/freebsd-doc-en/pkg-plist.pdf
@@ -9,7 +9,6 @@
 %%DOCSDIR%%/%%DOCLANG%%/articles/contributors/article.pdf
 %%DOCSDIR%%/%%DOCLANG%%/articles/cups/article.pdf
 %%DOCSDIR%%/%%DOCLANG%%/articles/custom-gcc/article.pdf
-%%DOCSDIR%%/%%DOCLANG%%/articles/cvs-freebsd/article.pdf
 %%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd/article.pdf
 %%DOCSDIR%%/%%DOCLANG%%/articles/fbsd-from-scratch/article.pdf
 %%DOCSDIR%%/%%DOCLANG%%/articles/filtering-bridges/article.pdf
diff --git a/misc/freebsd-doc-en/pkg-plist.ps b/misc/freebsd-doc-en/pkg-plist.ps
index a589a6ef5026..ffffb5b892f7 100644
--- a/misc/freebsd-doc-en/pkg-plist.ps
+++ b/misc/freebsd-doc-en/pkg-plist.ps
@@ -9,7 +9,6 @@
 %%DOCSDIR%%/%%DOCLANG%%/articles/contributors/article.ps
 %%DOCSDIR%%/%%DOCLANG%%/articles/cups/article.ps
 %%DOCSDIR%%/%%DOCLANG%%/articles/custom-gcc/article.ps
-%%DOCSDIR%%/%%DOCLANG%%/articles/cvs-freebsd/article.ps
 %%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd/article.ps
 %%DOCSDIR%%/%%DOCLANG%%/articles/fbsd-from-scratch/article.ps
 %%DOCSDIR%%/%%DOCLANG%%/articles/filtering-bridges/article.ps
diff --git a/misc/freebsd-doc-en/pkg-plist.txt b/misc/freebsd-doc-en/pkg-plist.txt
index d812a3157a3d..94601c54b17a 100644
--- a/misc/freebsd-doc-en/pkg-plist.txt
+++ b/misc/freebsd-doc-en/pkg-plist.txt
@@ -9,7 +9,6 @@
 %%DOCSDIR%%/%%DOCLANG%%/articles/contributors/article.txt
 %%DOCSDIR%%/%%DOCLANG%%/articles/cups/article.txt
 %%DOCSDIR%%/%%DOCLANG%%/articles/custom-gcc/article.txt
-%%DOCSDIR%%/%%DOCLANG%%/articles/cvs-freebsd/article.txt
 %%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd/article.txt
 %%DOCSDIR%%/%%DOCLANG%%/articles/fbsd-from-scratch/article.txt
 %%DOCSDIR%%/%%DOCLANG%%/articles/filtering-bridges/article.txt
diff --git a/misc/freebsd-doc-es/pkg-plist.common b/misc/freebsd-doc-es/pkg-plist.common
index 5865c7083abd..bb70f9cad46b 100644
--- a/misc/freebsd-doc-es/pkg-plist.common
+++ b/misc/freebsd-doc-es/pkg-plist.common
@@ -1,31 +1,31 @@
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/handbook/vinum
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/handbook/security
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/handbook/mail
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/handbook/install
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/handbook/imagelib/callouts
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/handbook/imagelib
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/handbook/geom
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/handbook/advanced-networking
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/handbook
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/faq
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/books
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/releng
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/problem-reports
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/p4-primer
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/nanobsd/imagelib/callouts
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/nanobsd/imagelib
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/nanobsd
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/mailing-list-faq
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/linux-users
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/linux-comparison
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/laptop
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/fdp-es
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/fbsd-from-scratch
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/cvs-freebsd
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/contributing
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/casestudy-argentina.com
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles
-%%DOCSDIR%%/%%DOCLANG_PREFIX%%
-@dirrm %%DOCSDIR%%/%%DOCLANG%%
+%%DOCSDIR%%/es
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/casestudy-argentina.com
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/contributing
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/cvs-freebsd
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/fbsd-from-scratch
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/fdp-es
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/laptop
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/linux-comparison
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/linux-users
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/mailing-list-faq
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/nanobsd/imagelib/callouts
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/nanobsd/imagelib
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/nanobsd
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/p4-primer
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/problem-reports
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/releng
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/faq
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/handbook/advanced-networking
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/handbook/geom
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/handbook/imagelib/callouts
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/handbook/imagelib
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/handbook/install
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/handbook/mail
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/handbook/security
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/handbook/vinum
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/handbook
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%
 @dirrmtry %%DOCSDIR%%
diff --git a/misc/freebsd-doc-fr/pkg-plist.common b/misc/freebsd-doc-fr/pkg-plist.common
index f1774fcc3826..9bb6251523c8 100644
--- a/misc/freebsd-doc-fr/pkg-plist.common
+++ b/misc/freebsd-doc-fr/pkg-plist.common
@@ -1,37 +1,37 @@
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/handbook/virtualization
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/handbook/vinum
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/handbook/mail
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/handbook/install
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/handbook/imagelib/callouts
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/handbook/imagelib
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/handbook/geom
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/handbook/advanced-networking
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/handbook
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/faq
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/developers-handbook
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/books
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/releng-packages
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/problem-reports
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/pr-guidelines
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/pam
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/new-users
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/nanobsd/imagelib/callouts
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/nanobsd/imagelib
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/nanobsd
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/mh
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/linux-users
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/laptop
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/ipsec-must
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/fonts
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/filtering-bridges
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/contributors
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/contributing-ports
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/contributing
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/committers-guide
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/building-products
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles
-%%DOCSDIR%%/%%DOCLANG_PREFIX%%
-@dirrm %%DOCSDIR%%/%%DOCLANG%%
+%%DOCSDIR%%/fr
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/building-products
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/committers-guide
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/contributing
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/contributing-ports
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/contributors
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/filtering-bridges
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/fonts
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/ipsec-must
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/laptop
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/linux-users
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/mh
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/nanobsd/imagelib/callouts
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/nanobsd/imagelib
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/nanobsd
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/new-users
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/pam
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/pr-guidelines
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/problem-reports
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/releng-packages
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/developers-handbook
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/faq
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/handbook/advanced-networking
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/handbook/geom
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/handbook/imagelib/callouts
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/handbook/imagelib
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/handbook/install
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/handbook/mail
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/handbook/vinum
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/handbook/virtualization
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/handbook
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%
 @dirrmtry %%DOCSDIR%%
diff --git a/misc/freebsd-doc-hu/pkg-plist.common b/misc/freebsd-doc-hu/pkg-plist.common
index 124748f6cdda..7acbdd38cc4b 100644
--- a/misc/freebsd-doc-hu/pkg-plist.common
+++ b/misc/freebsd-doc-hu/pkg-plist.common
@@ -1,26 +1,26 @@
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/handbook/virtualization
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/handbook/vinum
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/handbook/security
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/handbook/mail
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/handbook/install
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/handbook/imagelib/callouts
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/handbook/imagelib
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/handbook/geom
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/handbook/advanced-networking
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/handbook
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/imagelib/callouts
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/imagelib
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/faq
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/books
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/linux-users
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/linux-comparison
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/laptop
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/gjournal-desktop
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/cups
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/compiz-fusion
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles
-%%DOCSDIR%%/%%DOCLANG_PREFIX%%
-@dirrm %%DOCSDIR%%/%%DOCLANG%%
+%%DOCSDIR%%/hu
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/compiz-fusion
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/cups
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/gjournal-desktop
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/laptop
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/linux-comparison
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/linux-users
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/faq
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/imagelib/callouts
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/imagelib
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/handbook/advanced-networking
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/handbook/geom
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/handbook/imagelib/callouts
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/handbook/imagelib
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/handbook/install
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/handbook/mail
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/handbook/security
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/handbook/vinum
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/handbook/virtualization
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/handbook
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%
 @dirrmtry %%DOCSDIR%%
diff --git a/misc/freebsd-doc-it/pkg-plist.common b/misc/freebsd-doc-it/pkg-plist.common
index 26afff119fc6..ce616d9338d3 100644
--- a/misc/freebsd-doc-it/pkg-plist.common
+++ b/misc/freebsd-doc-it/pkg-plist.common
@@ -1,21 +1,21 @@
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/unix-introduction
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/handbook/virtualization
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/handbook/vinum
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/handbook/security
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/handbook/mail
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/handbook/install
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/handbook/imagelib/callouts
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/handbook/imagelib
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/handbook/geom
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/handbook/advanced-networking
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/handbook
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/books
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/vm-design
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/new-users
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/filtering-bridges
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/committers-guide
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles
-%%DOCSDIR%%/%%DOCLANG_PREFIX%%
-@dirrm %%DOCSDIR%%/%%DOCLANG%%
+%%DOCSDIR%%/it
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/committers-guide
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/filtering-bridges
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/new-users
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/vm-design
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/handbook/advanced-networking
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/handbook/geom
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/handbook/imagelib/callouts
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/handbook/imagelib
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/handbook/install
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/handbook/mail
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/handbook/security
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/handbook/vinum
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/handbook/virtualization
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/handbook
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/unix-introduction
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%
 @dirrmtry %%DOCSDIR%%
diff --git a/misc/freebsd-doc-ja/pkg-plist.common b/misc/freebsd-doc-ja/pkg-plist.common
index 404d853f17a6..f1d627cb031d 100644
--- a/misc/freebsd-doc-ja/pkg-plist.common
+++ b/misc/freebsd-doc-ja/pkg-plist.common
@@ -1,23 +1,23 @@
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/handbook/virtualization
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/handbook/mail
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/handbook/install
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/handbook/imagelib/callouts
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/handbook/imagelib
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/handbook/geom
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/handbook/advanced-networking
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/handbook
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/faq
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/design-44bsd
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/books
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/problem-reports
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/ipsec-must
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/fonts
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/fbsd-from-scratch
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/contributors
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/contributing
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles
-%%DOCSDIR%%/%%DOCLANG_PREFIX%%
-@dirrm %%DOCSDIR%%/%%DOCLANG%%
+%%DOCSDIR%%/ja
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/contributing
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/contributors
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/fbsd-from-scratch
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/fonts
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/ipsec-must
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/problem-reports
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/design-44bsd
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/faq
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/handbook/advanced-networking
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/handbook/geom
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/handbook/imagelib/callouts
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/handbook/imagelib
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/handbook/install
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/handbook/mail
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/handbook/virtualization
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/handbook
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%
 @dirrmtry %%DOCSDIR%%
diff --git a/misc/freebsd-doc-ja/pkg-plist.html-split b/misc/freebsd-doc-ja/pkg-plist.html-split
index 6859977d8446..4cead19b2fb0 100644
--- a/misc/freebsd-doc-ja/pkg-plist.html-split
+++ b/misc/freebsd-doc-ja/pkg-plist.html-split
@@ -239,9 +239,6 @@
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/openssh.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/openssl.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-other.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/pgpkeys.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/pkgng-intro.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/ports-broken.html
diff --git a/misc/freebsd-doc-mn/pkg-plist.common b/misc/freebsd-doc-mn/pkg-plist.common
index ae92391d038a..7ce1df7305af 100644
--- a/misc/freebsd-doc-mn/pkg-plist.common
+++ b/misc/freebsd-doc-mn/pkg-plist.common
@@ -1,15 +1,15 @@
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/handbook/virtualization
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/handbook/vinum
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/handbook/security
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/handbook/mail
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/handbook/install
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/handbook/imagelib/callouts
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/handbook/imagelib
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/handbook/geom
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/handbook/advanced-networking
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/handbook
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/books
-%%DOCSDIR%%/%%DOCLANG_PREFIX%%
-@dirrm %%DOCSDIR%%/%%DOCLANG%%
+%%DOCSDIR%%/mn
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/handbook/advanced-networking
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/handbook/geom
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/handbook/imagelib/callouts
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/handbook/imagelib
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/handbook/install
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/handbook/mail
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/handbook/security
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/handbook/vinum
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/handbook/virtualization
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/handbook
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%
 @dirrmtry %%DOCSDIR%%
diff --git a/misc/freebsd-doc-nl/pkg-plist.common b/misc/freebsd-doc-nl/pkg-plist.common
index c0d9a2f61f3d..0e2b9c3e9941 100644
--- a/misc/freebsd-doc-nl/pkg-plist.common
+++ b/misc/freebsd-doc-nl/pkg-plist.common
@@ -1,20 +1,20 @@
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/handbook/virtualization
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/handbook/security
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/handbook/mail
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/handbook/install
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/handbook/imagelib/callouts
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/handbook/imagelib
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/handbook/geom
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/handbook/advanced-networking
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/handbook
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/books
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/solid-state
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/problem-reports
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/contributing-ports
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/contributing
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles
-%%DOCSDIR%%/%%DOCLANG_PREFIX%%
-@dirrm %%DOCSDIR%%/%%DOCLANG%%
+%%DOCSDIR%%/nl
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/contributing
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/contributing-ports
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/problem-reports
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/solid-state
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/handbook/advanced-networking
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/handbook/geom
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/handbook/imagelib/callouts
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/handbook/imagelib
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/handbook/install
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/handbook/mail
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/handbook/security
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/handbook/virtualization
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/handbook
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%
 @dirrmtry %%DOCSDIR%%
diff --git a/misc/freebsd-doc-pl/pkg-plist.common b/misc/freebsd-doc-pl/pkg-plist.common
index c5a37019214f..44fd78669841 100644
--- a/misc/freebsd-doc-pl/pkg-plist.common
+++ b/misc/freebsd-doc-pl/pkg-plist.common
@@ -1,16 +1,16 @@
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/handbook/vinum
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/handbook/security
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/handbook/mail
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/handbook/install
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/handbook/imagelib/callouts
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/handbook/imagelib
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/handbook/geom
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/handbook/advanced-networking
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/handbook
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/books
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/new-users
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/filtering-bridges
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles
-%%DOCSDIR%%/%%DOCLANG_PREFIX%%
-@dirrm %%DOCSDIR%%/%%DOCLANG%%
+%%DOCSDIR%%/pl
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/filtering-bridges
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/new-users
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/handbook/advanced-networking
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/handbook/geom
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/handbook/imagelib/callouts
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/handbook/imagelib
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/handbook/install
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/handbook/mail
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/handbook/security
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/handbook/vinum
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/handbook
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%
 @dirrmtry %%DOCSDIR%%
diff --git a/misc/freebsd-doc-pt/pkg-plist.common b/misc/freebsd-doc-pt/pkg-plist.common
index a9ae98f0bfb3..5ab216e42b9b 100644
--- a/misc/freebsd-doc-pt/pkg-plist.common
+++ b/misc/freebsd-doc-pt/pkg-plist.common
@@ -1,22 +1,22 @@
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/imagelib/callouts
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/imagelib
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/faq
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/books
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/problem-reports
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/portbuild
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/new-users
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/linux-users
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/hubs
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-update-server/imagelib/callouts
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-update-server/imagelib
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-update-server
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-questions
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/contributing-ports
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/contributing
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/building-products
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles
 %%DOCSDIR%%/%%DOCLANG_PREFIX%%
-@dirrm %%DOCSDIR%%/%%DOCLANG%%
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/building-products
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/contributing
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/contributing-ports
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-questions
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-update-server/imagelib/callouts
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-update-server/imagelib
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-update-server
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/hubs
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/linux-users
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/new-users
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/portbuild
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/problem-reports
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/faq
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/imagelib/callouts
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/imagelib
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%
 @dirrmtry %%DOCSDIR%%
diff --git a/misc/freebsd-doc-ru/pkg-plist.common b/misc/freebsd-doc-ru/pkg-plist.common
index b0741a663da9..2a3493257f02 100644
--- a/misc/freebsd-doc-ru/pkg-plist.common
+++ b/misc/freebsd-doc-ru/pkg-plist.common
@@ -1,46 +1,46 @@
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/imagelib/callouts
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/imagelib
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/handbook/security
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/handbook/mail
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/handbook/install
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/handbook/imagelib/callouts
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/handbook/imagelib
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/handbook/geom
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/handbook/advanced-networking
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/handbook
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/faq
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/books
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/vm-design
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/solid-state
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/releng-packages
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/releng
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/relaydelay
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/problem-reports
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/pr-guidelines
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/portbuild
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/pam
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/new-users
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/mh
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/mailing-list-faq
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/linux-comparison
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/laptop
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/ipsec-must
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/hubs
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/gjournal-desktop
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/geom-class
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-questions
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/fonts
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/fbsd-from-scratch
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/cvs-freebsd
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/custom-gcc
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/cups
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/contributing
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/console-server
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/committers-guide
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles
-%%DOCSDIR%%/%%DOCLANG_PREFIX%%
-@dirrm %%DOCSDIR%%/%%DOCLANG%%
+%%DOCSDIR%%/ru
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/committers-guide
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/console-server
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/contributing
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/cups
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/custom-gcc
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/cvs-freebsd
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/fbsd-from-scratch
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/fonts
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-questions
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/geom-class
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/gjournal-desktop
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/hubs
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/ipsec-must
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/laptop
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/linux-comparison
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/mailing-list-faq
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/mh
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/new-users
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/pam
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/portbuild
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/pr-guidelines
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/problem-reports
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/relaydelay
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/releng
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/releng-packages
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/solid-state
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/vm-design
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/faq
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/handbook/advanced-networking
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/handbook/geom
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/handbook/imagelib/callouts
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/handbook/imagelib
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/handbook/install
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/handbook/mail
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/handbook/security
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/handbook
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/imagelib/callouts
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/imagelib
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%
 @dirrmtry %%DOCSDIR%%
diff --git a/misc/freebsd-doc-tr/pkg-plist.common b/misc/freebsd-doc-tr/pkg-plist.common
index 84abb870e7dc..7ace164ddcb0 100644
--- a/misc/freebsd-doc-tr/pkg-plist.common
+++ b/misc/freebsd-doc-tr/pkg-plist.common
@@ -1,5 +1,5 @@
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles
-%%DOCSDIR%%/%%DOCLANG_PREFIX%%
-@dirrm %%DOCSDIR%%/%%DOCLANG%%
+%%DOCSDIR%%/tr
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%
 @dirrmtry %%DOCSDIR%%
diff --git a/misc/freebsd-doc-zh_cn/pkg-plist.common b/misc/freebsd-doc-zh_cn/pkg-plist.common
index 0f1aa4611a6b..6163a1b4b4c0 100644
--- a/misc/freebsd-doc-zh_cn/pkg-plist.common
+++ b/misc/freebsd-doc-zh_cn/pkg-plist.common
@@ -1,34 +1,34 @@
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/imagelib/callouts
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/imagelib
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/handbook/virtualization
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/handbook/vinum
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/handbook/security
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/handbook/mail
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/handbook/install
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/handbook/imagelib/callouts
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/handbook/imagelib
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/handbook/geom
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/handbook/advanced-networking
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/handbook
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/arch-handbook/imagelib/callouts
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/arch-handbook/imagelib
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/arch-handbook
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/books
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/remote-install/imagelib/callouts
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/remote-install/imagelib
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/remote-install
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/rc-scripting/imagelib/callouts
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/rc-scripting/imagelib
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/rc-scripting
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/nanobsd/imagelib/callouts
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/nanobsd/imagelib
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/nanobsd
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/linux-users
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/cvs-freebsd
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/contributing
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles
 %%DOCSDIR%%/%%DOCLANG_PREFIX%%
-@dirrm %%DOCSDIR%%/%%DOCLANG%%
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/contributing
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/cvs-freebsd
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/linux-users
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/nanobsd/imagelib/callouts
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/nanobsd/imagelib
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/nanobsd
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/rc-scripting/imagelib/callouts
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/rc-scripting/imagelib
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/rc-scripting
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/remote-install/imagelib/callouts
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/remote-install/imagelib
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/remote-install
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/arch-handbook/imagelib/callouts
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/arch-handbook/imagelib
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/arch-handbook
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/handbook/advanced-networking
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/handbook/geom
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/handbook/imagelib/callouts
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/handbook/imagelib
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/handbook/install
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/handbook/mail
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/handbook/security
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/handbook/vinum
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/handbook/virtualization
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/handbook
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/imagelib/callouts
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/imagelib
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%
 @dirrmtry %%DOCSDIR%%
diff --git a/misc/freebsd-doc-zh_tw/Makefile b/misc/freebsd-doc-zh_tw/Makefile
index 16f913fa99e5..2d0d89ee9f71 100644
--- a/misc/freebsd-doc-zh_tw/Makefile
+++ b/misc/freebsd-doc-zh_tw/Makefile
@@ -10,7 +10,7 @@ COMMENT=	Traditional Chinese translation of the FreeBSD Documentation Project
 MASTERDIR=	${.CURDIR}/../freebsd-doc-en
 PLIST=		${.CURDIR}/pkg-plist
 
-DOCLANG=	zh_TW.Big5
+DOCLANG=	zh_TW.UTF-8
 DOCLANG_PREFIX=	zh_TW
 
 .include "${MASTERDIR}/Makefile"
diff --git a/misc/freebsd-doc-zh_tw/pkg-plist.common b/misc/freebsd-doc-zh_tw/pkg-plist.common
index 334a7aefa50c..b1cee5cb3790 100644
--- a/misc/freebsd-doc-zh_tw/pkg-plist.common
+++ b/misc/freebsd-doc-zh_tw/pkg-plist.common
@@ -1,36 +1,36 @@
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/imagelib/callouts
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/imagelib
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/handbook/virtualization
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/handbook/vinum
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/handbook/security
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/handbook/mail
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/handbook/install
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/handbook/imagelib/callouts
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/handbook/imagelib
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/handbook/geom
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/handbook/advanced-networking
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/handbook
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/imagelib/callouts
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/imagelib
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/developers-handbook/sockets
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/developers-handbook
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/books
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/remote-install/imagelib/callouts
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/remote-install/imagelib
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/remote-install
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/problem-reports
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/pr-guidelines
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/nanobsd/imagelib/callouts
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/nanobsd/imagelib
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/nanobsd
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/mailing-list-faq
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/hubs
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-questions
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/cvs-freebsd
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/contributing
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles
 %%DOCSDIR%%/%%DOCLANG_PREFIX%%
-@dirrm %%DOCSDIR%%/%%DOCLANG%%
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/contributing
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/cvs-freebsd
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-questions
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/hubs
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/mailing-list-faq
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/nanobsd/imagelib/callouts
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/nanobsd/imagelib
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/nanobsd
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/pr-guidelines
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/problem-reports
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/remote-install/imagelib/callouts
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/remote-install/imagelib
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/remote-install
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/developers-handbook/sockets
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/developers-handbook
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/imagelib/callouts
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/imagelib
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/handbook/advanced-networking
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/handbook/geom
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/handbook/imagelib/callouts
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/handbook/imagelib
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/handbook/install
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/handbook/mail
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/handbook/security
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/handbook/vinum
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/handbook/virtualization
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/handbook
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/imagelib/callouts
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/imagelib
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books
+@dirrmtry %%DOCSDIR%%/%%DOCLANG%%
 @dirrmtry %%DOCSDIR%%