Update to r53886 from the FreeBSD docset.

Approved by:	doceng (implicit)

20 files changed, 31 insertions, 25 deletions

diff --git a/misc/freebsd-doc-all/Makefile b/misc/freebsd-doc-all/Makefile
index 70331ba9adad..f44cd993ab62 100644
--- a/misc/freebsd-doc-all/Makefile
+++ b/misc/freebsd-doc-all/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	freebsd-doc-all
-PORTVERSION=	53688
+PORTVERSION=	53886
 PORTEPOCH=	1
 CATEGORIES=	misc docs
 
diff --git a/misc/freebsd-doc-da/pkg-plist.extras b/misc/freebsd-doc-da/pkg-plist.extras
deleted file mode 100644
index f2317921479a..000000000000
--- a/misc/freebsd-doc-da/pkg-plist.extras
+++ /dev/null
@@ -1,6 +0,0 @@
-%%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-da/pkg-plist.html b/misc/freebsd-doc-da/pkg-plist.html
index f1d1168b23c6..f818e4d4f90a 100644
--- a/misc/freebsd-doc-da/pkg-plist.html
+++ b/misc/freebsd-doc-da/pkg-plist.html
@@ -1,2 +1 @@
 %%DOCSDIR%%/%%DOCLANG%%/articles/ipsec-must/article.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/pxe/article.html
diff --git a/misc/freebsd-doc-da/pkg-plist.html-common b/misc/freebsd-doc-da/pkg-plist.html-common
index ee99ff1f9b64..4b834bccee86 100644
--- a/misc/freebsd-doc-da/pkg-plist.html-common
+++ b/misc/freebsd-doc-da/pkg-plist.html-common
@@ -1,2 +1 @@
 %%DOCSDIR%%/%%DOCLANG%%/articles/ipsec-must/docbook.css
-%%DOCSDIR%%/%%DOCLANG%%/articles/pxe/docbook.css
diff --git a/misc/freebsd-doc-da/pkg-plist.html-split b/misc/freebsd-doc-da/pkg-plist.html-split
index 2ebb4e30afdc..3fe62cdf9435 100644
--- a/misc/freebsd-doc-da/pkg-plist.html-split
+++ b/misc/freebsd-doc-da/pkg-plist.html-split
@@ -7,9 +7,3 @@
 %%DOCSDIR%%/%%DOCLANG%%/articles/ipsec-must/kernel.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/ipsec-must/solution.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/ipsec-must/trademarks.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/pxe/bootstrap-config.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/pxe/custom-postinst-package.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/pxe/index.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/pxe/install-setup.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/pxe/server-config.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/pxe/trademarks.html
diff --git a/misc/freebsd-doc-da/pkg-plist.pdf b/misc/freebsd-doc-da/pkg-plist.pdf
index 8769efaebc94..a02f4e61d1e9 100644
--- a/misc/freebsd-doc-da/pkg-plist.pdf
+++ b/misc/freebsd-doc-da/pkg-plist.pdf
@@ -1,2 +1 @@
 %%DOCSDIR%%/%%DOCLANG%%/articles/ipsec-must/article.pdf
-%%DOCSDIR%%/%%DOCLANG%%/articles/pxe/article.pdf
diff --git a/misc/freebsd-doc-da/pkg-plist.ps b/misc/freebsd-doc-da/pkg-plist.ps
index b1f4b80280a0..6cdf65961a27 100644
--- a/misc/freebsd-doc-da/pkg-plist.ps
+++ b/misc/freebsd-doc-da/pkg-plist.ps
@@ -1,2 +1 @@
 %%DOCSDIR%%/%%DOCLANG%%/articles/ipsec-must/article.ps
-%%DOCSDIR%%/%%DOCLANG%%/articles/pxe/article.ps
diff --git a/misc/freebsd-doc-da/pkg-plist.txt b/misc/freebsd-doc-da/pkg-plist.txt
index 793bd3a1579f..9a767a9f9ba6 100644
--- a/misc/freebsd-doc-da/pkg-plist.txt
+++ b/misc/freebsd-doc-da/pkg-plist.txt
@@ -1,2 +1 @@
 %%DOCSDIR%%/%%DOCLANG%%/articles/ipsec-must/article.txt
