Update to r40771 of the FreeBSD docset.

Approved by:	doceng (implicit)

7 files changed, 11 insertions, 50 deletions

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