Update to r48963 from the FreeBSD docset.

Approved by:	doceng (implicit)

6 files changed, 14 insertions, 11 deletions

diff --git a/misc/freebsd-doc-all/Makefile b/misc/freebsd-doc-all/Makefile
index 146b2e3f9396..cc9edf82496a 100644
--- a/misc/freebsd-doc-all/Makefile
+++ b/misc/freebsd-doc-all/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	freebsd-doc-all
-PORTVERSION=	48872
+PORTVERSION=	48963
 PORTEPOCH=	1
 CATEGORIES=	misc docs
 
diff --git a/misc/freebsd-doc-de/pkg-plist.html-common b/misc/freebsd-doc-de/pkg-plist.html-common
index cd041a6f202f..539bebaa5e5a 100644
--- a/misc/freebsd-doc-de/pkg-plist.html-common
+++ b/misc/freebsd-doc-de/pkg-plist.html-common
@@ -38,6 +38,12 @@
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/advanced-networking/net-routing.png
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/advanced-networking/pxe-nfs.png
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/advanced-networking/static-routes.png
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/basics/disk-layout.png
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/basics/example-dir1.png
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/basics/example-dir2.png
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/basics/example-dir3.png
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/basics/example-dir4.png
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/basics/example-dir5.png
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall/bsdinstall-adduser1.png
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall/bsdinstall-adduser2.png
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall/bsdinstall-adduser3.png
diff --git a/misc/freebsd-doc-de/pkg-plist.html-split b/misc/freebsd-doc-de/pkg-plist.html-split
index e890f47b6a42..9062eb616a66 100644
--- a/misc/freebsd-doc-de/pkg-plist.html-split
+++ b/misc/freebsd-doc-de/pkg-plist.html-split
@@ -204,7 +204,6 @@
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/acpi-overview.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/adding-swap-space.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/advanced-networking.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/anoncvs.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/appendices.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/audit-administration.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/audit-config.html
@@ -259,8 +258,6 @@
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/creating-dvds.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/ctm.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/current-stable.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/cvs-tags.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/cvsup.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/desktop-browsers.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/desktop-finance.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/desktop-productivity.html
@@ -335,7 +332,6 @@
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/kernelconfig-devices.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/kernelconfig-trouble.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/kernelconfig.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/l10n-basics.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/l10n-compiling.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/l10n.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/lang-setup.html
@@ -428,7 +424,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
@@ -462,7 +458,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-compiz-fusion.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/x-config.html
diff --git a/misc/freebsd-doc-en/Makefile b/misc/freebsd-doc-en/Makefile
index dfab30768144..11d1697147aa 100644
--- a/misc/freebsd-doc-en/Makefile
+++ b/misc/freebsd-doc-en/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	freebsd-doc
-PORTVERSION=	48872
+PORTVERSION=	48963
 PORTEPOCH=	1
 CATEGORIES=	misc docs
 MASTER_SITES=	LOCAL/blackend
diff --git a/misc/freebsd-doc-en/distinfo b/misc/freebsd-doc-en/distinfo
index 665ca3a6fedc..1ff4f6a8bf36 100644
--- a/misc/freebsd-doc-en/distinfo
+++ b/misc/freebsd-doc-en/distinfo
@@ -1,2 +1,2 @@
-SHA256 (freebsd-doc-48872.tar.gz) = 4b1ba712a08e9dd0d8a513eb740806ee31b9d507fc8709eaef3694ebc4859605
-SIZE (freebsd-doc-48872.tar.gz) = 49611628
+SHA256 (freebsd-doc-48963.tar.gz) = 85a4b5b5a13853926a66516f0b6873c6b2c4da606526615ef0063791d6a8ec68
+SIZE (freebsd-doc-48963.tar.gz) = 49712463
diff --git a/misc/freebsd-doc-en/pkg-plist.html-split b/misc/freebsd-doc-en/pkg-plist.html-split
index a384d21c5e78..61159524118f 100644
--- a/misc/freebsd-doc-en/pkg-plist.html-split
+++ b/misc/freebsd-doc-en/pkg-plist.html-split
@@ -548,7 +548,7 @@
 %%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/ix01.html
 %%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/legalnotice.html
 %%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/make-includes.html
-%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/overview-quick-start.html
+%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/overview-doc.html
 %%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/overview.html
 %%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/po-translations-building.html
 %%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/po-translations-creating.html