Update to r48074 of the FreeBSD docset.

Approved by:	doceng (implicit)

15 files changed, 53 insertions, 12 deletions

diff --git a/misc/freebsd-doc-all/Makefile b/misc/freebsd-doc-all/Makefile
index 697327e2a3b3..6d5fbb7cbae5 100644
--- a/misc/freebsd-doc-all/Makefile
+++ b/misc/freebsd-doc-all/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	freebsd-doc-all
-PORTVERSION=	47846
+PORTVERSION=	48074
 PORTEPOCH=	1
 CATEGORIES=	misc docs
 
diff --git a/misc/freebsd-doc-da/pkg-plist.common b/misc/freebsd-doc-da/pkg-plist.common
index ca79c6df1138..aa955d5bbae8 100644
--- a/misc/freebsd-doc-da/pkg-plist.common
+++ b/misc/freebsd-doc-da/pkg-plist.common
@@ -1 +1,7 @@
 %%DOCSDIR%%/da
+%%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-de/pkg-plist.html-split b/misc/freebsd-doc-de/pkg-plist.html-split
index 8c855872ba8a..d1b8786b3395 100644
--- a/misc/freebsd-doc-de/pkg-plist.html-split
+++ b/misc/freebsd-doc-de/pkg-plist.html-split
@@ -311,6 +311,7 @@
 %%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-raid3.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/getting-started.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/history.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/index.html
@@ -340,7 +341,6 @@
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/kernelconfig-config.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/kernelconfig-custom-kernel.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/kernelconfig-devices.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/kernelconfig-modules.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/kernelconfig-trouble.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/kernelconfig.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/l10n-basics.html
@@ -479,13 +479,14 @@
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/users-user.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/users.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/using-bsdinstall.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/using-live-cd.html
 %%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/virtualization-guest.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/virtualization-host.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/virtualization.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/x-config-quick-start.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-en/Makefile b/misc/freebsd-doc-en/Makefile
index 4794b41372b3..91288af70a14 100644
--- a/misc/freebsd-doc-en/Makefile
+++ b/misc/freebsd-doc-en/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	freebsd-doc
-PORTVERSION=	47846
+PORTVERSION=	48074
 PORTEPOCH=	1
 CATEGORIES=	misc docs
 MASTER_SITES=	LOCAL/blackend
diff --git a/misc/freebsd-doc-en/distinfo b/misc/freebsd-doc-en/distinfo
index 06d13eb400a3..8bb53516626e 100644
--- a/misc/freebsd-doc-en/distinfo
+++ b/misc/freebsd-doc-en/distinfo
@@ -1,2 +1,2 @@
-SHA256 (freebsd-doc-47846.tar.gz) = 0d4cb396bf427842eab161e05a63503e7afd61fe223ba3c1413fc784aa876ddd
-SIZE (freebsd-doc-47846.tar.gz) = 44414537
+SHA256 (freebsd-doc-48074.tar.gz) = 0f8ba9224f37b46ec721aa378312e9c9cca52422ef37e2d0b298662101d98fec
+SIZE (freebsd-doc-48074.tar.gz) = 44746081
diff --git a/misc/freebsd-doc-en/pkg-plist.html-split b/misc/freebsd-doc-en/pkg-plist.html-split
index 6cdc7c524e0d..df322b543800 100644
--- a/misc/freebsd-doc-en/pkg-plist.html-split
+++ b/misc/freebsd-doc-en/pkg-plist.html-split
@@ -20,6 +20,7 @@
 %%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
 %%DOCSDIR%%/%%DOCLANG%%/articles/committers-guide/commit-log-message.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/committers-guide/committer.types.html
diff --git a/misc/freebsd-doc-ja/pkg-plist.html-split b/misc/freebsd-doc-ja/pkg-plist.html-split
index 373425a49682..95f0cbc876a6 100644
--- a/misc/freebsd-doc-ja/pkg-plist.html-split
+++ b/misc/freebsd-doc-ja/pkg-plist.html-split
@@ -102,11 +102,9 @@
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/bibliography-userguides.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/bibliography.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/book-preface.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/boot-blocks.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/boot-init.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/boot-introduction.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/boot-kernel.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/boot-shutdown.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/boot-splash.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/boot.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall-final-warning.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall-hardware.html
@@ -116,7 +114,7 @@
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall-pre.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall-start.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/ch10s06.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/ch10s07.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/colophon.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/common-tasks.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/config-tuning.html
@@ -177,7 +175,8 @@
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/lang-setup.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/legalnotice.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/linuxemu-lbc-install.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/linuxemu-mathematicau.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/linuxemu-maple.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/linuxemu-mathematica.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/linuxemu-oracle.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/linuxemu.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/mail-advanced.html
@@ -268,11 +267,14 @@
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/using-live-cd.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/using-localization.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/video-playback.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/x-compiz-fusion.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/x-config-quick-start.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/x-config.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/x-fonts.html
 %%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-wm.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/x11.html
 %%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/changes.html
