9 files changed, 35 insertions, 22 deletions
diff --git a/misc/freebsd-doc-all/Makefile b/misc/freebsd-doc-all/Makefile
index 4e80c395e376..be1650c082c7 100644
--- a/misc/freebsd-doc-all/Makefile
+++ b/misc/freebsd-doc-all/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	freebsd-doc-all
-PORTVERSION=	41954
+PORTVERSION=	42095
 PORTEPOCH=	1
 CATEGORIES=	misc docs
 MASTER_SITES=	#empty
diff --git a/misc/freebsd-doc-el/pkg-plist.html-split b/misc/freebsd-doc-el/pkg-plist.html-split
index 72c76554f84b..99a4ab586dc0 100644
--- a/misc/freebsd-doc-el/pkg-plist.html-split
+++ b/misc/freebsd-doc-el/pkg-plist.html-split
@@ -126,7 +126,7 @@
 %%DOCSDIR%%/%%DOCLANG%%/books/faq/install.html
 %%DOCSDIR%%/%%DOCLANG%%/books/faq/introduction.html
 %%DOCSDIR%%/%%DOCLANG%%/books/faq/kernelconfig.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/ln-idp60507008.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/legalnotice.html
 %%DOCSDIR%%/%%DOCLANG%%/books/faq/misc.html
 %%DOCSDIR%%/%%DOCLANG%%/books/faq/networking.html
 %%DOCSDIR%%/%%DOCLANG%%/books/faq/ppp.html
@@ -292,6 +292,7 @@
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/l10n-compiling.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/l10n.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/lang-setup.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/legalnotice.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/linuxemu-advanced.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/linuxemu-lbc-install.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/linuxemu-maple.html
@@ -299,7 +300,6 @@
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/linuxemu-matlab.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/linuxemu-oracle.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/linuxemu.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/ln-idp60570624.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/mac-biba.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/mac-bsdextended.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/mac-ifoff.html
diff --git a/misc/freebsd-doc-en/Makefile b/misc/freebsd-doc-en/Makefile
index f8dfbc39f109..72f228f6ac0a 100644
--- a/misc/freebsd-doc-en/Makefile
+++ b/misc/freebsd-doc-en/Makefile
@@ -25,7 +25,7 @@
 #
 
 PORTNAME=	freebsd-doc
-PORTVERSION=	41954
+PORTVERSION=	42095
 PORTEPOCH=	1
 CATEGORIES=	misc docs
 MASTER_SITES=	LOCAL/blackend
diff --git a/misc/freebsd-doc-en/distinfo b/misc/freebsd-doc-en/distinfo
index 08a88b3def97..c82dbfb2c645 100644
--- a/misc/freebsd-doc-en/distinfo
+++ b/misc/freebsd-doc-en/distinfo
@@ -1,2 +1,2 @@
-SHA256 (freebsd-doc-41954.tar.gz) = fd39b3dd247dbfcd4f369addd0538ef6ce68b479ef768ffd029a0e2bdb85172a
-SIZE (freebsd-doc-41954.tar.gz) = 32815534
+SHA256 (freebsd-doc-42095.tar.gz) = 96b74cb7b88e9ece31e80680d2ecb6107f4cbc4bc1d41ccf39028ff5f31ed659
+SIZE (freebsd-doc-42095.tar.gz) = 32787926
diff --git a/misc/freebsd-doc-en/pkg-plist.html-split b/misc/freebsd-doc-en/pkg-plist.html-split
index 19e86f184be0..926ddc7ca81b 100644
--- a/misc/freebsd-doc-en/pkg-plist.html-split
+++ b/misc/freebsd-doc-en/pkg-plist.html-split
@@ -259,12 +259,12 @@
 %%DOCSDIR%%/%%DOCLANG%%/articles/p4-primer/trademarks.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/p4-primer/working-with-diffs.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/pam/index.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/pam/ln-idp60672000.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/pam/pam-appl-prog.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/pam/pam-config.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/pam/pam-essentials.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/pam/pam-freebsd-modules.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/pam/pam-further.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/pam/pam-legalnotice.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/pam/pam-module-prog.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/pam/pam-sample-appl.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/pam/pam-sample-conv.html
