8 files changed, 35 insertions, 100 deletions

diff --git a/misc/freebsd-doc-es/pkg-plist.common b/misc/freebsd-doc-es/pkg-plist.common
index 50e607c38368..594b1defc35e 100644
--- a/misc/freebsd-doc-es/pkg-plist.common
+++ b/misc/freebsd-doc-es/pkg-plist.common
@@ -10,10 +10,7 @@
 @dirrm %%DOCSDIR%%/%%DOCLANG%%/books/handbook
 @dirrm %%DOCSDIR%%/%%DOCLANG%%/books/faq
 @dirrm %%DOCSDIR%%/%%DOCLANG%%/books
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/zip-drive
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/version-guide
 @dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/releng
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/pxe
 @dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/problem-reports
 @dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/p4-primer
 @dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/nanobsd/imagelib/callouts
@@ -26,8 +23,6 @@
 @dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/fdp-es
 @dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/fbsd-from-scratch
 @dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/euro
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/dialup-firewall
 @dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/cvs-freebsd
 @dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/contributing
 @dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/casestudy-argentina.com
diff --git a/misc/freebsd-doc-es/pkg-plist.extras b/misc/freebsd-doc-es/pkg-plist.extras
index 2cc85886eb73..769466f97b89 100644
--- a/misc/freebsd-doc-es/pkg-plist.extras
+++ b/misc/freebsd-doc-es/pkg-plist.extras
@@ -2,9 +2,3 @@
 %%DOCSDIR%%/%%DOCLANG%%/articles/fbsd-from-scratch/fase_1.sh
 %%DOCSDIR%%/%%DOCLANG%%/articles/fbsd-from-scratch/fase_2.sh
 %%DOCSDIR%%/%%DOCLANG%%/articles/fbsd-from-scratch/fase_3.mk
-%%DOCSDIR%%/%%DOCLANG%%/articles/pxe/dhcpd.conf
-%%DOCSDIR%%/%%DOCLANG%%/articles/pxe/install.cfg
-%%DOCSDIR%%/%%DOCLANG%%/articles/pxe/loader.rc
-%%DOCSDIR%%/%%DOCLANG%%/articles/pxe/pkgmaker.sh
-%%DOCSDIR%%/%%DOCLANG%%/articles/pxe/post
-%%DOCSDIR%%/%%DOCLANG%%/articles/pxe/pre
diff --git a/misc/freebsd-doc-es/pkg-plist.html b/misc/freebsd-doc-es/pkg-plist.html
index ed60cd4cb4df..84b59ebd39ce 100644
--- a/misc/freebsd-doc-es/pkg-plist.html
+++ b/misc/freebsd-doc-es/pkg-plist.html
@@ -2,8 +2,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/dialup-firewall/article.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/euro/article.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd/article.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/fbsd-from-scratch/article.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/fdp-es/article.html
@@ -14,9 +12,6 @@
 %%DOCSDIR%%/%%DOCLANG%%/articles/nanobsd/article.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/p4-primer/article.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/problem-reports/article.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/pxe/article.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/releng/article.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/version-guide/article.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/zip-drive/article.html
 %%DOCSDIR%%/%%DOCLANG%%/books/faq/book.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/book.html
diff --git a/misc/freebsd-doc-es/pkg-plist.html-common b/misc/freebsd-doc-es/pkg-plist.html-common
index c8074fbc7fdf..c632cf7a95d9 100644
--- a/misc/freebsd-doc-es/pkg-plist.html-common
+++ b/misc/freebsd-doc-es/pkg-plist.html-common
@@ -2,8 +2,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/dialup-firewall/docbook.css
-%%DOCSDIR%%/%%DOCLANG%%/articles/euro/docbook.css
 %%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd/docbook.css
 %%DOCSDIR%%/%%DOCLANG%%/articles/fbsd-from-scratch/docbook.css
 %%DOCSDIR%%/%%DOCLANG%%/articles/fdp-es/docbook.css
@@ -18,13 +16,10 @@
 %%DOCSDIR%%/%%DOCLANG%%/articles/nanobsd/imagelib/callouts/4.png
 %%DOCSDIR%%/%%DOCLANG%%/articles/p4-primer/docbook.css
 %%DOCSDIR%%/%%DOCLANG%%/articles/problem-reports/docbook.css
-%%DOCSDIR%%/%%DOCLANG%%/articles/pxe/docbook.css
 %%DOCSDIR%%/%%DOCLANG%%/articles/releng/branches-head.png
 %%DOCSDIR%%/%%DOCLANG%%/articles/releng/branches-releng3.png
 %%DOCSDIR%%/%%DOCLANG%%/articles/releng/branches-releng4.png
 %%DOCSDIR%%/%%DOCLANG%%/articles/releng/docbook.css
