Update to r46616 of the FreeBSD docset.

Approved by:	doceng (implicit)

76 files changed, 139 insertions, 574 deletions

diff --git a/misc/freebsd-doc-all/Makefile b/misc/freebsd-doc-all/Makefile
index 575bf9f73469..9a4ab736c49b 100644
--- a/misc/freebsd-doc-all/Makefile
+++ b/misc/freebsd-doc-all/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	freebsd-doc-all
-PORTVERSION=	46230
+PORTVERSION=	46616
 PORTEPOCH=	1
 CATEGORIES=	misc docs
 MASTER_SITES=	#empty
diff --git a/misc/freebsd-doc-de/pkg-plist.html b/misc/freebsd-doc-de/pkg-plist.html
index c7fa7ebb9266..580b03310996 100644
--- a/misc/freebsd-doc-de/pkg-plist.html
+++ b/misc/freebsd-doc-de/pkg-plist.html
@@ -1,9 +1,6 @@
-%%DOCSDIR%%/%%DOCLANG%%/articles/contributing-ports/article.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/contributing/article.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd/article.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-update-server/article.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/laptop/article.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/linux-comparison/article.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/nanobsd/article.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/new-users/article.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/port-mentor-guidelines/article.html
diff --git a/misc/freebsd-doc-de/pkg-plist.html-common b/misc/freebsd-doc-de/pkg-plist.html-common
index 16448c5e0b9a..b35d4d893280 100644
--- a/misc/freebsd-doc-de/pkg-plist.html-common
+++ b/misc/freebsd-doc-de/pkg-plist.html-common
@@ -1,4 +1,3 @@
-%%DOCSDIR%%/%%DOCLANG%%/articles/contributing-ports/docbook.css
 %%DOCSDIR%%/%%DOCLANG%%/articles/contributing/docbook.css
 %%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd/docbook.css
 %%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-update-server/docbook.css
@@ -7,8 +6,6 @@
 %%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/laptop/docbook.css
-%%DOCSDIR%%/%%DOCLANG%%/articles/linux-comparison/docbook.css
 %%DOCSDIR%%/%%DOCLANG%%/articles/nanobsd/docbook.css
 %%DOCSDIR%%/%%DOCLANG%%/articles/nanobsd/imagelib/callouts/1.png
 %%DOCSDIR%%/%%DOCLANG%%/articles/nanobsd/imagelib/callouts/2.png
@@ -183,13 +180,6 @@
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/security/ipsec-encap-pkt.png
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/security/ipsec-network.png
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/security/ipsec-out-pkt.png
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/vinum/vinum-concat.png
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/vinum/vinum-mirrored-vol.png
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/vinum/vinum-raid10-vol.png
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/vinum/vinum-raid5-org.png
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/vinum/vinum-simple-vol.png
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/vinum/vinum-striped-vol.png
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/vinum/vinum-striped.png
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/virtualization/parallels-freebsd1.png
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/virtualization/parallels-freebsd10.png
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/virtualization/parallels-freebsd11.png
diff --git a/misc/freebsd-doc-de/pkg-plist.html-split b/misc/freebsd-doc-de/pkg-plist.html-split
index c1bf254994b0..592420f29ff1 100644
--- a/misc/freebsd-doc-de/pkg-plist.html-split
+++ b/misc/freebsd-doc-de/pkg-plist.html-split
@@ -1,13 +1,3 @@
-%%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/ix01.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%%/articles/contributing/ix01.html
@@ -25,19 +15,6 @@
 %%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/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/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/legalnotice.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/linux-comparison/trademarks.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/nanobsd/howto.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/nanobsd/index.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/nanobsd/ix01.html
@@ -513,6 +490,14 @@
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/x-xdm.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/x11-wm.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/x11.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/zfs-advanced.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/zfs-links.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/zfs-quickstart.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/zfs-term.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/zfs-zfs-allow.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/zfs-zfs.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/zfs-zpool.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/zfs.html
 %%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/build-cluster.html
 %%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/building.html
 %%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/ch06s25.html
diff --git a/misc/freebsd-doc-de/pkg-plist.pdf b/misc/freebsd-doc-de/pkg-plist.pdf
index ebe0c32bed73..c2ff03ca796d 100644
--- a/misc/freebsd-doc-de/pkg-plist.pdf
+++ b/misc/freebsd-doc-de/pkg-plist.pdf
@@ -1,9 +1,6 @@
-%%DOCSDIR%%/%%DOCLANG%%/articles/contributing-ports/article.pdf
 %%DOCSDIR%%/%%DOCLANG%%/articles/contributing/article.pdf
 %%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd/article.pdf
 %%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-update-server/article.pdf
-%%DOCSDIR%%/%%DOCLANG%%/articles/laptop/article.pdf
-%%DOCSDIR%%/%%DOCLANG%%/articles/linux-comparison/article.pdf
 %%DOCSDIR%%/%%DOCLANG%%/articles/nanobsd/article.pdf
 %%DOCSDIR%%/%%DOCLANG%%/articles/new-users/article.pdf
 %%DOCSDIR%%/%%DOCLANG%%/articles/port-mentor-guidelines/article.pdf
diff --git a/misc/freebsd-doc-de/pkg-plist.ps b/misc/freebsd-doc-de/pkg-plist.ps
index 89322aee26f1..e446b0cc2ff7 100644
--- a/misc/freebsd-doc-de/pkg-plist.ps
+++ b/misc/freebsd-doc-de/pkg-plist.ps
@@ -1,9 +1,6 @@
-%%DOCSDIR%%/%%DOCLANG%%/articles/contributing-ports/article.ps
 %%DOCSDIR%%/%%DOCLANG%%/articles/contributing/article.ps
 %%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd/article.ps
 %%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-update-server/article.ps
-%%DOCSDIR%%/%%DOCLANG%%/articles/laptop/article.ps
-%%DOCSDIR%%/%%DOCLANG%%/articles/linux-comparison/article.ps
 %%DOCSDIR%%/%%DOCLANG%%/articles/nanobsd/article.ps
 %%DOCSDIR%%/%%DOCLANG%%/articles/new-users/article.ps
 %%DOCSDIR%%/%%DOCLANG%%/articles/port-mentor-guidelines/article.ps
diff --git a/misc/freebsd-doc-de/pkg-plist.txt b/misc/freebsd-doc-de/pkg-plist.txt
index 2a445f10f09c..c884bdcdd179 100644
--- a/misc/freebsd-doc-de/pkg-plist.txt
+++ b/misc/freebsd-doc-de/pkg-plist.txt
@@ -1,11 +1,8 @@
-%%DOCSDIR%%/%%DOCLANG%%/articles/contributing-ports/article.txt
 %%DOCSDIR%%/%%DOCLANG%%/articles/contributing/article.txt
 %%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd/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/laptop/article.txt
-%%DOCSDIR%%/%%DOCLANG%%/articles/linux-comparison/article.txt
 %%DOCSDIR%%/%%DOCLANG%%/articles/nanobsd/article.txt
 %%DOCSDIR%%/%%DOCLANG%%/articles/new-users/article.txt
 %%DOCSDIR%%/%%DOCLANG%%/articles/port-mentor-guidelines/article.txt
diff --git a/misc/freebsd-doc-el/pkg-plist.html b/misc/freebsd-doc-el/pkg-plist.html
index 58d49b619fb1..14c104708f8f 100644
--- a/misc/freebsd-doc-el/pkg-plist.html
+++ b/misc/freebsd-doc-el/pkg-plist.html
@@ -1,18 +1,14 @@
 %%DOCSDIR%%/%%DOCLANG%%/articles/bsdl-gpl/article.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/compiz-fusion/article.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/contributing/article.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/cvs-freebsd/article.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd/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/nanobsd/article.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/new-users/article.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/problem-reports/article.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/releng-packages/article.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/releng/article.html
 %%DOCSDIR%%/%%DOCLANG%%/books/faq/book.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/book.html
diff --git a/misc/freebsd-doc-el/pkg-plist.html-common b/misc/freebsd-doc-el/pkg-plist.html-common
index fa3552890ff7..22972160496b 100644
--- a/misc/freebsd-doc-el/pkg-plist.html-common
+++ b/misc/freebsd-doc-el/pkg-plist.html-common
@@ -1,14 +1,11 @@
 %%DOCSDIR%%/%%DOCLANG%%/articles/bsdl-gpl/docbook.css
-%%DOCSDIR%%/%%DOCLANG%%/articles/compiz-fusion/docbook.css
 %%DOCSDIR%%/%%DOCLANG%%/articles/contributing/docbook.css
-%%DOCSDIR%%/%%DOCLANG%%/articles/cvs-freebsd/docbook.css
 %%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd/docbook.css
 %%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-questions/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/greek-language-support/docbook.css
-%%DOCSDIR%%/%%DOCLANG%%/articles/laptop/docbook.css
 %%DOCSDIR%%/%%DOCLANG%%/articles/linux-users/docbook.css
 %%DOCSDIR%%/%%DOCLANG%%/articles/mailing-list-faq/docbook.css
 %%DOCSDIR%%/%%DOCLANG%%/articles/nanobsd/docbook.css
@@ -18,7 +15,6 @@
 %%DOCSDIR%%/%%DOCLANG%%/articles/nanobsd/imagelib/callouts/4.png
 %%DOCSDIR%%/%%DOCLANG%%/articles/new-users/docbook.css
 %%DOCSDIR%%/%%DOCLANG%%/articles/problem-reports/docbook.css
-%%DOCSDIR%%/%%DOCLANG%%/articles/releng-packages/docbook.css
 %%DOCSDIR%%/%%DOCLANG%%/articles/releng/branches-head.png
 %%DOCSDIR%%/%%DOCLANG%%/articles/releng/branches-releng3.png
 %%DOCSDIR%%/%%DOCLANG%%/articles/releng/branches-releng4.png
diff --git a/misc/freebsd-doc-el/pkg-plist.html-split b/misc/freebsd-doc-el/pkg-plist.html-split
index fbb0c06eccf3..b188755412ff 100644
--- a/misc/freebsd-doc-el/pkg-plist.html-split
+++ b/misc/freebsd-doc-el/pkg-plist.html-split
@@ -12,20 +12,10 @@
 %%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/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/contrib-how.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/contributing/index.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/contributing/ix01.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/cvs-freebsd/trademarks.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd/ar01s02.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd/ar01s03.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd/ar01s04.html
@@ -53,11 +43,6 @@
 %%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/index.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/laptop/modems.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/laptop/pcmcia.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/laptop/power-management.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
@@ -98,8 +83,6 @@
 %%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/ar01s02.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/releng-packages/index.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/releng/ackno.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/releng/biblio.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/releng/distribution.html
diff --git a/misc/freebsd-doc-el/pkg-plist.pdf b/misc/freebsd-doc-el/pkg-plist.pdf
index 49dfb66030c6..c762c66acce0 100644
--- a/misc/freebsd-doc-el/pkg-plist.pdf
+++ b/misc/freebsd-doc-el/pkg-plist.pdf
@@ -1,18 +1,14 @@
 %%DOCSDIR%%/%%DOCLANG%%/articles/bsdl-gpl/article.pdf
-%%DOCSDIR%%/%%DOCLANG%%/articles/compiz-fusion/article.pdf
 %%DOCSDIR%%/%%DOCLANG%%/articles/contributing/article.pdf