@@ -351,7 +351,7 @@
 %%DOCSDIR%%/%%DOCLANG%%/articles/vm-design/conclusion.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/vm-design/freeing-pages.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/vm-design/index.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/vm-design/ln-idp60532352.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/vm-design/legalnotice.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/vm-design/page-coloring-optimizations.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/vm-design/page-table-optimizations.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/vm-design/prefault-optimizations.html
@@ -597,6 +597,14 @@
 %%DOCSDIR%%/%%DOCLANG%%/books/faq/x.html
 %%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/doc-build-makefiles.html
 %%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/doc-build.html
+%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/docbook-markup-block-elements.html
+%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/docbook-markup-document-structure.html
+%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/docbook-markup-fpi.html
+%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/docbook-markup-freebsd-extensions.html
+%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/docbook-markup-images.html
+%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/docbook-markup-inline-elements.html
+%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/docbook-markup-links.html
+%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/docbook-markup.html
 %%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/examples-docbook-article.html
 %%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/examples-formatted.html
 %%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/examples.html
@@ -626,10 +634,15 @@
 %%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/tools-optional.html
 %%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/tools.html
 %%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/translations.html
+%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/writing-style-guide.html
+%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/writing-style-guidelines.html
 %%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/writing-style-word-list.html
 %%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/writing-style.html
-%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/xml-markup-docbook.html
-%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/xml-markup.html
+%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/xhtml-markup-block-elements.html
+%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/xhtml-markup-fpi.html
+%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/xhtml-markup-inline-elements.html
+%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/xhtml-markup-sectional-elements.html
+%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/xhtml-markup.html
 %%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/xml-primer-comments.html
 %%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/xml-primer-conclusion.html
 %%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/xml-primer-doctype-declaration.html
@@ -654,7 +667,6 @@
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/audit.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/backup-basics.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/backup-strategies.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/backups-floppybackups.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/backups-tapebackups.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/basics-daemons.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/basics-devices.html
@@ -846,7 +858,7 @@
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/network-ftp.html
 %%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-ldap.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/network-natd.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/network-nfs.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/network-nis.html
@@ -888,13 +900,13 @@
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/printing-using.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/printing.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/quotas.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/raid.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/scanners.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/securing-freebsd.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/security-accounting.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/security-advisories.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/security-intro.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/security-portaudit.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/security-resourcelimits.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/security.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/sendmail.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/serial.html
@@ -921,6 +933,7 @@
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/updating-upgrading.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/usb-disks.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/userppp.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/users-becomesuper.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/users-groups.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/users-introduction.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/users-limiting.html
diff --git a/misc/freebsd-doc-es/pkg-plist.html-split b/misc/freebsd-doc-es/pkg-plist.html-split
index d482d2a6b71f..c90eb4524dd8 100644
--- a/misc/freebsd-doc-es/pkg-plist.html-split
+++ b/misc/freebsd-doc-es/pkg-plist.html-split
@@ -43,7 +43,7 @@
 %%DOCSDIR%%/%%DOCLANG%%/articles/linux-comparison/freebsd-security.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/linux-comparison/freebsd-support.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/linux-comparison/index.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/linux-comparison/ln-idp60511616.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/linux-comparison/legalnotice.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/linux-comparison/trademarks.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/linux-users/commands.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/linux-users/conclusion.html
@@ -108,7 +108,7 @@
 %%DOCSDIR%%/%%DOCLANG%%/books/faq/install.html
 %%DOCSDIR%%/%%DOCLANG%%/books/faq/introduction.html
 %%DOCSDIR%%/%%DOCLANG%%/books/faq/kernelconfig.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/ln-idp61496064.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/legalnotice.html
 %%DOCSDIR%%/%%DOCLANG%%/books/faq/misc.html
 %%DOCSDIR%%/%%DOCLANG%%/books/faq/networking.html
 %%DOCSDIR%%/%%DOCLANG%%/books/faq/ppp.html
