misc/freebsd-doc-*: Update to rev 8539114 from the FreeBSD docset

Note: HTML format build has been disabled until separate localized-only
build will work again without requiring the en_US build.

Approved by:	doceng (implicit)

(cherry picked from commit c7fe9c0eeedb224f21d35d11e9224b1b678beb23)

22 files changed, 242 insertions, 241 deletions

diff --git a/misc/freebsd-doc-all/Makefile b/misc/freebsd-doc-all/Makefile
index 403b89c24326..cfcc04c21b0f 100644
--- a/misc/freebsd-doc-all/Makefile
+++ b/misc/freebsd-doc-all/Makefile
@@ -1,7 +1,7 @@
 # Created by: Marc Fonvieille <blackend@FreeBSD.org>
 
 PORTNAME=	freebsd-doc-all
-PORTVERSION=	20211029
+PORTVERSION=	20220311
 PORTEPOCH=	1
 CATEGORIES=	misc docs
 
diff --git a/misc/freebsd-doc-bn/pkg-plist.pdf b/misc/freebsd-doc-bn/pkg-plist.pdf
index 122868befca7..4cabf87b0f23 100644
--- a/misc/freebsd-doc-bn/pkg-plist.pdf
+++ b/misc/freebsd-doc-bn/pkg-plist.pdf
@@ -1,2 +1,2 @@
-%%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd/article.pdf
-%%DOCSDIR%%/%%DOCLANG%%/articles/new-users/article.pdf
+%%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd/explaining-bsd_%%DOCLANG_PREFIX%%.pdf
+%%DOCSDIR%%/%%DOCLANG%%/articles/new-users/new-users_%%DOCLANG_PREFIX%%.pdf
diff --git a/misc/freebsd-doc-da/pkg-plist.pdf b/misc/freebsd-doc-da/pkg-plist.pdf
index a02f4e61d1e9..146cfaeea4df 100644
--- a/misc/freebsd-doc-da/pkg-plist.pdf
+++ b/misc/freebsd-doc-da/pkg-plist.pdf
@@ -1 +1 @@
-%%DOCSDIR%%/%%DOCLANG%%/articles/ipsec-must/article.pdf
+%%DOCSDIR%%/%%DOCLANG%%/articles/ipsec-must/ipsec-must_da.pdf
diff --git a/misc/freebsd-doc-de/pkg-plist.pdf b/misc/freebsd-doc-de/pkg-plist.pdf
index 5bcaebae7664..9a4dd70ca7a1 100644
--- a/misc/freebsd-doc-de/pkg-plist.pdf
+++ b/misc/freebsd-doc-de/pkg-plist.pdf
@@ -1,13 +1,13 @@
-%%DOCSDIR%%/%%DOCLANG%%/articles/contributing/article.pdf
-%%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd/article.pdf
-%%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-update-server/article.pdf
-%%DOCSDIR%%/%%DOCLANG%%/articles/leap-seconds/article.pdf
-%%DOCSDIR%%/%%DOCLANG%%/articles/linux-users/article.pdf
-%%DOCSDIR%%/%%DOCLANG%%/articles/nanobsd/article.pdf
-%%DOCSDIR%%/%%DOCLANG%%/articles/new-users/article.pdf
-%%DOCSDIR%%/%%DOCLANG%%/articles/port-mentor-guidelines/article.pdf
-%%DOCSDIR%%/%%DOCLANG%%/articles/solid-state/article.pdf
-%%DOCSDIR%%/%%DOCLANG%%/books/developers-handbook/book.pdf
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/book.pdf
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/book.pdf
-%%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/book.pdf
+%%DOCSDIR%%/%%DOCLANG%%/articles/contributing/contributing_de.pdf
+%%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd/explaining-bsd_de.pdf
+%%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-update-server/freebsd-update-server_de.pdf
+%%DOCSDIR%%/%%DOCLANG%%/articles/leap-seconds/leap-seconds_de.pdf
+%%DOCSDIR%%/%%DOCLANG%%/articles/linux-users/linux-users_de.pdf
+%%DOCSDIR%%/%%DOCLANG%%/articles/nanobsd/nanobsd_de.pdf
+%%DOCSDIR%%/%%DOCLANG%%/articles/new-users/new-users_de.pdf
+%%DOCSDIR%%/%%DOCLANG%%/articles/port-mentor-guidelines/port-mentor-guidelines_de.pdf
+%%DOCSDIR%%/%%DOCLANG%%/articles/solid-state/solid-state_de.pdf
+%%DOCSDIR%%/%%DOCLANG%%/books/developers-handbook/developers-handbook_de.pdf
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/faq_de.pdf
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/handbook_de.pdf
+%%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/porters-handbook_de.pdf
diff --git a/misc/freebsd-doc-el/pkg-plist.pdf b/misc/freebsd-doc-el/pkg-plist.pdf
index c762c66acce0..0da6c9802f6d 100644
--- a/misc/freebsd-doc-el/pkg-plist.pdf
+++ b/misc/freebsd-doc-el/pkg-plist.pdf
@@ -1,14 +1,14 @@
-%%DOCSDIR%%/%%DOCLANG%%/articles/bsdl-gpl/article.pdf
-%%DOCSDIR%%/%%DOCLANG%%/articles/contributing/article.pdf
-%%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd/article.pdf
-%%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-questions/article.pdf
-%%DOCSDIR%%/%%DOCLANG%%/articles/gjournal-desktop/article.pdf
-%%DOCSDIR%%/%%DOCLANG%%/articles/greek-language-support/article.pdf
-%%DOCSDIR%%/%%DOCLANG%%/articles/linux-users/article.pdf
-%%DOCSDIR%%/%%DOCLANG%%/articles/mailing-list-faq/article.pdf
-%%DOCSDIR%%/%%DOCLANG%%/articles/nanobsd/article.pdf
-%%DOCSDIR%%/%%DOCLANG%%/articles/new-users/article.pdf
-%%DOCSDIR%%/%%DOCLANG%%/articles/problem-reports/article.pdf
-%%DOCSDIR%%/%%DOCLANG%%/articles/releng/article.pdf
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/book.pdf
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/book.pdf
+%%DOCSDIR%%/%%DOCLANG%%/articles/bsdl-gpl/bsdl-gpl_el.pdf
+%%DOCSDIR%%/%%DOCLANG%%/articles/contributing/contributing_el.pdf
+%%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd/explaining-bsd_el.pdf
+%%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-questions/freebsd-questions_el.pdf
+%%DOCSDIR%%/%%DOCLANG%%/articles/gjournal-desktop/gjournal-desktop_el.pdf
+%%DOCSDIR%%/%%DOCLANG%%/articles/greek-language-support/greek-language-support_el.pdf
+%%DOCSDIR%%/%%DOCLANG%%/articles/linux-users/linux-users_el.pdf
+%%DOCSDIR%%/%%DOCLANG%%/articles/mailing-list-faq/mailing-list-faq_el.pdf
+%%DOCSDIR%%/%%DOCLANG%%/articles/nanobsd/nanobsd_el.pdf
+%%DOCSDIR%%/%%DOCLANG%%/articles/new-users/new-users_el.pdf
+%%DOCSDIR%%/%%DOCLANG%%/articles/problem-reports/problem-reports_el.pdf
+%%DOCSDIR%%/%%DOCLANG%%/articles/releng/releng_el.pdf
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/faq_el.pdf
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/handbook_el.pdf
diff --git a/misc/freebsd-doc-en/Makefile b/misc/freebsd-doc-en/Makefile
index fafdde5689bc..553033a321c7 100644
--- a/misc/freebsd-doc-en/Makefile
+++ b/misc/freebsd-doc-en/Makefile
@@ -1,7 +1,7 @@
 # Created by: Marc Fonvieille <blackend@FreeBSD.org>
 
 PORTNAME=	freebsd-doc
