7 files changed, 22 insertions, 53 deletions

diff --git a/misc/freebsd-doc-zh_tw/pkg-plist.common b/misc/freebsd-doc-zh_tw/pkg-plist.common
index 552beda093a0..01c4aaee01f4 100644
--- a/misc/freebsd-doc-zh_tw/pkg-plist.common
+++ b/misc/freebsd-doc-zh_tw/pkg-plist.common
@@ -15,7 +15,6 @@
 @dirrm %%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/imagelib/callouts
 @dirrm %%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/imagelib
 @dirrm %%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/faq
 @dirrm %%DOCSDIR%%/%%DOCLANG%%/books/developers-handbook/sockets
 @dirrm %%DOCSDIR%%/%%DOCLANG%%/books/developers-handbook
 @dirrm %%DOCSDIR%%/%%DOCLANG%%/books
diff --git a/misc/freebsd-doc-zh_tw/pkg-plist.html b/misc/freebsd-doc-zh_tw/pkg-plist.html
index 06ec66ac3046..23ae9ef1fd57 100644
--- a/misc/freebsd-doc-zh_tw/pkg-plist.html
+++ b/misc/freebsd-doc-zh_tw/pkg-plist.html
@@ -9,7 +9,6 @@
 %%DOCSDIR%%/%%DOCLANG%%/articles/problem-reports/article.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/remote-install/article.html
 %%DOCSDIR%%/%%DOCLANG%%/books/developers-handbook/book.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/book.html
 %%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/book.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/book.html
 %%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/book.html
diff --git a/misc/freebsd-doc-zh_tw/pkg-plist.html-common b/misc/freebsd-doc-zh_tw/pkg-plist.html-common
index 14740323b87e..9534b416d7bb 100644
--- a/misc/freebsd-doc-zh_tw/pkg-plist.html-common
+++ b/misc/freebsd-doc-zh_tw/pkg-plist.html-common
@@ -29,7 +29,6 @@
 %%DOCSDIR%%/%%DOCLANG%%/books/developers-handbook/sockets/serv.png
 %%DOCSDIR%%/%%DOCLANG%%/books/developers-handbook/sockets/serv2.png
 %%DOCSDIR%%/%%DOCLANG%%/books/developers-handbook/sockets/slayers.png
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/docbook.css
 %%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/docbook.css
 %%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/imagelib/callouts/1.png
 %%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/imagelib/callouts/2.png
diff --git a/misc/freebsd-doc-zh_tw/pkg-plist.html-split b/misc/freebsd-doc-zh_tw/pkg-plist.html-split
index c6644398243e..7f22761aea92 100644
--- a/misc/freebsd-doc-zh_tw/pkg-plist.html-split
+++ b/misc/freebsd-doc-zh_tw/pkg-plist.html-split
@@ -6,15 +6,15 @@
 %%DOCSDIR%%/%%DOCLANG%%/articles/cvs-freebsd/freebsdspecific.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/cvs-freebsd/index.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/cvs-freebsd/trademarks.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-questions/ar01s02.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-questions/ar01s03.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-questions/ar01s04.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-questions/ar01s05.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-questions/ar01s06.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-questions/ar01s07.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-questions/ar01s08.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-questions/index.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-questions/trademarks.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-questions/x113.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-questions/x205.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-questions/x217.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-questions/x37.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-questions/x52.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-questions/x66.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-questions/x91.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/hubs/index.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/hubs/mirror-howto.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/hubs/mirror-official.html
@@ -50,9 +50,10 @@
 %%DOCSDIR%%/%%DOCLANG%%/articles/remote-install/preparation.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/remote-install/trademarks.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/remote-install/zfs.html
+%%DOCSDIR%%/%%DOCLANG%%/books/developers-handbook/Basics.html
 %%DOCSDIR%%/%%DOCLANG%%/books/developers-handbook/appendices.html
 %%DOCSDIR%%/%%DOCLANG%%/books/developers-handbook/architectures.html
-%%DOCSDIR%%/%%DOCLANG%%/books/developers-handbook/basics.html
+%%DOCSDIR%%/%%DOCLANG%%/books/developers-handbook/bi01.html
 %%DOCSDIR%%/%%DOCLANG%%/books/developers-handbook/debugging.html
 %%DOCSDIR%%/%%DOCLANG%%/books/developers-handbook/emacs.html
 %%DOCSDIR%%/%%DOCLANG%%/books/developers-handbook/index.html
@@ -99,6 +100,7 @@
 %%DOCSDIR%%/%%DOCLANG%%/books/developers-handbook/tools-programming.html
 %%DOCSDIR%%/%%DOCLANG%%/books/developers-handbook/tools-reading.html
 %%DOCSDIR%%/%%DOCLANG%%/books/developers-handbook/tools.html
+%%DOCSDIR%%/%%DOCLANG%%/books/developers-handbook/trademarks.html
 %%DOCSDIR%%/%%DOCLANG%%/books/developers-handbook/x86-acknowledgements.html
 %%DOCSDIR%%/%%DOCLANG%%/books/developers-handbook/x86-buffered-io.html
 %%DOCSDIR%%/%%DOCLANG%%/books/developers-handbook/x86-caveats.html
