10 files changed, 40 insertions, 43 deletions
diff --git a/misc/freebsd-doc-en/Makefile b/misc/freebsd-doc-en/Makefile
index 5f0f8b8057e2..f8dfbc39f109 100644
--- a/misc/freebsd-doc-en/Makefile
+++ b/misc/freebsd-doc-en/Makefile
@@ -25,8 +25,7 @@
 #
 
 PORTNAME=	freebsd-doc
-PORTVERSION=	41380
-PORTREVISION=	1
+PORTVERSION=	41954
 PORTEPOCH=	1
 CATEGORIES=	misc docs
 MASTER_SITES=	LOCAL/blackend
diff --git a/misc/freebsd-doc-en/distinfo b/misc/freebsd-doc-en/distinfo
index 036072b78fa6..08a88b3def97 100644
--- a/misc/freebsd-doc-en/distinfo
+++ b/misc/freebsd-doc-en/distinfo
@@ -1,2 +1,2 @@
-SHA256 (freebsd-doc-41380.tar.gz) = 663c77c1b6c7e055126e4dd514f20b39e6555df21e899897e195ae1dc9fdd1e5
-SIZE (freebsd-doc-41380.tar.gz) = 32662311
+SHA256 (freebsd-doc-41954.tar.gz) = fd39b3dd247dbfcd4f369addd0538ef6ce68b479ef768ffd029a0e2bdb85172a
+SIZE (freebsd-doc-41954.tar.gz) = 32815534
diff --git a/misc/freebsd-doc-en/pkg-plist.common b/misc/freebsd-doc-en/pkg-plist.common
index 84695297acb2..97fc6cec72d2 100644
--- a/misc/freebsd-doc-en/pkg-plist.common
+++ b/misc/freebsd-doc-en/pkg-plist.common
@@ -70,7 +70,6 @@
 @dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/filtering-bridges
 @dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/fbsd-from-scratch
 @dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/cvsup-advanced
 @dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/cvs-freebsd
 @dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/custom-gcc
 @dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/cups
diff --git a/misc/freebsd-doc-en/pkg-plist.extras b/misc/freebsd-doc-en/pkg-plist.extras
index 25254ef165a8..f22ccb608ce8 100644
--- a/misc/freebsd-doc-en/pkg-plist.extras
+++ b/misc/freebsd-doc-en/pkg-plist.extras
@@ -4,3 +4,5 @@
 %%DOCSDIR%%/%%DOCLANG%%/articles/fbsd-from-scratch/stage_2.conf.default
 %%DOCSDIR%%/%%DOCLANG%%/articles/fbsd-from-scratch/stage_2.sh
 %%DOCSDIR%%/%%DOCLANG%%/articles/fbsd-from-scratch/stage_3.mk
+%%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-update-server/diff.txt
+%%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-update-server/init.txt
diff --git a/misc/freebsd-doc-en/pkg-plist.html b/misc/freebsd-doc-en/pkg-plist.html
index 79b3fbb5d35a..5ff61ad62f0a 100644
--- a/misc/freebsd-doc-en/pkg-plist.html
+++ b/misc/freebsd-doc-en/pkg-plist.html
@@ -11,7 +11,6 @@
 %%DOCSDIR%%/%%DOCLANG%%/articles/cups/article.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/custom-gcc/article.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/cvs-freebsd/article.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/cvsup-advanced/article.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd/article.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/fbsd-from-scratch/article.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/filtering-bridges/article.html
diff --git a/misc/freebsd-doc-en/pkg-plist.html-common b/misc/freebsd-doc-en/pkg-plist.html-common
index 97816acda3e6..6d4852370778 100644
--- a/misc/freebsd-doc-en/pkg-plist.html-common
+++ b/misc/freebsd-doc-en/pkg-plist.html-common
@@ -14,7 +14,6 @@
 %%DOCSDIR%%/%%DOCLANG%%/articles/cups/docbook.css
 %%DOCSDIR%%/%%DOCLANG%%/articles/custom-gcc/docbook.css
 %%DOCSDIR%%/%%DOCLANG%%/articles/cvs-freebsd/docbook.css
