6 files changed, 8 insertions, 45 deletions

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