20 files changed, 24 insertions, 41 deletions
diff --git a/misc/freebsd-doc-all/Makefile b/misc/freebsd-doc-all/Makefile
index 4fba5cd69ca4..5f7652676ea3 100644
--- a/misc/freebsd-doc-all/Makefile
+++ b/misc/freebsd-doc-all/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	freebsd-doc-all
-PORTVERSION=	41075
+PORTVERSION=	41327
 PORTEPOCH=	1
 CATEGORIES=	misc docs
 MASTER_SITES=	#empty
diff --git a/misc/freebsd-doc-de/pkg-plist.common b/misc/freebsd-doc-de/pkg-plist.common
index 0bf80e9b04a2..5265c63a6b68 100644
--- a/misc/freebsd-doc-de/pkg-plist.common
+++ b/misc/freebsd-doc-de/pkg-plist.common
@@ -23,6 +23,9 @@
 @dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/solid-state
 @dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/port-mentor-guidelines
 @dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/new-users
+@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/nanobsd/imagelib/callouts
+@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/nanobsd/imagelib
+@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/nanobsd
 @dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/linux-comparison
 @dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/laptop
 @dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd
diff --git a/misc/freebsd-doc-de/pkg-plist.html b/misc/freebsd-doc-de/pkg-plist.html
index 8990150a555d..b329ae695a7b 100644
--- a/misc/freebsd-doc-de/pkg-plist.html
+++ b/misc/freebsd-doc-de/pkg-plist.html
@@ -4,6 +4,7 @@
 %%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd/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
 %%DOCSDIR%%/%%DOCLANG%%/articles/solid-state/article.html
diff --git a/misc/freebsd-doc-de/pkg-plist.html-common b/misc/freebsd-doc-de/pkg-plist.html-common
index 84122afdecb3..8107cb9fc4cc 100644
--- a/misc/freebsd-doc-de/pkg-plist.html-common
+++ b/misc/freebsd-doc-de/pkg-plist.html-common
@@ -4,6 +4,11 @@
 %%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd/docbook.css
 %%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
+%%DOCSDIR%%/%%DOCLANG%%/articles/nanobsd/imagelib/callouts/3.png
+%%DOCSDIR%%/%%DOCLANG%%/articles/nanobsd/imagelib/callouts/4.png
 %%DOCSDIR%%/%%DOCLANG%%/articles/new-users/docbook.css
 %%DOCSDIR%%/%%DOCLANG%%/articles/port-mentor-guidelines/docbook.css
 %%DOCSDIR%%/%%DOCLANG%%/articles/solid-state/docbook.css
diff --git a/misc/freebsd-doc-de/pkg-plist.html-split b/misc/freebsd-doc-de/pkg-plist.html-split
index b5c7871543e4..1563c4f6a310 100644
--- a/misc/freebsd-doc-de/pkg-plist.html-split
+++ b/misc/freebsd-doc-de/pkg-plist.html-split
@@ -28,6 +28,9 @@
 %%DOCSDIR%%/%%DOCLANG%%/articles/linux-comparison/freebsd-support.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/linux-comparison/index.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/linux-comparison/trademarks.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/nanobsd/howto.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/nanobsd/index.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/nanobsd/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
diff --git a/misc/freebsd-doc-de/pkg-plist.pdf b/misc/freebsd-doc-de/pkg-plist.pdf
index 2e07b20d2fad..834a40435956 100644
--- a/misc/freebsd-doc-de/pkg-plist.pdf
+++ b/misc/freebsd-doc-de/pkg-plist.pdf
@@ -4,6 +4,7 @@
 %%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd/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
 %%DOCSDIR%%/%%DOCLANG%%/articles/solid-state/article.pdf
diff --git a/misc/freebsd-doc-de/pkg-plist.ps b/misc/freebsd-doc-de/pkg-plist.ps
index 4b3d14f0c9fa..1ae453228594 100644
--- a/misc/freebsd-doc-de/pkg-plist.ps
+++ b/misc/freebsd-doc-de/pkg-plist.ps
@@ -4,6 +4,7 @@
 %%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd/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
 %%DOCSDIR%%/%%DOCLANG%%/articles/solid-state/article.ps