-%%DOCSDIR%%/%%DOCLANG%%/articles/cvsup-advanced/docbook.css
 %%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd/docbook.css
 %%DOCSDIR%%/%%DOCLANG%%/articles/fbsd-from-scratch/docbook.css
 %%DOCSDIR%%/%%DOCLANG%%/articles/filtering-bridges/docbook.css
diff --git a/misc/freebsd-doc-en/pkg-plist.html-split b/misc/freebsd-doc-en/pkg-plist.html-split
index 3e4585e8fd28..19e86f184be0 100644
--- a/misc/freebsd-doc-en/pkg-plist.html-split
+++ b/misc/freebsd-doc-en/pkg-plist.html-split
@@ -13,7 +13,7 @@
 %%DOCSDIR%%/%%DOCLANG%%/articles/bsdl-gpl/recommendations.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/bsdl-gpl/trademarks.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/bsdl-gpl/unix-license.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/building-products/b383.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/building-products/bi01.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/building-products/conclusion.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/building-products/freebsd-collaboration.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/building-products/freebsd-intro.html
@@ -30,6 +30,7 @@
 %%DOCSDIR%%/%%DOCLANG%%/articles/committers-guide/coverity.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/committers-guide/developer.relations.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/committers-guide/gnats.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/committers-guide/google-analytics.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/committers-guide/index.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/committers-guide/misc.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/committers-guide/non-committers.html
@@ -98,11 +99,6 @@
 %%DOCSDIR%%/%%DOCLANG%%/articles/cvs-freebsd/freebsdspecific.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/cvs-freebsd/index.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/cvs-freebsd/trademarks.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/cvsup-advanced/examples.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/cvsup-advanced/index.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/cvsup-advanced/introduction.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/cvsup-advanced/script.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/cvsup-advanced/trademarks.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd/comparing-bsd-and-linux.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd/index.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd/trademarks.html
@@ -136,17 +132,17 @@
 %%DOCSDIR%%/%%DOCLANG%%/articles/fonts/type1-fonts-groff.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/fonts/type1-fonts-x11.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/fonts/virtual-console.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-questions/ar01s02.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-questions/ar01s03.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-questions/ar01s04.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-questions/ar01s05.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-questions/ar01s06.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-questions/ar01s07.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-questions/ar01s08.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-questions/index.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-questions/trademarks.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-questions/x115.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-questions/x207.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-questions/x219.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-questions/x39.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-questions/x54.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-questions/x68.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-questions/x93.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-update-server/Configuration.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-update-server/build.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-update-server/configuration.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-update-server/index.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-update-server/introduction.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-update-server/patch.html
@@ -172,12 +168,12 @@
 %%DOCSDIR%%/%%DOCLANG%%/articles/hubs/mirror-statpages.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/hubs/mirror-where.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/hubs/trademarks.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/ipsec-must/IPsec.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/ipsec-must/caveat.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/ipsec-must/code.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/ipsec-must/experiment.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/ipsec-must/index.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/ipsec-must/ipsec-install.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/ipsec-must/ipsec.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/ipsec-must/kernel.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/ipsec-must/solution.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/ipsec-must/trademarks.html
@@ -199,6 +195,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/legalnotice.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/linux-comparison/trademarks.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/linux-emulation/conclusion.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/linux-emulation/freebsd-emulation.html
@@ -224,11 +221,11 @@
 %%DOCSDIR%%/%%DOCLANG%%/articles/mailing-list-faq/etiquette.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/mailing-list-faq/index.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/mailing-list-faq/recurring.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/mh/ar01s02.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/mh/ar01s03.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/mh/ar01s04.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/mh/index.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/mh/trademarks.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/mh/x199.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/mh/x376.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/mh/x56.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/nanobsd/howto.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/nanobsd/index.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/nanobsd/trademarks.html