-%%DOCSDIR%%/%%DOCLANG%%/articles/cvs-freebsd/article.pdf
 %%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd/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/nanobsd/article.pdf
 %%DOCSDIR%%/%%DOCLANG%%/articles/new-users/article.pdf
 %%DOCSDIR%%/%%DOCLANG%%/articles/problem-reports/article.pdf
-%%DOCSDIR%%/%%DOCLANG%%/articles/releng-packages/article.pdf
 %%DOCSDIR%%/%%DOCLANG%%/articles/releng/article.pdf
 %%DOCSDIR%%/%%DOCLANG%%/books/faq/book.pdf
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/book.pdf
diff --git a/misc/freebsd-doc-el/pkg-plist.ps b/misc/freebsd-doc-el/pkg-plist.ps
index a80288190497..8d9785eb48ba 100644
--- a/misc/freebsd-doc-el/pkg-plist.ps
+++ b/misc/freebsd-doc-el/pkg-plist.ps
@@ -1,18 +1,14 @@
 %%DOCSDIR%%/%%DOCLANG%%/articles/bsdl-gpl/article.ps
-%%DOCSDIR%%/%%DOCLANG%%/articles/compiz-fusion/article.ps
 %%DOCSDIR%%/%%DOCLANG%%/articles/contributing/article.ps
-%%DOCSDIR%%/%%DOCLANG%%/articles/cvs-freebsd/article.ps
 %%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd/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/nanobsd/article.ps
 %%DOCSDIR%%/%%DOCLANG%%/articles/new-users/article.ps
 %%DOCSDIR%%/%%DOCLANG%%/articles/problem-reports/article.ps
-%%DOCSDIR%%/%%DOCLANG%%/articles/releng-packages/article.ps
 %%DOCSDIR%%/%%DOCLANG%%/articles/releng/article.ps
 %%DOCSDIR%%/%%DOCLANG%%/books/faq/book.ps
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/book.ps
diff --git a/misc/freebsd-doc-el/pkg-plist.txt b/misc/freebsd-doc-el/pkg-plist.txt
index 43f5631674d6..09d3b7a0d415 100644
--- a/misc/freebsd-doc-el/pkg-plist.txt
+++ b/misc/freebsd-doc-el/pkg-plist.txt
@@ -1,18 +1,14 @@
 %%DOCSDIR%%/%%DOCLANG%%/articles/bsdl-gpl/article.txt
-%%DOCSDIR%%/%%DOCLANG%%/articles/compiz-fusion/article.txt
 %%DOCSDIR%%/%%DOCLANG%%/articles/contributing/article.txt
-%%DOCSDIR%%/%%DOCLANG%%/articles/cvs-freebsd/article.txt
 %%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd/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/nanobsd/article.txt
 %%DOCSDIR%%/%%DOCLANG%%/articles/new-users/article.txt
 %%DOCSDIR%%/%%DOCLANG%%/articles/problem-reports/article.txt
-%%DOCSDIR%%/%%DOCLANG%%/articles/releng-packages/article.txt
 %%DOCSDIR%%/%%DOCLANG%%/articles/releng/article.txt
 %%DOCSDIR%%/%%DOCLANG%%/books/faq/book.txt
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/book.txt
diff --git a/misc/freebsd-doc-en/Makefile b/misc/freebsd-doc-en/Makefile
index 8ef8fd86f8cf..81e315a6b278 100644
--- a/misc/freebsd-doc-en/Makefile
+++ b/misc/freebsd-doc-en/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	freebsd-doc
-PORTVERSION=	46230
+PORTVERSION=	46616
 PORTEPOCH=	1
 CATEGORIES=	misc docs
 MASTER_SITES=	LOCAL/blackend
diff --git a/misc/freebsd-doc-en/distinfo b/misc/freebsd-doc-en/distinfo
index 940703aac8d0..9fe31473fd85 100644
--- a/misc/freebsd-doc-en/distinfo
+++ b/misc/freebsd-doc-en/distinfo
@@ -1,2 +1,2 @@
-SHA256 (freebsd-doc-46230.tar.gz) = e63593755f17ac8fe872ff5cf809da79ac20eb4088b59f8cabb779c6be8e6123
-SIZE (freebsd-doc-46230.tar.gz) = 33887613
+SHA256 (freebsd-doc-46616.tar.gz) = 27cd14dd93fa22f2d4e4a2c016e7eed834be7c2fa0c41c9bfd59858b64904059
+SIZE (freebsd-doc-46616.tar.gz) = 34832475
diff --git a/misc/freebsd-doc-en/pkg-plist.extras b/misc/freebsd-doc-en/pkg-plist.extras
index d5bf32b57858..747ae22467f4 100644
--- a/misc/freebsd-doc-en/pkg-plist.extras
+++ b/misc/freebsd-doc-en/pkg-plist.extras
@@ -1,7 +1,2 @@
-%%DOCSDIR%%/%%DOCLANG%%/articles/fbsd-from-scratch/stage_1.conf.default
-%%DOCSDIR%%/%%DOCLANG%%/articles/fbsd-from-scratch/stage_1.sh
-%%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/freebsd-update-server/diff.txt
 %%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-update-server/init.txt
diff --git a/misc/freebsd-doc-en/pkg-plist.html b/misc/freebsd-doc-en/pkg-plist.html
index 3142d14ce8b3..64aa0cdc1a26 100644
--- a/misc/freebsd-doc-en/pkg-plist.html
+++ b/misc/freebsd-doc-en/pkg-plist.html
@@ -1,15 +1,10 @@
 %%DOCSDIR%%/%%DOCLANG%%/articles/bsdl-gpl/article.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/building-products/article.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/committers-guide/article.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/compiz-fusion/article.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/console-server/article.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/contributing-ports/article.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/contributing/article.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/contributors/article.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/cups/article.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/custom-gcc/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/freebsd-questions/article.html
@@ -18,9 +13,7 @@
 %%DOCSDIR%%/%%DOCLANG%%/articles/gjournal-desktop/article.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/hubs/article.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/ipsec-must/article.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/laptop/article.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/ldap-auth/article.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/linux-comparison/article.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/linux-emulation/article.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/linux-users/article.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/mailing-list-faq/article.html
@@ -34,13 +27,12 @@
 %%DOCSDIR%%/%%DOCLANG%%/articles/problem-reports/article.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/rc-scripting/article.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/relaydelay/article.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/releng-packages/article.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/releng/article.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/remote-install/article.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/serial-uart/article.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/solid-state/article.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/vinum/article.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/vm-design/article.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/wp-toolbox/article.html
 %%DOCSDIR%%/%%DOCLANG%%/books/arch-handbook/book.html
 %%DOCSDIR%%/%%DOCLANG%%/books/design-44bsd/book.html
 %%DOCSDIR%%/%%DOCLANG%%/books/dev-model/book.html
diff --git a/misc/freebsd-doc-en/pkg-plist.html-common b/misc/freebsd-doc-en/pkg-plist.html-common
index 7eeb72d1167e..26dd05bf52ac 100644
--- a/misc/freebsd-doc-en/pkg-plist.html-common
+++ b/misc/freebsd-doc-en/pkg-plist.html-common
@@ -6,16 +6,10 @@
 %%DOCSDIR%%/%%DOCLANG%%/articles/committers-guide/imagelib/callouts/1.png
 %%DOCSDIR%%/%%DOCLANG%%/articles/committers-guide/imagelib/callouts/2.png
 %%DOCSDIR%%/%%DOCLANG%%/articles/committers-guide/imagelib/callouts/3.png
-%%DOCSDIR%%/%%DOCLANG%%/articles/compiz-fusion/docbook.css
-%%DOCSDIR%%/%%DOCLANG%%/articles/console-server/docbook.css
-%%DOCSDIR%%/%%DOCLANG%%/articles/console-server/tk0231-9-1.png
-%%DOCSDIR%%/%%DOCLANG%%/articles/contributing-ports/docbook.css
 %%DOCSDIR%%/%%DOCLANG%%/articles/contributing/docbook.css
 %%DOCSDIR%%/%%DOCLANG%%/articles/contributors/docbook.css
 %%DOCSDIR%%/%%DOCLANG%%/articles/cups/docbook.css
-%%DOCSDIR%%/%%DOCLANG%%/articles/custom-gcc/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/freebsd-questions/docbook.css
@@ -31,9 +25,7 @@
 %%DOCSDIR%%/%%DOCLANG%%/articles/gjournal-desktop/docbook.css
 %%DOCSDIR%%/%%DOCLANG%%/articles/hubs/docbook.css
 %%DOCSDIR%%/%%DOCLANG%%/articles/ipsec-must/docbook.css
-%%DOCSDIR%%/%%DOCLANG%%/articles/laptop/docbook.css
 %%DOCSDIR%%/%%DOCLANG%%/articles/ldap-auth/docbook.css
-%%DOCSDIR%%/%%DOCLANG%%/articles/linux-comparison/docbook.css
 %%DOCSDIR%%/%%DOCLANG%%/articles/linux-emulation/docbook.css
 %%DOCSDIR%%/%%DOCLANG%%/articles/linux-users/docbook.css
 %%DOCSDIR%%/%%DOCLANG%%/articles/mailing-list-faq/docbook.css
@@ -65,7 +57,6 @@
 %%DOCSDIR%%/%%DOCLANG%%/articles/rc-scripting/imagelib/callouts/8.png
 %%DOCSDIR%%/%%DOCLANG%%/articles/rc-scripting/imagelib/callouts/9.png
 %%DOCSDIR%%/%%DOCLANG%%/articles/relaydelay/docbook.css
-%%DOCSDIR%%/%%DOCLANG%%/articles/releng-packages/docbook.css
 %%DOCSDIR%%/%%DOCLANG%%/articles/releng/branches-head.png
 %%DOCSDIR%%/%%DOCLANG%%/articles/releng/branches-releng3.png
 %%DOCSDIR%%/%%DOCLANG%%/articles/releng/branches-releng4.png
@@ -85,12 +76,19 @@
 %%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/vinum/docbook.css
+%%DOCSDIR%%/%%DOCLANG%%/articles/vinum/vinum-concat.png
+%%DOCSDIR%%/%%DOCLANG%%/articles/vinum/vinum-mirrored-vol.png
+%%DOCSDIR%%/%%DOCLANG%%/articles/vinum/vinum-raid10-vol.png
+%%DOCSDIR%%/%%DOCLANG%%/articles/vinum/vinum-raid5-org.png
+%%DOCSDIR%%/%%DOCLANG%%/articles/vinum/vinum-simple-vol.png
+%%DOCSDIR%%/%%DOCLANG%%/articles/vinum/vinum-striped-vol.png
+%%DOCSDIR%%/%%DOCLANG%%/articles/vinum/vinum-striped.png
 %%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%%/books/arch-handbook/docbook.css
 %%DOCSDIR%%/%%DOCLANG%%/books/arch-handbook/imagelib/callouts/1.png
 %%DOCSDIR%%/%%DOCLANG%%/books/arch-handbook/imagelib/callouts/10.png
diff --git a/misc/freebsd-doc-en/pkg-plist.html-split b/misc/freebsd-doc-en/pkg-plist.html-split
index 0b0aff1d5daa..6ac72e9a38d4 100644
--- a/misc/freebsd-doc-en/pkg-plist.html-split
+++ b/misc/freebsd-doc-en/pkg-plist.html-split
@@ -18,6 +18,7 @@
 %%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/ar01s13.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/committers-guide/archs.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/committers-guide/bugzilla.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/committers-guide/commit-log-message.html
