11 files changed, 10 insertions, 41 deletions

diff --git a/misc/freebsd-doc-all/Makefile b/misc/freebsd-doc-all/Makefile
index 921d777ecfd8..700dfc58b350 100644
--- a/misc/freebsd-doc-all/Makefile
+++ b/misc/freebsd-doc-all/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	freebsd-doc-all
-PORTVERSION=	42326
+PORTVERSION=	42489
 PORTEPOCH=	1
 CATEGORIES=	misc docs
 MASTER_SITES=	#empty
diff --git a/misc/freebsd-doc-en/Makefile b/misc/freebsd-doc-en/Makefile
index d0038701bd90..97e4ae57e915 100644
--- a/misc/freebsd-doc-en/Makefile
+++ b/misc/freebsd-doc-en/Makefile
@@ -25,7 +25,7 @@
 #
 
 PORTNAME=	freebsd-doc
-PORTVERSION=	42326
+PORTVERSION=	42489
 PORTEPOCH=	1
 CATEGORIES=	misc docs
 MASTER_SITES=	LOCAL/blackend
diff --git a/misc/freebsd-doc-en/distinfo b/misc/freebsd-doc-en/distinfo
index d15109a8f56c..61fd9e1d432f 100644
--- a/misc/freebsd-doc-en/distinfo
+++ b/misc/freebsd-doc-en/distinfo
@@ -1,2 +1,2 @@
-SHA256 (freebsd-doc-42326.tar.gz) = 19f0b52bd56a5796187846f1896cf8d3d7a2cca8cc1ee19db23d4d8ce935fcb8
-SIZE (freebsd-doc-42326.tar.gz) = 32785208
+SHA256 (freebsd-doc-42489.tar.gz) = aacbc05d9085bf88a56967c65967224494811f972e03842617b5a7ce29e75a3b
+SIZE (freebsd-doc-42489.tar.gz) = 32765971
diff --git a/misc/freebsd-doc-en/pkg-plist.html-split b/misc/freebsd-doc-en/pkg-plist.html-split
index 3f72fa3af371..498f060ab236 100644
--- a/misc/freebsd-doc-en/pkg-plist.html-split
+++ b/misc/freebsd-doc-en/pkg-plist.html-split
@@ -605,6 +605,9 @@
 %%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/docbook-markup-inline-elements.html
 %%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/docbook-markup-links.html
 %%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/docbook-markup.html
+%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/editor-config-emacs.html
+%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/editor-config-nano.html
+%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/editor-config.html
 %%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/examples-docbook-article.html
 %%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/examples-formatted.html
 %%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/examples.html
@@ -617,7 +620,6 @@
 %%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/preface-conventions.html
 %%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/preface-notes.html
 %%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/preface.html
-%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/psgml-mode.html
 %%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/see-also-docbook.html
 %%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/see-also-html.html
 %%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/see-also-linuxdoc.html
@@ -638,6 +640,7 @@
 %%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-subversion-references.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
diff --git a/misc/freebsd-doc-fr/pkg-plist.html-split b/misc/freebsd-doc-fr/pkg-plist.html-split
index 846073f9b6ce..c0313ed30a30 100644
--- a/misc/freebsd-doc-fr/pkg-plist.html-split
+++ b/misc/freebsd-doc-fr/pkg-plist.html-split
@@ -282,7 +282,6 @@
 %%DOCSDIR%%/%%DOCLANG%%/books/faq/ch05s03.html
 %%DOCSDIR%%/%%DOCLANG%%/books/faq/ch05s04.html
 %%DOCSDIR%%/%%DOCLANG%%/books/faq/ch06s02.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch06s03.html
 %%DOCSDIR%%/%%DOCLANG%%/books/faq/ch06s04.html
 %%DOCSDIR%%/%%DOCLANG%%/books/faq/ch06s05.html
 %%DOCSDIR%%/%%DOCLANG%%/books/faq/ch06s06.html
