Update to r40771 of the FreeBSD docset.

Approved by:	doceng (implicit)

7 files changed, 17 insertions, 43 deletions

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