aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-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.common1
-rw-r--r--misc/freebsd-doc-da/pkg-plist.html1
-rw-r--r--misc/freebsd-doc-da/pkg-plist.html-common1
-rw-r--r--misc/freebsd-doc-da/pkg-plist.html-split9
-rw-r--r--misc/freebsd-doc-da/pkg-plist.pdf1
-rw-r--r--misc/freebsd-doc-da/pkg-plist.ps1
-rw-r--r--misc/freebsd-doc-da/pkg-plist.txt1
-rw-r--r--misc/freebsd-doc-de/pkg-plist.common2
-rw-r--r--misc/freebsd-doc-de/pkg-plist.html2
-rw-r--r--misc/freebsd-doc-de/pkg-plist.html-common2
-rw-r--r--misc/freebsd-doc-de/pkg-plist.html-split35
-rw-r--r--misc/freebsd-doc-de/pkg-plist.pdf2
-rw-r--r--misc/freebsd-doc-de/pkg-plist.ps2
-rw-r--r--misc/freebsd-doc-de/pkg-plist.txt2
-rw-r--r--misc/freebsd-doc-el/pkg-plist.common3
-rw-r--r--misc/freebsd-doc-el/pkg-plist.html3
-rw-r--r--misc/freebsd-doc-el/pkg-plist.html-common3
-rw-r--r--misc/freebsd-doc-el/pkg-plist.html-split75
-rw-r--r--misc/freebsd-doc-el/pkg-plist.pdf3
-rw-r--r--misc/freebsd-doc-el/pkg-plist.ps3
-rw-r--r--misc/freebsd-doc-el/pkg-plist.txt3
-rw-r--r--misc/freebsd-doc-en/Makefile2
-rw-r--r--misc/freebsd-doc-en/distinfo4
-rw-r--r--misc/freebsd-doc-en/pkg-plist.common13
-rw-r--r--misc/freebsd-doc-en/pkg-plist.html13
-rw-r--r--misc/freebsd-doc-en/pkg-plist.html-common23
-rw-r--r--misc/freebsd-doc-en/pkg-plist.html-split250
-rw-r--r--misc/freebsd-doc-en/pkg-plist.pdf13
-rw-r--r--misc/freebsd-doc-en/pkg-plist.ps13
-rw-r--r--misc/freebsd-doc-en/pkg-plist.txt13
-rw-r--r--misc/freebsd-doc-es/pkg-plist.common5
-rw-r--r--misc/freebsd-doc-es/pkg-plist.extras6
-rw-r--r--misc/freebsd-doc-es/pkg-plist.html5
-rw-r--r--misc/freebsd-doc-es/pkg-plist.html-common5
-rw-r--r--misc/freebsd-doc-es/pkg-plist.html-split99
-rw-r--r--misc/freebsd-doc-es/pkg-plist.pdf5
-rw-r--r--misc/freebsd-doc-es/pkg-plist.ps5
-rw-r--r--misc/freebsd-doc-es/pkg-plist.txt5
-rw-r--r--misc/freebsd-doc-fr/pkg-plist.common15
-rw-r--r--misc/freebsd-doc-fr/pkg-plist.html15
-rw-r--r--misc/freebsd-doc-fr/pkg-plist.html-common17
-rw-r--r--misc/freebsd-doc-fr/pkg-plist.html-split238
-rw-r--r--misc/freebsd-doc-fr/pkg-plist.pdf15
-rw-r--r--misc/freebsd-doc-fr/pkg-plist.ps15
-rw-r--r--misc/freebsd-doc-fr/pkg-plist.txt15
-rw-r--r--misc/freebsd-doc-hu/pkg-plist.common3
-rw-r--r--misc/freebsd-doc-hu/pkg-plist.html3
-rw-r--r--misc/freebsd-doc-hu/pkg-plist.html-common3
-rw-r--r--misc/freebsd-doc-hu/pkg-plist.html-split43
-rw-r--r--misc/freebsd-doc-hu/pkg-plist.pdf3
-rw-r--r--misc/freebsd-doc-hu/pkg-plist.ps3
-rw-r--r--misc/freebsd-doc-hu/pkg-plist.txt3
-rw-r--r--misc/freebsd-doc-it/pkg-plist.common2
-rw-r--r--misc/freebsd-doc-it/pkg-plist.html2
-rw-r--r--misc/freebsd-doc-it/pkg-plist.html-common2
-rw-r--r--misc/freebsd-doc-it/pkg-plist.html-split48
-rw-r--r--misc/freebsd-doc-it/pkg-plist.pdf2
-rw-r--r--misc/freebsd-doc-it/pkg-plist.ps2
-rw-r--r--misc/freebsd-doc-it/pkg-plist.txt2
-rw-r--r--misc/freebsd-doc-ja/pkg-plist.common5
-rw-r--r--misc/freebsd-doc-ja/pkg-plist.html5
-rw-r--r--misc/freebsd-doc-ja/pkg-plist.html-common5
-rw-r--r--misc/freebsd-doc-ja/pkg-plist.html-split107
-rw-r--r--misc/freebsd-doc-mn/pkg-plist.html-split7
-rw-r--r--misc/freebsd-doc-nl/pkg-plist.html-split16
-rw-r--r--misc/freebsd-doc-pl/pkg-plist.common1
-rw-r--r--misc/freebsd-doc-pl/pkg-plist.html1
-rw-r--r--misc/freebsd-doc-pl/pkg-plist.html-common1
-rw-r--r--misc/freebsd-doc-pl/pkg-plist.html-split14
-rw-r--r--misc/freebsd-doc-pl/pkg-plist.pdf1
-rw-r--r--misc/freebsd-doc-pl/pkg-plist.ps1
-rw-r--r--misc/freebsd-doc-pl/pkg-plist.txt1
-rw-r--r--misc/freebsd-doc-pt/pkg-plist.common15
-rw-r--r--misc/freebsd-doc-pt/pkg-plist.html11
-rw-r--r--misc/freebsd-doc-pt/pkg-plist.html-common23
-rw-r--r--misc/freebsd-doc-pt/pkg-plist.html-split144
-rw-r--r--misc/freebsd-doc-pt/pkg-plist.pdf11
-rw-r--r--misc/freebsd-doc-pt/pkg-plist.ps11
-rw-r--r--misc/freebsd-doc-pt/pkg-plist.txt13
-rw-r--r--misc/freebsd-doc-ru/pkg-plist.common13
-rw-r--r--misc/freebsd-doc-ru/pkg-plist.extras6
-rw-r--r--misc/freebsd-doc-ru/pkg-plist.html12
-rw-r--r--misc/freebsd-doc-ru/pkg-plist.html-common58
-rw-r--r--misc/freebsd-doc-ru/pkg-plist.html-split179
-rw-r--r--misc/freebsd-doc-ru/pkg-plist.txt12
-rw-r--r--misc/freebsd-doc-sr/pkg-plist.common6
-rw-r--r--misc/freebsd-doc-tr/pkg-plist.html-split8
-rw-r--r--misc/freebsd-doc-zh_cn/pkg-plist.common1
-rw-r--r--misc/freebsd-doc-zh_cn/pkg-plist.html-common44
-rw-r--r--misc/freebsd-doc-zh_cn/pkg-plist.html-split32
-rw-r--r--misc/freebsd-doc-zh_tw/pkg-plist.html-split41
93 files changed, 773 insertions, 1145 deletions
diff --git a/misc/freebsd-doc-all/Makefile b/misc/freebsd-doc-all/Makefile
index 194c8e94bf42..4ec5c332c353 100644
--- a/misc/freebsd-doc-all/Makefile
+++ b/misc/freebsd-doc-all/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= freebsd-doc-all
-PORTVERSION= 40385
+PORTVERSION= 40771
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 f235119daa38..157a8c28f5cb 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/index.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd/x115.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd/x65.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd/x92.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/index.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/new-users/x118.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/new-users/x194.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/new-users/x298.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/new-users/x451.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/new-users/x516.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/new-users/x583.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/new-users/x676.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/new-users/x743.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/new-users/x76.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/new-users/x764.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.common b/misc/freebsd-doc-da/pkg-plist.common
index e549b699ab22..ff629923eb26 100644
--- a/misc/freebsd-doc-da/pkg-plist.common
+++ b/misc/freebsd-doc-da/pkg-plist.common
@@ -1,7 +1,6 @@
@comment $FreeBSD$
@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/pxe
@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/ipsec-must
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/euro
@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles
%%DOCSDIR%%/%%DOCLANG_PREFIX%%
@dirrm %%DOCSDIR%%/%%DOCLANG%%
diff --git a/misc/freebsd-doc-da/pkg-plist.html b/misc/freebsd-doc-da/pkg-plist.html
index 7f022d6fc406..23e78f87def2 100644
--- a/misc/freebsd-doc-da/pkg-plist.html
+++ b/misc/freebsd-doc-da/pkg-plist.html
@@ -1,4 +1,3 @@
@comment $FreeBSD$
-%%DOCSDIR%%/%%DOCLANG%%/articles/euro/article.html
%%DOCSDIR%%/%%DOCLANG%%/articles/ipsec-must/article.html
%%DOCSDIR%%/%%DOCLANG%%/articles/pxe/article.html
diff --git a/misc/freebsd-doc-da/pkg-plist.html-common b/misc/freebsd-doc-da/pkg-plist.html-common
index 905df531c04a..382421dc7a3e 100644
--- a/misc/freebsd-doc-da/pkg-plist.html-common
+++ b/misc/freebsd-doc-da/pkg-plist.html-common
@@ -1,4 +1,3 @@
@comment $FreeBSD$
-%%DOCSDIR%%/%%DOCLANG%%/articles/euro/docbook.css
%%DOCSDIR%%/%%DOCLANG%%/articles/ipsec-must/docbook.css
%%DOCSDIR%%/%%DOCLANG%%/articles/pxe/docbook.css
diff --git a/misc/freebsd-doc-da/pkg-plist.html-split b/misc/freebsd-doc-da/pkg-plist.html-split
index 06461a447081..6a66b57cfdec 100644
--- a/misc/freebsd-doc-da/pkg-plist.html-split
+++ b/misc/freebsd-doc-da/pkg-plist.html-split
@@ -1,10 +1,4 @@
@comment $FreeBSD$
-%%DOCSDIR%%/%%DOCLANG%%/articles/euro/index.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/euro/x161.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/euro/x189.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/euro/x69.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/euro/x79.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/ipsec-must/TRADEMARKS.html
%%DOCSDIR%%/%%DOCLANG%%/articles/ipsec-must/caveat.html
%%DOCSDIR%%/%%DOCLANG%%/articles/ipsec-must/code.html
%%DOCSDIR%%/%%DOCLANG%%/articles/ipsec-must/experiment.html
@@ -13,9 +7,10 @@
%%DOCSDIR%%/%%DOCLANG%%/articles/ipsec-must/ipsec.html
%%DOCSDIR%%/%%DOCLANG%%/articles/ipsec-must/kernel.html
%%DOCSDIR%%/%%DOCLANG%%/articles/ipsec-must/solution.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/pxe/TRADEMARKS.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/ipsec-must/trademarks.html
%%DOCSDIR%%/%%DOCLANG%%/articles/pxe/bootstrap-config.html
%%DOCSDIR%%/%%DOCLANG%%/articles/pxe/custom-postinst-package.html
%%DOCSDIR%%/%%DOCLANG%%/articles/pxe/index.html
%%DOCSDIR%%/%%DOCLANG%%/articles/pxe/install-setup.html
%%DOCSDIR%%/%%DOCLANG%%/articles/pxe/server-config.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/pxe/trademarks.html
diff --git a/misc/freebsd-doc-da/pkg-plist.pdf b/misc/freebsd-doc-da/pkg-plist.pdf
index d8c61495d71b..ce13f84d8453 100644
--- a/misc/freebsd-doc-da/pkg-plist.pdf
+++ b/misc/freebsd-doc-da/pkg-plist.pdf
@@ -1,4 +1,3 @@
@comment $FreeBSD$
-%%DOCSDIR%%/%%DOCLANG%%/articles/euro/article.pdf
%%DOCSDIR%%/%%DOCLANG%%/articles/ipsec-must/article.pdf
%%DOCSDIR%%/%%DOCLANG%%/articles/pxe/article.pdf
diff --git a/misc/freebsd-doc-da/pkg-plist.ps b/misc/freebsd-doc-da/pkg-plist.ps
index b8dc557d4903..65128ff50154 100644
--- a/misc/freebsd-doc-da/pkg-plist.ps
+++ b/misc/freebsd-doc-da/pkg-plist.ps
@@ -1,4 +1,3 @@
@comment $FreeBSD$
-%%DOCSDIR%%/%%DOCLANG%%/articles/euro/article.ps
%%DOCSDIR%%/%%DOCLANG%%/articles/ipsec-must/article.ps
%%DOCSDIR%%/%%DOCLANG%%/articles/pxe/article.ps
diff --git a/misc/freebsd-doc-da/pkg-plist.txt b/misc/freebsd-doc-da/pkg-plist.txt
index 5f096040d833..b11f9c2dec8f 100644
--- a/misc/freebsd-doc-da/pkg-plist.txt
+++ b/misc/freebsd-doc-da/pkg-plist.txt
@@ -1,4 +1,3 @@
@comment $FreeBSD$
-%%DOCSDIR%%/%%DOCLANG%%/articles/euro/article.txt
%%DOCSDIR%%/%%DOCLANG%%/articles/ipsec-must/article.txt
%%DOCSDIR%%/%%DOCLANG%%/articles/pxe/article.txt
diff --git a/misc/freebsd-doc-de/pkg-plist.common b/misc/freebsd-doc-de/pkg-plist.common
index b30ed6227b61..0bf80e9b04a2 100644
--- a/misc/freebsd-doc-de/pkg-plist.common
+++ b/misc/freebsd-doc-de/pkg-plist.common
@@ -20,8 +20,8 @@
@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/developers-handbook/sockets
@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/developers-handbook
@dirrm %%DOCSDIR%%/%%DOCLANG%%/books
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/version-guide
@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/solid-state
+@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/port-mentor-guidelines
@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/new-users
@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/linux-comparison
@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/laptop
diff --git a/misc/freebsd-doc-de/pkg-plist.html b/misc/freebsd-doc-de/pkg-plist.html
index f8b446dd268b..8990150a555d 100644
--- a/misc/freebsd-doc-de/pkg-plist.html
+++ b/misc/freebsd-doc-de/pkg-plist.html
@@ -5,8 +5,8 @@
%%DOCSDIR%%/%%DOCLANG%%/articles/laptop/article.html
%%DOCSDIR%%/%%DOCLANG%%/articles/linux-comparison/article.html
%%DOCSDIR%%/%%DOCLANG%%/articles/new-users/article.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/port-mentor-guidelines/article.html
%%DOCSDIR%%/%%DOCLANG%%/articles/solid-state/article.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/version-guide/article.html
%%DOCSDIR%%/%%DOCLANG%%/books/developers-handbook/book.html
%%DOCSDIR%%/%%DOCLANG%%/books/faq/book.html
%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/book.html
diff --git a/misc/freebsd-doc-de/pkg-plist.html-common b/misc/freebsd-doc-de/pkg-plist.html-common
index 36bedb49e89b..84122afdecb3 100644
--- a/misc/freebsd-doc-de/pkg-plist.html-common
+++ b/misc/freebsd-doc-de/pkg-plist.html-common
@@ -5,8 +5,8 @@
%%DOCSDIR%%/%%DOCLANG%%/articles/laptop/docbook.css
%%DOCSDIR%%/%%DOCLANG%%/articles/linux-comparison/docbook.css
%%DOCSDIR%%/%%DOCLANG%%/articles/new-users/docbook.css
+%%DOCSDIR%%/%%DOCLANG%%/articles/port-mentor-guidelines/docbook.css
%%DOCSDIR%%/%%DOCLANG%%/articles/solid-state/docbook.css
-%%DOCSDIR%%/%%DOCLANG%%/articles/version-guide/docbook.css
%%DOCSDIR%%/%%DOCLANG%%/books/developers-handbook/docbook.css
%%DOCSDIR%%/%%DOCLANG%%/books/developers-handbook/sockets/layers.png
%%DOCSDIR%%/%%DOCLANG%%/books/developers-handbook/sockets/sain.png
diff --git a/misc/freebsd-doc-de/pkg-plist.html-split b/misc/freebsd-doc-de/pkg-plist.html-split
index 731a033574d7..b5c7871543e4 100644
--- a/misc/freebsd-doc-de/pkg-plist.html-split
+++ b/misc/freebsd-doc-de/pkg-plist.html-split
@@ -1,5 +1,4 @@
@comment $FreeBSD$
-%%DOCSDIR%%/%%DOCLANG%%/articles/contributing-ports/TRADEMARKS.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
@@ -7,28 +6,28 @@
%%DOCSDIR%%/%%DOCLANG%%/articles/contributing-ports/maintain-port.html
%%DOCSDIR%%/%%DOCLANG%%/articles/contributing-ports/mortal-coil.html
%%DOCSDIR%%/%%DOCLANG%%/articles/contributing-ports/resources.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/contributing-ports/trademarks.html
%%DOCSDIR%%/%%DOCLANG%%/articles/contributing-ports/what-contribute.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/contributing/TRADEMARKS.html
%%DOCSDIR%%/%%DOCLANG%%/articles/contributing/contrib-how.html
%%DOCSDIR%%/%%DOCLANG%%/articles/contributing/index.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd/TRADEMARKS.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/contributing/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
%%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/laptop/TRADEMARKS.html
%%DOCSDIR%%/%%DOCLANG%%/articles/laptop/index.html
%%DOCSDIR%%/%%DOCLANG%%/articles/laptop/modems.html
%%DOCSDIR%%/%%DOCLANG%%/articles/laptop/pcmcia.html
%%DOCSDIR%%/%%DOCLANG%%/articles/laptop/power-management.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/linux-comparison/TRADEMARKS.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/laptop/trademarks.html
%%DOCSDIR%%/%%DOCLANG%%/articles/linux-comparison/freebsd-advantages.html
%%DOCSDIR%%/%%DOCLANG%%/articles/linux-comparison/freebsd-conclusion.html
%%DOCSDIR%%/%%DOCLANG%%/articles/linux-comparison/freebsd-features.html
%%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/new-users/TRADEMARKS.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/linux-comparison/trademarks.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
@@ -39,20 +38,15 @@
%%DOCSDIR%%/%%DOCLANG%%/articles/new-users/other-useful-commands.html
%%DOCSDIR%%/%%DOCLANG%%/articles/new-users/other.html
%%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/solid-state/TRADEMARKS.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/port-mentor-guidelines/index.html
%%DOCSDIR%%/%%DOCLANG%%/articles/solid-state/index.html
%%DOCSDIR%%/%%DOCLANG%%/articles/solid-state/kernel.html
%%DOCSDIR%%/%%DOCLANG%%/articles/solid-state/ro-fs.html
%%DOCSDIR%%/%%DOCLANG%%/articles/solid-state/strategies.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/solid-state/x95.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/version-guide/TRADEMARKS.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/version-guide/conclusion.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/version-guide/decision-points.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/version-guide/future-goals.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/version-guide/index.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/version-guide/past-schedules.html
-%%DOCSDIR%%/%%DOCLANG%%/books/developers-handbook/LEGALNOTICE.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/solid-state/trademarks.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/solid-state/x96.html
%%DOCSDIR%%/%%DOCLANG%%/books/developers-handbook/appendices.html
%%DOCSDIR%%/%%DOCLANG%%/books/developers-handbook/architectures.html
%%DOCSDIR%%/%%DOCLANG%%/books/developers-handbook/basics.html
@@ -77,6 +71,7 @@
%%DOCSDIR%%/%%DOCLANG%%/books/developers-handbook/kerneldebug-options.html
%%DOCSDIR%%/%%DOCLANG%%/books/developers-handbook/kerneldebug.html
%%DOCSDIR%%/%%DOCLANG%%/books/developers-handbook/l10n.html
+%%DOCSDIR%%/%%DOCLANG%%/books/developers-handbook/legalnotice.html
%%DOCSDIR%%/%%DOCLANG%%/books/developers-handbook/policies-contributed.html
%%DOCSDIR%%/%%DOCLANG%%/books/developers-handbook/policies-encumbered.html
%%DOCSDIR%%/%%DOCLANG%%/books/developers-handbook/policies-maintainer.html
@@ -113,7 +108,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/LEGALNOTICE.html
%%DOCSDIR%%/%%DOCLANG%%/books/faq/acknowledgments.html
%%DOCSDIR%%/%%DOCLANG%%/books/faq/admin.html
%%DOCSDIR%%/%%DOCLANG%%/books/faq/advanced.html
@@ -134,6 +128,7 @@
%%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/ppp.html
@@ -142,13 +137,13 @@
%%DOCSDIR%%/%%DOCLANG%%/books/faq/support.html
%%DOCSDIR%%/%%DOCLANG%%/books/faq/troubleshoot.html
%%DOCSDIR%%/%%DOCLANG%%/books/faq/x.html
-%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/LEGALNOTICE.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
%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/examples-formatted.html
%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/examples.html
%%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
@@ -188,7 +183,6 @@
%%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/LEGALNOTICE.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/acpi-debug.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/acpi-overview.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/adding-swap-space.html
@@ -339,6 +333,7 @@
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/l10n-compiling.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/l10n.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/lang-setup.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/legalnotice.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/linuxemu-advanced.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/linuxemu-lbc-install.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/linuxemu-maple.html
@@ -498,7 +493,6 @@
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/x-xdm.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/x11-wm.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/x11.html
-%%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/TRADEMARKS.html
%%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/build-cluster.html
%%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/building.html
%%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/conflicts.html
@@ -577,6 +571,7 @@
%%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/testing-porttools.html
%%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/testing-tinderbox.html
%%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/testing.html
+%%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/trademarks.html
%%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/users-and-groups.html
%%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/using-autotools.html
%%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/using-databases.html
@@ -599,4 +594,4 @@
%%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/x5593.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 c3c8b13bff59..2e07b20d2fad 100644
--- a/misc/freebsd-doc-de/pkg-plist.pdf
+++ b/misc/freebsd-doc-de/pkg-plist.pdf
@@ -5,8 +5,8 @@
%%DOCSDIR%%/%%DOCLANG%%/articles/laptop/article.pdf
%%DOCSDIR%%/%%DOCLANG%%/articles/linux-comparison/article.pdf
%%DOCSDIR%%/%%DOCLANG%%/articles/new-users/article.pdf
+%%DOCSDIR%%/%%DOCLANG%%/articles/port-mentor-guidelines/article.pdf
%%DOCSDIR%%/%%DOCLANG%%/articles/solid-state/article.pdf
-%%DOCSDIR%%/%%DOCLANG%%/articles/version-guide/article.pdf
%%DOCSDIR%%/%%DOCLANG%%/books/developers-handbook/book.pdf
%%DOCSDIR%%/%%DOCLANG%%/books/faq/book.pdf
%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/book.pdf
diff --git a/misc/freebsd-doc-de/pkg-plist.ps b/misc/freebsd-doc-de/pkg-plist.ps
index 437ccd7aa0d8..4b3d14f0c9fa 100644
--- a/misc/freebsd-doc-de/pkg-plist.ps
+++ b/misc/freebsd-doc-de/pkg-plist.ps
@@ -5,8 +5,8 @@
%%DOCSDIR%%/%%DOCLANG%%/articles/laptop/article.ps
%%DOCSDIR%%/%%DOCLANG%%/articles/linux-comparison/article.ps
%%DOCSDIR%%/%%DOCLANG%%/articles/new-users/article.ps
+%%DOCSDIR%%/%%DOCLANG%%/articles/port-mentor-guidelines/article.ps
%%DOCSDIR%%/%%DOCLANG%%/articles/solid-state/article.ps
-%%DOCSDIR%%/%%DOCLANG%%/articles/version-guide/article.ps
%%DOCSDIR%%/%%DOCLANG%%/books/developers-handbook/book.ps
%%DOCSDIR%%/%%DOCLANG%%/books/faq/book.ps
%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/book.ps
diff --git a/misc/freebsd-doc-de/pkg-plist.txt b/misc/freebsd-doc-de/pkg-plist.txt
index 4ace8545442f..2a92167408d8 100644
--- a/misc/freebsd-doc-de/pkg-plist.txt
+++ b/misc/freebsd-doc-de/pkg-plist.txt
@@ -5,8 +5,8 @@
%%DOCSDIR%%/%%DOCLANG%%/articles/laptop/article.txt
%%DOCSDIR%%/%%DOCLANG%%/articles/linux-comparison/article.txt
%%DOCSDIR%%/%%DOCLANG%%/articles/new-users/article.txt
+%%DOCSDIR%%/%%DOCLANG%%/articles/port-mentor-guidelines/article.txt
%%DOCSDIR%%/%%DOCLANG%%/articles/solid-state/article.txt
-%%DOCSDIR%%/%%DOCLANG%%/articles/version-guide/article.txt
%%DOCSDIR%%/%%DOCLANG%%/books/developers-handbook/book.txt
%%DOCSDIR%%/%%DOCLANG%%/books/faq/book.txt
%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/book.txt
diff --git a/misc/freebsd-doc-el/pkg-plist.common b/misc/freebsd-doc-el/pkg-plist.common
index d5a336dd90c6..4a8340e1d43f 100644
--- a/misc/freebsd-doc-el/pkg-plist.common
+++ b/misc/freebsd-doc-el/pkg-plist.common
@@ -19,16 +19,13 @@
@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/nanobsd/imagelib/callouts
@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/nanobsd/imagelib
@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/nanobsd
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/multi-os
@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/mailing-list-faq
@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/linux-users
@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/laptop
@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/greek-language-support
@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/gjournal-desktop
@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-questions
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/formatting-media
@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/dialup-firewall
@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/cvs-freebsd
@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/contributing
@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/compiz-fusion
diff --git a/misc/freebsd-doc-el/pkg-plist.html b/misc/freebsd-doc-el/pkg-plist.html
index 2a56e84bb0d7..5cd20cfc30c1 100644
--- a/misc/freebsd-doc-el/pkg-plist.html
+++ b/misc/freebsd-doc-el/pkg-plist.html
@@ -3,16 +3,13 @@
%%DOCSDIR%%/%%DOCLANG%%/articles/compiz-fusion/article.html
%%DOCSDIR%%/%%DOCLANG%%/articles/contributing/article.html
%%DOCSDIR%%/%%DOCLANG%%/articles/cvs-freebsd/article.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/dialup-firewall/article.html
%%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd/article.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/formatting-media/article.html
%%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-questions/article.html
%%DOCSDIR%%/%%DOCLANG%%/articles/gjournal-desktop/article.html
%%DOCSDIR%%/%%DOCLANG%%/articles/greek-language-support/article.html
%%DOCSDIR%%/%%DOCLANG%%/articles/laptop/article.html
%%DOCSDIR%%/%%DOCLANG%%/articles/linux-users/article.html
%%DOCSDIR%%/%%DOCLANG%%/articles/mailing-list-faq/article.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/multi-os/article.html
%%DOCSDIR%%/%%DOCLANG%%/articles/nanobsd/article.html
%%DOCSDIR%%/%%DOCLANG%%/articles/new-users/article.html
%%DOCSDIR%%/%%DOCLANG%%/articles/problem-reports/article.html
diff --git a/misc/freebsd-doc-el/pkg-plist.html-common b/misc/freebsd-doc-el/pkg-plist.html-common
index 03578788948c..df1fcca81baa 100644
--- a/misc/freebsd-doc-el/pkg-plist.html-common
+++ b/misc/freebsd-doc-el/pkg-plist.html-common
@@ -3,9 +3,7 @@
%%DOCSDIR%%/%%DOCLANG%%/articles/compiz-fusion/docbook.css
%%DOCSDIR%%/%%DOCLANG%%/articles/contributing/docbook.css
%%DOCSDIR%%/%%DOCLANG%%/articles/cvs-freebsd/docbook.css
-%%DOCSDIR%%/%%DOCLANG%%/articles/dialup-firewall/docbook.css
%%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd/docbook.css
-%%DOCSDIR%%/%%DOCLANG%%/articles/formatting-media/docbook.css
%%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-questions/docbook.css
%%DOCSDIR%%/%%DOCLANG%%/articles/gjournal-desktop/disklabel1.png
%%DOCSDIR%%/%%DOCLANG%%/articles/gjournal-desktop/disklabel2.png
@@ -14,7 +12,6 @@
%%DOCSDIR%%/%%DOCLANG%%/articles/laptop/docbook.css
%%DOCSDIR%%/%%DOCLANG%%/articles/linux-users/docbook.css
%%DOCSDIR%%/%%DOCLANG%%/articles/mailing-list-faq/docbook.css
-%%DOCSDIR%%/%%DOCLANG%%/articles/multi-os/docbook.css
%%DOCSDIR%%/%%DOCLANG%%/articles/nanobsd/docbook.css
%%DOCSDIR%%/%%DOCLANG%%/articles/nanobsd/imagelib/callouts/1.png
%%DOCSDIR%%/%%DOCLANG%%/articles/nanobsd/imagelib/callouts/2.png
diff --git a/misc/freebsd-doc-el/pkg-plist.html-split b/misc/freebsd-doc-el/pkg-plist.html-split
index 39f6962f194a..04efa986752a 100644
--- a/misc/freebsd-doc-el/pkg-plist.html-split
+++ b/misc/freebsd-doc-el/pkg-plist.html-split
@@ -1,5 +1,4 @@
@comment $FreeBSD$
-%%DOCSDIR%%/%%DOCLANG%%/articles/bsdl-gpl/TRADEMARKS.html
%%DOCSDIR%%/%%DOCLANG%%/articles/bsdl-gpl/addenda.html
%%DOCSDIR%%/%%DOCLANG%%/articles/bsdl-gpl/bsd-advantages.html
%%DOCSDIR%%/%%DOCLANG%%/articles/bsdl-gpl/conclusion.html
@@ -12,66 +11,53 @@
%%DOCSDIR%%/%%DOCLANG%%/articles/bsdl-gpl/origins-lgpl.html
%%DOCSDIR%%/%%DOCLANG%%/articles/bsdl-gpl/orphaning.html
%%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/compiz-fusion/TRADEMARKS.html
%%DOCSDIR%%/%%DOCLANG%%/articles/compiz-fusion/compiz-fusion.html
%%DOCSDIR%%/%%DOCLANG%%/articles/compiz-fusion/compiz-troubleshooting.html
%%DOCSDIR%%/%%DOCLANG%%/articles/compiz-fusion/index.html
%%DOCSDIR%%/%%DOCLANG%%/articles/compiz-fusion/nvidia-setup.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/compiz-fusion/trademarks.html
%%DOCSDIR%%/%%DOCLANG%%/articles/compiz-fusion/xorg-configuration.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/contributing/TRADEMARKS.html
%%DOCSDIR%%/%%DOCLANG%%/articles/contributing/contrib-how.html
%%DOCSDIR%%/%%DOCLANG%%/articles/contributing/index.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/cvs-freebsd/TRADEMARKS.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/contributing/trademarks.html
%%DOCSDIR%%/%%DOCLANG%%/articles/cvs-freebsd/first-setup.html
%%DOCSDIR%%/%%DOCLANG%%/articles/cvs-freebsd/freebsdspecific.html
%%DOCSDIR%%/%%DOCLANG%%/articles/cvs-freebsd/index.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/dialup-firewall/TRADEMARKS.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/dialup-firewall/index.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/dialup-firewall/kernel.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/dialup-firewall/rcconf.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/dialup-firewall/rules.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/dialup-firewall/x75.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/dialup-firewall/x96.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd/TRADEMARKS.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/cvs-freebsd/trademarks.html
%%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd/index.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd/x121.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd/x62.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd/x96.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/formatting-media/TRADEMARKS.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/formatting-media/index.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/formatting-media/x165.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/formatting-media/x223.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/formatting-media/x321.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/formatting-media/x76.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-questions/TRADEMARKS.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/index.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/x38.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/gjournal-desktop/TRADEMARKS.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
%%DOCSDIR%%/%%DOCLANG%%/articles/gjournal-desktop/reserve-space.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/gjournal-desktop/trademarks.html
%%DOCSDIR%%/%%DOCLANG%%/articles/gjournal-desktop/troubleshooting-gjournal.html
%%DOCSDIR%%/%%DOCLANG%%/articles/gjournal-desktop/understanding-journaling.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/greek-language-support/TRADEMARKS.html
%%DOCSDIR%%/%%DOCLANG%%/articles/greek-language-support/console-setup.html
%%DOCSDIR%%/%%DOCLANG%%/articles/greek-language-support/index.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/greek-language-support/trademarks.html
%%DOCSDIR%%/%%DOCLANG%%/articles/greek-language-support/various-apps.html
%%DOCSDIR%%/%%DOCLANG%%/articles/greek-language-support/x11-fonts.html
%%DOCSDIR%%/%%DOCLANG%%/articles/greek-language-support/xorg-setup.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/laptop/TRADEMARKS.html
%%DOCSDIR%%/%%DOCLANG%%/articles/laptop/index.html
%%DOCSDIR%%/%%DOCLANG%%/articles/laptop/modems.html
%%DOCSDIR%%/%%DOCLANG%%/articles/laptop/pcmcia.html
%%DOCSDIR%%/%%DOCLANG%%/articles/laptop/power-management.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/linux-users/TRADEMARKS.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/laptop/trademarks.html
%%DOCSDIR%%/%%DOCLANG%%/articles/linux-users/commands.html
%%DOCSDIR%%/%%DOCLANG%%/articles/linux-users/conclusion.html
%%DOCSDIR%%/%%DOCLANG%%/articles/linux-users/firewall.html
@@ -81,24 +67,16 @@
%%DOCSDIR%%/%%DOCLANG%%/articles/linux-users/shells.html
%%DOCSDIR%%/%%DOCLANG%%/articles/linux-users/software.html
%%DOCSDIR%%/%%DOCLANG%%/articles/linux-users/startup.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/linux-users/trademarks.html
%%DOCSDIR%%/%%DOCLANG%%/articles/linux-users/updates.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/multi-os/TRADEMARKS.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/multi-os/ch2.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/multi-os/ch3.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/multi-os/ch4.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/multi-os/ch5.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/multi-os/index.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/multi-os/sources.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/multi-os/x188.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/nanobsd/TRADEMARKS.html
%%DOCSDIR%%/%%DOCLANG%%/articles/nanobsd/howto.html
%%DOCSDIR%%/%%DOCLANG%%/articles/nanobsd/index.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/new-users/TRADEMARKS.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/nanobsd/trademarks.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
@@ -109,16 +87,17 @@
%%DOCSDIR%%/%%DOCLANG%%/articles/new-users/other-useful-commands.html
%%DOCSDIR%%/%%DOCLANG%%/articles/new-users/other.html
%%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/problem-reports/TRADEMARKS.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/problem-reports/trademarks.html
%%DOCSDIR%%/%%DOCLANG%%/articles/releng-packages/index.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/releng-packages/x29.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
@@ -147,7 +126,7 @@
%%DOCSDIR%%/%%DOCLANG%%/books/faq/install.html
%%DOCSDIR%%/%%DOCLANG%%/books/faq/introduction.html
%%DOCSDIR%%/%%DOCLANG%%/books/faq/kernelconfig.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/ln24.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ln23.html
%%DOCSDIR%%/%%DOCLANG%%/books/faq/misc.html
%%DOCSDIR%%/%%DOCLANG%%/books/faq/networking.html
%%DOCSDIR%%/%%DOCLANG%%/books/faq/ppp.html
@@ -252,6 +231,7 @@
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/eresources-news.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/eresources-web.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/eresources.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/filesystems-linux.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/filesystems-zfs.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/filesystems.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/firewalls-apps.html
@@ -268,6 +248,7 @@
%%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
@@ -314,7 +295,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/ln26.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/ln27.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/mac-biba.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/mac-bsdextended.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/mac-ifoff.html
diff --git a/misc/freebsd-doc-el/pkg-plist.pdf b/misc/freebsd-doc-el/pkg-plist.pdf
index 3f3367df128c..9002f0f85af4 100644
--- a/misc/freebsd-doc-el/pkg-plist.pdf
+++ b/misc/freebsd-doc-el/pkg-plist.pdf
@@ -3,16 +3,13 @@
%%DOCSDIR%%/%%DOCLANG%%/articles/compiz-fusion/article.pdf
%%DOCSDIR%%/%%DOCLANG%%/articles/contributing/article.pdf
%%DOCSDIR%%/%%DOCLANG%%/articles/cvs-freebsd/article.pdf
-%%DOCSDIR%%/%%DOCLANG%%/articles/dialup-firewall/article.pdf
%%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd/article.pdf
-%%DOCSDIR%%/%%DOCLANG%%/articles/formatting-media/article.pdf
%%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-questions/article.pdf
%%DOCSDIR%%/%%DOCLANG%%/articles/gjournal-desktop/article.pdf
%%DOCSDIR%%/%%DOCLANG%%/articles/greek-language-support/article.pdf
%%DOCSDIR%%/%%DOCLANG%%/articles/laptop/article.pdf
%%DOCSDIR%%/%%DOCLANG%%/articles/linux-users/article.pdf
%%DOCSDIR%%/%%DOCLANG%%/articles/mailing-list-faq/article.pdf
-%%DOCSDIR%%/%%DOCLANG%%/articles/multi-os/article.pdf
%%DOCSDIR%%/%%DOCLANG%%/articles/nanobsd/article.pdf
%%DOCSDIR%%/%%DOCLANG%%/articles/new-users/article.pdf
%%DOCSDIR%%/%%DOCLANG%%/articles/problem-reports/article.pdf
diff --git a/misc/freebsd-doc-el/pkg-plist.ps b/misc/freebsd-doc-el/pkg-plist.ps
index 6a9b65737abf..55e3a364c936 100644
--- a/misc/freebsd-doc-el/pkg-plist.ps
+++ b/misc/freebsd-doc-el/pkg-plist.ps
@@ -3,16 +3,13 @@
%%DOCSDIR%%/%%DOCLANG%%/articles/compiz-fusion/article.ps
%%DOCSDIR%%/%%DOCLANG%%/articles/contributing/article.ps
%%DOCSDIR%%/%%DOCLANG%%/articles/cvs-freebsd/article.ps
-%%DOCSDIR%%/%%DOCLANG%%/articles/dialup-firewall/article.ps
%%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd/article.ps
-%%DOCSDIR%%/%%DOCLANG%%/articles/formatting-media/article.ps
%%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-questions/article.ps
%%DOCSDIR%%/%%DOCLANG%%/articles/gjournal-desktop/article.ps
%%DOCSDIR%%/%%DOCLANG%%/articles/greek-language-support/article.ps
%%DOCSDIR%%/%%DOCLANG%%/articles/laptop/article.ps
%%DOCSDIR%%/%%DOCLANG%%/articles/linux-users/article.ps
%%DOCSDIR%%/%%DOCLANG%%/articles/mailing-list-faq/article.ps
-%%DOCSDIR%%/%%DOCLANG%%/articles/multi-os/article.ps
%%DOCSDIR%%/%%DOCLANG%%/articles/nanobsd/article.ps
%%DOCSDIR%%/%%DOCLANG%%/articles/new-users/article.ps
%%DOCSDIR%%/%%DOCLANG%%/articles/problem-reports/article.ps
diff --git a/misc/freebsd-doc-el/pkg-plist.txt b/misc/freebsd-doc-el/pkg-plist.txt
index 5984c3c697d1..a9e2bc309e8b 100644
--- a/misc/freebsd-doc-el/pkg-plist.txt
+++ b/misc/freebsd-doc-el/pkg-plist.txt
@@ -3,16 +3,13 @@
%%DOCSDIR%%/%%DOCLANG%%/articles/compiz-fusion/article.txt
%%DOCSDIR%%/%%DOCLANG%%/articles/contributing/article.txt
%%DOCSDIR%%/%%DOCLANG%%/articles/cvs-freebsd/article.txt
-%%DOCSDIR%%/%%DOCLANG%%/articles/dialup-firewall/article.txt
%%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd/article.txt
-%%DOCSDIR%%/%%DOCLANG%%/articles/formatting-media/article.txt
%%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-questions/article.txt
%%DOCSDIR%%/%%DOCLANG%%/articles/gjournal-desktop/article.txt
%%DOCSDIR%%/%%DOCLANG%%/articles/greek-language-support/article.txt
%%DOCSDIR%%/%%DOCLANG%%/articles/laptop/article.txt
%%DOCSDIR%%/%%DOCLANG%%/articles/linux-users/article.txt
%%DOCSDIR%%/%%DOCLANG%%/articles/mailing-list-faq/article.txt
-%%DOCSDIR%%/%%DOCLANG%%/articles/multi-os/article.txt
%%DOCSDIR%%/%%DOCLANG%%/articles/nanobsd/article.txt
%%DOCSDIR%%/%%DOCLANG%%/articles/new-users/article.txt
%%DOCSDIR%%/%%DOCLANG%%/articles/problem-reports/article.txt
diff --git a/misc/freebsd-doc-en/Makefile b/misc/freebsd-doc-en/Makefile
index 076c12b9d4c9..1a68f3e133cc 100644
--- a/misc/freebsd-doc-en/Makefile
+++ b/misc/freebsd-doc-en/Makefile
@@ -28,7 +28,7 @@
#
PORTNAME= freebsd-doc
-PORTVERSION= 40385
+PORTVERSION= 40771
PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= misc docs
diff --git a/misc/freebsd-doc-en/distinfo b/misc/freebsd-doc-en/distinfo
index f9396ad4169c..e9d35db87cf8 100644
--- a/misc/freebsd-doc-en/distinfo
+++ b/misc/freebsd-doc-en/distinfo
@@ -1,2 +1,2 @@
-SHA256 (freebsd-doc-40385.tar.gz) = 753e68af94c860bdab3997cd5a93c33c419931db28443342f9c37d0fd50d8e50
-SIZE (freebsd-doc-40385.tar.gz) = 32680440
+SHA256 (freebsd-doc-40771.tar.gz) = 8edd6717dff3f670234007d77d599b154d19cf3a897f73b6b0c5f8f30121a1ff
+SIZE (freebsd-doc-40771.tar.gz) = 32696016
diff --git a/misc/freebsd-doc-en/pkg-plist.common b/misc/freebsd-doc-en/pkg-plist.common
index 58c7aa57cc3d..84695297acb2 100644
--- a/misc/freebsd-doc-en/pkg-plist.common
+++ b/misc/freebsd-doc-en/pkg-plist.common
@@ -24,17 +24,12 @@
@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/developers-handbook
@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/dev-model
@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/design-44bsd
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/corp-net-guide
@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/arch-handbook/imagelib/callouts
@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/arch-handbook/imagelib
@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/arch-handbook
@dirrm %%DOCSDIR%%/%%DOCLANG%%/books
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/zip-drive
@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/wp-toolbox
@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/vm-design
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/vinum
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/version-guide
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/storage-devices
@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/solid-state
@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/serial-uart
@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/remote-install/imagelib/callouts
@@ -56,7 +51,6 @@
@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/nanobsd/imagelib/callouts
@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/nanobsd/imagelib
@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/nanobsd
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/multi-os
@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/mh
@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/mailing-list-faq
@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/linux-users
@@ -66,21 +60,16 @@
@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/laptop
@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/ipsec-must
@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/hubs
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/hats
@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/gjournal-desktop
@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/geom-class
@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/freebsd-questions
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/formatting-media
@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/fonts
@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/filtering-bridges
@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/fbsd-from-scratch
@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/euro
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/diskless-x
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/dialup-firewall
@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/cvsup-advanced
@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/cvs-freebsd
@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/custom-gcc
@@ -91,11 +80,9 @@
@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/console-server
@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/compiz-fusion
@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/committers-guide
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/checkpoint
@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/casestudy-argentina.com
@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/building-products
@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/bsdl-gpl
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/5-roadmap
@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles
%%DOCSDIR%%/%%DOCLANG_PREFIX%%
@dirrm %%DOCSDIR%%/%%DOCLANG%%
diff --git a/misc/freebsd-doc-en/pkg-plist.html b/misc/freebsd-doc-en/pkg-plist.html
index 68b898208777..79b3fbb5d35a 100644
--- a/misc/freebsd-doc-en/pkg-plist.html
+++ b/misc/freebsd-doc-en/pkg-plist.html
@@ -1,9 +1,7 @@
@comment $FreeBSD$
-%%DOCSDIR%%/%%DOCLANG%%/articles/5-roadmap/article.html
%%DOCSDIR%%/%%DOCLANG%%/articles/bsdl-gpl/article.html
%%DOCSDIR%%/%%DOCLANG%%/articles/building-products/article.html
%%DOCSDIR%%/%%DOCLANG%%/articles/casestudy-argentina.com/article.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/checkpoint/article.html
%%DOCSDIR%%/%%DOCLANG%%/articles/committers-guide/article.html
%%DOCSDIR%%/%%DOCLANG%%/articles/compiz-fusion/article.html
%%DOCSDIR%%/%%DOCLANG%%/articles/console-server/article.html
@@ -14,19 +12,14 @@
%%DOCSDIR%%/%%DOCLANG%%/articles/custom-gcc/article.html
%%DOCSDIR%%/%%DOCLANG%%/articles/cvs-freebsd/article.html
%%DOCSDIR%%/%%DOCLANG%%/articles/cvsup-advanced/article.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/dialup-firewall/article.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/diskless-x/article.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/euro/article.html
%%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd/article.html
%%DOCSDIR%%/%%DOCLANG%%/articles/fbsd-from-scratch/article.html
%%DOCSDIR%%/%%DOCLANG%%/articles/filtering-bridges/article.html
%%DOCSDIR%%/%%DOCLANG%%/articles/fonts/article.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/formatting-media/article.html
%%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-questions/article.html
%%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-update-server/article.html
%%DOCSDIR%%/%%DOCLANG%%/articles/geom-class/article.html
%%DOCSDIR%%/%%DOCLANG%%/articles/gjournal-desktop/article.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/hats/article.html
%%DOCSDIR%%/%%DOCLANG%%/articles/hubs/article.html
%%DOCSDIR%%/%%DOCLANG%%/articles/ipsec-must/article.html
%%DOCSDIR%%/%%DOCLANG%%/articles/laptop/article.html
@@ -36,7 +29,6 @@
%%DOCSDIR%%/%%DOCLANG%%/articles/linux-users/article.html
%%DOCSDIR%%/%%DOCLANG%%/articles/mailing-list-faq/article.html
%%DOCSDIR%%/%%DOCLANG%%/articles/mh/article.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/multi-os/article.html
%%DOCSDIR%%/%%DOCLANG%%/articles/nanobsd/article.html
%%DOCSDIR%%/%%DOCLANG%%/articles/new-users/article.html
%%DOCSDIR%%/%%DOCLANG%%/articles/p4-primer/article.html
@@ -52,14 +44,9 @@
%%DOCSDIR%%/%%DOCLANG%%/articles/remote-install/article.html
%%DOCSDIR%%/%%DOCLANG%%/articles/serial-uart/article.html
%%DOCSDIR%%/%%DOCLANG%%/articles/solid-state/article.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/storage-devices/article.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/version-guide/article.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/vinum/article.html
%%DOCSDIR%%/%%DOCLANG%%/articles/vm-design/article.html
%%DOCSDIR%%/%%DOCLANG%%/articles/wp-toolbox/article.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/zip-drive/article.html
%%DOCSDIR%%/%%DOCLANG%%/books/arch-handbook/book.html
-%%DOCSDIR%%/%%DOCLANG%%/books/corp-net-guide/book.html
%%DOCSDIR%%/%%DOCLANG%%/books/design-44bsd/book.html
%%DOCSDIR%%/%%DOCLANG%%/books/dev-model/book.html
%%DOCSDIR%%/%%DOCLANG%%/books/developers-handbook/book.html
diff --git a/misc/freebsd-doc-en/pkg-plist.html-common b/misc/freebsd-doc-en/pkg-plist.html-common
index 445dd4abcf7b..97816acda3e6 100644
--- a/misc/freebsd-doc-en/pkg-plist.html-common
+++ b/misc/freebsd-doc-en/pkg-plist.html-common
@@ -1,12 +1,9 @@
@comment $FreeBSD$
-%%DOCSDIR%%/%%DOCLANG%%/articles/5-roadmap/docbook.css
%%DOCSDIR%%/%%DOCLANG%%/articles/bsdl-gpl/docbook.css
%%DOCSDIR%%/%%DOCLANG%%/articles/building-products/docbook.css
%%DOCSDIR%%/%%DOCLANG%%/articles/building-products/freebsd-branches.png
%%DOCSDIR%%/%%DOCLANG%%/articles/building-products/freebsd-organization.png
%%DOCSDIR%%/%%DOCLANG%%/articles/casestudy-argentina.com/docbook.css
-%%DOCSDIR%%/%%DOCLANG%%/articles/checkpoint/docbook.css
-%%DOCSDIR%%/%%DOCLANG%%/articles/checkpoint/networks.png
%%DOCSDIR%%/%%DOCLANG%%/articles/committers-guide/docbook.css
%%DOCSDIR%%/%%DOCLANG%%/articles/compiz-fusion/docbook.css
%%DOCSDIR%%/%%DOCLANG%%/articles/console-server/docbook.css
@@ -18,14 +15,10 @@
%%DOCSDIR%%/%%DOCLANG%%/articles/custom-gcc/docbook.css
%%DOCSDIR%%/%%DOCLANG%%/articles/cvs-freebsd/docbook.css
%%DOCSDIR%%/%%DOCLANG%%/articles/cvsup-advanced/docbook.css
-%%DOCSDIR%%/%%DOCLANG%%/articles/dialup-firewall/docbook.css
-%%DOCSDIR%%/%%DOCLANG%%/articles/diskless-x/docbook.css
-%%DOCSDIR%%/%%DOCLANG%%/articles/euro/docbook.css
%%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd/docbook.css
%%DOCSDIR%%/%%DOCLANG%%/articles/fbsd-from-scratch/docbook.css
%%DOCSDIR%%/%%DOCLANG%%/articles/filtering-bridges/docbook.css
%%DOCSDIR%%/%%DOCLANG%%/articles/fonts/docbook.css
-%%DOCSDIR%%/%%DOCLANG%%/articles/formatting-media/docbook.css
%%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-questions/docbook.css
%%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-update-server/docbook.css
%%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-update-server/imagelib/callouts/1.png
@@ -37,7 +30,6 @@
%%DOCSDIR%%/%%DOCLANG%%/articles/gjournal-desktop/disklabel1.png
%%DOCSDIR%%/%%DOCLANG%%/articles/gjournal-desktop/disklabel2.png
%%DOCSDIR%%/%%DOCLANG%%/articles/gjournal-desktop/docbook.css
-%%DOCSDIR%%/%%DOCLANG%%/articles/hats/docbook.css
%%DOCSDIR%%/%%DOCLANG%%/articles/hubs/docbook.css
%%DOCSDIR%%/%%DOCLANG%%/articles/ipsec-must/docbook.css
%%DOCSDIR%%/%%DOCLANG%%/articles/laptop/docbook.css
@@ -47,7 +39,6 @@
%%DOCSDIR%%/%%DOCLANG%%/articles/linux-users/docbook.css
%%DOCSDIR%%/%%DOCLANG%%/articles/mailing-list-faq/docbook.css
%%DOCSDIR%%/%%DOCLANG%%/articles/mh/docbook.css
-%%DOCSDIR%%/%%DOCLANG%%/articles/multi-os/docbook.css
%%DOCSDIR%%/%%DOCLANG%%/articles/nanobsd/docbook.css
%%DOCSDIR%%/%%DOCLANG%%/articles/nanobsd/imagelib/callouts/1.png
%%DOCSDIR%%/%%DOCLANG%%/articles/nanobsd/imagelib/callouts/2.png
@@ -96,19 +87,12 @@
%%DOCSDIR%%/%%DOCLANG%%/articles/remote-install/imagelib/callouts/7.png
%%DOCSDIR%%/%%DOCLANG%%/articles/serial-uart/docbook.css
%%DOCSDIR%%/%%DOCLANG%%/articles/solid-state/docbook.css
-%%DOCSDIR%%/%%DOCLANG%%/articles/storage-devices/docbook.css
-%%DOCSDIR%%/%%DOCLANG%%/articles/version-guide/docbook.css
-%%DOCSDIR%%/%%DOCLANG%%/articles/vinum/ad0b4aft.png
-%%DOCSDIR%%/%%DOCLANG%%/articles/vinum/ad2b4aft.png
-%%DOCSDIR%%/%%DOCLANG%%/articles/vinum/arch.png
-%%DOCSDIR%%/%%DOCLANG%%/articles/vinum/docbook.css
%%DOCSDIR%%/%%DOCLANG%%/articles/vm-design/docbook.css
%%DOCSDIR%%/%%DOCLANG%%/articles/vm-design/fig1.png
%%DOCSDIR%%/%%DOCLANG%%/articles/vm-design/fig2.png
%%DOCSDIR%%/%%DOCLANG%%/articles/vm-design/fig3.png
%%DOCSDIR%%/%%DOCLANG%%/articles/vm-design/fig4.png
%%DOCSDIR%%/%%DOCLANG%%/articles/wp-toolbox/docbook.css
-%%DOCSDIR%%/%%DOCLANG%%/articles/zip-drive/docbook.css
%%DOCSDIR%%/%%DOCLANG%%/books/arch-handbook/docbook.css
%%DOCSDIR%%/%%DOCLANG%%/books/arch-handbook/imagelib/callouts/1.png
%%DOCSDIR%%/%%DOCLANG%%/books/arch-handbook/imagelib/callouts/10.png
@@ -120,13 +104,6 @@
%%DOCSDIR%%/%%DOCLANG%%/books/arch-handbook/imagelib/callouts/7.png
%%DOCSDIR%%/%%DOCLANG%%/books/arch-handbook/imagelib/callouts/8.png
%%DOCSDIR%%/%%DOCLANG%%/books/arch-handbook/imagelib/callouts/9.png
-%%DOCSDIR%%/%%DOCLANG%%/books/corp-net-guide/08-01.png
-%%DOCSDIR%%/%%DOCLANG%%/books/corp-net-guide/08-02.png
-%%DOCSDIR%%/%%DOCLANG%%/books/corp-net-guide/08-03.png
-%%DOCSDIR%%/%%DOCLANG%%/books/corp-net-guide/08-04.png
-%%DOCSDIR%%/%%DOCLANG%%/books/corp-net-guide/08-05.png
-%%DOCSDIR%%/%%DOCLANG%%/books/corp-net-guide/08-06.png
-%%DOCSDIR%%/%%DOCLANG%%/books/corp-net-guide/docbook.css
%%DOCSDIR%%/%%DOCLANG%%/books/design-44bsd/docbook.css
%%DOCSDIR%%/%%DOCLANG%%/books/design-44bsd/fig1.png
%%DOCSDIR%%/%%DOCLANG%%/books/design-44bsd/fig2.png
diff --git a/misc/freebsd-doc-en/pkg-plist.html-split b/misc/freebsd-doc-en/pkg-plist.html-split
index 934aae427591..c38e70a5c153 100644
--- a/misc/freebsd-doc-en/pkg-plist.html-split
+++ b/misc/freebsd-doc-en/pkg-plist.html-split
@@ -1,10 +1,4 @@
@comment $FreeBSD$
-%%DOCSDIR%%/%%DOCLANG%%/articles/5-roadmap/TRADEMARKS.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/5-roadmap/future.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/5-roadmap/goals.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/5-roadmap/index.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/5-roadmap/major-issues.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/bsdl-gpl/TRADEMARKS.html
%%DOCSDIR%%/%%DOCLANG%%/articles/bsdl-gpl/addenda.html
%%DOCSDIR%%/%%DOCLANG%%/articles/bsdl-gpl/bsd-advantages.html
%%DOCSDIR%%/%%DOCLANG%%/articles/bsdl-gpl/conclusion.html
@@ -17,27 +11,19 @@
%%DOCSDIR%%/%%DOCLANG%%/articles/bsdl-gpl/origins-lgpl.html
%%DOCSDIR%%/%%DOCLANG%%/articles/bsdl-gpl/orphaning.html
%%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/TRADEMARKS.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/building-products/b382.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/building-products/b383.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/casestudy-argentina.com/TRADEMARKS.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/building-products/trademarks.html
%%DOCSDIR%%/%%DOCLANG%%/articles/casestudy-argentina.com/challenge.html
%%DOCSDIR%%/%%DOCLANG%%/articles/casestudy-argentina.com/freebsd.html
%%DOCSDIR%%/%%DOCLANG%%/articles/casestudy-argentina.com/index.html
%%DOCSDIR%%/%%DOCLANG%%/articles/casestudy-argentina.com/results.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/checkpoint/LEGALNOTICE.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/checkpoint/index.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/checkpoint/object.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/checkpoint/policy.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/checkpoint/racoon.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/checkpoint/references.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/checkpoint/rulecfg.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/checkpoint/startingvpn.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/committers-guide/TRADEMARKS.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/casestudy-argentina.com/trademarks.html
%%DOCSDIR%%/%%DOCLANG%%/articles/committers-guide/archs.html
%%DOCSDIR%%/%%DOCLANG%%/articles/committers-guide/committer.types.html
%%DOCSDIR%%/%%DOCLANG%%/articles/committers-guide/conventions.html
@@ -54,13 +40,13 @@
%%DOCSDIR%%/%%DOCLANG%%/articles/committers-guide/rules.html
%%DOCSDIR%%/%%DOCLANG%%/articles/committers-guide/ssh.guide.html
%%DOCSDIR%%/%%DOCLANG%%/articles/committers-guide/subversion-primer.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/compiz-fusion/TRADEMARKS.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/committers-guide/trademarks.html
%%DOCSDIR%%/%%DOCLANG%%/articles/compiz-fusion/compiz-fusion.html
%%DOCSDIR%%/%%DOCLANG%%/articles/compiz-fusion/compiz-troubleshooting.html
%%DOCSDIR%%/%%DOCLANG%%/articles/compiz-fusion/index.html
%%DOCSDIR%%/%%DOCLANG%%/articles/compiz-fusion/nvidia-setup.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/compiz-fusion/trademarks.html
%%DOCSDIR%%/%%DOCLANG%%/articles/compiz-fusion/xorg-configuration.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/console-server/TRADEMARKS.html
%%DOCSDIR%%/%%DOCLANG%%/articles/console-server/cabling.html
%%DOCSDIR%%/%%DOCLANG%%/articles/console-server/conserver-versions.html
%%DOCSDIR%%/%%DOCLANG%%/articles/console-server/freebsd.html
@@ -72,7 +58,7 @@
%%DOCSDIR%%/%%DOCLANG%%/articles/console-server/security.html
%%DOCSDIR%%/%%DOCLANG%%/articles/console-server/setting-up-server.html
%%DOCSDIR%%/%%DOCLANG%%/articles/console-server/solaris.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/contributing-ports/TRADEMARKS.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/console-server/trademarks.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
@@ -80,11 +66,11 @@
%%DOCSDIR%%/%%DOCLANG%%/articles/contributing-ports/maintain-port.html
%%DOCSDIR%%/%%DOCLANG%%/articles/contributing-ports/mortal-coil.html
%%DOCSDIR%%/%%DOCLANG%%/articles/contributing-ports/resources.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/contributing-ports/trademarks.html
%%DOCSDIR%%/%%DOCLANG%%/articles/contributing-ports/what-contribute.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/contributing/TRADEMARKS.html
%%DOCSDIR%%/%%DOCLANG%%/articles/contributing/contrib-how.html
%%DOCSDIR%%/%%DOCLANG%%/articles/contributing/index.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/contributors/TRADEMARKS.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/contributing/trademarks.html
%%DOCSDIR%%/%%DOCLANG%%/articles/contributors/contrib-386bsd.html
%%DOCSDIR%%/%%DOCLANG%%/articles/contributors/contrib-additional.html
%%DOCSDIR%%/%%DOCLANG%%/articles/contributors/contrib-corealumni.html
@@ -94,7 +80,7 @@
%%DOCSDIR%%/%%DOCLANG%%/articles/contributors/contrib-portmgralumni.html
%%DOCSDIR%%/%%DOCLANG%%/articles/contributors/index.html
%%DOCSDIR%%/%%DOCLANG%%/articles/contributors/staff-committers.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/cups/TRADEMARKS.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/contributors/trademarks.html
%%DOCSDIR%%/%%DOCLANG%%/articles/cups/index.html
%%DOCSDIR%%/%%DOCLANG%%/articles/cups/printing-cups-clients.html
%%DOCSDIR%%/%%DOCLANG%%/articles/cups/printing-cups-configuring-printers.html
@@ -102,45 +88,26 @@
%%DOCSDIR%%/%%DOCLANG%%/articles/cups/printing-cups-install.html
%%DOCSDIR%%/%%DOCLANG%%/articles/cups/printing-cups-ports-knobs.html
%%DOCSDIR%%/%%DOCLANG%%/articles/cups/printing-cups-troubleshooting.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/custom-gcc/TRADEMARKS.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/cups/trademarks.html
%%DOCSDIR%%/%%DOCLANG%%/articles/custom-gcc/configuring-ports-gcc.html
%%DOCSDIR%%/%%DOCLANG%%/articles/custom-gcc/index.html
%%DOCSDIR%%/%%DOCLANG%%/articles/custom-gcc/performance-imparct.html
%%DOCSDIR%%/%%DOCLANG%%/articles/custom-gcc/prerequisites.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/cvs-freebsd/TRADEMARKS.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/custom-gcc/trademarks.html
%%DOCSDIR%%/%%DOCLANG%%/articles/cvs-freebsd/first-setup.html
%%DOCSDIR%%/%%DOCLANG%%/articles/cvs-freebsd/freebsdspecific.html
%%DOCSDIR%%/%%DOCLANG%%/articles/cvs-freebsd/index.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/cvsup-advanced/TRADEMARKS.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/dialup-firewall/TRADEMARKS.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/dialup-firewall/index.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/dialup-firewall/kernel.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/dialup-firewall/rcconf.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/dialup-firewall/rules.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/dialup-firewall/x70.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/dialup-firewall/x91.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/diskless-x/TRADEMARKS.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/diskless-x/index.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/diskless-x/x45.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/diskless-x/x55.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/diskless-x/x62.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/diskless-x/x83.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/euro/TRADEMARKS.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/euro/console.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/euro/general.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/euro/index.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/euro/problems.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/euro/x11.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd/TRADEMARKS.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
%%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/fbsd-from-scratch/TRADEMARKS.html
%%DOCSDIR%%/%%DOCLANG%%/articles/fbsd-from-scratch/files.html
%%DOCSDIR%%/%%DOCLANG%%/articles/fbsd-from-scratch/index.html
%%DOCSDIR%%/%%DOCLANG%%/articles/fbsd-from-scratch/limitations.html
@@ -148,42 +115,36 @@
%%DOCSDIR%%/%%DOCLANG%%/articles/fbsd-from-scratch/stage1.html
%%DOCSDIR%%/%%DOCLANG%%/articles/fbsd-from-scratch/stage2.html
%%DOCSDIR%%/%%DOCLANG%%/articles/fbsd-from-scratch/stage3.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/fbsd-from-scratch/trademarks.html
%%DOCSDIR%%/%%DOCLANG%%/articles/fbsd-from-scratch/why.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/filtering-bridges/TRADEMARKS.html
%%DOCSDIR%%/%%DOCLANG%%/articles/filtering-bridges/filtering-bridges-contributors.html
%%DOCSDIR%%/%%DOCLANG%%/articles/filtering-bridges/filtering-bridges-enabling.html
%%DOCSDIR%%/%%DOCLANG%%/articles/filtering-bridges/filtering-bridges-finalprep.html
%%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/fonts/TRADEMARKS.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/filtering-bridges/trademarks.html
%%DOCSDIR%%/%%DOCLANG%%/articles/fonts/additional-questions.html
%%DOCSDIR%%/%%DOCLANG%%/articles/fonts/convert-truetype.html
%%DOCSDIR%%/%%DOCLANG%%/articles/fonts/font-formats.html
%%DOCSDIR%%/%%DOCLANG%%/articles/fonts/index.html
%%DOCSDIR%%/%%DOCLANG%%/articles/fonts/obtaining-additional-fonts.html
%%DOCSDIR%%/%%DOCLANG%%/articles/fonts/terminology.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/fonts/trademarks.html
%%DOCSDIR%%/%%DOCLANG%%/articles/fonts/truetype-for-other-programs.html
%%DOCSDIR%%/%%DOCLANG%%/articles/fonts/type1-fonts-ghostscript.html
%%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/formatting-media/TRADEMARKS.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/formatting-media/index.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/formatting-media/x165.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/formatting-media/x223.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/formatting-media/x321.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/formatting-media/x76.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-questions/TRADEMARKS.html
%%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-questions/index.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-questions/x114.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-questions/x206.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-questions/x218.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-questions/x38.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/freebsd-update-server/TRADEMARKS.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/build.html
%%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-update-server/configuration.html
%%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-update-server/index.html
@@ -191,27 +152,26 @@
%%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/geom-class/TRADEMARKS.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-update-server/trademarks.html
%%DOCSDIR%%/%%DOCLANG%%/articles/geom-class/geom.html
%%DOCSDIR%%/%%DOCLANG%%/articles/geom-class/index.html
%%DOCSDIR%%/%%DOCLANG%%/articles/geom-class/kernelprog.html
%%DOCSDIR%%/%%DOCLANG%%/articles/geom-class/prelim.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/gjournal-desktop/TRADEMARKS.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/geom-class/trademarks.html
%%DOCSDIR%%/%%DOCLANG%%/articles/gjournal-desktop/configure-journal.html
%%DOCSDIR%%/%%DOCLANG%%/articles/gjournal-desktop/further-reading.html
%%DOCSDIR%%/%%DOCLANG%%/articles/gjournal-desktop/index.html
%%DOCSDIR%%/%%DOCLANG%%/articles/gjournal-desktop/reserve-space.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/gjournal-desktop/trademarks.html
%%DOCSDIR%%/%%DOCLANG%%/articles/gjournal-desktop/troubleshooting-gjournal.html
%%DOCSDIR%%/%%DOCLANG%%/articles/gjournal-desktop/understanding-journaling.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/hats/index.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/hubs/TRADEMARKS.html
%%DOCSDIR%%/%%DOCLANG%%/articles/hubs/index.html
%%DOCSDIR%%/%%DOCLANG%%/articles/hubs/mirror-howto.html
%%DOCSDIR%%/%%DOCLANG%%/articles/hubs/mirror-official.html
%%DOCSDIR%%/%%DOCLANG%%/articles/hubs/mirror-requirements.html
%%DOCSDIR%%/%%DOCLANG%%/articles/hubs/mirror-statpages.html
%%DOCSDIR%%/%%DOCLANG%%/articles/hubs/mirror-where.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/ipsec-must/TRADEMARKS.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/hubs/trademarks.html
%%DOCSDIR%%/%%DOCLANG%%/articles/ipsec-must/caveat.html
%%DOCSDIR%%/%%DOCLANG%%/articles/ipsec-must/code.html
%%DOCSDIR%%/%%DOCLANG%%/articles/ipsec-must/experiment.html
@@ -220,26 +180,26 @@
%%DOCSDIR%%/%%DOCLANG%%/articles/ipsec-must/ipsec.html
%%DOCSDIR%%/%%DOCLANG%%/articles/ipsec-must/kernel.html
%%DOCSDIR%%/%%DOCLANG%%/articles/ipsec-must/solution.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/laptop/TRADEMARKS.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/ipsec-must/trademarks.html
%%DOCSDIR%%/%%DOCLANG%%/articles/laptop/index.html
%%DOCSDIR%%/%%DOCLANG%%/articles/laptop/modems.html
%%DOCSDIR%%/%%DOCLANG%%/articles/laptop/pcmcia.html
%%DOCSDIR%%/%%DOCLANG%%/articles/laptop/power-management.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/ldap-auth/TRADEMARKS.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/laptop/trademarks.html
%%DOCSDIR%%/%%DOCLANG%%/articles/ldap-auth/client.html
%%DOCSDIR%%/%%DOCLANG%%/articles/ldap-auth/index.html
%%DOCSDIR%%/%%DOCLANG%%/articles/ldap-auth/ldap.html
%%DOCSDIR%%/%%DOCLANG%%/articles/ldap-auth/secure.html
%%DOCSDIR%%/%%DOCLANG%%/articles/ldap-auth/ssl-ca.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/ldap-auth/trademarks.html
%%DOCSDIR%%/%%DOCLANG%%/articles/ldap-auth/useful.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/linux-comparison/TRADEMARKS.html
%%DOCSDIR%%/%%DOCLANG%%/articles/linux-comparison/freebsd-advantages.html
%%DOCSDIR%%/%%DOCLANG%%/articles/linux-comparison/freebsd-conclusion.html
%%DOCSDIR%%/%%DOCLANG%%/articles/linux-comparison/freebsd-features.html
%%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-emulation/TRADEMARKS.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/linux-comparison/trademarks.html
%%DOCSDIR%%/%%DOCLANG%%/articles/linux-emulation/conclusion.html
%%DOCSDIR%%/%%DOCLANG%%/articles/linux-emulation/freebsd-emulation.html
%%DOCSDIR%%/%%DOCLANG%%/articles/linux-emulation/index.html
@@ -247,7 +207,7 @@
%%DOCSDIR%%/%%DOCLANG%%/articles/linux-emulation/literatures.html
%%DOCSDIR%%/%%DOCLANG%%/articles/linux-emulation/md.html
%%DOCSDIR%%/%%DOCLANG%%/articles/linux-emulation/mi.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/linux-users/TRADEMARKS.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/linux-emulation/trademarks.html
%%DOCSDIR%%/%%DOCLANG%%/articles/linux-users/commands.html
%%DOCSDIR%%/%%DOCLANG%%/articles/linux-users/conclusion.html
%%DOCSDIR%%/%%DOCLANG%%/articles/linux-users/firewall.html
@@ -257,29 +217,21 @@
%%DOCSDIR%%/%%DOCLANG%%/articles/linux-users/shells.html
%%DOCSDIR%%/%%DOCLANG%%/articles/linux-users/software.html
%%DOCSDIR%%/%%DOCLANG%%/articles/linux-users/startup.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/linux-users/trademarks.html
%%DOCSDIR%%/%%DOCLANG%%/articles/linux-users/updates.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/TRADEMARKS.html
%%DOCSDIR%%/%%DOCLANG%%/articles/mh/index.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/mh/x198.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/mh/x375.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/mh/x55.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/multi-os/TRADEMARKS.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/multi-os/ch2.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/multi-os/ch3.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/multi-os/ch4.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/multi-os/ch5.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/multi-os/index.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/multi-os/sources.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/multi-os/x191.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/nanobsd/TRADEMARKS.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/new-users/TRADEMARKS.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/nanobsd/trademarks.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
@@ -290,8 +242,8 @@
%%DOCSDIR%%/%%DOCLANG%%/articles/new-users/other-useful-commands.html
%%DOCSDIR%%/%%DOCLANG%%/articles/new-users/other.html
%%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/TRADEMARKS.html
%%DOCSDIR%%/%%DOCLANG%%/articles/p4-primer/add-rm-files.html
%%DOCSDIR%%/%%DOCLANG%%/articles/p4-primer/branches.html
%%DOCSDIR%%/%%DOCLANG%%/articles/p4-primer/changes.html
@@ -307,6 +259,7 @@
%%DOCSDIR%%/%%DOCLANG%%/articles/p4-primer/start.html
%%DOCSDIR%%/%%DOCLANG%%/articles/p4-primer/submit.html
%%DOCSDIR%%/%%DOCLANG%%/articles/p4-primer/syncing.html
+%%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/pam-appl-prog.html
@@ -320,7 +273,6 @@
%%DOCSDIR%%/%%DOCLANG%%/articles/pam/pam-sample-module.html
%%DOCSDIR%%/%%DOCLANG%%/articles/pam/pam-terms.html
%%DOCSDIR%%/%%DOCLANG%%/articles/port-mentor-guidelines/index.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/portbuild/TRADEMARKS.html
%%DOCSDIR%%/%%DOCLANG%%/articles/portbuild/anatomy.html
%%DOCSDIR%%/%%DOCLANG%%/articles/portbuild/build-maintenance.html
%%DOCSDIR%%/%%DOCLANG%%/articles/portbuild/customizing.html
@@ -339,14 +291,14 @@
%%DOCSDIR%%/%%DOCLANG%%/articles/portbuild/release.html
%%DOCSDIR%%/%%DOCLANG%%/articles/portbuild/setup.html
%%DOCSDIR%%/%%DOCLANG%%/articles/portbuild/starting.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/portbuild/trademarks.html
%%DOCSDIR%%/%%DOCLANG%%/articles/portbuild/uploading.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/pr-guidelines/TRADEMARKS.html
%%DOCSDIR%%/%%DOCLANG%%/articles/pr-guidelines/index.html
%%DOCSDIR%%/%%DOCLANG%%/articles/pr-guidelines/pr-lifecycle.html
%%DOCSDIR%%/%%DOCLANG%%/articles/pr-guidelines/pr-states.html
%%DOCSDIR%%/%%DOCLANG%%/articles/pr-guidelines/pr-types.html
%%DOCSDIR%%/%%DOCLANG%%/articles/pr-guidelines/references.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/problem-reports/TRADEMARKS.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/pr-guidelines/trademarks.html
%%DOCSDIR%%/%%DOCLANG%%/articles/problem-reports/index.html
%%DOCSDIR%%/%%DOCLANG%%/articles/problem-reports/pr-followup.html
%%DOCSDIR%%/%%DOCLANG%%/articles/problem-reports/pr-further.html
@@ -354,7 +306,7 @@
%%DOCSDIR%%/%%DOCLANG%%/articles/problem-reports/pr-problems.html
%%DOCSDIR%%/%%DOCLANG%%/articles/problem-reports/pr-when.html
%%DOCSDIR%%/%%DOCLANG%%/articles/problem-reports/pr-writing.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/rc-scripting/TRADEMARKS.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/problem-reports/trademarks.html
%%DOCSDIR%%/%%DOCLANG%%/articles/rc-scripting/index.html
%%DOCSDIR%%/%%DOCLANG%%/articles/rc-scripting/rcng-args.html
%%DOCSDIR%%/%%DOCLANG%%/articles/rc-scripting/rcng-confdummy.html
@@ -364,11 +316,11 @@
%%DOCSDIR%%/%%DOCLANG%%/articles/rc-scripting/rcng-furthur.html
%%DOCSDIR%%/%%DOCLANG%%/articles/rc-scripting/rcng-hookup.html
%%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/TRADEMARKS.html
%%DOCSDIR%%/%%DOCLANG%%/articles/releng-packages/index.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/releng-packages/x39.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/releng/TRADEMARKS.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
@@ -378,45 +330,24 @@
%%DOCSDIR%%/%%DOCLANG%%/articles/releng/lessons-learned.html
%%DOCSDIR%%/%%DOCLANG%%/articles/releng/release-build.html
%%DOCSDIR%%/%%DOCLANG%%/articles/releng/release-proc.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/remote-install/TRADEMARKS.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/releng/trademarks.html
%%DOCSDIR%%/%%DOCLANG%%/articles/remote-install/index.html
%%DOCSDIR%%/%%DOCLANG%%/articles/remote-install/installation.html
%%DOCSDIR%%/%%DOCLANG%%/articles/remote-install/intro.html
%%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/TRADEMARKS.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/x1044.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/solid-state/TRADEMARKS.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/serial-uart/trademarks.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/serial-uart/x1045.html
%%DOCSDIR%%/%%DOCLANG%%/articles/solid-state/index.html
%%DOCSDIR%%/%%DOCLANG%%/articles/solid-state/kernel.html
%%DOCSDIR%%/%%DOCLANG%%/articles/solid-state/ro-fs.html
%%DOCSDIR%%/%%DOCLANG%%/articles/solid-state/strategies.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/solid-state/x93.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/storage-devices/TRADEMARKS.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/storage-devices/hw-storage-controllers.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/storage-devices/index.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/storage-devices/scsi.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/storage-devices/x1039.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/storage-devices/x493.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/storage-devices/x528.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/version-guide/TRADEMARKS.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/version-guide/conclusion.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/version-guide/decision-points.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/version-guide/future-goals.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/version-guide/index.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/version-guide/past-schedules.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/vinum/TRADEMARKS.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/vinum/acknowledgements.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/vinum/bootstrappingphases.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/vinum/failures.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/vinum/fromhere.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/vinum/index.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/vinum/manualboot.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/vinum/perl.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/vm-design/TRADEMARKS.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
@@ -425,17 +356,13 @@
%%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%%/articles/wp-toolbox/TRADEMARKS.html
%%DOCSDIR%%/%%DOCLANG%%/articles/wp-toolbox/challenge.html
%%DOCSDIR%%/%%DOCLANG%%/articles/wp-toolbox/conclusion.html
%%DOCSDIR%%/%%DOCLANG%%/articles/wp-toolbox/freebsd-solution.html
%%DOCSDIR%%/%%DOCLANG%%/articles/wp-toolbox/index.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/zip-drive/TRADEMARKS.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/zip-drive/index.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/zip-drive/x103.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/zip-drive/x53.html
-%%DOCSDIR%%/%%DOCLANG%%/books/arch-handbook/TRADEMARKS.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/wp-toolbox/trademarks.html
%%DOCSDIR%%/%%DOCLANG%%/books/arch-handbook/appendices.html
%%DOCSDIR%%/%%DOCLANG%%/books/arch-handbook/boot-bios.html
%%DOCSDIR%%/%%DOCLANG%%/books/arch-handbook/boot-boot0.html
@@ -509,6 +436,7 @@
%%DOCSDIR%%/%%DOCLANG%%/books/arch-handbook/sysinit-operation.html
%%DOCSDIR%%/%%DOCLANG%%/books/arch-handbook/sysinit-using.html
%%DOCSDIR%%/%%DOCLANG%%/books/arch-handbook/sysinit.html
+%%DOCSDIR%%/%%DOCLANG%%/books/arch-handbook/trademarks.html
%%DOCSDIR%%/%%DOCLANG%%/books/arch-handbook/usb-dev.html
%%DOCSDIR%%/%%DOCLANG%%/books/arch-handbook/usb-devprobe.html
%%DOCSDIR%%/%%DOCLANG%%/books/arch-handbook/usb-hc.html
@@ -520,23 +448,8 @@
%%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/corp-net-guide/LEGALNOTICE.html
-%%DOCSDIR%%/%%DOCLANG%%/books/corp-net-guide/index.html
-%%DOCSDIR%%/%%DOCLANG%%/books/corp-net-guide/printserving-accounting.html
-%%DOCSDIR%%/%%DOCLANG%%/books/corp-net-guide/printserving-advanced.html
-%%DOCSDIR%%/%%DOCLANG%%/books/corp-net-guide/printserving-lpr-freebsd.html
-%%DOCSDIR%%/%%DOCLANG%%/books/corp-net-guide/printserving-lpr-windows.html
-%%DOCSDIR%%/%%DOCLANG%%/books/corp-net-guide/printserving-misc.html
-%%DOCSDIR%%/%%DOCLANG%%/books/corp-net-guide/printserving-network.html
-%%DOCSDIR%%/%%DOCLANG%%/books/corp-net-guide/printserving-nt-and-freebsd.html
-%%DOCSDIR%%/%%DOCLANG%%/books/corp-net-guide/printserving-protocols.html
-%%DOCSDIR%%/%%DOCLANG%%/books/corp-net-guide/printserving-ps-dos.html
-%%DOCSDIR%%/%%DOCLANG%%/books/corp-net-guide/printserving-psprinter.html
-%%DOCSDIR%%/%%DOCLANG%%/books/corp-net-guide/printserving-samba.html
-%%DOCSDIR%%/%%DOCLANG%%/books/corp-net-guide/printserving-unix.html
-%%DOCSDIR%%/%%DOCLANG%%/books/corp-net-guide/printserving.html
-%%DOCSDIR%%/%%DOCLANG%%/books/design-44bsd/LEGALNOTICE.html
%%DOCSDIR%%/%%DOCLANG%%/books/design-44bsd/index.html
+%%DOCSDIR%%/%%DOCLANG%%/books/design-44bsd/legalnotice.html
%%DOCSDIR%%/%%DOCLANG%%/books/design-44bsd/overview-filestore.html
%%DOCSDIR%%/%%DOCLANG%%/books/design-44bsd/overview-filesystem.html
%%DOCSDIR%%/%%DOCLANG%%/books/design-44bsd/overview-io-system.html
@@ -585,7 +498,6 @@
%%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/LEGALNOTICE.html
%%DOCSDIR%%/%%DOCLANG%%/books/developers-handbook/appendices.html
%%DOCSDIR%%/%%DOCLANG%%/books/developers-handbook/architectures.html
%%DOCSDIR%%/%%DOCLANG%%/books/developers-handbook/basics.html
@@ -602,6 +514,7 @@
%%DOCSDIR%%/%%DOCLANG%%/books/developers-handbook/kernelbuild-new.html
%%DOCSDIR%%/%%DOCLANG%%/books/developers-handbook/kernelbuild.html
%%DOCSDIR%%/%%DOCLANG%%/books/developers-handbook/kerneldebug-console.html
+%%DOCSDIR%%/%%DOCLANG%%/books/developers-handbook/kerneldebug-dcons.html
%%DOCSDIR%%/%%DOCLANG%%/books/developers-handbook/kerneldebug-ddd.html
%%DOCSDIR%%/%%DOCLANG%%/books/developers-handbook/kerneldebug-deadlocks.html
%%DOCSDIR%%/%%DOCLANG%%/books/developers-handbook/kerneldebug-gdb.html
@@ -610,6 +523,7 @@
%%DOCSDIR%%/%%DOCLANG%%/books/developers-handbook/kerneldebug-options.html
%%DOCSDIR%%/%%DOCLANG%%/books/developers-handbook/kerneldebug.html
%%DOCSDIR%%/%%DOCLANG%%/books/developers-handbook/l10n.html
+%%DOCSDIR%%/%%DOCLANG%%/books/developers-handbook/legalnotice.html
%%DOCSDIR%%/%%DOCLANG%%/books/developers-handbook/policies-contributed.html
%%DOCSDIR%%/%%DOCLANG%%/books/developers-handbook/policies-encumbered.html
%%DOCSDIR%%/%%DOCLANG%%/books/developers-handbook/policies-maintainer.html
@@ -653,16 +567,13 @@
%%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/LEGALNOTICE.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-memory.html
%%DOCSDIR%%/%%DOCLANG%%/books/faq/compatibility-networking.html
%%DOCSDIR%%/%%DOCLANG%%/books/faq/compatibility-other.html
%%DOCSDIR%%/%%DOCLANG%%/books/faq/compatibility-processors.html
@@ -674,6 +585,7 @@
%%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/ppp.html
@@ -682,13 +594,13 @@
%%DOCSDIR%%/%%DOCLANG%%/books/faq/support.html
%%DOCSDIR%%/%%DOCLANG%%/books/faq/troubleshoot.html
%%DOCSDIR%%/%%DOCLANG%%/books/faq/x.html
-%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/LEGALNOTICE.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
%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/examples-formatted.html
%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/examples.html
%%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
@@ -701,19 +613,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
@@ -728,7 +629,17 @@
%%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/LEGALNOTICE.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/acpi-overview.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/adding-swap-space.html
@@ -883,6 +794,7 @@
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/l10n-compiling.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/l10n.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/lang-setup.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/legalnotice.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/linuxemu-advanced.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/linuxemu-lbc-install.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/linuxemu-maple.html
@@ -917,7 +829,6 @@
%%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-afs.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/mirrors-bittorrent.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/mirrors-ftp.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/mirrors-rsync.html
@@ -959,6 +870,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
@@ -999,6 +911,8 @@
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/snapshots.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/sound-mp3.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/sound-setup.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/svn-mirrors.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/svn.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/swap-encrypting.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/synching.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/system-administration.html
@@ -1020,6 +934,7 @@
%%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
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/using-localization.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/using-sysinstall.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/video-playback.html
@@ -1042,7 +957,6 @@
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/x-xdm.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/x11-wm.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/x11.html
-%%DOCSDIR%%/%%DOCLANG%%/books/pmake/LEGALNOTICE.html
%%DOCSDIR%%/%%DOCLANG%%/books/pmake/answers.html
%%DOCSDIR%%/%%DOCLANG%%/books/pmake/archivesandlibraries.html
%%DOCSDIR%%/%%DOCLANG%%/books/pmake/ashell.html
@@ -1059,6 +973,7 @@
%%DOCSDIR%%/%%DOCLANG%%/books/pmake/index.html
%%DOCSDIR%%/%%DOCLANG%%/books/pmake/intro.html
%%DOCSDIR%%/%%DOCLANG%%/books/pmake/invoking.html
+%%DOCSDIR%%/%%DOCLANG%%/books/pmake/legalnotice.html
%%DOCSDIR%%/%%DOCLANG%%/books/pmake/modyvarex.html
%%DOCSDIR%%/%%DOCLANG%%/books/pmake/moreexercises.html
%%DOCSDIR%%/%%DOCLANG%%/books/pmake/parellelism.html
@@ -1071,7 +986,6 @@
%%DOCSDIR%%/%%DOCLANG%%/books/pmake/theway.html
%%DOCSDIR%%/%%DOCLANG%%/books/pmake/variables.html
%%DOCSDIR%%/%%DOCLANG%%/books/pmake/writeanddebug.html
-%%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/TRADEMARKS.html
%%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/build-cluster.html
%%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/building.html
%%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/conflicts.html
@@ -1105,6 +1019,7 @@
%%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/makefile-masterdir.html
%%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/makefile-naming.html
%%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/makefile-options.html
+%%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/makefile-portscout.html
%%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/makefile-wrkdir.html
%%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/makefile.html
%%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/moved-and-updating-files.html
@@ -1152,6 +1067,7 @@
%%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/testing-porttools.html
%%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/testing-tinderbox.html
%%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/testing.html
+%%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/trademarks.html
%%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/users-and-groups.html
%%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/using-autotools.html
%%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/using-databases.html
diff --git a/misc/freebsd-doc-en/pkg-plist.pdf b/misc/freebsd-doc-en/pkg-plist.pdf
index 9e847650ba61..371db3027f12 100644
--- a/misc/freebsd-doc-en/pkg-plist.pdf
+++ b/misc/freebsd-doc-en/pkg-plist.pdf
@@ -1,9 +1,7 @@
@comment $FreeBSD$
-%%DOCSDIR%%/%%DOCLANG%%/articles/5-roadmap/article.pdf
%%DOCSDIR%%/%%DOCLANG%%/articles/bsdl-gpl/article.pdf
%%DOCSDIR%%/%%DOCLANG%%/articles/building-products/article.pdf
%%DOCSDIR%%/%%DOCLANG%%/articles/casestudy-argentina.com/article.pdf
-%%DOCSDIR%%/%%DOCLANG%%/articles/checkpoint/article.pdf
%%DOCSDIR%%/%%DOCLANG%%/articles/committers-guide/article.pdf
%%DOCSDIR%%/%%DOCLANG%%/articles/compiz-fusion/article.pdf
%%DOCSDIR%%/%%DOCLANG%%/articles/console-server/article.pdf
@@ -14,19 +12,14 @@
%%DOCSDIR%%/%%DOCLANG%%/articles/custom-gcc/article.pdf
%%DOCSDIR%%/%%DOCLANG%%/articles/cvs-freebsd/article.pdf
%%DOCSDIR%%/%%DOCLANG%%/articles/cvsup-advanced/article.pdf
-%%DOCSDIR%%/%%DOCLANG%%/articles/dialup-firewall/article.pdf
-%%DOCSDIR%%/%%DOCLANG%%/articles/diskless-x/article.pdf
-%%DOCSDIR%%/%%DOCLANG%%/articles/euro/article.pdf
%%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd/article.pdf
%%DOCSDIR%%/%%DOCLANG%%/articles/fbsd-from-scratch/article.pdf
%%DOCSDIR%%/%%DOCLANG%%/articles/filtering-bridges/article.pdf
%%DOCSDIR%%/%%DOCLANG%%/articles/fonts/article.pdf
-%%DOCSDIR%%/%%DOCLANG%%/articles/formatting-media/article.pdf
%%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-questions/article.pdf
%%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-update-server/article.pdf
%%DOCSDIR%%/%%DOCLANG%%/articles/geom-class/article.pdf
%%DOCSDIR%%/%%DOCLANG%%/articles/gjournal-desktop/article.pdf
-%%DOCSDIR%%/%%DOCLANG%%/articles/hats/article.pdf
%%DOCSDIR%%/%%DOCLANG%%/articles/hubs/article.pdf
%%DOCSDIR%%/%%DOCLANG%%/articles/ipsec-must/article.pdf
%%DOCSDIR%%/%%DOCLANG%%/articles/laptop/article.pdf
@@ -36,7 +29,6 @@
%%DOCSDIR%%/%%DOCLANG%%/articles/linux-users/article.pdf
%%DOCSDIR%%/%%DOCLANG%%/articles/mailing-list-faq/article.pdf
%%DOCSDIR%%/%%DOCLANG%%/articles/mh/article.pdf
-%%DOCSDIR%%/%%DOCLANG%%/articles/multi-os/article.pdf
%%DOCSDIR%%/%%DOCLANG%%/articles/nanobsd/article.pdf
%%DOCSDIR%%/%%DOCLANG%%/articles/new-users/article.pdf
%%DOCSDIR%%/%%DOCLANG%%/articles/p4-primer/article.pdf
@@ -52,14 +44,9 @@
%%DOCSDIR%%/%%DOCLANG%%/articles/remote-install/article.pdf
%%DOCSDIR%%/%%DOCLANG%%/articles/serial-uart/article.pdf
%%DOCSDIR%%/%%DOCLANG%%/articles/solid-state/article.pdf
-%%DOCSDIR%%/%%DOCLANG%%/articles/storage-devices/article.pdf
-%%DOCSDIR%%/%%DOCLANG%%/articles/version-guide/article.pdf
-%%DOCSDIR%%/%%DOCLANG%%/articles/vinum/article.pdf
%%DOCSDIR%%/%%DOCLANG%%/articles/vm-design/article.pdf
%%DOCSDIR%%/%%DOCLANG%%/articles/wp-toolbox/article.pdf
-%%DOCSDIR%%/%%DOCLANG%%/articles/zip-drive/article.pdf
%%DOCSDIR%%/%%DOCLANG%%/books/arch-handbook/book.pdf
-%%DOCSDIR%%/%%DOCLANG%%/books/corp-net-guide/book.pdf
%%DOCSDIR%%/%%DOCLANG%%/books/design-44bsd/book.pdf
%%DOCSDIR%%/%%DOCLANG%%/books/dev-model/book.pdf
%%DOCSDIR%%/%%DOCLANG%%/books/developers-handbook/book.pdf
diff --git a/misc/freebsd-doc-en/pkg-plist.ps b/misc/freebsd-doc-en/pkg-plist.ps
index 8361bfddefc8..cf11845445e6 100644
--- a/misc/freebsd-doc-en/pkg-plist.ps
+++ b/misc/freebsd-doc-en/pkg-plist.ps
@@ -1,9 +1,7 @@
@comment $FreeBSD$
-%%DOCSDIR%%/%%DOCLANG%%/articles/5-roadmap/article.ps
%%DOCSDIR%%/%%DOCLANG%%/articles/bsdl-gpl/article.ps
%%DOCSDIR%%/%%DOCLANG%%/articles/building-products/article.ps
%%DOCSDIR%%/%%DOCLANG%%/articles/casestudy-argentina.com/article.ps
-%%DOCSDIR%%/%%DOCLANG%%/articles/checkpoint/article.ps
%%DOCSDIR%%/%%DOCLANG%%/articles/committers-guide/article.ps
%%DOCSDIR%%/%%DOCLANG%%/articles/compiz-fusion/article.ps
%%DOCSDIR%%/%%DOCLANG%%/articles/console-server/article.ps
@@ -14,19 +12,14 @@
%%DOCSDIR%%/%%DOCLANG%%/articles/custom-gcc/article.ps
%%DOCSDIR%%/%%DOCLANG%%/articles/cvs-freebsd/article.ps
%%DOCSDIR%%/%%DOCLANG%%/articles/cvsup-advanced/article.ps
-%%DOCSDIR%%/%%DOCLANG%%/articles/dialup-firewall/article.ps
-%%DOCSDIR%%/%%DOCLANG%%/articles/diskless-x/article.ps
-%%DOCSDIR%%/%%DOCLANG%%/articles/euro/article.ps
%%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd/article.ps
%%DOCSDIR%%/%%DOCLANG%%/articles/fbsd-from-scratch/article.ps
%%DOCSDIR%%/%%DOCLANG%%/articles/filtering-bridges/article.ps
%%DOCSDIR%%/%%DOCLANG%%/articles/fonts/article.ps
-%%DOCSDIR%%/%%DOCLANG%%/articles/formatting-media/article.ps
%%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-questions/article.ps
%%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-update-server/article.ps
%%DOCSDIR%%/%%DOCLANG%%/articles/geom-class/article.ps
%%DOCSDIR%%/%%DOCLANG%%/articles/gjournal-desktop/article.ps
-%%DOCSDIR%%/%%DOCLANG%%/articles/hats/article.ps
%%DOCSDIR%%/%%DOCLANG%%/articles/hubs/article.ps
%%DOCSDIR%%/%%DOCLANG%%/articles/ipsec-must/article.ps
%%DOCSDIR%%/%%DOCLANG%%/articles/laptop/article.ps
@@ -36,7 +29,6 @@
%%DOCSDIR%%/%%DOCLANG%%/articles/linux-users/article.ps
%%DOCSDIR%%/%%DOCLANG%%/articles/mailing-list-faq/article.ps
%%DOCSDIR%%/%%DOCLANG%%/articles/mh/article.ps
-%%DOCSDIR%%/%%DOCLANG%%/articles/multi-os/article.ps
%%DOCSDIR%%/%%DOCLANG%%/articles/nanobsd/article.ps
%%DOCSDIR%%/%%DOCLANG%%/articles/new-users/article.ps
%%DOCSDIR%%/%%DOCLANG%%/articles/p4-primer/article.ps
@@ -52,14 +44,9 @@
%%DOCSDIR%%/%%DOCLANG%%/articles/remote-install/article.ps
%%DOCSDIR%%/%%DOCLANG%%/articles/serial-uart/article.ps
%%DOCSDIR%%/%%DOCLANG%%/articles/solid-state/article.ps
-%%DOCSDIR%%/%%DOCLANG%%/articles/storage-devices/article.ps
-%%DOCSDIR%%/%%DOCLANG%%/articles/version-guide/article.ps
-%%DOCSDIR%%/%%DOCLANG%%/articles/vinum/article.ps
%%DOCSDIR%%/%%DOCLANG%%/articles/vm-design/article.ps
%%DOCSDIR%%/%%DOCLANG%%/articles/wp-toolbox/article.ps
-%%DOCSDIR%%/%%DOCLANG%%/articles/zip-drive/article.ps
%%DOCSDIR%%/%%DOCLANG%%/books/arch-handbook/book.ps
-%%DOCSDIR%%/%%DOCLANG%%/books/corp-net-guide/book.ps
%%DOCSDIR%%/%%DOCLANG%%/books/design-44bsd/book.ps
%%DOCSDIR%%/%%DOCLANG%%/books/dev-model/book.ps
%%DOCSDIR%%/%%DOCLANG%%/books/developers-handbook/book.ps
diff --git a/misc/freebsd-doc-en/pkg-plist.txt b/misc/freebsd-doc-en/pkg-plist.txt
index 20187a3440e2..7378ae571b84 100644
--- a/misc/freebsd-doc-en/pkg-plist.txt
+++ b/misc/freebsd-doc-en/pkg-plist.txt
@@ -1,9 +1,7 @@
@comment $FreeBSD$
-%%DOCSDIR%%/%%DOCLANG%%/articles/5-roadmap/article.txt
%%DOCSDIR%%/%%DOCLANG%%/articles/bsdl-gpl/article.txt
%%DOCSDIR%%/%%DOCLANG%%/articles/building-products/article.txt
%%DOCSDIR%%/%%DOCLANG%%/articles/casestudy-argentina.com/article.txt
-%%DOCSDIR%%/%%DOCLANG%%/articles/checkpoint/article.txt
%%DOCSDIR%%/%%DOCLANG%%/articles/committers-guide/article.txt
%%DOCSDIR%%/%%DOCLANG%%/articles/compiz-fusion/article.txt
%%DOCSDIR%%/%%DOCLANG%%/articles/console-server/article.txt
@@ -14,21 +12,16 @@
%%DOCSDIR%%/%%DOCLANG%%/articles/custom-gcc/article.txt
%%DOCSDIR%%/%%DOCLANG%%/articles/cvs-freebsd/article.txt
%%DOCSDIR%%/%%DOCLANG%%/articles/cvsup-advanced/article.txt
-%%DOCSDIR%%/%%DOCLANG%%/articles/dialup-firewall/article.txt
-%%DOCSDIR%%/%%DOCLANG%%/articles/diskless-x/article.txt
-%%DOCSDIR%%/%%DOCLANG%%/articles/euro/article.txt
%%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd/article.txt
%%DOCSDIR%%/%%DOCLANG%%/articles/fbsd-from-scratch/article.txt
%%DOCSDIR%%/%%DOCLANG%%/articles/filtering-bridges/article.txt
%%DOCSDIR%%/%%DOCLANG%%/articles/fonts/article.txt
-%%DOCSDIR%%/%%DOCLANG%%/articles/formatting-media/article.txt
%%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-questions/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/geom-class/article.txt
%%DOCSDIR%%/%%DOCLANG%%/articles/gjournal-desktop/article.txt
-%%DOCSDIR%%/%%DOCLANG%%/articles/hats/article.txt
%%DOCSDIR%%/%%DOCLANG%%/articles/hubs/article.txt
%%DOCSDIR%%/%%DOCLANG%%/articles/ipsec-must/article.txt
%%DOCSDIR%%/%%DOCLANG%%/articles/laptop/article.txt
@@ -38,7 +31,6 @@
%%DOCSDIR%%/%%DOCLANG%%/articles/linux-users/article.txt
%%DOCSDIR%%/%%DOCLANG%%/articles/mailing-list-faq/article.txt
%%DOCSDIR%%/%%DOCLANG%%/articles/mh/article.txt
-%%DOCSDIR%%/%%DOCLANG%%/articles/multi-os/article.txt
%%DOCSDIR%%/%%DOCLANG%%/articles/nanobsd/article.txt
%%DOCSDIR%%/%%DOCLANG%%/articles/new-users/article.txt
%%DOCSDIR%%/%%DOCLANG%%/articles/p4-primer/article.txt
@@ -54,14 +46,9 @@
%%DOCSDIR%%/%%DOCLANG%%/articles/remote-install/article.txt
%%DOCSDIR%%/%%DOCLANG%%/articles/serial-uart/article.txt
%%DOCSDIR%%/%%DOCLANG%%/articles/solid-state/article.txt
-%%DOCSDIR%%/%%DOCLANG%%/articles/storage-devices/article.txt
-%%DOCSDIR%%/%%DOCLANG%%/articles/version-guide/article.txt
-%%DOCSDIR%%/%%DOCLANG%%/articles/vinum/article.txt
%%DOCSDIR%%/%%DOCLANG%%/articles/vm-design/article.txt
%%DOCSDIR%%/%%DOCLANG%%/articles/wp-toolbox/article.txt
-%%DOCSDIR%%/%%DOCLANG%%/articles/zip-drive/article.txt
%%DOCSDIR%%/%%DOCLANG%%/books/arch-handbook/book.txt
-%%DOCSDIR%%/%%DOCLANG%%/books/corp-net-guide/book.txt
%%DOCSDIR%%/%%DOCLANG%%/books/design-44bsd/book.txt
%%DOCSDIR%%/%%DOCLANG%%/books/dev-model/book.txt
%%DOCSDIR%%/%%DOCLANG%%/books/developers-handbook/book.txt
diff --git a/misc/freebsd-doc-es/pkg-plist.common b/misc/freebsd-doc-es/pkg-plist.common
index 50e607c38368..594b1defc35e 100644
--- a/misc/freebsd-doc-es/pkg-plist.common
+++ b/misc/freebsd-doc-es/pkg-plist.common
@@ -10,10 +10,7 @@
@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/handbook
@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/faq
@dirrm %%DOCSDIR%%/%%DOCLANG%%/books
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/zip-drive
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/version-guide
@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/releng
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/pxe
@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/problem-reports
@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/p4-primer
@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/nanobsd/imagelib/callouts
@@ -26,8 +23,6 @@
@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/fdp-es
@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/fbsd-from-scratch
@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/euro
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/dialup-firewall
@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/cvs-freebsd
@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/contributing
@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/casestudy-argentina.com
diff --git a/misc/freebsd-doc-es/pkg-plist.extras b/misc/freebsd-doc-es/pkg-plist.extras
index 2cc85886eb73..769466f97b89 100644
--- a/misc/freebsd-doc-es/pkg-plist.extras
+++ b/misc/freebsd-doc-es/pkg-plist.extras
@@ -2,9 +2,3 @@
%%DOCSDIR%%/%%DOCLANG%%/articles/fbsd-from-scratch/fase_1.sh
%%DOCSDIR%%/%%DOCLANG%%/articles/fbsd-from-scratch/fase_2.sh
%%DOCSDIR%%/%%DOCLANG%%/articles/fbsd-from-scratch/fase_3.mk
-%%DOCSDIR%%/%%DOCLANG%%/articles/pxe/dhcpd.conf
-%%DOCSDIR%%/%%DOCLANG%%/articles/pxe/install.cfg
-%%DOCSDIR%%/%%DOCLANG%%/articles/pxe/loader.rc
-%%DOCSDIR%%/%%DOCLANG%%/articles/pxe/pkgmaker.sh
-%%DOCSDIR%%/%%DOCLANG%%/articles/pxe/post
-%%DOCSDIR%%/%%DOCLANG%%/articles/pxe/pre
diff --git a/misc/freebsd-doc-es/pkg-plist.html b/misc/freebsd-doc-es/pkg-plist.html
index ed60cd4cb4df..84b59ebd39ce 100644
--- a/misc/freebsd-doc-es/pkg-plist.html
+++ b/misc/freebsd-doc-es/pkg-plist.html
@@ -2,8 +2,6 @@
%%DOCSDIR%%/%%DOCLANG%%/articles/casestudy-argentina.com/article.html
%%DOCSDIR%%/%%DOCLANG%%/articles/contributing/article.html
%%DOCSDIR%%/%%DOCLANG%%/articles/cvs-freebsd/article.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/dialup-firewall/article.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/euro/article.html
%%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd/article.html
%%DOCSDIR%%/%%DOCLANG%%/articles/fbsd-from-scratch/article.html
%%DOCSDIR%%/%%DOCLANG%%/articles/fdp-es/article.html
@@ -14,9 +12,6 @@
%%DOCSDIR%%/%%DOCLANG%%/articles/nanobsd/article.html
%%DOCSDIR%%/%%DOCLANG%%/articles/p4-primer/article.html
%%DOCSDIR%%/%%DOCLANG%%/articles/problem-reports/article.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/pxe/article.html
%%DOCSDIR%%/%%DOCLANG%%/articles/releng/article.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/version-guide/article.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/zip-drive/article.html
%%DOCSDIR%%/%%DOCLANG%%/books/faq/book.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/book.html
diff --git a/misc/freebsd-doc-es/pkg-plist.html-common b/misc/freebsd-doc-es/pkg-plist.html-common
index c8074fbc7fdf..c632cf7a95d9 100644
--- a/misc/freebsd-doc-es/pkg-plist.html-common
+++ b/misc/freebsd-doc-es/pkg-plist.html-common
@@ -2,8 +2,6 @@
%%DOCSDIR%%/%%DOCLANG%%/articles/casestudy-argentina.com/docbook.css
%%DOCSDIR%%/%%DOCLANG%%/articles/contributing/docbook.css
%%DOCSDIR%%/%%DOCLANG%%/articles/cvs-freebsd/docbook.css
-%%DOCSDIR%%/%%DOCLANG%%/articles/dialup-firewall/docbook.css
-%%DOCSDIR%%/%%DOCLANG%%/articles/euro/docbook.css
%%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd/docbook.css
%%DOCSDIR%%/%%DOCLANG%%/articles/fbsd-from-scratch/docbook.css
%%DOCSDIR%%/%%DOCLANG%%/articles/fdp-es/docbook.css
@@ -18,13 +16,10 @@
%%DOCSDIR%%/%%DOCLANG%%/articles/nanobsd/imagelib/callouts/4.png
%%DOCSDIR%%/%%DOCLANG%%/articles/p4-primer/docbook.css
%%DOCSDIR%%/%%DOCLANG%%/articles/problem-reports/docbook.css
-%%DOCSDIR%%/%%DOCLANG%%/articles/pxe/docbook.css
%%DOCSDIR%%/%%DOCLANG%%/articles/releng/branches-head.png
%%DOCSDIR%%/%%DOCLANG%%/articles/releng/branches-releng3.png
%%DOCSDIR%%/%%DOCLANG%%/articles/releng/branches-releng4.png
%%DOCSDIR%%/%%DOCLANG%%/articles/releng/docbook.css
-%%DOCSDIR%%/%%DOCLANG%%/articles/version-guide/docbook.css
-%%DOCSDIR%%/%%DOCLANG%%/articles/zip-drive/docbook.css
%%DOCSDIR%%/%%DOCLANG%%/books/faq/docbook.css
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/advanced-networking/isdn-bus.png
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/advanced-networking/isdn-twisted-pair.png
diff --git a/misc/freebsd-doc-es/pkg-plist.html-split b/misc/freebsd-doc-es/pkg-plist.html-split
index a28d622961c3..8864ab1506e9 100644
--- a/misc/freebsd-doc-es/pkg-plist.html-split
+++ b/misc/freebsd-doc-es/pkg-plist.html-split
@@ -1,30 +1,19 @@
@comment $FreeBSD$
-%%DOCSDIR%%/%%DOCLANG%%/articles/casestudy-argentina.com/TRADEMARKS.html
%%DOCSDIR%%/%%DOCLANG%%/articles/casestudy-argentina.com/challenge.html
%%DOCSDIR%%/%%DOCLANG%%/articles/casestudy-argentina.com/freebsd.html
%%DOCSDIR%%/%%DOCLANG%%/articles/casestudy-argentina.com/index.html
%%DOCSDIR%%/%%DOCLANG%%/articles/casestudy-argentina.com/results.html
+%%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/TRADEMARKS.html
%%DOCSDIR%%/%%DOCLANG%%/articles/cvs-freebsd/freebsdspecific.html
%%DOCSDIR%%/%%DOCLANG%%/articles/cvs-freebsd/index.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/cvs-freebsd/x40.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/dialup-firewall/index.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/dialup-firewall/kernel.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/dialup-firewall/rcconf.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/dialup-firewall/rules.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/dialup-firewall/x112.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/dialup-firewall/x84.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/euro/index.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/euro/x169.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/euro/x201.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/euro/x70.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/euro/x80.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/cvs-freebsd/trademarks.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/cvs-freebsd/x41.html
%%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd/index.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd/x51.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd/x76.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd/x98.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
@@ -35,19 +24,18 @@
%%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/x184.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/fdp-es/x187.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/fdp-es/x191.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/fdp-es/x205.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/fdp-es/x244.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/fdp-es/x27.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/fdp-es/x42.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/fdp-es/x92.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/index.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/laptop/x38.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/laptop/x43.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/laptop/x70.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/linux-comparison/TRADEMARKS.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
@@ -55,7 +43,7 @@
%%DOCSDIR%%/%%DOCLANG%%/articles/linux-comparison/freebsd-security.html
%%DOCSDIR%%/%%DOCLANG%%/articles/linux-comparison/freebsd-support.html
%%DOCSDIR%%/%%DOCLANG%%/articles/linux-comparison/index.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/linux-users/TRADEMARKS.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/linux-comparison/trademarks.html
%%DOCSDIR%%/%%DOCLANG%%/articles/linux-users/commands.html
%%DOCSDIR%%/%%DOCLANG%%/articles/linux-users/conclusion.html
%%DOCSDIR%%/%%DOCLANG%%/articles/linux-users/firewall.html
@@ -65,16 +53,16 @@
%%DOCSDIR%%/%%DOCLANG%%/articles/linux-users/shells.html
%%DOCSDIR%%/%%DOCLANG%%/articles/linux-users/software.html
%%DOCSDIR%%/%%DOCLANG%%/articles/linux-users/startup.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/linux-users/trademarks.html
%%DOCSDIR%%/%%DOCLANG%%/articles/linux-users/updates.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/nanobsd/TRADEMARKS.html
%%DOCSDIR%%/%%DOCLANG%%/articles/nanobsd/howto.html
%%DOCSDIR%%/%%DOCLANG%%/articles/nanobsd/index.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/p4-primer/TRADEMARKS.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/nanobsd/trademarks.html
%%DOCSDIR%%/%%DOCLANG%%/articles/p4-primer/add-rm-files.html
%%DOCSDIR%%/%%DOCLANG%%/articles/p4-primer/branches.html
%%DOCSDIR%%/%%DOCLANG%%/articles/p4-primer/changes.html
@@ -90,21 +78,15 @@
%%DOCSDIR%%/%%DOCLANG%%/articles/p4-primer/start.html
%%DOCSDIR%%/%%DOCLANG%%/articles/p4-primer/submit.html
%%DOCSDIR%%/%%DOCLANG%%/articles/p4-primer/syncing.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/p4-primer/trademarks.html
%%DOCSDIR%%/%%DOCLANG%%/articles/p4-primer/working-with-diffs.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/problem-reports/TRADEMARKS.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/pxe/TRADEMARKS.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/pxe/bootstrap-config.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/pxe/custom-postinst-package.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/pxe/index.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/pxe/install-setup.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/pxe/server-config.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/releng/TRADEMARKS.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/problem-reports/trademarks.html
%%DOCSDIR%%/%%DOCLANG%%/articles/releng/ackno.html
%%DOCSDIR%%/%%DOCLANG%%/articles/releng/biblio.html
%%DOCSDIR%%/%%DOCLANG%%/articles/releng/distribution.html
@@ -114,15 +96,7 @@
%%DOCSDIR%%/%%DOCLANG%%/articles/releng/lessons-learned.html
%%DOCSDIR%%/%%DOCLANG%%/articles/releng/release-build.html
%%DOCSDIR%%/%%DOCLANG%%/articles/releng/release-proc.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/version-guide/TRADEMARKS.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/version-guide/conclusion.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/version-guide/decision-points.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/version-guide/future-goals.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/version-guide/index.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/version-guide/past-schedules.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/zip-drive/index.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/zip-drive/x108.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/zip-drive/x49.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/releng/trademarks.html
%%DOCSDIR%%/%%DOCLANG%%/books/faq/acknowledgments.html
%%DOCSDIR%%/%%DOCLANG%%/books/faq/admin.html
%%DOCSDIR%%/%%DOCLANG%%/books/faq/applications.html
@@ -133,7 +107,7 @@
%%DOCSDIR%%/%%DOCLANG%%/books/faq/install.html
%%DOCSDIR%%/%%DOCLANG%%/books/faq/introduction.html
%%DOCSDIR%%/%%DOCLANG%%/books/faq/kernelconfig.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/ln19.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ln18.html
%%DOCSDIR%%/%%DOCLANG%%/books/faq/misc.html
%%DOCSDIR%%/%%DOCLANG%%/books/faq/networking.html
%%DOCSDIR%%/%%DOCLANG%%/books/faq/ppp.html
@@ -244,7 +218,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/ln24.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/ln25.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/mac-biba.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/mac-examplehttpd.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/mac-ifoff.html
@@ -344,9 +318,6 @@
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/tcpwrappers.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/term.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/tvcard.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/updating-freebsdupdate.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/updating-portsnap.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/updating.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/usb-disks.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/userppp.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/users-groups.html
@@ -378,13 +349,13 @@
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/x-xdm.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/x11-wm.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/x11.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/x30964.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/x30988.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/x31017.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/x31050.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/x31083.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/x31095.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/x31119.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/x31155.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/x32062.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/x9105.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-es/pkg-plist.pdf b/misc/freebsd-doc-es/pkg-plist.pdf
index e819c72beef3..988235caf460 100644
--- a/misc/freebsd-doc-es/pkg-plist.pdf
+++ b/misc/freebsd-doc-es/pkg-plist.pdf
@@ -2,8 +2,6 @@
%%DOCSDIR%%/%%DOCLANG%%/articles/casestudy-argentina.com/article.pdf
%%DOCSDIR%%/%%DOCLANG%%/articles/contributing/article.pdf
%%DOCSDIR%%/%%DOCLANG%%/articles/cvs-freebsd/article.pdf
-%%DOCSDIR%%/%%DOCLANG%%/articles/dialup-firewall/article.pdf
-%%DOCSDIR%%/%%DOCLANG%%/articles/euro/article.pdf
%%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd/article.pdf
%%DOCSDIR%%/%%DOCLANG%%/articles/fbsd-from-scratch/article.pdf
%%DOCSDIR%%/%%DOCLANG%%/articles/fdp-es/article.pdf
@@ -14,9 +12,6 @@
%%DOCSDIR%%/%%DOCLANG%%/articles/nanobsd/article.pdf
%%DOCSDIR%%/%%DOCLANG%%/articles/p4-primer/article.pdf
%%DOCSDIR%%/%%DOCLANG%%/articles/problem-reports/article.pdf
-%%DOCSDIR%%/%%DOCLANG%%/articles/pxe/article.pdf
%%DOCSDIR%%/%%DOCLANG%%/articles/releng/article.pdf
-%%DOCSDIR%%/%%DOCLANG%%/articles/version-guide/article.pdf
-%%DOCSDIR%%/%%DOCLANG%%/articles/zip-drive/article.pdf
%%DOCSDIR%%/%%DOCLANG%%/books/faq/book.pdf
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/book.pdf
diff --git a/misc/freebsd-doc-es/pkg-plist.ps b/misc/freebsd-doc-es/pkg-plist.ps
index cc9b39c85bfe..436a16bba97e 100644
--- a/misc/freebsd-doc-es/pkg-plist.ps
+++ b/misc/freebsd-doc-es/pkg-plist.ps
@@ -2,8 +2,6 @@
%%DOCSDIR%%/%%DOCLANG%%/articles/casestudy-argentina.com/article.ps
%%DOCSDIR%%/%%DOCLANG%%/articles/contributing/article.ps
%%DOCSDIR%%/%%DOCLANG%%/articles/cvs-freebsd/article.ps
-%%DOCSDIR%%/%%DOCLANG%%/articles/dialup-firewall/article.ps
-%%DOCSDIR%%/%%DOCLANG%%/articles/euro/article.ps
%%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd/article.ps
%%DOCSDIR%%/%%DOCLANG%%/articles/fbsd-from-scratch/article.ps
%%DOCSDIR%%/%%DOCLANG%%/articles/fdp-es/article.ps
@@ -14,9 +12,6 @@
%%DOCSDIR%%/%%DOCLANG%%/articles/nanobsd/article.ps
%%DOCSDIR%%/%%DOCLANG%%/articles/p4-primer/article.ps
%%DOCSDIR%%/%%DOCLANG%%/articles/problem-reports/article.ps
-%%DOCSDIR%%/%%DOCLANG%%/articles/pxe/article.ps
%%DOCSDIR%%/%%DOCLANG%%/articles/releng/article.ps
-%%DOCSDIR%%/%%DOCLANG%%/articles/version-guide/article.ps
-%%DOCSDIR%%/%%DOCLANG%%/articles/zip-drive/article.ps
%%DOCSDIR%%/%%DOCLANG%%/books/faq/book.ps
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/book.ps
diff --git a/misc/freebsd-doc-es/pkg-plist.txt b/misc/freebsd-doc-es/pkg-plist.txt
index e493d000f184..0c54bfc3bd6b 100644
--- a/misc/freebsd-doc-es/pkg-plist.txt
+++ b/misc/freebsd-doc-es/pkg-plist.txt
@@ -2,8 +2,6 @@
%%DOCSDIR%%/%%DOCLANG%%/articles/casestudy-argentina.com/article.txt
%%DOCSDIR%%/%%DOCLANG%%/articles/contributing/article.txt
%%DOCSDIR%%/%%DOCLANG%%/articles/cvs-freebsd/article.txt
-%%DOCSDIR%%/%%DOCLANG%%/articles/dialup-firewall/article.txt
-%%DOCSDIR%%/%%DOCLANG%%/articles/euro/article.txt
%%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd/article.txt
%%DOCSDIR%%/%%DOCLANG%%/articles/fbsd-from-scratch/article.txt
%%DOCSDIR%%/%%DOCLANG%%/articles/fdp-es/article.txt
@@ -14,9 +12,6 @@
%%DOCSDIR%%/%%DOCLANG%%/articles/nanobsd/article.txt
%%DOCSDIR%%/%%DOCLANG%%/articles/p4-primer/article.txt
%%DOCSDIR%%/%%DOCLANG%%/articles/problem-reports/article.txt
-%%DOCSDIR%%/%%DOCLANG%%/articles/pxe/article.txt
%%DOCSDIR%%/%%DOCLANG%%/articles/releng/article.txt
-%%DOCSDIR%%/%%DOCLANG%%/articles/version-guide/article.txt
-%%DOCSDIR%%/%%DOCLANG%%/articles/zip-drive/article.txt
%%DOCSDIR%%/%%DOCLANG%%/books/faq/book.txt
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/book.txt
diff --git a/misc/freebsd-doc-fr/pkg-plist.common b/misc/freebsd-doc-fr/pkg-plist.common
index aa04205db31e..3d1f422f394b 100644
--- a/misc/freebsd-doc-fr/pkg-plist.common
+++ b/misc/freebsd-doc-fr/pkg-plist.common
@@ -1,5 +1,4 @@
@comment $FreeBSD$
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/ppp-primer
@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/handbook/virtualization
@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/handbook/vinum
@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/handbook/mail
@@ -13,39 +12,27 @@
@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/faq
@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/developers-handbook
@dirrm %%DOCSDIR%%/%%DOCLANG%%/books
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/zip-drive
@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/releng-packages
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/pxe
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/programming-tools
@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/problem-reports
@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/pr-guidelines
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/ppp
@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/pam
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/ntfs
@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/new-users
@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/nanobsd/imagelib/callouts
@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/nanobsd/imagelib
@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/nanobsd
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/multi-os
@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/mh
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/make-world
@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/linux-users
@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/laptop
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/java-tomcat
@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/ipsec-must
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/ip-aliasing
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/formatting-media
@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/fonts
@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/filtering-bridges
@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/euro
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/diskless-x
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/dialup-firewall
@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/cvsup-advanced
@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/contributors
@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/contributing-ports
@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/contributing
@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/committers-guide
+@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/building-products
@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles
%%DOCSDIR%%/%%DOCLANG_PREFIX%%
@dirrm %%DOCSDIR%%/%%DOCLANG%%
diff --git a/misc/freebsd-doc-fr/pkg-plist.html b/misc/freebsd-doc-fr/pkg-plist.html
index 5d156c68fb94..63d9884d113d 100644
--- a/misc/freebsd-doc-fr/pkg-plist.html
+++ b/misc/freebsd-doc-fr/pkg-plist.html
@@ -1,37 +1,24 @@
@comment $FreeBSD$
+%%DOCSDIR%%/%%DOCLANG%%/articles/building-products/article.html
%%DOCSDIR%%/%%DOCLANG%%/articles/committers-guide/article.html
%%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/dialup-firewall/article.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/diskless-x/article.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/euro/article.html
%%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd/article.html
%%DOCSDIR%%/%%DOCLANG%%/articles/filtering-bridges/article.html
%%DOCSDIR%%/%%DOCLANG%%/articles/fonts/article.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/formatting-media/article.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/ip-aliasing/article.html
%%DOCSDIR%%/%%DOCLANG%%/articles/ipsec-must/article.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/java-tomcat/article.html
%%DOCSDIR%%/%%DOCLANG%%/articles/laptop/article.html
%%DOCSDIR%%/%%DOCLANG%%/articles/linux-users/article.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/make-world/article.html
%%DOCSDIR%%/%%DOCLANG%%/articles/mh/article.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/multi-os/article.html
%%DOCSDIR%%/%%DOCLANG%%/articles/nanobsd/article.html
%%DOCSDIR%%/%%DOCLANG%%/articles/new-users/article.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/ntfs/article.html
%%DOCSDIR%%/%%DOCLANG%%/articles/pam/article.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/ppp/article.html
%%DOCSDIR%%/%%DOCLANG%%/articles/pr-guidelines/article.html
%%DOCSDIR%%/%%DOCLANG%%/articles/problem-reports/article.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/programming-tools/article.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/pxe/article.html
%%DOCSDIR%%/%%DOCLANG%%/articles/releng-packages/article.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/zip-drive/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/ppp-primer/book.html
diff --git a/misc/freebsd-doc-fr/pkg-plist.html-common b/misc/freebsd-doc-fr/pkg-plist.html-common
index b001a275eb39..25b660c8a4d0 100644
--- a/misc/freebsd-doc-fr/pkg-plist.html-common
+++ b/misc/freebsd-doc-fr/pkg-plist.html-common
@@ -1,39 +1,29 @@
@comment $FreeBSD$
+%%DOCSDIR%%/%%DOCLANG%%/articles/building-products/docbook.css
+%%DOCSDIR%%/%%DOCLANG%%/articles/building-products/freebsd-branches.png
+%%DOCSDIR%%/%%DOCLANG%%/articles/building-products/freebsd-organization.png
%%DOCSDIR%%/%%DOCLANG%%/articles/committers-guide/docbook.css
%%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/dialup-firewall/docbook.css
-%%DOCSDIR%%/%%DOCLANG%%/articles/diskless-x/docbook.css
-%%DOCSDIR%%/%%DOCLANG%%/articles/euro/docbook.css
%%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd/docbook.css
%%DOCSDIR%%/%%DOCLANG%%/articles/filtering-bridges/docbook.css
%%DOCSDIR%%/%%DOCLANG%%/articles/fonts/docbook.css
-%%DOCSDIR%%/%%DOCLANG%%/articles/formatting-media/docbook.css
-%%DOCSDIR%%/%%DOCLANG%%/articles/ip-aliasing/docbook.css
%%DOCSDIR%%/%%DOCLANG%%/articles/ipsec-must/docbook.css
-%%DOCSDIR%%/%%DOCLANG%%/articles/java-tomcat/docbook.css
%%DOCSDIR%%/%%DOCLANG%%/articles/laptop/docbook.css
%%DOCSDIR%%/%%DOCLANG%%/articles/linux-users/docbook.css
-%%DOCSDIR%%/%%DOCLANG%%/articles/make-world/docbook.css
%%DOCSDIR%%/%%DOCLANG%%/articles/mh/docbook.css
-%%DOCSDIR%%/%%DOCLANG%%/articles/multi-os/docbook.css
%%DOCSDIR%%/%%DOCLANG%%/articles/nanobsd/docbook.css
%%DOCSDIR%%/%%DOCLANG%%/articles/nanobsd/imagelib/callouts/1.png
%%DOCSDIR%%/%%DOCLANG%%/articles/nanobsd/imagelib/callouts/2.png
%%DOCSDIR%%/%%DOCLANG%%/articles/nanobsd/imagelib/callouts/3.png
%%DOCSDIR%%/%%DOCLANG%%/articles/nanobsd/imagelib/callouts/4.png
%%DOCSDIR%%/%%DOCLANG%%/articles/new-users/docbook.css
-%%DOCSDIR%%/%%DOCLANG%%/articles/ntfs/docbook.css
%%DOCSDIR%%/%%DOCLANG%%/articles/pam/docbook.css
-%%DOCSDIR%%/%%DOCLANG%%/articles/ppp/docbook.css
%%DOCSDIR%%/%%DOCLANG%%/articles/pr-guidelines/docbook.css
%%DOCSDIR%%/%%DOCLANG%%/articles/problem-reports/docbook.css
-%%DOCSDIR%%/%%DOCLANG%%/articles/programming-tools/docbook.css
-%%DOCSDIR%%/%%DOCLANG%%/articles/pxe/docbook.css
%%DOCSDIR%%/%%DOCLANG%%/articles/releng-packages/docbook.css
-%%DOCSDIR%%/%%DOCLANG%%/articles/zip-drive/docbook.css
%%DOCSDIR%%/%%DOCLANG%%/books/developers-handbook/docbook.css
%%DOCSDIR%%/%%DOCLANG%%/books/faq/docbook.css
%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/docbook.css
@@ -169,4 +159,3 @@
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/virtualization/virtualpc-freebsd7.png
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/virtualization/virtualpc-freebsd8.png
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/virtualization/virtualpc-freebsd9.png
-%%DOCSDIR%%/%%DOCLANG%%/books/ppp-primer/docbook.css
diff --git a/misc/freebsd-doc-fr/pkg-plist.html-split b/misc/freebsd-doc-fr/pkg-plist.html-split
index d061ebd49518..1e6c7d3524b3 100644
--- a/misc/freebsd-doc-fr/pkg-plist.html-split
+++ b/misc/freebsd-doc-fr/pkg-plist.html-split
@@ -1,4 +1,10 @@
@comment $FreeBSD$
+%%DOCSDIR%%/%%DOCLANG%%/articles/building-products/b393.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/conventions.html
%%DOCSDIR%%/%%DOCLANG%%/articles/committers-guide/cvs.operations.html
%%DOCSDIR%%/%%DOCLANG%%/articles/committers-guide/developer.relations.html
@@ -6,9 +12,8 @@
%%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/x309.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/committers-guide/x441.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/contributing-ports/TRADEMARKS.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
@@ -16,10 +21,11 @@
%%DOCSDIR%%/%%DOCLANG%%/articles/contributing-ports/maintain-port.html
%%DOCSDIR%%/%%DOCLANG%%/articles/contributing-ports/mortal-coil.html
%%DOCSDIR%%/%%DOCLANG%%/articles/contributing-ports/resources.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/contributing-ports/trademarks.html
%%DOCSDIR%%/%%DOCLANG%%/articles/contributing-ports/what-contribute.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/contributing/TRADEMARKS.html
%%DOCSDIR%%/%%DOCLANG%%/articles/contributing/contrib-how.html
%%DOCSDIR%%/%%DOCLANG%%/articles/contributing/index.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/contributing/trademarks.html
%%DOCSDIR%%/%%DOCLANG%%/articles/contributors/contrib-386bsd.html
%%DOCSDIR%%/%%DOCLANG%%/articles/contributors/contrib-additional.html
%%DOCSDIR%%/%%DOCLANG%%/articles/contributors/contrib-corealumni.html
@@ -30,79 +36,46 @@
%%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/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/dialup-firewall/index.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/dialup-firewall/kernel.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/dialup-firewall/rcconf.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/dialup-firewall/rules.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/dialup-firewall/x107.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/dialup-firewall/x79.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/diskless-x/index.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/diskless-x/x45.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/diskless-x/x52.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/diskless-x/x58.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/diskless-x/x80.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/euro/TRADEMARKS.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/euro/index.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/euro/x178.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/euro/x209.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/euro/x82.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/euro/x92.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd/TRADEMARKS.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
%%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/filtering-bridges/TRADEMARKS.html
%%DOCSDIR%%/%%DOCLANG%%/articles/filtering-bridges/filtering-bridges-contributors.html
%%DOCSDIR%%/%%DOCLANG%%/articles/filtering-bridges/filtering-bridges-enabling.html
%%DOCSDIR%%/%%DOCLANG%%/articles/filtering-bridges/filtering-bridges-finalprep.html
%%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/filtering-bridges/trademarks.html
%%DOCSDIR%%/%%DOCLANG%%/articles/fonts/index.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/fonts/x138.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/fonts/x185.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/fonts/x31.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/fonts/x346.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/fonts/x395.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/fonts/x523.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/fonts/x551.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/fonts/x573.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/fonts/x75.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/formatting-media/index.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/formatting-media/x187.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/formatting-media/x253.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/formatting-media/x346.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/formatting-media/x93.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/ip-aliasing/index.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/ip-aliasing/x102.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/ip-aliasing/x134.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/ip-aliasing/x170.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/ip-aliasing/x41.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/ip-aliasing/x77.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/ipsec-must/TRADEMARKS.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/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/x39.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/ipsec-must/x69.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/java-tomcat/index.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/java-tomcat/ref.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/java-tomcat/x143.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/java-tomcat/x45.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/index.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/laptop/x30.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/laptop/x34.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/laptop/x53.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/linux-users/TRADEMARKS.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
@@ -112,49 +85,27 @@
%%DOCSDIR%%/%%DOCLANG%%/articles/linux-users/shells.html
%%DOCSDIR%%/%%DOCLANG%%/articles/linux-users/software.html
%%DOCSDIR%%/%%DOCLANG%%/articles/linux-users/startup.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/linux-users/trademarks.html
%%DOCSDIR%%/%%DOCLANG%%/articles/linux-users/updates.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/make-world/contributors.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/make-world/index.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/make-world/translations.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/make-world/x114.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/make-world/x134.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/make-world/x285.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/make-world/x411.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/make-world/x450.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/make-world/x474.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/make-world/x509.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/make-world/x519.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/make-world/x52.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/make-world/x532.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/make-world/x65.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/make-world/x87.html
%%DOCSDIR%%/%%DOCLANG%%/articles/mh/index.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/mh/x165.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/mh/x313.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/mh/x47.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/multi-os/boot-managers.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/multi-os/examples.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/multi-os/help.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/multi-os/index.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/multi-os/special.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/multi-os/typical.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/multi-os/x168.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/nanobsd/TRADEMARKS.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/index.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/new-users/x177.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/new-users/x283.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/new-users/x421.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/new-users/x466.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/new-users/x530.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/new-users/x58.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/new-users/x610.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/new-users/x649.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/new-users/x669.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/new-users/x87.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/ntfs/index.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/ntfs/x164.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/pam-appl-prog.html
%%DOCSDIR%%/%%DOCLANG%%/articles/pam/pam-config.html
@@ -166,40 +117,18 @@
%%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/ppp/chap3.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/ppp/index.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/ppp/sect2.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/ppp/sect5.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/ppp/sect6.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/ppp/sect7.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/ppp/x275.html
%%DOCSDIR%%/%%DOCLANG%%/articles/pr-guidelines/index.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/pr-guidelines/x30.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/pr-guidelines/x62.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/pr-guidelines/x96.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/programming-tools/debugging.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/programming-tools/emacs.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/programming-tools/index.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/programming-tools/x117.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/programming-tools/x30.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/programming-tools/x447.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/programming-tools/x945.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/pxe/bootstrap-config.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/pxe/custom-postinst-package.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/pxe/index.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/pxe/install-setup.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/pxe/server-config.html
%%DOCSDIR%%/%%DOCLANG%%/articles/releng-packages/index.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/releng-packages/x38.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/zip-drive/index.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/zip-drive/x52.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/zip-drive/x97.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/releng-packages/x31.html
%%DOCSDIR%%/%%DOCLANG%%/books/developers-handbook/afs.html
%%DOCSDIR%%/%%DOCLANG%%/books/developers-handbook/alpha.html
%%DOCSDIR%%/%%DOCLANG%%/books/developers-handbook/appendices.html
@@ -223,8 +152,8 @@
%%DOCSDIR%%/%%DOCLANG%%/books/developers-handbook/ipc.html
%%DOCSDIR%%/%%DOCLANG%%/books/developers-handbook/kernel.html
%%DOCSDIR%%/%%DOCLANG%%/books/developers-handbook/kernelhistory.html
+%%DOCSDIR%%/%%DOCLANG%%/books/developers-handbook/legalnotice.html
%%DOCSDIR%%/%%DOCLANG%%/books/developers-handbook/linux.html
-%%DOCSDIR%%/%%DOCLANG%%/books/developers-handbook/ln12.html
%%DOCSDIR%%/%%DOCLANG%%/books/developers-handbook/locking.html
%%DOCSDIR%%/%%DOCLANG%%/books/developers-handbook/memory.html
%%DOCSDIR%%/%%DOCLANG%%/books/developers-handbook/networkfs.html
@@ -262,7 +191,6 @@
%%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/LEGALNOTICE.html
%%DOCSDIR%%/%%DOCLANG%%/books/faq/acknowledgments.html
%%DOCSDIR%%/%%DOCLANG%%/books/faq/admin.html
%%DOCSDIR%%/%%DOCLANG%%/books/faq/applications.html
@@ -273,6 +201,7 @@
%%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/network.html
%%DOCSDIR%%/%%DOCLANG%%/books/faq/serial.html
@@ -471,9 +400,9 @@
%%DOCSDIR%%/%%DOCLANG%%/books/faq/x959.html
%%DOCSDIR%%/%%DOCLANG%%/books/faq/x964.html
%%DOCSDIR%%/%%DOCLANG%%/books/faq/x976.html
-%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/f33.html
+%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/f32.html
%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/index.html
-%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/ln16.html
+%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/ln15.html
%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/overview.html
%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/psgml-mode.html
%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/see-also.html
@@ -491,24 +420,24 @@
%%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/x1009.html
-%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/x103.html
-%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/x113.html
-%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/x1276.html
-%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/x164.html
-%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/x2030.html
-%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/x2047.html
-%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/x2066.html
-%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/x2135.html
-%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/x2515.html
-%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/x2524.html
-%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/x2533.html
-%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/x2540.html
-%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/x274.html
-%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/x54.html
-%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/x706.html
-%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/x748.html
-%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/x835.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-overview.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/adding-swap-space.html
@@ -645,6 +574,7 @@
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/l10n-compiling.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/l10n.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/lang-setup.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/legalnotice.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/linuxemu-advanced.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/linuxemu-lbc-install.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/linuxemu-maple.html
@@ -652,7 +582,6 @@
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/linuxemu-matlab.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/linuxemu-oracle.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/linuxemu.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/ln22.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/mac-biba.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/mac-bsdextended.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/mac-examplehttpd.html
@@ -793,25 +722,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/x23601.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/x23647.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/x23852.html
-%%DOCSDIR%%/%%DOCLANG%%/books/ppp-primer/c331.html
-%%DOCSDIR%%/%%DOCLANG%%/books/ppp-primer/config-windows-system.html
-%%DOCSDIR%%/%%DOCLANG%%/books/ppp-primer/exercices.html
-%%DOCSDIR%%/%%DOCLANG%%/books/ppp-primer/f29.html
-%%DOCSDIR%%/%%DOCLANG%%/books/ppp-primer/index.html
-%%DOCSDIR%%/%%DOCLANG%%/books/ppp-primer/lan.html
-%%DOCSDIR%%/%%DOCLANG%%/books/ppp-primer/list-lan-hosts.html
-%%DOCSDIR%%/%%DOCLANG%%/books/ppp-primer/system-config.html
-%%DOCSDIR%%/%%DOCLANG%%/books/ppp-primer/testing-the-network.html
-%%DOCSDIR%%/%%DOCLANG%%/books/ppp-primer/verify-ether-if-config.html
-%%DOCSDIR%%/%%DOCLANG%%/books/ppp-primer/workgroups.html
-%%DOCSDIR%%/%%DOCLANG%%/books/ppp-primer/x247.html
-%%DOCSDIR%%/%%DOCLANG%%/books/ppp-primer/x287.html
-%%DOCSDIR%%/%%DOCLANG%%/books/ppp-primer/x370.html
-%%DOCSDIR%%/%%DOCLANG%%/books/ppp-primer/x57.html
-%%DOCSDIR%%/%%DOCLANG%%/books/ppp-primer/x600.html
-%%DOCSDIR%%/%%DOCLANG%%/books/ppp-primer/x726.html
-%%DOCSDIR%%/%%DOCLANG%%/books/ppp-primer/x892.html
-%%DOCSDIR%%/%%DOCLANG%%/books/ppp-primer/x995.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 c68c7ed8028f..a61f60cdc384 100644
--- a/misc/freebsd-doc-fr/pkg-plist.pdf
+++ b/misc/freebsd-doc-fr/pkg-plist.pdf
@@ -1,37 +1,24 @@
@comment $FreeBSD$
+%%DOCSDIR%%/%%DOCLANG%%/articles/building-products/article.pdf
%%DOCSDIR%%/%%DOCLANG%%/articles/committers-guide/article.pdf
%%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/dialup-firewall/article.pdf
-%%DOCSDIR%%/%%DOCLANG%%/articles/diskless-x/article.pdf
-%%DOCSDIR%%/%%DOCLANG%%/articles/euro/article.pdf
%%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd/article.pdf
%%DOCSDIR%%/%%DOCLANG%%/articles/filtering-bridges/article.pdf
%%DOCSDIR%%/%%DOCLANG%%/articles/fonts/article.pdf
-%%DOCSDIR%%/%%DOCLANG%%/articles/formatting-media/article.pdf
-%%DOCSDIR%%/%%DOCLANG%%/articles/ip-aliasing/article.pdf
%%DOCSDIR%%/%%DOCLANG%%/articles/ipsec-must/article.pdf
-%%DOCSDIR%%/%%DOCLANG%%/articles/java-tomcat/article.pdf
%%DOCSDIR%%/%%DOCLANG%%/articles/laptop/article.pdf
%%DOCSDIR%%/%%DOCLANG%%/articles/linux-users/article.pdf
-%%DOCSDIR%%/%%DOCLANG%%/articles/make-world/article.pdf
%%DOCSDIR%%/%%DOCLANG%%/articles/mh/article.pdf
-%%DOCSDIR%%/%%DOCLANG%%/articles/multi-os/article.pdf
%%DOCSDIR%%/%%DOCLANG%%/articles/nanobsd/article.pdf
%%DOCSDIR%%/%%DOCLANG%%/articles/new-users/article.pdf
-%%DOCSDIR%%/%%DOCLANG%%/articles/ntfs/article.pdf
%%DOCSDIR%%/%%DOCLANG%%/articles/pam/article.pdf
-%%DOCSDIR%%/%%DOCLANG%%/articles/ppp/article.pdf
%%DOCSDIR%%/%%DOCLANG%%/articles/pr-guidelines/article.pdf
%%DOCSDIR%%/%%DOCLANG%%/articles/problem-reports/article.pdf
-%%DOCSDIR%%/%%DOCLANG%%/articles/programming-tools/article.pdf
-%%DOCSDIR%%/%%DOCLANG%%/articles/pxe/article.pdf
%%DOCSDIR%%/%%DOCLANG%%/articles/releng-packages/article.pdf
-%%DOCSDIR%%/%%DOCLANG%%/articles/zip-drive/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/ppp-primer/book.pdf
diff --git a/misc/freebsd-doc-fr/pkg-plist.ps b/misc/freebsd-doc-fr/pkg-plist.ps
index c06e067f0fc1..18ea1cd834ce 100644
--- a/misc/freebsd-doc-fr/pkg-plist.ps
+++ b/misc/freebsd-doc-fr/pkg-plist.ps
@@ -1,37 +1,24 @@
@comment $FreeBSD$
+%%DOCSDIR%%/%%DOCLANG%%/articles/building-products/article.ps
%%DOCSDIR%%/%%DOCLANG%%/articles/committers-guide/article.ps
%%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/dialup-firewall/article.ps
-%%DOCSDIR%%/%%DOCLANG%%/articles/diskless-x/article.ps
-%%DOCSDIR%%/%%DOCLANG%%/articles/euro/article.ps
%%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd/article.ps
%%DOCSDIR%%/%%DOCLANG%%/articles/filtering-bridges/article.ps
%%DOCSDIR%%/%%DOCLANG%%/articles/fonts/article.ps
-%%DOCSDIR%%/%%DOCLANG%%/articles/formatting-media/article.ps
-%%DOCSDIR%%/%%DOCLANG%%/articles/ip-aliasing/article.ps
%%DOCSDIR%%/%%DOCLANG%%/articles/ipsec-must/article.ps
-%%DOCSDIR%%/%%DOCLANG%%/articles/java-tomcat/article.ps
%%DOCSDIR%%/%%DOCLANG%%/articles/laptop/article.ps
%%DOCSDIR%%/%%DOCLANG%%/articles/linux-users/article.ps
-%%DOCSDIR%%/%%DOCLANG%%/articles/make-world/article.ps
%%DOCSDIR%%/%%DOCLANG%%/articles/mh/article.ps
-%%DOCSDIR%%/%%DOCLANG%%/articles/multi-os/article.ps
%%DOCSDIR%%/%%DOCLANG%%/articles/nanobsd/article.ps
%%DOCSDIR%%/%%DOCLANG%%/articles/new-users/article.ps
-%%DOCSDIR%%/%%DOCLANG%%/articles/ntfs/article.ps
%%DOCSDIR%%/%%DOCLANG%%/articles/pam/article.ps
-%%DOCSDIR%%/%%DOCLANG%%/articles/ppp/article.ps
%%DOCSDIR%%/%%DOCLANG%%/articles/pr-guidelines/article.ps
%%DOCSDIR%%/%%DOCLANG%%/articles/problem-reports/article.ps
-%%DOCSDIR%%/%%DOCLANG%%/articles/programming-tools/article.ps
-%%DOCSDIR%%/%%DOCLANG%%/articles/pxe/article.ps
%%DOCSDIR%%/%%DOCLANG%%/articles/releng-packages/article.ps
-%%DOCSDIR%%/%%DOCLANG%%/articles/zip-drive/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/ppp-primer/book.ps
diff --git a/misc/freebsd-doc-fr/pkg-plist.txt b/misc/freebsd-doc-fr/pkg-plist.txt
index 1740868e37ae..2edfc1baddc8 100644
--- a/misc/freebsd-doc-fr/pkg-plist.txt
+++ b/misc/freebsd-doc-fr/pkg-plist.txt
@@ -1,37 +1,24 @@
@comment $FreeBSD$
+%%DOCSDIR%%/%%DOCLANG%%/articles/building-products/article.txt
%%DOCSDIR%%/%%DOCLANG%%/articles/committers-guide/article.txt
%%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/dialup-firewall/article.txt
-%%DOCSDIR%%/%%DOCLANG%%/articles/diskless-x/article.txt
-%%DOCSDIR%%/%%DOCLANG%%/articles/euro/article.txt
%%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd/article.txt
%%DOCSDIR%%/%%DOCLANG%%/articles/filtering-bridges/article.txt
%%DOCSDIR%%/%%DOCLANG%%/articles/fonts/article.txt
-%%DOCSDIR%%/%%DOCLANG%%/articles/formatting-media/article.txt
-%%DOCSDIR%%/%%DOCLANG%%/articles/ip-aliasing/article.txt
%%DOCSDIR%%/%%DOCLANG%%/articles/ipsec-must/article.txt
-%%DOCSDIR%%/%%DOCLANG%%/articles/java-tomcat/article.txt
%%DOCSDIR%%/%%DOCLANG%%/articles/laptop/article.txt
%%DOCSDIR%%/%%DOCLANG%%/articles/linux-users/article.txt
-%%DOCSDIR%%/%%DOCLANG%%/articles/make-world/article.txt
%%DOCSDIR%%/%%DOCLANG%%/articles/mh/article.txt
-%%DOCSDIR%%/%%DOCLANG%%/articles/multi-os/article.txt
%%DOCSDIR%%/%%DOCLANG%%/articles/nanobsd/article.txt
%%DOCSDIR%%/%%DOCLANG%%/articles/new-users/article.txt
-%%DOCSDIR%%/%%DOCLANG%%/articles/ntfs/article.txt
%%DOCSDIR%%/%%DOCLANG%%/articles/pam/article.txt
-%%DOCSDIR%%/%%DOCLANG%%/articles/ppp/article.txt
%%DOCSDIR%%/%%DOCLANG%%/articles/pr-guidelines/article.txt
%%DOCSDIR%%/%%DOCLANG%%/articles/problem-reports/article.txt
-%%DOCSDIR%%/%%DOCLANG%%/articles/programming-tools/article.txt
-%%DOCSDIR%%/%%DOCLANG%%/articles/pxe/article.txt
%%DOCSDIR%%/%%DOCLANG%%/articles/releng-packages/article.txt
-%%DOCSDIR%%/%%DOCLANG%%/articles/zip-drive/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/ppp-primer/book.txt
diff --git a/misc/freebsd-doc-hu/pkg-plist.common b/misc/freebsd-doc-hu/pkg-plist.common
index e9c80d3644e1..65c8ca65be4c 100644
--- a/misc/freebsd-doc-hu/pkg-plist.common
+++ b/misc/freebsd-doc-hu/pkg-plist.common
@@ -14,14 +14,11 @@
@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer
@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/faq
@dirrm %%DOCSDIR%%/%%DOCLANG%%/books
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/version-guide
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/multi-os
@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/linux-users
@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/linux-comparison
@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/laptop
@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/gjournal-desktop
@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/dialup-firewall
@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/cups
@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/compiz-fusion
@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles
diff --git a/misc/freebsd-doc-hu/pkg-plist.html b/misc/freebsd-doc-hu/pkg-plist.html
index d46caccaae79..ce9a289538fa 100644
--- a/misc/freebsd-doc-hu/pkg-plist.html
+++ b/misc/freebsd-doc-hu/pkg-plist.html
@@ -1,14 +1,11 @@
@comment $FreeBSD$
%%DOCSDIR%%/%%DOCLANG%%/articles/compiz-fusion/article.html
%%DOCSDIR%%/%%DOCLANG%%/articles/cups/article.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/dialup-firewall/article.html
%%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd/article.html
%%DOCSDIR%%/%%DOCLANG%%/articles/gjournal-desktop/article.html
%%DOCSDIR%%/%%DOCLANG%%/articles/laptop/article.html
%%DOCSDIR%%/%%DOCLANG%%/articles/linux-comparison/article.html
%%DOCSDIR%%/%%DOCLANG%%/articles/linux-users/article.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/multi-os/article.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/version-guide/article.html
%%DOCSDIR%%/%%DOCLANG%%/books/faq/book.html
%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/book.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/book.html
diff --git a/misc/freebsd-doc-hu/pkg-plist.html-common b/misc/freebsd-doc-hu/pkg-plist.html-common
index 885877e08821..f70425c80bab 100644
--- a/misc/freebsd-doc-hu/pkg-plist.html-common
+++ b/misc/freebsd-doc-hu/pkg-plist.html-common
@@ -1,7 +1,6 @@
@comment $FreeBSD$
%%DOCSDIR%%/%%DOCLANG%%/articles/compiz-fusion/docbook.css
%%DOCSDIR%%/%%DOCLANG%%/articles/cups/docbook.css
-%%DOCSDIR%%/%%DOCLANG%%/articles/dialup-firewall/docbook.css
%%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd/docbook.css
%%DOCSDIR%%/%%DOCLANG%%/articles/gjournal-desktop/disklabel1.png
%%DOCSDIR%%/%%DOCLANG%%/articles/gjournal-desktop/disklabel2.png
@@ -9,8 +8,6 @@
%%DOCSDIR%%/%%DOCLANG%%/articles/laptop/docbook.css
%%DOCSDIR%%/%%DOCLANG%%/articles/linux-comparison/docbook.css
%%DOCSDIR%%/%%DOCLANG%%/articles/linux-users/docbook.css
-%%DOCSDIR%%/%%DOCLANG%%/articles/multi-os/docbook.css
-%%DOCSDIR%%/%%DOCLANG%%/articles/version-guide/docbook.css
%%DOCSDIR%%/%%DOCLANG%%/books/faq/docbook.css
%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/docbook.css
%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/imagelib/callouts/1.png
diff --git a/misc/freebsd-doc-hu/pkg-plist.html-split b/misc/freebsd-doc-hu/pkg-plist.html-split
index c3ac5ba0218c..99779f71183d 100644
--- a/misc/freebsd-doc-hu/pkg-plist.html-split
+++ b/misc/freebsd-doc-hu/pkg-plist.html-split
@@ -1,11 +1,10 @@
@comment $FreeBSD$
-%%DOCSDIR%%/%%DOCLANG%%/articles/compiz-fusion/TRADEMARKS.html
%%DOCSDIR%%/%%DOCLANG%%/articles/compiz-fusion/compiz-fusion.html
%%DOCSDIR%%/%%DOCLANG%%/articles/compiz-fusion/compiz-troubleshooting.html
%%DOCSDIR%%/%%DOCLANG%%/articles/compiz-fusion/index.html
%%DOCSDIR%%/%%DOCLANG%%/articles/compiz-fusion/nvidia-setup.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/compiz-fusion/trademarks.html
%%DOCSDIR%%/%%DOCLANG%%/articles/compiz-fusion/xorg-configuration.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/cups/TRADEMARKS.html
%%DOCSDIR%%/%%DOCLANG%%/articles/cups/index.html
%%DOCSDIR%%/%%DOCLANG%%/articles/cups/printing-cups-clients.html
%%DOCSDIR%%/%%DOCLANG%%/articles/cups/printing-cups-configuring-printers.html
@@ -13,31 +12,24 @@
%%DOCSDIR%%/%%DOCLANG%%/articles/cups/printing-cups-install.html
%%DOCSDIR%%/%%DOCLANG%%/articles/cups/printing-cups-ports-knobs.html
%%DOCSDIR%%/%%DOCLANG%%/articles/cups/printing-cups-troubleshooting.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/dialup-firewall/TRADEMARKS.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/dialup-firewall/index.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/dialup-firewall/kernel.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/dialup-firewall/rcconf.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/dialup-firewall/rules.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/dialup-firewall/x72.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/dialup-firewall/x93.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd/TRADEMARKS.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/cups/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
%%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/gjournal-desktop/TRADEMARKS.html
%%DOCSDIR%%/%%DOCLANG%%/articles/gjournal-desktop/configure-journal.html
%%DOCSDIR%%/%%DOCLANG%%/articles/gjournal-desktop/further-reading.html
%%DOCSDIR%%/%%DOCLANG%%/articles/gjournal-desktop/index.html
%%DOCSDIR%%/%%DOCLANG%%/articles/gjournal-desktop/reserve-space.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/gjournal-desktop/trademarks.html
%%DOCSDIR%%/%%DOCLANG%%/articles/gjournal-desktop/troubleshooting-gjournal.html
%%DOCSDIR%%/%%DOCLANG%%/articles/gjournal-desktop/understanding-journaling.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/laptop/TRADEMARKS.html
%%DOCSDIR%%/%%DOCLANG%%/articles/laptop/index.html
%%DOCSDIR%%/%%DOCLANG%%/articles/laptop/modems.html
%%DOCSDIR%%/%%DOCLANG%%/articles/laptop/pcmcia.html
%%DOCSDIR%%/%%DOCLANG%%/articles/laptop/power-management.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/linux-comparison/TRADEMARKS.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/laptop/trademarks.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
@@ -45,7 +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-users/TRADEMARKS.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/linux-comparison/trademarks.html
%%DOCSDIR%%/%%DOCLANG%%/articles/linux-users/commands.html
%%DOCSDIR%%/%%DOCLANG%%/articles/linux-users/conclusion.html
%%DOCSDIR%%/%%DOCLANG%%/articles/linux-users/firewall.html
@@ -55,22 +47,8 @@
%%DOCSDIR%%/%%DOCLANG%%/articles/linux-users/shells.html
%%DOCSDIR%%/%%DOCLANG%%/articles/linux-users/software.html
%%DOCSDIR%%/%%DOCLANG%%/articles/linux-users/startup.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/linux-users/trademarks.html
%%DOCSDIR%%/%%DOCLANG%%/articles/linux-users/updates.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/multi-os/TRADEMARKS.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/multi-os/ch2.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/multi-os/ch3.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/multi-os/ch4.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/multi-os/ch5.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/multi-os/index.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/multi-os/sources.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/multi-os/x219.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/version-guide/TRADEMARKS.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/version-guide/conclusion.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/version-guide/decision-points.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/version-guide/future-goals.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/version-guide/index.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/version-guide/past-schedules.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/LEGALNOTICE.html
%%DOCSDIR%%/%%DOCLANG%%/books/faq/acknowledgments.html
%%DOCSDIR%%/%%DOCLANG%%/books/faq/admin.html
%%DOCSDIR%%/%%DOCLANG%%/books/faq/advanced.html
@@ -91,6 +69,7 @@
%%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/ppp.html
@@ -99,13 +78,13 @@
%%DOCSDIR%%/%%DOCLANG%%/books/faq/support.html
%%DOCSDIR%%/%%DOCLANG%%/books/faq/troubleshoot.html
%%DOCSDIR%%/%%DOCLANG%%/books/faq/x.html
-%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/LEGALNOTICE.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
%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/examples-formatted.html
%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/examples.html
%%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
@@ -145,7 +124,6 @@
%%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/LEGALNOTICE.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/acpi-debug.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/acpi-overview.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/adding-swap-space.html
@@ -288,6 +266,7 @@
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/l10n-compiling.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/l10n.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/lang-setup.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/legalnotice.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/linuxemu-advanced.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/linuxemu-lbc-install.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/linuxemu-maple.html
@@ -443,4 +422,4 @@
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/x-xdm.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/x11-wm.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/x11.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/x45624.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/x45615.html
diff --git a/misc/freebsd-doc-hu/pkg-plist.pdf b/misc/freebsd-doc-hu/pkg-plist.pdf
index 342a727e4d73..a572fab3aadd 100644
--- a/misc/freebsd-doc-hu/pkg-plist.pdf
+++ b/misc/freebsd-doc-hu/pkg-plist.pdf
@@ -1,14 +1,11 @@
@comment $FreeBSD$
%%DOCSDIR%%/%%DOCLANG%%/articles/compiz-fusion/article.pdf
%%DOCSDIR%%/%%DOCLANG%%/articles/cups/article.pdf
-%%DOCSDIR%%/%%DOCLANG%%/articles/dialup-firewall/article.pdf
%%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd/article.pdf
%%DOCSDIR%%/%%DOCLANG%%/articles/gjournal-desktop/article.pdf
%%DOCSDIR%%/%%DOCLANG%%/articles/laptop/article.pdf
%%DOCSDIR%%/%%DOCLANG%%/articles/linux-comparison/article.pdf
%%DOCSDIR%%/%%DOCLANG%%/articles/linux-users/article.pdf
-%%DOCSDIR%%/%%DOCLANG%%/articles/multi-os/article.pdf
-%%DOCSDIR%%/%%DOCLANG%%/articles/version-guide/article.pdf
%%DOCSDIR%%/%%DOCLANG%%/books/faq/book.pdf
%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/book.pdf
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/book.pdf
diff --git a/misc/freebsd-doc-hu/pkg-plist.ps b/misc/freebsd-doc-hu/pkg-plist.ps
index ddb41d80cd76..0a7668136977 100644
--- a/misc/freebsd-doc-hu/pkg-plist.ps
+++ b/misc/freebsd-doc-hu/pkg-plist.ps
@@ -1,14 +1,11 @@
@comment $FreeBSD$
%%DOCSDIR%%/%%DOCLANG%%/articles/compiz-fusion/article.ps
%%DOCSDIR%%/%%DOCLANG%%/articles/cups/article.ps
-%%DOCSDIR%%/%%DOCLANG%%/articles/dialup-firewall/article.ps
%%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd/article.ps
%%DOCSDIR%%/%%DOCLANG%%/articles/gjournal-desktop/article.ps
%%DOCSDIR%%/%%DOCLANG%%/articles/laptop/article.ps
%%DOCSDIR%%/%%DOCLANG%%/articles/linux-comparison/article.ps
%%DOCSDIR%%/%%DOCLANG%%/articles/linux-users/article.ps
-%%DOCSDIR%%/%%DOCLANG%%/articles/multi-os/article.ps
-%%DOCSDIR%%/%%DOCLANG%%/articles/version-guide/article.ps
%%DOCSDIR%%/%%DOCLANG%%/books/faq/book.ps
%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/book.ps
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/book.ps
diff --git a/misc/freebsd-doc-hu/pkg-plist.txt b/misc/freebsd-doc-hu/pkg-plist.txt
index 326f6485829f..1cd5a71cfaaa 100644
--- a/misc/freebsd-doc-hu/pkg-plist.txt
+++ b/misc/freebsd-doc-hu/pkg-plist.txt
@@ -1,14 +1,11 @@
@comment $FreeBSD$
%%DOCSDIR%%/%%DOCLANG%%/articles/compiz-fusion/article.txt
%%DOCSDIR%%/%%DOCLANG%%/articles/cups/article.txt
-%%DOCSDIR%%/%%DOCLANG%%/articles/dialup-firewall/article.txt
%%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd/article.txt
%%DOCSDIR%%/%%DOCLANG%%/articles/gjournal-desktop/article.txt
%%DOCSDIR%%/%%DOCLANG%%/articles/laptop/article.txt
%%DOCSDIR%%/%%DOCLANG%%/articles/linux-comparison/article.txt
%%DOCSDIR%%/%%DOCLANG%%/articles/linux-users/article.txt
-%%DOCSDIR%%/%%DOCLANG%%/articles/multi-os/article.txt
-%%DOCSDIR%%/%%DOCLANG%%/articles/version-guide/article.txt
%%DOCSDIR%%/%%DOCLANG%%/books/faq/book.txt
%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/book.txt
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/book.txt
diff --git a/misc/freebsd-doc-it/pkg-plist.common b/misc/freebsd-doc-it/pkg-plist.common
index 04fcd80a97c8..597b22073d43 100644
--- a/misc/freebsd-doc-it/pkg-plist.common
+++ b/misc/freebsd-doc-it/pkg-plist.common
@@ -13,10 +13,8 @@
@dirrm %%DOCSDIR%%/%%DOCLANG%%/books
@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/vm-design
@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/new-users
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/multi-os
@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/filtering-bridges
@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/euro
@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/committers-guide
@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles
%%DOCSDIR%%/%%DOCLANG_PREFIX%%
diff --git a/misc/freebsd-doc-it/pkg-plist.html b/misc/freebsd-doc-it/pkg-plist.html
index 13c3b657765a..c807a66c6b31 100644
--- a/misc/freebsd-doc-it/pkg-plist.html
+++ b/misc/freebsd-doc-it/pkg-plist.html
@@ -1,9 +1,7 @@
@comment $FreeBSD$
%%DOCSDIR%%/%%DOCLANG%%/articles/committers-guide/article.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/euro/article.html
%%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd/article.html
%%DOCSDIR%%/%%DOCLANG%%/articles/filtering-bridges/article.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/multi-os/article.html
%%DOCSDIR%%/%%DOCLANG%%/articles/new-users/article.html
%%DOCSDIR%%/%%DOCLANG%%/articles/vm-design/article.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/book.html
diff --git a/misc/freebsd-doc-it/pkg-plist.html-common b/misc/freebsd-doc-it/pkg-plist.html-common
index 2a7477cf3eab..ef550a112529 100644
--- a/misc/freebsd-doc-it/pkg-plist.html-common
+++ b/misc/freebsd-doc-it/pkg-plist.html-common
@@ -1,9 +1,7 @@
@comment $FreeBSD$
%%DOCSDIR%%/%%DOCLANG%%/articles/committers-guide/docbook.css
-%%DOCSDIR%%/%%DOCLANG%%/articles/euro/docbook.css
%%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd/docbook.css
%%DOCSDIR%%/%%DOCLANG%%/articles/filtering-bridges/docbook.css
-%%DOCSDIR%%/%%DOCLANG%%/articles/multi-os/docbook.css
%%DOCSDIR%%/%%DOCLANG%%/articles/new-users/docbook.css
%%DOCSDIR%%/%%DOCLANG%%/articles/vm-design/docbook.css
%%DOCSDIR%%/%%DOCLANG%%/articles/vm-design/fig1.png
diff --git a/misc/freebsd-doc-it/pkg-plist.html-split b/misc/freebsd-doc-it/pkg-plist.html-split
index 769414638761..f79c307b0c6c 100644
--- a/misc/freebsd-doc-it/pkg-plist.html-split
+++ b/misc/freebsd-doc-it/pkg-plist.html-split
@@ -1,5 +1,4 @@
@comment $FreeBSD$
-%%DOCSDIR%%/%%DOCLANG%%/articles/committers-guide/TRADEMARKS.html
%%DOCSDIR%%/%%DOCLANG%%/articles/committers-guide/archs.html
%%DOCSDIR%%/%%DOCLANG%%/articles/committers-guide/committer.types.html
%%DOCSDIR%%/%%DOCLANG%%/articles/committers-guide/conventions.html
@@ -14,45 +13,31 @@
%%DOCSDIR%%/%%DOCLANG%%/articles/committers-guide/pref-license.html
%%DOCSDIR%%/%%DOCLANG%%/articles/committers-guide/rules.html
%%DOCSDIR%%/%%DOCLANG%%/articles/committers-guide/ssh.guide.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/euro/TRADEMARKS.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/euro/console.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/euro/general.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/euro/index.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/euro/problems.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/euro/x11.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd/TRADEMARKS.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/committers-guide/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
%%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/filtering-bridges/TRADEMARKS.html
%%DOCSDIR%%/%%DOCLANG%%/articles/filtering-bridges/filtering-bridges-contributors.html
%%DOCSDIR%%/%%DOCLANG%%/articles/filtering-bridges/filtering-bridges-enabling.html
%%DOCSDIR%%/%%DOCLANG%%/articles/filtering-bridges/filtering-bridges-finalprep.html
%%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/multi-os/TRADEMARKS.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/multi-os/ch2.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/multi-os/ch3.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/multi-os/ch4.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/multi-os/ch5.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/multi-os/index.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/multi-os/sources.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/multi-os/x195.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/new-users/TRADEMARKS.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/filtering-bridges/trademarks.html
%%DOCSDIR%%/%%DOCLANG%%/articles/new-users/index.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/new-users/x133.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/new-users/x228.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/new-users/x343.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/new-users/x495.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/new-users/x560.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/new-users/x628.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/new-users/x712.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/new-users/x74.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/new-users/x784.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/new-users/x798.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/vm-design/TRADEMARKS.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
@@ -61,8 +46,8 @@
%%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/LEGALNOTICE.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/acpi-debug.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/acpi-overview.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/adding-swap-space.html
@@ -192,6 +177,7 @@
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/l10n-compiling.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/l10n.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/lang-setup.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/legalnotice.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/linuxemu-advanced.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/linuxemu-lbc-install.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/linuxemu-maple.html
@@ -350,7 +336,7 @@
%%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/g9537.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
diff --git a/misc/freebsd-doc-it/pkg-plist.pdf b/misc/freebsd-doc-it/pkg-plist.pdf
index 15a6025582c8..452ddce6f3ca 100644
--- a/misc/freebsd-doc-it/pkg-plist.pdf
+++ b/misc/freebsd-doc-it/pkg-plist.pdf
@@ -1,9 +1,7 @@
@comment $FreeBSD$
%%DOCSDIR%%/%%DOCLANG%%/articles/committers-guide/article.pdf
-%%DOCSDIR%%/%%DOCLANG%%/articles/euro/article.pdf
%%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd/article.pdf
%%DOCSDIR%%/%%DOCLANG%%/articles/filtering-bridges/article.pdf
-%%DOCSDIR%%/%%DOCLANG%%/articles/multi-os/article.pdf
%%DOCSDIR%%/%%DOCLANG%%/articles/new-users/article.pdf
%%DOCSDIR%%/%%DOCLANG%%/articles/vm-design/article.pdf
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/book.pdf
diff --git a/misc/freebsd-doc-it/pkg-plist.ps b/misc/freebsd-doc-it/pkg-plist.ps
index 1290316cc26e..9da4e0f6ac0b 100644
--- a/misc/freebsd-doc-it/pkg-plist.ps
+++ b/misc/freebsd-doc-it/pkg-plist.ps
@@ -1,9 +1,7 @@
@comment $FreeBSD$
%%DOCSDIR%%/%%DOCLANG%%/articles/committers-guide/article.ps
-%%DOCSDIR%%/%%DOCLANG%%/articles/euro/article.ps
%%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd/article.ps
%%DOCSDIR%%/%%DOCLANG%%/articles/filtering-bridges/article.ps
-%%DOCSDIR%%/%%DOCLANG%%/articles/multi-os/article.ps
%%DOCSDIR%%/%%DOCLANG%%/articles/new-users/article.ps
%%DOCSDIR%%/%%DOCLANG%%/articles/vm-design/article.ps
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/book.ps
diff --git a/misc/freebsd-doc-it/pkg-plist.txt b/misc/freebsd-doc-it/pkg-plist.txt
index b8236c947e6c..be9d2a39008a 100644
--- a/misc/freebsd-doc-it/pkg-plist.txt
+++ b/misc/freebsd-doc-it/pkg-plist.txt
@@ -1,9 +1,7 @@
@comment $FreeBSD$
%%DOCSDIR%%/%%DOCLANG%%/articles/committers-guide/article.txt
-%%DOCSDIR%%/%%DOCLANG%%/articles/euro/article.txt
%%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd/article.txt
%%DOCSDIR%%/%%DOCLANG%%/articles/filtering-bridges/article.txt
-%%DOCSDIR%%/%%DOCLANG%%/articles/multi-os/article.txt
%%DOCSDIR%%/%%DOCLANG%%/articles/new-users/article.txt
%%DOCSDIR%%/%%DOCLANG%%/articles/vm-design/article.txt
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/book.txt
diff --git a/misc/freebsd-doc-ja/pkg-plist.common b/misc/freebsd-doc-ja/pkg-plist.common
index 2ccbfc26259f..8a38ce747469 100644
--- a/misc/freebsd-doc-ja/pkg-plist.common
+++ b/misc/freebsd-doc-ja/pkg-plist.common
@@ -1,5 +1,4 @@
@comment $FreeBSD$
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/ppp-primer
@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook
@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/handbook/virtualization
@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/handbook/mail
@@ -13,14 +12,10 @@
@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/faq
@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/design-44bsd
@dirrm %%DOCSDIR%%/%%DOCLANG%%/books
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/zip-drive
@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/problem-reports
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/multi-os
@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/ipsec-must
@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/fonts
@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/fbsd-from-scratch
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/diskless-x
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/dialup-firewall
@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/contributors
@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/contributing
@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles
diff --git a/misc/freebsd-doc-ja/pkg-plist.html b/misc/freebsd-doc-ja/pkg-plist.html
index 276bc2e74653..2e663392f52d 100644
--- a/misc/freebsd-doc-ja/pkg-plist.html
+++ b/misc/freebsd-doc-ja/pkg-plist.html
@@ -1,16 +1,11 @@
@comment $FreeBSD$
%%DOCSDIR%%/%%DOCLANG%%/articles/contributing/article.html
%%DOCSDIR%%/%%DOCLANG%%/articles/contributors/article.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/dialup-firewall/article.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/diskless-x/article.html
%%DOCSDIR%%/%%DOCLANG%%/articles/fbsd-from-scratch/article.html
%%DOCSDIR%%/%%DOCLANG%%/articles/fonts/article.html
%%DOCSDIR%%/%%DOCLANG%%/articles/ipsec-must/article.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/multi-os/article.html
%%DOCSDIR%%/%%DOCLANG%%/articles/problem-reports/article.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/zip-drive/article.html
%%DOCSDIR%%/%%DOCLANG%%/books/design-44bsd/book.html
%%DOCSDIR%%/%%DOCLANG%%/books/faq/book.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/book.html
%%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/book.html
-%%DOCSDIR%%/%%DOCLANG%%/books/ppp-primer/book.html
diff --git a/misc/freebsd-doc-ja/pkg-plist.html-common b/misc/freebsd-doc-ja/pkg-plist.html-common
index 224e65505bb4..d50fe2678cfd 100644
--- a/misc/freebsd-doc-ja/pkg-plist.html-common
+++ b/misc/freebsd-doc-ja/pkg-plist.html-common
@@ -1,14 +1,10 @@
@comment $FreeBSD$
%%DOCSDIR%%/%%DOCLANG%%/articles/contributing/docbook.css
%%DOCSDIR%%/%%DOCLANG%%/articles/contributors/docbook.css
-%%DOCSDIR%%/%%DOCLANG%%/articles/dialup-firewall/docbook.css
-%%DOCSDIR%%/%%DOCLANG%%/articles/diskless-x/docbook.css
%%DOCSDIR%%/%%DOCLANG%%/articles/fbsd-from-scratch/docbook.css
%%DOCSDIR%%/%%DOCLANG%%/articles/fonts/docbook.css
%%DOCSDIR%%/%%DOCLANG%%/articles/ipsec-must/docbook.css
-%%DOCSDIR%%/%%DOCLANG%%/articles/multi-os/docbook.css
%%DOCSDIR%%/%%DOCLANG%%/articles/problem-reports/docbook.css
-%%DOCSDIR%%/%%DOCLANG%%/articles/zip-drive/docbook.css
%%DOCSDIR%%/%%DOCLANG%%/books/design-44bsd/docbook.css
%%DOCSDIR%%/%%DOCLANG%%/books/design-44bsd/fig1.png
%%DOCSDIR%%/%%DOCLANG%%/books/design-44bsd/fig2.png
@@ -196,4 +192,3 @@
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/virtualization/vmware-freebsd11.png
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/virtualization/vmware-freebsd12.png
%%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/docbook.css
-%%DOCSDIR%%/%%DOCLANG%%/books/ppp-primer/docbook.css
diff --git a/misc/freebsd-doc-ja/pkg-plist.html-split b/misc/freebsd-doc-ja/pkg-plist.html-split
index d0f4a65d5c66..befaa0e9b5e0 100644
--- a/misc/freebsd-doc-ja/pkg-plist.html-split
+++ b/misc/freebsd-doc-ja/pkg-plist.html-split
@@ -1,8 +1,7 @@
@comment $FreeBSD$
-%%DOCSDIR%%/%%DOCLANG%%/articles/contributing/TRADEMARKS.html
%%DOCSDIR%%/%%DOCLANG%%/articles/contributing/contrib-how.html
%%DOCSDIR%%/%%DOCLANG%%/articles/contributing/index.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/contributors/TRADEMARKS.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/contributing/trademarks.html
%%DOCSDIR%%/%%DOCLANG%%/articles/contributors/contrib-386bsd.html
%%DOCSDIR%%/%%DOCLANG%%/articles/contributors/contrib-additional.html
%%DOCSDIR%%/%%DOCLANG%%/articles/contributors/contrib-corealumni.html
@@ -10,20 +9,7 @@
%%DOCSDIR%%/%%DOCLANG%%/articles/contributors/contrib-develalumni.html
%%DOCSDIR%%/%%DOCLANG%%/articles/contributors/index.html
%%DOCSDIR%%/%%DOCLANG%%/articles/contributors/staff-committers.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/dialup-firewall/TRADEMARKS.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/dialup-firewall/index.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/dialup-firewall/kernel.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/dialup-firewall/rcconf.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/dialup-firewall/rules.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/dialup-firewall/x71.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/dialup-firewall/x91.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/diskless-x/TRADEMARKS.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/diskless-x/index.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/diskless-x/x45.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/diskless-x/x55.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/diskless-x/x62.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/diskless-x/x83.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/fbsd-from-scratch/TRADEMARKS.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/contributors/trademarks.html
%%DOCSDIR%%/%%DOCLANG%%/articles/fbsd-from-scratch/files.html
%%DOCSDIR%%/%%DOCLANG%%/articles/fbsd-from-scratch/index.html
%%DOCSDIR%%/%%DOCLANG%%/articles/fbsd-from-scratch/limitations.html
@@ -31,20 +17,20 @@
%%DOCSDIR%%/%%DOCLANG%%/articles/fbsd-from-scratch/stage1.html
%%DOCSDIR%%/%%DOCLANG%%/articles/fbsd-from-scratch/stage2.html
%%DOCSDIR%%/%%DOCLANG%%/articles/fbsd-from-scratch/stage3.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/fbsd-from-scratch/trademarks.html
%%DOCSDIR%%/%%DOCLANG%%/articles/fbsd-from-scratch/why.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/fonts/TRADEMARKS.html
%%DOCSDIR%%/%%DOCLANG%%/articles/fonts/additional-questions.html
%%DOCSDIR%%/%%DOCLANG%%/articles/fonts/convert-truetype.html
%%DOCSDIR%%/%%DOCLANG%%/articles/fonts/font-formats.html
%%DOCSDIR%%/%%DOCLANG%%/articles/fonts/index.html
%%DOCSDIR%%/%%DOCLANG%%/articles/fonts/obtaining-additional-fonts.html
%%DOCSDIR%%/%%DOCLANG%%/articles/fonts/terminology.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/fonts/trademarks.html
%%DOCSDIR%%/%%DOCLANG%%/articles/fonts/truetype-for-other-programs.html
%%DOCSDIR%%/%%DOCLANG%%/articles/fonts/type1-fonts-ghostscript.html
%%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/TRADEMARKS.html
%%DOCSDIR%%/%%DOCLANG%%/articles/ipsec-must/caveat.html
%%DOCSDIR%%/%%DOCLANG%%/articles/ipsec-must/code.html
%%DOCSDIR%%/%%DOCLANG%%/articles/ipsec-must/experiment.html
@@ -53,27 +39,18 @@
%%DOCSDIR%%/%%DOCLANG%%/articles/ipsec-must/ipsec.html
%%DOCSDIR%%/%%DOCLANG%%/articles/ipsec-must/kernel.html
%%DOCSDIR%%/%%DOCLANG%%/articles/ipsec-must/solution.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/multi-os/TRADEMARKS.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/multi-os/ch2.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/multi-os/ch3.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/multi-os/ch4.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/multi-os/ch5.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/multi-os/index.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/multi-os/sources.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/multi-os/x193.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/ipsec-must/trademarks.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-problems.html
%%DOCSDIR%%/%%DOCLANG%%/articles/problem-reports/pr-when.html
%%DOCSDIR%%/%%DOCLANG%%/articles/problem-reports/pr-writing.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/zip-drive/TRADEMARKS.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/zip-drive/index.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/zip-drive/x103.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/zip-drive/x53.html
-%%DOCSDIR%%/%%DOCLANG%%/books/design-44bsd/LEGALNOTICE.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/problem-reports/trademarks.html
%%DOCSDIR%%/%%DOCLANG%%/books/design-44bsd/index.html
%%DOCSDIR%%/%%DOCLANG%%/books/design-44bsd/jacknowledgement.html
+%%DOCSDIR%%/%%DOCLANG%%/books/design-44bsd/legalnotice.html
%%DOCSDIR%%/%%DOCLANG%%/books/design-44bsd/overview-filestore.html
%%DOCSDIR%%/%%DOCLANG%%/books/design-44bsd/overview-filesystem.html
%%DOCSDIR%%/%%DOCLANG%%/books/design-44bsd/overview-io-system.html
@@ -88,7 +65,6 @@
%%DOCSDIR%%/%%DOCLANG%%/books/design-44bsd/overview-process-management.html
%%DOCSDIR%%/%%DOCLANG%%/books/design-44bsd/overview-terminal.html
%%DOCSDIR%%/%%DOCLANG%%/books/design-44bsd/overview.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/LEGALNOTICE.html
%%DOCSDIR%%/%%DOCLANG%%/books/faq/acknowledgments.html
%%DOCSDIR%%/%%DOCLANG%%/books/faq/admin.html
%%DOCSDIR%%/%%DOCLANG%%/books/faq/applications.html
@@ -100,6 +76,7 @@
%%DOCSDIR%%/%%DOCLANG%%/books/faq/install.html
%%DOCSDIR%%/%%DOCLANG%%/books/faq/jcontrib.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/ppp.html
@@ -107,7 +84,6 @@
%%DOCSDIR%%/%%DOCLANG%%/books/faq/serial.html
%%DOCSDIR%%/%%DOCLANG%%/books/faq/troubleshoot.html
%%DOCSDIR%%/%%DOCLANG%%/books/faq/x.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/LEGALNOTICE.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/advanced-networking.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/anoncvs.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/appendices.html
@@ -132,7 +108,6 @@
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/boot-kernel.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/boot-shutdown.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/boot.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/bridging.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall-final-warning.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall-hardware.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall-install-trouble.html
@@ -168,11 +143,9 @@
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/desktop-viewers.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/desktop.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/device-hints.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/dhcp.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/dialout.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/dialup.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/dirstructure.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/diskless.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/disks-adding.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/disks-encrypting.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/disks-naming.html
@@ -206,7 +179,6 @@
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/install.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/introduction.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/ipsec.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/isdn.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/kerberos.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/kernelconfig-building.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/kernelconfig-config.html
@@ -219,6 +191,7 @@
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/l10n-compiling.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/l10n.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/lang-setup.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/legalnotice.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/linuxemu-lbc-install.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/linuxemu-mathematicau.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/linuxemu-oracle.html
@@ -230,7 +203,6 @@
%%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-afs.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/mirrors-bittorrent.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/mirrors-ftp.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/mirrors-rsync.html
@@ -238,9 +210,22 @@
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/mount-unmount.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/multimedia.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/mythtv.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/network-bluetooth.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/network-bridging.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/network-communication.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/nfs.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/nis.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/network-dhcp.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/network-diskless.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/network-dns.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/network-inetd.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/network-ipv6.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/network-isdn.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/network-natd.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/network-nfs.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/network-nis.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/network-ntp.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/network-plip.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/network-routing.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/network-wireless.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/nutshell.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/openssh.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/openssl.html
@@ -249,6 +234,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
@@ -267,7 +253,6 @@
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/printing.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/quotas.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/raid.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/routing.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/sapr3.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/scanners.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/securing-freebsd.html
@@ -287,6 +272,8 @@
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/snapshots.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/sound-mp3.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/sound-setup.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/svn-mirrors.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/svn.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/synching.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/system-administration.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/term.html
@@ -297,14 +284,15 @@
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/updating-upgrading.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/userppp.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/users-groups.html
+%%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-personalizing.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
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/using-localization.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/using-sysinstall.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/video-playback.html
@@ -315,12 +303,12 @@
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/x-xdm.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/x11-wm.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/x11.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/x15539.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/x32248.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/x32292.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/x32336.html
-%%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/LEGALNOTICE.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/x15858.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/x35809.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/x35853.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/x35897.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
%%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/dads-broken.html
%%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/dads-cc.html
@@ -332,9 +320,11 @@
%%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/dads-misc.html
%%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/dads-rational.html
%%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/dads-readme.html
+%%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/dads-strip.html
%%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/dads-stuck.html
%%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/dads-subdirs.html
%%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/dads-uid.html
+%%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/makefile-build.html
@@ -348,6 +338,7 @@
%%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/makefile.html
%%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/motif-lib.html
%%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/own-port.html
+%%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/pkg-deinstall.html
%%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/pkg-files.html
%%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/pkg-install.html
%%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/pkg-names.html
@@ -383,6 +374,7 @@
%%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/special.html
%%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/testing-freshports.html
%%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/testing.html
+%%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/trademarks.html
%%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/using-automake.html
%%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/using-bison.html
%%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/using-emacs.html
@@ -392,24 +384,7 @@
%%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/using-perl.html
%%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/using-python.html
%%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/using-ruby.html
+%%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/using-sdl.html
%%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/using-x11.html
+%%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/why-port.html
%%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/x11-fonts.html
-%%DOCSDIR%%/%%DOCLANG%%/books/ppp-primer/c30.html
-%%DOCSDIR%%/%%DOCLANG%%/books/ppp-primer/c307.html
-%%DOCSDIR%%/%%DOCLANG%%/books/ppp-primer/c832.html
-%%DOCSDIR%%/%%DOCLANG%%/books/ppp-primer/config-window-system.html
-%%DOCSDIR%%/%%DOCLANG%%/books/ppp-primer/f14.html
-%%DOCSDIR%%/%%DOCLANG%%/books/ppp-primer/index.html
-%%DOCSDIR%%/%%DOCLANG%%/books/ppp-primer/list-lan-hosts.html
-%%DOCSDIR%%/%%DOCLANG%%/books/ppp-primer/system-config.html
-%%DOCSDIR%%/%%DOCLANG%%/books/ppp-primer/testing-the-network.html
-%%DOCSDIR%%/%%DOCLANG%%/books/ppp-primer/verify-ether-if-config.html
-%%DOCSDIR%%/%%DOCLANG%%/books/ppp-primer/x237.html
-%%DOCSDIR%%/%%DOCLANG%%/books/ppp-primer/x273.html
-%%DOCSDIR%%/%%DOCLANG%%/books/ppp-primer/x339.html
-%%DOCSDIR%%/%%DOCLANG%%/books/ppp-primer/x38.html
-%%DOCSDIR%%/%%DOCLANG%%/books/ppp-primer/x562.html
-%%DOCSDIR%%/%%DOCLANG%%/books/ppp-primer/x678.html
-%%DOCSDIR%%/%%DOCLANG%%/books/ppp-primer/x759.html
-%%DOCSDIR%%/%%DOCLANG%%/books/ppp-primer/x829.html
-%%DOCSDIR%%/%%DOCLANG%%/books/ppp-primer/x920.html
diff --git a/misc/freebsd-doc-mn/pkg-plist.html-split b/misc/freebsd-doc-mn/pkg-plist.html-split
index e9ef360380ed..525dd0f44fc1 100644
--- a/misc/freebsd-doc-mn/pkg-plist.html-split
+++ b/misc/freebsd-doc-mn/pkg-plist.html-split
@@ -1,5 +1,4 @@
@comment $FreeBSD$
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/LEGALNOTICE.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/acpi-debug.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/acpi-overview.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/adding-swap-space.html
@@ -154,6 +153,7 @@
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/l10n-compiling.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/l10n.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/lang-setup.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/legalnotice.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/linuxemu-advanced.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/linuxemu-lbc-install.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/linuxemu-maple.html
@@ -188,7 +188,6 @@
%%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-afs.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/mirrors-bittorrent.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/mirrors-ftp.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/mirrors-rsync.html
@@ -230,6 +229,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
@@ -270,6 +270,8 @@
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/snapshots.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/sound-mp3.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/sound-setup.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/svn-mirrors.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/svn.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/swap-encrypting.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/synching.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/system-administration.html
@@ -291,6 +293,7 @@
%%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
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/using-localization.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/using-sysinstall.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/video-playback.html
diff --git a/misc/freebsd-doc-nl/pkg-plist.html-split b/misc/freebsd-doc-nl/pkg-plist.html-split
index c79ecf0e1994..29685cc2adbc 100644
--- a/misc/freebsd-doc-nl/pkg-plist.html-split
+++ b/misc/freebsd-doc-nl/pkg-plist.html-split
@@ -1,5 +1,4 @@
@comment $FreeBSD$
-%%DOCSDIR%%/%%DOCLANG%%/articles/contributing-ports/TRADEMARKS.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
@@ -7,16 +6,16 @@
%%DOCSDIR%%/%%DOCLANG%%/articles/contributing-ports/maintain-port.html
%%DOCSDIR%%/%%DOCLANG%%/articles/contributing-ports/mortal-coil.html
%%DOCSDIR%%/%%DOCLANG%%/articles/contributing-ports/resources.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/contributing-ports/trademarks.html
%%DOCSDIR%%/%%DOCLANG%%/articles/contributing-ports/what-contribute.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/contributing/TRADEMARKS.html
%%DOCSDIR%%/%%DOCLANG%%/articles/contributing/contrib-how.html
%%DOCSDIR%%/%%DOCLANG%%/articles/contributing/index.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd/TRADEMARKS.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/contributing/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
%%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/problem-reports/TRADEMARKS.html
%%DOCSDIR%%/%%DOCLANG%%/articles/problem-reports/index.html
%%DOCSDIR%%/%%DOCLANG%%/articles/problem-reports/pr-followup.html
%%DOCSDIR%%/%%DOCLANG%%/articles/problem-reports/pr-further.html
@@ -24,13 +23,13 @@
%%DOCSDIR%%/%%DOCLANG%%/articles/problem-reports/pr-problems.html
%%DOCSDIR%%/%%DOCLANG%%/articles/problem-reports/pr-when.html
%%DOCSDIR%%/%%DOCLANG%%/articles/problem-reports/pr-writing.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/solid-state/TRADEMARKS.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/problem-reports/trademarks.html
%%DOCSDIR%%/%%DOCLANG%%/articles/solid-state/index.html
%%DOCSDIR%%/%%DOCLANG%%/articles/solid-state/kernel.html
%%DOCSDIR%%/%%DOCLANG%%/articles/solid-state/ro-fs.html
%%DOCSDIR%%/%%DOCLANG%%/articles/solid-state/strategies.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/solid-state/x94.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/LEGALNOTICE.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-overview.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/adding-swap-space.html
@@ -177,6 +176,7 @@
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/l10n-compiling.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/l10n.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/lang-setup.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/legalnotice.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/linuxemu-advanced.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/linuxemu-lbc-install.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/linuxemu-maple.html
@@ -211,10 +211,10 @@
%%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-afs.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-svn.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/mirrors.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/mount-unmount.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/multimedia.html
diff --git a/misc/freebsd-doc-pl/pkg-plist.common b/misc/freebsd-doc-pl/pkg-plist.common
index 2bf13cf355b2..23e1045f1568 100644
--- a/misc/freebsd-doc-pl/pkg-plist.common
+++ b/misc/freebsd-doc-pl/pkg-plist.common
@@ -11,7 +11,6 @@
@dirrm %%DOCSDIR%%/%%DOCLANG%%/books
@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/new-users
@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/filtering-bridges
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/dialup-firewall
@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles
%%DOCSDIR%%/%%DOCLANG_PREFIX%%
@dirrm %%DOCSDIR%%/%%DOCLANG%%
diff --git a/misc/freebsd-doc-pl/pkg-plist.html b/misc/freebsd-doc-pl/pkg-plist.html
index 52abd986c2a5..8ea1666004cd 100644
--- a/misc/freebsd-doc-pl/pkg-plist.html
+++ b/misc/freebsd-doc-pl/pkg-plist.html
@@ -1,5 +1,4 @@
@comment $FreeBSD$
-%%DOCSDIR%%/%%DOCLANG%%/articles/dialup-firewall/article.html
%%DOCSDIR%%/%%DOCLANG%%/articles/filtering-bridges/article.html
%%DOCSDIR%%/%%DOCLANG%%/articles/new-users/article.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/book.html
diff --git a/misc/freebsd-doc-pl/pkg-plist.html-common b/misc/freebsd-doc-pl/pkg-plist.html-common
index 0358fb9d2cbb..d6492f0b8e3f 100644
--- a/misc/freebsd-doc-pl/pkg-plist.html-common
+++ b/misc/freebsd-doc-pl/pkg-plist.html-common
@@ -1,5 +1,4 @@
@comment $FreeBSD$
-%%DOCSDIR%%/%%DOCLANG%%/articles/dialup-firewall/docbook.css
%%DOCSDIR%%/%%DOCLANG%%/articles/filtering-bridges/docbook.css
%%DOCSDIR%%/%%DOCLANG%%/articles/new-users/docbook.css
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/advanced-networking/isdn-bus.png
diff --git a/misc/freebsd-doc-pl/pkg-plist.html-split b/misc/freebsd-doc-pl/pkg-plist.html-split
index 3c9811b888cd..3bd14142b89b 100644
--- a/misc/freebsd-doc-pl/pkg-plist.html-split
+++ b/misc/freebsd-doc-pl/pkg-plist.html-split
@@ -1,10 +1,4 @@
@comment $FreeBSD$
-%%DOCSDIR%%/%%DOCLANG%%/articles/dialup-firewall/index.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/dialup-firewall/kernel.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/dialup-firewall/rcconf.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/dialup-firewall/rules.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/dialup-firewall/x66.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/dialup-firewall/x94.html
%%DOCSDIR%%/%%DOCLANG%%/articles/filtering-bridges/filtering-bridges-contributors.html
%%DOCSDIR%%/%%DOCLANG%%/articles/filtering-bridges/filtering-bridges-enabling.html
%%DOCSDIR%%/%%DOCLANG%%/articles/filtering-bridges/filtering-bridges-finalprep.html
@@ -12,17 +6,16 @@
%%DOCSDIR%%/%%DOCLANG%%/articles/filtering-bridges/filtering-bridges-ipfirewall.html
%%DOCSDIR%%/%%DOCLANG%%/articles/filtering-bridges/index.html
%%DOCSDIR%%/%%DOCLANG%%/articles/new-users/index.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/new-users/x103.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/new-users/x195.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/x54.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/LEGALNOTICE.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/acpi-debug.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/acpi-overview.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/adding-swap-space.html
@@ -149,6 +142,7 @@
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/l10n-compiling.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/l10n.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/lang-setup.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/legalnotice.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/linuxemu-advanced.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/linuxemu-lbc-install.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/linuxemu-maple.html
diff --git a/misc/freebsd-doc-pl/pkg-plist.pdf b/misc/freebsd-doc-pl/pkg-plist.pdf
index 10ab25dffd32..f029ef58fb24 100644
--- a/misc/freebsd-doc-pl/pkg-plist.pdf
+++ b/misc/freebsd-doc-pl/pkg-plist.pdf
@@ -1,5 +1,4 @@
@comment $FreeBSD$
-%%DOCSDIR%%/%%DOCLANG%%/articles/dialup-firewall/article.pdf
%%DOCSDIR%%/%%DOCLANG%%/articles/filtering-bridges/article.pdf
%%DOCSDIR%%/%%DOCLANG%%/articles/new-users/article.pdf
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/book.pdf
diff --git a/misc/freebsd-doc-pl/pkg-plist.ps b/misc/freebsd-doc-pl/pkg-plist.ps
index ce524e105eeb..ab9ee01314c6 100644
--- a/misc/freebsd-doc-pl/pkg-plist.ps
+++ b/misc/freebsd-doc-pl/pkg-plist.ps
@@ -1,5 +1,4 @@
@comment $FreeBSD$
-%%DOCSDIR%%/%%DOCLANG%%/articles/dialup-firewall/article.ps
%%DOCSDIR%%/%%DOCLANG%%/articles/filtering-bridges/article.ps
%%DOCSDIR%%/%%DOCLANG%%/articles/new-users/article.ps
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/book.ps
diff --git a/misc/freebsd-doc-pl/pkg-plist.txt b/misc/freebsd-doc-pl/pkg-plist.txt
index a5877034be04..3a0a84cb14fb 100644
--- a/misc/freebsd-doc-pl/pkg-plist.txt
+++ b/misc/freebsd-doc-pl/pkg-plist.txt
@@ -1,5 +1,4 @@
@comment $FreeBSD$
-%%DOCSDIR%%/%%DOCLANG%%/articles/dialup-firewall/article.txt
%%DOCSDIR%%/%%DOCLANG%%/articles/filtering-bridges/article.txt
%%DOCSDIR%%/%%DOCLANG%%/articles/new-users/article.txt
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/book.txt
diff --git a/misc/freebsd-doc-pt/pkg-plist.common b/misc/freebsd-doc-pt/pkg-plist.common
index e5ebf2cf113e..40160fc1258e 100644
--- a/misc/freebsd-doc-pt/pkg-plist.common
+++ b/misc/freebsd-doc-pt/pkg-plist.common
@@ -1,7 +1,22 @@
@comment $FreeBSD$
+@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
+@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/problem-reports
+@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/portbuild
+@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/new-users
+@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/linux-users
+@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/hubs
+@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/freebsd-questions
+@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd
+@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/contributing-ports
@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/contributing
+@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/building-products
@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles
%%DOCSDIR%%/%%DOCLANG_PREFIX%%
@dirrm %%DOCSDIR%%/%%DOCLANG%%
diff --git a/misc/freebsd-doc-pt/pkg-plist.html b/misc/freebsd-doc-pt/pkg-plist.html
index c0fff33cbce3..0715c7654f67 100644
--- a/misc/freebsd-doc-pt/pkg-plist.html
+++ b/misc/freebsd-doc-pt/pkg-plist.html
@@ -1,3 +1,14 @@
@comment $FreeBSD$
+%%DOCSDIR%%/%%DOCLANG%%/articles/building-products/article.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/contributing-ports/article.html
%%DOCSDIR%%/%%DOCLANG%%/articles/contributing/article.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd/article.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-questions/article.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-update-server/article.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/hubs/article.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/linux-users/article.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/new-users/article.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/portbuild/article.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/problem-reports/article.html
%%DOCSDIR%%/%%DOCLANG%%/books/faq/book.html
+%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/book.html
diff --git a/misc/freebsd-doc-pt/pkg-plist.html-common b/misc/freebsd-doc-pt/pkg-plist.html-common
index 24ed67338497..2f0f54fa08bd 100644
--- a/misc/freebsd-doc-pt/pkg-plist.html-common
+++ b/misc/freebsd-doc-pt/pkg-plist.html-common
@@ -1,3 +1,26 @@
@comment $FreeBSD$
+%%DOCSDIR%%/%%DOCLANG%%/articles/building-products/docbook.css
+%%DOCSDIR%%/%%DOCLANG%%/articles/building-products/freebsd-branches.png
+%%DOCSDIR%%/%%DOCLANG%%/articles/building-products/freebsd-organization.png
+%%DOCSDIR%%/%%DOCLANG%%/articles/contributing-ports/docbook.css
%%DOCSDIR%%/%%DOCLANG%%/articles/contributing/docbook.css
+%%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd/docbook.css
+%%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-questions/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/hubs/docbook.css
+%%DOCSDIR%%/%%DOCLANG%%/articles/linux-users/docbook.css
+%%DOCSDIR%%/%%DOCLANG%%/articles/new-users/docbook.css
+%%DOCSDIR%%/%%DOCLANG%%/articles/portbuild/docbook.css
+%%DOCSDIR%%/%%DOCLANG%%/articles/problem-reports/docbook.css
%%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
+%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/imagelib/callouts/3.png
+%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/imagelib/callouts/4.png
+%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/imagelib/callouts/5.png
diff --git a/misc/freebsd-doc-pt/pkg-plist.html-split b/misc/freebsd-doc-pt/pkg-plist.html-split
index 599b7cc2318d..77af8d89b11f 100644
--- a/misc/freebsd-doc-pt/pkg-plist.html-split
+++ b/misc/freebsd-doc-pt/pkg-plist.html-split
@@ -1,7 +1,102 @@
@comment $FreeBSD$
+%%DOCSDIR%%/%%DOCLANG%%/articles/building-products/b397.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/contributing-ports/adopt-port.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/contributing-ports/create-port.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/contributing-ports/fix-broken.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/contributing-ports/index.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/contributing-ports/maintain-port.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/contributing-ports/mortal-coil.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/contributing-ports/resources.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/contributing-ports/trademarks.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/contributing-ports/what-contribute.html
%%DOCSDIR%%/%%DOCLANG%%/articles/contributing/contrib-how.html
%%DOCSDIR%%/%%DOCLANG%%/articles/contributing/index.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/LEGALNOTICE.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/contributing/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
+%%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/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/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
+%%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/hubs/index.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/hubs/mirror-howto.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/hubs/mirror-official.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/hubs/mirror-requirements.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/hubs/mirror-statpages.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/hubs/mirror-where.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/hubs/trademarks.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/linux-users/commands.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/linux-users/conclusion.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/linux-users/firewall.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/linux-users/index.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/linux-users/network.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/linux-users/procfs.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/linux-users/shells.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/linux-users/software.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/linux-users/startup.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/linux-users/trademarks.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/linux-users/updates.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
+%%DOCSDIR%%/%%DOCLANG%%/articles/new-users/getting-help.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/new-users/index.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/new-users/looking-around.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/new-users/next-steps.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/new-users/other-useful-commands.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/new-users/other.html
+%%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/portbuild/anatomy.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/portbuild/build-maintenance.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/portbuild/customizing.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/portbuild/disk-failure.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/portbuild/errors.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/portbuild/expbuilds.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/portbuild/index.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/portbuild/management.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/portbuild/monitoring.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/portbuild/new-arch.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/portbuild/new-branch.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/portbuild/new-head-node.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/portbuild/new-node.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/portbuild/old-branch.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/portbuild/rebase-branch.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/portbuild/release.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/portbuild/setup.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/portbuild/starting.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/portbuild/trademarks.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/portbuild/uploading.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-problems.html
+%%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%%/books/faq/acknowledgments.html
%%DOCSDIR%%/%%DOCLANG%%/books/faq/admin.html
%%DOCSDIR%%/%%DOCLANG%%/books/faq/advanced.html
@@ -14,6 +109,7 @@
%%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/ppp.html
@@ -22,3 +118,49 @@
%%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.html
+%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/examples-docbook-article.html
+%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/examples-formatted.html
+%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/examples.html
+%%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
+%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/preface-conventions.html
+%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/preface-notes.html
+%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/preface.html
+%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/psgml-mode.html
+%%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.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
+%%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
+%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/the-website-install.html
+%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/the-website.html
+%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/tools-optional.html
+%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/tools.html
+%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/translations.html
+%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/writing-style-word-list.html
+%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/writing-style.html
+%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/x2671.html
diff --git a/misc/freebsd-doc-pt/pkg-plist.pdf b/misc/freebsd-doc-pt/pkg-plist.pdf
index cc682ce1b79a..a682ecd6d5f1 100644
--- a/misc/freebsd-doc-pt/pkg-plist.pdf
+++ b/misc/freebsd-doc-pt/pkg-plist.pdf
@@ -1,3 +1,14 @@
@comment $FreeBSD$
+%%DOCSDIR%%/%%DOCLANG%%/articles/building-products/article.pdf
+%%DOCSDIR%%/%%DOCLANG%%/articles/contributing-ports/article.pdf
%%DOCSDIR%%/%%DOCLANG%%/articles/contributing/article.pdf
+%%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd/article.pdf
+%%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-questions/article.pdf
+%%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-update-server/article.pdf
+%%DOCSDIR%%/%%DOCLANG%%/articles/hubs/article.pdf
+%%DOCSDIR%%/%%DOCLANG%%/articles/linux-users/article.pdf
+%%DOCSDIR%%/%%DOCLANG%%/articles/new-users/article.pdf
+%%DOCSDIR%%/%%DOCLANG%%/articles/portbuild/article.pdf
+%%DOCSDIR%%/%%DOCLANG%%/articles/problem-reports/article.pdf
%%DOCSDIR%%/%%DOCLANG%%/books/faq/book.pdf
+%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/book.pdf
diff --git a/misc/freebsd-doc-pt/pkg-plist.ps b/misc/freebsd-doc-pt/pkg-plist.ps
index 624f35d6dbd7..bca07b69a7b6 100644
--- a/misc/freebsd-doc-pt/pkg-plist.ps
+++ b/misc/freebsd-doc-pt/pkg-plist.ps
@@ -1,3 +1,14 @@
@comment $FreeBSD$
+%%DOCSDIR%%/%%DOCLANG%%/articles/building-products/article.ps
+%%DOCSDIR%%/%%DOCLANG%%/articles/contributing-ports/article.ps
%%DOCSDIR%%/%%DOCLANG%%/articles/contributing/article.ps
+%%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd/article.ps
+%%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-questions/article.ps
+%%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-update-server/article.ps
+%%DOCSDIR%%/%%DOCLANG%%/articles/hubs/article.ps
+%%DOCSDIR%%/%%DOCLANG%%/articles/linux-users/article.ps
+%%DOCSDIR%%/%%DOCLANG%%/articles/new-users/article.ps
+%%DOCSDIR%%/%%DOCLANG%%/articles/portbuild/article.ps
+%%DOCSDIR%%/%%DOCLANG%%/articles/problem-reports/article.ps
%%DOCSDIR%%/%%DOCLANG%%/books/faq/book.ps
+%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/book.ps
diff --git a/misc/freebsd-doc-pt/pkg-plist.txt b/misc/freebsd-doc-pt/pkg-plist.txt
index b093d24009fa..3fe50473c197 100644
--- a/misc/freebsd-doc-pt/pkg-plist.txt
+++ b/misc/freebsd-doc-pt/pkg-plist.txt
@@ -1,3 +1,16 @@
@comment $FreeBSD$
+%%DOCSDIR%%/%%DOCLANG%%/articles/building-products/article.txt
+%%DOCSDIR%%/%%DOCLANG%%/articles/contributing-ports/article.txt
%%DOCSDIR%%/%%DOCLANG%%/articles/contributing/article.txt
+%%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd/article.txt
+%%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-questions/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/hubs/article.txt
+%%DOCSDIR%%/%%DOCLANG%%/articles/linux-users/article.txt
+%%DOCSDIR%%/%%DOCLANG%%/articles/new-users/article.txt
+%%DOCSDIR%%/%%DOCLANG%%/articles/portbuild/article.txt
+%%DOCSDIR%%/%%DOCLANG%%/articles/problem-reports/article.txt
%%DOCSDIR%%/%%DOCLANG%%/books/faq/book.txt
+%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/book.txt
diff --git a/misc/freebsd-doc-ru/pkg-plist.common b/misc/freebsd-doc-ru/pkg-plist.common
index a9bea848e264..8ea74e1abe6a 100644
--- a/misc/freebsd-doc-ru/pkg-plist.common
+++ b/misc/freebsd-doc-ru/pkg-plist.common
@@ -1,5 +1,4 @@
@comment $FreeBSD$
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/ppp-primer
@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook
@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/handbook/vinum
@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/handbook/security
@@ -8,41 +7,33 @@
@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/handbook/imagelib/callouts
@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/handbook/imagelib
@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/handbook/geom
+@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall
@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/handbook/advanced-networking
@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/handbook
@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/faq
@dirrm %%DOCSDIR%%/%%DOCLANG%%/books
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/zip-drive
@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/vm-design
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/version-guide
@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/solid-state
@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/releng-packages
@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/releng
@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/relaydelay
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/pxe
@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/problem-reports
@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/pr-guidelines
@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/portbuild
@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/pam
@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/new-users
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/multi-os
@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/mh
@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/mailing-list-faq
@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/linux-comparison
@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/laptop
@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/ipsec-must
@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/hubs
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/hats
@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/gjournal-desktop
@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/geom-class
@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-questions
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/formatting-media
@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/fonts
@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/fbsd-from-scratch
@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/euro
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/diskless-x
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/dialup-firewall
@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/cvsup-advanced
@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/cvs-freebsd
@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/custom-gcc
@@ -50,8 +41,6 @@
@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/contributing
@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/console-server
@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/committers-guide
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/checkpoint
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/5-roadmap
@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles
%%DOCSDIR%%/%%DOCLANG_PREFIX%%
@dirrm %%DOCSDIR%%/%%DOCLANG%%
diff --git a/misc/freebsd-doc-ru/pkg-plist.extras b/misc/freebsd-doc-ru/pkg-plist.extras
index e12a0d59e0fe..25254ef165a8 100644
--- a/misc/freebsd-doc-ru/pkg-plist.extras
+++ b/misc/freebsd-doc-ru/pkg-plist.extras
@@ -4,9 +4,3 @@
%%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/pxe/dhcpd.conf
-%%DOCSDIR%%/%%DOCLANG%%/articles/pxe/install.cfg
-%%DOCSDIR%%/%%DOCLANG%%/articles/pxe/loader.rc
-%%DOCSDIR%%/%%DOCLANG%%/articles/pxe/pkgmaker.sh
-%%DOCSDIR%%/%%DOCLANG%%/articles/pxe/post
-%%DOCSDIR%%/%%DOCLANG%%/articles/pxe/pre
diff --git a/misc/freebsd-doc-ru/pkg-plist.html b/misc/freebsd-doc-ru/pkg-plist.html
index a866725f12e5..f549fb811b61 100644
--- a/misc/freebsd-doc-ru/pkg-plist.html
+++ b/misc/freebsd-doc-ru/pkg-plist.html
@@ -1,6 +1,4 @@
@comment $FreeBSD$
-%%DOCSDIR%%/%%DOCLANG%%/articles/5-roadmap/article.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/checkpoint/article.html
%%DOCSDIR%%/%%DOCLANG%%/articles/committers-guide/article.html
%%DOCSDIR%%/%%DOCLANG%%/articles/console-server/article.html
%%DOCSDIR%%/%%DOCLANG%%/articles/contributing/article.html
@@ -8,38 +6,28 @@
%%DOCSDIR%%/%%DOCLANG%%/articles/custom-gcc/article.html
%%DOCSDIR%%/%%DOCLANG%%/articles/cvs-freebsd/article.html
%%DOCSDIR%%/%%DOCLANG%%/articles/cvsup-advanced/article.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/dialup-firewall/article.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/diskless-x/article.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/euro/article.html
%%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd/article.html
%%DOCSDIR%%/%%DOCLANG%%/articles/fbsd-from-scratch/article.html
%%DOCSDIR%%/%%DOCLANG%%/articles/fonts/article.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/formatting-media/article.html
%%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-questions/article.html
%%DOCSDIR%%/%%DOCLANG%%/articles/geom-class/article.html
%%DOCSDIR%%/%%DOCLANG%%/articles/gjournal-desktop/article.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/hats/article.html
%%DOCSDIR%%/%%DOCLANG%%/articles/hubs/article.html
%%DOCSDIR%%/%%DOCLANG%%/articles/ipsec-must/article.html
%%DOCSDIR%%/%%DOCLANG%%/articles/laptop/article.html
%%DOCSDIR%%/%%DOCLANG%%/articles/linux-comparison/article.html
%%DOCSDIR%%/%%DOCLANG%%/articles/mailing-list-faq/article.html
%%DOCSDIR%%/%%DOCLANG%%/articles/mh/article.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/multi-os/article.html
%%DOCSDIR%%/%%DOCLANG%%/articles/new-users/article.html
%%DOCSDIR%%/%%DOCLANG%%/articles/pam/article.html
%%DOCSDIR%%/%%DOCLANG%%/articles/portbuild/article.html
%%DOCSDIR%%/%%DOCLANG%%/articles/pr-guidelines/article.html
%%DOCSDIR%%/%%DOCLANG%%/articles/problem-reports/article.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/pxe/article.html
%%DOCSDIR%%/%%DOCLANG%%/articles/relaydelay/article.html
%%DOCSDIR%%/%%DOCLANG%%/articles/releng-packages/article.html
%%DOCSDIR%%/%%DOCLANG%%/articles/releng/article.html
%%DOCSDIR%%/%%DOCLANG%%/articles/solid-state/article.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/version-guide/article.html
%%DOCSDIR%%/%%DOCLANG%%/articles/vm-design/article.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/zip-drive/article.html
%%DOCSDIR%%/%%DOCLANG%%/books/faq/book.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/book.html
%%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/book.html
-%%DOCSDIR%%/%%DOCLANG%%/books/ppp-primer/book.html
diff --git a/misc/freebsd-doc-ru/pkg-plist.html-common b/misc/freebsd-doc-ru/pkg-plist.html-common
index 4fbe521c1f31..7f2ff4dd94b4 100644
--- a/misc/freebsd-doc-ru/pkg-plist.html-common
+++ b/misc/freebsd-doc-ru/pkg-plist.html-common
@@ -1,7 +1,4 @@
@comment $FreeBSD$
-%%DOCSDIR%%/%%DOCLANG%%/articles/5-roadmap/docbook.css
-%%DOCSDIR%%/%%DOCLANG%%/articles/checkpoint/docbook.css
-%%DOCSDIR%%/%%DOCLANG%%/articles/checkpoint/networks.png
%%DOCSDIR%%/%%DOCLANG%%/articles/committers-guide/docbook.css
%%DOCSDIR%%/%%DOCLANG%%/articles/console-server/docbook.css
%%DOCSDIR%%/%%DOCLANG%%/articles/console-server/tk0231-9-1.png
@@ -10,32 +7,25 @@
%%DOCSDIR%%/%%DOCLANG%%/articles/custom-gcc/docbook.css
%%DOCSDIR%%/%%DOCLANG%%/articles/cvs-freebsd/docbook.css
%%DOCSDIR%%/%%DOCLANG%%/articles/cvsup-advanced/docbook.css
-%%DOCSDIR%%/%%DOCLANG%%/articles/dialup-firewall/docbook.css
-%%DOCSDIR%%/%%DOCLANG%%/articles/diskless-x/docbook.css
-%%DOCSDIR%%/%%DOCLANG%%/articles/euro/docbook.css
%%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd/docbook.css
%%DOCSDIR%%/%%DOCLANG%%/articles/fbsd-from-scratch/docbook.css
%%DOCSDIR%%/%%DOCLANG%%/articles/fonts/docbook.css
-%%DOCSDIR%%/%%DOCLANG%%/articles/formatting-media/docbook.css
%%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-questions/docbook.css
%%DOCSDIR%%/%%DOCLANG%%/articles/geom-class/docbook.css
%%DOCSDIR%%/%%DOCLANG%%/articles/gjournal-desktop/disklabel1.png
%%DOCSDIR%%/%%DOCLANG%%/articles/gjournal-desktop/disklabel2.png
%%DOCSDIR%%/%%DOCLANG%%/articles/gjournal-desktop/docbook.css
-%%DOCSDIR%%/%%DOCLANG%%/articles/hats/docbook.css
%%DOCSDIR%%/%%DOCLANG%%/articles/hubs/docbook.css
%%DOCSDIR%%/%%DOCLANG%%/articles/ipsec-must/docbook.css
%%DOCSDIR%%/%%DOCLANG%%/articles/laptop/docbook.css
%%DOCSDIR%%/%%DOCLANG%%/articles/linux-comparison/docbook.css
%%DOCSDIR%%/%%DOCLANG%%/articles/mailing-list-faq/docbook.css
%%DOCSDIR%%/%%DOCLANG%%/articles/mh/docbook.css
-%%DOCSDIR%%/%%DOCLANG%%/articles/multi-os/docbook.css
%%DOCSDIR%%/%%DOCLANG%%/articles/new-users/docbook.css
%%DOCSDIR%%/%%DOCLANG%%/articles/pam/docbook.css
%%DOCSDIR%%/%%DOCLANG%%/articles/portbuild/docbook.css
%%DOCSDIR%%/%%DOCLANG%%/articles/pr-guidelines/docbook.css
%%DOCSDIR%%/%%DOCLANG%%/articles/problem-reports/docbook.css
-%%DOCSDIR%%/%%DOCLANG%%/articles/pxe/docbook.css
%%DOCSDIR%%/%%DOCLANG%%/articles/relaydelay/docbook.css
%%DOCSDIR%%/%%DOCLANG%%/articles/releng-packages/docbook.css
%%DOCSDIR%%/%%DOCLANG%%/articles/releng/branches-head.png
@@ -45,21 +35,64 @@
%%DOCSDIR%%/%%DOCLANG%%/articles/releng/branches-releng6.png
%%DOCSDIR%%/%%DOCLANG%%/articles/releng/branches-releng7.png
%%DOCSDIR%%/%%DOCLANG%%/articles/releng/branches-releng8.png
+%%DOCSDIR%%/%%DOCLANG%%/articles/releng/branches-releng9.png
%%DOCSDIR%%/%%DOCLANG%%/articles/releng/docbook.css
%%DOCSDIR%%/%%DOCLANG%%/articles/solid-state/docbook.css
-%%DOCSDIR%%/%%DOCLANG%%/articles/version-guide/docbook.css
%%DOCSDIR%%/%%DOCLANG%%/articles/vm-design/docbook.css
%%DOCSDIR%%/%%DOCLANG%%/articles/vm-design/fig1.png
%%DOCSDIR%%/%%DOCLANG%%/articles/vm-design/fig2.png
%%DOCSDIR%%/%%DOCLANG%%/articles/vm-design/fig3.png
%%DOCSDIR%%/%%DOCLANG%%/articles/vm-design/fig4.png
-%%DOCSDIR%%/%%DOCLANG%%/articles/zip-drive/docbook.css
%%DOCSDIR%%/%%DOCLANG%%/books/faq/docbook.css
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/advanced-networking/isdn-bus.png
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/advanced-networking/isdn-twisted-pair.png
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/advanced-networking/natd.png
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/advanced-networking/net-routing.png
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/advanced-networking/static-routes.png
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall/bsdinstall-adduser1.png
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall/bsdinstall-adduser2.png
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall/bsdinstall-adduser3.png
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall/bsdinstall-boot-loader-menu.png
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall/bsdinstall-choose-mode.png
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall/bsdinstall-config-components.png
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall/bsdinstall-config-crashdump.png
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall/bsdinstall-config-hostname.png
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall/bsdinstall-config-keymap.png
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall/bsdinstall-config-services.png
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall/bsdinstall-configure-network-interface-ipv4-dhcp.png
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall/bsdinstall-configure-network-interface-ipv4-static.png
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall/bsdinstall-configure-network-interface-ipv4.png
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall/bsdinstall-configure-network-interface-ipv6-static.png
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall/bsdinstall-configure-network-interface-ipv6.png
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall/bsdinstall-configure-network-interface-slaac.png
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall/bsdinstall-configure-network-interface.png
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall/bsdinstall-configure-network-ipv4-dns.png
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall/bsdinstall-configure-wireless-accesspoints.png
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall/bsdinstall-configure-wireless-scan.png
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall/bsdinstall-configure-wireless-wpa2setup.png
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall/bsdinstall-distfile-extracting.png
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall/bsdinstall-distfile-fetching.png
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall/bsdinstall-distfile-verifying.png
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall/bsdinstall-final-confirmation.png
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall/bsdinstall-final-modification-shell.png
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall/bsdinstall-finalconfiguration.png
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall/bsdinstall-keymap-select-default.png
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall/bsdinstall-mainexit.png
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall/bsdinstall-netinstall-files.png
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall/bsdinstall-netinstall-mirrorselect.png
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall/bsdinstall-part-entire-part.png
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall/bsdinstall-part-guided-disk.png
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall/bsdinstall-part-guided-manual.png
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall/bsdinstall-part-manual-addpart.png
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall/bsdinstall-part-manual-create.png
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall/bsdinstall-part-manual-partscheme.png
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall/bsdinstall-part-review.png
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall/bsdinstall-post-root-passwd.png
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall/bsdinstall-set-clock-local-utc.png
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall/bsdinstall-timezone-confirm.png
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall/bsdinstall-timezone-country.png
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall/bsdinstall-timezone-region.png
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall/bsdinstall-timezone-zone.png
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/docbook.css
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/geom/striping.png
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/imagelib/callouts/1.png
@@ -164,4 +197,3 @@
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/vinum/vinum-striped-vol.png
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/vinum/vinum-striped.png
%%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/docbook.css
-%%DOCSDIR%%/%%DOCLANG%%/books/ppp-primer/docbook.css
diff --git a/misc/freebsd-doc-ru/pkg-plist.html-split b/misc/freebsd-doc-ru/pkg-plist.html-split
index ebf1dc555f1a..c6851c0b6a8b 100644
--- a/misc/freebsd-doc-ru/pkg-plist.html-split
+++ b/misc/freebsd-doc-ru/pkg-plist.html-split
@@ -1,18 +1,4 @@
@comment $FreeBSD$
-%%DOCSDIR%%/%%DOCLANG%%/articles/5-roadmap/TRADEMARKS.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/5-roadmap/future.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/5-roadmap/goals.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/5-roadmap/index.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/5-roadmap/major-issues.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/checkpoint/LEGALNOTICE.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/checkpoint/index.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/checkpoint/object.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/checkpoint/policy.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/checkpoint/racoon.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/checkpoint/references.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/checkpoint/rulecfg.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/checkpoint/startingvpn.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/committers-guide/TRADEMARKS.html
%%DOCSDIR%%/%%DOCLANG%%/articles/committers-guide/archs.html
%%DOCSDIR%%/%%DOCLANG%%/articles/committers-guide/committer.types.html
%%DOCSDIR%%/%%DOCLANG%%/articles/committers-guide/conventions.html
@@ -27,7 +13,7 @@
%%DOCSDIR%%/%%DOCLANG%%/articles/committers-guide/pref-license.html
%%DOCSDIR%%/%%DOCLANG%%/articles/committers-guide/rules.html
%%DOCSDIR%%/%%DOCLANG%%/articles/committers-guide/ssh.guide.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/console-server/TRADEMARKS.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/committers-guide/trademarks.html
%%DOCSDIR%%/%%DOCLANG%%/articles/console-server/cabling.html
%%DOCSDIR%%/%%DOCLANG%%/articles/console-server/conserver-versions.html
%%DOCSDIR%%/%%DOCLANG%%/articles/console-server/freebsd.html
@@ -39,10 +25,10 @@
%%DOCSDIR%%/%%DOCLANG%%/articles/console-server/security.html
%%DOCSDIR%%/%%DOCLANG%%/articles/console-server/setting-up-server.html
%%DOCSDIR%%/%%DOCLANG%%/articles/console-server/solaris.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/contributing/TRADEMARKS.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/console-server/trademarks.html
%%DOCSDIR%%/%%DOCLANG%%/articles/contributing/contrib-how.html
%%DOCSDIR%%/%%DOCLANG%%/articles/contributing/index.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/cups/TRADEMARKS.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/contributing/trademarks.html
%%DOCSDIR%%/%%DOCLANG%%/articles/cups/index.html
%%DOCSDIR%%/%%DOCLANG%%/articles/cups/printing-cups-clients.html
%%DOCSDIR%%/%%DOCLANG%%/articles/cups/printing-cups-configuring-printers.html
@@ -50,44 +36,26 @@
%%DOCSDIR%%/%%DOCLANG%%/articles/cups/printing-cups-install.html
%%DOCSDIR%%/%%DOCLANG%%/articles/cups/printing-cups-ports-knobs.html
%%DOCSDIR%%/%%DOCLANG%%/articles/cups/printing-cups-troubleshooting.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/custom-gcc/TRADEMARKS.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/cups/trademarks.html
%%DOCSDIR%%/%%DOCLANG%%/articles/custom-gcc/configuring-ports-gcc.html
%%DOCSDIR%%/%%DOCLANG%%/articles/custom-gcc/index.html
%%DOCSDIR%%/%%DOCLANG%%/articles/custom-gcc/performance-imparct.html
%%DOCSDIR%%/%%DOCLANG%%/articles/custom-gcc/prerequisites.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/cvs-freebsd/TRADEMARKS.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/custom-gcc/trademarks.html
%%DOCSDIR%%/%%DOCLANG%%/articles/cvs-freebsd/first-setup.html
%%DOCSDIR%%/%%DOCLANG%%/articles/cvs-freebsd/freebsdspecific.html
%%DOCSDIR%%/%%DOCLANG%%/articles/cvs-freebsd/index.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/cvsup-advanced/TRADEMARKS.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/dialup-firewall/index.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/dialup-firewall/kernel.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/dialup-firewall/rcconf.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/dialup-firewall/rules.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/dialup-firewall/x71.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/dialup-firewall/x94.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/diskless-x/TRADEMARKS.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/diskless-x/index.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/diskless-x/x45.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/diskless-x/x55.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/diskless-x/x62.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/diskless-x/x83.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/euro/TRADEMARKS.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/euro/console.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/euro/general.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/euro/index.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/euro/problems.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/euro/x11.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd/TRADEMARKS.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
%%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/fbsd-from-scratch/TRADEMARKS.html
%%DOCSDIR%%/%%DOCLANG%%/articles/fbsd-from-scratch/files.html
%%DOCSDIR%%/%%DOCLANG%%/articles/fbsd-from-scratch/index.html
%%DOCSDIR%%/%%DOCLANG%%/articles/fbsd-from-scratch/limitations.html
@@ -95,55 +63,48 @@
%%DOCSDIR%%/%%DOCLANG%%/articles/fbsd-from-scratch/stage1.html
%%DOCSDIR%%/%%DOCLANG%%/articles/fbsd-from-scratch/stage2.html
%%DOCSDIR%%/%%DOCLANG%%/articles/fbsd-from-scratch/stage3.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/fbsd-from-scratch/trademarks.html
%%DOCSDIR%%/%%DOCLANG%%/articles/fbsd-from-scratch/why.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/fonts/TRADEMARKS.html
%%DOCSDIR%%/%%DOCLANG%%/articles/fonts/additional-questions.html
%%DOCSDIR%%/%%DOCLANG%%/articles/fonts/convert-truetype.html
%%DOCSDIR%%/%%DOCLANG%%/articles/fonts/font-formats.html
%%DOCSDIR%%/%%DOCLANG%%/articles/fonts/index.html
%%DOCSDIR%%/%%DOCLANG%%/articles/fonts/obtaining-additional-fonts.html
%%DOCSDIR%%/%%DOCLANG%%/articles/fonts/terminology.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/fonts/trademarks.html
%%DOCSDIR%%/%%DOCLANG%%/articles/fonts/truetype-for-other-programs.html
%%DOCSDIR%%/%%DOCLANG%%/articles/fonts/type1-fonts-ghostscript.html
%%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/formatting-media/TRADEMARKS.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/formatting-media/index.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/formatting-media/x165.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/formatting-media/x223.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/formatting-media/x321.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/formatting-media/x76.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-questions/TRADEMARKS.html
%%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-questions/index.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-questions/x112.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-questions/x203.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-questions/x215.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-questions/x38.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-questions/x52.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-questions/x65.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-questions/x90.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/geom-class/TRADEMARKS.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
%%DOCSDIR%%/%%DOCLANG%%/articles/geom-class/prelim.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/gjournal-desktop/TRADEMARKS.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/geom-class/trademarks.html
%%DOCSDIR%%/%%DOCLANG%%/articles/gjournal-desktop/configure-journal.html
%%DOCSDIR%%/%%DOCLANG%%/articles/gjournal-desktop/further-reading.html
%%DOCSDIR%%/%%DOCLANG%%/articles/gjournal-desktop/index.html
%%DOCSDIR%%/%%DOCLANG%%/articles/gjournal-desktop/reserve-space.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/gjournal-desktop/trademarks.html
%%DOCSDIR%%/%%DOCLANG%%/articles/gjournal-desktop/troubleshooting-gjournal.html
%%DOCSDIR%%/%%DOCLANG%%/articles/gjournal-desktop/understanding-journaling.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/hats/index.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/hubs/TRADEMARKS.html
%%DOCSDIR%%/%%DOCLANG%%/articles/hubs/index.html
%%DOCSDIR%%/%%DOCLANG%%/articles/hubs/mirror-howto.html
%%DOCSDIR%%/%%DOCLANG%%/articles/hubs/mirror-official.html
%%DOCSDIR%%/%%DOCLANG%%/articles/hubs/mirror-requirements.html
%%DOCSDIR%%/%%DOCLANG%%/articles/hubs/mirror-statpages.html
%%DOCSDIR%%/%%DOCLANG%%/articles/hubs/mirror-where.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/ipsec-must/TRADEMARKS.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/hubs/trademarks.html
%%DOCSDIR%%/%%DOCLANG%%/articles/ipsec-must/caveat.html
%%DOCSDIR%%/%%DOCLANG%%/articles/ipsec-must/code.html
%%DOCSDIR%%/%%DOCLANG%%/articles/ipsec-must/experiment.html
@@ -152,37 +113,29 @@
%%DOCSDIR%%/%%DOCLANG%%/articles/ipsec-must/ipsec.html
%%DOCSDIR%%/%%DOCLANG%%/articles/ipsec-must/kernel.html
%%DOCSDIR%%/%%DOCLANG%%/articles/ipsec-must/solution.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/laptop/TRADEMARKS.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/ipsec-must/trademarks.html
%%DOCSDIR%%/%%DOCLANG%%/articles/laptop/index.html
%%DOCSDIR%%/%%DOCLANG%%/articles/laptop/modems.html
%%DOCSDIR%%/%%DOCLANG%%/articles/laptop/pcmcia.html
%%DOCSDIR%%/%%DOCLANG%%/articles/laptop/power-management.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/linux-comparison/TRADEMARKS.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/laptop/trademarks.html
%%DOCSDIR%%/%%DOCLANG%%/articles/linux-comparison/freebsd-advantages.html
%%DOCSDIR%%/%%DOCLANG%%/articles/linux-comparison/freebsd-conclusion.html
%%DOCSDIR%%/%%DOCLANG%%/articles/linux-comparison/freebsd-features.html
%%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/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/TRADEMARKS.html
%%DOCSDIR%%/%%DOCLANG%%/articles/mh/index.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/mh/x198.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/mh/x374.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/mh/x55.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/multi-os/TRADEMARKS.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/multi-os/ch2.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/multi-os/ch3.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/multi-os/ch4.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/multi-os/ch5.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/multi-os/index.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/multi-os/sources.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/multi-os/x194.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/new-users/TRADEMARKS.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
@@ -193,6 +146,7 @@
%%DOCSDIR%%/%%DOCLANG%%/articles/new-users/other-useful-commands.html
%%DOCSDIR%%/%%DOCLANG%%/articles/new-users/other.html
%%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/pam/index.html
%%DOCSDIR%%/%%DOCLANG%%/articles/pam/pam-appl-prog.html
@@ -205,7 +159,6 @@
%%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/portbuild/TRADEMARKS.html
%%DOCSDIR%%/%%DOCLANG%%/articles/portbuild/anatomy.html
%%DOCSDIR%%/%%DOCLANG%%/articles/portbuild/expbuilds.html
%%DOCSDIR%%/%%DOCLANG%%/articles/portbuild/index.html
@@ -215,14 +168,14 @@
%%DOCSDIR%%/%%DOCLANG%%/articles/portbuild/release.html
%%DOCSDIR%%/%%DOCLANG%%/articles/portbuild/setup.html
%%DOCSDIR%%/%%DOCLANG%%/articles/portbuild/starting.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/portbuild/trademarks.html
%%DOCSDIR%%/%%DOCLANG%%/articles/portbuild/uploading.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/pr-guidelines/TRADEMARKS.html
%%DOCSDIR%%/%%DOCLANG%%/articles/pr-guidelines/index.html
%%DOCSDIR%%/%%DOCLANG%%/articles/pr-guidelines/pr-lifecycle.html
%%DOCSDIR%%/%%DOCLANG%%/articles/pr-guidelines/pr-states.html
%%DOCSDIR%%/%%DOCLANG%%/articles/pr-guidelines/pr-types.html
%%DOCSDIR%%/%%DOCLANG%%/articles/pr-guidelines/references.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/problem-reports/TRADEMARKS.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/pr-guidelines/trademarks.html
%%DOCSDIR%%/%%DOCLANG%%/articles/problem-reports/index.html
%%DOCSDIR%%/%%DOCLANG%%/articles/problem-reports/pr-followup.html
%%DOCSDIR%%/%%DOCLANG%%/articles/problem-reports/pr-further.html
@@ -230,17 +183,11 @@
%%DOCSDIR%%/%%DOCLANG%%/articles/problem-reports/pr-problems.html
%%DOCSDIR%%/%%DOCLANG%%/articles/problem-reports/pr-when.html
%%DOCSDIR%%/%%DOCLANG%%/articles/problem-reports/pr-writing.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/pxe/TRADEMARKS.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/pxe/bootstrap-config.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/pxe/custom-postinst-package.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/pxe/index.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/pxe/install-setup.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/pxe/server-config.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/problem-reports/trademarks.html
%%DOCSDIR%%/%%DOCLANG%%/articles/relaydelay/index.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/releng-packages/TRADEMARKS.html
%%DOCSDIR%%/%%DOCLANG%%/articles/releng-packages/index.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/releng-packages/x39.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/releng/TRADEMARKS.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
@@ -250,19 +197,13 @@
%%DOCSDIR%%/%%DOCLANG%%/articles/releng/lessons-learned.html
%%DOCSDIR%%/%%DOCLANG%%/articles/releng/release-build.html
%%DOCSDIR%%/%%DOCLANG%%/articles/releng/release-proc.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/solid-state/TRADEMARKS.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/releng/trademarks.html
%%DOCSDIR%%/%%DOCLANG%%/articles/solid-state/index.html
%%DOCSDIR%%/%%DOCLANG%%/articles/solid-state/kernel.html
%%DOCSDIR%%/%%DOCLANG%%/articles/solid-state/ro-fs.html
%%DOCSDIR%%/%%DOCLANG%%/articles/solid-state/strategies.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/solid-state/x94.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/version-guide/TRADEMARKS.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/version-guide/conclusion.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/version-guide/decision-points.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/version-guide/future-goals.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/version-guide/index.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/version-guide/past-schedules.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/vm-design/TRADEMARKS.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
@@ -271,12 +212,8 @@
%%DOCSDIR%%/%%DOCLANG%%/articles/vm-design/pre-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%%/articles/zip-drive/TRADEMARKS.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/zip-drive/index.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/zip-drive/x102.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/zip-drive/x53.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/LEGALNOTICE.html
%%DOCSDIR%%/%%DOCLANG%%/books/faq/acknowledgments.html
%%DOCSDIR%%/%%DOCLANG%%/books/faq/admin.html
%%DOCSDIR%%/%%DOCLANG%%/books/faq/advanced.html
@@ -297,6 +234,7 @@
%%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/ppp.html
@@ -305,7 +243,6 @@
%%DOCSDIR%%/%%DOCLANG%%/books/faq/support.html
%%DOCSDIR%%/%%DOCLANG%%/books/faq/troubleshoot.html
%%DOCSDIR%%/%%DOCLANG%%/books/faq/x.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/LEGALNOTICE.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/acpi-debug.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/acpi-overview.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/adding-swap-space.html
@@ -343,6 +280,15 @@
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/boot-kernel.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/boot-shutdown.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/boot.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall-final-warning.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall-hardware.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall-install-trouble.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall-netinstall.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall-partitioning.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall-post.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall-pre.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall-start.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/colophon.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/common-tasks.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/config-network-setup.html
@@ -364,7 +310,6 @@
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/crypt.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/ctm.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/current-stable.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/cutting-edge.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/cvs-tags.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/cvsup.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/desktop-browsers.html
@@ -437,6 +382,7 @@
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/l10n-compiling.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/l10n.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/lang-setup.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/legalnotice.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/linuxemu-advanced.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/linuxemu-lbc-install.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/linuxemu-maple.html
@@ -555,6 +501,9 @@
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/tcpwrappers.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/term.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/tvcard.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/updating-upgrading-freebsdupdate.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/updating-upgrading-portsnap.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/updating-upgrading.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/usb-disks.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/userppp.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/users-groups.html
@@ -565,6 +514,7 @@
%%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-localization.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/using-sysinstall.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/video-playback.html
@@ -584,7 +534,6 @@
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/x-xdm.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/x11-wm.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/x11.html
-%%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/TRADEMARKS.html
%%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/build-cluster.html
%%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/building.html
%%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/conflicts.html
@@ -664,6 +613,7 @@
%%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/testing-porttools.html
%%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/testing-tinderbox.html
%%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/testing.html
+%%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/trademarks.html
%%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/users-and-groups.html
%%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/using-autotools.html
%%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/using-databases.html
@@ -686,23 +636,4 @@
%%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/x5788.html
-%%DOCSDIR%%/%%DOCLANG%%/books/ppp-primer/c30.html
-%%DOCSDIR%%/%%DOCLANG%%/books/ppp-primer/c309.html
-%%DOCSDIR%%/%%DOCLANG%%/books/ppp-primer/c833.html
-%%DOCSDIR%%/%%DOCLANG%%/books/ppp-primer/config-window-system.html
-%%DOCSDIR%%/%%DOCLANG%%/books/ppp-primer/f14.html
-%%DOCSDIR%%/%%DOCLANG%%/books/ppp-primer/index.html
-%%DOCSDIR%%/%%DOCLANG%%/books/ppp-primer/list-lan-hosts.html
-%%DOCSDIR%%/%%DOCLANG%%/books/ppp-primer/system-config.html
-%%DOCSDIR%%/%%DOCLANG%%/books/ppp-primer/testing-the-network.html
-%%DOCSDIR%%/%%DOCLANG%%/books/ppp-primer/verify-ether-if-config.html
-%%DOCSDIR%%/%%DOCLANG%%/books/ppp-primer/x237.html
-%%DOCSDIR%%/%%DOCLANG%%/books/ppp-primer/x274.html
-%%DOCSDIR%%/%%DOCLANG%%/books/ppp-primer/x341.html
-%%DOCSDIR%%/%%DOCLANG%%/books/ppp-primer/x38.html
-%%DOCSDIR%%/%%DOCLANG%%/books/ppp-primer/x569.html
-%%DOCSDIR%%/%%DOCLANG%%/books/ppp-primer/x682.html
-%%DOCSDIR%%/%%DOCLANG%%/books/ppp-primer/x760.html
-%%DOCSDIR%%/%%DOCLANG%%/books/ppp-primer/x830.html
-%%DOCSDIR%%/%%DOCLANG%%/books/ppp-primer/x924.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 6ff4ea0a3a02..ba167ebda4ed 100644
--- a/misc/freebsd-doc-ru/pkg-plist.txt
+++ b/misc/freebsd-doc-ru/pkg-plist.txt
@@ -1,6 +1,4 @@
@comment $FreeBSD$
-%%DOCSDIR%%/%%DOCLANG%%/articles/5-roadmap/article.txt
-%%DOCSDIR%%/%%DOCLANG%%/articles/checkpoint/article.txt
%%DOCSDIR%%/%%DOCLANG%%/articles/committers-guide/article.txt
%%DOCSDIR%%/%%DOCLANG%%/articles/console-server/article.txt
%%DOCSDIR%%/%%DOCLANG%%/articles/contributing/article.txt
@@ -8,38 +6,28 @@
%%DOCSDIR%%/%%DOCLANG%%/articles/custom-gcc/article.txt
%%DOCSDIR%%/%%DOCLANG%%/articles/cvs-freebsd/article.txt
%%DOCSDIR%%/%%DOCLANG%%/articles/cvsup-advanced/article.txt
-%%DOCSDIR%%/%%DOCLANG%%/articles/dialup-firewall/article.txt
-%%DOCSDIR%%/%%DOCLANG%%/articles/diskless-x/article.txt
-%%DOCSDIR%%/%%DOCLANG%%/articles/euro/article.txt
%%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd/article.txt
%%DOCSDIR%%/%%DOCLANG%%/articles/fbsd-from-scratch/article.txt
%%DOCSDIR%%/%%DOCLANG%%/articles/fonts/article.txt
-%%DOCSDIR%%/%%DOCLANG%%/articles/formatting-media/article.txt
%%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-questions/article.txt
%%DOCSDIR%%/%%DOCLANG%%/articles/geom-class/article.txt
%%DOCSDIR%%/%%DOCLANG%%/articles/gjournal-desktop/article.txt
-%%DOCSDIR%%/%%DOCLANG%%/articles/hats/article.txt
%%DOCSDIR%%/%%DOCLANG%%/articles/hubs/article.txt
%%DOCSDIR%%/%%DOCLANG%%/articles/ipsec-must/article.txt
%%DOCSDIR%%/%%DOCLANG%%/articles/laptop/article.txt
%%DOCSDIR%%/%%DOCLANG%%/articles/linux-comparison/article.txt
%%DOCSDIR%%/%%DOCLANG%%/articles/mailing-list-faq/article.txt
%%DOCSDIR%%/%%DOCLANG%%/articles/mh/article.txt
-%%DOCSDIR%%/%%DOCLANG%%/articles/multi-os/article.txt
%%DOCSDIR%%/%%DOCLANG%%/articles/new-users/article.txt
%%DOCSDIR%%/%%DOCLANG%%/articles/pam/article.txt
%%DOCSDIR%%/%%DOCLANG%%/articles/portbuild/article.txt
%%DOCSDIR%%/%%DOCLANG%%/articles/pr-guidelines/article.txt
%%DOCSDIR%%/%%DOCLANG%%/articles/problem-reports/article.txt
-%%DOCSDIR%%/%%DOCLANG%%/articles/pxe/article.txt
%%DOCSDIR%%/%%DOCLANG%%/articles/relaydelay/article.txt
%%DOCSDIR%%/%%DOCLANG%%/articles/releng-packages/article.txt
%%DOCSDIR%%/%%DOCLANG%%/articles/releng/article.txt
%%DOCSDIR%%/%%DOCLANG%%/articles/solid-state/article.txt
-%%DOCSDIR%%/%%DOCLANG%%/articles/version-guide/article.txt
%%DOCSDIR%%/%%DOCLANG%%/articles/vm-design/article.txt
-%%DOCSDIR%%/%%DOCLANG%%/articles/zip-drive/article.txt
%%DOCSDIR%%/%%DOCLANG%%/books/faq/book.txt
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/book.txt
%%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/book.txt
-%%DOCSDIR%%/%%DOCLANG%%/books/ppp-primer/book.txt
diff --git a/misc/freebsd-doc-sr/pkg-plist.common b/misc/freebsd-doc-sr/pkg-plist.common
index fc265d17a8b3..8fb5cc4556d5 100644
--- a/misc/freebsd-doc-sr/pkg-plist.common
+++ b/misc/freebsd-doc-sr/pkg-plist.common
@@ -1,7 +1 @@
@comment $FreeBSD$
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/diskless-x
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/dialup-firewall
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles
-%%DOCSDIR%%/%%DOCLANG_PREFIX%%
-@dirrm %%DOCSDIR%%/%%DOCLANG%%
-@dirrmtry %%DOCSDIR%%
diff --git a/misc/freebsd-doc-tr/pkg-plist.html-split b/misc/freebsd-doc-tr/pkg-plist.html-split
index 1e3dd871c8fb..387a47b962d3 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/TRADEMARKS.html
%%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd/index.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd/x117.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd/x59.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd/x92.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.common b/misc/freebsd-doc-zh_cn/pkg-plist.common
index 8b88aa7f7078..9992fbf6f27c 100644
--- a/misc/freebsd-doc-zh_cn/pkg-plist.common
+++ b/misc/freebsd-doc-zh_cn/pkg-plist.common
@@ -10,6 +10,7 @@
@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/handbook/imagelib/callouts
@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/handbook/imagelib
@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/handbook/geom
+@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall
@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/handbook/advanced-networking
@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/handbook
@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/arch-handbook/imagelib/callouts
diff --git a/misc/freebsd-doc-zh_cn/pkg-plist.html-common b/misc/freebsd-doc-zh_cn/pkg-plist.html-common
index 88060775ec3a..16eea09aa831 100644
--- a/misc/freebsd-doc-zh_cn/pkg-plist.html-common
+++ b/misc/freebsd-doc-zh_cn/pkg-plist.html-common
@@ -46,6 +46,50 @@
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/advanced-networking/natd.png
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/advanced-networking/net-routing.png
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/advanced-networking/static-routes.png
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall/bsdinstall-adduser1.png
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall/bsdinstall-adduser2.png
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall/bsdinstall-adduser3.png
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall/bsdinstall-boot-loader-menu.png
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall/bsdinstall-choose-mode.png
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall/bsdinstall-config-components.png
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall/bsdinstall-config-crashdump.png
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall/bsdinstall-config-hostname.png
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall/bsdinstall-config-keymap.png
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall/bsdinstall-config-services.png
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall/bsdinstall-configure-network-interface-ipv4-dhcp.png
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall/bsdinstall-configure-network-interface-ipv4-static.png
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall/bsdinstall-configure-network-interface-ipv4.png
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall/bsdinstall-configure-network-interface-ipv6-static.png
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall/bsdinstall-configure-network-interface-ipv6.png
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall/bsdinstall-configure-network-interface-slaac.png
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall/bsdinstall-configure-network-interface.png
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall/bsdinstall-configure-network-ipv4-dns.png
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall/bsdinstall-configure-wireless-accesspoints.png
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall/bsdinstall-configure-wireless-scan.png
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall/bsdinstall-configure-wireless-wpa2setup.png
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall/bsdinstall-distfile-extracting.png
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall/bsdinstall-distfile-fetching.png
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall/bsdinstall-distfile-verifying.png
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall/bsdinstall-final-confirmation.png
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall/bsdinstall-final-modification-shell.png
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall/bsdinstall-finalconfiguration.png
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall/bsdinstall-keymap-select-default.png
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall/bsdinstall-mainexit.png
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall/bsdinstall-netinstall-files.png
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall/bsdinstall-netinstall-mirrorselect.png
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall/bsdinstall-part-entire-part.png
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall/bsdinstall-part-guided-disk.png
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall/bsdinstall-part-guided-manual.png
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall/bsdinstall-part-manual-addpart.png
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall/bsdinstall-part-manual-create.png
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall/bsdinstall-part-manual-partscheme.png
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall/bsdinstall-part-review.png
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall/bsdinstall-post-root-passwd.png
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall/bsdinstall-set-clock-local-utc.png
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall/bsdinstall-timezone-confirm.png
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall/bsdinstall-timezone-country.png
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall/bsdinstall-timezone-region.png
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall/bsdinstall-timezone-zone.png
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/docbook.css
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/geom/striping.png
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/imagelib/callouts/1.png
diff --git a/misc/freebsd-doc-zh_cn/pkg-plist.html-split b/misc/freebsd-doc-zh_cn/pkg-plist.html-split
index 5b876c5b7098..018404677fa8 100644
--- a/misc/freebsd-doc-zh_cn/pkg-plist.html-split
+++ b/misc/freebsd-doc-zh_cn/pkg-plist.html-split
@@ -1,12 +1,11 @@
@comment $FreeBSD$
-%%DOCSDIR%%/%%DOCLANG%%/articles/contributing/TRADEMARKS.html
%%DOCSDIR%%/%%DOCLANG%%/articles/contributing/contrib-how.html
%%DOCSDIR%%/%%DOCLANG%%/articles/contributing/index.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/cvs-freebsd/TRADEMARKS.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/contributing/trademarks.html
%%DOCSDIR%%/%%DOCLANG%%/articles/cvs-freebsd/first-setup.html
%%DOCSDIR%%/%%DOCLANG%%/articles/cvs-freebsd/freebsdspecific.html
%%DOCSDIR%%/%%DOCLANG%%/articles/cvs-freebsd/index.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/linux-users/TRADEMARKS.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/cvs-freebsd/trademarks.html
%%DOCSDIR%%/%%DOCLANG%%/articles/linux-users/commands.html
%%DOCSDIR%%/%%DOCLANG%%/articles/linux-users/conclusion.html
%%DOCSDIR%%/%%DOCLANG%%/articles/linux-users/firewall.html
@@ -16,11 +15,11 @@
%%DOCSDIR%%/%%DOCLANG%%/articles/linux-users/shells.html
%%DOCSDIR%%/%%DOCLANG%%/articles/linux-users/software.html
%%DOCSDIR%%/%%DOCLANG%%/articles/linux-users/startup.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/linux-users/trademarks.html
%%DOCSDIR%%/%%DOCLANG%%/articles/linux-users/updates.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/nanobsd/TRADEMARKS.html
%%DOCSDIR%%/%%DOCLANG%%/articles/nanobsd/howto.html
%%DOCSDIR%%/%%DOCLANG%%/articles/nanobsd/index.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/rc-scripting/TRADEMARKS.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/nanobsd/trademarks.html
%%DOCSDIR%%/%%DOCLANG%%/articles/rc-scripting/index.html
%%DOCSDIR%%/%%DOCLANG%%/articles/rc-scripting/rcng-args.html
%%DOCSDIR%%/%%DOCLANG%%/articles/rc-scripting/rcng-confdummy.html
@@ -30,13 +29,13 @@
%%DOCSDIR%%/%%DOCLANG%%/articles/rc-scripting/rcng-furthur.html
%%DOCSDIR%%/%%DOCLANG%%/articles/rc-scripting/rcng-hookup.html
%%DOCSDIR%%/%%DOCLANG%%/articles/rc-scripting/rcng-task.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/remote-install/TRADEMARKS.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/rc-scripting/trademarks.html
%%DOCSDIR%%/%%DOCLANG%%/articles/remote-install/index.html
%%DOCSDIR%%/%%DOCLANG%%/articles/remote-install/installation.html
%%DOCSDIR%%/%%DOCLANG%%/articles/remote-install/intro.html
%%DOCSDIR%%/%%DOCLANG%%/articles/remote-install/preparation.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/remote-install/trademarks.html
%%DOCSDIR%%/%%DOCLANG%%/articles/remote-install/zfs.html
-%%DOCSDIR%%/%%DOCLANG%%/books/arch-handbook/TRADEMARKS.html
%%DOCSDIR%%/%%DOCLANG%%/books/arch-handbook/appendices.html
%%DOCSDIR%%/%%DOCLANG%%/books/arch-handbook/boot-bios.html
%%DOCSDIR%%/%%DOCLANG%%/books/arch-handbook/boot-boot0.html
@@ -110,6 +109,7 @@
%%DOCSDIR%%/%%DOCLANG%%/books/arch-handbook/sysinit-operation.html
%%DOCSDIR%%/%%DOCLANG%%/books/arch-handbook/sysinit-using.html
%%DOCSDIR%%/%%DOCLANG%%/books/arch-handbook/sysinit.html
+%%DOCSDIR%%/%%DOCLANG%%/books/arch-handbook/trademarks.html
%%DOCSDIR%%/%%DOCLANG%%/books/arch-handbook/usb-dev.html
%%DOCSDIR%%/%%DOCLANG%%/books/arch-handbook/usb-devprobe.html
%%DOCSDIR%%/%%DOCLANG%%/books/arch-handbook/usb-hc.html
@@ -121,7 +121,6 @@
%%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/LEGALNOTICE.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/acpi-debug.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/acpi-overview.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/adding-swap-space.html
@@ -159,6 +158,15 @@
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/boot-kernel.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/boot-shutdown.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/boot.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall-final-warning.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall-hardware.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall-install-trouble.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall-netinstall.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall-partitioning.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall-post.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall-pre.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall-start.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/carp.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/colophon.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/common-tasks.html
@@ -226,6 +234,7 @@
%%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
@@ -264,6 +273,7 @@
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/l10n-compiling.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/l10n.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/lang-setup.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/legalnotice.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/linuxemu-advanced.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/linuxemu-lbc-install.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/linuxemu-maple.html
@@ -323,6 +333,7 @@
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/network-nis.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/network-ntp.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/network-plip.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/network-pxe-nfs.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/network-routing.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/network-samba.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/network-servers.html
@@ -398,6 +409,7 @@
%%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-localization.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/using-sysinstall.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/video-playback.html
@@ -420,7 +432,6 @@
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/x-xdm.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/x11-wm.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/x11.html
-%%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/TRADEMARKS.html
%%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/build-cluster.html
%%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/building.html
%%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/conflicts.html
@@ -499,6 +510,7 @@
%%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/testing-porttools.html
%%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/testing-tinderbox.html
%%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/testing.html
+%%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/trademarks.html
%%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/users-and-groups.html
%%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/using-autotools.html
%%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/using-databases.html
@@ -521,4 +533,4 @@
%%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/x5621.html
+%%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/x5617.html
diff --git a/misc/freebsd-doc-zh_tw/pkg-plist.html-split b/misc/freebsd-doc-zh_tw/pkg-plist.html-split
index 7b06db4603c6..c6644398243e 100644
--- a/misc/freebsd-doc-zh_tw/pkg-plist.html-split
+++ b/misc/freebsd-doc-zh_tw/pkg-plist.html-split
@@ -1,42 +1,41 @@
@comment $FreeBSD$
-%%DOCSDIR%%/%%DOCLANG%%/articles/contributing/TRADEMARKS.html
%%DOCSDIR%%/%%DOCLANG%%/articles/contributing/contrib-how.html
%%DOCSDIR%%/%%DOCLANG%%/articles/contributing/index.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/cvs-freebsd/TRADEMARKS.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/contributing/trademarks.html
%%DOCSDIR%%/%%DOCLANG%%/articles/cvs-freebsd/first-setup.html
%%DOCSDIR%%/%%DOCLANG%%/articles/cvs-freebsd/freebsdspecific.html
%%DOCSDIR%%/%%DOCLANG%%/articles/cvs-freebsd/index.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-questions/TRADEMARKS.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/cvs-freebsd/trademarks.html
%%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-questions/index.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-questions/x112.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-questions/x204.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-questions/x216.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-questions/x36.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-questions/x51.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-questions/x65.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-questions/x90.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/hubs/TRADEMARKS.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
%%DOCSDIR%%/%%DOCLANG%%/articles/hubs/mirror-requirements.html
%%DOCSDIR%%/%%DOCLANG%%/articles/hubs/mirror-statpages.html
%%DOCSDIR%%/%%DOCLANG%%/articles/hubs/mirror-where.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/hubs/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/nanobsd/TRADEMARKS.html
%%DOCSDIR%%/%%DOCLANG%%/articles/nanobsd/howto.html
%%DOCSDIR%%/%%DOCLANG%%/articles/nanobsd/index.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/pr-guidelines/TRADEMARKS.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/nanobsd/trademarks.html
%%DOCSDIR%%/%%DOCLANG%%/articles/pr-guidelines/index.html
%%DOCSDIR%%/%%DOCLANG%%/articles/pr-guidelines/pr-lifecycle.html
%%DOCSDIR%%/%%DOCLANG%%/articles/pr-guidelines/pr-states.html
%%DOCSDIR%%/%%DOCLANG%%/articles/pr-guidelines/pr-types.html
%%DOCSDIR%%/%%DOCLANG%%/articles/pr-guidelines/references.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/problem-reports/TRADEMARKS.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/pr-guidelines/trademarks.html
%%DOCSDIR%%/%%DOCLANG%%/articles/problem-reports/index.html
%%DOCSDIR%%/%%DOCLANG%%/articles/problem-reports/pr-followup.html
%%DOCSDIR%%/%%DOCLANG%%/articles/problem-reports/pr-further.html
@@ -44,18 +43,17 @@
%%DOCSDIR%%/%%DOCLANG%%/articles/problem-reports/pr-problems.html
%%DOCSDIR%%/%%DOCLANG%%/articles/problem-reports/pr-when.html
%%DOCSDIR%%/%%DOCLANG%%/articles/problem-reports/pr-writing.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/remote-install/TRADEMARKS.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/problem-reports/trademarks.html
%%DOCSDIR%%/%%DOCLANG%%/articles/remote-install/index.html
%%DOCSDIR%%/%%DOCLANG%%/articles/remote-install/installation.html
%%DOCSDIR%%/%%DOCLANG%%/articles/remote-install/intro.html
%%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/LEGALNOTICE.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/debugging.html
-%%DOCSDIR%%/%%DOCLANG%%/books/developers-handbook/dma.html
%%DOCSDIR%%/%%DOCLANG%%/books/developers-handbook/emacs.html
%%DOCSDIR%%/%%DOCLANG%%/books/developers-handbook/index.html
%%DOCSDIR%%/%%DOCLANG%%/books/developers-handbook/introduction-archguide.html
@@ -75,6 +73,7 @@
%%DOCSDIR%%/%%DOCLANG%%/books/developers-handbook/kerneldebug-post-mortem.html
%%DOCSDIR%%/%%DOCLANG%%/books/developers-handbook/kerneldebug.html
%%DOCSDIR%%/%%DOCLANG%%/books/developers-handbook/l10n.html
+%%DOCSDIR%%/%%DOCLANG%%/books/developers-handbook/legalnotice.html
%%DOCSDIR%%/%%DOCLANG%%/books/developers-handbook/policies-contributed.html
%%DOCSDIR%%/%%DOCLANG%%/books/developers-handbook/policies-encumbered.html
%%DOCSDIR%%/%%DOCLANG%%/books/developers-handbook/policies-shlib.html
@@ -115,7 +114,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/LEGALNOTICE.html
%%DOCSDIR%%/%%DOCLANG%%/books/faq/acknowledgments.html
%%DOCSDIR%%/%%DOCLANG%%/books/faq/admin.html
%%DOCSDIR%%/%%DOCLANG%%/books/faq/advanced.html
@@ -135,6 +133,7 @@
%%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
@@ -144,13 +143,13 @@
%%DOCSDIR%%/%%DOCLANG%%/books/faq/support.html
%%DOCSDIR%%/%%DOCLANG%%/books/faq/troubleshoot.html
%%DOCSDIR%%/%%DOCLANG%%/books/faq/x.html
-%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/LEGALNOTICE.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
%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/examples-formatted.html
%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/examples.html
%%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
@@ -190,7 +189,6 @@
%%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/LEGALNOTICE.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/acpi-debug.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/acpi-overview.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/adding-swap-space.html
@@ -324,6 +322,7 @@
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/l10n-compiling.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/l10n.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/lang-setup.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/legalnotice.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/linuxemu-advanced.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/linuxemu-lbc-install.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/linuxemu-maple.html
@@ -475,7 +474,6 @@
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/x-xdm.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/x11-wm.html
%%DOCSDIR%%/%%DOCLANG%%/books/handbook/x11.html
-%%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/TRADEMARKS.html
%%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/build-cluster.html
%%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/building.html
%%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/conflicts.html
@@ -555,6 +553,7 @@
%%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/testing-porttools.html
%%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/testing-tinderbox.html
%%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/testing.html
+%%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/trademarks.html
%%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/using-autotools.html
%%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/using-databases.html
%%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/using-emacs.html