-PORTVERSION=	20211029
+PORTVERSION=	20220311
 PORTEPOCH=	1
 CATEGORIES=	misc docs
 MASTER_SITES=	LOCAL/blackend
@@ -14,7 +14,6 @@ LICENSE=	BSD2CLAUSE
 
 BUILD_DEPENDS=	docproj>=4.0:textproc/docproj
 
-USES=		python:build,3.6+
 WRKSRC=		${WRKDIR}/doc/documentation
 PLIST_SUB=	DOCSDIR=${DOCBASE} \
 		DOCLANG=${DOCLANG} \
@@ -33,7 +32,9 @@ DOCLANG?=		en
 DOCLANG_PREFIX?=	${DOCLANG:C/_.*$//}
 DOCBASE?=		share/doc/freebsd
 
-AVAILABLEFORMATS=	HTML PDF
+# HTML format disabled until separate localized-only build will work again
+#AVAILABLEFORMATS=	HTML PDF
+AVAILABLEFORMATS=	PDF
 
 OPTIONS_DEFINE=		${AVAILABLEFORMATS}
 OPTIONS_DEFAULT=	PDF
@@ -69,7 +70,6 @@ pre-build:
 		${CAT} ${i} >> ${PLIST}; \
 	fi
 .endfor
-	${REINPLACE_CMD} -e 's/python3/${PYTHON_CMD:T}/' ${WRKSRC}/Makefile
 
 do-build:
 	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \
@@ -78,5 +78,10 @@ do-build:
 do-install:
 	${MKDIR} ${STAGEDIR}${DESTDIR}${PREFIX}/${DOCBASE}
 	${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}%; \
+	fi
 
 .include <bsd.port.mk>
diff --git a/misc/freebsd-doc-en/distinfo b/misc/freebsd-doc-en/distinfo
index 8d939eb27f87..87ef7ca39001 100644
--- a/misc/freebsd-doc-en/distinfo
+++ b/misc/freebsd-doc-en/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1635522068
-SHA256 (freebsd-doc-20211029.tar.gz) = ea769f49a224981e387f290dfd6b124811f1c185eac943d46d009255dab926d4
-SIZE (freebsd-doc-20211029.tar.gz) = 93429740
+TIMESTAMP = 1647078475
+SHA256 (freebsd-doc-20220311.tar.gz) = e90161a999342c8bb6774416801ac218c439c4b3528a6fbbdcee453762a3d701
+SIZE (freebsd-doc-20220311.tar.gz) = 97556551
diff --git a/misc/freebsd-doc-en/pkg-plist.pdf b/misc/freebsd-doc-en/pkg-plist.pdf
index e981187ef917..2d5f788ad9fa 100644
--- a/misc/freebsd-doc-en/pkg-plist.pdf
+++ b/misc/freebsd-doc-en/pkg-plist.pdf
@@ -1,44 +1,42 @@
-%%DOCSDIR%%/%%DOCLANG%%/articles/bsdl-gpl/article.pdf
-%%DOCSDIR%%/%%DOCLANG%%/articles/building-products/article.pdf
-%%DOCSDIR%%/%%DOCLANG%%/articles/committers-guide/article.pdf
-%%DOCSDIR%%/%%DOCLANG%%/articles/contributing/article.pdf
-%%DOCSDIR%%/%%DOCLANG%%/articles/contributors/article.pdf
-%%DOCSDIR%%/%%DOCLANG%%/articles/cups/article.pdf
-%%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd/article.pdf
-%%DOCSDIR%%/%%DOCLANG%%/articles/filtering-bridges/article.pdf
-%%DOCSDIR%%/%%DOCLANG%%/articles/fonts/article.pdf
-%%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-questions/article.pdf
-%%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-releng/article.pdf
-%%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-src-lsp/article.pdf
-%%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-update-server/article.pdf
-%%DOCSDIR%%/%%DOCLANG%%/articles/geom-class/article.pdf
-%%DOCSDIR%%/%%DOCLANG%%/articles/gjournal-desktop/article.pdf
-%%DOCSDIR%%/%%DOCLANG%%/articles/hubs/article.pdf
-%%DOCSDIR%%/%%DOCLANG%%/articles/ipsec-must/article.pdf
-%%DOCSDIR%%/%%DOCLANG%%/articles/ldap-auth/article.pdf
-%%DOCSDIR%%/%%DOCLANG%%/articles/leap-seconds/article.pdf
-%%DOCSDIR%%/%%DOCLANG%%/articles/linux-emulation/article.pdf
-%%DOCSDIR%%/%%DOCLANG%%/articles/linux-users/article.pdf
-%%DOCSDIR%%/%%DOCLANG%%/articles/mailing-list-faq/article.pdf
-%%DOCSDIR%%/%%DOCLANG%%/articles/nanobsd/article.pdf
-%%DOCSDIR%%/%%DOCLANG%%/articles/new-users/article.pdf
-%%DOCSDIR%%/%%DOCLANG%%/articles/pam/article.pdf
-%%DOCSDIR%%/%%DOCLANG%%/articles/pgpkeys/article.pdf
-%%DOCSDIR%%/%%DOCLANG%%/articles/port-mentor-guidelines/article.pdf
-%%DOCSDIR%%/%%DOCLANG%%/articles/pr-guidelines/article.pdf
-%%DOCSDIR%%/%%DOCLANG%%/articles/problem-reports/article.pdf
-%%DOCSDIR%%/%%DOCLANG%%/articles/rc-scripting/article.pdf
-%%DOCSDIR%%/%%DOCLANG%%/articles/releng/article.pdf
-%%DOCSDIR%%/%%DOCLANG%%/articles/remote-install/article.pdf
-%%DOCSDIR%%/%%DOCLANG%%/articles/serial-uart/article.pdf
-%%DOCSDIR%%/%%DOCLANG%%/articles/solid-state/article.pdf
-%%DOCSDIR%%/%%DOCLANG%%/articles/vinum/article.pdf
-%%DOCSDIR%%/%%DOCLANG%%/articles/vm-design/article.pdf
-%%DOCSDIR%%/%%DOCLANG%%/books/arch-handbook/book.pdf
-%%DOCSDIR%%/%%DOCLANG%%/books/design-44bsd/book.pdf
-%%DOCSDIR%%/%%DOCLANG%%/books/dev-model/book.pdf
-%%DOCSDIR%%/%%DOCLANG%%/books/developers-handbook/book.pdf
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/book.pdf
-%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/book.pdf
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/book.pdf
-%%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/book.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-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/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
diff --git a/misc/freebsd-doc-es/pkg-plist.pdf b/misc/freebsd-doc-es/pkg-plist.pdf
index 1138a780139c..f3a20a57e5ef 100644
--- a/misc/freebsd-doc-es/pkg-plist.pdf
+++ b/misc/freebsd-doc-es/pkg-plist.pdf
@@ -1,24 +1,26 @@
-%%DOCSDIR%%/%%DOCLANG%%/articles/bsdl-gpl/article.pdf
-%%DOCSDIR%%/%%DOCLANG%%/articles/building-products/article.pdf
-%%DOCSDIR%%/%%DOCLANG%%/articles/contributing/article.pdf
-%%DOCSDIR%%/%%DOCLANG%%/articles/contributors/article.pdf
-%%DOCSDIR%%/%%DOCLANG%%/articles/cups/article.pdf
-%%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd/article.pdf
-%%DOCSDIR%%/%%DOCLANG%%/articles/filtering-bridges/article.pdf
-%%DOCSDIR%%/%%DOCLANG%%/articles/fonts/article.pdf
-%%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-questions/article.pdf
-%%DOCSDIR%%/%%DOCLANG%%/articles/ipsec-must/article.pdf
-%%DOCSDIR%%/%%DOCLANG%%/articles/leap-seconds/article.pdf
-%%DOCSDIR%%/%%DOCLANG%%/articles/linux-users/article.pdf
-%%DOCSDIR%%/%%DOCLANG%%/articles/mailing-list-faq/article.pdf
-%%DOCSDIR%%/%%DOCLANG%%/articles/nanobsd/article.pdf
-%%DOCSDIR%%/%%DOCLANG%%/articles/port-mentor-guidelines/article.pdf
-%%DOCSDIR%%/%%DOCLANG%%/articles/pr-guidelines/article.pdf
-%%DOCSDIR%%/%%DOCLANG%%/articles/problem-reports/article.pdf
-%%DOCSDIR%%/%%DOCLANG%%/articles/releng/article.pdf
-%%DOCSDIR%%/%%DOCLANG%%/articles/remote-install/article.pdf
-%%DOCSDIR%%/%%DOCLANG%%/articles/solid-state/article.pdf
-%%DOCSDIR%%/%%DOCLANG%%/articles/vinum/article.pdf
-%%DOCSDIR%%/%%DOCLANG%%/articles/vm-design/article.pdf
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/book.pdf
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/book.pdf
+%%DOCSDIR%%/%%DOCLANG%%/articles/bsdl-gpl/bsdl-gpl_es.pdf
+%%DOCSDIR%%/%%DOCLANG%%/articles/building-products/building-products_es.pdf
+%%DOCSDIR%%/%%DOCLANG%%/articles/contributing/contributing_es.pdf
+%%DOCSDIR%%/%%DOCLANG%%/articles/contributors/contributors_es.pdf
+%%DOCSDIR%%/%%DOCLANG%%/articles/cups/cups_es.pdf
+%%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd/explaining-bsd_es.pdf
+%%DOCSDIR%%/%%DOCLANG%%/articles/filtering-bridges/filtering-bridges_es.pdf
+%%DOCSDIR%%/%%DOCLANG%%/articles/fonts/fonts_es.pdf
+%%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-questions/freebsd-questions_es.pdf
+%%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-releng/freebsd-releng_es.pdf
+%%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-update-server/freebsd-update-server_es.pdf
+%%DOCSDIR%%/%%DOCLANG%%/articles/ipsec-must/ipsec-must_es.pdf
+%%DOCSDIR%%/%%DOCLANG%%/articles/leap-seconds/leap-seconds_es.pdf
+%%DOCSDIR%%/%%DOCLANG%%/articles/linux-users/linux-users_es.pdf
+%%DOCSDIR%%/%%DOCLANG%%/articles/mailing-list-faq/mailing-list-faq_es.pdf
+%%DOCSDIR%%/%%DOCLANG%%/articles/nanobsd/nanobsd_es.pdf
+%%DOCSDIR%%/%%DOCLANG%%/articles/port-mentor-guidelines/port-mentor-guidelines_es.pdf
+%%DOCSDIR%%/%%DOCLANG%%/articles/pr-guidelines/pr-guidelines_es.pdf
+%%DOCSDIR%%/%%DOCLANG%%/articles/problem-reports/problem-reports_es.pdf
+%%DOCSDIR%%/%%DOCLANG%%/articles/releng/releng_es.pdf
+%%DOCSDIR%%/%%DOCLANG%%/articles/remote-install/remote-install_es.pdf
+%%DOCSDIR%%/%%DOCLANG%%/articles/solid-state/solid-state_es.pdf
+%%DOCSDIR%%/%%DOCLANG%%/articles/vinum/vinum_es.pdf
+%%DOCSDIR%%/%%DOCLANG%%/articles/vm-design/vm-design_es.pdf
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/faq_es.pdf
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/handbook_es.pdf
diff --git a/misc/freebsd-doc-fr/pkg-plist.pdf b/misc/freebsd-doc-fr/pkg-plist.pdf
index f406779ca2cc..685f02d12018 100644
--- a/misc/freebsd-doc-fr/pkg-plist.pdf
+++ b/misc/freebsd-doc-fr/pkg-plist.pdf
@@ -1,18 +1,17 @@
-%%DOCSDIR%%/%%DOCLANG%%/articles/building-products/article.pdf
-%%DOCSDIR%%/%%DOCLANG%%/articles/committers-guide/article.pdf
-%%DOCSDIR%%/%%DOCLANG%%/articles/contributing/article.pdf
-%%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd/article.pdf
-%%DOCSDIR%%/%%DOCLANG%%/articles/filtering-bridges/article.pdf
-%%DOCSDIR%%/%%DOCLANG%%/articles/fonts/article.pdf
-%%DOCSDIR%%/%%DOCLANG%%/articles/ipsec-must/article.pdf
-%%DOCSDIR%%/%%DOCLANG%%/articles/leap-seconds/article.pdf
-%%DOCSDIR%%/%%DOCLANG%%/articles/linux-users/article.pdf
-%%DOCSDIR%%/%%DOCLANG%%/articles/nanobsd/article.pdf
-%%DOCSDIR%%/%%DOCLANG%%/articles/new-users/article.pdf
-%%DOCSDIR%%/%%DOCLANG%%/articles/pam/article.pdf
-%%DOCSDIR%%/%%DOCLANG%%/articles/pr-guidelines/article.pdf
-%%DOCSDIR%%/%%DOCLANG%%/articles/problem-reports/article.pdf
-%%DOCSDIR%%/%%DOCLANG%%/books/developers-handbook/book.pdf
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/book.pdf
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/book.pdf
-%%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/book.pdf
+%%DOCSDIR%%/%%DOCLANG%%/articles/building-products/building-products_fr.pdf
+%%DOCSDIR%%/%%DOCLANG%%/articles/committers-guide/committers-guide_fr.pdf
+%%DOCSDIR%%/%%DOCLANG%%/articles/contributing/contributing_fr.pdf
+%%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd/explaining-bsd_fr.pdf
+%%DOCSDIR%%/%%DOCLANG%%/articles/filtering-bridges/filtering-bridges_fr.pdf
+%%DOCSDIR%%/%%DOCLANG%%/articles/fonts/fonts_fr.pdf
+%%DOCSDIR%%/%%DOCLANG%%/articles/ipsec-must/ipsec-must_fr.pdf
+%%DOCSDIR%%/%%DOCLANG%%/articles/leap-seconds/leap-seconds_fr.pdf
+%%DOCSDIR%%/%%DOCLANG%%/articles/linux-users/linux-users_fr.pdf
+%%DOCSDIR%%/%%DOCLANG%%/articles/nanobsd/nanobsd_fr.pdf
+%%DOCSDIR%%/%%DOCLANG%%/articles/new-users/new-users_fr.pdf
+%%DOCSDIR%%/%%DOCLANG%%/articles/pr-guidelines/pr-guidelines_fr.pdf
+%%DOCSDIR%%/%%DOCLANG%%/articles/problem-reports/problem-reports_fr.pdf
+%%DOCSDIR%%/%%DOCLANG%%/books/developers-handbook/developers-handbook_fr.pdf
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/faq_fr.pdf
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/handbook_fr.pdf
+%%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/porters-handbook_fr.pdf
diff --git a/misc/freebsd-doc-hu/pkg-plist.pdf b/misc/freebsd-doc-hu/pkg-plist.pdf
index 0ab1ca0b764e..f3a06ed235ed 100644
--- a/misc/freebsd-doc-hu/pkg-plist.pdf
+++ b/misc/freebsd-doc-hu/pkg-plist.pdf
@@ -1,6 +1,6 @@
-%%DOCSDIR%%/%%DOCLANG%%/articles/cups/article.pdf
-%%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd/article.pdf
-%%DOCSDIR%%/%%DOCLANG%%/articles/gjournal-desktop/article.pdf
-%%DOCSDIR%%/%%DOCLANG%%/articles/linux-users/article.pdf
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/book.pdf
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/book.pdf
+%%DOCSDIR%%/%%DOCLANG%%/articles/cups/cups_hu.pdf
+%%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd/explaining-bsd_hu.pdf
+%%DOCSDIR%%/%%DOCLANG%%/articles/gjournal-desktop/gjournal-desktop_hu.pdf
+%%DOCSDIR%%/%%DOCLANG%%/articles/linux-users/linux-users_hu.pdf
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/faq_hu.pdf
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/handbook_hu.pdf
diff --git a/misc/freebsd-doc-it/pkg-plist.pdf b/misc/freebsd-doc-it/pkg-plist.pdf
index 4a0a4fb28672..9f53a8f78028 100644
--- a/misc/freebsd-doc-it/pkg-plist.pdf
+++ b/misc/freebsd-doc-it/pkg-plist.pdf
@@ -1,2 +1,2 @@
-%%DOCSDIR%%/%%DOCLANG%%/articles/bsdl-gpl/article.pdf
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/book.pdf
+%%DOCSDIR%%/%%DOCLANG%%/articles/bsdl-gpl/bsdl-gpl_it.pdf
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/handbook_it.pdf
diff --git a/misc/freebsd-doc-ja/pkg-plist.pdf b/misc/freebsd-doc-ja/pkg-plist.pdf
index 9982b22755a3..61cb407dfb34 100644
--- a/misc/freebsd-doc-ja/pkg-plist.pdf
+++ b/misc/freebsd-doc-ja/pkg-plist.pdf
@@ -1,9 +1,9 @@
-%%DOCSDIR%%/%%DOCLANG%%/articles/contributing/article.pdf
-%%DOCSDIR%%/%%DOCLANG%%/articles/fonts/article.pdf
-%%DOCSDIR%%/%%DOCLANG%%/articles/ipsec-must/article.pdf
-%%DOCSDIR%%/%%DOCLANG%%/articles/leap-seconds/article.pdf
-%%DOCSDIR%%/%%DOCLANG%%/articles/problem-reports/article.pdf
-%%DOCSDIR%%/%%DOCLANG%%/books/design-44bsd/book.pdf
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/book.pdf
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/book.pdf
-%%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/book.pdf
+%%DOCSDIR%%/%%DOCLANG%%/articles/contributing/contributing_ja.pdf
+%%DOCSDIR%%/%%DOCLANG%%/articles/fonts/fonts_ja.pdf
+%%DOCSDIR%%/%%DOCLANG%%/articles/ipsec-must/ipsec-must_ja.pdf
+%%DOCSDIR%%/%%DOCLANG%%/articles/leap-seconds/leap-seconds_ja.pdf
+%%DOCSDIR%%/%%DOCLANG%%/articles/problem-reports/problem-reports_ja.pdf
+%%DOCSDIR%%/%%DOCLANG%%/books/design-44bsd/design-44bsd_ja.pdf
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/faq_ja.pdf
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/handbook_ja.pdf
+%%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/porters-handbook_ja.pdf
diff --git a/misc/freebsd-doc-ko/pkg-plist.pdf b/misc/freebsd-doc-ko/pkg-plist.pdf
index 8aa65dd0d743..837c20d11287 100644
--- a/misc/freebsd-doc-ko/pkg-plist.pdf
+++ b/misc/freebsd-doc-ko/pkg-plist.pdf
@@ -1,3 +1,3 @@
-%%DOCSDIR%%/%%DOCLANG%%/articles/bsdl-gpl/article.pdf
-%%DOCSDIR%%/%%DOCLANG%%/articles/contributing/article.pdf
-%%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd/article.pdf
+%%DOCSDIR%%/%%DOCLANG%%/articles/bsdl-gpl/bsdl-gpl_ko.pdf
+%%DOCSDIR%%/%%DOCLANG%%/articles/contributing/contributing_ko.pdf
+%%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd/explaining-bsd_ko.pdf
diff --git a/misc/freebsd-doc-mn/pkg-plist.pdf b/misc/freebsd-doc-mn/pkg-plist.pdf
index a04e3923047d..c5d9891cb34f 100644
--- a/misc/freebsd-doc-mn/pkg-plist.pdf
+++ b/misc/freebsd-doc-mn/pkg-plist.pdf
@@ -1 +1 @@
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/book.pdf
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/handbook_mn.pdf
diff --git a/misc/freebsd-doc-nl/pkg-plist.pdf b/misc/freebsd-doc-nl/pkg-plist.pdf
index b4f030f9d715..245dcc15d6ef 100644
--- a/misc/freebsd-doc-nl/pkg-plist.pdf
+++ b/misc/freebsd-doc-nl/pkg-plist.pdf
@@ -1,6 +1,6 @@
-%%DOCSDIR%%/%%DOCLANG%%/articles/contributing/article.pdf
-%%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd/article.pdf
-%%DOCSDIR%%/%%DOCLANG%%/articles/leap-seconds/article.pdf
-%%DOCSDIR%%/%%DOCLANG%%/articles/problem-reports/article.pdf
-%%DOCSDIR%%/%%DOCLANG%%/articles/solid-state/article.pdf
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/book.pdf
+%%DOCSDIR%%/%%DOCLANG%%/articles/contributing/contributing_nl.pdf
+%%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd/explaining-bsd_nl.pdf
+%%DOCSDIR%%/%%DOCLANG%%/articles/leap-seconds/leap-seconds_nl.pdf
+%%DOCSDIR%%/%%DOCLANG%%/articles/problem-reports/problem-reports_nl.pdf
+%%DOCSDIR%%/%%DOCLANG%%/articles/solid-state/solid-state_nl.pdf
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/handbook_nl.pdf
diff --git a/misc/freebsd-doc-pl/pkg-plist.pdf b/misc/freebsd-doc-pl/pkg-plist.pdf
index 33bf29b71cd9..f9e6aaa22e09 100644
--- a/misc/freebsd-doc-pl/pkg-plist.pdf
+++ b/misc/freebsd-doc-pl/pkg-plist.pdf
@@ -1,3 +1,3 @@
-%%DOCSDIR%%/%%DOCLANG%%/articles/filtering-bridges/article.pdf
-%%DOCSDIR%%/%%DOCLANG%%/articles/new-users/article.pdf
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/book.pdf
+%%DOCSDIR%%/%%DOCLANG%%/articles/filtering-bridges/filtering-bridges_pl.pdf
+%%DOCSDIR%%/%%DOCLANG%%/articles/new-users/new-users_pl.pdf
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/handbook_pl.pdf
diff --git a/misc/freebsd-doc-pt/pkg-plist.pdf b/misc/freebsd-doc-pt/pkg-plist.pdf
index a75233b0e33b..40c53e88eb1d 100644
--- a/misc/freebsd-doc-pt/pkg-plist.pdf
+++ b/misc/freebsd-doc-pt/pkg-plist.pdf
@@ -1,40 +1,38 @@
-%%DOCSDIR%%/%%DOCLANG%%/articles/bsdl-gpl/article.pdf
-%%DOCSDIR%%/%%DOCLANG%%/articles/building-products/article.pdf
-%%DOCSDIR%%/%%DOCLANG%%/articles/committers-guide/article.pdf
-%%DOCSDIR%%/%%DOCLANG%%/articles/contributing/article.pdf
-%%DOCSDIR%%/%%DOCLANG%%/articles/contributors/article.pdf
-%%DOCSDIR%%/%%DOCLANG%%/articles/cups/article.pdf
-%%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd/article.pdf
-%%DOCSDIR%%/%%DOCLANG%%/articles/filtering-bridges/article.pdf
-%%DOCSDIR%%/%%DOCLANG%%/articles/fonts/article.pdf
-%%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-questions/article.pdf
-%%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-releng/article.pdf
-%%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-update-server/article.pdf
-%%DOCSDIR%%/%%DOCLANG%%/articles/geom-class/article.pdf
-%%DOCSDIR%%/%%DOCLANG%%/articles/gjournal-desktop/article.pdf
-%%DOCSDIR%%/%%DOCLANG%%/articles/hubs/article.pdf
-%%DOCSDIR%%/%%DOCLANG%%/articles/ipsec-must/article.pdf
-%%DOCSDIR%%/%%DOCLANG%%/articles/ldap-auth/article.pdf
-%%DOCSDIR%%/%%DOCLANG%%/articles/leap-seconds/article.pdf
-%%DOCSDIR%%/%%DOCLANG%%/articles/linux-emulation/article.pdf
-%%DOCSDIR%%/%%DOCLANG%%/articles/linux-users/article.pdf
-%%DOCSDIR%%/%%DOCLANG%%/articles/mailing-list-faq/article.pdf
-%%DOCSDIR%%/%%DOCLANG%%/articles/nanobsd/article.pdf
-%%DOCSDIR%%/%%DOCLANG%%/articles/new-users/article.pdf
-%%DOCSDIR%%/%%DOCLANG%%/articles/pam/article.pdf
-%%DOCSDIR%%/%%DOCLANG%%/articles/pgpkeys/article.pdf
-%%DOCSDIR%%/%%DOCLANG%%/articles/port-mentor-guidelines/article.pdf
-%%DOCSDIR%%/%%DOCLANG%%/articles/pr-guidelines/article.pdf
-%%DOCSDIR%%/%%DOCLANG%%/articles/problem-reports/article.pdf
-%%DOCSDIR%%/%%DOCLANG%%/articles/rc-scripting/article.pdf
-%%DOCSDIR%%/%%DOCLANG%%/articles/releng/article.pdf
-%%DOCSDIR%%/%%DOCLANG%%/articles/remote-install/article.pdf
-%%DOCSDIR%%/%%DOCLANG%%/articles/serial-uart/article.pdf
-%%DOCSDIR%%/%%DOCLANG%%/articles/solid-state/article.pdf
-%%DOCSDIR%%/%%DOCLANG%%/articles/vinum/article.pdf
-%%DOCSDIR%%/%%DOCLANG%%/articles/vm-design/article.pdf
-%%DOCSDIR%%/%%DOCLANG%%/books/dev-model/book.pdf
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/book.pdf
-%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/book.pdf
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/book.pdf
-%%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/book.pdf
+%%DOCSDIR%%/%%DOCLANG%%/articles/bsdl-gpl/bsdl-gpl_%%DOCLANG_PREFIX%%.pdf
+%%DOCSDIR%%/%%DOCLANG%%/articles/building-products/building-products_%%DOCLANG_PREFIX%%.pdf
+%%DOCSDIR%%/%%DOCLANG%%/articles/committers-guide/committers-guide_%%DOCLANG_PREFIX%%.pdf
+%%DOCSDIR%%/%%DOCLANG%%/articles/contributing/contributing_%%DOCLANG_PREFIX%%.pdf
+%%DOCSDIR%%/%%DOCLANG%%/articles/contributors/contributors_%%DOCLANG_PREFIX%%.pdf
+%%DOCSDIR%%/%%DOCLANG%%/articles/cups/cups_%%DOCLANG_PREFIX%%.pdf
+%%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd/explaining-bsd_%%DOCLANG_PREFIX%%.pdf
+%%DOCSDIR%%/%%DOCLANG%%/articles/filtering-bridges/filtering-bridges_%%DOCLANG_PREFIX%%.pdf
+%%DOCSDIR%%/%%DOCLANG%%/articles/fonts/fonts_%%DOCLANG_PREFIX%%.pdf
+%%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-questions/freebsd-questions_%%DOCLANG_PREFIX%%.pdf
+%%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-releng/freebsd-releng_%%DOCLANG_PREFIX%%.pdf
+%%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-update-server/freebsd-update-server_%%DOCLANG_PREFIX%%.pdf
+%%DOCSDIR%%/%%DOCLANG%%/articles/geom-class/geom-class_%%DOCLANG_PREFIX%%.pdf
+%%DOCSDIR%%/%%DOCLANG%%/articles/gjournal-desktop/gjournal-desktop_%%DOCLANG_PREFIX%%.pdf
+%%DOCSDIR%%/%%DOCLANG%%/articles/hubs/hubs_%%DOCLANG_PREFIX%%.pdf
+%%DOCSDIR%%/%%DOCLANG%%/articles/ipsec-must/ipsec-must_%%DOCLANG_PREFIX%%.pdf
+%%DOCSDIR%%/%%DOCLANG%%/articles/ldap-auth/ldap-auth_%%DOCLANG_PREFIX%%.pdf
+%%DOCSDIR%%/%%DOCLANG%%/articles/leap-seconds/leap-seconds_%%DOCLANG_PREFIX%%.pdf
+%%DOCSDIR%%/%%DOCLANG%%/articles/linux-emulation/linux-emulation_%%DOCLANG_PREFIX%%.pdf
+%%DOCSDIR%%/%%DOCLANG%%/articles/linux-users/linux-users_%%DOCLANG_PREFIX%%.pdf
+%%DOCSDIR%%/%%DOCLANG%%/articles/mailing-list-faq/mailing-list-faq_%%DOCLANG_PREFIX%%.pdf
+%%DOCSDIR%%/%%DOCLANG%%/articles/nanobsd/nanobsd_%%DOCLANG_PREFIX%%.pdf
+%%DOCSDIR%%/%%DOCLANG%%/articles/new-users/new-users_%%DOCLANG_PREFIX%%.pdf
+%%DOCSDIR%%/%%DOCLANG%%/articles/port-mentor-guidelines/port-mentor-guidelines_%%DOCLANG_PREFIX%%.pdf
+%%DOCSDIR%%/%%DOCLANG%%/articles/pr-guidelines/pr-guidelines_%%DOCLANG_PREFIX%%.pdf
+%%DOCSDIR%%/%%DOCLANG%%/articles/problem-reports/problem-reports_%%DOCLANG_PREFIX%%.pdf
+%%DOCSDIR%%/%%DOCLANG%%/articles/rc-scripting/rc-scripting_%%DOCLANG_PREFIX%%.pdf
+%%DOCSDIR%%/%%DOCLANG%%/articles/releng/releng_%%DOCLANG_PREFIX%%.pdf
+%%DOCSDIR%%/%%DOCLANG%%/articles/remote-install/remote-install_%%DOCLANG_PREFIX%%.pdf
+%%DOCSDIR%%/%%DOCLANG%%/articles/serial-uart/serial-uart_%%DOCLANG_PREFIX%%.pdf
+%%DOCSDIR%%/%%DOCLANG%%/articles/solid-state/solid-state_%%DOCLANG_PREFIX%%.pdf
+%%DOCSDIR%%/%%DOCLANG%%/articles/vinum/vinum_%%DOCLANG_PREFIX%%.pdf
+%%DOCSDIR%%/%%DOCLANG%%/articles/vm-design/vm-design_%%DOCLANG_PREFIX%%.pdf
+%%DOCSDIR%%/%%DOCLANG%%/books/dev-model/dev-model_%%DOCLANG_PREFIX%%.pdf
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/faq_%%DOCLANG_PREFIX%%.pdf
+%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/fdp-primer_%%DOCLANG_PREFIX%%.pdf
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/handbook_%%DOCLANG_PREFIX%%.pdf
+%%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/porters-handbook_%%DOCLANG_PREFIX%%.pdf
diff --git a/misc/freebsd-doc-ru/pkg-plist.pdf b/misc/freebsd-doc-ru/pkg-plist.pdf
index 7aaceb0f9eee..c23c81e156f2 100644
--- a/misc/freebsd-doc-ru/pkg-plist.pdf
+++ b/misc/freebsd-doc-ru/pkg-plist.pdf
@@ -1,24 +1,23 @@
-%%DOCSDIR%%/%%DOCLANG%%/articles/committers-guide/article.pdf
-%%DOCSDIR%%/%%DOCLANG%%/articles/contributing/article.pdf
-%%DOCSDIR%%/%%DOCLANG%%/articles/cups/article.pdf
-%%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd/article.pdf
-%%DOCSDIR%%/%%DOCLANG%%/articles/fonts/article.pdf
-%%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-questions/article.pdf
-%%DOCSDIR%%/%%DOCLANG%%/articles/geom-class/article.pdf
-%%DOCSDIR%%/%%DOCLANG%%/articles/gjournal-desktop/article.pdf
-%%DOCSDIR%%/%%DOCLANG%%/articles/hubs/article.pdf
-%%DOCSDIR%%/%%DOCLANG%%/articles/ipsec-must/article.pdf
-%%DOCSDIR%%/%%DOCLANG%%/articles/mailing-list-faq/article.pdf
-%%DOCSDIR%%/%%DOCLANG%%/articles/new-users/article.pdf
-%%DOCSDIR%%/%%DOCLANG%%/articles/pam/article.pdf
-%%DOCSDIR%%/%%DOCLANG%%/articles/pr-guidelines/article.pdf
-%%DOCSDIR%%/%%DOCLANG%%/articles/problem-reports/article.pdf
-%%DOCSDIR%%/%%DOCLANG%%/articles/releng/article.pdf
-%%DOCSDIR%%/%%DOCLANG%%/articles/solid-state/article.pdf
-%%DOCSDIR%%/%%DOCLANG%%/articles/vm-design/article.pdf
-%%DOCSDIR%%/%%DOCLANG%%/books/arch-handbook/book.pdf
-%%DOCSDIR%%/%%DOCLANG%%/books/design-44bsd/book.pdf
-%%DOCSDIR%%/%%DOCLANG%%/books/developers-handbook/book.pdf
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/book.pdf
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/book.pdf
-%%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/book.pdf
+%%DOCSDIR%%/%%DOCLANG%%/articles/committers-guide/committers-guide_ru.pdf
+%%DOCSDIR%%/%%DOCLANG%%/articles/contributing/contributing_ru.pdf
+%%DOCSDIR%%/%%DOCLANG%%/articles/cups/cups_ru.pdf
+%%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd/explaining-bsd_ru.pdf
+%%DOCSDIR%%/%%DOCLANG%%/articles/fonts/fonts_ru.pdf
+%%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-questions/freebsd-questions_ru.pdf
+%%DOCSDIR%%/%%DOCLANG%%/articles/geom-class/geom-class_ru.pdf
+%%DOCSDIR%%/%%DOCLANG%%/articles/gjournal-desktop/gjournal-desktop_ru.pdf
+%%DOCSDIR%%/%%DOCLANG%%/articles/hubs/hubs_ru.pdf
+%%DOCSDIR%%/%%DOCLANG%%/articles/ipsec-must/ipsec-must_ru.pdf
+%%DOCSDIR%%/%%DOCLANG%%/articles/mailing-list-faq/mailing-list-faq_ru.pdf
+%%DOCSDIR%%/%%DOCLANG%%/articles/new-users/new-users_ru.pdf
+%%DOCSDIR%%/%%DOCLANG%%/articles/pr-guidelines/pr-guidelines_ru.pdf
+%%DOCSDIR%%/%%DOCLANG%%/articles/problem-reports/problem-reports_ru.pdf
+%%DOCSDIR%%/%%DOCLANG%%/articles/releng/releng_ru.pdf
+%%DOCSDIR%%/%%DOCLANG%%/articles/solid-state/solid-state_ru.pdf
+%%DOCSDIR%%/%%DOCLANG%%/articles/vm-design/vm-design_ru.pdf
+%%DOCSDIR%%/%%DOCLANG%%/books/arch-handbook/arch-handbook_ru.pdf
+%%DOCSDIR%%/%%DOCLANG%%/books/design-44bsd/design-44bsd_ru.pdf
+%%DOCSDIR%%/%%DOCLANG%%/books/developers-handbook/developers-handbook_ru.pdf
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/faq_ru.pdf
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/handbook_ru.pdf
+%%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/porters-handbook_ru.pdf
diff --git a/misc/freebsd-doc-tr/pkg-plist.pdf b/misc/freebsd-doc-tr/pkg-plist.pdf
index 46b9c6d162d4..a28dc13c6941 100644
--- a/misc/freebsd-doc-tr/pkg-plist.pdf
+++ b/misc/freebsd-doc-tr/pkg-plist.pdf
@@ -1 +1 @@
-%%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd/article.pdf
+%%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd/explaining-bsd_tr.pdf
diff --git a/misc/freebsd-doc-zh_cn/pkg-plist.pdf b/misc/freebsd-doc-zh_cn/pkg-plist.pdf
index e630f7bda375..5d375a197038 100644
--- a/misc/freebsd-doc-zh_cn/pkg-plist.pdf
+++ b/misc/freebsd-doc-zh_cn/pkg-plist.pdf
@@ -1,9 +1,9 @@
-%%DOCSDIR%%/%%DOCLANG%%/articles/contributing/article.pdf
-%%DOCSDIR%%/%%DOCLANG%%/articles/leap-seconds/article.pdf
-%%DOCSDIR%%/%%DOCLANG%%/articles/linux-users/article.pdf
-%%DOCSDIR%%/%%DOCLANG%%/articles/nanobsd/article.pdf
-%%DOCSDIR%%/%%DOCLANG%%/articles/rc-scripting/article.pdf
-%%DOCSDIR%%/%%DOCLANG%%/articles/remote-install/article.pdf
-%%DOCSDIR%%/%%DOCLANG%%/books/arch-handbook/book.pdf
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/book.pdf
-%%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/book.pdf
+%%DOCSDIR%%/%%DOCLANG%%/articles/contributing/contributing_%%DOCLANG_PREFIX%%.pdf
+%%DOCSDIR%%/%%DOCLANG%%/articles/leap-seconds/leap-seconds_%%DOCLANG_PREFIX%%.pdf
+%%DOCSDIR%%/%%DOCLANG%%/articles/linux-users/linux-users_%%DOCLANG_PREFIX%%.pdf
+%%DOCSDIR%%/%%DOCLANG%%/articles/nanobsd/nanobsd_%%DOCLANG_PREFIX%%.pdf
+%%DOCSDIR%%/%%DOCLANG%%/articles/rc-scripting/rc-scripting_%%DOCLANG_PREFIX%%.pdf
+%%DOCSDIR%%/%%DOCLANG%%/articles/remote-install/remote-install_%%DOCLANG_PREFIX%%.pdf
+%%DOCSDIR%%/%%DOCLANG%%/books/arch-handbook/arch-handbook_%%DOCLANG_PREFIX%%.pdf
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/handbook_%%DOCLANG_PREFIX%%.pdf
+%%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/porters-handbook_%%DOCLANG_PREFIX%%.pdf
diff --git a/misc/freebsd-doc-zh_tw/pkg-plist.pdf b/misc/freebsd-doc-zh_tw/pkg-plist.pdf
index 2875045eb22c..faece4b3ee4d 100644
--- a/misc/freebsd-doc-zh_tw/pkg-plist.pdf
+++ b/misc/freebsd-doc-zh_tw/pkg-plist.pdf
@@ -1,13 +1,13 @@
-%%DOCSDIR%%/%%DOCLANG%%/articles/contributing/article.pdf
-%%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-questions/article.pdf
-%%DOCSDIR%%/%%DOCLANG%%/articles/hubs/article.pdf
-%%DOCSDIR%%/%%DOCLANG%%/articles/leap-seconds/article.pdf
-%%DOCSDIR%%/%%DOCLANG%%/articles/mailing-list-faq/article.pdf
-%%DOCSDIR%%/%%DOCLANG%%/articles/nanobsd/article.pdf
-%%DOCSDIR%%/%%DOCLANG%%/articles/pr-guidelines/article.pdf
-%%DOCSDIR%%/%%DOCLANG%%/articles/problem-reports/article.pdf
-%%DOCSDIR%%/%%DOCLANG%%/articles/remote-install/article.pdf
-%%DOCSDIR%%/%%DOCLANG%%/books/developers-handbook/book.pdf
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/book.pdf
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/book.pdf
-%%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/book.pdf
+%%DOCSDIR%%/%%DOCLANG%%/articles/contributing/contributing_%%DOCLANG_PREFIX%%.pdf
+%%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-questions/freebsd-questions_%%DOCLANG_PREFIX%%.pdf
+%%DOCSDIR%%/%%DOCLANG%%/articles/hubs/hubs_%%DOCLANG_PREFIX%%.pdf
+%%DOCSDIR%%/%%DOCLANG%%/articles/leap-seconds/leap-seconds_%%DOCLANG_PREFIX%%.pdf
+%%DOCSDIR%%/%%DOCLANG%%/articles/mailing-list-faq/mailing-list-faq_%%DOCLANG_PREFIX%%.pdf
+%%DOCSDIR%%/%%DOCLANG%%/articles/nanobsd/nanobsd_%%DOCLANG_PREFIX%%.pdf
+%%DOCSDIR%%/%%DOCLANG%%/articles/pr-guidelines/pr-guidelines_%%DOCLANG_PREFIX%%.pdf
+%%DOCSDIR%%/%%DOCLANG%%/articles/problem-reports/problem-reports_%%DOCLANG_PREFIX%%.pdf
+%%DOCSDIR%%/%%DOCLANG%%/articles/remote-install/remote-install_%%DOCLANG_PREFIX%%.pdf
+%%DOCSDIR%%/%%DOCLANG%%/books/developers-handbook/developers-handbook_%%DOCLANG_PREFIX%%.pdf
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/faq_%%DOCLANG_PREFIX%%.pdf
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/handbook_%%DOCLANG_PREFIX%%.pdf
+%%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/porters-handbook_%%DOCLANG_PREFIX%%.pdf