-%%DOCSDIR%%/%%DOCLANG%%/articles/pxe/article.txt
diff --git a/misc/freebsd-doc-de/pkg-plist.html-split b/misc/freebsd-doc-de/pkg-plist.html-split
index fe9ea86d5e3b..ed6a33284ebd 100644
--- a/misc/freebsd-doc-de/pkg-plist.html-split
+++ b/misc/freebsd-doc-de/pkg-plist.html-split
@@ -291,6 +291,7 @@
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/eresources.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/filesystems-linux.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/filesystems.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/firewalls-blacklistd.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/firewalls-concepts.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/firewalls-ipf.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/firewalls-ipfw.html
diff --git a/misc/freebsd-doc-en/Makefile b/misc/freebsd-doc-en/Makefile
index 217f60348727..64eaabfdeb05 100644
--- a/misc/freebsd-doc-en/Makefile
+++ b/misc/freebsd-doc-en/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	freebsd-doc
-PORTVERSION=	53688
+PORTVERSION=	53886
 PORTEPOCH=	1
 CATEGORIES=	misc docs
 MASTER_SITES=	LOCAL/blackend
diff --git a/misc/freebsd-doc-en/distinfo b/misc/freebsd-doc-en/distinfo
index 4ac1153994af..a4ab11cea00d 100644
--- a/misc/freebsd-doc-en/distinfo
+++ b/misc/freebsd-doc-en/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1576318190
-SHA256 (freebsd-doc-53688.tar.gz) = 77d958cb4eaf5b07323092c539c88758cb2c87259e40fb2dab7520cb21ec5dae
-SIZE (freebsd-doc-53688.tar.gz) = 65556326
+TIMESTAMP = 1581416017
+SHA256 (freebsd-doc-53886.tar.gz) = 6ae7519fbe4806b70b015024390c31887fab1fd659721448df47a4acf71f0019
+SIZE (freebsd-doc-53886.tar.gz) = 65613833
diff --git a/misc/freebsd-doc-en/pkg-plist.html-split b/misc/freebsd-doc-en/pkg-plist.html-split
index 5ac9488c4a19..064f429704b9 100644
--- a/misc/freebsd-doc-en/pkg-plist.html-split
+++ b/misc/freebsd-doc-en/pkg-plist.html-split
@@ -843,7 +843,7 @@
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/x-install.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/x-understanding.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/x-xdm.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/x11-understanding.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/x11-troubleshooting.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/x11-wm.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/x11.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/zfs-advanced.html
@@ -1055,7 +1055,6 @@
 %%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/uses-xorg-cat.html
 %%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/uses-xorg.html
 %%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/uses-zip.html
-%%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/uses-zope.html
 %%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/uses.html
 %%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/using-autotools.html
 %%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/using-databases.html
diff --git a/misc/freebsd-doc-es/pkg-plist.html b/misc/freebsd-doc-es/pkg-plist.html
index f3821cf49e13..6fa178f67f6c 100644
--- a/misc/freebsd-doc-es/pkg-plist.html
+++ b/misc/freebsd-doc-es/pkg-plist.html
@@ -2,6 +2,7 @@
 %%DOCSDIR%%/%%DOCLANG%%/articles/cups/article.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd/article.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/fdp-es/article.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/filtering-bridges/article.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-questions/article.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/ipsec-must/article.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/leap-seconds/article.html
@@ -10,6 +11,7 @@
 %%DOCSDIR%%/%%DOCLANG%%/articles/nanobsd/article.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/p4-primer/article.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/port-mentor-guidelines/article.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/pr-guidelines/article.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/problem-reports/article.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/releng/article.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/remote-install/article.html
diff --git a/misc/freebsd-doc-es/pkg-plist.html-common b/misc/freebsd-doc-es/pkg-plist.html-common
index 43cf79256f15..11e1302e3014 100644
--- a/misc/freebsd-doc-es/pkg-plist.html-common
+++ b/misc/freebsd-doc-es/pkg-plist.html-common
@@ -2,6 +2,7 @@
 %%DOCSDIR%%/%%DOCLANG%%/articles/cups/docbook.css
 %%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd/docbook.css
 %%DOCSDIR%%/%%DOCLANG%%/articles/fdp-es/docbook.css