@@ -32,7 +33,6 @@
 %%DOCSDIR%%/%%DOCLANG%%/articles/committers-guide/misc.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/committers-guide/non-committers.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/committers-guide/people.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/committers-guide/perks.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/committers-guide/pgpkeys.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/committers-guide/ports.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/committers-guide/pref-license.html
@@ -41,38 +41,10 @@
 %%DOCSDIR%%/%%DOCLANG%%/articles/committers-guide/subversion-primer.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/committers-guide/tracking.license.grants.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/cabling.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/console-server/conserver-versions.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/console-server/freebsd.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/console-server/index.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/console-server/ix01.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/console-server/links.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/console-server/manpages.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/console-server/our-solution.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/console-server/possible-solutions.html
-%%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/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
-%%DOCSDIR%%/%%DOCLANG%%/articles/contributing-ports/index.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/contributing-ports/ix01.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%%/articles/contributing/ix01.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/contributing/ports-contributing.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/contributing/trademarks.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/contributors/contrib-386bsd.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/contributors/contrib-additional.html
@@ -91,28 +63,13 @@
 %%DOCSDIR%%/%%DOCLANG%%/articles/cups/printing-cups-configuring-printers.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/cups/printing-cups-configuring-server.html
 %%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/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/custom-gcc/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/files.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
-%%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/filtering-bridges-contributors.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/filtering-bridges/filtering-bridges-enabling.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/filtering-bridges/filtering-bridges-finalprep.html
@@ -177,11 +134,6 @@
 %%DOCSDIR%%/%%DOCLANG%%/articles/ipsec-must/kernel.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/ipsec-must/solution.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/laptop/trademarks.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/ldap-auth/client.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/ldap-auth/index.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/ldap-auth/ldap.html
@@ -189,14 +141,6 @@
 %%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/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/legalnotice.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
@@ -234,7 +178,6 @@
 %%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/p4-primer/Integrations.html
@@ -298,9 +241,6 @@
 %%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/ar01s02.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/releng-packages/index.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/releng-packages/trademarks.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/releng/ackno.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/releng/distribution.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/releng/extensibility.html
@@ -328,6 +268,14 @@
 %%DOCSDIR%%/%%DOCLANG%%/articles/solid-state/ro-fs.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/solid-state/strategies.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/solid-state/trademarks.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/vinum/index.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/vinum/vinum-access-bottlenecks.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/vinum/vinum-config.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/vinum/vinum-data-integrity.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/vinum/vinum-examples.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/vinum/vinum-object-naming.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/vinum/vinum-objects.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/vinum/vinum-root.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
@@ -339,11 +287,6 @@
 %%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/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/wp-toolbox/trademarks.html
 %%DOCSDIR%%/%%DOCLANG%%/books/arch-handbook/appendices.html
 %%DOCSDIR%%/%%DOCLANG%%/books/arch-handbook/bi01.html
 %%DOCSDIR%%/%%DOCLANG%%/books/arch-handbook/boot-bios.html
@@ -563,6 +506,7 @@
 %%DOCSDIR%%/%%DOCLANG%%/books/faq/compatibility-other.html
 %%DOCSDIR%%/%%DOCLANG%%/books/faq/compatibility-processors.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
@@ -720,6 +664,7 @@
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/dtrace-using.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/dtrace.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/editors.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/eresources-mail.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/eresources-news.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/eresources-web.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/eresources.html
@@ -854,7 +799,7 @@
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/security-accounting.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/security-advisories.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/security-intro.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/security-portaudit.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/security-pkg.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/security-resourcelimits.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/security.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/sendmail.html
@@ -889,6 +834,7 @@
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/virtualization-host-bhyve.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/virtualization-host-virtualbox.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/virtualization.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/x-compiz-fusion.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/x-config-quick-start.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/x-config.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/x-fonts.html
diff --git a/misc/freebsd-doc-en/pkg-plist.pdf b/misc/freebsd-doc-en/pkg-plist.pdf
index 0a36cd8bef22..0616b7794700 100644
--- a/misc/freebsd-doc-en/pkg-plist.pdf
+++ b/misc/freebsd-doc-en/pkg-plist.pdf
@@ -1,15 +1,10 @@
 %%DOCSDIR%%/%%DOCLANG%%/articles/bsdl-gpl/article.pdf
 %%DOCSDIR%%/%%DOCLANG%%/articles/building-products/article.pdf
 %%DOCSDIR%%/%%DOCLANG%%/articles/committers-guide/article.pdf
-%%DOCSDIR%%/%%DOCLANG%%/articles/compiz-fusion/article.pdf
-%%DOCSDIR%%/%%DOCLANG%%/articles/console-server/article.pdf
-%%DOCSDIR%%/%%DOCLANG%%/articles/contributing-ports/article.pdf
 %%DOCSDIR%%/%%DOCLANG%%/articles/contributing/article.pdf
 %%DOCSDIR%%/%%DOCLANG%%/articles/contributors/article.pdf
 %%DOCSDIR%%/%%DOCLANG%%/articles/cups/article.pdf
-%%DOCSDIR%%/%%DOCLANG%%/articles/custom-gcc/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/freebsd-questions/article.pdf
@@ -18,9 +13,7 @@
 %%DOCSDIR%%/%%DOCLANG%%/articles/gjournal-desktop/article.pdf
 %%DOCSDIR%%/%%DOCLANG%%/articles/hubs/article.pdf
 %%DOCSDIR%%/%%DOCLANG%%/articles/ipsec-must/article.pdf
-%%DOCSDIR%%/%%DOCLANG%%/articles/laptop/article.pdf
 %%DOCSDIR%%/%%DOCLANG%%/articles/ldap-auth/article.pdf
-%%DOCSDIR%%/%%DOCLANG%%/articles/linux-comparison/article.pdf
 %%DOCSDIR%%/%%DOCLANG%%/articles/linux-emulation/article.pdf
 %%DOCSDIR%%/%%DOCLANG%%/articles/linux-users/article.pdf
 %%DOCSDIR%%/%%DOCLANG%%/articles/mailing-list-faq/article.pdf
@@ -34,13 +27,12 @@
 %%DOCSDIR%%/%%DOCLANG%%/articles/problem-reports/article.pdf
 %%DOCSDIR%%/%%DOCLANG%%/articles/rc-scripting/article.pdf
 %%DOCSDIR%%/%%DOCLANG%%/articles/relaydelay/article.pdf
-%%DOCSDIR%%/%%DOCLANG%%/articles/releng-packages/article.pdf
 %%DOCSDIR%%/%%DOCLANG%%/articles/releng/article.pdf
 %%DOCSDIR%%/%%DOCLANG%%/articles/remote-install/article.pdf
 %%DOCSDIR%%/%%DOCLANG%%/articles/serial-uart/article.pdf
 %%DOCSDIR%%/%%DOCLANG%%/articles/solid-state/article.pdf
+%%DOCSDIR%%/%%DOCLANG%%/articles/vinum/article.pdf
 %%DOCSDIR%%/%%DOCLANG%%/articles/vm-design/article.pdf
-%%DOCSDIR%%/%%DOCLANG%%/articles/wp-toolbox/article.pdf
 %%DOCSDIR%%/%%DOCLANG%%/books/arch-handbook/book.pdf
 %%DOCSDIR%%/%%DOCLANG%%/books/design-44bsd/book.pdf
 %%DOCSDIR%%/%%DOCLANG%%/books/dev-model/book.pdf
diff --git a/misc/freebsd-doc-en/pkg-plist.ps b/misc/freebsd-doc-en/pkg-plist.ps
index 5ba6b91e3637..374d047357ee 100644
--- a/misc/freebsd-doc-en/pkg-plist.ps
+++ b/misc/freebsd-doc-en/pkg-plist.ps
@@ -1,15 +1,10 @@
 %%DOCSDIR%%/%%DOCLANG%%/articles/bsdl-gpl/article.ps
 %%DOCSDIR%%/%%DOCLANG%%/articles/building-products/article.ps
 %%DOCSDIR%%/%%DOCLANG%%/articles/committers-guide/article.ps
-%%DOCSDIR%%/%%DOCLANG%%/articles/compiz-fusion/article.ps
-%%DOCSDIR%%/%%DOCLANG%%/articles/console-server/article.ps
-%%DOCSDIR%%/%%DOCLANG%%/articles/contributing-ports/article.ps
 %%DOCSDIR%%/%%DOCLANG%%/articles/contributing/article.ps
 %%DOCSDIR%%/%%DOCLANG%%/articles/contributors/article.ps
 %%DOCSDIR%%/%%DOCLANG%%/articles/cups/article.ps
-%%DOCSDIR%%/%%DOCLANG%%/articles/custom-gcc/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/freebsd-questions/article.ps
@@ -18,9 +13,7 @@
 %%DOCSDIR%%/%%DOCLANG%%/articles/gjournal-desktop/article.ps
 %%DOCSDIR%%/%%DOCLANG%%/articles/hubs/article.ps
 %%DOCSDIR%%/%%DOCLANG%%/articles/ipsec-must/article.ps
-%%DOCSDIR%%/%%DOCLANG%%/articles/laptop/article.ps
 %%DOCSDIR%%/%%DOCLANG%%/articles/ldap-auth/article.ps
-%%DOCSDIR%%/%%DOCLANG%%/articles/linux-comparison/article.ps
 %%DOCSDIR%%/%%DOCLANG%%/articles/linux-emulation/article.ps
 %%DOCSDIR%%/%%DOCLANG%%/articles/linux-users/article.ps
 %%DOCSDIR%%/%%DOCLANG%%/articles/mailing-list-faq/article.ps
@@ -34,13 +27,12 @@
 %%DOCSDIR%%/%%DOCLANG%%/articles/problem-reports/article.ps
 %%DOCSDIR%%/%%DOCLANG%%/articles/rc-scripting/article.ps
 %%DOCSDIR%%/%%DOCLANG%%/articles/relaydelay/article.ps
-%%DOCSDIR%%/%%DOCLANG%%/articles/releng-packages/article.ps
 %%DOCSDIR%%/%%DOCLANG%%/articles/releng/article.ps
 %%DOCSDIR%%/%%DOCLANG%%/articles/remote-install/article.ps
 %%DOCSDIR%%/%%DOCLANG%%/articles/serial-uart/article.ps
 %%DOCSDIR%%/%%DOCLANG%%/articles/solid-state/article.ps
+%%DOCSDIR%%/%%DOCLANG%%/articles/vinum/article.ps
 %%DOCSDIR%%/%%DOCLANG%%/articles/vm-design/article.ps
-%%DOCSDIR%%/%%DOCLANG%%/articles/wp-toolbox/article.ps
 %%DOCSDIR%%/%%DOCLANG%%/books/arch-handbook/book.ps
 %%DOCSDIR%%/%%DOCLANG%%/books/design-44bsd/book.ps
 %%DOCSDIR%%/%%DOCLANG%%/books/dev-model/book.ps
diff --git a/misc/freebsd-doc-en/pkg-plist.txt b/misc/freebsd-doc-en/pkg-plist.txt
index a99aff6ad473..84a275a28d1a 100644
--- a/misc/freebsd-doc-en/pkg-plist.txt
+++ b/misc/freebsd-doc-en/pkg-plist.txt
@@ -1,15 +1,10 @@
 %%DOCSDIR%%/%%DOCLANG%%/articles/bsdl-gpl/article.txt
 %%DOCSDIR%%/%%DOCLANG%%/articles/building-products/article.txt
 %%DOCSDIR%%/%%DOCLANG%%/articles/committers-guide/article.txt
