MFH: r561911 r566314

Update to r85c9d788f8 from the FreeBSD docset.

Approved by:	doceng (implicit)

Update to 0cff342f42461c5081b98bce7581f43df319e4f4 version from the
FreeBSD docset (a.k.a. 13.0-R version)

Approved by:	doceng (implicit)

Approved by:	portmgr (blanket)

8 files changed, 49 insertions, 8 deletions

diff --git a/misc/freebsd-doc-all/Makefile b/misc/freebsd-doc-all/Makefile
index b82b9e4ac1ae..21e733a438ec 100644
--- a/misc/freebsd-doc-all/Makefile
+++ b/misc/freebsd-doc-all/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	freebsd-doc-all
-PORTVERSION=	54536
+PORTVERSION=	20210125
 PORTEPOCH=	1
 CATEGORIES=	misc docs
 
diff --git a/misc/freebsd-doc-en/Makefile b/misc/freebsd-doc-en/Makefile
index 52a359361ed2..a82aa24b5db3 100644
--- a/misc/freebsd-doc-en/Makefile
+++ b/misc/freebsd-doc-en/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	freebsd-doc
-PORTVERSION=	54536
+PORTVERSION=	20210125
 PORTEPOCH=	1
 CATEGORIES=	misc docs
 MASTER_SITES=	LOCAL/blackend
diff --git a/misc/freebsd-doc-en/distinfo b/misc/freebsd-doc-en/distinfo
index 8a46b35885ee..2636fa2c8db8 100644
--- a/misc/freebsd-doc-en/distinfo
+++ b/misc/freebsd-doc-en/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1601109444
-SHA256 (freebsd-doc-54536.tar.gz) = 3391ab0670ae189af455be55b1a4a2cecc1f85efd90c5264a81ac44057e8dd26
-SIZE (freebsd-doc-54536.tar.gz) = 70259253
+TIMESTAMP = 1613933154
+SHA256 (freebsd-doc-20210125.tar.gz) = 7b77b11978f7e42b7e9bb71c4d428ffb489288f023a8b5811db1b626957acd0a
+SIZE (freebsd-doc-20210125.tar.gz) = 75833878
diff --git a/misc/freebsd-doc-en/pkg-plist.html-common b/misc/freebsd-doc-en/pkg-plist.html-common
index 1f6b5d563d31..21fb28a93cb0 100644
--- a/misc/freebsd-doc-en/pkg-plist.html-common
+++ b/misc/freebsd-doc-en/pkg-plist.html-common
@@ -281,6 +281,34 @@
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/virtualization/vmware-freebsd10.png
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/virtualization/vmware-freebsd11.png
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/virtualization/vmware-freebsd12.png
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/wine/homura-install-1.png
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/wine/homura-install-2.png
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/wine/homura-install-3.png
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/wine/homura-install-4.png
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/wine/homura-install-5.png
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/wine/homura-install-6.png
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/wine/homura-install-7.png
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/wine/homura-install-8.png
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/wine/homura-launch-1.png
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/wine/homura-run-2.png
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/wine/homura-run-3.png
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/wine/homura-uninstall-1.png
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/wine/wine-config-1.png
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/wine/wine-config-2.png
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/wine/wine-config-3.png
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/wine/wine-config-4.png
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/wine/wine-config-5.png
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/wine/wine-config-6.png
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/wine/wine-config-7.png
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/wine/wine-run-np++-1.png
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/wine/winetricks-app-install-1.png
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/wine/winetricks-app-install-2.png
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/wine/winetricks-menu-1.png
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/wine/winetricks-run-1.png
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/wine/winetricks-run-2.png
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/wine/winetricks-uninstall-1.png
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/wine/winetricks-uninstall-2.png
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/wine/winetricks-uninstall-3.png
 %%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/docbook.css
 %%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/imagelib/callouts/1.png
 %%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/imagelib/callouts/10.png
diff --git a/misc/freebsd-doc-en/pkg-plist.html-split b/misc/freebsd-doc-en/pkg-plist.html-split
index 72dcee6f14f5..ffde857017eb 100644
--- a/misc/freebsd-doc-en/pkg-plist.html-split
+++ b/misc/freebsd-doc-en/pkg-plist.html-split
@@ -103,6 +103,7 @@
 %%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-questions/trademarks.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-releng/index.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-releng/releng-building.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-releng/releng-eol.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-releng/releng-head.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-releng/releng-mirrors.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-releng/releng-prep.html