diff --git a/misc/freebsd-doc-ko/pkg-plist.html b/misc/freebsd-doc-ko/pkg-plist.html
index 460c5eee2ce8..75c9d45c30bc 100644
--- a/misc/freebsd-doc-ko/pkg-plist.html
+++ b/misc/freebsd-doc-ko/pkg-plist.html
@@ -1 +1,3 @@
 %%DOCSDIR%%/%%DOCLANG%%/articles/bsdl-gpl/article.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/contributing/article.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd/article.html
diff --git a/misc/freebsd-doc-ko/pkg-plist.html-common b/misc/freebsd-doc-ko/pkg-plist.html-common
index 79e835b957af..dfc3f9359e18 100644
--- a/misc/freebsd-doc-ko/pkg-plist.html-common
+++ b/misc/freebsd-doc-ko/pkg-plist.html-common
@@ -1 +1,3 @@
 %%DOCSDIR%%/%%DOCLANG%%/articles/bsdl-gpl/docbook.css
+%%DOCSDIR%%/%%DOCLANG%%/articles/contributing/docbook.css
+%%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd/docbook.css
diff --git a/misc/freebsd-doc-ko/pkg-plist.html-split b/misc/freebsd-doc-ko/pkg-plist.html-split
index 194eb5528f44..140578497bad 100644
--- a/misc/freebsd-doc-ko/pkg-plist.html-split
+++ b/misc/freebsd-doc-ko/pkg-plist.html-split
@@ -12,3 +12,13 @@
 %%DOCSDIR%%/%%DOCLANG%%/articles/bsdl-gpl/recommendations.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/bsdl-gpl/trademarks.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/bsdl-gpl/unix-license.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/contributing/contrib-how.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/contributing/index.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/contributing/ix01.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/contributing/ports-contributing.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/contributing/trademarks.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd/comparing-bsd-and-linux.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd/index.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd/trademarks.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd/what-a-real-unix.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd/why-is-bsd-not-better-known.html
diff --git a/misc/freebsd-doc-ko/pkg-plist.pdf b/misc/freebsd-doc-ko/pkg-plist.pdf
index a4ff471473ff..8aa65dd0d743 100644
--- a/misc/freebsd-doc-ko/pkg-plist.pdf
+++ b/misc/freebsd-doc-ko/pkg-plist.pdf
@@ -1 +1,3 @@
 %%DOCSDIR%%/%%DOCLANG%%/articles/bsdl-gpl/article.pdf
+%%DOCSDIR%%/%%DOCLANG%%/articles/contributing/article.pdf
+%%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd/article.pdf
diff --git a/misc/freebsd-doc-ko/pkg-plist.ps b/misc/freebsd-doc-ko/pkg-plist.ps
index 18fe7f3dd8e0..3a96bf5bd679 100644
--- a/misc/freebsd-doc-ko/pkg-plist.ps
+++ b/misc/freebsd-doc-ko/pkg-plist.ps
@@ -1 +1,3 @@
 %%DOCSDIR%%/%%DOCLANG%%/articles/bsdl-gpl/article.ps
+%%DOCSDIR%%/%%DOCLANG%%/articles/contributing/article.ps
+%%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd/article.ps
diff --git a/misc/freebsd-doc-ko/pkg-plist.txt b/misc/freebsd-doc-ko/pkg-plist.txt
index 2c953578eace..8081cfb92433 100644
--- a/misc/freebsd-doc-ko/pkg-plist.txt
+++ b/misc/freebsd-doc-ko/pkg-plist.txt
@@ -1 +1,3 @@
 %%DOCSDIR%%/%%DOCLANG%%/articles/bsdl-gpl/article.txt
+%%DOCSDIR%%/%%DOCLANG%%/articles/contributing/article.txt
+%%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd/article.txt
diff --git a/misc/freebsd-doc-ru/pkg-plist.html-split b/misc/freebsd-doc-ru/pkg-plist.html-split
index 5bf9f198a606..b3aabc94a45c 100644
--- a/misc/freebsd-doc-ru/pkg-plist.html-split
+++ b/misc/freebsd-doc-ru/pkg-plist.html-split
@@ -434,8 +434,8 @@
 %%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
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/updating-upgrading-portsnap.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/updating-upgrading.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/usb-disks.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/userppp.html
diff --git a/misc/freebsd-doc-zh_tw/pkg-plist.html-common b/misc/freebsd-doc-zh_tw/pkg-plist.html-common
index db171361885d..10bd2008b6c8 100644
--- a/misc/freebsd-doc-zh_tw/pkg-plist.html-common
+++ b/misc/freebsd-doc-zh_tw/pkg-plist.html-common
@@ -235,7 +235,18 @@
 %%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
+%%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/imagelib/callouts/11.png
+%%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/imagelib/callouts/12.png
+%%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/imagelib/callouts/13.png
+%%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/imagelib/callouts/14.png
+%%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/imagelib/callouts/15.png
+%%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/imagelib/callouts/16.png
+%%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/imagelib/callouts/17.png
+%%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/imagelib/callouts/18.png
+%%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/imagelib/callouts/19.png
 %%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/imagelib/callouts/2.png
+%%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/imagelib/callouts/20.png
+%%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/imagelib/callouts/21.png
 %%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/imagelib/callouts/3.png
 %%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/imagelib/callouts/4.png
 %%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/imagelib/callouts/5.png