-%%DOCSDIR%%/%%DOCLANG%%/articles/compiz-fusion/article.txt
-%%DOCSDIR%%/%%DOCLANG%%/articles/console-server/article.txt
-%%DOCSDIR%%/%%DOCLANG%%/articles/contributing-ports/article.txt
 %%DOCSDIR%%/%%DOCLANG%%/articles/contributing/article.txt
 %%DOCSDIR%%/%%DOCLANG%%/articles/contributors/article.txt
 %%DOCSDIR%%/%%DOCLANG%%/articles/cups/article.txt
-%%DOCSDIR%%/%%DOCLANG%%/articles/custom-gcc/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/freebsd-questions/article.txt
@@ -20,9 +15,7 @@
 %%DOCSDIR%%/%%DOCLANG%%/articles/gjournal-desktop/article.txt
 %%DOCSDIR%%/%%DOCLANG%%/articles/hubs/article.txt
 %%DOCSDIR%%/%%DOCLANG%%/articles/ipsec-must/article.txt
-%%DOCSDIR%%/%%DOCLANG%%/articles/laptop/article.txt
 %%DOCSDIR%%/%%DOCLANG%%/articles/ldap-auth/article.txt
-%%DOCSDIR%%/%%DOCLANG%%/articles/linux-comparison/article.txt
 %%DOCSDIR%%/%%DOCLANG%%/articles/linux-emulation/article.txt
 %%DOCSDIR%%/%%DOCLANG%%/articles/linux-users/article.txt
 %%DOCSDIR%%/%%DOCLANG%%/articles/mailing-list-faq/article.txt
@@ -36,13 +29,12 @@
 %%DOCSDIR%%/%%DOCLANG%%/articles/problem-reports/article.txt
 %%DOCSDIR%%/%%DOCLANG%%/articles/rc-scripting/article.txt
 %%DOCSDIR%%/%%DOCLANG%%/articles/relaydelay/article.txt
-%%DOCSDIR%%/%%DOCLANG%%/articles/releng-packages/article.txt
 %%DOCSDIR%%/%%DOCLANG%%/articles/releng/article.txt
 %%DOCSDIR%%/%%DOCLANG%%/articles/remote-install/article.txt
 %%DOCSDIR%%/%%DOCLANG%%/articles/serial-uart/article.txt
 %%DOCSDIR%%/%%DOCLANG%%/articles/solid-state/article.txt
+%%DOCSDIR%%/%%DOCLANG%%/articles/vinum/article.txt
 %%DOCSDIR%%/%%DOCLANG%%/articles/vm-design/article.txt
-%%DOCSDIR%%/%%DOCLANG%%/articles/wp-toolbox/article.txt
 %%DOCSDIR%%/%%DOCLANG%%/books/arch-handbook/book.txt
 %%DOCSDIR%%/%%DOCLANG%%/books/design-44bsd/book.txt
 %%DOCSDIR%%/%%DOCLANG%%/books/dev-model/book.txt
diff --git a/misc/freebsd-doc-es/pkg-plist.html b/misc/freebsd-doc-es/pkg-plist.html
index d58ce4d782e2..b98ead06f388 100644
--- a/misc/freebsd-doc-es/pkg-plist.html
+++ b/misc/freebsd-doc-es/pkg-plist.html
@@ -1,11 +1,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/explaining-bsd/article.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/fbsd-from-scratch/article.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/fdp-es/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/mailing-list-faq/article.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/nanobsd/article.html
diff --git a/misc/freebsd-doc-es/pkg-plist.html-common b/misc/freebsd-doc-es/pkg-plist.html-common
index 69a9d4fc58a7..ef6f46ae1d78 100644
--- a/misc/freebsd-doc-es/pkg-plist.html-common
+++ b/misc/freebsd-doc-es/pkg-plist.html-common
@@ -1,11 +1,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/explaining-bsd/docbook.css
-%%DOCSDIR%%/%%DOCLANG%%/articles/fbsd-from-scratch/docbook.css
 %%DOCSDIR%%/%%DOCLANG%%/articles/fdp-es/docbook.css
-%%DOCSDIR%%/%%DOCLANG%%/articles/laptop/docbook.css
-%%DOCSDIR%%/%%DOCLANG%%/articles/linux-comparison/docbook.css
 %%DOCSDIR%%/%%DOCLANG%%/articles/linux-users/docbook.css
 %%DOCSDIR%%/%%DOCLANG%%/articles/mailing-list-faq/docbook.css
 %%DOCSDIR%%/%%DOCLANG%%/articles/nanobsd/docbook.css
diff --git a/misc/freebsd-doc-es/pkg-plist.html-split b/misc/freebsd-doc-es/pkg-plist.html-split
index 0d833a2449cf..2d2d7912b6f5 100644
--- a/misc/freebsd-doc-es/pkg-plist.html-split
+++ b/misc/freebsd-doc-es/pkg-plist.html-split
@@ -1,26 +1,10 @@
-%%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/contributing/ix01.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/cvs-freebsd/ar01s02.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/cvs-freebsd/freebsdspecific.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/cvs-freebsd/index.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/cvs-freebsd/trademarks.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd/ar01s02.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd/ar01s03.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd/ar01s04.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd/index.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
-%%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/why.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/fdp-es/ar01s02.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/fdp-es/ar01s03.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/fdp-es/ar01s04.html
@@ -32,19 +16,6 @@
 %%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/laptop/ar01s02.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/laptop/ar01s03.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/laptop/ar01s04.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/laptop/index.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
-%%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/legalnotice.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
diff --git a/misc/freebsd-doc-es/pkg-plist.pdf b/misc/freebsd-doc-es/pkg-plist.pdf
index 02e23444637c..e6f1bb49fad2 100644
--- a/misc/freebsd-doc-es/pkg-plist.pdf
+++ b/misc/freebsd-doc-es/pkg-plist.pdf
@@ -1,11 +1,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/explaining-bsd/article.pdf
-%%DOCSDIR%%/%%DOCLANG%%/articles/fbsd-from-scratch/article.pdf
 %%DOCSDIR%%/%%DOCLANG%%/articles/fdp-es/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/mailing-list-faq/article.pdf
 %%DOCSDIR%%/%%DOCLANG%%/articles/nanobsd/article.pdf
diff --git a/misc/freebsd-doc-es/pkg-plist.ps b/misc/freebsd-doc-es/pkg-plist.ps
index 3be87e1164ad..f75e89b2531a 100644
--- a/misc/freebsd-doc-es/pkg-plist.ps
+++ b/misc/freebsd-doc-es/pkg-plist.ps
@@ -1,11 +1,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/explaining-bsd/article.ps
-%%DOCSDIR%%/%%DOCLANG%%/articles/fbsd-from-scratch/article.ps
 %%DOCSDIR%%/%%DOCLANG%%/articles/fdp-es/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/mailing-list-faq/article.ps
 %%DOCSDIR%%/%%DOCLANG%%/articles/nanobsd/article.ps
diff --git a/misc/freebsd-doc-es/pkg-plist.txt b/misc/freebsd-doc-es/pkg-plist.txt
index 1ae9c1eaad1a..1231b4a70646 100644
--- a/misc/freebsd-doc-es/pkg-plist.txt
+++ b/misc/freebsd-doc-es/pkg-plist.txt
@@ -1,11 +1,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/explaining-bsd/article.txt
-%%DOCSDIR%%/%%DOCLANG%%/articles/fbsd-from-scratch/article.txt
 %%DOCSDIR%%/%%DOCLANG%%/articles/fdp-es/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/mailing-list-faq/article.txt
 %%DOCSDIR%%/%%DOCLANG%%/articles/nanobsd/article.txt
diff --git a/misc/freebsd-doc-fr/pkg-plist.html b/misc/freebsd-doc-fr/pkg-plist.html
index 23abcb91ee8b..bb1df625f588 100644
--- a/misc/freebsd-doc-fr/pkg-plist.html
+++ b/misc/freebsd-doc-fr/pkg-plist.html
@@ -1,21 +1,17 @@
 %%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/explaining-bsd/article.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/filtering-bridges/article.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/fonts/article.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/ipsec-must/article.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/laptop/article.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/linux-users/article.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/mh/article.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/nanobsd/article.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/new-users/article.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/pam/article.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/pr-guidelines/article.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/problem-reports/article.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/releng-packages/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-fr/pkg-plist.html-common b/misc/freebsd-doc-fr/pkg-plist.html-common
index 2a5885982cc1..3000154f5750 100644
--- a/misc/freebsd-doc-fr/pkg-plist.html-common
+++ b/misc/freebsd-doc-fr/pkg-plist.html-common
@@ -2,16 +2,13 @@
 %%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/explaining-bsd/docbook.css
 %%DOCSDIR%%/%%DOCLANG%%/articles/filtering-bridges/docbook.css
 %%DOCSDIR%%/%%DOCLANG%%/articles/fonts/docbook.css
 %%DOCSDIR%%/%%DOCLANG%%/articles/ipsec-must/docbook.css
-%%DOCSDIR%%/%%DOCLANG%%/articles/laptop/docbook.css
 %%DOCSDIR%%/%%DOCLANG%%/articles/linux-users/docbook.css
-%%DOCSDIR%%/%%DOCLANG%%/articles/mh/docbook.css
 %%DOCSDIR%%/%%DOCLANG%%/articles/nanobsd/docbook.css
 %%DOCSDIR%%/%%DOCLANG%%/articles/nanobsd/imagelib/callouts/1.png
 %%DOCSDIR%%/%%DOCLANG%%/articles/nanobsd/imagelib/callouts/2.png
@@ -21,7 +18,6 @@
 %%DOCSDIR%%/%%DOCLANG%%/articles/pam/docbook.css
 %%DOCSDIR%%/%%DOCLANG%%/articles/pr-guidelines/docbook.css
 %%DOCSDIR%%/%%DOCLANG%%/articles/problem-reports/docbook.css
-%%DOCSDIR%%/%%DOCLANG%%/articles/releng-packages/docbook.css
 %%DOCSDIR%%/%%DOCLANG%%/books/developers-handbook/docbook.css
 %%DOCSDIR%%/%%DOCLANG%%/books/faq/docbook.css
 %%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/docbook.css
diff --git a/misc/freebsd-doc-fr/pkg-plist.html-split b/misc/freebsd-doc-fr/pkg-plist.html-split
index 848c405567dd..8ef29a759ba5 100644
--- a/misc/freebsd-doc-fr/pkg-plist.html-split
+++ b/misc/freebsd-doc-fr/pkg-plist.html-split
@@ -13,16 +13,6 @@
 %%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/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/ix01.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%%/articles/contributing/ix01.html
@@ -69,10 +59,6 @@
 %%DOCSDIR%%/%%DOCLANG%%/articles/ipsec-must/ipsec-install.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/ipsec-must/kernel.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/ipsec-must/trademarks.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/laptop/ar01s02.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/laptop/ar01s03.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/laptop/ar01s04.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/laptop/index.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/linux-users/commands.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/linux-users/conclusion.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/linux-users/firewall.html