+%%DOCSDIR%%/%%DOCLANG%%/articles/filtering-bridges/docbook.css
 %%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-questions/docbook.css
 %%DOCSDIR%%/%%DOCLANG%%/articles/ipsec-must/docbook.css
 %%DOCSDIR%%/%%DOCLANG%%/articles/leap-seconds/docbook.css
@@ -10,6 +11,7 @@
 %%DOCSDIR%%/%%DOCLANG%%/articles/nanobsd/docbook.css
 %%DOCSDIR%%/%%DOCLANG%%/articles/p4-primer/docbook.css
 %%DOCSDIR%%/%%DOCLANG%%/articles/port-mentor-guidelines/docbook.css
+%%DOCSDIR%%/%%DOCLANG%%/articles/pr-guidelines/docbook.css
 %%DOCSDIR%%/%%DOCLANG%%/articles/problem-reports/docbook.css
 %%DOCSDIR%%/%%DOCLANG%%/articles/releng/branches-head.png
 %%DOCSDIR%%/%%DOCLANG%%/articles/releng/branches-releng3.png
diff --git a/misc/freebsd-doc-es/pkg-plist.html-split b/misc/freebsd-doc-es/pkg-plist.html-split
index 71e9171f12c0..0b80ddfe14e7 100644
--- a/misc/freebsd-doc-es/pkg-plist.html-split
+++ b/misc/freebsd-doc-es/pkg-plist.html-split
@@ -25,6 +25,13 @@
 %%DOCSDIR%%/%%DOCLANG%%/articles/fdp-es/index.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/fdp-es/sintaxis.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/fdp-es/voluntarios-fdp-es.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/filtering-bridges/filtering-bridges-contributors.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/filtering-bridges/filtering-bridges-enabling.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/filtering-bridges/filtering-bridges-finalprep.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/filtering-bridges/filtering-bridges-how.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/filtering-bridges/filtering-bridges-ipfirewall.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/filtering-bridges/index.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/filtering-bridges/trademarks.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-questions/ar01s02.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-questions/ar01s03.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-questions/ar01s04.html
@@ -86,6 +93,12 @@
 %%DOCSDIR%%/%%DOCLANG%%/articles/p4-primer/trademarks.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/p4-primer/working-with-diffs.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/port-mentor-guidelines/index.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/pr-guidelines/index.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/pr-guidelines/pr-lifecycle.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/pr-guidelines/pr-states.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/pr-guidelines/pr-types.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/pr-guidelines/references.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/pr-guidelines/trademarks.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/problem-reports/index.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/problem-reports/ix01.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/problem-reports/pr-followup.html
diff --git a/misc/freebsd-doc-es/pkg-plist.pdf b/misc/freebsd-doc-es/pkg-plist.pdf
index c9525574b36a..520b63404e54 100644
--- a/misc/freebsd-doc-es/pkg-plist.pdf
+++ b/misc/freebsd-doc-es/pkg-plist.pdf
@@ -2,6 +2,7 @@
 %%DOCSDIR%%/%%DOCLANG%%/articles/cups/article.pdf
 %%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd/article.pdf
 %%DOCSDIR%%/%%DOCLANG%%/articles/fdp-es/article.pdf
+%%DOCSDIR%%/%%DOCLANG%%/articles/filtering-bridges/article.pdf
 %%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-questions/article.pdf
 %%DOCSDIR%%/%%DOCLANG%%/articles/ipsec-must/article.pdf
 %%DOCSDIR%%/%%DOCLANG%%/articles/leap-seconds/article.pdf
@@ -10,6 +11,7 @@
 %%DOCSDIR%%/%%DOCLANG%%/articles/nanobsd/article.pdf
 %%DOCSDIR%%/%%DOCLANG%%/articles/p4-primer/article.pdf
 %%DOCSDIR%%/%%DOCLANG%%/articles/port-mentor-guidelines/article.pdf
+%%DOCSDIR%%/%%DOCLANG%%/articles/pr-guidelines/article.pdf
 %%DOCSDIR%%/%%DOCLANG%%/articles/problem-reports/article.pdf
 %%DOCSDIR%%/%%DOCLANG%%/articles/releng/article.pdf
 %%DOCSDIR%%/%%DOCLANG%%/articles/remote-install/article.pdf