@@ -542,6 +543,7 @@
 %%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/manpages-resources.html
 %%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/manpages-sample-structures.html
 %%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/manpages-sections.html
+%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/manpages-testing.html
 %%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/manpages.html
 %%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/overview-doc.html
 %%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/overview.html
@@ -646,6 +648,7 @@
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/configtuning-sysctl.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/configtuning-syslog.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/configtuning-virtual-hosts.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/configuring-wine-installation.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/consoles.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/creating-cds.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/creating-dvds.html
@@ -698,6 +701,7 @@
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/handbook.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/history.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/index.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/installing-wine-on-freebsd.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/introduction.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/ipsec.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/ix01.html
@@ -792,6 +796,7 @@
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/printing-pdls.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/printing.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/quotas.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/running-first-wine-program.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/scanners.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/security-accounting.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/security-advisories.html
@@ -838,6 +843,11 @@
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/virtualization-host-virtualbox.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/virtualization-host-xen.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/virtualization.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/wine-in-multi-user-os-installations.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/wine-management-guis.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/wine-on-os-faq.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/wine-overview-concepts.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/wine.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/x-compiz-fusion.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/x-config.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/x-fonts.html
@@ -877,6 +887,7 @@
 %%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/dads-use-posix-standards.html
 %%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/dads-verbose-logs.html
 %%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/distfile-survey.html
+%%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/flavors-auto-lua.html
 %%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/flavors-auto-php.html
 %%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/flavors-auto-python.html
 %%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/flavors-using.html
@@ -982,6 +993,7 @@
 %%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/uses-display.html
 %%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/uses-dos2unix.html
 %%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/uses-drupal.html
+%%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/uses-eigen.html
 %%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/uses-fakeroot.html
 %%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/uses-fam.html
 %%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/uses-firebird.html
diff --git a/misc/freebsd-doc-fr/pkg-plist.html-split b/misc/freebsd-doc-fr/pkg-plist.html-split
index c531e577f063..9a2bf49281ee 100644
--- a/misc/freebsd-doc-fr/pkg-plist.html-split
+++ b/misc/freebsd-doc-fr/pkg-plist.html-split
@@ -699,6 +699,7 @@
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/virtualization-guest.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/virtualization-host.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/virtualization.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/x-compiz-fusion.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/x-config.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/x-fonts.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/x-install.html
diff --git a/misc/freebsd-doc-ja/pkg-plist.html-split b/misc/freebsd-doc-ja/pkg-plist.html-split
index 7e779d4f43d4..8e280a1d53e8 100644
--- a/misc/freebsd-doc-ja/pkg-plist.html-split
+++ b/misc/freebsd-doc-ja/pkg-plist.html-split
@@ -134,7 +134,6 @@
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/configtuning-virtual-hosts.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/consoles.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/creating-cds.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/crypt.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/current-stable.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/desktop-browsers.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/desktop-finance.html
@@ -173,7 +172,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
@@ -236,7 +234,6 @@
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/quotas.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/raid.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/scanners.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/securing-freebsd.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/security-accounting.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/security-advisories.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/security-intro.html
diff --git a/misc/freebsd-doc-pt/pkg-plist.html-split b/misc/freebsd-doc-pt/pkg-plist.html-split
index 9a4c940c4ec7..9d6e3f0df654 100644
--- a/misc/freebsd-doc-pt/pkg-plist.html-split
+++ b/misc/freebsd-doc-pt/pkg-plist.html-split
@@ -103,6 +103,7 @@
 %%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-questions/trademarks.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-releng/index.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-releng/releng-building.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-releng/releng-eol.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-releng/releng-head.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-releng/releng-mirrors.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-releng/releng-prep.html
@@ -452,6 +453,7 @@
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall-fetching-distribution.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall-hardware.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall-install-trouble.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall-network.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall-partitioning.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall-post.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall-pre.html
@@ -702,6 +704,7 @@
 %%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/dads-use-posix-standards.html
 %%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/dads-verbose-logs.html
 %%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/distfile-survey.html
+%%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/flavors-auto-lua.html
 %%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/flavors-auto-php.html
 %%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/flavors-auto-python.html
 %%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/flavors-using.html