@@ -84,10 +70,6 @@
 %%DOCSDIR%%/%%DOCLANG%%/articles/linux-users/startup.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/linux-users/trademarks.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/linux-users/updates.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/mh/ar01s02.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/mh/ar01s03.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/mh/ar01s04.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/mh/index.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/nanobsd/howto.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/nanobsd/index.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/nanobsd/ix01.html
@@ -127,8 +109,6 @@
 %%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/releng-packages/ar01s02.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/releng-packages/index.html
 %%DOCSDIR%%/%%DOCLANG%%/books/developers-handbook/Basics.html
 %%DOCSDIR%%/%%DOCLANG%%/books/developers-handbook/afs.html
 %%DOCSDIR%%/%%DOCLANG%%/books/developers-handbook/alpha.html
diff --git a/misc/freebsd-doc-fr/pkg-plist.pdf b/misc/freebsd-doc-fr/pkg-plist.pdf
index f089b0652cc1..e2234830a6c4 100644
--- a/misc/freebsd-doc-fr/pkg-plist.pdf
+++ b/misc/freebsd-doc-fr/pkg-plist.pdf
@@ -1,21 +1,17 @@
 %%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/explaining-bsd/article.pdf
 %%DOCSDIR%%/%%DOCLANG%%/articles/filtering-bridges/article.pdf
 %%DOCSDIR%%/%%DOCLANG%%/articles/fonts/article.pdf
 %%DOCSDIR%%/%%DOCLANG%%/articles/ipsec-must/article.pdf
-%%DOCSDIR%%/%%DOCLANG%%/articles/laptop/article.pdf
 %%DOCSDIR%%/%%DOCLANG%%/articles/linux-users/article.pdf
-%%DOCSDIR%%/%%DOCLANG%%/articles/mh/article.pdf
 %%DOCSDIR%%/%%DOCLANG%%/articles/nanobsd/article.pdf
 %%DOCSDIR%%/%%DOCLANG%%/articles/new-users/article.pdf
 %%DOCSDIR%%/%%DOCLANG%%/articles/pam/article.pdf
 %%DOCSDIR%%/%%DOCLANG%%/articles/pr-guidelines/article.pdf
 %%DOCSDIR%%/%%DOCLANG%%/articles/problem-reports/article.pdf
-%%DOCSDIR%%/%%DOCLANG%%/articles/releng-packages/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-fr/pkg-plist.ps b/misc/freebsd-doc-fr/pkg-plist.ps
index 7d16049ceaa3..b72dfa3fb407 100644
--- a/misc/freebsd-doc-fr/pkg-plist.ps
+++ b/misc/freebsd-doc-fr/pkg-plist.ps
@@ -1,21 +1,17 @@
 %%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/explaining-bsd/article.ps
 %%DOCSDIR%%/%%DOCLANG%%/articles/filtering-bridges/article.ps
 %%DOCSDIR%%/%%DOCLANG%%/articles/fonts/article.ps
 %%DOCSDIR%%/%%DOCLANG%%/articles/ipsec-must/article.ps
-%%DOCSDIR%%/%%DOCLANG%%/articles/laptop/article.ps
 %%DOCSDIR%%/%%DOCLANG%%/articles/linux-users/article.ps
-%%DOCSDIR%%/%%DOCLANG%%/articles/mh/article.ps
 %%DOCSDIR%%/%%DOCLANG%%/articles/nanobsd/article.ps
 %%DOCSDIR%%/%%DOCLANG%%/articles/new-users/article.ps
 %%DOCSDIR%%/%%DOCLANG%%/articles/pam/article.ps
 %%DOCSDIR%%/%%DOCLANG%%/articles/pr-guidelines/article.ps
 %%DOCSDIR%%/%%DOCLANG%%/articles/problem-reports/article.ps
-%%DOCSDIR%%/%%DOCLANG%%/articles/releng-packages/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-fr/pkg-plist.txt b/misc/freebsd-doc-fr/pkg-plist.txt
index 7afbe86056ce..b0b7e4d801a5 100644
--- a/misc/freebsd-doc-fr/pkg-plist.txt
+++ b/misc/freebsd-doc-fr/pkg-plist.txt
@@ -1,21 +1,17 @@
 %%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/explaining-bsd/article.txt
 %%DOCSDIR%%/%%DOCLANG%%/articles/filtering-bridges/article.txt
 %%DOCSDIR%%/%%DOCLANG%%/articles/fonts/article.txt
 %%DOCSDIR%%/%%DOCLANG%%/articles/ipsec-must/article.txt
-%%DOCSDIR%%/%%DOCLANG%%/articles/laptop/article.txt
 %%DOCSDIR%%/%%DOCLANG%%/articles/linux-users/article.txt
-%%DOCSDIR%%/%%DOCLANG%%/articles/mh/article.txt
 %%DOCSDIR%%/%%DOCLANG%%/articles/nanobsd/article.txt
 %%DOCSDIR%%/%%DOCLANG%%/articles/new-users/article.txt
 %%DOCSDIR%%/%%DOCLANG%%/articles/pam/article.txt
 %%DOCSDIR%%/%%DOCLANG%%/articles/pr-guidelines/article.txt
 %%DOCSDIR%%/%%DOCLANG%%/articles/problem-reports/article.txt
-%%DOCSDIR%%/%%DOCLANG%%/articles/releng-packages/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-hu/pkg-plist.html b/misc/freebsd-doc-hu/pkg-plist.html
index 8828ae787483..5397e7a5e70c 100644
--- a/misc/freebsd-doc-hu/pkg-plist.html
+++ b/misc/freebsd-doc-hu/pkg-plist.html
@@ -1,9 +1,6 @@
-%%DOCSDIR%%/%%DOCLANG%%/articles/compiz-fusion/article.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/cups/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%%/books/faq/book.html
 %%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/book.html
diff --git a/misc/freebsd-doc-hu/pkg-plist.html-common b/misc/freebsd-doc-hu/pkg-plist.html-common
index 55f7e7875ffc..b8181cb1c596 100644
--- a/misc/freebsd-doc-hu/pkg-plist.html-common
+++ b/misc/freebsd-doc-hu/pkg-plist.html-common
@@ -1,11 +1,8 @@
-%%DOCSDIR%%/%%DOCLANG%%/articles/compiz-fusion/docbook.css
 %%DOCSDIR%%/%%DOCLANG%%/articles/cups/docbook.css
 %%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd/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/laptop/docbook.css
-%%DOCSDIR%%/%%DOCLANG%%/articles/linux-comparison/docbook.css
 %%DOCSDIR%%/%%DOCLANG%%/articles/linux-users/docbook.css
 %%DOCSDIR%%/%%DOCLANG%%/books/faq/docbook.css
 %%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/docbook.css
diff --git a/misc/freebsd-doc-hu/pkg-plist.html-split b/misc/freebsd-doc-hu/pkg-plist.html-split
index 03e9f3db6775..4753e3523cd5 100644
--- a/misc/freebsd-doc-hu/pkg-plist.html-split
+++ b/misc/freebsd-doc-hu/pkg-plist.html-split
@@ -1,9 +1,3 @@
-%%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/index.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/cups/ix01.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/cups/printing-cups-clients.html
@@ -25,20 +19,6 @@
 %%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/index.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/laptop/modems.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/laptop/pcmcia.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/laptop/power-management.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
-%%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/legalnotice.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
diff --git a/misc/freebsd-doc-hu/pkg-plist.pdf b/misc/freebsd-doc-hu/pkg-plist.pdf
index 542580ff27d0..4535d017e213 100644
--- a/misc/freebsd-doc-hu/pkg-plist.pdf
+++ b/misc/freebsd-doc-hu/pkg-plist.pdf
@@ -1,9 +1,6 @@
-%%DOCSDIR%%/%%DOCLANG%%/articles/compiz-fusion/article.pdf
 %%DOCSDIR%%/%%DOCLANG%%/articles/cups/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%%/books/faq/book.pdf
 %%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/book.pdf
diff --git a/misc/freebsd-doc-hu/pkg-plist.ps b/misc/freebsd-doc-hu/pkg-plist.ps
index dbe6f9c45020..d4970425faaf 100644
--- a/misc/freebsd-doc-hu/pkg-plist.ps
+++ b/misc/freebsd-doc-hu/pkg-plist.ps
@@ -1,9 +1,6 @@
-%%DOCSDIR%%/%%DOCLANG%%/articles/compiz-fusion/article.ps
 %%DOCSDIR%%/%%DOCLANG%%/articles/cups/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%%/books/faq/book.ps
 %%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/book.ps
diff --git a/misc/freebsd-doc-hu/pkg-plist.txt b/misc/freebsd-doc-hu/pkg-plist.txt
index e9249c33462b..5c20f0504580 100644
--- a/misc/freebsd-doc-hu/pkg-plist.txt
+++ b/misc/freebsd-doc-hu/pkg-plist.txt
@@ -1,9 +1,6 @@
-%%DOCSDIR%%/%%DOCLANG%%/articles/compiz-fusion/article.txt
 %%DOCSDIR%%/%%DOCLANG%%/articles/cups/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%%/books/faq/book.txt
 %%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/book.txt
diff --git a/misc/freebsd-doc-ja/pkg-plist.html b/misc/freebsd-doc-ja/pkg-plist.html
index 1d37a24a8a17..5558990e01c2 100644
--- a/misc/freebsd-doc-ja/pkg-plist.html
+++ b/misc/freebsd-doc-ja/pkg-plist.html
@@ -1,6 +1,5 @@
 %%DOCSDIR%%/%%DOCLANG%%/articles/contributing/article.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/contributors/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/problem-reports/article.html
diff --git a/misc/freebsd-doc-ja/pkg-plist.html-common b/misc/freebsd-doc-ja/pkg-plist.html-common
index b3f32abb0e4d..d5c253251c97 100644
--- a/misc/freebsd-doc-ja/pkg-plist.html-common
+++ b/misc/freebsd-doc-ja/pkg-plist.html-common
@@ -1,6 +1,5 @@
 %%DOCSDIR%%/%%DOCLANG%%/articles/contributing/docbook.css
 %%DOCSDIR%%/%%DOCLANG%%/articles/contributors/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/problem-reports/docbook.css
diff --git a/misc/freebsd-doc-ja/pkg-plist.html-split b/misc/freebsd-doc-ja/pkg-plist.html-split
index 88b8308a0d6c..169faee68247 100644
--- a/misc/freebsd-doc-ja/pkg-plist.html-split
+++ b/misc/freebsd-doc-ja/pkg-plist.html-split
@@ -13,15 +13,6 @@
 %%DOCSDIR%%/%%DOCLANG%%/articles/contributors/ix01.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/contributors/staff-committers.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
-%%DOCSDIR%%/%%DOCLANG%%/articles/fbsd-from-scratch/prerequisites.html
-%%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/additional-questions.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/fonts/convert-truetype.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/fonts/font-formats.html
@@ -241,6 +232,7 @@
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/ports-finding-applications.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/ports-nextsteps.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/ports-overview.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/ports-poudriere.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/ports-using.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/ports.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/ppp-and-slip.html
diff --git a/misc/freebsd-doc-ja/pkg-plist.pdf b/misc/freebsd-doc-ja/pkg-plist.pdf
index f3abd65cb726..6026050f8660 100644
--- a/misc/freebsd-doc-ja/pkg-plist.pdf
+++ b/misc/freebsd-doc-ja/pkg-plist.pdf
@@ -1,6 +1,5 @@
 %%DOCSDIR%%/%%DOCLANG%%/articles/contributing/article.pdf
 %%DOCSDIR%%/%%DOCLANG%%/articles/contributors/article.pdf
