Update to r40771 of the FreeBSD docset.

Approved by:	doceng (implicit)

1 files changed, 20 insertions, 21 deletions

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