@@ -226,6 +226,7 @@
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/l10n-compiling.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/l10n.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/lang-setup.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/legalnotice.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/linuxemu-advanced.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/linuxemu-lbc-install.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/linuxemu-maple.html
@@ -233,7 +234,6 @@
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/linuxemu-matlab.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/linuxemu-oracle.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/linuxemu.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/ln-idp70379264.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/mac-biba.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/mac-ifoff.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/mac-implementing.html
diff --git a/misc/freebsd-doc-fr/pkg-plist.html-split b/misc/freebsd-doc-fr/pkg-plist.html-split
index d00d4fc3cbfd..846073f9b6ce 100644
--- a/misc/freebsd-doc-fr/pkg-plist.html-split
+++ b/misc/freebsd-doc-fr/pkg-plist.html-split
@@ -102,12 +102,12 @@
 %%DOCSDIR%%/%%DOCLANG%%/articles/new-users/index.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/new-users/trademarks.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/pam/index.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/pam/ln-idp61431552.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/pam/pam-appl-prog.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/pam/pam-config.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/pam/pam-essentials.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/pam/pam-freebsd-modules.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/pam/pam-further.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/pam/pam-legalnotice.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/pam/pam-module-prog.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/pam/pam-sample-appl.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/pam/pam-sample-conv.html
@@ -413,7 +413,7 @@
 %%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/ch12s04.html
 %%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/ch12s05.html
 %%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/index.html
-%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/ln-idp61438592.html
+%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/legalnotice.html
 %%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/overview.html
 %%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/pr01.html
 %%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/pr01s02.html
diff --git a/misc/freebsd-doc-it/pkg-plist.html-split b/misc/freebsd-doc-it/pkg-plist.html-split
index 787b9ed387c6..b4df6aa9d9a1 100644
--- a/misc/freebsd-doc-it/pkg-plist.html-split
+++ b/misc/freebsd-doc-it/pkg-plist.html-split
@@ -42,7 +42,7 @@
 %%DOCSDIR%%/%%DOCLANG%%/articles/vm-design/conclusion.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/vm-design/freeing-pages.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/vm-design/index.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/vm-design/ln-idp70850304.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/vm-design/legalnotice.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/vm-design/page-coloring-optimizations.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/vm-design/page-table-optimizations.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/vm-design/prefault-optimizations.html
@@ -349,7 +349,7 @@
 %%DOCSDIR%%/%%DOCLANG%%/books/unix-introduction/go01.html
 %%DOCSDIR%%/%%DOCLANG%%/books/unix-introduction/history.html
 %%DOCSDIR%%/%%DOCLANG%%/books/unix-introduction/index.html
-%%DOCSDIR%%/%%DOCLANG%%/books/unix-introduction/ln-idp60487168.html
+%%DOCSDIR%%/%%DOCLANG%%/books/unix-introduction/legalnotice.html
 %%DOCSDIR%%/%%DOCLANG%%/books/unix-introduction/preface.html
 %%DOCSDIR%%/%%DOCLANG%%/books/unix-introduction/shell-programming-control-comm.html
 %%DOCSDIR%%/%%DOCLANG%%/books/unix-introduction/shell-programming-functions.html
diff --git a/misc/freebsd-doc-ru/pkg-plist.html-split b/misc/freebsd-doc-ru/pkg-plist.html-split
index 5c074833d611..afb9ce81d792 100644
--- a/misc/freebsd-doc-ru/pkg-plist.html-split
+++ b/misc/freebsd-doc-ru/pkg-plist.html-split
@@ -145,12 +145,12 @@
 %%DOCSDIR%%/%%DOCLANG%%/articles/new-users/trademarks.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/new-users/your-working-environment.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/pam/index.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/pam/ln-idp60522240.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/pam/pam-appl-prog.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/pam/pam-config.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/pam/pam-essentials.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/pam/pam-freebsd-modules.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/pam/pam-further.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/pam/pam-legalnotice.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/pam/pam-module-prog.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/pam/pam-sample-appl.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/pam/pam-sample-conv.html
@@ -207,7 +207,7 @@
 %%DOCSDIR%%/%%DOCLANG%%/articles/vm-design/conclusion.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/vm-design/freeing-pages.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/vm-design/index.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/vm-design/ln-idp60513280.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/vm-design/legalnotice.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/vm-design/page-coloring-optimizations.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/vm-design/pre-table-optimizations.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/vm-design/prefault-optimizations.html