9 files changed, 29 insertions, 122 deletions

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