-%%DOCSDIR%%/%%DOCLANG%%/articles/fbsd-from-scratch/article.pdf
 %%DOCSDIR%%/%%DOCLANG%%/articles/fonts/article.pdf
 %%DOCSDIR%%/%%DOCLANG%%/articles/ipsec-must/article.pdf
 %%DOCSDIR%%/%%DOCLANG%%/articles/problem-reports/article.pdf
diff --git a/misc/freebsd-doc-ja/pkg-plist.ps b/misc/freebsd-doc-ja/pkg-plist.ps
index eb75f8367b57..1cb30acfb893 100644
--- a/misc/freebsd-doc-ja/pkg-plist.ps
+++ b/misc/freebsd-doc-ja/pkg-plist.ps
@@ -1,6 +1,5 @@
 %%DOCSDIR%%/%%DOCLANG%%/articles/contributing/article.ps
 %%DOCSDIR%%/%%DOCLANG%%/articles/contributors/article.ps
-%%DOCSDIR%%/%%DOCLANG%%/articles/fbsd-from-scratch/article.ps
 %%DOCSDIR%%/%%DOCLANG%%/articles/fonts/article.ps
 %%DOCSDIR%%/%%DOCLANG%%/articles/ipsec-must/article.ps
 %%DOCSDIR%%/%%DOCLANG%%/articles/problem-reports/article.ps
diff --git a/misc/freebsd-doc-ja/pkg-plist.txt b/misc/freebsd-doc-ja/pkg-plist.txt
index e958b897ceb6..7f7549e9b8b0 100644
--- a/misc/freebsd-doc-ja/pkg-plist.txt
+++ b/misc/freebsd-doc-ja/pkg-plist.txt
@@ -1,6 +1,5 @@
 %%DOCSDIR%%/%%DOCLANG%%/articles/contributing/article.txt
 %%DOCSDIR%%/%%DOCLANG%%/articles/contributors/article.txt
-%%DOCSDIR%%/%%DOCLANG%%/articles/fbsd-from-scratch/article.txt
 %%DOCSDIR%%/%%DOCLANG%%/articles/fonts/article.txt
 %%DOCSDIR%%/%%DOCLANG%%/articles/ipsec-must/article.txt
 %%DOCSDIR%%/%%DOCLANG%%/articles/problem-reports/article.txt
diff --git a/misc/freebsd-doc-nl/pkg-plist.html b/misc/freebsd-doc-nl/pkg-plist.html
index f0abde102c7d..3b35ed19242e 100644
--- a/misc/freebsd-doc-nl/pkg-plist.html
+++ b/misc/freebsd-doc-nl/pkg-plist.html
@@ -1,4 +1,3 @@
-%%DOCSDIR%%/%%DOCLANG%%/articles/contributing-ports/article.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/contributing/article.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd/article.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/problem-reports/article.html
diff --git a/misc/freebsd-doc-nl/pkg-plist.html-common b/misc/freebsd-doc-nl/pkg-plist.html-common
index 925f21565eb2..adece1a73707 100644
--- a/misc/freebsd-doc-nl/pkg-plist.html-common
+++ b/misc/freebsd-doc-nl/pkg-plist.html-common
@@ -1,4 +1,3 @@
-%%DOCSDIR%%/%%DOCLANG%%/articles/contributing-ports/docbook.css
 %%DOCSDIR%%/%%DOCLANG%%/articles/contributing/docbook.css
 %%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd/docbook.css
 %%DOCSDIR%%/%%DOCLANG%%/articles/problem-reports/docbook.css
diff --git a/misc/freebsd-doc-nl/pkg-plist.html-split b/misc/freebsd-doc-nl/pkg-plist.html-split
index 2faf594f3f32..5e597be467a8 100644
--- a/misc/freebsd-doc-nl/pkg-plist.html-split
+++ b/misc/freebsd-doc-nl/pkg-plist.html-split
@@ -1,13 +1,3 @@
-%%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/ix01.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%%/articles/contributing/ix01.html
diff --git a/misc/freebsd-doc-nl/pkg-plist.pdf b/misc/freebsd-doc-nl/pkg-plist.pdf
index 8657a4c22337..859615832ccd 100644
--- a/misc/freebsd-doc-nl/pkg-plist.pdf
+++ b/misc/freebsd-doc-nl/pkg-plist.pdf
@@ -1,4 +1,3 @@
-%%DOCSDIR%%/%%DOCLANG%%/articles/contributing-ports/article.pdf
 %%DOCSDIR%%/%%DOCLANG%%/articles/contributing/article.pdf
 %%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd/article.pdf
 %%DOCSDIR%%/%%DOCLANG%%/articles/problem-reports/article.pdf
diff --git a/misc/freebsd-doc-nl/pkg-plist.ps b/misc/freebsd-doc-nl/pkg-plist.ps
index e00bf5099cbe..050b34040401 100644
--- a/misc/freebsd-doc-nl/pkg-plist.ps
+++ b/misc/freebsd-doc-nl/pkg-plist.ps
@@ -1,4 +1,3 @@
-%%DOCSDIR%%/%%DOCLANG%%/articles/contributing-ports/article.ps
 %%DOCSDIR%%/%%DOCLANG%%/articles/contributing/article.ps
 %%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd/article.ps
 %%DOCSDIR%%/%%DOCLANG%%/articles/problem-reports/article.ps
diff --git a/misc/freebsd-doc-nl/pkg-plist.txt b/misc/freebsd-doc-nl/pkg-plist.txt
index c60b0b4bae28..13de02612df6 100644
--- a/misc/freebsd-doc-nl/pkg-plist.txt
+++ b/misc/freebsd-doc-nl/pkg-plist.txt
@@ -1,4 +1,3 @@
-%%DOCSDIR%%/%%DOCLANG%%/articles/contributing-ports/article.txt
 %%DOCSDIR%%/%%DOCLANG%%/articles/contributing/article.txt
 %%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd/article.txt
 %%DOCSDIR%%/%%DOCLANG%%/articles/problem-reports/article.txt
diff --git a/misc/freebsd-doc-pt/pkg-plist.html b/misc/freebsd-doc-pt/pkg-plist.html
index 2713aca79094..a31188e169c5 100644
--- a/misc/freebsd-doc-pt/pkg-plist.html
+++ b/misc/freebsd-doc-pt/pkg-plist.html
@@ -1,5 +1,4 @@
 %%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
@@ -7,7 +6,6 @@
 %%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 5c030334c94f..e1ff894373ee 100644
--- a/misc/freebsd-doc-pt/pkg-plist.html-common
+++ b/misc/freebsd-doc-pt/pkg-plist.html-common
@@ -1,7 +1,6 @@
 %%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
@@ -14,7 +13,6 @@
 %%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
diff --git a/misc/freebsd-doc-pt/pkg-plist.html-split b/misc/freebsd-doc-pt/pkg-plist.html-split
index 3b2fd1da314e..74133a715550 100644
--- a/misc/freebsd-doc-pt/pkg-plist.html-split
+++ b/misc/freebsd-doc-pt/pkg-plist.html-split
@@ -4,16 +4,6 @@
 %%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/ix01.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%%/articles/contributing/ix01.html
@@ -70,26 +60,6 @@
 %%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/ix01.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/problem-reports/pr-followup.html
diff --git a/misc/freebsd-doc-pt/pkg-plist.pdf b/misc/freebsd-doc-pt/pkg-plist.pdf
index 938568e3f852..a9d5e8bd1e8b 100644
--- a/misc/freebsd-doc-pt/pkg-plist.pdf
+++ b/misc/freebsd-doc-pt/pkg-plist.pdf
@@ -1,5 +1,4 @@
 %%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
@@ -7,7 +6,6 @@
 %%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 712f2a3d6502..0ccfdd3dcf9a 100644
--- a/misc/freebsd-doc-pt/pkg-plist.ps
+++ b/misc/freebsd-doc-pt/pkg-plist.ps
@@ -1,5 +1,4 @@
 %%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
@@ -7,7 +6,6 @@
 %%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 d217beda9dd6..54644621bee1 100644
--- a/misc/freebsd-doc-pt/pkg-plist.txt
+++ b/misc/freebsd-doc-pt/pkg-plist.txt
@@ -1,5 +1,4 @@
 %%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
@@ -9,7 +8,6 @@
 %%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.html b/misc/freebsd-doc-ru/pkg-plist.html
index 7010266a2c1a..2877f7b2206c 100644
--- a/misc/freebsd-doc-ru/pkg-plist.html
+++ b/misc/freebsd-doc-ru/pkg-plist.html
@@ -1,28 +1,19 @@
 %%DOCSDIR%%/%%DOCLANG%%/articles/committers-guide/article.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/console-server/article.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/contributing/article.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/cups/article.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/custom-gcc/article.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/cvs-freebsd/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/freebsd-questions/article.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/geom-class/article.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/gjournal-desktop/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/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/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/vm-design/article.html
diff --git a/misc/freebsd-doc-ru/pkg-plist.html-common b/misc/freebsd-doc-ru/pkg-plist.html-common
index c4f3e381de80..09e297f18a29 100644
--- a/misc/freebsd-doc-ru/pkg-plist.html-common
+++ b/misc/freebsd-doc-ru/pkg-plist.html-common
@@ -1,12 +1,7 @@
 %%DOCSDIR%%/%%DOCLANG%%/articles/committers-guide/docbook.css
-%%DOCSDIR%%/%%DOCLANG%%/articles/console-server/docbook.css
-%%DOCSDIR%%/%%DOCLANG%%/articles/console-server/tk0231-9-1.png
 %%DOCSDIR%%/%%DOCLANG%%/articles/contributing/docbook.css
 %%DOCSDIR%%/%%DOCLANG%%/articles/cups/docbook.css
-%%DOCSDIR%%/%%DOCLANG%%/articles/custom-gcc/docbook.css
-%%DOCSDIR%%/%%DOCLANG%%/articles/cvs-freebsd/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/freebsd-questions/docbook.css
 %%DOCSDIR%%/%%DOCLANG%%/articles/geom-class/docbook.css
@@ -15,17 +10,12 @@
 %%DOCSDIR%%/%%DOCLANG%%/articles/gjournal-desktop/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/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/relaydelay/docbook.css
-%%DOCSDIR%%/%%DOCLANG%%/articles/releng-packages/docbook.css
 %%DOCSDIR%%/%%DOCLANG%%/articles/releng/branches-head.png
 %%DOCSDIR%%/%%DOCLANG%%/articles/releng/branches-releng3.png
 %%DOCSDIR%%/%%DOCLANG%%/articles/releng/branches-releng4.png
diff --git a/misc/freebsd-doc-ru/pkg-plist.html-split b/misc/freebsd-doc-ru/pkg-plist.html-split
index 4ed56e13d25b..35c2e46a0f55 100644
--- a/misc/freebsd-doc-ru/pkg-plist.html-split
+++ b/misc/freebsd-doc-ru/pkg-plist.html-split
@@ -13,19 +13,6 @@
 %%DOCSDIR%%/%%DOCLANG%%/articles/committers-guide/rules.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/committers-guide/ssh.guide.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