@@ -114,35 +116,6 @@
 %%DOCSDIR%%/%%DOCLANG%%/books/developers-handbook/x86-the-tools.html
 %%DOCSDIR%%/%%DOCLANG%%/books/developers-handbook/x86-unix-filters.html
 %%DOCSDIR%%/%%DOCLANG%%/books/developers-handbook/x86.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/acknowledgments.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/admin.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/advanced.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/applications.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/bibliography.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/commercial.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/compatibility-drives.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/compatibility-kbd-mice.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/compatibility-networking.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/compatibility-other.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/compatibility-processors.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/compatibility-sound.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/disks.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/funnies.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/hardware.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/index.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/install.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/introduction.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/kernelconfig.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/legalnotice.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/misc.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/networking.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/ports.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/ppp.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/security.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/serial.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/support.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/troubleshoot.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x.html
 %%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/doc-build-makefiles.html
 %%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/doc-build.html
 %%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/examples-docbook-article.html
@@ -189,7 +162,15 @@
 %%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/translations.html
 %%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/writing-style-word-list.html
 %%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/writing-style.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/acpi-debug.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/ACPI-debug.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/GEOM-intro.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/GEOM-mirror.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/GEOM-striping.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/GEOM.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/MAC-examplehttpd.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/SMTP-Auth.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/SMTP-UUCP.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/SMTP-dialup.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/acpi-overview.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/adding-swap-space.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/advanced-networking.html
@@ -282,10 +263,6 @@
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/floppies.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/freebsd-glossary.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/fs-acl.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/geom-intro.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/geom-mirror.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/geom-striping.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/geom.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/getting-started.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/handbook.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/history.html
@@ -311,7 +288,7 @@
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/jails-tuning.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/jails.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/kerberos5.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/kerberosiv.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/kerberosIV.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/kernelconfig-building.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/kernelconfig-config.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/kernelconfig-custom-kernel.html
@@ -332,7 +309,6 @@
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/linuxemu.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/mac-biba.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/mac-bsdextended.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/mac-examplehttpd.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/mac-ifoff.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/mac-implementing.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/mac-initial.html
@@ -430,9 +406,6 @@
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/shells.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/slip.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/small-lan.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/smtp-auth.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/smtp-dialup.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/smtp-uucp.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/snapshots.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/sound-mp3.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/sound-setup.html
@@ -441,6 +414,7 @@
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/system-administration.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/tcpwrappers.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/term.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/trademarks.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/tvcard.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/usb-disks.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/userppp.html
@@ -499,6 +473,7 @@
 %%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/index.html
 %%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/install.html
 %%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/keeping-up.html
+%%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/legalnotice.html
 %%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/makefile-categories.html
 %%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/makefile-comment.html
 %%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/makefile-depend.html
diff --git a/misc/freebsd-doc-zh_tw/pkg-plist.pdf b/misc/freebsd-doc-zh_tw/pkg-plist.pdf
index c5e648155d14..ee146aadbc87 100644
--- a/misc/freebsd-doc-zh_tw/pkg-plist.pdf
+++ b/misc/freebsd-doc-zh_tw/pkg-plist.pdf
@@ -9,7 +9,6 @@
 %%DOCSDIR%%/%%DOCLANG%%/articles/problem-reports/article.pdf
 %%DOCSDIR%%/%%DOCLANG%%/articles/remote-install/article.pdf
 %%DOCSDIR%%/%%DOCLANG%%/books/developers-handbook/book.pdf
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/book.pdf
 %%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/book.pdf
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/book.pdf
 %%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/book.pdf
diff --git a/misc/freebsd-doc-zh_tw/pkg-plist.ps b/misc/freebsd-doc-zh_tw/pkg-plist.ps
index fba145a37bb7..e4872a6504ab 100644
--- a/misc/freebsd-doc-zh_tw/pkg-plist.ps
+++ b/misc/freebsd-doc-zh_tw/pkg-plist.ps
@@ -9,7 +9,6 @@
 %%DOCSDIR%%/%%DOCLANG%%/articles/problem-reports/article.ps
 %%DOCSDIR%%/%%DOCLANG%%/articles/remote-install/article.ps
 %%DOCSDIR%%/%%DOCLANG%%/books/developers-handbook/book.ps
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/book.ps
 %%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/book.ps
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/book.ps
 %%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/book.ps
diff --git a/misc/freebsd-doc-zh_tw/pkg-plist.txt b/misc/freebsd-doc-zh_tw/pkg-plist.txt
index 6f665fd94f80..21d9759b074c 100644
--- a/misc/freebsd-doc-zh_tw/pkg-plist.txt
+++ b/misc/freebsd-doc-zh_tw/pkg-plist.txt
@@ -9,7 +9,6 @@
 %%DOCSDIR%%/%%DOCLANG%%/articles/problem-reports/article.txt
 %%DOCSDIR%%/%%DOCLANG%%/articles/remote-install/article.txt
 %%DOCSDIR%%/%%DOCLANG%%/books/developers-handbook/book.txt
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/book.txt
 %%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/book.txt
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/book.txt
 %%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/book.txt