-%%DOCSDIR%%/%%DOCLANG%%/articles/version-guide/docbook.css
-%%DOCSDIR%%/%%DOCLANG%%/articles/zip-drive/docbook.css
 %%DOCSDIR%%/%%DOCLANG%%/books/faq/docbook.css
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/advanced-networking/isdn-bus.png
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/advanced-networking/isdn-twisted-pair.png
diff --git a/misc/freebsd-doc-es/pkg-plist.html-split b/misc/freebsd-doc-es/pkg-plist.html-split
index a28d622961c3..8864ab1506e9 100644
--- a/misc/freebsd-doc-es/pkg-plist.html-split
+++ b/misc/freebsd-doc-es/pkg-plist.html-split
@@ -1,30 +1,19 @@
 @comment $FreeBSD$
-%%DOCSDIR%%/%%DOCLANG%%/articles/casestudy-argentina.com/TRADEMARKS.html
 %%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/cvs-freebsd/TRADEMARKS.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/cvs-freebsd/freebsdspecific.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/cvs-freebsd/index.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/cvs-freebsd/x40.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/dialup-firewall/index.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/dialup-firewall/kernel.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/dialup-firewall/rcconf.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/dialup-firewall/rules.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/dialup-firewall/x112.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/dialup-firewall/x84.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/euro/index.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/euro/x169.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/euro/x201.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/euro/x70.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/euro/x80.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/cvs-freebsd/trademarks.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/cvs-freebsd/x41.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd/index.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd/x51.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd/x76.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd/x98.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd/x100.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd/x53.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd/x78.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
@@ -35,19 +24,18 @@
 %%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/fdp-es/x184.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/fdp-es/x187.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/fdp-es/x191.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/fdp-es/x205.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/fdp-es/x244.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/fdp-es/x27.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/fdp-es/x42.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/fdp-es/x92.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/fdp-es/x185.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/fdp-es/x188.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/fdp-es/x192.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/fdp-es/x206.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/fdp-es/x245.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/fdp-es/x28.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/fdp-es/x43.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/fdp-es/x93.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/laptop/index.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/laptop/x38.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/laptop/x43.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/laptop/x70.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/linux-comparison/TRADEMARKS.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/laptop/x39.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/laptop/x44.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/laptop/x71.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
@@ -55,7 +43,7 @@
 %%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-users/TRADEMARKS.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
@@ -65,16 +53,16 @@
 %%DOCSDIR%%/%%DOCLANG%%/articles/linux-users/shells.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/linux-users/software.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/linux-users/startup.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/linux-users/trademarks.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/linux-users/updates.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/mailing-list-faq/acknowledgments.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/mailing-list-faq/bikeshed.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/mailing-list-faq/etiquette.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/mailing-list-faq/index.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/mailing-list-faq/recurring.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/nanobsd/TRADEMARKS.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/nanobsd/howto.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/nanobsd/index.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/p4-primer/TRADEMARKS.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/nanobsd/trademarks.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/p4-primer/add-rm-files.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/p4-primer/branches.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/p4-primer/changes.html
@@ -90,21 +78,15 @@
 %%DOCSDIR%%/%%DOCLANG%%/articles/p4-primer/start.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/p4-primer/submit.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/p4-primer/syncing.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/p4-primer/trademarks.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/p4-primer/working-with-diffs.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/problem-reports/TRADEMARKS.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/problem-reports/index.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/problem-reports/pr-followup.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/problem-reports/pr-further.html
 %%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/pxe/TRADEMARKS.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/pxe/bootstrap-config.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/pxe/custom-postinst-package.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/pxe/index.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/pxe/install-setup.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/pxe/server-config.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/releng/TRADEMARKS.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/problem-reports/trademarks.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/releng/ackno.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/releng/biblio.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/releng/distribution.html
@@ -114,15 +96,7 @@
 %%DOCSDIR%%/%%DOCLANG%%/articles/releng/lessons-learned.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/releng/release-build.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/releng/release-proc.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/version-guide/TRADEMARKS.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/version-guide/conclusion.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/version-guide/decision-points.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/version-guide/future-goals.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/version-guide/index.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/version-guide/past-schedules.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/zip-drive/index.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/zip-drive/x108.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/zip-drive/x49.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/releng/trademarks.html
 %%DOCSDIR%%/%%DOCLANG%%/books/faq/acknowledgments.html
 %%DOCSDIR%%/%%DOCLANG%%/books/faq/admin.html
 %%DOCSDIR%%/%%DOCLANG%%/books/faq/applications.html
@@ -133,7 +107,7 @@
 %%DOCSDIR%%/%%DOCLANG%%/books/faq/install.html
 %%DOCSDIR%%/%%DOCLANG%%/books/faq/introduction.html
 %%DOCSDIR%%/%%DOCLANG%%/books/faq/kernelconfig.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/ln19.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ln18.html
 %%DOCSDIR%%/%%DOCLANG%%/books/faq/misc.html
 %%DOCSDIR%%/%%DOCLANG%%/books/faq/networking.html
 %%DOCSDIR%%/%%DOCLANG%%/books/faq/ppp.html