-%%DOCSDIR%%/%%DOCLANG%%/articles/console-server/index.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/console-server/ix01.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/console-server/links.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/console-server/manpages.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/console-server/our-solution.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/console-server/possible-solutions.html
-%%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/console-server/trademarks.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/contributing/contrib-how.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/contributing/index.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/contributing/ix01.html
@@ -39,29 +26,11 @@
 %%DOCSDIR%%/%%DOCLANG%%/articles/cups/printing-cups-ports-knobs.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/cups/printing-cups-troubleshooting.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/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/cvs-freebsd/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/files.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
-%%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/additional-questions.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/fonts/convert-truetype.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/fonts/font-formats.html
@@ -111,29 +80,11 @@
 %%DOCSDIR%%/%%DOCLANG%%/articles/ipsec-must/kernel.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/ipsec-must/solution.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/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/legalnotice.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/ar01s02.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/mh/ar01s03.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/mh/ar01s04.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/mh/index.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/mh/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
@@ -159,17 +110,6 @@
 %%DOCSDIR%%/%%DOCLANG%%/articles/pam/pam-sample-module.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/pam/pam-terms.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/pam/trademarks.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/portbuild/anatomy.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/portbuild/expbuilds.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/portbuild/index.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/portbuild/interrupting.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/portbuild/management.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/portbuild/monitoring.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/pr-guidelines/index.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/pr-guidelines/pr-lifecycle.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/pr-guidelines/pr-states.html
@@ -186,9 +126,6 @@
 %%DOCSDIR%%/%%DOCLANG%%/articles/problem-reports/pr-writing.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/problem-reports/trademarks.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/relaydelay/index.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/releng-packages/ar01s02.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/releng-packages/index.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/releng-packages/trademarks.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/releng/ackno.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/releng/biblio.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/releng/distribution.html
diff --git a/misc/freebsd-doc-ru/pkg-plist.pdf b/misc/freebsd-doc-ru/pkg-plist.pdf
index ef3b1f76b24f..31ca857bbfdb 100644
--- a/misc/freebsd-doc-ru/pkg-plist.pdf
+++ b/misc/freebsd-doc-ru/pkg-plist.pdf
@@ -1,28 +1,19 @@
 %%DOCSDIR%%/%%DOCLANG%%/articles/committers-guide/article.pdf
-%%DOCSDIR%%/%%DOCLANG%%/articles/console-server/article.pdf
 %%DOCSDIR%%/%%DOCLANG%%/articles/contributing/article.pdf
 %%DOCSDIR%%/%%DOCLANG%%/articles/cups/article.pdf
-%%DOCSDIR%%/%%DOCLANG%%/articles/custom-gcc/article.pdf
-%%DOCSDIR%%/%%DOCLANG%%/articles/cvs-freebsd/article.pdf
 %%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd/article.pdf
-%%DOCSDIR%%/%%DOCLANG%%/articles/fbsd-from-scratch/article.pdf
 %%DOCSDIR%%/%%DOCLANG%%/articles/fonts/article.pdf
 %%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-questions/article.pdf
 %%DOCSDIR%%/%%DOCLANG%%/articles/geom-class/article.pdf
 %%DOCSDIR%%/%%DOCLANG%%/articles/gjournal-desktop/article.pdf
 %%DOCSDIR%%/%%DOCLANG%%/articles/hubs/article.pdf
 %%DOCSDIR%%/%%DOCLANG%%/articles/ipsec-must/article.pdf
-%%DOCSDIR%%/%%DOCLANG%%/articles/laptop/article.pdf
-%%DOCSDIR%%/%%DOCLANG%%/articles/linux-comparison/article.pdf
 %%DOCSDIR%%/%%DOCLANG%%/articles/mailing-list-faq/article.pdf
-%%DOCSDIR%%/%%DOCLANG%%/articles/mh/article.pdf
 %%DOCSDIR%%/%%DOCLANG%%/articles/new-users/article.pdf
 %%DOCSDIR%%/%%DOCLANG%%/articles/pam/article.pdf
-%%DOCSDIR%%/%%DOCLANG%%/articles/portbuild/article.pdf
 %%DOCSDIR%%/%%DOCLANG%%/articles/pr-guidelines/article.pdf
 %%DOCSDIR%%/%%DOCLANG%%/articles/problem-reports/article.pdf
 %%DOCSDIR%%/%%DOCLANG%%/articles/relaydelay/article.pdf
-%%DOCSDIR%%/%%DOCLANG%%/articles/releng-packages/article.pdf
 %%DOCSDIR%%/%%DOCLANG%%/articles/releng/article.pdf
 %%DOCSDIR%%/%%DOCLANG%%/articles/solid-state/article.pdf
 %%DOCSDIR%%/%%DOCLANG%%/articles/vm-design/article.pdf
diff --git a/misc/freebsd-doc-ru/pkg-plist.ps b/misc/freebsd-doc-ru/pkg-plist.ps
index d45817509777..eefc627074d1 100644
--- a/misc/freebsd-doc-ru/pkg-plist.ps
+++ b/misc/freebsd-doc-ru/pkg-plist.ps
@@ -1,28 +1,19 @@
 %%DOCSDIR%%/%%DOCLANG%%/articles/committers-guide/article.ps
-%%DOCSDIR%%/%%DOCLANG%%/articles/console-server/article.ps
 %%DOCSDIR%%/%%DOCLANG%%/articles/contributing/article.ps
 %%DOCSDIR%%/%%DOCLANG%%/articles/cups/article.ps
-%%DOCSDIR%%/%%DOCLANG%%/articles/custom-gcc/article.ps
-%%DOCSDIR%%/%%DOCLANG%%/articles/cvs-freebsd/article.ps
 %%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd/article.ps
-%%DOCSDIR%%/%%DOCLANG%%/articles/fbsd-from-scratch/article.ps
 %%DOCSDIR%%/%%DOCLANG%%/articles/fonts/article.ps
 %%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-questions/article.ps
 %%DOCSDIR%%/%%DOCLANG%%/articles/geom-class/article.ps
 %%DOCSDIR%%/%%DOCLANG%%/articles/gjournal-desktop/article.ps
 %%DOCSDIR%%/%%DOCLANG%%/articles/hubs/article.ps
 %%DOCSDIR%%/%%DOCLANG%%/articles/ipsec-must/article.ps
-%%DOCSDIR%%/%%DOCLANG%%/articles/laptop/article.ps
-%%DOCSDIR%%/%%DOCLANG%%/articles/linux-comparison/article.ps
 %%DOCSDIR%%/%%DOCLANG%%/articles/mailing-list-faq/article.ps
-%%DOCSDIR%%/%%DOCLANG%%/articles/mh/article.ps
 %%DOCSDIR%%/%%DOCLANG%%/articles/new-users/article.ps
 %%DOCSDIR%%/%%DOCLANG%%/articles/pam/article.ps
-%%DOCSDIR%%/%%DOCLANG%%/articles/portbuild/article.ps
 %%DOCSDIR%%/%%DOCLANG%%/articles/pr-guidelines/article.ps
 %%DOCSDIR%%/%%DOCLANG%%/articles/problem-reports/article.ps
 %%DOCSDIR%%/%%DOCLANG%%/articles/relaydelay/article.ps
-%%DOCSDIR%%/%%DOCLANG%%/articles/releng-packages/article.ps
 %%DOCSDIR%%/%%DOCLANG%%/articles/releng/article.ps
 %%DOCSDIR%%/%%DOCLANG%%/articles/solid-state/article.ps
 %%DOCSDIR%%/%%DOCLANG%%/articles/vm-design/article.ps
diff --git a/misc/freebsd-doc-ru/pkg-plist.txt b/misc/freebsd-doc-ru/pkg-plist.txt
index 0f37e64a21b9..5f567c387520 100644
--- a/misc/freebsd-doc-ru/pkg-plist.txt
+++ b/misc/freebsd-doc-ru/pkg-plist.txt
@@ -1,28 +1,19 @@
 %%DOCSDIR%%/%%DOCLANG%%/articles/committers-guide/article.txt
-%%DOCSDIR%%/%%DOCLANG%%/articles/console-server/article.txt
 %%DOCSDIR%%/%%DOCLANG%%/articles/contributing/article.txt
 %%DOCSDIR%%/%%DOCLANG%%/articles/cups/article.txt
-%%DOCSDIR%%/%%DOCLANG%%/articles/custom-gcc/article.txt
-%%DOCSDIR%%/%%DOCLANG%%/articles/cvs-freebsd/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/freebsd-questions/article.txt
 %%DOCSDIR%%/%%DOCLANG%%/articles/geom-class/article.txt
 %%DOCSDIR%%/%%DOCLANG%%/articles/gjournal-desktop/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/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/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/vm-design/article.txt
diff --git a/misc/freebsd-doc-zh_cn/pkg-plist.html b/misc/freebsd-doc-zh_cn/pkg-plist.html
index 24b40fc4d8a8..1b00f83ec7b0 100644
--- a/misc/freebsd-doc-zh_cn/pkg-plist.html
+++ b/misc/freebsd-doc-zh_cn/pkg-plist.html
@@ -1,5 +1,4 @@
 %%DOCSDIR%%/%%DOCLANG%%/articles/contributing/article.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/cvs-freebsd/article.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/linux-users/article.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/nanobsd/article.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/rc-scripting/article.html
diff --git a/misc/freebsd-doc-zh_cn/pkg-plist.html-common b/misc/freebsd-doc-zh_cn/pkg-plist.html-common
index 1cc5da40517b..4e62ee9b9dcb 100644
--- a/misc/freebsd-doc-zh_cn/pkg-plist.html-common
+++ b/misc/freebsd-doc-zh_cn/pkg-plist.html-common
@@ -1,5 +1,4 @@
 %%DOCSDIR%%/%%DOCLANG%%/articles/contributing/docbook.css
-%%DOCSDIR%%/%%DOCLANG%%/articles/cvs-freebsd/docbook.css
 %%DOCSDIR%%/%%DOCLANG%%/articles/linux-users/docbook.css
 %%DOCSDIR%%/%%DOCLANG%%/articles/nanobsd/docbook.css
 %%DOCSDIR%%/%%DOCLANG%%/articles/nanobsd/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 cdebb607d2ed..61d6237e8891 100644
--- a/misc/freebsd-doc-zh_cn/pkg-plist.html-split
+++ b/misc/freebsd-doc-zh_cn/pkg-plist.html-split
@@ -2,10 +2,6 @@
 %%DOCSDIR%%/%%DOCLANG%%/articles/contributing/index.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/contributing/ix01.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/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
diff --git a/misc/freebsd-doc-zh_cn/pkg-plist.pdf b/misc/freebsd-doc-zh_cn/pkg-plist.pdf
index ab0781646939..fc126abb32a0 100644
--- a/misc/freebsd-doc-zh_cn/pkg-plist.pdf
+++ b/misc/freebsd-doc-zh_cn/pkg-plist.pdf
@@ -1,5 +1,4 @@
 %%DOCSDIR%%/%%DOCLANG%%/articles/contributing/article.pdf
-%%DOCSDIR%%/%%DOCLANG%%/articles/cvs-freebsd/article.pdf
 %%DOCSDIR%%/%%DOCLANG%%/articles/linux-users/article.pdf
 %%DOCSDIR%%/%%DOCLANG%%/articles/nanobsd/article.pdf
 %%DOCSDIR%%/%%DOCLANG%%/articles/rc-scripting/article.pdf
