misc/freebsd-doc-*: Update to rev. 1011d2f from the FreeBSD docset.

Approved by:	doceng (implicit)

7 files changed, 567 insertions, 281 deletions

diff --git a/misc/freebsd-doc-all/Makefile b/misc/freebsd-doc-all/Makefile
index e432547e2ab7..2a194383c808 100644
--- a/misc/freebsd-doc-all/Makefile
+++ b/misc/freebsd-doc-all/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	freebsd-doc-all
-PORTVERSION=	20230224
+PORTVERSION=	20230410
 PORTEPOCH=	1
 CATEGORIES=	misc docs
 
diff --git a/misc/freebsd-doc-en/Makefile b/misc/freebsd-doc-en/Makefile
index 1a177cfb38ff..0605104ead21 100644
--- a/misc/freebsd-doc-en/Makefile
+++ b/misc/freebsd-doc-en/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	freebsd-doc
-PORTVERSION=	20230224
+PORTVERSION=	20230410
 PORTEPOCH=	1
 CATEGORIES=	misc docs
 MASTER_SITES=	LOCAL/blackend
@@ -30,7 +30,7 @@ DOCLANG?=		en
 DOCLANG_PREFIX?=	${DOCLANG:C/_.*$//}
 DOCBASE?=		share/doc/freebsd
 
-# HTML format disabled until separate localized-only build will work again
+# HTML format disabled for localized languages
 .if ${DOCLANG:Men}
 AVAILABLEFORMATS=	HTML PDF
 .else
@@ -92,8 +92,8 @@ do-install:
 	${CP} -R ${WRKSRC}/public/* ${STAGEDIR}${DESTDIR}${PREFIX}/${DOCBASE}
 	if ${TEST} -f ${.CURDIR}/pkg-plist.extras; then \
 		${CAT} ${.CURDIR}/pkg-plist.extras | \
-		${SED} -e 's|%%DOCSDIR%%/%%DOCLANG%%||' | \
-		${XARGS} -t -I % ${CP} -v ${WRKSRC}/static/source/% ${STAGEDIR}${DESTDIR}${PREFIX}/${DOCBASE}/${DOCLANG}%; \
+		${SED} -e 's|%%DOCSDIR%%/||' | \
+		${XARGS} -t -I % ${CP} -v ${WRKSRC}/static/% ${STAGEDIR}${DESTDIR}${PREFIX}/${DOCBASE}/; \
 	fi
 
 .include <bsd.port.mk>
diff --git a/misc/freebsd-doc-en/distinfo b/misc/freebsd-doc-en/distinfo
index d4c7573cdc6f..2aaabc4e4fdf 100644
--- a/misc/freebsd-doc-en/distinfo
+++ b/misc/freebsd-doc-en/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1677266835
-SHA256 (freebsd-doc-20230224.tar.gz) = 36f7059fd3867700a3ffeae64ae944fb5e1509d84c9a81ae2d197c048e931dce
-SIZE (freebsd-doc-20230224.tar.gz) = 35026906
+TIMESTAMP = 1681127503
+SHA256 (freebsd-doc-20230410.tar.gz) = 1610d291dfb9872f649c3caea2d26086bd8c98666786e750a31e159e3159d479
+SIZE (freebsd-doc-20230410.tar.gz) = 39058180
diff --git a/misc/freebsd-doc-en/pkg-plist.extras b/misc/freebsd-doc-en/pkg-plist.extras
index 8b441dcb7879..d1e369004f97 100644
--- a/misc/freebsd-doc-en/pkg-plist.extras
+++ b/misc/freebsd-doc-en/pkg-plist.extras
@@ -1,5 +1,5 @@
-%%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-update-server/diff.txt
-%%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-update-server/init.txt
-%%DOCSDIR%%/%%DOCLANG%%/articles/pam/converse.c
-%%DOCSDIR%%/%%DOCLANG%%/articles/pam/pam_unix.c
-%%DOCSDIR%%/%%DOCLANG%%/articles/pam/su.c
+%%DOCSDIR%%/source/articles/freebsd-update-server/diff.txt
+%%DOCSDIR%%/source/articles/freebsd-update-server/init.txt
+%%DOCSDIR%%/source/articles/pam/converse.c
+%%DOCSDIR%%/source/articles/pam/pam_unix.c
+%%DOCSDIR%%/source/articles/pam/su.c
diff --git a/misc/freebsd-doc-en/pkg-plist.html b/misc/freebsd-doc-en/pkg-plist.html
index 86aa2efa5fa2..38ed7d0617fa 100644
--- a/misc/freebsd-doc-en/pkg-plist.html
+++ b/misc/freebsd-doc-en/pkg-plist.html
@@ -1,223 +1,3 @@
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/SMTP-Auth/index.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/SMTP-dialup/index.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/acpi-overview/index.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/adding-swap-space/index.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/audit-administration/index.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/audit-config/index.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/audit-inline-glossary/index.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/backup-basics/index.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/basics-devices/index.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/basics-more-information/index.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/basics-processes/index.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/bibliography-adminguides/index.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/bibliography-hardware/index.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/bibliography-history/index.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/bibliography-journals/index.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/bibliography-osinternals/index.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/bibliography-programmers/index.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/bibliography-security/index.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/bibliography-userguides/index.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/boot-introduction/index.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/boot-shutdown/index.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/boot-splash/index.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall-fetching-distribution/index.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall-hardware/index.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall-install-trouble/index.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall-network/index.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall-partitioning/index.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall-post/index.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall-pre/index.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall-start/index.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/carp/index.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/config-network-setup/index.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/configtuning-configfiles/index.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/configtuning-cron/index.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/configtuning-disk/index.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/configtuning-kernel-limits/index.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/configtuning-rcd/index.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/configtuning-starting-services/index.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/configtuning-sysctl/index.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/configtuning-syslog/index.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/configtuning-virtual-hosts/index.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/configuring-wine-installation/index.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/consoles/index.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/creating-cds/index.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/creating-dvds/index.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/current-stable/index.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/desktop-browsers/index.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/desktop-finance/index.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/desktop-productivity/index.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/desktop-viewers/index.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/device-hints/index.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/dialout/index.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/dialup/index.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/dirstructure/index.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/disk-organization/index.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/disks-adding/index.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/disks-encrypting/index.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/disks-growing/index.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/disks-hast/index.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/disks-virtual/index.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/dtrace-enable/index.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/dtrace-implementation/index.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/dtrace-using/index.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/editors/index.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/eresources-mail/index.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/eresources-news/index.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/eresources-web/index.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/filesystems-linux/index.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/firewalls-blacklistd/index.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/firewalls-concepts/index.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/firewalls-ipf/index.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/firewalls-ipfw/index.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/firewalls-pf/index.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/floppies/index.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/fs-acl/index.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/geom-ggate/index.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/geom-gjournal/index.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/geom-glabel/index.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/geom-graid/index.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/geom-mirror/index.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/geom-raid3/index.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/geom-striping/index.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/history/index.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/installing-wine-on-freebsd/index.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/ipsec/index.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/jails-application/index.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/jails-build/index.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/jails-ezjail/index.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/jails-terms/index.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/jails-tuning/index.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/kerberos5/index.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/kernelconfig-building/index.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/kernelconfig-config/index.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/kernelconfig-custom-kernel/index.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/kernelconfig-devices/index.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/kernelconfig-trouble/index.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/l10n-compiling/index.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/lang-setup/index.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/linuxemu-advanced/index.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/linuxemu-lbc-install/index.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/mac-implementing/index.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/mac-inline-glossary/index.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/mac-planning/index.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/mac-policies/index.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/mac-troubleshoot/index.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/mac-understandlabel/index.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/mac-userlocked/index.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/mail-advanced/index.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/mail-agents/index.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/mail-changingmta/index.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/mail-fetchmail/index.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/mail-procmail/index.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/mail-trouble/index.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/mail-using/index.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/makeworld/index.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/mirrors-ftp/index.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/mirrors-rsync/index.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/mount-unmount/index.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/mythtv/index.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/network-aggregation/index.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/network-apache/index.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/network-bluetooth/index.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/network-bridging/index.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/network-dhcp/index.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/network-diskless/index.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/network-dns/index.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/network-ftp/index.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/network-inetd/index.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/network-ipv6/index.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/network-iscsi/index.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/network-ldap/index.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/network-nfs/index.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/network-nis/index.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/network-ntp/index.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/network-routing/index.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/network-samba/index.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/network-usb-tethering/index.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/network-vlan/index.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/network-wireless/index.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/nutshell/index.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/one-time-passwords/index.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/openssh/index.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/openssl/index.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/outgoing-only/index.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/permissions/index.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/pkgng-intro/index.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/ports-broken/index.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/ports-finding-applications/index.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/ports-nextsteps/index.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/ports-overview/index.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/ports-poudriere/index.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/ports-using/index.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/ppp-troubleshoot/index.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/pppoa/index.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/pppoe/index.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/printing-connections/index.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/printing-direct/index.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/printing-lpd/index.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/printing-other/index.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/printing-pdls/index.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/quotas/index.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/running-first-wine-program/index.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/scanners/index.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/security-accounting/index.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/security-advisories/index.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/security-intro/index.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/security-pkg/index.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/security-resourcelimits/index.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/security-sudo/index.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/sendmail/index.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/serial/index.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/serialconsole-setup/index.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/shells/index.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/small-lan/index.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/snapshots/index.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/sound-mp3/index.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/sound-setup/index.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/svn/index.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/swap-encrypting/index.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/tcpwrappers/index.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/term/index.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/tvcard/index.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/updating-upgrading-documentation/index.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/updating-upgrading-freebsdupdate/index.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/usb-device-mode-network/index.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/usb-device-mode-storage/index.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/usb-device-mode-terminals/index.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/usb-disks/index.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/userppp/index.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/users-synopsis/index.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/using-bsdinstall/index.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/using-live-cd/index.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/using-localization/index.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/video-playback/index.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/virtualization-guest-parallels/index.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/virtualization-guest-virtualbox/index.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/virtualization-guest-virtualpc/index.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/virtualization-guest-vmware/index.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/virtualization-host-bhyve/index.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/virtualization-host-virtualbox/index.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/virtualization-host-xen/index.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/wine-in-multi-user-os-installations/index.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/wine-management-guis/index.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/wine-on-os-faq/index.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/wine-overview-concepts/index.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/x-compiz-fusion/index.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/x-config/index.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/x-fonts/index.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/x-install/index.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/x-understanding/index.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/x-xdm/index.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/x11-troubleshooting/index.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/x11-wm/index.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/zfs-advanced/index.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/zfs-links/index.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/zfs-quickstart/index.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/zfs-term/index.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/zfs-zfs-allow/index.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/zfs-zfs/index.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/zfs-zpool/index.html
 %%DOCSDIR%%/articles/bsdl-gpl/index.html
 %%DOCSDIR%%/articles/building-products/index.html
 %%DOCSDIR%%/articles/committers-guide/index.html
@@ -230,6 +10,7 @@
 %%DOCSDIR%%/articles/freebsd-questions/index.html
 %%DOCSDIR%%/articles/freebsd-releng/index.html
 %%DOCSDIR%%/articles/freebsd-src-lsp/index.html
+%%DOCSDIR%%/articles/freebsd-status-report-process/index.html
 %%DOCSDIR%%/articles/freebsd-update-server/index.html
 %%DOCSDIR%%/articles/geom-class/index.html
 %%DOCSDIR%%/articles/gjournal-desktop/index.html
@@ -386,3 +167,4 @@
 %%DOCSDIR%%/books/porters-handbook/upgrading/index.html
 %%DOCSDIR%%/books/porters-handbook/uses/index.html
 %%DOCSDIR%%/books/porters-handbook/versions/index.html
+%%DOCSDIR%%/languages/index.html
diff --git a/misc/freebsd-doc-en/pkg-plist.html-common b/misc/freebsd-doc-en/pkg-plist.html-common
index 1b957ec6fca6..ed17eb83d421 100644
--- a/misc/freebsd-doc-en/pkg-plist.html-common
+++ b/misc/freebsd-doc-en/pkg-plist.html-common
@@ -1,3 +1,5 @@
+%%DOCSDIR%%/css/font-awesome-min.css
+%%DOCSDIR%%/favicon.ico
 %%DOCSDIR%%/images/FreeBSD-colors.svg
 %%DOCSDIR%%/images/FreeBSD-monochromatic.svg
 %%DOCSDIR%%/images/articles/building-products/freebsd-branches.png
@@ -206,6 +208,7 @@
 %%DOCSDIR%%/images/books/handbook/mail/pine3.png
 %%DOCSDIR%%/images/books/handbook/mail/pine4.png
 %%DOCSDIR%%/images/books/handbook/mail/pine5.png
+%%DOCSDIR%%/images/books/handbook/multimedia/pwcview.png
 %%DOCSDIR%%/images/books/handbook/security/ipsec-crypt-pkt.png
 %%DOCSDIR%%/images/books/handbook/security/ipsec-encap-pkt.png
 %%DOCSDIR%%/images/books/handbook/security/ipsec-network.png
@@ -276,7 +279,6 @@
 %%DOCSDIR%%/images/books/handbook/wine/wine-config-6.png
 %%DOCSDIR%%/images/books/handbook/wine/wine-config-7.png
 %%DOCSDIR%%/images/books/handbook/wine/wine-run-np++-1.png
-%%DOCSDIR%%/images/books/handbook/wine/wine-run-np++-1.scr
 %%DOCSDIR%%/images/books/handbook/wine/winetricks-app-install-1.png
 %%DOCSDIR%%/images/books/handbook/wine/winetricks-app-install-2.png
 %%DOCSDIR%%/images/books/handbook/wine/winetricks-install-1.png
@@ -291,15 +293,517 @@
 %%DOCSDIR%%/images/freebsd-official.svg
 %%DOCSDIR%%/images/language.png
 %%DOCSDIR%%/images/logo-red.png
-%%DOCSDIR%%/css/font-awesome-min.css
+%%DOCSDIR%%/styles/main.min.css
 %%DOCSDIR%%/fonts/fontawesome-webfont.woff
 %%DOCSDIR%%/fonts/fontawesome-webfont.woff2
 %%DOCSDIR%%/fonts/inter/Inter-Regular.woff
 %%DOCSDIR%%/fonts/inter/Inter-Regular.woff2
 %%DOCSDIR%%/fonts/inter/Inter-roman.var.woff2
 %%DOCSDIR%%/fonts/inter/LICENSE.txt
-%%DOCSDIR%%/favicon.ico
 %%DOCSDIR%%/js/copy-clipboard.min.js
 %%DOCSDIR%%/js/search.min.js
 %%DOCSDIR%%/js/theme-chooser.min.js
-%%DOCSDIR%%/languages/index.html
+%%DOCSDIR%%/pgpkeys/0mp.key
+%%DOCSDIR%%/pgpkeys/README
+%%DOCSDIR%%/pgpkeys/ache.key
+%%DOCSDIR%%/pgpkeys/achim.key
+%%DOCSDIR%%/pgpkeys/acm.key
+%%DOCSDIR%%/pgpkeys/adamw.key
+%%DOCSDIR%%/pgpkeys/adridg.key
+%%DOCSDIR%%/pgpkeys/ae.key
+%%DOCSDIR%%/pgpkeys/afedorov.key
+%%DOCSDIR%%/pgpkeys/ahze.key
+%%DOCSDIR%%/pgpkeys/ak.key
+%%DOCSDIR%%/pgpkeys/alc.key
+%%DOCSDIR%%/pgpkeys/ale.key
+%%DOCSDIR%%/pgpkeys/alepulver.key
+%%DOCSDIR%%/pgpkeys/alex.key
+%%DOCSDIR%%/pgpkeys/alexbl.key
+%%DOCSDIR%%/pgpkeys/alexey.key
+%%DOCSDIR%%/pgpkeys/alfredo.key
+%%DOCSDIR%%/pgpkeys/allanjude.key
+%%DOCSDIR%%/pgpkeys/anchie.key
+%%DOCSDIR%%/pgpkeys/anders.key
+%%DOCSDIR%%/pgpkeys/andreas.key
+%%DOCSDIR%%/pgpkeys/anholt.key
+%%DOCSDIR%%/pgpkeys/anray.key
+%%DOCSDIR%%/pgpkeys/antoine.key
+%%DOCSDIR%%/pgpkeys/araujo.key
+%%DOCSDIR%%/pgpkeys/ariff.key
+%%DOCSDIR%%/pgpkeys/arrowd.key
+%%DOCSDIR%%/pgpkeys/art.key
+%%DOCSDIR%%/pgpkeys/arved.key
+%%DOCSDIR%%/pgpkeys/asami.key
+%%DOCSDIR%%/pgpkeys/ashish.key
+%%DOCSDIR%%/pgpkeys/asiciliano.key
+%%DOCSDIR%%/pgpkeys/asomers.key
+%%DOCSDIR%%/pgpkeys/avatar.key
+%%DOCSDIR%%/pgpkeys/avg.key
+%%DOCSDIR%%/pgpkeys/avilla.key
+%%DOCSDIR%%/pgpkeys/avl.key
+%%DOCSDIR%%/pgpkeys/bakul.key
+%%DOCSDIR%%/pgpkeys/bapt.key
+%%DOCSDIR%%/pgpkeys/bar.key
+%%DOCSDIR%%/pgpkeys/barner.key
+%%DOCSDIR%%/pgpkeys/bcr.key
+%%DOCSDIR%%/pgpkeys/bcran.key
+%%DOCSDIR%%/pgpkeys/bdragon.key
+%%DOCSDIR%%/pgpkeys/bdrewery.key
+%%DOCSDIR%%/pgpkeys/beat.key
+%%DOCSDIR%%/pgpkeys/beech.key
+%%DOCSDIR%%/pgpkeys/ben.key
+%%DOCSDIR%%/pgpkeys/benjsc.key
+%%DOCSDIR%%/pgpkeys/benno.key
+%%DOCSDIR%%/pgpkeys/bhd.key
+%%DOCSDIR%%/pgpkeys/bhughes.key
+%%DOCSDIR%%/pgpkeys/billf.key
+%%DOCSDIR%%/pgpkeys/bjk.key
+%%DOCSDIR%%/pgpkeys/bk.key
+%%DOCSDIR%%/pgpkeys/blackend.key
+%%DOCSDIR%%/pgpkeys/bland.key
+%%DOCSDIR%%/pgpkeys/bmah.key
+%%DOCSDIR%%/pgpkeys/bms.key
+%%DOCSDIR%%/pgpkeys/bofh.key
+%%DOCSDIR%%/pgpkeys/br.key
+%%DOCSDIR%%/pgpkeys/brian.key
+%%DOCSDIR%%/pgpkeys/brix.key
+%%DOCSDIR%%/pgpkeys/brnrd.key
+%%DOCSDIR%%/pgpkeys/brooks.key
+%%DOCSDIR%%/pgpkeys/brueffer.key
+%%DOCSDIR%%/pgpkeys/bruno.key
+%%DOCSDIR%%/pgpkeys/bryanv.key
+%%DOCSDIR%%/pgpkeys/bsam.key
+%%DOCSDIR%%/pgpkeys/bschmidt.key
+%%DOCSDIR%%/pgpkeys/bsd.key
+%%DOCSDIR%%/pgpkeys/bvs.key
+%%DOCSDIR%%/pgpkeys/bz.key
+%%DOCSDIR%%/pgpkeys/carl.key
+%%DOCSDIR%%/pgpkeys/carlavilla.key
+%%DOCSDIR%%/pgpkeys/cc.key
+%%DOCSDIR%%/pgpkeys/cel.key
+%%DOCSDIR%%/pgpkeys/ceri.key
+%%DOCSDIR%%/pgpkeys/cherry.key
+%%DOCSDIR%%/pgpkeys/chinsan.key
+%%DOCSDIR%%/pgpkeys/chs.key
+%%DOCSDIR%%/pgpkeys/chuck.key
+%%DOCSDIR%%/pgpkeys/cjc.key
+%%DOCSDIR%%/pgpkeys/cjh.key
+%%DOCSDIR%%/pgpkeys/clement.key
+%%DOCSDIR%%/pgpkeys/clsung.key
+%%DOCSDIR%%/pgpkeys/cmt.key
+%%DOCSDIR%%/pgpkeys/cokane.key
+%%DOCSDIR%%/pgpkeys/core-secretary.key
+%%DOCSDIR%%/pgpkeys/corvink.key
+%%DOCSDIR%%/pgpkeys/cperciva.key
+%%DOCSDIR%%/pgpkeys/cpm.key
+%%DOCSDIR%%/pgpkeys/crees.key
+%%DOCSDIR%%/pgpkeys/cs.key
+%%DOCSDIR%%/pgpkeys/cshumway.key
+%%DOCSDIR%%/pgpkeys/csjp.key
+%%DOCSDIR%%/pgpkeys/culot.key
+%%DOCSDIR%%/pgpkeys/cy.key
+%%DOCSDIR%%/pgpkeys/daichi.key
+%%DOCSDIR%%/pgpkeys/damien.key
+%%DOCSDIR%%/pgpkeys/danfe.key
+%%DOCSDIR%%/pgpkeys/dannyboy.key
+%%DOCSDIR%%/pgpkeys/das.key
+%%DOCSDIR%%/pgpkeys/davidch.key
+%%DOCSDIR%%/pgpkeys/davide.key
+%%DOCSDIR%%/pgpkeys/db.key
+%%DOCSDIR%%/pgpkeys/dbaio.key
+%%DOCSDIR%%/pgpkeys/dchagin.key
+%%DOCSDIR%%/pgpkeys/dcs.key
+%%DOCSDIR%%/pgpkeys/dd.key
+%%DOCSDIR%%/pgpkeys/deb.key
+%%DOCSDIR%%/pgpkeys/debdrup.key
+%%DOCSDIR%%/pgpkeys/decke.key
+%%DOCSDIR%%/pgpkeys/def.key
+%%DOCSDIR%%/pgpkeys/deischen.key
+%%DOCSDIR%%/pgpkeys/delphij.key
+%%DOCSDIR%%/pgpkeys/demon.key
+%%DOCSDIR%%/pgpkeys/den.key
+%%DOCSDIR%%/pgpkeys/des.key
+%%DOCSDIR%%/pgpkeys/dhartmei.key
+%%DOCSDIR%%/pgpkeys/dhn.key
+%%DOCSDIR%%/pgpkeys/dhw.key
+%%DOCSDIR%%/pgpkeys/diizzy.key
+%%DOCSDIR%%/pgpkeys/dim.key
+%%DOCSDIR%%/pgpkeys/dinoex.key
+%%DOCSDIR%%/pgpkeys/dmgk.key
+%%DOCSDIR%%/pgpkeys/doceng-secretary.key
+%%DOCSDIR%%/pgpkeys/donner.key
+%%DOCSDIR%%/pgpkeys/dougm.key
+%%DOCSDIR%%/pgpkeys/driesm.key
+%%DOCSDIR%%/pgpkeys/dru.key
+%%DOCSDIR%%/pgpkeys/dryice.key
+%%DOCSDIR%%/pgpkeys/dsl.key
+%%DOCSDIR%%/pgpkeys/dutchdaemon.key
+%%DOCSDIR%%/pgpkeys/dwmalone.key
+%%DOCSDIR%%/pgpkeys/eadler.key
+%%DOCSDIR%%/pgpkeys/ebrandi.key
+%%DOCSDIR%%/pgpkeys/edavis.key
+%%DOCSDIR%%/pgpkeys/eduardo.key
+%%DOCSDIR%%/pgpkeys/egypcio.key
+%%DOCSDIR%%/pgpkeys/ehaupt.key
+%%DOCSDIR%%/pgpkeys/emax.key
+%%DOCSDIR%%/pgpkeys/erj.key
+%%DOCSDIR%%/pgpkeys/eugen.key
+%%DOCSDIR%%/pgpkeys/fabient.key
+%%DOCSDIR%%/pgpkeys/fanf.key
+%%DOCSDIR%%/pgpkeys/farrokhi.key
+%%DOCSDIR%%/pgpkeys/feld.key
+%%DOCSDIR%%/pgpkeys/fernape.key
+%%DOCSDIR%%/pgpkeys/fjoe.key
+%%DOCSDIR%%/pgpkeys/flo.key
+%%DOCSDIR%%/pgpkeys/fluffy.key
+%%DOCSDIR%%/pgpkeys/flz.key
+%%DOCSDIR%%/pgpkeys/fox.key
+%%DOCSDIR%%/pgpkeys/foxfair.key
+%%DOCSDIR%%/pgpkeys/freqlabs.key
+%%DOCSDIR%%/pgpkeys/fsu.key
+%%DOCSDIR%%/pgpkeys/fuz.key
+%%DOCSDIR%%/pgpkeys/gabor.key
+%%DOCSDIR%%/pgpkeys/gad.key
+%%DOCSDIR%%/pgpkeys/gahr.key
+%%DOCSDIR%%/pgpkeys/ganbold.key
+%%DOCSDIR%%/pgpkeys/garga.key
+%%DOCSDIR%%/pgpkeys/gbe.key
+%%DOCSDIR%%/pgpkeys/gerald.key
+%%DOCSDIR%%/pgpkeys/ghelmer.key
+%%DOCSDIR%%/pgpkeys/gibbs.key
+%%DOCSDIR%%/pgpkeys/girgen.key
+%%DOCSDIR%%/pgpkeys/gjb.key
+%%DOCSDIR%%/pgpkeys/glarkin.key
+%%DOCSDIR%%/pgpkeys/glebius.key
+%%DOCSDIR%%/pgpkeys/glewis.key
+%%DOCSDIR%%/pgpkeys/gnn.key
+%%DOCSDIR%%/pgpkeys/gonzo.key
+%%DOCSDIR%%/pgpkeys/gordon.key
+%%DOCSDIR%%/pgpkeys/grahamperrin.key
+%%DOCSDIR%%/pgpkeys/green.key
+%%DOCSDIR%%/pgpkeys/grehan.key
+%%DOCSDIR%%/pgpkeys/grembo.key
+%%DOCSDIR%%/pgpkeys/grog.key
+%%DOCSDIR%%/pgpkeys/gshapiro.key
+%%DOCSDIR%%/pgpkeys/gsutter.key
+%%DOCSDIR%%/pgpkeys/guido.key
+%%DOCSDIR%%/pgpkeys/harti.key
+%%DOCSDIR%%/pgpkeys/hiren.key
+%%DOCSDIR%%/pgpkeys/hmp.key
+%%DOCSDIR%%/pgpkeys/hq.key
+%%DOCSDIR%%/pgpkeys/hrs.key
+%%DOCSDIR%%/pgpkeys/ijliao.key
+%%DOCSDIR%%/pgpkeys/imp.key
+%%DOCSDIR%%/pgpkeys/itetcu.key
+%%DOCSDIR%%/pgpkeys/ivoras.key
+%%DOCSDIR%%/pgpkeys/jacula.key
+%%DOCSDIR%%/pgpkeys/jadawin.key
+%%DOCSDIR%%/pgpkeys/jah.key
+%%DOCSDIR%%/pgpkeys/jamie.key
+%%DOCSDIR%%/pgpkeys/jcamou.key
+%%DOCSDIR%%/pgpkeys/jceel.key
+%%DOCSDIR%%/pgpkeys/jch.key
+%%DOCSDIR%%/pgpkeys/jchandra.key
+%%DOCSDIR%%/pgpkeys/jdp.key
+%%DOCSDIR%%/pgpkeys/jedgar.key
+%%DOCSDIR%%/pgpkeys/jesper.key
+%%DOCSDIR%%/pgpkeys/jgh.key
+%%DOCSDIR%%/pgpkeys/jhale.key
+%%DOCSDIR%%/pgpkeys/jhay.key
+%%DOCSDIR%%/pgpkeys/jhb.key
+%%DOCSDIR%%/pgpkeys/jhibbits.key
+%%DOCSDIR%%/pgpkeys/jhixson.key
+%%DOCSDIR%%/pgpkeys/jilles.key
+%%DOCSDIR%%/pgpkeys/jim.key
+%%DOCSDIR%%/pgpkeys/jinmei.key
+%%DOCSDIR%%/pgpkeys/jkh.key
+%%DOCSDIR%%/pgpkeys/jkim.key
+%%DOCSDIR%%/pgpkeys/jkois.key
+%%DOCSDIR%%/pgpkeys/jkoshy.key
+%%DOCSDIR%%/pgpkeys/jlaffaye.key
+%%DOCSDIR%%/pgpkeys/jlh.key
+%%DOCSDIR%%/pgpkeys/jmb.key
+%%DOCSDIR%%/pgpkeys/jmelo.key
+%%DOCSDIR%%/pgpkeys/jmg.key
+%%DOCSDIR%%/pgpkeys/jmmv.key
+%%DOCSDIR%%/pgpkeys/joerg.key
+%%DOCSDIR%%/pgpkeys/johans.key
+%%DOCSDIR%%/pgpkeys/jon.key
+%%DOCSDIR%%/pgpkeys/jonathan.key
+%%DOCSDIR%%/pgpkeys/jpaetzel.key
+%%DOCSDIR%%/pgpkeys/jrm.key
+%%DOCSDIR%%/pgpkeys/jsa.key
+%%DOCSDIR%%/pgpkeys/jwb.key
+%%DOCSDIR%%/pgpkeys/jylefort.key
+%%DOCSDIR%%/pgpkeys/kadesai.key
+%%DOCSDIR%%/pgpkeys/kai.key
+%%DOCSDIR%%/pgpkeys/kaiw.key
+%%DOCSDIR%%/pgpkeys/kaktus.key
+%%DOCSDIR%%/pgpkeys/kami.key
+%%DOCSDIR%%/pgpkeys/karels.key
+%%DOCSDIR%%/pgpkeys/kato.key
+%%DOCSDIR%%/pgpkeys/kbowling.key
+%%DOCSDIR%%/pgpkeys/kd.key
+%%DOCSDIR%%/pgpkeys/ken.key
+%%DOCSDIR%%/pgpkeys/kensmith.key
+%%DOCSDIR%%/pgpkeys/keramida.key
+%%DOCSDIR%%/pgpkeys/kevans.key
+%%DOCSDIR%%/pgpkeys/kevlo.key
+%%DOCSDIR%%/pgpkeys/keymaster.key
+%%DOCSDIR%%/pgpkeys/khng.key
+%%DOCSDIR%%/pgpkeys/kib.key
+%%DOCSDIR%%/pgpkeys/kmoore.key
+%%DOCSDIR%%/pgpkeys/knu.key
+%%DOCSDIR%%/pgpkeys/koitsu.key
+%%DOCSDIR%%/pgpkeys/kp.key
+%%DOCSDIR%%/pgpkeys/krion.key
+%%DOCSDIR%%/pgpkeys/kris.key
+%%DOCSDIR%%/pgpkeys/kuriyama.key
+%%DOCSDIR%%/pgpkeys/landonf.key
+%%DOCSDIR%%/pgpkeys/lawrance.key
+%%DOCSDIR%%/pgpkeys/lbartoletti.key
+%%DOCSDIR%%/pgpkeys/lbr.key
+%%DOCSDIR%%/pgpkeys/lcook.key
+%%DOCSDIR%%/pgpkeys/le.key
+%%DOCSDIR%%/pgpkeys/leeym.key
+%%DOCSDIR%%/pgpkeys/leitao.key
+%%DOCSDIR%%/pgpkeys/ler.key
+%%DOCSDIR%%/pgpkeys/leres.key
+%%DOCSDIR%%/pgpkeys/lesi.key
+%%DOCSDIR%%/pgpkeys/linimon.key
+%%DOCSDIR%%/pgpkeys/loader.key
+%%DOCSDIR%%/pgpkeys/lofi.key
+%%DOCSDIR%%/pgpkeys/loos.key
+%%DOCSDIR%%/pgpkeys/lstewart.key
+%%DOCSDIR%%/pgpkeys/lth.key
+%%DOCSDIR%%/pgpkeys/luoqi.key
+%%DOCSDIR%%/pgpkeys/lwhsu.key
+%%DOCSDIR%%/pgpkeys/madpilot.key
+%%DOCSDIR%%/pgpkeys/maho.key
+%%DOCSDIR%%/pgpkeys/makc.key
+%%DOCSDIR%%/pgpkeys/mandree.key
+%%DOCSDIR%%/pgpkeys/manolis.key
+%%DOCSDIR%%/pgpkeys/manu.key
+%%DOCSDIR%%/pgpkeys/marcel.key
+%%DOCSDIR%%/pgpkeys/marck.key
+%%DOCSDIR%%/pgpkeys/marcus.key
+%%DOCSDIR%%/pgpkeys/marino.key
+%%DOCSDIR%%/pgpkeys/marius.key
+%%DOCSDIR%%/pgpkeys/markj.key
+%%DOCSDIR%%/pgpkeys/markm.key
+%%DOCSDIR%%/pgpkeys/markp.key
+%%DOCSDIR%%/pgpkeys/marks.key
+%%DOCSDIR%%/pgpkeys/markus.key
+%%DOCSDIR%%/pgpkeys/martymac.key
+%%DOCSDIR%%/pgpkeys/mat.key
+%%DOCSDIR%%/pgpkeys/matthew.key
+%%DOCSDIR%%/pgpkeys/matusita.key
+%%DOCSDIR%%/pgpkeys/mav.key
+%%DOCSDIR%%/pgpkeys/max.key
+%%DOCSDIR%%/pgpkeys/maxim.key
+%%DOCSDIR%%/pgpkeys/mbr.key
+%%DOCSDIR%%/pgpkeys/mckusick.key
+%%DOCSDIR%%/pgpkeys/melifaro.key
+%%DOCSDIR%%/pgpkeys/meta.key
+%%DOCSDIR%%/pgpkeys/metal.key
+%%DOCSDIR%%/pgpkeys/mfechner.key
+%%DOCSDIR%%/pgpkeys/mheinen.key
+%%DOCSDIR%%/pgpkeys/mhorne.key
+%%DOCSDIR%%/pgpkeys/mi.key
+%%DOCSDIR%%/pgpkeys/mikael.key
+%%DOCSDIR%%/pgpkeys/mikeh.key
+%%DOCSDIR%%/pgpkeys/milki.key
+%%DOCSDIR%%/pgpkeys/misha.key
+%%DOCSDIR%%/pgpkeys/miwi.key
+%%DOCSDIR%%/pgpkeys/mjg.key
+%%DOCSDIR%%/pgpkeys/mlaier.key
+%%DOCSDIR%%/pgpkeys/mm.key
+%%DOCSDIR%%/pgpkeys/mmel.key
+%%DOCSDIR%%/pgpkeys/mmoll.key
+%%DOCSDIR%%/pgpkeys/mp.key
+%%DOCSDIR%%/pgpkeys/mr.key
+%%DOCSDIR%%/pgpkeys/mtm.key
+%%DOCSDIR%%/pgpkeys/murray.key
+%%DOCSDIR%%/pgpkeys/mux.key
+%%DOCSDIR%%/pgpkeys/mva.key
+%%DOCSDIR%%/pgpkeys/mwlucas.key
+%%DOCSDIR%%/pgpkeys/naddy.key
+%%DOCSDIR%%/pgpkeys/nate.key
+%%DOCSDIR%%/pgpkeys/nc.key
+%%DOCSDIR%%/pgpkeys/nectar.key
+%%DOCSDIR%%/pgpkeys/nemoliu.key
+%%DOCSDIR%%/pgpkeys/nemysis.key
+%%DOCSDIR%%/pgpkeys/netchild.key
+%%DOCSDIR%%/pgpkeys/ngie.key
+%%DOCSDIR%%/pgpkeys/nick.key
+%%DOCSDIR%%/pgpkeys/niels.key
+%%DOCSDIR%%/pgpkeys/nik.key
+%%DOCSDIR%%/pgpkeys/niklas.key
+%%DOCSDIR%%/pgpkeys/nivit.key
+%%DOCSDIR%%/pgpkeys/njl.key
+%%DOCSDIR%%/pgpkeys/nork.key
+%%DOCSDIR%%/pgpkeys/novel.key
+%%DOCSDIR%%/pgpkeys/nox.key
+%%DOCSDIR%%/pgpkeys/np.key
+%%DOCSDIR%%/pgpkeys/nsouch.key
+%%DOCSDIR%%/pgpkeys/nwhitehorn.key
+%%DOCSDIR%%/pgpkeys/nyan.key
+%%DOCSDIR%%/pgpkeys/obraun.key
+%%DOCSDIR%%/pgpkeys/obrien.key
+%%DOCSDIR%%/pgpkeys/oh.key
+%%DOCSDIR%%/pgpkeys/ohauer.key
+%%DOCSDIR%%/pgpkeys/olgeni.key
+%%DOCSDIR%%/pgpkeys/oliver.key
+%%DOCSDIR%%/pgpkeys/olivier.key
+%%DOCSDIR%%/pgpkeys/olivierd.key
+%%DOCSDIR%%/pgpkeys/osa.key
+%%DOCSDIR%%/pgpkeys/oshogbo.key
+%%DOCSDIR%%/pgpkeys/otis.key
+%%DOCSDIR%%/pgpkeys/patrick.key
+%%DOCSDIR%%/pgpkeys/pauamma.key
+%%DOCSDIR%%/pgpkeys/paul.key
+%%DOCSDIR%%/pgpkeys/pav.key
+%%DOCSDIR%%/pgpkeys/pclin.key
+%%DOCSDIR%%/pgpkeys/peadar.key
+%%DOCSDIR%%/pgpkeys/perky.key
+%%DOCSDIR%%/pgpkeys/petef.key
+%%DOCSDIR%%/pgpkeys/peter.key
+%%DOCSDIR%%/pgpkeys/peterj.key
+%%DOCSDIR%%/pgpkeys/pfg.key
+%%DOCSDIR%%/pgpkeys/pgollucci.key
+%%DOCSDIR%%/pgpkeys/phantom.key
+%%DOCSDIR%%/pgpkeys/philip.key
+%%DOCSDIR%%/pgpkeys/phk.key
+%%DOCSDIR%%/pgpkeys/pho.key
+%%DOCSDIR%%/pgpkeys/pi.key
+%%DOCSDIR%%/pgpkeys/pirzyk.key
+%%DOCSDIR%%/pgpkeys/pkubaj.key
+%%DOCSDIR%%/pgpkeys/pluknet.key
+%%DOCSDIR%%/pgpkeys/portmgr-secretary.key
+%%DOCSDIR%%/pgpkeys/pstef.key
+%%DOCSDIR%%/pgpkeys/rafan.key
+%%DOCSDIR%%/pgpkeys/rajeshasp.key
+%%DOCSDIR%%/pgpkeys/rakuco.key
+%%DOCSDIR%%/pgpkeys/ram.key
+%%DOCSDIR%%/pgpkeys/ray.key
+%%DOCSDIR%%/pgpkeys/rdivacky.key
+%%DOCSDIR%%/pgpkeys/rea.key
+%%DOCSDIR%%/pgpkeys/rees.key
+%%DOCSDIR%%/pgpkeys/rene.key
+%%DOCSDIR%%/pgpkeys/rew.key
+%%DOCSDIR%%/pgpkeys/rgrimes.key
+%%DOCSDIR%%/pgpkeys/rhurlin.key
+%%DOCSDIR%%/pgpkeys/rich.key
+%%DOCSDIR%%/pgpkeys/riggs.key
+%%DOCSDIR%%/pgpkeys/rigoletto.key
+%%DOCSDIR%%/pgpkeys/rink.key
+%%DOCSDIR%%/pgpkeys/rlibby.key
+%%DOCSDIR%%/pgpkeys/rm.key
+%%DOCSDIR%%/pgpkeys/rmacklem.key
+%%DOCSDIR%%/pgpkeys/rmh.key
+%%DOCSDIR%%/pgpkeys/rnagy.key
+%%DOCSDIR%%/pgpkeys/rnoland.key
+%%DOCSDIR%%/pgpkeys/roam.key
+%%DOCSDIR%%/pgpkeys/robak.key
+%%DOCSDIR%%/pgpkeys/roberto.key
+%%DOCSDIR%%/pgpkeys/rodrigc.key
+%%DOCSDIR%%/pgpkeys/rodrigo.key
+%%DOCSDIR%%/pgpkeys/romain.key
+%%DOCSDIR%%/pgpkeys/ronald.key
+%%DOCSDIR%%/pgpkeys/royger.key
+%%DOCSDIR%%/pgpkeys/rpaulo.key
+%%DOCSDIR%%/pgpkeys/rpokala.key
+%%DOCSDIR%%/pgpkeys/rscheff.key
+%%DOCSDIR%%/pgpkeys/rushani.key
+%%DOCSDIR%%/pgpkeys/ryusuke.key
+%%DOCSDIR%%/pgpkeys/sahil.key
+%%DOCSDIR%%/pgpkeys/salvadore.key
+%%DOCSDIR%%/pgpkeys/sam.key
+%%DOCSDIR%%/pgpkeys/samm.key
+%%DOCSDIR%%/pgpkeys/sanpei.key
+%%DOCSDIR%%/pgpkeys/sat.key
+%%DOCSDIR%%/pgpkeys/scheidell.key
+%%DOCSDIR%%/pgpkeys/scop.key
+%%DOCSDIR%%/pgpkeys/scottl.key
+%%DOCSDIR%%/pgpkeys/scottph.key
+%%DOCSDIR%%/pgpkeys/se.key
+%%DOCSDIR%%/pgpkeys/security-officer.key
+%%DOCSDIR%%/pgpkeys/sef.key
+%%DOCSDIR%%/pgpkeys/sem.key
+%%DOCSDIR%%/pgpkeys/sepotvin.key
+%%DOCSDIR%%/pgpkeys/sergei.key
+%%DOCSDIR%%/pgpkeys/sgalabov.key
+%%DOCSDIR%%/pgpkeys/shaun.key
+%%DOCSDIR%%/pgpkeys/sheldonh.key
+%%DOCSDIR%%/pgpkeys/simon.key
+%%DOCSDIR%%/pgpkeys/sjg.key
+%%DOCSDIR%%/pgpkeys/skozlov.key
+%%DOCSDIR%%/pgpkeys/snb.key
+%%DOCSDIR%%/pgpkeys/sobomax.key
+%%DOCSDIR%%/pgpkeys/sson.key
+%%DOCSDIR%%/pgpkeys/ssouhlal.key
+%%DOCSDIR%%/pgpkeys/stefan.key
+%%DOCSDIR%%/pgpkeys/stephane.key
+%%DOCSDIR%%/pgpkeys/stephen.key
+%%DOCSDIR%%/pgpkeys/stevek.key
+%%DOCSDIR%%/pgpkeys/sunpoet.key
+%%DOCSDIR%%/pgpkeys/sylvio.key
+%%DOCSDIR%%/pgpkeys/syrinx.key
+%%DOCSDIR%%/pgpkeys/syuu.key
+%%DOCSDIR%%/pgpkeys/tabthorpe.key
+%%DOCSDIR%%/pgpkeys/tagattie.key
+%%DOCSDIR%%/pgpkeys/taras.key
+%%DOCSDIR%%/pgpkeys/tcberner.key
+%%DOCSDIR%%/pgpkeys/tdb.key
+%%DOCSDIR%%/pgpkeys/theraven.key
+%%DOCSDIR%%/pgpkeys/thierry.key
+%%DOCSDIR%%/pgpkeys/thomas.key
+%%DOCSDIR%%/pgpkeys/thompsa.key
+%%DOCSDIR%%/pgpkeys/timur.key
+%%DOCSDIR%%/pgpkeys/tmclaugh.key
+%%DOCSDIR%%/pgpkeys/tmm.key
+%%DOCSDIR%%/pgpkeys/tmseck.key
+%%DOCSDIR%%/pgpkeys/tobez.key
+%%DOCSDIR%%/pgpkeys/tobik.key
+%%DOCSDIR%%/pgpkeys/tota.key
+%%DOCSDIR%%/pgpkeys/trevor.key
+%%DOCSDIR%%/pgpkeys/trhodes.key
+%%DOCSDIR%%/pgpkeys/trociny.key
+%%DOCSDIR%%/pgpkeys/tuexen.key
+%%DOCSDIR%%/pgpkeys/twinterg.key
+%%DOCSDIR%%/pgpkeys/tz.key
+%%DOCSDIR%%/pgpkeys/ue.key
+%%DOCSDIR%%/pgpkeys/ume.key
+%%DOCSDIR%%/pgpkeys/ups.key
+%%DOCSDIR%%/pgpkeys/vanilla.key
+%%DOCSDIR%%/pgpkeys/vd.key
+%%DOCSDIR%%/pgpkeys/versus.key
+%%DOCSDIR%%/pgpkeys/vg.key
+%%DOCSDIR%%/pgpkeys/viny.key
+%%DOCSDIR%%/pgpkeys/vishwin.key
+%%DOCSDIR%%/pgpkeys/vkashyap.key
+%%DOCSDIR%%/pgpkeys/vmaffione.key
+%%DOCSDIR%%/pgpkeys/vs.key
+%%DOCSDIR%%/pgpkeys/vsevolod.key
+%%DOCSDIR%%/pgpkeys/wen.key
+%%DOCSDIR%%/pgpkeys/weongyo.key
+%%DOCSDIR%%/pgpkeys/wes.key
+%%DOCSDIR%%/pgpkeys/wg.key
+%%DOCSDIR%%/pgpkeys/whu.key
+%%DOCSDIR%%/pgpkeys/wilko.key
+%%DOCSDIR%%/pgpkeys/will.key
+%%DOCSDIR%%/pgpkeys/wkoszek.key
+%%DOCSDIR%%/pgpkeys/wollman.key
+%%DOCSDIR%%/pgpkeys/wosch.key
+%%DOCSDIR%%/pgpkeys/wxs.key
+%%DOCSDIR%%/pgpkeys/xride.key
+%%DOCSDIR%%/pgpkeys/yasu.key
+%%DOCSDIR%%/pgpkeys/ygy.key
+%%DOCSDIR%%/pgpkeys/yoichi.key
+%%DOCSDIR%%/pgpkeys/yzlin.key
+%%DOCSDIR%%/pgpkeys/zack.key
+%%DOCSDIR%%/pgpkeys/zeising.key
+%%DOCSDIR%%/pgpkeys/zi.key
+%%DOCSDIR%%/pgpkeys/zirias.key
+%%DOCSDIR%%/pgpkeys/zlei.key
+%%DOCSDIR%%/pgpkeys/zml.key
diff --git a/misc/freebsd-doc-en/pkg-plist.pdf b/misc/freebsd-doc-en/pkg-plist.pdf
index 24d39a1446a5..e9aba0827029 100644
--- a/misc/freebsd-doc-en/pkg-plist.pdf
+++ b/misc/freebsd-doc-en/pkg-plist.pdf
@@ -1,44 +1,44 @@
-%%DOCSDIR%%/%%DOCLANG%%/articles/bsdl-gpl/bsdl-gpl_en.pdf
-%%DOCSDIR%%/%%DOCLANG%%/articles/building-products/building-products_en.pdf
-%%DOCSDIR%%/%%DOCLANG%%/articles/committers-guide/committers-guide_en.pdf
-%%DOCSDIR%%/%%DOCLANG%%/articles/contributing/contributing_en.pdf
-%%DOCSDIR%%/%%DOCLANG%%/articles/contributors/contributors_en.pdf
-%%DOCSDIR%%/%%DOCLANG%%/articles/cups/cups_en.pdf
-%%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd/explaining-bsd_en.pdf
-%%DOCSDIR%%/%%DOCLANG%%/articles/filtering-bridges/filtering-bridges_en.pdf
-%%DOCSDIR%%/%%DOCLANG%%/articles/fonts/fonts_en.pdf
-%%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-questions/freebsd-questions_en.pdf
-%%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-releng/freebsd-releng_en.pdf
-%%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-src-lsp/freebsd-src-lsp_en.pdf
-%%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-update-server/freebsd-update-server_en.pdf
-%%DOCSDIR%%/%%DOCLANG%%/articles/geom-class/geom-class_en.pdf
-%%DOCSDIR%%/%%DOCLANG%%/articles/gjournal-desktop/gjournal-desktop_en.pdf
-%%DOCSDIR%%/%%DOCLANG%%/articles/hubs/hubs_en.pdf
-%%DOCSDIR%%/%%DOCLANG%%/articles/ipsec-must/ipsec-must_en.pdf
-%%DOCSDIR%%/%%DOCLANG%%/articles/ldap-auth/ldap-auth_en.pdf
-%%DOCSDIR%%/%%DOCLANG%%/articles/leap-seconds/leap-seconds_en.pdf
-%%DOCSDIR%%/%%DOCLANG%%/articles/license-guide/license-guide_en.pdf
-%%DOCSDIR%%/%%DOCLANG%%/articles/linux-emulation/linux-emulation_en.pdf
-%%DOCSDIR%%/%%DOCLANG%%/articles/linux-users/linux-users_en.pdf
-%%DOCSDIR%%/%%DOCLANG%%/articles/mailing-list-faq/mailing-list-faq_en.pdf
-%%DOCSDIR%%/%%DOCLANG%%/articles/nanobsd/nanobsd_en.pdf
-%%DOCSDIR%%/%%DOCLANG%%/articles/new-users/new-users_en.pdf
-%%DOCSDIR%%/%%DOCLANG%%/articles/pam/pam_en.pdf
-%%DOCSDIR%%/%%DOCLANG%%/articles/port-mentor-guidelines/port-mentor-guidelines_en.pdf
-%%DOCSDIR%%/%%DOCLANG%%/articles/pr-guidelines/pr-guidelines_en.pdf
-%%DOCSDIR%%/%%DOCLANG%%/articles/problem-reports/problem-reports_en.pdf
-%%DOCSDIR%%/%%DOCLANG%%/articles/rc-scripting/rc-scripting_en.pdf
-%%DOCSDIR%%/%%DOCLANG%%/articles/releng/releng_en.pdf
-%%DOCSDIR%%/%%DOCLANG%%/articles/remote-install/remote-install_en.pdf
-%%DOCSDIR%%/%%DOCLANG%%/articles/serial-uart/serial-uart_en.pdf
-%%DOCSDIR%%/%%DOCLANG%%/articles/solid-state/solid-state_en.pdf
-%%DOCSDIR%%/%%DOCLANG%%/articles/vinum/vinum_en.pdf
-%%DOCSDIR%%/%%DOCLANG%%/articles/vm-design/vm-design_en.pdf
-%%DOCSDIR%%/%%DOCLANG%%/books/arch-handbook/arch-handbook_en.pdf
-%%DOCSDIR%%/%%DOCLANG%%/books/design-44bsd/design-44bsd_en.pdf
-%%DOCSDIR%%/%%DOCLANG%%/books/dev-model/dev-model_en.pdf
-%%DOCSDIR%%/%%DOCLANG%%/books/developers-handbook/developers-handbook_en.pdf
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/faq_en.pdf
-%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/fdp-primer_en.pdf
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/handbook_en.pdf
-%%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/porters-handbook_en.pdf
+%%DOCSDIR%%/en/articles/bsdl-gpl/bsdl-gpl_en.pdf
+%%DOCSDIR%%/en/articles/building-products/building-products_en.pdf
+%%DOCSDIR%%/en/articles/committers-guide/committers-guide_en.pdf
+%%DOCSDIR%%/en/articles/contributing/contributing_en.pdf
+%%DOCSDIR%%/en/articles/contributors/contributors_en.pdf
+%%DOCSDIR%%/en/articles/cups/cups_en.pdf
+%%DOCSDIR%%/en/articles/explaining-bsd/explaining-bsd_en.pdf
+%%DOCSDIR%%/en/articles/filtering-bridges/filtering-bridges_en.pdf
+%%DOCSDIR%%/en/articles/fonts/fonts_en.pdf
+%%DOCSDIR%%/en/articles/freebsd-questions/freebsd-questions_en.pdf
+%%DOCSDIR%%/en/articles/freebsd-releng/freebsd-releng_en.pdf
+%%DOCSDIR%%/en/articles/freebsd-src-lsp/freebsd-src-lsp_en.pdf
+%%DOCSDIR%%/en/articles/freebsd-status-report-process/freebsd-status-report-process_en.pdf
+%%DOCSDIR%%/en/articles/freebsd-update-server/freebsd-update-server_en.pdf
+%%DOCSDIR%%/en/articles/geom-class/geom-class_en.pdf
+%%DOCSDIR%%/en/articles/gjournal-desktop/gjournal-desktop_en.pdf
+%%DOCSDIR%%/en/articles/hubs/hubs_en.pdf
+%%DOCSDIR%%/en/articles/ipsec-must/ipsec-must_en.pdf
+%%DOCSDIR%%/en/articles/ldap-auth/ldap-auth_en.pdf
+%%DOCSDIR%%/en/articles/leap-seconds/leap-seconds_en.pdf
+%%DOCSDIR%%/en/articles/license-guide/license-guide_en.pdf
+%%DOCSDIR%%/en/articles/linux-emulation/linux-emulation_en.pdf
+%%DOCSDIR%%/en/articles/linux-users/linux-users_en.pdf
+%%DOCSDIR%%/en/articles/mailing-list-faq/mailing-list-faq_en.pdf
+%%DOCSDIR%%/en/articles/nanobsd/nanobsd_en.pdf
+%%DOCSDIR%%/en/articles/new-users/new-users_en.pdf
+%%DOCSDIR%%/en/articles/port-mentor-guidelines/port-mentor-guidelines_en.pdf
+%%DOCSDIR%%/en/articles/pr-guidelines/pr-guidelines_en.pdf
+%%DOCSDIR%%/en/articles/problem-reports/problem-reports_en.pdf
+%%DOCSDIR%%/en/articles/rc-scripting/rc-scripting_en.pdf
+%%DOCSDIR%%/en/articles/releng/releng_en.pdf
+%%DOCSDIR%%/en/articles/remote-install/remote-install_en.pdf
+%%DOCSDIR%%/en/articles/serial-uart/serial-uart_en.pdf
+%%DOCSDIR%%/en/articles/solid-state/solid-state_en.pdf
+%%DOCSDIR%%/en/articles/vinum/vinum_en.pdf
+%%DOCSDIR%%/en/articles/vm-design/vm-design_en.pdf
+%%DOCSDIR%%/en/books/arch-handbook/arch-handbook_en.pdf
+%%DOCSDIR%%/en/books/design-44bsd/design-44bsd_en.pdf
+%%DOCSDIR%%/en/books/dev-model/dev-model_en.pdf
+%%DOCSDIR%%/en/books/developers-handbook/developers-handbook_en.pdf
+%%DOCSDIR%%/en/books/faq/faq_en.pdf
+%%DOCSDIR%%/en/books/fdp-primer/fdp-primer_en.pdf
+%%DOCSDIR%%/en/books/handbook/handbook_en.pdf
+%%DOCSDIR%%/en/books/porters-handbook/porters-handbook_en.pdf