aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorblackend <blackend@FreeBSD.org>2013-06-27 03:24:14 +0800
committerblackend <blackend@FreeBSD.org>2013-06-27 03:24:14 +0800
commit644dbcfe5daad1f5a1452230c04d3c2af620d9cc (patch)
treeb30b23ba52f8bb878c020de9b01569dda5851b12
parent39f7f162bd0f43891a0afcceee1feb713f9fdb05 (diff)
downloadfreebsd-ports-gnome-644dbcfe5daad1f5a1452230c04d3c2af620d9cc.tar.gz
freebsd-ports-gnome-644dbcfe5daad1f5a1452230c04d3c2af620d9cc.tar.zst
freebsd-ports-gnome-644dbcfe5daad1f5a1452230c04d3c2af620d9cc.zip
Update to r41954 of the FreeBSD docset.
Approved by: doceng (implicit)
-rw-r--r--misc/freebsd-doc-all/Makefile2
-rw-r--r--misc/freebsd-doc-bn/pkg-plist.html-split26
-rw-r--r--misc/freebsd-doc-da/pkg-plist.html-split2
-rw-r--r--misc/freebsd-doc-de/pkg-plist.common3
-rw-r--r--misc/freebsd-doc-de/pkg-plist.extras2
-rw-r--r--misc/freebsd-doc-de/pkg-plist.html1
-rw-r--r--misc/freebsd-doc-de/pkg-plist.html-common6
-rw-r--r--misc/freebsd-doc-de/pkg-plist.html-split61
-rw-r--r--misc/freebsd-doc-de/pkg-plist.pdf1
-rw-r--r--misc/freebsd-doc-de/pkg-plist.ps1
-rw-r--r--misc/freebsd-doc-de/pkg-plist.txt3
-rw-r--r--misc/freebsd-doc-el/pkg-plist.html-split48
-rw-r--r--misc/freebsd-doc-en/Makefile3
-rw-r--r--misc/freebsd-doc-en/distinfo4
-rw-r--r--misc/freebsd-doc-en/pkg-plist.common1
-rw-r--r--misc/freebsd-doc-en/pkg-plist.extras2
-rw-r--r--misc/freebsd-doc-en/pkg-plist.html1
-rw-r--r--misc/freebsd-doc-en/pkg-plist.html-common1
-rw-r--r--misc/freebsd-doc-en/pkg-plist.html-split68
-rw-r--r--misc/freebsd-doc-en/pkg-plist.pdf1
-rw-r--r--misc/freebsd-doc-en/pkg-plist.ps1
-rw-r--r--misc/freebsd-doc-en/pkg-plist.txt1
-rw-r--r--misc/freebsd-doc-es/pkg-plist.html-split76
-rw-r--r--misc/freebsd-doc-fr/pkg-plist.common1
-rw-r--r--misc/freebsd-doc-fr/pkg-plist.html1
-rw-r--r--misc/freebsd-doc-fr/pkg-plist.html-common1
-rw-r--r--misc/freebsd-doc-fr/pkg-plist.html-split564
-rw-r--r--misc/freebsd-doc-fr/pkg-plist.pdf1
-rw-r--r--misc/freebsd-doc-fr/pkg-plist.ps1
-rw-r--r--misc/freebsd-doc-fr/pkg-plist.txt1
-rw-r--r--misc/freebsd-doc-hu/pkg-plist.html-split23
-rw-r--r--misc/freebsd-doc-it/pkg-plist.html-split46
-rw-r--r--misc/freebsd-doc-ja/pkg-plist.html-split23
-rw-r--r--misc/freebsd-doc-nl/pkg-plist.html-split23
-rw-r--r--misc/freebsd-doc-pl/pkg-plist.html-split39
-rw-r--r--misc/freebsd-doc-pt/pkg-plist.extras2
-rw-r--r--misc/freebsd-doc-pt/pkg-plist.html-split20
-rw-r--r--misc/freebsd-doc-ru/pkg-plist.common1
-rw-r--r--misc/freebsd-doc-ru/pkg-plist.html1
-rw-r--r--misc/freebsd-doc-ru/pkg-plist.html-common1
-rw-r--r--misc/freebsd-doc-ru/pkg-plist.html-split61
-rw-r--r--misc/freebsd-doc-ru/pkg-plist.txt1
-rw-r--r--misc/freebsd-doc-tr/pkg-plist.html-split6
-rw-r--r--misc/freebsd-doc-zh_cn/pkg-plist.html-split25
-rw-r--r--misc/freebsd-doc-zh_tw/pkg-plist.common1
-rw-r--r--misc/freebsd-doc-zh_tw/pkg-plist.html1
-rw-r--r--misc/freebsd-doc-zh_tw/pkg-plist.html-common1
-rw-r--r--misc/freebsd-doc-zh_tw/pkg-plist.html-split69
-rw-r--r--misc/freebsd-doc-zh_tw/pkg-plist.pdf1
-rw-r--r--misc/freebsd-doc-zh_tw/pkg-plist.ps1
-rw-r--r--misc/freebsd-doc-zh_tw/pkg-plist.txt1
51 files changed, 618 insertions, 614 deletions
diff --git a/misc/freebsd-doc-all/Makefile b/misc/freebsd-doc-all/Makefile
index cc4b76be5980..4e80c395e376 100644
--- a/misc/freebsd-doc-all/Makefile
+++ b/misc/freebsd-doc-all/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= freebsd-doc-all
-PORTVERSION= 41380
+PORTVERSION= 41954
PORTEPOCH= 1
CATEGORIES= misc docs
MASTER_SITES= #empty
diff --git a/misc/freebsd-doc-bn/pkg-plist.html-split b/misc/freebsd-doc-bn/pkg-plist.html-split
index 157a8c28f5cb..25212da23e14 100644
--- a/misc/freebsd-doc-bn/pkg-plist.html-split
+++ b/misc/freebsd-doc-bn/pkg-plist.html-split
@@ -1,16 +1,16 @@
@comment $FreeBSD$
+%%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd/ar01s02.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd/ar01s03.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd/ar01s04.html
%%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd/index.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd/x117.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd/x67.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd/x94.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/new-users/ar01s02.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/new-users/ar01s03.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/new-users/ar01s04.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/new-users/ar01s05.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/new-users/ar01s06.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/new-users/ar01s07.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/new-users/ar01s08.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/new-users/ar01s09.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/new-users/ar01s10.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/new-users/ar01s11.html
%%DOCSDIR%%/%%DOCLANG%%/articles/new-users/index.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/new-users/x119.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/new-users/x195.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/new-users/x299.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/new-users/x452.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/new-users/x517.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/new-users/x584.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/new-users/x677.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/new-users/x744.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/new-users/x765.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/new-users/x77.html
diff --git a/misc/freebsd-doc-da/pkg-plist.html-split b/misc/freebsd-doc-da/pkg-plist.html-split
index 6a66b57cfdec..1db6d54d013c 100644
--- a/misc/freebsd-doc-da/pkg-plist.html-split
+++ b/misc/freebsd-doc-da/pkg-plist.html-split
@@ -1,10 +1,10 @@
@comment $FreeBSD$
+%%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
diff --git a/misc/freebsd-doc-de/pkg-plist.common b/misc/freebsd-doc-de/pkg-plist.common
index 5265c63a6b68..bfb5e8a492cf 100644
--- a/misc/freebsd-doc-de/pkg-plist.common
+++ b/misc/freebsd-doc-de/pkg-plist.common
@@ -28,6 +28,9 @@
@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/nanobsd
@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/linux-comparison
@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/laptop
+@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-update-server/imagelib/callouts
+@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-update-server/imagelib
+@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-update-server
@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd
@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/contributing-ports
@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/contributing
diff --git a/misc/freebsd-doc-de/pkg-plist.extras b/misc/freebsd-doc-de/pkg-plist.extras
index 8fb5cc4556d5..177a23efbeb5 100644
--- a/misc/freebsd-doc-de/pkg-plist.extras
+++ b/misc/freebsd-doc-de/pkg-plist.extras
@@ -1 +1,3 @@
@comment $FreeBSD$
+%%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-update-server/diff.txt
+%%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-update-server/init.txt
diff --git a/misc/freebsd-doc-de/pkg-plist.html b/misc/freebsd-doc-de/pkg-plist.html
index b329ae695a7b..bc7327959c6a 100644
--- a/misc/freebsd-doc-de/pkg-plist.html
+++ b/misc/freebsd-doc-de/pkg-plist.html
@@ -2,6 +2,7 @@
%%DOCSDIR%%/%%DOCLANG%%/articles/contributing-ports/article.html
%%DOCSDIR%%/%%DOCLANG%%/articles/contributing/article.html
%%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd/article.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-update-server/article.html
%%DOCSDIR%%/%%DOCLANG%%/articles/laptop/article.html
%%DOCSDIR%%/%%DOCLANG%%/articles/linux-comparison/article.html
%%DOCSDIR%%/%%DOCLANG%%/articles/nanobsd/article.html
diff --git a/misc/freebsd-doc-de/pkg-plist.html-common b/misc/freebsd-doc-de/pkg-plist.html-common
index 8107cb9fc4cc..eff48c99bfcf 100644
--- a/misc/freebsd-doc-de/pkg-plist.html-common
+++ b/misc/freebsd-doc-de/pkg-plist.html-common
@@ -2,6 +2,12 @@
%%DOCSDIR%%/%%DOCLANG%%/articles/contributing-ports/docbook.css
%%DOCSDIR%%/%%DOCLANG%%/articles/contributing/docbook.css
%%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd/docbook.css
+%%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-update-server/docbook.css
+%%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-update-server/imagelib/callouts/1.png
+%%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-update-server/imagelib/callouts/2.png
+%%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-update-server/imagelib/callouts/3.png
+%%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-update-server/imagelib/callouts/4.png
+%%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-update-server/imagelib/callouts/5.png
%%DOCSDIR%%/%%DOCLANG%%/articles/laptop/docbook.css
%%DOCSDIR%%/%%DOCLANG%%/articles/linux-comparison/docbook.css
%%DOCSDIR%%/%%DOCLANG%%/articles/nanobsd/docbook.css
diff --git a/misc/freebsd-doc-de/pkg-plist.html-split b/misc/freebsd-doc-de/pkg-plist.html-split
index 1563c4f6a310..7bc134285492 100644
--- a/misc/freebsd-doc-de/pkg-plist.html-split
+++ b/misc/freebsd-doc-de/pkg-plist.html-split
@@ -16,6 +16,14 @@
%%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd/trademarks.html
%%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd/what-a-real-unix.html
%%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd/why-is-bsd-not-better-known.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-update-server/Configuration.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-update-server/build.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
+%%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-update-server/prerequisites.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-update-server/tips.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-update-server/trademarks.html
%%DOCSDIR%%/%%DOCLANG%%/articles/laptop/index.html
%%DOCSDIR%%/%%DOCLANG%%/articles/laptop/modems.html
%%DOCSDIR%%/%%DOCLANG%%/articles/laptop/pcmcia.html
@@ -27,6 +35,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/nanobsd/howto.html
%%DOCSDIR%%/%%DOCLANG%%/articles/nanobsd/index.html
@@ -44,15 +53,17 @@
%%DOCSDIR%%/%%DOCLANG%%/articles/new-users/trademarks.html
%%DOCSDIR%%/%%DOCLANG%%/articles/new-users/your-working-environment.html
%%DOCSDIR%%/%%DOCLANG%%/articles/port-mentor-guidelines/index.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/x96.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
@@ -96,6 +107,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
@@ -138,6 +150,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
@@ -159,19 +172,8 @@
%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/see-also-docbook.html
%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/see-also-html.html
%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/see-also-linuxdoc.html
-%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/see-also-sgml.html
+%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/see-also-xml.html
%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/see-also.html
-%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/sgml-markup-docbook.html
-%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/sgml-markup.html
-%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/sgml-primer-comments.html
-%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/sgml-primer-conclusion.html
-%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/sgml-primer-doctype-declaration.html
-%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/sgml-primer-elements.html
-%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/sgml-primer-entities.html
-%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/sgml-primer-include.html
-%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/sgml-primer-marked-sections.html
-%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/sgml-primer-sgml-escape.html
-%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/sgml-primer.html
%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/structure-document.html
%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/structure-locale.html
%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/structure.html
@@ -186,7 +188,25 @@
%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/translations.html
%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/writing-style-word-list.html
%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/writing-style.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/acpi-debug.html
+%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/xml-markup-docbook.html
+%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/xml-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
+%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/xml-primer-elements.html
+%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/xml-primer-entities.html
+%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/xml-primer-include.html
+%%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/GEOM-intro.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/GEOM-mirror.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/GEOM-striping.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/GEOM.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/SMTP-Auth.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/SMTP-UUCP.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
@@ -297,10 +317,6 @@
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/geom-ggate.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/geom-gjournal.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/geom-glabel.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/geom-intro.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/geom-mirror.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/geom-striping.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/geom.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/getting-started.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/history.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/index.html
@@ -447,9 +463,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
@@ -458,6 +471,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
@@ -498,6 +512,7 @@
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/x11.html
%%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/build-cluster.html
%%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/building.html
+%%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/ch06s25.html
%%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/conflicts.html
%%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/cvsweb.html
%%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/dads-after-port-mk.html
@@ -519,6 +534,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
@@ -597,4 +613,3 @@
%%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/using-x11.html
%%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/using-xfce.html
%%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/why-port.html
-%%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/x5594.html
diff --git a/misc/freebsd-doc-de/pkg-plist.pdf b/misc/freebsd-doc-de/pkg-plist.pdf
index 834a40435956..2a21d76ceedf 100644
--- a/misc/freebsd-doc-de/pkg-plist.pdf
+++ b/misc/freebsd-doc-de/pkg-plist.pdf
@@ -2,6 +2,7 @@
%%DOCSDIR%%/%%DOCLANG%%/articles/contributing-ports/article.pdf
%%DOCSDIR%%/%%DOCLANG%%/articles/contributing/article.pdf
%%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd/article.pdf
+%%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-update-server/article.pdf
%%DOCSDIR%%/%%DOCLANG%%/articles/laptop/article.pdf
%%DOCSDIR%%/%%DOCLANG%%/articles/linux-comparison/article.pdf
%%DOCSDIR%%/%%DOCLANG%%/articles/nanobsd/article.pdf
diff --git a/misc/freebsd-doc-de/pkg-plist.ps b/misc/freebsd-doc-de/pkg-plist.ps
index 1ae453228594..65ceeed5f3ca 100644
--- a/misc/freebsd-doc-de/pkg-plist.ps
+++ b/misc/freebsd-doc-de/pkg-plist.ps
@@ -2,6 +2,7 @@
%%DOCSDIR%%/%%DOCLANG%%/articles/contributing-ports/article.ps
%%DOCSDIR%%/%%DOCLANG%%/articles/contributing/article.ps
%%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd/article.ps
+%%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-update-server/article.ps
%%DOCSDIR%%/%%DOCLANG%%/articles/laptop/article.ps
%%DOCSDIR%%/%%DOCLANG%%/articles/linux-comparison/article.ps
%%DOCSDIR%%/%%DOCLANG%%/articles/nanobsd/article.ps
diff --git a/misc/freebsd-doc-de/pkg-plist.txt b/misc/freebsd-doc-de/pkg-plist.txt
index 60945b3b5f48..f1cb60534507 100644
--- a/misc/freebsd-doc-de/pkg-plist.txt
+++ b/misc/freebsd-doc-de/pkg-plist.txt
@@ -2,6 +2,9 @@
%%DOCSDIR%%/%%DOCLANG%%/articles/contributing-ports/article.txt
%%DOCSDIR%%/%%DOCLANG%%/articles/contributing/article.txt
%%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd/article.txt
+%%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-update-server/article.txt
+%%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-update-server/diff.txt
+%%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-update-server/init.txt
%%DOCSDIR%%/%%DOCLANG%%/articles/laptop/article.txt
%%DOCSDIR%%/%%DOCLANG%%/articles/linux-comparison/article.txt
%%DOCSDIR%%/%%DOCLANG%%/articles/nanobsd/article.txt
diff --git a/misc/freebsd-doc-el/pkg-plist.html-split b/misc/freebsd-doc-el/pkg-plist.html-split
index 04efa986752a..72c76554f84b 100644
--- a/misc/freebsd-doc-el/pkg-plist.html-split
+++ b/misc/freebsd-doc-el/pkg-plist.html-split
@@ -26,20 +26,20 @@
%%DOCSDIR%%/%%DOCLANG%%/articles/cvs-freebsd/freebsdspecific.html
%%DOCSDIR%%/%%DOCLANG%%/articles/cvs-freebsd/index.html
%%DOCSDIR%%/%%DOCLANG%%/articles/cvs-freebsd/trademarks.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd/ar01s02.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd/ar01s03.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd/ar01s04.html
%%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd/index.html
%%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd/trademarks.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd/x123.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd/x64.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd/x98.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/x114.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-questions/x205.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-questions/x217.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-questions/x39.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-questions/x53.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-questions/x67.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-questions/x92.html
%%DOCSDIR%%/%%DOCLANG%%/articles/gjournal-desktop/configure-journal.html
%%DOCSDIR%%/%%DOCLANG%%/articles/gjournal-desktop/further-reading.html
%%DOCSDIR%%/%%DOCLANG%%/articles/gjournal-desktop/index.html
@@ -96,8 +96,8 @@
%%DOCSDIR%%/%%DOCLANG%%/articles/problem-reports/pr-when.html
%%DOCSDIR%%/%%DOCLANG%%/articles/problem-reports/pr-writing.html
%%DOCSDIR%%/%%DOCLANG%%/articles/problem-reports/trademarks.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/releng-packages/ar01s02.html
%%DOCSDIR%%/%%DOCLANG%%/articles/releng-packages/index.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/releng-packages/x30.html
%%DOCSDIR%%/%%DOCLANG%%/articles/releng/ackno.html
%%DOCSDIR%%/%%DOCLANG%%/articles/releng/biblio.html
%%DOCSDIR%%/%%DOCLANG%%/articles/releng/distribution.html
@@ -126,16 +126,25 @@
%%DOCSDIR%%/%%DOCLANG%%/books/faq/install.html
%%DOCSDIR%%/%%DOCLANG%%/books/faq/introduction.html
%%DOCSDIR%%/%%DOCLANG%%/books/faq/kernelconfig.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/ln23.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ln-idp60507008.html
%%DOCSDIR%%/%%DOCLANG%%/books/faq/misc.html
%%DOCSDIR%%/%%DOCLANG%%/books/faq/networking.html
%%DOCSDIR%%/%%DOCLANG%%/books/faq/ppp.html
%%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/handbook/acpi-debug.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/ACPI-debug.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/GEOM-intro.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/GEOM-mirror.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/GEOM-raid3.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/GEOM-striping.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/GEOM.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/SMTP-Auth.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/SMTP-UUCP.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
@@ -246,11 +255,6 @@
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/geom-ggate.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/geom-gjournal.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/geom-glabel.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/geom-intro.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/geom-mirror.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/geom-raid3.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/geom-striping.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/geom.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/getting-started.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/handbook.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/history.html
@@ -276,7 +280,7 @@
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/jails-tuning.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/jails.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/kerberos5.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/kerberosiv.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/kerberosIV.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/kernelconfig-building.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/kernelconfig-config.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/kernelconfig-custom-kernel.html
@@ -295,7 +299,7 @@
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/linuxemu-matlab.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/linuxemu-oracle.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/linuxemu.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/ln27.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
@@ -395,9 +399,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
@@ -406,6 +407,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
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
diff --git a/misc/freebsd-doc-es/pkg-plist.html-split b/misc/freebsd-doc-es/pkg-plist.html-split
index 8864ab1506e9..d482d2a6b71f 100644
--- a/misc/freebsd-doc-es/pkg-plist.html-split
+++ b/misc/freebsd-doc-es/pkg-plist.html-split
@@ -6,14 +6,14 @@
%%DOCSDIR%%/%%DOCLANG%%/articles/casestudy-argentina.com/trademarks.html
%%DOCSDIR%%/%%DOCLANG%%/articles/contributing/contrib-how.html
%%DOCSDIR%%/%%DOCLANG%%/articles/contributing/index.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/cvs-freebsd/ar01s02.html
%%DOCSDIR%%/%%DOCLANG%%/articles/cvs-freebsd/freebsdspecific.html
%%DOCSDIR%%/%%DOCLANG%%/articles/cvs-freebsd/index.html
%%DOCSDIR%%/%%DOCLANG%%/articles/cvs-freebsd/trademarks.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/cvs-freebsd/x41.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd/ar01s02.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd/ar01s03.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd/ar01s04.html
%%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd/index.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd/x100.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd/x53.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd/x78.html
%%DOCSDIR%%/%%DOCLANG%%/articles/fbsd-from-scratch/index.html
%%DOCSDIR%%/%%DOCLANG%%/articles/fbsd-from-scratch/limitations.html
%%DOCSDIR%%/%%DOCLANG%%/articles/fbsd-from-scratch/prerequisites.html
@@ -21,21 +21,21 @@
%%DOCSDIR%%/%%DOCLANG%%/articles/fbsd-from-scratch/stage2.html
%%DOCSDIR%%/%%DOCLANG%%/articles/fbsd-from-scratch/stage3.html
%%DOCSDIR%%/%%DOCLANG%%/articles/fbsd-from-scratch/why.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/fdp-es/ar01s02.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/fdp-es/ar01s03.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/fdp-es/ar01s04.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/fdp-es/ar01s06.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/fdp-es/ar01s07.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/fdp-es/ar01s08.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/fdp-es/ar01s09.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/fdp-es/ar01s11.html
%%DOCSDIR%%/%%DOCLANG%%/articles/fdp-es/index.html
%%DOCSDIR%%/%%DOCLANG%%/articles/fdp-es/sintaxis.html
%%DOCSDIR%%/%%DOCLANG%%/articles/fdp-es/voluntarios-fdp-es.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/fdp-es/x185.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/fdp-es/x188.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/fdp-es/x192.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/fdp-es/x206.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/fdp-es/x245.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/fdp-es/x28.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/fdp-es/x43.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/fdp-es/x93.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/laptop/ar01s02.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/laptop/ar01s03.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/laptop/ar01s04.html
%%DOCSDIR%%/%%DOCLANG%%/articles/laptop/index.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/laptop/x39.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/laptop/x44.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/laptop/x71.html
%%DOCSDIR%%/%%DOCLANG%%/articles/linux-comparison/freebsd-addenda.html
%%DOCSDIR%%/%%DOCLANG%%/articles/linux-comparison/freebsd-advantages.html
%%DOCSDIR%%/%%DOCLANG%%/articles/linux-comparison/freebsd-conclusion.html
@@ -43,6 +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/trademarks.html
%%DOCSDIR%%/%%DOCLANG%%/articles/linux-users/commands.html
%%DOCSDIR%%/%%DOCLANG%%/articles/linux-users/conclusion.html
@@ -63,6 +64,7 @@
%%DOCSDIR%%/%%DOCLANG%%/articles/nanobsd/howto.html
%%DOCSDIR%%/%%DOCLANG%%/articles/nanobsd/index.html
%%DOCSDIR%%/%%DOCLANG%%/articles/nanobsd/trademarks.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
@@ -71,7 +73,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
@@ -107,13 +108,21 @@
%%DOCSDIR%%/%%DOCLANG%%/books/faq/install.html
%%DOCSDIR%%/%%DOCLANG%%/books/faq/introduction.html
%%DOCSDIR%%/%%DOCLANG%%/books/faq/kernelconfig.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/ln18.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ln-idp61496064.html
%%DOCSDIR%%/%%DOCLANG%%/books/faq/misc.html
%%DOCSDIR%%/%%DOCLANG%%/books/faq/networking.html
%%DOCSDIR%%/%%DOCLANG%%/books/faq/ppp.html
%%DOCSDIR%%/%%DOCLANG%%/books/faq/serial.html
%%DOCSDIR%%/%%DOCLANG%%/books/faq/troubleshoot.html
%%DOCSDIR%%/%%DOCLANG%%/books/faq/x.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/GEOM-intro.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/GEOM-mirror.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/GEOM-striping.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/GEOM.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/MAC-examplehttpd.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/SMTP-Auth.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/SMTP-UUCP.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/SMTP-dialup.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/adding-swap-space.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/advanced-networking.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/appendices.html
@@ -135,6 +144,16 @@
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/boot-kernel.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/boot-shutdown.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/boot.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/ch08s02.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/ch31s02.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/ch31s03.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/ch31s04.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/ch31s05.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/ch31s06.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/ch31s07.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/ch31s08.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/ch31s09.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/ch32s02.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/colophon.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/common-tasks.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/config-tuning.html
@@ -171,10 +190,6 @@
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/firewalls.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/floppies.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/fs-acl.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/geom-intro.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/geom-mirror.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/geom-striping.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/geom.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/getting-started.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/handbook.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/history.html
@@ -200,7 +215,7 @@
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/jails-tuning.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/jails.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/kerberos5.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/kerberosiv.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/kerberosIV.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/kernelconfig-building.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/kernelconfig-config.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/kernelconfig-devices.html
@@ -218,9 +233,8 @@
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/linuxemu-matlab.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/linuxemu-oracle.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/linuxemu.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/ln25.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/ln-idp70379264.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/mac-biba.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/mac-examplehttpd.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/mac-ifoff.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/mac-implementing.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/mac-initial.html
@@ -306,9 +320,6 @@
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/shells.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/slip.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/small-lans.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/soft-updates.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/sound-mp3.html
@@ -317,6 +328,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/usb-disks.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/userppp.html
@@ -349,13 +361,3 @@
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/x-xdm.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/x11-wm.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/x11.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/x30948.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/x30972.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/x31001.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/x31034.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/x31067.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/x31079.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/x31103.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/x31139.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/x32046.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/x9095.html
diff --git a/misc/freebsd-doc-fr/pkg-plist.common b/misc/freebsd-doc-fr/pkg-plist.common
index 3d1f422f394b..94edc563556d 100644
--- a/misc/freebsd-doc-fr/pkg-plist.common
+++ b/misc/freebsd-doc-fr/pkg-plist.common
@@ -27,7 +27,6 @@
@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/fonts
@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/filtering-bridges
@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/cvsup-advanced
@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/contributors
@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/contributing-ports
@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/contributing
diff --git a/misc/freebsd-doc-fr/pkg-plist.html b/misc/freebsd-doc-fr/pkg-plist.html
index 63d9884d113d..7b3b80cb151c 100644
--- a/misc/freebsd-doc-fr/pkg-plist.html
+++ b/misc/freebsd-doc-fr/pkg-plist.html
@@ -4,7 +4,6 @@
%%DOCSDIR%%/%%DOCLANG%%/articles/contributing-ports/article.html
%%DOCSDIR%%/%%DOCLANG%%/articles/contributing/article.html
%%DOCSDIR%%/%%DOCLANG%%/articles/contributors/article.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/cvsup-advanced/article.html
%%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd/article.html
%%DOCSDIR%%/%%DOCLANG%%/articles/filtering-bridges/article.html
%%DOCSDIR%%/%%DOCLANG%%/articles/fonts/article.html
diff --git a/misc/freebsd-doc-fr/pkg-plist.html-common b/misc/freebsd-doc-fr/pkg-plist.html-common
index 25b660c8a4d0..a837e111f818 100644
--- a/misc/freebsd-doc-fr/pkg-plist.html-common
+++ b/misc/freebsd-doc-fr/pkg-plist.html-common
@@ -6,7 +6,6 @@
%%DOCSDIR%%/%%DOCLANG%%/articles/contributing-ports/docbook.css
%%DOCSDIR%%/%%DOCLANG%%/articles/contributing/docbook.css
%%DOCSDIR%%/%%DOCLANG%%/articles/contributors/docbook.css
-%%DOCSDIR%%/%%DOCLANG%%/articles/cvsup-advanced/docbook.css
%%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd/docbook.css
%%DOCSDIR%%/%%DOCLANG%%/articles/filtering-bridges/docbook.css
%%DOCSDIR%%/%%DOCLANG%%/articles/fonts/docbook.css
diff --git a/misc/freebsd-doc-fr/pkg-plist.html-split b/misc/freebsd-doc-fr/pkg-plist.html-split
index 1e6c7d3524b3..d00d4fc3cbfd 100644
--- a/misc/freebsd-doc-fr/pkg-plist.html-split
+++ b/misc/freebsd-doc-fr/pkg-plist.html-split
@@ -1,10 +1,12 @@
@comment $FreeBSD$
-%%DOCSDIR%%/%%DOCLANG%%/articles/building-products/b393.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
%%DOCSDIR%%/%%DOCLANG%%/articles/building-products/index.html
%%DOCSDIR%%/%%DOCLANG%%/articles/building-products/trademarks.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/committers-guide/ar01s08.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/committers-guide/ar01s09.html
%%DOCSDIR%%/%%DOCLANG%%/articles/committers-guide/conventions.html
%%DOCSDIR%%/%%DOCLANG%%/articles/committers-guide/cvs.operations.html
%%DOCSDIR%%/%%DOCLANG%%/articles/committers-guide/developer.relations.html
@@ -12,8 +14,6 @@
%%DOCSDIR%%/%%DOCLANG%%/articles/committers-guide/index.html
%%DOCSDIR%%/%%DOCLANG%%/articles/committers-guide/people.html
%%DOCSDIR%%/%%DOCLANG%%/articles/committers-guide/ssh.guide.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/committers-guide/x302.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/committers-guide/x434.html
%%DOCSDIR%%/%%DOCLANG%%/articles/contributing-ports/adopt-port.html
%%DOCSDIR%%/%%DOCLANG%%/articles/contributing-ports/create-port.html
%%DOCSDIR%%/%%DOCLANG%%/articles/contributing-ports/fix-broken.html
@@ -36,11 +36,6 @@
%%DOCSDIR%%/%%DOCLANG%%/articles/contributors/staff-core.html
%%DOCSDIR%%/%%DOCLANG%%/articles/contributors/staff-doc.html
%%DOCSDIR%%/%%DOCLANG%%/articles/contributors/staff-who.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
@@ -53,29 +48,29 @@
%%DOCSDIR%%/%%DOCLANG%%/articles/filtering-bridges/filtering-bridges-ipfirewall.html
%%DOCSDIR%%/%%DOCLANG%%/articles/filtering-bridges/index.html
%%DOCSDIR%%/%%DOCLANG%%/articles/filtering-bridges/trademarks.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/fonts/ar01s02.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/fonts/ar01s03.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/fonts/ar01s04.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/fonts/ar01s05.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/fonts/ar01s06.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/fonts/ar01s07.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/fonts/ar01s08.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/fonts/ar01s09.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/fonts/ar01s10.html
%%DOCSDIR%%/%%DOCLANG%%/articles/fonts/index.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/fonts/x129.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/fonts/x176.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/fonts/x22.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/fonts/x337.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/fonts/x386.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/fonts/x514.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/fonts/x542.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/fonts/x564.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/fonts/x66.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/ipsec-must/IPsec.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/ipsec-must/ar01s02.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/ipsec-must/ar01s03.html
%%DOCSDIR%%/%%DOCLANG%%/articles/ipsec-must/caveat.html
%%DOCSDIR%%/%%DOCLANG%%/articles/ipsec-must/code.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/trademarks.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/ipsec-must/x32.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/ipsec-must/x62.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/laptop/ar01s02.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/laptop/ar01s03.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/laptop/ar01s04.html
%%DOCSDIR%%/%%DOCLANG%%/articles/laptop/index.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/laptop/x23.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/laptop/x27.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/laptop/x46.html
%%DOCSDIR%%/%%DOCLANG%%/articles/linux-users/commands.html
%%DOCSDIR%%/%%DOCLANG%%/articles/linux-users/conclusion.html
%%DOCSDIR%%/%%DOCLANG%%/articles/linux-users/firewall.html
@@ -87,26 +82,27 @@
%%DOCSDIR%%/%%DOCLANG%%/articles/linux-users/startup.html
%%DOCSDIR%%/%%DOCLANG%%/articles/linux-users/trademarks.html
%%DOCSDIR%%/%%DOCLANG%%/articles/linux-users/updates.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/x155.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/mh/x303.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/mh/x37.html
%%DOCSDIR%%/%%DOCLANG%%/articles/nanobsd/howto.html
%%DOCSDIR%%/%%DOCLANG%%/articles/nanobsd/index.html
%%DOCSDIR%%/%%DOCLANG%%/articles/nanobsd/trademarks.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/new-users/ar01s02.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/new-users/ar01s03.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/new-users/ar01s04.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/new-users/ar01s05.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/new-users/ar01s06.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/new-users/ar01s07.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/new-users/ar01s08.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/new-users/ar01s09.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/new-users/ar01s10.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/new-users/ar01s11.html
%%DOCSDIR%%/%%DOCLANG%%/articles/new-users/index.html
%%DOCSDIR%%/%%DOCLANG%%/articles/new-users/trademarks.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/new-users/x176.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/new-users/x282.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/new-users/x420.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/new-users/x465.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/new-users/x529.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/new-users/x57.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/new-users/x609.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/new-users/x648.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/new-users/x668.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/new-users/x86.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
@@ -117,25 +113,42 @@
%%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/pr-guidelines/ar01s02.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/pr-guidelines/ar01s03.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/pr-guidelines/ar01s04.html
%%DOCSDIR%%/%%DOCLANG%%/articles/pr-guidelines/index.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/pr-guidelines/x23.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/pr-guidelines/x55.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/pr-guidelines/x89.html
%%DOCSDIR%%/%%DOCLANG%%/articles/problem-reports/index.html
%%DOCSDIR%%/%%DOCLANG%%/articles/problem-reports/pr-followup.html
%%DOCSDIR%%/%%DOCLANG%%/articles/problem-reports/pr-further.html
%%DOCSDIR%%/%%DOCLANG%%/articles/problem-reports/pr-prep.html
%%DOCSDIR%%/%%DOCLANG%%/articles/problem-reports/pr-when.html
%%DOCSDIR%%/%%DOCLANG%%/articles/problem-reports/pr-writing.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/releng-packages/ar01s02.html
%%DOCSDIR%%/%%DOCLANG%%/articles/releng-packages/index.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/releng-packages/x31.html
+%%DOCSDIR%%/%%DOCLANG%%/books/developers-handbook/Basics.html
%%DOCSDIR%%/%%DOCLANG%%/books/developers-handbook/afs.html
%%DOCSDIR%%/%%DOCLANG%%/books/developers-handbook/alpha.html
%%DOCSDIR%%/%%DOCLANG%%/books/developers-handbook/appendices.html
%%DOCSDIR%%/%%DOCLANG%%/books/developers-handbook/architectures.html
%%DOCSDIR%%/%%DOCLANG%%/books/developers-handbook/archoverview.html
-%%DOCSDIR%%/%%DOCLANG%%/books/developers-handbook/basics.html
+%%DOCSDIR%%/%%DOCLANG%%/books/developers-handbook/bi01.html
%%DOCSDIR%%/%%DOCLANG%%/books/developers-handbook/bsdvision.html
+%%DOCSDIR%%/%%DOCLANG%%/books/developers-handbook/ch05s02.html
+%%DOCSDIR%%/%%DOCLANG%%/books/developers-handbook/ch05s03.html
+%%DOCSDIR%%/%%DOCLANG%%/books/developers-handbook/ch05s04.html
+%%DOCSDIR%%/%%DOCLANG%%/books/developers-handbook/ch05s05.html
+%%DOCSDIR%%/%%DOCLANG%%/books/developers-handbook/ch05s08.html
+%%DOCSDIR%%/%%DOCLANG%%/books/developers-handbook/ch06s03.html
+%%DOCSDIR%%/%%DOCLANG%%/books/developers-handbook/ch06s04.html
+%%DOCSDIR%%/%%DOCLANG%%/books/developers-handbook/ch06s06.html
+%%DOCSDIR%%/%%DOCLANG%%/books/developers-handbook/ch06s07.html
+%%DOCSDIR%%/%%DOCLANG%%/books/developers-handbook/ch08s02.html
+%%DOCSDIR%%/%%DOCLANG%%/books/developers-handbook/ch08s03.html
+%%DOCSDIR%%/%%DOCLANG%%/books/developers-handbook/ch16s02.html
+%%DOCSDIR%%/%%DOCLANG%%/books/developers-handbook/ch16s03.html
+%%DOCSDIR%%/%%DOCLANG%%/books/developers-handbook/ch16s04.html
+%%DOCSDIR%%/%%DOCLANG%%/books/developers-handbook/ch16s05.html
+%%DOCSDIR%%/%%DOCLANG%%/books/developers-handbook/ch17s02.html
%%DOCSDIR%%/%%DOCLANG%%/books/developers-handbook/chroot.html
%%DOCSDIR%%/%%DOCLANG%%/books/developers-handbook/compatibility.html
%%DOCSDIR%%/%%DOCLANG%%/books/developers-handbook/debugging.html
@@ -175,25 +188,202 @@
%%DOCSDIR%%/%%DOCLANG%%/books/developers-handbook/ufs.html
%%DOCSDIR%%/%%DOCLANG%%/books/developers-handbook/usb.html
%%DOCSDIR%%/%%DOCLANG%%/books/developers-handbook/virtualmemory.html
-%%DOCSDIR%%/%%DOCLANG%%/books/developers-handbook/x1174.html
-%%DOCSDIR%%/%%DOCLANG%%/books/developers-handbook/x1212.html
-%%DOCSDIR%%/%%DOCLANG%%/books/developers-handbook/x1308.html
-%%DOCSDIR%%/%%DOCLANG%%/books/developers-handbook/x1372.html
-%%DOCSDIR%%/%%DOCLANG%%/books/developers-handbook/x1380.html
-%%DOCSDIR%%/%%DOCLANG%%/books/developers-handbook/x159.html
-%%DOCSDIR%%/%%DOCLANG%%/books/developers-handbook/x1622.html
-%%DOCSDIR%%/%%DOCLANG%%/books/developers-handbook/x1658.html
-%%DOCSDIR%%/%%DOCLANG%%/books/developers-handbook/x168.html
-%%DOCSDIR%%/%%DOCLANG%%/books/developers-handbook/x1724.html
-%%DOCSDIR%%/%%DOCLANG%%/books/developers-handbook/x1749.html
-%%DOCSDIR%%/%%DOCLANG%%/books/developers-handbook/x1761.html
-%%DOCSDIR%%/%%DOCLANG%%/books/developers-handbook/x1785.html
-%%DOCSDIR%%/%%DOCLANG%%/books/developers-handbook/x1807.html
-%%DOCSDIR%%/%%DOCLANG%%/books/developers-handbook/x254.html
-%%DOCSDIR%%/%%DOCLANG%%/books/developers-handbook/x647.html
%%DOCSDIR%%/%%DOCLANG%%/books/faq/acknowledgments.html
%%DOCSDIR%%/%%DOCLANG%%/books/faq/admin.html
%%DOCSDIR%%/%%DOCLANG%%/books/faq/applications.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch01s02.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch01s03.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch01s04.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch01s05.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch01s06.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch01s07.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch01s08.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch01s09.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch01s10.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch01s11.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch01s12.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch01s13.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch01s14.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch01s15.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch01s16.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch01s17.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch01s18.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch01s19.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch01s20.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch01s21.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch01s22.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch02s02.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch02s03.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch02s04.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch02s05.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch02s06.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch02s07.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch02s08.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch02s09.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch02s10.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch02s11.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch02s12.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch02s13.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch02s14.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch02s15.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch02s16.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch02s17.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch02s18.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch02s19.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch02s20.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch02s21.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch02s22.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch02s23.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch02s24.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch02s25.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch02s26.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch02s27.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch02s28.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch03s02.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch03s03.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch03s04.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch03s05.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch03s06.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch03s07.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch03s08.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch03s09.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch03s10.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch03s11.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch03s12.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch03s13.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch03s14.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch03s15.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch03s16.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch03s17.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch03s18.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch03s19.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch03s20.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch03s21.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch03s22.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch03s23.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch03s24.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch03s25.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch04s02.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch04s03.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch04s04.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch04s05.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch04s06.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch04s07.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch04s08.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch04s09.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch04s10.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch04s11.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch04s12.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch04s13.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch04s14.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch04s15.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch04s16.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch05s02.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch05s03.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch05s04.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch06s02.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch06s03.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch06s04.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch06s05.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch06s06.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch07s02.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch07s03.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch07s04.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch08s02.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch08s03.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch08s04.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch08s05.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch08s06.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch08s07.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch08s08.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch08s09.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch08s10.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch08s11.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch08s12.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch08s13.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch08s14.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch08s15.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch08s16.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch08s17.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch08s18.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch08s19.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch08s20.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch08s21.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch08s22.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch08s23.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch08s24.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch08s25.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch08s26.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch09s02.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch09s03.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch09s04.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch09s05.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch09s06.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch09s07.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch09s08.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch09s09.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch09s10.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch09s11.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch10s02.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch10s03.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch10s04.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch10s05.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch10s06.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch10s07.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch10s08.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch10s09.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch10s10.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch10s11.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch10s12.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch10s13.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch10s14.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch10s15.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch10s16.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch10s17.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch10s18.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch10s19.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch10s20.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch10s21.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch10s22.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch11s02.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch11s03.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch11s04.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch11s05.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch11s06.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch11s07.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch11s08.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch11s09.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch11s10.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch11s11.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch11s12.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch11s13.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch11s14.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch11s15.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch11s16.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch11s17.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch11s18.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch11s19.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch11s20.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch11s21.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch11s22.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch12s02.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch12s03.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch12s04.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch12s05.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch12s06.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch12s07.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch12s08.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch12s09.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch13s02.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch13s03.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch13s04.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch13s05.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch13s06.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch13s07.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch13s08.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch13s09.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch13s10.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch13s11.html
%%DOCSDIR%%/%%DOCLANG%%/books/faq/commercial.html
%%DOCSDIR%%/%%DOCLANG%%/books/faq/hackers.html
%%DOCSDIR%%/%%DOCLANG%%/books/faq/hardware.html
@@ -207,203 +397,28 @@
%%DOCSDIR%%/%%DOCLANG%%/books/faq/serial.html
%%DOCSDIR%%/%%DOCLANG%%/books/faq/troubleshoot.html
%%DOCSDIR%%/%%DOCLANG%%/books/faq/x.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x103.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x1052.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x1057.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x1078.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x1112.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x1115.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x112.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x1122.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x1139.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x1143.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x1155.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x1162.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x1167.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x117.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x1225.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x1234.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x1238.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x1263.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x1267.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x1276.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x1295.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x130.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x1310.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x1314.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x1324.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x1350.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x1354.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x136.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x1423.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x1432.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x1437.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x1443.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x1450.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x1492.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x1527.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x1534.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x1541.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x1548.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x1552.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x1556.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x1562.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x1591.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x1603.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x1610.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x1640.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x1643.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x1659.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x1675.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x1692.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x170.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x1706.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x1711.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x1721.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x1736.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x174.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x1748.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x1753.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x178.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x1781.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x1790.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x1847.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x1949.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x201.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x2055.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x2060.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x2066.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x2073.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x2078.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x2082.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x2086.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x2092.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x2105.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x2110.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x2126.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x2136.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x2160.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x2179.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x2182.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x2187.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x2201.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x2212.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x2215.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x2236.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x2267.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x2277.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x2291.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x2314.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x2335.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x2345.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x2361.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x2369.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x2380.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x2394.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x240.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x2408.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x2419.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x2429.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x2445.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x2455.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x246.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x2489.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x2514.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x2521.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x2528.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x253.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x2535.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x2541.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x2547.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x2566.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x2584.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x2589.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x260.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x2600.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x2605.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x2609.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x2617.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x2622.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x264.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x2640.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x2644.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x276.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x279.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x341.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x362.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x366.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x371.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x383.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x389.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x393.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x396.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x414.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x421.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x433.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x437.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x464.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x473.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x490.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x50.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x502.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x507.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x511.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x514.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x520.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x532.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x538.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x575.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x578.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x58.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x594.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x597.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x604.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x616.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x62.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x620.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x637.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x646.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x651.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x658.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x664.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x675.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x691.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x697.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x700.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x705.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x709.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x717.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x722.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x726.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x734.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x738.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x74.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x743.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x751.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x756.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x763.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x777.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x783.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x82.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x832.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x844.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x862.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x868.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x874.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x891.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x896.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x901.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x908.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x936.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x943.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x953.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x959.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x964.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x976.html
-%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/f32.html
+%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/ch01s02.html
+%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/ch02s02.html
+%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/ch03s05.html
+%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/ch03s06.html
+%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/ch03s07.html
+%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/ch03s09.html
+%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/ch04s02.html
+%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/ch04s03.html
+%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/ch05s02.html
+%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/ch07s02.html
+%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/ch07s03.html
+%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/ch12s02.html
+%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/ch12s03.html
+%%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/ln15.html
+%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/ln-idp61438592.html
%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/overview.html
+%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/pr01.html
+%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/pr01s02.html
+%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/pr01s03.html
+%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/pr01s04.html
%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/psgml-mode.html
%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/see-also.html
%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/sgml-markup.html
@@ -420,25 +435,15 @@
%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/tools.html
%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/translations.html
%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/writing-style.html
-%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/x1008.html
-%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/x102.html
-%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/x112.html
-%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/x1275.html
-%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/x163.html
-%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/x2029.html
-%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/x2046.html
-%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/x2065.html
-%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/x2134.html
-%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/x2514.html
-%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/x2523.html
-%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/x2532.html
-%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/x2539.html
-%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/x273.html
-%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/x53.html
-%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/x705.html
-%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/x747.html
-%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/x834.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/acpi-debug.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/ACPI-debug.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/GEOM-intro.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/GEOM-mirror.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/GEOM-striping.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/GEOM.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/MAC-examplehttpd.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/SMTP-Auth.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/SMTP-UUCP.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
@@ -475,6 +480,9 @@
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/boot-kernel.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/boot-shutdown.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/boot.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/ch20s03.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/ch20s04.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/ch20s07.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/colophon.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/common-tasks.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/config-network-setup.html
@@ -536,10 +544,6 @@
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/fs-acl.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/geom-ggate.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/geom-glabel.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/geom-intro.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/geom-mirror.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/geom-striping.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/geom.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/getting-started.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/handbook.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/history.html
@@ -564,7 +568,7 @@
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/jails-tuning.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/jails.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/kerberos5.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/kerberosiv.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/kerberosIV.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/kernelconfig-building.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/kernelconfig-config.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/kernelconfig-custom-kernel.html
@@ -584,7 +588,6 @@
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/linuxemu.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/mac-biba.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/mac-bsdextended.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/mac-examplehttpd.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/mac-glossary.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/mac-ifoff.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/mac-implementing.html
@@ -679,9 +682,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
@@ -690,6 +690,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-freebsdupdate.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/updating-upgrading-portsnap.html
@@ -722,6 +723,3 @@
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/x-xdm.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/x11-wm.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/x11.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/x23593.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/x23639.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/x23844.html
diff --git a/misc/freebsd-doc-fr/pkg-plist.pdf b/misc/freebsd-doc-fr/pkg-plist.pdf
index a61f60cdc384..b44acd2fbfe9 100644
--- a/misc/freebsd-doc-fr/pkg-plist.pdf
+++ b/misc/freebsd-doc-fr/pkg-plist.pdf
@@ -4,7 +4,6 @@
%%DOCSDIR%%/%%DOCLANG%%/articles/contributing-ports/article.pdf
%%DOCSDIR%%/%%DOCLANG%%/articles/contributing/article.pdf
%%DOCSDIR%%/%%DOCLANG%%/articles/contributors/article.pdf
-%%DOCSDIR%%/%%DOCLANG%%/articles/cvsup-advanced/article.pdf
%%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd/article.pdf
%%DOCSDIR%%/%%DOCLANG%%/articles/filtering-bridges/article.pdf
%%DOCSDIR%%/%%DOCLANG%%/articles/fonts/article.pdf
diff --git a/misc/freebsd-doc-fr/pkg-plist.ps b/misc/freebsd-doc-fr/pkg-plist.ps
index 18ea1cd834ce..26b681d85bb8 100644
--- a/misc/freebsd-doc-fr/pkg-plist.ps
+++ b/misc/freebsd-doc-fr/pkg-plist.ps
@@ -4,7 +4,6 @@
%%DOCSDIR%%/%%DOCLANG%%/articles/contributing-ports/article.ps
%%DOCSDIR%%/%%DOCLANG%%/articles/contributing/article.ps
%%DOCSDIR%%/%%DOCLANG%%/articles/contributors/article.ps
-%%DOCSDIR%%/%%DOCLANG%%/articles/cvsup-advanced/article.ps
%%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd/article.ps
%%DOCSDIR%%/%%DOCLANG%%/articles/filtering-bridges/article.ps
%%DOCSDIR%%/%%DOCLANG%%/articles/fonts/article.ps
diff --git a/misc/freebsd-doc-fr/pkg-plist.txt b/misc/freebsd-doc-fr/pkg-plist.txt
index 2edfc1baddc8..117739027b04 100644
--- a/misc/freebsd-doc-fr/pkg-plist.txt
+++ b/misc/freebsd-doc-fr/pkg-plist.txt
@@ -4,7 +4,6 @@
%%DOCSDIR%%/%%DOCLANG%%/articles/contributing-ports/article.txt
%%DOCSDIR%%/%%DOCLANG%%/articles/contributing/article.txt
%%DOCSDIR%%/%%DOCLANG%%/articles/contributors/article.txt
-%%DOCSDIR%%/%%DOCLANG%%/articles/cvsup-advanced/article.txt
%%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd/article.txt
%%DOCSDIR%%/%%DOCLANG%%/articles/filtering-bridges/article.txt
%%DOCSDIR%%/%%DOCLANG%%/articles/fonts/article.txt
diff --git a/misc/freebsd-doc-hu/pkg-plist.html-split b/misc/freebsd-doc-hu/pkg-plist.html-split
index e321d9434ef1..05f4f55ff13f 100644
--- a/misc/freebsd-doc-hu/pkg-plist.html-split
+++ b/misc/freebsd-doc-hu/pkg-plist.html-split
@@ -37,6 +37,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-users/commands.html
%%DOCSDIR%%/%%DOCLANG%%/articles/linux-users/conclusion.html
@@ -76,6 +77,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
@@ -124,11 +126,19 @@
%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/translations.html
%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/writing-style-word-list.html
%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/writing-style.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/acpi-debug.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/ACPI-debug.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/GEOM-intro.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/GEOM-mirror.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/GEOM-striping.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/GEOM.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/SMTP-Auth.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/SMTP-UUCP.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
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/anoncvs.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/apas03.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/appendices.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/audit-administration.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/audit-config.html
@@ -225,10 +235,6 @@
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/geom-ggate.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/geom-gjournal.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/geom-glabel.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/geom-intro.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/geom-mirror.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/geom-striping.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/geom.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/getting-started.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/handbook.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/history.html
@@ -254,7 +260,7 @@
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/jails-tuning.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/jails.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/kerberos5.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/kerberosiv.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/kerberosIV.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/kernelconfig-building.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/kernelconfig-config.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/kernelconfig-custom-kernel.html
@@ -374,9 +380,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
@@ -385,6 +388,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
@@ -422,4 +426,3 @@
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/x-xdm.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/x11-wm.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/x11.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/x45612.html
diff --git a/misc/freebsd-doc-it/pkg-plist.html-split b/misc/freebsd-doc-it/pkg-plist.html-split
index f79c307b0c6c..787b9ed387c6 100644
--- a/misc/freebsd-doc-it/pkg-plist.html-split
+++ b/misc/freebsd-doc-it/pkg-plist.html-split
@@ -26,29 +26,38 @@
%%DOCSDIR%%/%%DOCLANG%%/articles/filtering-bridges/filtering-bridges-ipfirewall.html
%%DOCSDIR%%/%%DOCLANG%%/articles/filtering-bridges/index.html
%%DOCSDIR%%/%%DOCLANG%%/articles/filtering-bridges/trademarks.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/new-users/ar01s02.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/new-users/ar01s03.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/new-users/ar01s04.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/new-users/ar01s05.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/new-users/ar01s06.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/new-users/ar01s07.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/new-users/ar01s08.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/new-users/ar01s09.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/new-users/ar01s10.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/new-users/ar01s11.html
%%DOCSDIR%%/%%DOCLANG%%/articles/new-users/index.html
%%DOCSDIR%%/%%DOCLANG%%/articles/new-users/trademarks.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/new-users/x134.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/new-users/x229.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/new-users/x344.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/new-users/x496.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/new-users/x561.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/new-users/x629.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/new-users/x713.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/new-users/x75.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/new-users/x785.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/new-users/x799.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-idp70850304.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
%%DOCSDIR%%/%%DOCLANG%%/articles/vm-design/swap-layers.html
%%DOCSDIR%%/%%DOCLANG%%/articles/vm-design/trademarks.html
%%DOCSDIR%%/%%DOCLANG%%/articles/vm-design/vm-objects.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/acpi-debug.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/ACPI-debug.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/GEOM-intro.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/GEOM-mirror.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/GEOM-striping.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/GEOM.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/MAC-examplehttpd.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/SMTP-Auth.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/SMTP-UUCP.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
@@ -138,10 +147,6 @@
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/floppies.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/freebsd-glossary.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/fs-acl.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/geom-intro.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/geom-mirror.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/geom-striping.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/geom.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/getting-started.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/handbook.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/history.html
@@ -167,7 +172,7 @@
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/jails-tuning.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/jails.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/kerberos5.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/kerberosiv.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/kerberosIV.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/kernelconfig-building.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/kernelconfig-config.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/kernelconfig-custom-kernel.html
@@ -187,7 +192,6 @@
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/linuxemu.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/mac-biba.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/mac-bsdextended.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/mac-examplehttpd.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/mac-examplesandbox.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/mac-ifoff.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/mac-implementing.html
@@ -283,9 +287,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
@@ -294,6 +295,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/userppp.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/users-groups.html
@@ -336,7 +338,6 @@
%%DOCSDIR%%/%%DOCLANG%%/books/unix-introduction/editors-emacs.html
%%DOCSDIR%%/%%DOCLANG%%/books/unix-introduction/editors-vi-guide.html
%%DOCSDIR%%/%%DOCLANG%%/books/unix-introduction/editors.html
-%%DOCSDIR%%/%%DOCLANG%%/books/unix-introduction/g9538.html
%%DOCSDIR%%/%%DOCLANG%%/books/unix-introduction/getting-started-comm-line-struct.html
%%DOCSDIR%%/%%DOCLANG%%/books/unix-introduction/getting-started-control-keys.html
%%DOCSDIR%%/%%DOCLANG%%/books/unix-introduction/getting-started-directory-nav-control.html
@@ -345,9 +346,10 @@
%%DOCSDIR%%/%%DOCLANG%%/books/unix-introduction/getting-started-get-help.html
%%DOCSDIR%%/%%DOCLANG%%/books/unix-introduction/getting-started-stty.html
%%DOCSDIR%%/%%DOCLANG%%/books/unix-introduction/getting-started.html
+%%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/ln28.html
+%%DOCSDIR%%/%%DOCLANG%%/books/unix-introduction/ln-idp60487168.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-ja/pkg-plist.html-split b/misc/freebsd-doc-ja/pkg-plist.html-split
index a538cdf68f6b..a6c27c5b4d8b 100644
--- a/misc/freebsd-doc-ja/pkg-plist.html-split
+++ b/misc/freebsd-doc-ja/pkg-plist.html-split
@@ -31,12 +31,12 @@
%%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/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
@@ -84,8 +84,14 @@
%%DOCSDIR%%/%%DOCLANG%%/books/faq/serial.html
%%DOCSDIR%%/%%DOCLANG%%/books/faq/troubleshoot.html
%%DOCSDIR%%/%%DOCLANG%%/books/faq/x.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/SMTP-Auth.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/SMTP-UUCP.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/SMTP-dialup.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/advanced-networking.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/anoncvs.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/apbs04.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/apbs05.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/apbs06.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/appendices.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/backup-basics.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/backups-floppybackups.html
@@ -117,6 +123,7 @@
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall-pre.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall-start.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/ch11s06.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/colophon.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/common-tasks.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/config-tuning.html
@@ -200,9 +207,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
@@ -265,9 +270,6 @@
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/skey.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
@@ -276,6 +278,7 @@
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/synching.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/system-administration.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
@@ -286,9 +289,6 @@
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/users-introduction.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/users-limiting.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/users-modifying.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/users-superuser.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/users-system.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/users-user.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/users.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/using-bsdinstall.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/using-live-cd.html
@@ -302,10 +302,6 @@
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/x-xdm.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/x11-wm.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/x11.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/x15606.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/x35187.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/x35231.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/x35275.html
%%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/changes.html
%%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/conflicts.html
%%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/dads-after-port-mk.html
@@ -326,6 +322,7 @@
%%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/dads-workarounds.html
%%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/freebsd-versions.html
%%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/index.html
+%%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/legalnotice.html
%%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/makefile-build.html
%%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/makefile-categories.html
%%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/makefile-comment.html
diff --git a/misc/freebsd-doc-nl/pkg-plist.html-split b/misc/freebsd-doc-nl/pkg-plist.html-split
index 49c9d739a2a5..69ef5cbbe9df 100644
--- a/misc/freebsd-doc-nl/pkg-plist.html-split
+++ b/misc/freebsd-doc-nl/pkg-plist.html-split
@@ -24,13 +24,22 @@
%%DOCSDIR%%/%%DOCLANG%%/articles/problem-reports/pr-when.html
%%DOCSDIR%%/%%DOCLANG%%/articles/problem-reports/pr-writing.html
%%DOCSDIR%%/%%DOCLANG%%/articles/problem-reports/trademarks.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/x96.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/acpi-debug.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/ACPI-debug.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/GEOM-intro.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/GEOM-mirror.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/GEOM-raid3.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/GEOM-striping.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/GEOM.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/SMTP-Auth.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/SMTP-UUCP.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
@@ -135,11 +144,6 @@
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/geom-ggate.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/geom-gjournal.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/geom-glabels.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/geom-intro.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/geom-mirror.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/geom-raid3.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/geom-striping.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/geom.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/getting-started.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/handbook.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/history.html
@@ -251,6 +255,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/ports-broken.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/ports-finding-applications.html
@@ -286,9 +291,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
@@ -297,6 +299,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
diff --git a/misc/freebsd-doc-pl/pkg-plist.html-split b/misc/freebsd-doc-pl/pkg-plist.html-split
index 3bd14142b89b..c3601ad7d054 100644
--- a/misc/freebsd-doc-pl/pkg-plist.html-split
+++ b/misc/freebsd-doc-pl/pkg-plist.html-split
@@ -5,18 +5,25 @@
%%DOCSDIR%%/%%DOCLANG%%/articles/filtering-bridges/filtering-bridges-how.html
%%DOCSDIR%%/%%DOCLANG%%/articles/filtering-bridges/filtering-bridges-ipfirewall.html
%%DOCSDIR%%/%%DOCLANG%%/articles/filtering-bridges/index.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/new-users/ar01s02.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/new-users/ar01s03.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/new-users/ar01s04.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/new-users/ar01s05.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/new-users/ar01s06.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/new-users/ar01s07.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/new-users/ar01s08.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/new-users/ar01s09.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/new-users/ar01s10.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/new-users/ar01s11.html
%%DOCSDIR%%/%%DOCLANG%%/articles/new-users/index.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/new-users/x104.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/new-users/x196.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/new-users/x307.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/new-users/x453.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/new-users/x510.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/new-users/x55.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/new-users/x575.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/new-users/x656.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/new-users/x723.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/new-users/x735.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/acpi-debug.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/ACPI-debug.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/GEOM-intro.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/GEOM-mirror.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/GEOM-striping.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/GEOM.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/SMTP-Auth.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/SMTP-UUCP.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
@@ -109,10 +116,6 @@
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/freebsd-glossary.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/fs-acl.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/geom-ggate.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/geom-intro.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/geom-mirror.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/geom-striping.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/geom.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/getting-started.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/handbook.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/history.html
@@ -132,7 +135,7 @@
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/introduction.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/ipsec.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/kerberos5.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/kerberosiv.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/kerberosIV.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/kernelconfig-building.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/kernelconfig-config.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/kernelconfig-custom-kernel.html
@@ -248,9 +251,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
@@ -259,6 +259,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/usb-disks.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/userppp.html
diff --git a/misc/freebsd-doc-pt/pkg-plist.extras b/misc/freebsd-doc-pt/pkg-plist.extras
index 8fb5cc4556d5..177a23efbeb5 100644
--- a/misc/freebsd-doc-pt/pkg-plist.extras
+++ b/misc/freebsd-doc-pt/pkg-plist.extras
@@ -1 +1,3 @@
@comment $FreeBSD$
+%%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-update-server/diff.txt
+%%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-update-server/init.txt
diff --git a/misc/freebsd-doc-pt/pkg-plist.html-split b/misc/freebsd-doc-pt/pkg-plist.html-split
index 77af8d89b11f..1f7bb9f2ff13 100644
--- a/misc/freebsd-doc-pt/pkg-plist.html-split
+++ b/misc/freebsd-doc-pt/pkg-plist.html-split
@@ -1,5 +1,5 @@
@comment $FreeBSD$
-%%DOCSDIR%%/%%DOCLANG%%/articles/building-products/b397.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
@@ -22,17 +22,17 @@
%%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd/trademarks.html
%%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd/what-a-real-unix.html
%%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd/why-is-bsd-not-better-known.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/x116.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-questions/x207.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-questions/x219.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-questions/x40.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-questions/x55.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-questions/x69.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-questions/x94.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
@@ -118,6 +118,7 @@
%%DOCSDIR%%/%%DOCLANG%%/books/faq/support.html
%%DOCSDIR%%/%%DOCLANG%%/books/faq/troubleshoot.html
%%DOCSDIR%%/%%DOCLANG%%/books/faq/x.html
+%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/ch07s02.html
%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/doc-build.html
%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/examples-docbook-article.html
%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/examples-formatted.html
@@ -163,4 +164,3 @@
%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/translations.html
%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/writing-style-word-list.html
%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/writing-style.html
-%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/x2671.html
diff --git a/misc/freebsd-doc-ru/pkg-plist.common b/misc/freebsd-doc-ru/pkg-plist.common
index 8ea74e1abe6a..dc32bf728fe7 100644
--- a/misc/freebsd-doc-ru/pkg-plist.common
+++ b/misc/freebsd-doc-ru/pkg-plist.common
@@ -34,7 +34,6 @@
@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/fonts
@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-ru/pkg-plist.html b/misc/freebsd-doc-ru/pkg-plist.html
index f549fb811b61..c2b292e6f53a 100644
--- a/misc/freebsd-doc-ru/pkg-plist.html
+++ b/misc/freebsd-doc-ru/pkg-plist.html
@@ -5,7 +5,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/fonts/article.html
diff --git a/misc/freebsd-doc-ru/pkg-plist.html-common b/misc/freebsd-doc-ru/pkg-plist.html-common
index 7f2ff4dd94b4..576c84032fef 100644
--- a/misc/freebsd-doc-ru/pkg-plist.html-common
+++ b/misc/freebsd-doc-ru/pkg-plist.html-common
@@ -6,7 +6,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/fonts/docbook.css
diff --git a/misc/freebsd-doc-ru/pkg-plist.html-split b/misc/freebsd-doc-ru/pkg-plist.html-split
index b0bad9b897de..5c074833d611 100644
--- a/misc/freebsd-doc-ru/pkg-plist.html-split
+++ b/misc/freebsd-doc-ru/pkg-plist.html-split
@@ -46,11 +46,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/compairing-bsd-and-linux.html
%%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd/index.html
%%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd/trademarks.html
@@ -77,15 +72,15 @@
%%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/x113.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-questions/x204.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-questions/x216.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-questions/x39.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-questions/x53.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-questions/x66.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-questions/x91.html
%%DOCSDIR%%/%%DOCLANG%%/articles/geom-class/geom.html
%%DOCSDIR%%/%%DOCLANG%%/articles/geom-class/index.html
%%DOCSDIR%%/%%DOCLANG%%/articles/geom-class/kernelprog.html
@@ -105,12 +100,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
@@ -125,17 +120,18 @@
%%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/mailing-list-faq/acknowledgments.html
%%DOCSDIR%%/%%DOCLANG%%/articles/mailing-list-faq/bikeshed.html
%%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/x375.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/mh/x56.html
%%DOCSDIR%%/%%DOCLANG%%/articles/new-users/adding-a-user.html
%%DOCSDIR%%/%%DOCLANG%%/articles/new-users/comments-welcome.html
%%DOCSDIR%%/%%DOCLANG%%/articles/new-users/editing-text.html
@@ -149,6 +145,7 @@
%%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
@@ -159,6 +156,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/portbuild/anatomy.html
%%DOCSDIR%%/%%DOCLANG%%/articles/portbuild/expbuilds.html
%%DOCSDIR%%/%%DOCLANG%%/articles/portbuild/index.html
@@ -185,9 +183,9 @@
%%DOCSDIR%%/%%DOCLANG%%/articles/problem-reports/pr-writing.html
%%DOCSDIR%%/%%DOCLANG%%/articles/problem-reports/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/biblio.html
%%DOCSDIR%%/%%DOCLANG%%/articles/releng/distribution.html
@@ -198,16 +196,18 @@
%%DOCSDIR%%/%%DOCLANG%%/articles/releng/release-build.html
%%DOCSDIR%%/%%DOCLANG%%/articles/releng/release-proc.html
%%DOCSDIR%%/%%DOCLANG%%/articles/releng/trademarks.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/x95.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-idp60513280.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
@@ -241,9 +241,17 @@
%%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/handbook/acpi-debug.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/ACPI-debug.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/GEOM-intro.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/GEOM-mirror.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/GEOM-striping.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/GEOM.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/MAC-examplehttpd.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
@@ -347,10 +355,6 @@
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/geom-ggate.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/geom-gjournal.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/geom-glabel.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/geom-intro.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/geom-mirror.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/geom-striping.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/geom.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/getting-started.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/handbook.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/history.html
@@ -370,7 +374,7 @@
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/introduction.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/ipsec.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/kerberos5.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/kerberosiv.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/kerberosIV.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/kernelconfig-building.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/kernelconfig-config.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/kernelconfig-custom-kernel.html
@@ -392,7 +396,6 @@
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/linuxemu.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/mac-biba.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/mac-bsdextended.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/mac-examplehttpd.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/mac-ifoff.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/mac-implementing.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/mac-initial.html
@@ -453,6 +456,7 @@
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/pgpkeys-core.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/pgpkeys-developers.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/pgpkeys.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/pkgng-intro.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/ports-broken.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/ports-finding-applications.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/ports-nextsteps.html
@@ -489,9 +493,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
@@ -500,6 +501,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-freebsdupdate.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/updating-upgrading-portsnap.html
@@ -537,6 +539,7 @@
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/x11.html
%%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/build-cluster.html
%%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/building.html
+%%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/ch06s25.html
%%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/conflicts.html
%%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/dads-after-port-mk.html
%%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/dads-avoiding-linuxisms.html
@@ -558,6 +561,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
@@ -637,4 +641,3 @@
%%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/using-x11.html
%%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/using-xfce.html
%%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/why-port.html
-%%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/x5789.html
diff --git a/misc/freebsd-doc-ru/pkg-plist.txt b/misc/freebsd-doc-ru/pkg-plist.txt
index ba167ebda4ed..c305247d13f9 100644
--- a/misc/freebsd-doc-ru/pkg-plist.txt
+++ b/misc/freebsd-doc-ru/pkg-plist.txt
@@ -5,7 +5,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/fonts/article.txt
diff --git a/misc/freebsd-doc-tr/pkg-plist.html-split b/misc/freebsd-doc-tr/pkg-plist.html-split
index 387a47b962d3..2d8da54916ef 100644
--- a/misc/freebsd-doc-tr/pkg-plist.html-split
+++ b/misc/freebsd-doc-tr/pkg-plist.html-split
@@ -1,6 +1,6 @@
@comment $FreeBSD$
+%%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd/ar01s02.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd/ar01s03.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd/ar01s04.html
%%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd/index.html
%%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd/trademarks.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd/x119.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd/x61.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd/x94.html
diff --git a/misc/freebsd-doc-zh_cn/pkg-plist.html-split b/misc/freebsd-doc-zh_cn/pkg-plist.html-split
index 018404677fa8..3b16abd97688 100644
--- a/misc/freebsd-doc-zh_cn/pkg-plist.html-split
+++ b/misc/freebsd-doc-zh_cn/pkg-plist.html-split
@@ -37,6 +37,7 @@
%%DOCSDIR%%/%%DOCLANG%%/articles/remote-install/trademarks.html
%%DOCSDIR%%/%%DOCLANG%%/articles/remote-install/zfs.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
@@ -70,6 +71,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
@@ -100,7 +102,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
@@ -121,7 +122,15 @@
%%DOCSDIR%%/%%DOCLANG%%/books/arch-handbook/vm-pagetables.html
%%DOCSDIR%%/%%DOCLANG%%/books/arch-handbook/vm-tuning.html
%%DOCSDIR%%/%%DOCLANG%%/books/arch-handbook/vm.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/acpi-debug.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/ACPI-debug.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/GEOM-intro.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/GEOM-mirror.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/GEOM-raid3.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/GEOM-striping.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/GEOM.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/SMTP-Auth.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/SMTP-UUCP.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
@@ -232,11 +241,6 @@
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/geom-ggate.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/geom-gjournal.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/geom-glabel.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/geom-intro.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/geom-mirror.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/geom-raid3.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/geom-striping.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/geom.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/getting-started.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/handbook.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/history.html
@@ -383,9 +387,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
@@ -394,6 +395,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
@@ -434,6 +436,7 @@
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/x11.html
%%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/build-cluster.html
%%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/building.html
+%%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/ch06s25.html
%%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/conflicts.html
%%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/cvsweb.html
%%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/dads-after-port-mk.html
@@ -455,6 +458,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
@@ -533,4 +537,3 @@
%%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/using-x11.html
%%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/using-xfce.html
%%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/why-port.html
-%%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/x5617.html
diff --git a/misc/freebsd-doc-zh_tw/pkg-plist.common b/misc/freebsd-doc-zh_tw/pkg-plist.common
index 552beda093a0..01c4aaee01f4 100644
--- a/misc/freebsd-doc-zh_tw/pkg-plist.common
+++ b/misc/freebsd-doc-zh_tw/pkg-plist.common
@@ -15,7 +15,6 @@
@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/imagelib/callouts
@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/imagelib
@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/faq
@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/developers-handbook/sockets
@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/developers-handbook
@dirrm %%DOCSDIR%%/%%DOCLANG%%/books
diff --git a/misc/freebsd-doc-zh_tw/pkg-plist.html b/misc/freebsd-doc-zh_tw/pkg-plist.html
index 06ec66ac3046..23ae9ef1fd57 100644
--- a/misc/freebsd-doc-zh_tw/pkg-plist.html
+++ b/misc/freebsd-doc-zh_tw/pkg-plist.html
@@ -9,7 +9,6 @@
%%DOCSDIR%%/%%DOCLANG%%/articles/problem-reports/article.html
%%DOCSDIR%%/%%DOCLANG%%/articles/remote-install/article.html
%%DOCSDIR%%/%%DOCLANG%%/books/developers-handbook/book.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/book.html
%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/book.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/book.html
%%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/book.html
diff --git a/misc/freebsd-doc-zh_tw/pkg-plist.html-common b/misc/freebsd-doc-zh_tw/pkg-plist.html-common
index 14740323b87e..9534b416d7bb 100644
--- a/misc/freebsd-doc-zh_tw/pkg-plist.html-common
+++ b/misc/freebsd-doc-zh_tw/pkg-plist.html-common
@@ -29,7 +29,6 @@
%%DOCSDIR%%/%%DOCLANG%%/books/developers-handbook/sockets/serv.png
%%DOCSDIR%%/%%DOCLANG%%/books/developers-handbook/sockets/serv2.png
%%DOCSDIR%%/%%DOCLANG%%/books/developers-handbook/sockets/slayers.png
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/docbook.css
%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/docbook.css
%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/imagelib/callouts/1.png
%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/imagelib/callouts/2.png
diff --git a/misc/freebsd-doc-zh_tw/pkg-plist.html-split b/misc/freebsd-doc-zh_tw/pkg-plist.html-split
index c6644398243e..7f22761aea92 100644
--- a/misc/freebsd-doc-zh_tw/pkg-plist.html-split
+++ b/misc/freebsd-doc-zh_tw/pkg-plist.html-split
@@ -6,15 +6,15 @@
%%DOCSDIR%%/%%DOCLANG%%/articles/cvs-freebsd/freebsdspecific.html
%%DOCSDIR%%/%%DOCLANG%%/articles/cvs-freebsd/index.html
%%DOCSDIR%%/%%DOCLANG%%/articles/cvs-freebsd/trademarks.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/x113.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-questions/x205.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-questions/x217.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-questions/x37.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-questions/x52.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-questions/x66.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-questions/x91.html
%%DOCSDIR%%/%%DOCLANG%%/articles/hubs/index.html
%%DOCSDIR%%/%%DOCLANG%%/articles/hubs/mirror-howto.html
%%DOCSDIR%%/%%DOCLANG%%/articles/hubs/mirror-official.html
@@ -50,9 +50,10 @@
%%DOCSDIR%%/%%DOCLANG%%/articles/remote-install/preparation.html
%%DOCSDIR%%/%%DOCLANG%%/articles/remote-install/trademarks.html
%%DOCSDIR%%/%%DOCLANG%%/articles/remote-install/zfs.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
@@ -99,6 +100,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
@@ -114,35 +116,6 @@
%%DOCSDIR%%/%%DOCLANG%%/books/developers-handbook/x86-the-tools.html
%%DOCSDIR%%/%%DOCLANG%%/books/developers-handbook/x86-unix-filters.html
%%DOCSDIR%%/%%DOCLANG%%/books/developers-handbook/x86.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/acknowledgments.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/admin.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/advanced.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/applications.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/bibliography.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/commercial.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/compatibility-drives.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/compatibility-kbd-mice.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/compatibility-networking.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/compatibility-other.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/compatibility-processors.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/compatibility-sound.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/disks.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/funnies.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/hardware.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/index.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/install.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/introduction.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/kernelconfig.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/legalnotice.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/misc.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/networking.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/ports.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/ppp.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/security.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/serial.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/support.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/troubleshoot.html
-%%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/examples-docbook-article.html
@@ -189,7 +162,15 @@
%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/translations.html
%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/writing-style-word-list.html
%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/writing-style.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/acpi-debug.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/ACPI-debug.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/GEOM-intro.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/GEOM-mirror.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/GEOM-striping.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/GEOM.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/MAC-examplehttpd.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/SMTP-Auth.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/SMTP-UUCP.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
@@ -282,10 +263,6 @@
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/floppies.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/freebsd-glossary.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/fs-acl.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/geom-intro.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/geom-mirror.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/geom-striping.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/geom.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/getting-started.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/handbook.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/history.html
@@ -311,7 +288,7 @@
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/jails-tuning.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/jails.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/kerberos5.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/kerberosiv.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/kerberosIV.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/kernelconfig-building.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/kernelconfig-config.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/kernelconfig-custom-kernel.html
@@ -332,7 +309,6 @@
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/linuxemu.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/mac-biba.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/mac-bsdextended.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/mac-examplehttpd.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/mac-ifoff.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/mac-implementing.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/mac-initial.html
@@ -430,9 +406,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
@@ -441,6 +414,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/usb-disks.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/userppp.html
@@ -499,6 +473,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
diff --git a/misc/freebsd-doc-zh_tw/pkg-plist.pdf b/misc/freebsd-doc-zh_tw/pkg-plist.pdf
index c5e648155d14..ee146aadbc87 100644
--- a/misc/freebsd-doc-zh_tw/pkg-plist.pdf
+++ b/misc/freebsd-doc-zh_tw/pkg-plist.pdf
@@ -9,7 +9,6 @@
%%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/fdp-primer/book.pdf
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/book.pdf
%%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/book.pdf
diff --git a/misc/freebsd-doc-zh_tw/pkg-plist.ps b/misc/freebsd-doc-zh_tw/pkg-plist.ps
index fba145a37bb7..e4872a6504ab 100644
--- a/misc/freebsd-doc-zh_tw/pkg-plist.ps
+++ b/misc/freebsd-doc-zh_tw/pkg-plist.ps
@@ -9,7 +9,6 @@
%%DOCSDIR%%/%%DOCLANG%%/articles/problem-reports/article.ps
%%DOCSDIR%%/%%DOCLANG%%/articles/remote-install/article.ps
%%DOCSDIR%%/%%DOCLANG%%/books/developers-handbook/book.ps
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/book.ps
%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/book.ps
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/book.ps
%%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/book.ps
diff --git a/misc/freebsd-doc-zh_tw/pkg-plist.txt b/misc/freebsd-doc-zh_tw/pkg-plist.txt
index 6f665fd94f80..21d9759b074c 100644
--- a/misc/freebsd-doc-zh_tw/pkg-plist.txt
+++ b/misc/freebsd-doc-zh_tw/pkg-plist.txt
@@ -9,7 +9,6 @@
%%DOCSDIR%%/%%DOCLANG%%/articles/problem-reports/article.txt
%%DOCSDIR%%/%%DOCLANG%%/articles/remote-install/article.txt
%%DOCSDIR%%/%%DOCLANG%%/books/developers-handbook/book.txt
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/book.txt
%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/book.txt
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/book.txt
%%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/book.txt