diff --git a/misc/freebsd-doc-zh_cn/pkg-plist.ps b/misc/freebsd-doc-zh_cn/pkg-plist.ps
index 679e5b865daf..8d0f328b8366 100644
--- a/misc/freebsd-doc-zh_cn/pkg-plist.ps
+++ b/misc/freebsd-doc-zh_cn/pkg-plist.ps
@@ -1,5 +1,4 @@
 %%DOCSDIR%%/%%DOCLANG%%/articles/contributing/article.ps
-%%DOCSDIR%%/%%DOCLANG%%/articles/cvs-freebsd/article.ps
 %%DOCSDIR%%/%%DOCLANG%%/articles/linux-users/article.ps
 %%DOCSDIR%%/%%DOCLANG%%/articles/nanobsd/article.ps
 %%DOCSDIR%%/%%DOCLANG%%/articles/rc-scripting/article.ps
diff --git a/misc/freebsd-doc-zh_cn/pkg-plist.txt b/misc/freebsd-doc-zh_cn/pkg-plist.txt
index 3ec135ac6cb2..b1e7b6783881 100644
--- a/misc/freebsd-doc-zh_cn/pkg-plist.txt
+++ b/misc/freebsd-doc-zh_cn/pkg-plist.txt
@@ -1,5 +1,4 @@
 %%DOCSDIR%%/%%DOCLANG%%/articles/contributing/article.txt
-%%DOCSDIR%%/%%DOCLANG%%/articles/cvs-freebsd/article.txt
 %%DOCSDIR%%/%%DOCLANG%%/articles/linux-users/article.txt
 %%DOCSDIR%%/%%DOCLANG%%/articles/nanobsd/article.txt
 %%DOCSDIR%%/%%DOCLANG%%/articles/rc-scripting/article.txt
diff --git a/misc/freebsd-doc-zh_tw/pkg-plist.html b/misc/freebsd-doc-zh_tw/pkg-plist.html
index cc84b7d0e600..5b14a503c945 100644
--- a/misc/freebsd-doc-zh_tw/pkg-plist.html
+++ b/misc/freebsd-doc-zh_tw/pkg-plist.html
@@ -1,5 +1,4 @@
 %%DOCSDIR%%/%%DOCLANG%%/articles/contributing/article.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/cvs-freebsd/article.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-questions/article.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/hubs/article.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/mailing-list-faq/article.html
diff --git a/misc/freebsd-doc-zh_tw/pkg-plist.html-common b/misc/freebsd-doc-zh_tw/pkg-plist.html-common
index 31f3a73e19a6..7b07cda1a0da 100644
--- a/misc/freebsd-doc-zh_tw/pkg-plist.html-common
+++ b/misc/freebsd-doc-zh_tw/pkg-plist.html-common
@@ -1,5 +1,4 @@
 %%DOCSDIR%%/%%DOCLANG%%/articles/contributing/docbook.css
-%%DOCSDIR%%/%%DOCLANG%%/articles/cvs-freebsd/docbook.css
 %%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-questions/docbook.css
 %%DOCSDIR%%/%%DOCLANG%%/articles/hubs/docbook.css
 %%DOCSDIR%%/%%DOCLANG%%/articles/mailing-list-faq/docbook.css
@@ -38,7 +37,63 @@
 %%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/pxe-nfs.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-boot-options-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-10.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-newboot-loader-menu.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/bsdinstall/bsdinstall-zfs-disk_info.png
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall/bsdinstall-zfs-disk_select.png
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall/bsdinstall-zfs-geli_password.png
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall/bsdinstall-zfs-menu.png
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall/bsdinstall-zfs-partmenu.png
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall/bsdinstall-zfs-vdev_invalid.png
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall/bsdinstall-zfs-vdev_type.png
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall/bsdinstall-zfs-warning.png
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/docbook.css
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/geom/striping.png
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/imagelib/callouts/1.png
@@ -62,6 +117,7 @@
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/install/boot-loader-menu.png
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/install/boot-mgr.png
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/install/config-country.png
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/install/config-keymap.png
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/install/console-saver1.png
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/install/console-saver2.png
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/install/console-saver3.png
@@ -137,13 +193,6 @@
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/security/ipsec-encap-pkt.png
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/security/ipsec-network.png
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/security/ipsec-out-pkt.png
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/vinum/vinum-concat.png
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/vinum/vinum-mirrored-vol.png
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/vinum/vinum-raid10-vol.png
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/vinum/vinum-raid5-org.png
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/vinum/vinum-simple-vol.png
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/vinum/vinum-striped-vol.png
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/vinum/vinum-striped.png
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/virtualization/parallels-freebsd1.png
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/virtualization/parallels-freebsd10.png
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/virtualization/parallels-freebsd11.png
diff --git a/misc/freebsd-doc-zh_tw/pkg-plist.html-split b/misc/freebsd-doc-zh_tw/pkg-plist.html-split
index e9007b595feb..4142314ad22d 100644
--- a/misc/freebsd-doc-zh_tw/pkg-plist.html-split
+++ b/misc/freebsd-doc-zh_tw/pkg-plist.html-split
@@ -2,10 +2,6 @@
 %%DOCSDIR%%/%%DOCLANG%%/articles/contributing/index.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/contributing/ix01.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/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
@@ -167,10 +163,6 @@
 %%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/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
@@ -178,7 +170,6 @@
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/acpi-overview.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/adding-swap-space.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/advanced-networking.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/anoncvs.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/appendices.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/audit-administration.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/audit-config.html
@@ -186,9 +177,6 @@
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/audit-install.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/audit.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/backup-basics.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/backup-strategies.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/backups-floppybackups.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/backups-tapebackups.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/basics-daemons.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/basics-devices.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/basics-more-information.html
@@ -211,6 +199,14 @@
 %%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-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
@@ -221,7 +217,6 @@
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/configtuning-core-configuration.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/configtuning-cron.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/configtuning-disk.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/configtuning-initial.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/configtuning-kernel-limits.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/configtuning-rcd.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/configtuning-starting-services.html
@@ -230,12 +225,8 @@
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/consoles.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/creating-cds.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/creating-dvds.html
-%%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
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/desktop-finance.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/desktop-productivity.html
@@ -249,15 +240,23 @@
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/disk-organization.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/disks-adding.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/disks-encrypting.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/disks-growing.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/disks-hast.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/disks-naming.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/disks-virtual.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/disks.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/dtrace-enable.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/dtrace-implementation.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/dtrace-using.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/dtrace.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/editors.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/eresources-email.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/eresources-news.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/eresources-shell.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.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/firewalls-apps.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/firewalls-concepts.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/firewalls-ipf.html
@@ -267,6 +266,14 @@
 %%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-ggate.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/geom-gjournal.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/geom-glabel.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/geom-graid.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
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/handbook.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/history.html
@@ -293,7 +300,6 @@
 %%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/kernelconfig-building.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/kernelconfig-config.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/kernelconfig-custom-kernel.html
@@ -336,7 +342,6 @@
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/mail-using.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/mail.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/makeworld.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/mirrors-afs.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/mirrors-ftp.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/mirrors-rsync.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/mirrors.html
@@ -345,7 +350,6 @@
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/network-aggregation.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/network-apache.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/network-atm.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/network-bind9.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/network-bluetooth.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/network-bridging.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/network-communication.html
@@ -355,7 +359,9 @@
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/network-ftp.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/network-inetd.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/network-ipv6.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/network-iscsi.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/network-isdn.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/network-ldap.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/network-natd.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/network-nfs.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/network-nis.html
@@ -370,18 +376,17 @@
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/openssh.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/openssl.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/outgoing-only.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/packages-using.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/permissions.html
 %%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
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/ports-overview.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/ports-using.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/ports.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/portsnap.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/ppp-and-slip.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/ppp-troubleshoot.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/ppp.html
@@ -395,14 +400,13 @@
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/printing-using.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/printing.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/quotas.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/raid.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/sapr3.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/scanners.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/securing-freebsd.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/security-accounting.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/security-advisories.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/security-intro.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/security-portaudit.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/security-resourcelimits.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/security.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/sendmail.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/serial.html
@@ -414,6 +418,7 @@
 %%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.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/swap-encrypting.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/synching.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/system-administration.html
@@ -421,28 +426,17 @@
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/term.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/trademarks.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/tvcard.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/updating-upgrading-documentation.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/updating-upgrading-freebsdupdate.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
-%%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-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/users-synopsis.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
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/vinum-access-bottlenecks.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/vinum-config.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/vinum-data-integrity.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/vinum-examples.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/vinum-intro.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/vinum-object-naming.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/vinum-objects.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/vinum-root.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/vinum-vinum.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/virtualization-guest.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/virtualization-host.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/virtualization.html
@@ -453,6 +447,14 @@
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/x-xdm.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/x11-wm.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/x11.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/zfs-advanced.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/zfs-links.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/zfs-quickstart.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/zfs-term.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/zfs-zfs-allow.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/zfs-zfs.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/zfs-zpool.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/zfs.html
 %%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/build-cluster.html
 %%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/building.html
 %%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/conflicts.html
diff --git a/misc/freebsd-doc-zh_tw/pkg-plist.pdf b/misc/freebsd-doc-zh_tw/pkg-plist.pdf
index c7485c6031ff..d8d6284a98ad 100644
--- a/misc/freebsd-doc-zh_tw/pkg-plist.pdf
+++ b/misc/freebsd-doc-zh_tw/pkg-plist.pdf
@@ -1,5 +1,4 @@
 %%DOCSDIR%%/%%DOCLANG%%/articles/contributing/article.pdf
-%%DOCSDIR%%/%%DOCLANG%%/articles/cvs-freebsd/article.pdf
 %%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-questions/article.pdf
 %%DOCSDIR%%/%%DOCLANG%%/articles/hubs/article.pdf
 %%DOCSDIR%%/%%DOCLANG%%/articles/mailing-list-faq/article.pdf
diff --git a/misc/freebsd-doc-zh_tw/pkg-plist.ps b/misc/freebsd-doc-zh_tw/pkg-plist.ps
index 28b5eca299d1..8827f989bfc3 100644
--- a/misc/freebsd-doc-zh_tw/pkg-plist.ps
+++ b/misc/freebsd-doc-zh_tw/pkg-plist.ps
@@ -1,5 +1,4 @@
 %%DOCSDIR%%/%%DOCLANG%%/articles/contributing/article.ps
-%%DOCSDIR%%/%%DOCLANG%%/articles/cvs-freebsd/article.ps
 %%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-questions/article.ps
 %%DOCSDIR%%/%%DOCLANG%%/articles/hubs/article.ps
 %%DOCSDIR%%/%%DOCLANG%%/articles/mailing-list-faq/article.ps
diff --git a/misc/freebsd-doc-zh_tw/pkg-plist.txt b/misc/freebsd-doc-zh_tw/pkg-plist.txt
index c752cd9f7df2..805a24947477 100644
--- a/misc/freebsd-doc-zh_tw/pkg-plist.txt
+++ b/misc/freebsd-doc-zh_tw/pkg-plist.txt
@@ -1,5 +1,4 @@
 %%DOCSDIR%%/%%DOCLANG%%/articles/contributing/article.txt
-%%DOCSDIR%%/%%DOCLANG%%/articles/cvs-freebsd/article.txt
 %%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-questions/article.txt
 %%DOCSDIR%%/%%DOCLANG%%/articles/hubs/article.txt
 %%DOCSDIR%%/%%DOCLANG%%/articles/mailing-list-faq/article.txt