Update to r42326 of the FreeBSD docset.

Approved by:	doceng (implicit)

7 files changed, 21 insertions, 30 deletions

diff --git a/misc/freebsd-doc-all/Makefile b/misc/freebsd-doc-all/Makefile
index be1650c082c7..921d777ecfd8 100644
--- a/misc/freebsd-doc-all/Makefile
+++ b/misc/freebsd-doc-all/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	freebsd-doc-all
-PORTVERSION=	42095
+PORTVERSION=	42326
 PORTEPOCH=	1
 CATEGORIES=	misc docs
 MASTER_SITES=	#empty
diff --git a/misc/freebsd-doc-en/Makefile b/misc/freebsd-doc-en/Makefile
index 72f228f6ac0a..d0038701bd90 100644
--- a/misc/freebsd-doc-en/Makefile
+++ b/misc/freebsd-doc-en/Makefile
@@ -25,7 +25,7 @@
 #
 
 PORTNAME=	freebsd-doc
-PORTVERSION=	42095
+PORTVERSION=	42326
 PORTEPOCH=	1
 CATEGORIES=	misc docs
 MASTER_SITES=	LOCAL/blackend
diff --git a/misc/freebsd-doc-en/distinfo b/misc/freebsd-doc-en/distinfo
index c82dbfb2c645..d15109a8f56c 100644
--- a/misc/freebsd-doc-en/distinfo
+++ b/misc/freebsd-doc-en/distinfo
@@ -1,2 +1,2 @@
-SHA256 (freebsd-doc-42095.tar.gz) = 96b74cb7b88e9ece31e80680d2ecb6107f4cbc4bc1d41ccf39028ff5f31ed659
-SIZE (freebsd-doc-42095.tar.gz) = 32787926
+SHA256 (freebsd-doc-42326.tar.gz) = 19f0b52bd56a5796187846f1896cf8d3d7a2cca8cc1ee19db23d4d8ce935fcb8
+SIZE (freebsd-doc-42326.tar.gz) = 32785208
diff --git a/misc/freebsd-doc-en/pkg-plist.common b/misc/freebsd-doc-en/pkg-plist.common
index 97fc6cec72d2..d8b98efb4a49 100644
--- a/misc/freebsd-doc-en/pkg-plist.common
+++ b/misc/freebsd-doc-en/pkg-plist.common
@@ -6,7 +6,6 @@
 @dirrm %%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook
 @dirrm %%DOCSDIR%%/%%DOCLANG%%/books/pmake
 @dirrm %%DOCSDIR%%/%%DOCLANG%%/books/handbook/virtualization
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/handbook/vinum
 @dirrm %%DOCSDIR%%/%%DOCLANG%%/books/handbook/security
 @dirrm %%DOCSDIR%%/%%DOCLANG%%/books/handbook/mail
 @dirrm %%DOCSDIR%%/%%DOCLANG%%/books/handbook/install
diff --git a/misc/freebsd-doc-en/pkg-plist.html-common b/misc/freebsd-doc-en/pkg-plist.html-common
index 6d4852370778..3ca12cf908ee 100644
--- a/misc/freebsd-doc-en/pkg-plist.html-common
+++ b/misc/freebsd-doc-en/pkg-plist.html-common
@@ -288,13 +288,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-en/pkg-plist.html-split b/misc/freebsd-doc-en/pkg-plist.html-split
index 926ddc7ca81b..3f72fa3af371 100644
--- a/misc/freebsd-doc-en/pkg-plist.html-split
+++ b/misc/freebsd-doc-en/pkg-plist.html-split
@@ -627,13 +627,19 @@
 %%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/structure-locale.html
 %%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/structure.html
 %%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/stylesheets.html
-%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/the-website-build.html
 %%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/the-website-env.html
 %%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/the-website-install.html
 %%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/the-website.html
 %%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/tools-optional.html
 %%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/tools.html
 %%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/translations.html
+%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/working-copy-checking-out.html
+%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/working-copy-choosing-directory.html
+%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/working-copy-choosing-mirror.html
+%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/working-copy-making-diff.html
+%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/working-copy-revert.html
+%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/working-copy-updating.html
+%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/working-copy.html
 %%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/writing-style-guide.html
 %%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/writing-style-guidelines.html
 %%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/writing-style-word-list.html
@@ -944,14 +950,6 @@
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/using-localization.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/using-sysinstall.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/video-playback.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/vinum-access-bottlenecks.html
-%%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-object-naming.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/vinum-objects.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/vinum-root.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/vinum-vinum.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/virtualization-guest.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/virtualization-host.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/virtualization.html
diff --git a/misc/freebsd-doc-mn/pkg-plist.html-split b/misc/freebsd-doc-mn/pkg-plist.html-split
index 757c2286b5c5..9fe4d532e411 100644
--- a/misc/freebsd-doc-mn/pkg-plist.html-split
+++ b/misc/freebsd-doc-mn/pkg-plist.html-split
@@ -1,5 +1,13 @@
 @comment $FreeBSD$
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/acpi-debug.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/ACPI-debug.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
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/GEOM.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/SMTP-Auth.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/SMTP-UUCP.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/SMTP-dialup.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/acpi-overview.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/adding-swap-space.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/advanced-networking.html
@@ -112,11 +120,6 @@
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/geom-ggate.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/geom-gjournal.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/geom-glabel.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
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/geom.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/getting-started.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/handbook.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/history.html
@@ -263,9 +266,6 @@
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/shells.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/slip.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/small-lan.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/smtp-auth.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/smtp-dialup.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/smtp-uucp.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/snapshots.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/sound-mp3.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/sound-setup.html
@@ -276,6 +276,7 @@
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/system-administration.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/tcpwrappers.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/term.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/trademarks.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/tvcard.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/updating-upgrading-documentation.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/updating-upgrading-freebsdupdate.html