diff --git a/misc/freebsd-doc-es/pkg-plist.ps b/misc/freebsd-doc-es/pkg-plist.ps
index 020815ff90fb..9748d9e1cc6b 100644
--- a/misc/freebsd-doc-es/pkg-plist.ps
+++ b/misc/freebsd-doc-es/pkg-plist.ps
@@ -2,6 +2,7 @@
 %%DOCSDIR%%/%%DOCLANG%%/articles/cups/article.ps
 %%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd/article.ps
 %%DOCSDIR%%/%%DOCLANG%%/articles/fdp-es/article.ps
+%%DOCSDIR%%/%%DOCLANG%%/articles/filtering-bridges/article.ps
 %%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-questions/article.ps
 %%DOCSDIR%%/%%DOCLANG%%/articles/ipsec-must/article.ps
 %%DOCSDIR%%/%%DOCLANG%%/articles/leap-seconds/article.ps
@@ -10,6 +11,7 @@
 %%DOCSDIR%%/%%DOCLANG%%/articles/nanobsd/article.ps
 %%DOCSDIR%%/%%DOCLANG%%/articles/p4-primer/article.ps
 %%DOCSDIR%%/%%DOCLANG%%/articles/port-mentor-guidelines/article.ps
+%%DOCSDIR%%/%%DOCLANG%%/articles/pr-guidelines/article.ps
 %%DOCSDIR%%/%%DOCLANG%%/articles/problem-reports/article.ps
 %%DOCSDIR%%/%%DOCLANG%%/articles/releng/article.ps
 %%DOCSDIR%%/%%DOCLANG%%/articles/remote-install/article.ps
diff --git a/misc/freebsd-doc-es/pkg-plist.txt b/misc/freebsd-doc-es/pkg-plist.txt
index 318856e4c69a..ded46bcdd0a9 100644
--- a/misc/freebsd-doc-es/pkg-plist.txt
+++ b/misc/freebsd-doc-es/pkg-plist.txt
@@ -2,6 +2,7 @@
 %%DOCSDIR%%/%%DOCLANG%%/articles/cups/article.txt
 %%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd/article.txt
 %%DOCSDIR%%/%%DOCLANG%%/articles/fdp-es/article.txt
+%%DOCSDIR%%/%%DOCLANG%%/articles/filtering-bridges/article.txt
 %%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-questions/article.txt
 %%DOCSDIR%%/%%DOCLANG%%/articles/ipsec-must/article.txt
 %%DOCSDIR%%/%%DOCLANG%%/articles/leap-seconds/article.txt
@@ -10,6 +11,7 @@
 %%DOCSDIR%%/%%DOCLANG%%/articles/nanobsd/article.txt
 %%DOCSDIR%%/%%DOCLANG%%/articles/p4-primer/article.txt
 %%DOCSDIR%%/%%DOCLANG%%/articles/port-mentor-guidelines/article.txt
+%%DOCSDIR%%/%%DOCLANG%%/articles/pr-guidelines/article.txt
 %%DOCSDIR%%/%%DOCLANG%%/articles/problem-reports/article.txt
 %%DOCSDIR%%/%%DOCLANG%%/articles/releng/article.txt
 %%DOCSDIR%%/%%DOCLANG%%/articles/remote-install/article.txt
diff --git a/misc/freebsd-doc-fr/pkg-plist.html-split b/misc/freebsd-doc-fr/pkg-plist.html-split
index 9b796d41f0f6..98a93c7d82bf 100644
--- a/misc/freebsd-doc-fr/pkg-plist.html-split
+++ b/misc/freebsd-doc-fr/pkg-plist.html-split
@@ -472,7 +472,6 @@
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall-final-warning.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall-hardware.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall-install-trouble.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall-netinstall.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall-partitioning.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall-post.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall-pre.html
diff --git a/misc/freebsd-doc-pt/pkg-plist.html-split b/misc/freebsd-doc-pt/pkg-plist.html-split
index 4c6f3c29c616..11edb2553b35 100644
--- a/misc/freebsd-doc-pt/pkg-plist.html-split
+++ b/misc/freebsd-doc-pt/pkg-plist.html-split
@@ -502,6 +502,7 @@
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/eresources.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/filesystems-linux.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/filesystems.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/firewalls-blacklistd.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/firewalls-concepts.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/firewalls-ipf.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/firewalls-ipfw.html