4 files changed, 23 insertions, 21 deletions

diff --git a/misc/freebsd-doc-en/Makefile b/misc/freebsd-doc-en/Makefile
index c797f367d746..c6b8d1ba2f4e 100644
--- a/misc/freebsd-doc-en/Makefile
+++ b/misc/freebsd-doc-en/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	freebsd-doc
-PORTVERSION=	44393
+PORTVERSION=	44807
 PORTEPOCH=	1
 CATEGORIES=	misc docs
 MASTER_SITES=	LOCAL/blackend
@@ -20,12 +20,12 @@ PLIST_SUB=	DOCSDIR=${DOCBASE} \
 MAKE_ARGS=	FORMATS="${DOCFORMAT}" \
 		DOC_LANG="${DOCLANG}" \
 		INSTALL_COMPRESSED= \
-		DOCDIR=${PREFIX}/${DOCBASE} \
+		DOCDIR=${STAGEDIR}${PREFIX}/${DOCBASE} \
 		DOCOWN=${SHAREOWN} \
 		DOCGRP=${SHAREGRP}
 MAKE_JOBS_UNSAFE=	yes
+DESTDIRNAME=    ${STAGEDIR}${PREFIX}/${DOCBASE}
 PLIST=		${WRKDIR}/pkg-plist
-NO_STAGE=	yes
 
 DOCLANG?=		en_US.ISO8859-1
 DOCLANG_PREFIX?=	${DOCLANG:C/_.*$//}
diff --git a/misc/freebsd-doc-en/distinfo b/misc/freebsd-doc-en/distinfo
index 12c236c756b9..dcdd9f51a8b0 100644
--- a/misc/freebsd-doc-en/distinfo
+++ b/misc/freebsd-doc-en/distinfo
@@ -1,2 +1,2 @@
-SHA256 (freebsd-doc-44393.tar.gz) = 3baf1a292fe404aa561cc6ef31d9f352ccd6c4ae84fc139095b6d0c6751a69fd
-SIZE (freebsd-doc-44393.tar.gz) = 32742504
+SHA256 (freebsd-doc-44807.tar.gz) = 1e5acc5667ccf574df7aaab1303adcb0fb412ee8b05099b963834aa30aa65474
+SIZE (freebsd-doc-44807.tar.gz) = 32775374
diff --git a/misc/freebsd-doc-en/pkg-plist.html-common b/misc/freebsd-doc-en/pkg-plist.html-common
index 6861c0e9841f..f621124945d2 100644
--- a/misc/freebsd-doc-en/pkg-plist.html-common
+++ b/misc/freebsd-doc-en/pkg-plist.html-common
@@ -175,6 +175,7 @@
 %%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
@@ -192,6 +193,14 @@
 %%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
diff --git a/misc/freebsd-doc-en/pkg-plist.html-split b/misc/freebsd-doc-en/pkg-plist.html-split
index a14052a48820..3a71f62a787b 100644
--- a/misc/freebsd-doc-en/pkg-plist.html-split
+++ b/misc/freebsd-doc-en/pkg-plist.html-split
@@ -677,7 +677,6 @@
 %%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/xml-primer-marked-sections.html
 %%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/xml-primer-xml-escape.html
 %%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/xml-primer.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/ACPI-debug.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/SMTP-Auth.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/SMTP-dialup.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/acpi-overview.html
@@ -689,7 +688,6 @@
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/audit-inline-glossary.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/audit.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/backup-basics.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/backups-tapebackups.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/basics-devices.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/basics-more-information.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/basics-processes.html
@@ -704,10 +702,9 @@
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/bibliography-userguides.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/bibliography.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/book-preface.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/boot-boot0.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/boot-init.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/boot-introduction.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/boot-shutdown.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/boot-splash.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/boot.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall-final-warning.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall-hardware.html
@@ -751,12 +748,10 @@
 %%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-language.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/dtrace-using.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/dtrace.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/editors.html
@@ -778,7 +773,6 @@
 %%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-intro.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/geom-mirror.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/geom-raid3.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/geom-striping.html
@@ -804,7 +798,6 @@
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/ix01.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/jails-application.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/jails-build.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/jails-intro.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/jails-terms.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/jails-tuning.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/jails.html
@@ -885,12 +878,11 @@
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/ppp-troubleshoot.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/pppoa.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/pppoe.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/printing-advanced.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/printing-intro-setup.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/printing-intro-spooler.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/printing-lpd-alternatives.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/printing-troubleshooting.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/printing-using.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/printing-connections.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/printing-direct.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/printing-lpd.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/printing-other.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/printing-pdls.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/printing.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/quotas.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/scanners.html
@@ -909,7 +901,6 @@
 %%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-mirrors.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/svn.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/swap-encrypting.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/synching.html
@@ -930,7 +921,8 @@
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/using-sysinstall.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/video-playback.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/virtualization-guest.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/virtualization-host.html
+%%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-config.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/x-fonts.html
@@ -1018,6 +1010,7 @@
 %%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/plist-cleaning.html
 %%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/plist-config.html
 %%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/plist-dynamic.html
+%%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/plist-keywords.html
 %%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/plist.html
 %%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/port-upgrading.html
 %%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/porting-checksum.html