@@ -244,7 +218,7 @@
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/linuxemu-matlab.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/linuxemu-oracle.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/linuxemu.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/ln24.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/ln25.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/mac-biba.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/mac-examplehttpd.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/mac-ifoff.html
@@ -344,9 +318,6 @@
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/tcpwrappers.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/term.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/tvcard.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/updating-freebsdupdate.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/updating-portsnap.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/updating.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/usb-disks.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/userppp.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/users-groups.html
@@ -378,13 +349,13 @@
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/x-xdm.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/x11-wm.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/x11.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/x30964.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/x30988.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/x31017.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/x31050.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/x31083.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/x31095.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/x31119.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/x31155.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/x32062.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/x9105.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/x30948.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/x30972.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/x31001.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/x31034.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/x31067.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/x31079.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/x31103.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/x31139.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/x32046.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/x9095.html
diff --git a/misc/freebsd-doc-es/pkg-plist.pdf b/misc/freebsd-doc-es/pkg-plist.pdf
index e819c72beef3..988235caf460 100644
--- a/misc/freebsd-doc-es/pkg-plist.pdf
+++ b/misc/freebsd-doc-es/pkg-plist.pdf
@@ -2,8 +2,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/dialup-firewall/article.pdf
-%%DOCSDIR%%/%%DOCLANG%%/articles/euro/article.pdf
 %%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd/article.pdf
 %%DOCSDIR%%/%%DOCLANG%%/articles/fbsd-from-scratch/article.pdf
 %%DOCSDIR%%/%%DOCLANG%%/articles/fdp-es/article.pdf
@@ -14,9 +12,6 @@
 %%DOCSDIR%%/%%DOCLANG%%/articles/nanobsd/article.pdf
 %%DOCSDIR%%/%%DOCLANG%%/articles/p4-primer/article.pdf
 %%DOCSDIR%%/%%DOCLANG%%/articles/problem-reports/article.pdf
-%%DOCSDIR%%/%%DOCLANG%%/articles/pxe/article.pdf
 %%DOCSDIR%%/%%DOCLANG%%/articles/releng/article.pdf
-%%DOCSDIR%%/%%DOCLANG%%/articles/version-guide/article.pdf
-%%DOCSDIR%%/%%DOCLANG%%/articles/zip-drive/article.pdf
 %%DOCSDIR%%/%%DOCLANG%%/books/faq/book.pdf
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/book.pdf
diff --git a/misc/freebsd-doc-es/pkg-plist.ps b/misc/freebsd-doc-es/pkg-plist.ps
index cc9b39c85bfe..436a16bba97e 100644
--- a/misc/freebsd-doc-es/pkg-plist.ps
+++ b/misc/freebsd-doc-es/pkg-plist.ps
@@ -2,8 +2,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/dialup-firewall/article.ps
-%%DOCSDIR%%/%%DOCLANG%%/articles/euro/article.ps
 %%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd/article.ps
 %%DOCSDIR%%/%%DOCLANG%%/articles/fbsd-from-scratch/article.ps
 %%DOCSDIR%%/%%DOCLANG%%/articles/fdp-es/article.ps
@@ -14,9 +12,6 @@
 %%DOCSDIR%%/%%DOCLANG%%/articles/nanobsd/article.ps
 %%DOCSDIR%%/%%DOCLANG%%/articles/p4-primer/article.ps
 %%DOCSDIR%%/%%DOCLANG%%/articles/problem-reports/article.ps
-%%DOCSDIR%%/%%DOCLANG%%/articles/pxe/article.ps
 %%DOCSDIR%%/%%DOCLANG%%/articles/releng/article.ps
-%%DOCSDIR%%/%%DOCLANG%%/articles/version-guide/article.ps
-%%DOCSDIR%%/%%DOCLANG%%/articles/zip-drive/article.ps
 %%DOCSDIR%%/%%DOCLANG%%/books/faq/book.ps
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/book.ps
diff --git a/misc/freebsd-doc-es/pkg-plist.txt b/misc/freebsd-doc-es/pkg-plist.txt
index e493d000f184..0c54bfc3bd6b 100644
--- a/misc/freebsd-doc-es/pkg-plist.txt
+++ b/misc/freebsd-doc-es/pkg-plist.txt
@@ -2,8 +2,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/dialup-firewall/article.txt
-%%DOCSDIR%%/%%DOCLANG%%/articles/euro/article.txt
 %%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd/article.txt
 %%DOCSDIR%%/%%DOCLANG%%/articles/fbsd-from-scratch/article.txt
 %%DOCSDIR%%/%%DOCLANG%%/articles/fdp-es/article.txt
@@ -14,9 +12,6 @@
 %%DOCSDIR%%/%%DOCLANG%%/articles/nanobsd/article.txt
 %%DOCSDIR%%/%%DOCLANG%%/articles/p4-primer/article.txt
 %%DOCSDIR%%/%%DOCLANG%%/articles/problem-reports/article.txt
-%%DOCSDIR%%/%%DOCLANG%%/articles/pxe/article.txt
 %%DOCSDIR%%/%%DOCLANG%%/articles/releng/article.txt
-%%DOCSDIR%%/%%DOCLANG%%/articles/version-guide/article.txt
-%%DOCSDIR%%/%%DOCLANG%%/articles/zip-drive/article.txt
 %%DOCSDIR%%/%%DOCLANG%%/books/faq/book.txt
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/book.txt