MFH: r468622 r470988

Update to r51585 from the FreeBSD docset.

Approved by:	doceng (implicit)

Update to r51730 from the FreeBSD docset (a.k.a. 11.2-R version)

Approved by:	doceng (implicit)

Approved by:	portmgr (blanket)

misc/freebsd-doc-all/Makefile

@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	freebsd-doc-all
-PORTVERSION=	51513
+PORTVERSION=	51730
 PORTEPOCH=	1
 CATEGORIES=	misc docs
 

misc/freebsd-doc-de/pkg-plist.html-split

@@ -430,7 +430,6 @@
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/snapshots.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/sound-mp3.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/sound-setup.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/svn-mirrors.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/svn.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/swap-encrypting.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/system-administration.html

misc/freebsd-doc-en/Makefile

@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	freebsd-doc
-PORTVERSION=	51513
+PORTVERSION=	51730
 PORTEPOCH=	1
 CATEGORIES=	misc docs
 MASTER_SITES=	LOCAL/blackend

misc/freebsd-doc-en/distinfo

@@ -1,3 +1,3 @@
-TIMESTAMP = 1521982403
-SHA256 (freebsd-doc-51513.tar.gz) = 30257ae0b3a31fc885cd7b9e9a0690a02d6a17a93cbb7544c6db57a932bf777b
-SIZE (freebsd-doc-51513.tar.gz) = 56401346
+TIMESTAMP = 1527351263
+SHA256 (freebsd-doc-51730.tar.gz) = 798d47285ee3377d58cd51e57276cc9b8456c13f310b66a196b52225713c5d68
+SIZE (freebsd-doc-51730.tar.gz) = 56540577

misc/freebsd-doc-en/pkg-plist.html

@@ -21,7 +21,6 @@
 %%DOCSDIR%%/%%DOCLANG%%/articles/mailing-list-faq/article.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/nanobsd/article.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/new-users/article.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/p4-primer/article.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/pam/article.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/pgpkeys/article.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/port-mentor-guidelines/article.html

misc/freebsd-doc-en/pkg-plist.html-common

@@ -40,7 +40,6 @@
 %%DOCSDIR%%/%%DOCLANG%%/articles/nanobsd/imagelib/callouts/3.png
 %%DOCSDIR%%/%%DOCLANG%%/articles/nanobsd/imagelib/callouts/4.png
 %%DOCSDIR%%/%%DOCLANG%%/articles/new-users/docbook.css
-%%DOCSDIR%%/%%DOCLANG%%/articles/p4-primer/docbook.css
 %%DOCSDIR%%/%%DOCLANG%%/articles/pam/docbook.css
 %%DOCSDIR%%/%%DOCLANG%%/articles/pgpkeys/docbook.css
 %%DOCSDIR%%/%%DOCLANG%%/articles/port-mentor-guidelines/docbook.css

misc/freebsd-doc-en/pkg-plist.html-split

@@ -18,7 +18,6 @@
 %%DOCSDIR%%/%%DOCLANG%%/articles/building-products/freebsd-intro.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/building-products/index.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/building-products/trademarks.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/committers-guide/ar01s13.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/committers-guide/archs.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/committers-guide/benefits.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/committers-guide/bugzilla.html
@@ -35,6 +34,7 @@
 %%DOCSDIR%%/%%DOCLANG%%/articles/committers-guide/non-committers.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/committers-guide/people.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/committers-guide/pgpkeys.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/committers-guide/phabricator.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/committers-guide/ports.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/committers-guide/pref-license.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/committers-guide/rules.html
@@ -197,23 +197,6 @@
 %%DOCSDIR%%/%%DOCLANG%%/articles/new-users/other.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/new-users/trademarks.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/new-users/your-working-environment.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/p4-primer/Integrations.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/p4-primer/add-rm-files.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/p4-primer/branches.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/p4-primer/changes.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/p4-primer/clients.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/p4-primer/diffs.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/p4-primer/editing.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/p4-primer/freebsd-cvs-and-p4.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/p4-primer/index.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/p4-primer/offline-ops.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/p4-primer/renaming-files.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/p4-primer/soc.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/p4-primer/start.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/p4-primer/submit.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/p4-primer/syncing.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/p4-primer/trademarks.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/p4-primer/working-with-diffs.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/pam/index.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/pam/pam-appl-prog.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/pam/pam-config.html
@@ -435,7 +418,6 @@
 %%DOCSDIR%%/%%DOCLANG%%/books/dev-model/sub-project-documentation.html
 %%DOCSDIR%%/%%DOCLANG%%/books/dev-model/sub-projects.html
 %%DOCSDIR%%/%%DOCLANG%%/books/dev-model/tool-bugzilla.html
-%%DOCSDIR%%/%%DOCLANG%%/books/dev-model/tool-perforce.html
 %%DOCSDIR%%/%%DOCLANG%%/books/dev-model/tool-pgp.html
 %%DOCSDIR%%/%%DOCLANG%%/books/dev-model/tool-ssh2.html
 %%DOCSDIR%%/%%DOCLANG%%/books/dev-model/tools.html
@@ -457,7 +439,6 @@
 %%DOCSDIR%%/%%DOCLANG%%/books/developers-handbook/kernelbuild.html
 %%DOCSDIR%%/%%DOCLANG%%/books/developers-handbook/kerneldebug-console.html
 %%DOCSDIR%%/%%DOCLANG%%/books/developers-handbook/kerneldebug-dcons.html
-%%DOCSDIR%%/%%DOCLANG%%/books/developers-handbook/kerneldebug-ddd.html
 %%DOCSDIR%%/%%DOCLANG%%/books/developers-handbook/kerneldebug-deadlocks.html
 %%DOCSDIR%%/%%DOCLANG%%/books/developers-handbook/kerneldebug-gdb.html
 %%DOCSDIR%%/%%DOCLANG%%/books/developers-handbook/kerneldebug-online-ddb.html
@@ -919,7 +900,8 @@
 %%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.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
 %%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/flavors.html
 %%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/gnome-components.html
@@ -1011,6 +993,7 @@
 %%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/uses-bdb.html
 %%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/uses-bison.html
 %%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/uses-blaslapack.html
+%%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/uses-cargo.html
 %%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/uses-charsetfix.html
 %%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/uses-cmake.html
 %%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/uses-compiler.html

misc/freebsd-doc-en/pkg-plist.txt

@@ -21,7 +21,6 @@
 %%DOCSDIR%%/%%DOCLANG%%/articles/mailing-list-faq/article.txt
 %%DOCSDIR%%/%%DOCLANG%%/articles/nanobsd/article.txt
 %%DOCSDIR%%/%%DOCLANG%%/articles/new-users/article.txt
-%%DOCSDIR%%/%%DOCLANG%%/articles/p4-primer/article.txt
 %%DOCSDIR%%/%%DOCLANG%%/articles/pam/article.txt
 %%DOCSDIR%%/%%DOCLANG%%/articles/pgpkeys/article.txt
 %%DOCSDIR%%/%%DOCLANG%%/articles/port-mentor-guidelines/article.txt