@@ -244,6 +241,7 @@
 %%DOCSDIR%%/%%DOCLANG%%/articles/new-users/printing-files-from-dos.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/new-users/trademarks.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/new-users/your-working-environment.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/p4-primer/Integrations.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/p4-primer/add-rm-files.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/p4-primer/branches.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/p4-primer/changes.html
@@ -252,7 +250,6 @@
 %%DOCSDIR%%/%%DOCLANG%%/articles/p4-primer/editing.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/p4-primer/freebsd-cvs-and-p4.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/p4-primer/index.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/p4-primer/integrations.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/p4-primer/offline-ops.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/p4-primer/renaming-files.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/p4-primer/soc.html
@@ -262,6 +259,7 @@
 %%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
@@ -272,6 +270,7 @@
 %%DOCSDIR%%/%%DOCLANG%%/articles/pam/pam-sample-conv.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/pam/pam-sample-module.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/pam/pam-terms.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/pam/trademarks.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/port-mentor-guidelines/index.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/portbuild/anatomy.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/portbuild/build-maintenance.html
@@ -318,9 +317,9 @@
 %%DOCSDIR%%/%%DOCLANG%%/articles/rc-scripting/rcng-task.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/rc-scripting/trademarks.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/relaydelay/index.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/releng-packages/ar01s02.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/releng-packages/index.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/releng-packages/trademarks.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/releng-packages/x40.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/releng/ackno.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/releng/distribution.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/releng/extensibility.html
@@ -336,21 +335,23 @@
 %%DOCSDIR%%/%%DOCLANG%%/articles/remote-install/preparation.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/remote-install/trademarks.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/remote-install/zfs.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/serial-uart/ar01s04.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/serial-uart/cy.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/serial-uart/index.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/serial-uart/sio.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/serial-uart/trademarks.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/serial-uart/x1045.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/solid-state/ar01s04.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/solid-state/index.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/solid-state/kernel.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/solid-state/legalnotice.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/solid-state/ro-fs.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/solid-state/strategies.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/solid-state/trademarks.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/solid-state/x94.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/vm-design/allen-briggs-qa.html
 %%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/page-coloring-optimizations.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/vm-design/page-table-optimizations.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/vm-design/prefault-optimizations.html
@@ -363,6 +364,7 @@
 %%DOCSDIR%%/%%DOCLANG%%/articles/wp-toolbox/index.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/wp-toolbox/trademarks.html
 %%DOCSDIR%%/%%DOCLANG%%/books/arch-handbook/appendices.html
+%%DOCSDIR%%/%%DOCLANG%%/books/arch-handbook/bi01.html
 %%DOCSDIR%%/%%DOCLANG%%/books/arch-handbook/boot-bios.html
 %%DOCSDIR%%/%%DOCLANG%%/books/arch-handbook/boot-boot0.html
 %%DOCSDIR%%/%%DOCLANG%%/books/arch-handbook/boot-boot2.html
@@ -395,6 +397,7 @@
 %%DOCSDIR%%/%%DOCLANG%%/books/arch-handbook/kernel-objects-using.html
 %%DOCSDIR%%/%%DOCLANG%%/books/arch-handbook/kernel-objects.html
 %%DOCSDIR%%/%%DOCLANG%%/books/arch-handbook/kernel.html
+%%DOCSDIR%%/%%DOCLANG%%/books/arch-handbook/legalnotice.html
 %%DOCSDIR%%/%%DOCLANG%%/books/arch-handbook/locking-atomic.html
 %%DOCSDIR%%/%%DOCLANG%%/books/arch-handbook/locking-sx.html
 %%DOCSDIR%%/%%DOCLANG%%/books/arch-handbook/locking.html
@@ -425,7 +428,6 @@
 %%DOCSDIR%%/%%DOCLANG%%/books/arch-handbook/scsi-timeout.html
 %%DOCSDIR%%/%%DOCLANG%%/books/arch-handbook/scsi.html
 %%DOCSDIR%%/%%DOCLANG%%/books/arch-handbook/smp-design.html