@@ -314,7 +313,6 @@
 %%DOCSDIR%%/%%DOCLANG%%/books/faq/ch08s24.html
 %%DOCSDIR%%/%%DOCLANG%%/books/faq/ch08s25.html
 %%DOCSDIR%%/%%DOCLANG%%/books/faq/ch08s26.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch09s02.html
 %%DOCSDIR%%/%%DOCLANG%%/books/faq/ch09s03.html
 %%DOCSDIR%%/%%DOCLANG%%/books/faq/ch09s04.html
 %%DOCSDIR%%/%%DOCLANG%%/books/faq/ch09s05.html
@@ -385,6 +383,7 @@
 %%DOCSDIR%%/%%DOCLANG%%/books/faq/ch13s10.html
 %%DOCSDIR%%/%%DOCLANG%%/books/faq/ch13s11.html
 %%DOCSDIR%%/%%DOCLANG%%/books/faq/commercial.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/emul.html
 %%DOCSDIR%%/%%DOCLANG%%/books/faq/hackers.html
 %%DOCSDIR%%/%%DOCLANG%%/books/faq/hardware.html
 %%DOCSDIR%%/%%DOCLANG%%/books/faq/index.html
@@ -396,6 +395,7 @@
 %%DOCSDIR%%/%%DOCLANG%%/books/faq/network.html
 %%DOCSDIR%%/%%DOCLANG%%/books/faq/serial.html
 %%DOCSDIR%%/%%DOCLANG%%/books/faq/troubleshoot.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/x-and-moused.html
 %%DOCSDIR%%/%%DOCLANG%%/books/faq/x.html
 %%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/ch01s02.html
 %%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/ch02s02.html
diff --git a/misc/freebsd-doc-nl/pkg-plist.common b/misc/freebsd-doc-nl/pkg-plist.common
index a937f9f0d3cd..c1871be883bc 100644
--- a/misc/freebsd-doc-nl/pkg-plist.common
+++ b/misc/freebsd-doc-nl/pkg-plist.common
@@ -1,6 +1,5 @@
 @comment $FreeBSD$
 @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-nl/pkg-plist.html-common b/misc/freebsd-doc-nl/pkg-plist.html-common
index 901680e03f9c..302ac10a9268 100644
--- a/misc/freebsd-doc-nl/pkg-plist.html-common
+++ b/misc/freebsd-doc-nl/pkg-plist.html-common
@@ -153,13 +153,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-nl/pkg-plist.html-split b/misc/freebsd-doc-nl/pkg-plist.html-split
index 69ef5cbbe9df..d643155307b5 100644
--- a/misc/freebsd-doc-nl/pkg-plist.html-split
+++ b/misc/freebsd-doc-nl/pkg-plist.html-split
@@ -318,15 +318,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-intro.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-ru/pkg-plist.common b/misc/freebsd-doc-ru/pkg-plist.common
index dc32bf728fe7..c43da5d1884c 100644
--- a/misc/freebsd-doc-ru/pkg-plist.common
+++ b/misc/freebsd-doc-ru/pkg-plist.common
@@ -1,6 +1,5 @@
 @comment $FreeBSD$
 @dirrm %%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook
-@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-ru/pkg-plist.html-common b/misc/freebsd-doc-ru/pkg-plist.html-common
index 576c84032fef..70bf57f49d1e 100644
--- a/misc/freebsd-doc-ru/pkg-plist.html-common
+++ b/misc/freebsd-doc-ru/pkg-plist.html-common
@@ -188,11 +188,4 @@
 %%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/porters-handbook/docbook.css
diff --git a/misc/freebsd-doc-ru/pkg-plist.html-split b/misc/freebsd-doc-ru/pkg-plist.html-split
index afb9ce81d792..df9ba607d22b 100644
--- a/misc/freebsd-doc-ru/pkg-plist.html-split
+++ b/misc/freebsd-doc-ru/pkg-plist.html-split
@@ -521,15 +521,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-intro.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/x-config.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/x-fonts.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/x-install.html