diff --git a/misc/freebsd-doc-de/pkg-plist.txt b/misc/freebsd-doc-de/pkg-plist.txt
index 2a92167408d8..60945b3b5f48 100644
--- a/misc/freebsd-doc-de/pkg-plist.txt
+++ b/misc/freebsd-doc-de/pkg-plist.txt
@@ -4,6 +4,7 @@
 %%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd/article.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
 %%DOCSDIR%%/%%DOCLANG%%/articles/solid-state/article.txt
diff --git a/misc/freebsd-doc-en/Makefile b/misc/freebsd-doc-en/Makefile
index 7c5c12281f0c..ca9c87d35cc2 100644
--- a/misc/freebsd-doc-en/Makefile
+++ b/misc/freebsd-doc-en/Makefile
@@ -28,7 +28,7 @@
 #
 
 PORTNAME=	freebsd-doc
-PORTVERSION=	41075
+PORTVERSION=	41327
 PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	misc docs
diff --git a/misc/freebsd-doc-en/distinfo b/misc/freebsd-doc-en/distinfo
index 1d67b178e163..f8b280be642c 100644
--- a/misc/freebsd-doc-en/distinfo
+++ b/misc/freebsd-doc-en/distinfo
@@ -1,2 +1,2 @@
-SHA256 (freebsd-doc-41075.tar.gz) = 75d1f29bf5a2030af5f20cd6fc6992dacd3377670381212d3e20c204bb564fbc
-SIZE (freebsd-doc-41075.tar.gz) = 32656339
+SHA256 (freebsd-doc-41327.tar.gz) = 31623e13ab96405fe1e870ede6d81151ad4cf2feff763f0697935735cddb7ab7
+SIZE (freebsd-doc-41327.tar.gz) = 32654963
diff --git a/misc/freebsd-doc-en/pkg-plist.html-split b/misc/freebsd-doc-en/pkg-plist.html-split
index f372c88702bc..3e4585e8fd28 100644
--- a/misc/freebsd-doc-en/pkg-plist.html-split
+++ b/misc/freebsd-doc-en/pkg-plist.html-split
@@ -322,7 +322,6 @@
 %%DOCSDIR%%/%%DOCLANG%%/articles/releng-packages/trademarks.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/releng-packages/x40.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/releng/ackno.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/releng/biblio.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/releng/distribution.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/releng/extensibility.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/releng/future.html
@@ -573,10 +572,8 @@
 %%DOCSDIR%%/%%DOCLANG%%/books/faq/bibliography.html
 %%DOCSDIR%%/%%DOCLANG%%/books/faq/compatibility-drives.html
 %%DOCSDIR%%/%%DOCLANG%%/books/faq/compatibility-kbd-mice.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/compatibility-networking.html
 %%DOCSDIR%%/%%DOCLANG%%/books/faq/compatibility-other.html
 %%DOCSDIR%%/%%DOCLANG%%/books/faq/compatibility-processors.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/compatibility-sound.html
 %%DOCSDIR%%/%%DOCLANG%%/books/faq/disks.html
 %%DOCSDIR%%/%%DOCLANG%%/books/faq/funnies.html
 %%DOCSDIR%%/%%DOCLANG%%/books/faq/hardware.html
@@ -936,7 +933,6 @@
 %%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
@@ -980,6 +976,7 @@
 %%DOCSDIR%%/%%DOCLANG%%/books/pmake/theway.html
 %%DOCSDIR%%/%%DOCLANG%%/books/pmake/variables.html
 %%DOCSDIR%%/%%DOCLANG%%/books/pmake/writeanddebug.html
+%%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/appendices.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-fr/pkg-plist.extras b/misc/freebsd-doc-fr/pkg-plist.extras
index 7b3069b047e1..8fb5cc4556d5 100644
--- a/misc/freebsd-doc-fr/pkg-plist.extras
+++ b/misc/freebsd-doc-fr/pkg-plist.extras
@@ -1,7 +1 @@
 @comment $FreeBSD$
-%%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-ja/pkg-plist.html-split b/misc/freebsd-doc-ja/pkg-plist.html-split
index 4ff45bcc64a4..a538cdf68f6b 100644
--- a/misc/freebsd-doc-ja/pkg-plist.html-split
+++ b/misc/freebsd-doc-ja/pkg-plist.html-split
@@ -139,7 +139,6 @@
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/desktop-browsers.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/desktop-finance.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/desktop-productivity.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/desktop-summary.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/desktop-viewers.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/desktop.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/device-hints.html
@@ -303,10 +302,10 @@
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/x-xdm.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/x11-wm.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/x11.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/x15761.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/x35342.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/x35386.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/x35430.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/x15606.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/x35187.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/x35231.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/x35275.html
 %%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/changes.html
 %%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/conflicts.html
 %%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/dads-after-port-mk.html