-%%DOCSDIR%%/%%DOCLANG%%/books/arch-handbook/smp-glossary.html
 %%DOCSDIR%%/%%DOCLANG%%/books/arch-handbook/smp-implementation-notes.html
 %%DOCSDIR%%/%%DOCLANG%%/books/arch-handbook/smp-lock-fundamentals.html
 %%DOCSDIR%%/%%DOCLANG%%/books/arch-handbook/smp-lock-strategies.html
@@ -496,9 +498,10 @@
 %%DOCSDIR%%/%%DOCLANG%%/books/dev-model/tool-pgp.html
 %%DOCSDIR%%/%%DOCLANG%%/books/dev-model/tool-ssh2.html
 %%DOCSDIR%%/%%DOCLANG%%/books/dev-model/tools.html
+%%DOCSDIR%%/%%DOCLANG%%/books/developers-handbook/Basics.html
 %%DOCSDIR%%/%%DOCLANG%%/books/developers-handbook/appendices.html
 %%DOCSDIR%%/%%DOCLANG%%/books/developers-handbook/architectures.html
-%%DOCSDIR%%/%%DOCLANG%%/books/developers-handbook/basics.html
+%%DOCSDIR%%/%%DOCLANG%%/books/developers-handbook/bi01.html
 %%DOCSDIR%%/%%DOCLANG%%/books/developers-handbook/debugging.html
 %%DOCSDIR%%/%%DOCLANG%%/books/developers-handbook/emacs.html
 %%DOCSDIR%%/%%DOCLANG%%/books/developers-handbook/index.html
@@ -550,6 +553,7 @@
 %%DOCSDIR%%/%%DOCLANG%%/books/developers-handbook/tools-programming.html
 %%DOCSDIR%%/%%DOCLANG%%/books/developers-handbook/tools-reading.html
 %%DOCSDIR%%/%%DOCLANG%%/books/developers-handbook/tools.html
+%%DOCSDIR%%/%%DOCLANG%%/books/developers-handbook/trademarks.html
 %%DOCSDIR%%/%%DOCLANG%%/books/developers-handbook/x86-acknowledgements.html
 %%DOCSDIR%%/%%DOCLANG%%/books/developers-handbook/x86-buffered-io.html
 %%DOCSDIR%%/%%DOCLANG%%/books/developers-handbook/x86-caveats.html
@@ -588,6 +592,7 @@
 %%DOCSDIR%%/%%DOCLANG%%/books/faq/security.html
 %%DOCSDIR%%/%%DOCLANG%%/books/faq/serial.html
 %%DOCSDIR%%/%%DOCLANG%%/books/faq/support.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/trademarks.html
 %%DOCSDIR%%/%%DOCLANG%%/books/faq/troubleshoot.html
 %%DOCSDIR%%/%%DOCLANG%%/books/faq/x.html
 %%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/doc-build-makefiles.html
@@ -598,7 +603,6 @@
 %%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/index.html
 %%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/legalnotice.html
 %%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/make-includes.html
-%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/overview-before.html
 %%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/overview-quick-start.html
 %%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/overview.html
 %%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/preface-acknowledgements.html
@@ -614,7 +618,6 @@
 %%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/structure-document.html
 %%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/structure-locale.html
 %%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/structure.html
-%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/stylesheets-css.html
 %%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/stylesheets.html
 %%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/the-website-build.html
 %%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/the-website-env.html
@@ -636,7 +639,9 @@
 %%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/xml-primer-marked-sections.html
 %%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/xml-primer-xml-escape.html
 %%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/xml-primer.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/acpi-debug.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/ACPI-debug.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/SMTP-Auth.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/SMTP-dialup.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/acpi-overview.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/adding-swap-space.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/advanced-networking.html
@@ -822,9 +827,7 @@
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/mail-trouble.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/mail-using.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/mail.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/make-delete-old.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/makeworld.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/mirrors-bittorrent.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/mirrors-ftp.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/mirrors-rsync.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/mirrors.html
@@ -863,6 +866,7 @@
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/permissions.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/pgpkeys-core.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/pgpkeys-developers.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/pgpkeys-other.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/pgpkeys.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/pkgng-intro.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/ports-broken.html
@@ -899,9 +903,6 @@
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/shells.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/slip.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/small-lan.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/smtp-auth.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/smtp-dialup.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/smtp-uucp.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/snapshots.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/sound-mp3.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/sound-setup.html
@@ -912,6 +913,7 @@
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/system-administration.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/tcpwrappers.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/term.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/trademarks.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/tvcard.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/updating-upgrading-documentation.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/updating-upgrading-freebsdupdate.html
@@ -1000,6 +1002,7 @@
 %%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/index.html
 %%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/install.html
 %%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/keeping-up.html
+%%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/legalnotice.html
 %%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/makefile-categories.html
 %%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/makefile-comment.html
 %%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/makefile-depend.html
@@ -1071,7 +1074,6 @@
 %%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/using-mozilla.html
 %%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/using-perl.html
 %%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/using-php.html
-%%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/using-pkg-config.html
 %%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/using-python.html
 %%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/using-qt.html
 %%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/using-ruby.html
diff --git a/misc/freebsd-doc-en/pkg-plist.pdf b/misc/freebsd-doc-en/pkg-plist.pdf
index 371db3027f12..02c8e8dc6fdc 100644
--- a/misc/freebsd-doc-en/pkg-plist.pdf
+++ b/misc/freebsd-doc-en/pkg-plist.pdf
@@ -11,7 +11,6 @@
 %%DOCSDIR%%/%%DOCLANG%%/articles/cups/article.pdf
 %%DOCSDIR%%/%%DOCLANG%%/articles/custom-gcc/article.pdf
 %%DOCSDIR%%/%%DOCLANG%%/articles/cvs-freebsd/article.pdf
-%%DOCSDIR%%/%%DOCLANG%%/articles/cvsup-advanced/article.pdf
 %%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd/article.pdf
 %%DOCSDIR%%/%%DOCLANG%%/articles/fbsd-from-scratch/article.pdf
 %%DOCSDIR%%/%%DOCLANG%%/articles/filtering-bridges/article.pdf
diff --git a/misc/freebsd-doc-en/pkg-plist.ps b/misc/freebsd-doc-en/pkg-plist.ps
index cf11845445e6..e08795a03a60 100644
--- a/misc/freebsd-doc-en/pkg-plist.ps
+++ b/misc/freebsd-doc-en/pkg-plist.ps
@@ -11,7 +11,6 @@
 %%DOCSDIR%%/%%DOCLANG%%/articles/cups/article.ps
 %%DOCSDIR%%/%%DOCLANG%%/articles/custom-gcc/article.ps
 %%DOCSDIR%%/%%DOCLANG%%/articles/cvs-freebsd/article.ps
-%%DOCSDIR%%/%%DOCLANG%%/articles/cvsup-advanced/article.ps
 %%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd/article.ps
 %%DOCSDIR%%/%%DOCLANG%%/articles/fbsd-from-scratch/article.ps
 %%DOCSDIR%%/%%DOCLANG%%/articles/filtering-bridges/article.ps
diff --git a/misc/freebsd-doc-en/pkg-plist.txt b/misc/freebsd-doc-en/pkg-plist.txt
index 7378ae571b84..65cec78af071 100644
--- a/misc/freebsd-doc-en/pkg-plist.txt
+++ b/misc/freebsd-doc-en/pkg-plist.txt
@@ -11,7 +11,6 @@
 %%DOCSDIR%%/%%DOCLANG%%/articles/cups/article.txt
 %%DOCSDIR%%/%%DOCLANG%%/articles/custom-gcc/article.txt
 %%DOCSDIR%%/%%DOCLANG%%/articles/cvs-freebsd/article.txt
-%%DOCSDIR%%/%%DOCLANG%%/articles/cvsup-advanced/article.txt
 %%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd/article.txt
 %%DOCSDIR%%/%%DOCLANG%%/articles/fbsd-from-scratch/article.txt
 %%DOCSDIR%%/%%DOCLANG%%/articles/filtering-bridges/article.txt