diff --git a/misc/freebsd-doc-mn/pkg-plist.html-split b/misc/freebsd-doc-mn/pkg-plist.html-split
index 525dd0f44fc1..757c2286b5c5 100644
--- a/misc/freebsd-doc-mn/pkg-plist.html-split
+++ b/misc/freebsd-doc-mn/pkg-plist.html-split
@@ -212,7 +212,6 @@
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/network-nfs.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/network-nis.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/network-ntp.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/network-plip.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/network-pxe-nfs.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/network-routing.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/network-samba.html
diff --git a/misc/freebsd-doc-sr/pkg-plist.html b/misc/freebsd-doc-sr/pkg-plist.html
index f4a07d32bf4a..8fb5cc4556d5 100644
--- a/misc/freebsd-doc-sr/pkg-plist.html
+++ b/misc/freebsd-doc-sr/pkg-plist.html
@@ -1,3 +1 @@
 @comment $FreeBSD$
-%%DOCSDIR%%/%%DOCLANG%%/articles/dialup-firewall/article.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/diskless-x/article.html
diff --git a/misc/freebsd-doc-sr/pkg-plist.html-common b/misc/freebsd-doc-sr/pkg-plist.html-common
index edb01a140ae4..8fb5cc4556d5 100644
--- a/misc/freebsd-doc-sr/pkg-plist.html-common
+++ b/misc/freebsd-doc-sr/pkg-plist.html-common
@@ -1,3 +1 @@
 @comment $FreeBSD$
-%%DOCSDIR%%/%%DOCLANG%%/articles/dialup-firewall/docbook.css
-%%DOCSDIR%%/%%DOCLANG%%/articles/diskless-x/docbook.css
diff --git a/misc/freebsd-doc-sr/pkg-plist.html-split b/misc/freebsd-doc-sr/pkg-plist.html-split
index 35ad2870a210..8fb5cc4556d5 100644
--- a/misc/freebsd-doc-sr/pkg-plist.html-split
+++ b/misc/freebsd-doc-sr/pkg-plist.html-split
@@ -1,12 +1 @@
 @comment $FreeBSD$
-%%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/x71.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/dialup-firewall/x94.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/diskless-x/index.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/diskless-x/x33.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/diskless-x/x40.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/diskless-x/x46.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/diskless-x/x67.html
diff --git a/misc/freebsd-doc-sr/pkg-plist.pdf b/misc/freebsd-doc-sr/pkg-plist.pdf
index cf91011b62dc..8fb5cc4556d5 100644
--- a/misc/freebsd-doc-sr/pkg-plist.pdf
+++ b/misc/freebsd-doc-sr/pkg-plist.pdf
@@ -1,3 +1 @@
 @comment $FreeBSD$
-%%DOCSDIR%%/%%DOCLANG%%/articles/dialup-firewall/article.pdf
-%%DOCSDIR%%/%%DOCLANG%%/articles/diskless-x/article.pdf
diff --git a/misc/freebsd-doc-sr/pkg-plist.ps b/misc/freebsd-doc-sr/pkg-plist.ps
index fc3ad11b4a81..8fb5cc4556d5 100644
--- a/misc/freebsd-doc-sr/pkg-plist.ps
+++ b/misc/freebsd-doc-sr/pkg-plist.ps
@@ -1,3 +1 @@
 @comment $FreeBSD$
-%%DOCSDIR%%/%%DOCLANG%%/articles/dialup-firewall/article.ps
-%%DOCSDIR%%/%%DOCLANG%%/articles/diskless-x/article.ps
diff --git a/misc/freebsd-doc-sr/pkg-plist.txt b/misc/freebsd-doc-sr/pkg-plist.txt
index c049fc011ba9..8fb5cc4556d5 100644
--- a/misc/freebsd-doc-sr/pkg-plist.txt
+++ b/misc/freebsd-doc-sr/pkg-plist.txt
@@ -1,3 +1 @@
 @comment $FreeBSD$
-%%DOCSDIR%%/%%DOCLANG%%/articles/dialup-firewall/article.txt
-%%DOCSDIR%%/%%DOCLANG%%/articles/diskless-x/article.txt