13 files changed, 18 insertions, 33 deletions
diff --git a/misc/freebsd-doc-all/Makefile b/misc/freebsd-doc-all/Makefile
index bb718df9ed7..7fd4697e07c 100644
--- a/misc/freebsd-doc-all/Makefile
+++ b/misc/freebsd-doc-all/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	freebsd-doc-all
-PORTVERSION=	39187
+PORTVERSION=	39278
 PORTEPOCH=	1
 CATEGORIES=	misc docs
 MASTER_SITES=	#empty
diff --git a/misc/freebsd-doc-en/Makefile b/misc/freebsd-doc-en/Makefile
index 949ce975aff..d9f68e4a60e 100644
--- a/misc/freebsd-doc-en/Makefile
+++ b/misc/freebsd-doc-en/Makefile
@@ -28,7 +28,7 @@
 #
 
 PORTNAME=	freebsd-doc
-PORTVERSION=	39187
+PORTVERSION=	39278
 PORTEPOCH=	1
 CATEGORIES=	misc docs
 MASTER_SITES=	LOCAL/blackend
diff --git a/misc/freebsd-doc-en/distinfo b/misc/freebsd-doc-en/distinfo
index ccb45e28060..17b5f3590ad 100644
--- a/misc/freebsd-doc-en/distinfo
+++ b/misc/freebsd-doc-en/distinfo
@@ -1,2 +1,2 @@
-SHA256 (freebsd-doc-39187.tar.gz) = b46d90452a19fb462d81c1f201ee6e8e87d1478b83474fe42803317225df7a76
-SIZE (freebsd-doc-39187.tar.gz) = 24463750
+SHA256 (freebsd-doc-39278.tar.gz) = bb1ffa7096157d67b9551630b2f03da5c3d97c398d5b419bccacd707da7bf9aa
+SIZE (freebsd-doc-39278.tar.gz) = 24474509
diff --git a/misc/freebsd-doc-en/pkg-plist.common b/misc/freebsd-doc-en/pkg-plist.common
index 3db0871d4f2..58c7aa57cc3 100644
--- a/misc/freebsd-doc-en/pkg-plist.common
+++ b/misc/freebsd-doc-en/pkg-plist.common
@@ -46,7 +46,6 @@
 @dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/rc-scripting/imagelib/callouts
 @dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/rc-scripting/imagelib
 @dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/rc-scripting
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/pxe
 @dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/problem-reports
 @dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/pr-guidelines
 @dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/portbuild
diff --git a/misc/freebsd-doc-en/pkg-plist.extras b/misc/freebsd-doc-en/pkg-plist.extras
index e12a0d59e0f..25254ef165a 100644
--- a/misc/freebsd-doc-en/pkg-plist.extras
+++ b/misc/freebsd-doc-en/pkg-plist.extras
@@ -4,9 +4,3 @@
 %%DOCSDIR%%/%%DOCLANG%%/articles/fbsd-from-scratch/stage_2.conf.default
 %%DOCSDIR%%/%%DOCLANG%%/articles/fbsd-from-scratch/stage_2.sh
 %%DOCSDIR%%/%%DOCLANG%%/articles/fbsd-from-scratch/stage_3.mk
-%%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-en/pkg-plist.html b/misc/freebsd-doc-en/pkg-plist.html
index 3091a98631b..68b89820877 100644
--- a/misc/freebsd-doc-en/pkg-plist.html
+++ b/misc/freebsd-doc-en/pkg-plist.html
@@ -45,7 +45,6 @@
 %%DOCSDIR%%/%%DOCLANG%%/articles/portbuild/article.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/pr-guidelines/article.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/problem-reports/article.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/pxe/article.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/rc-scripting/article.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/relaydelay/article.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/releng-packages/article.html
diff --git a/misc/freebsd-doc-en/pkg-plist.html-common b/misc/freebsd-doc-en/pkg-plist.html-common
index ddd0c5aa546..445dd4abcf7 100644
--- a/misc/freebsd-doc-en/pkg-plist.html-common
+++ b/misc/freebsd-doc-en/pkg-plist.html-common
@@ -60,7 +60,6 @@
 %%DOCSDIR%%/%%DOCLANG%%/articles/portbuild/docbook.css
 %%DOCSDIR%%/%%DOCLANG%%/articles/pr-guidelines/docbook.css
 %%DOCSDIR%%/%%DOCLANG%%/articles/problem-reports/docbook.css
-%%DOCSDIR%%/%%DOCLANG%%/articles/pxe/docbook.css
 %%DOCSDIR%%/%%DOCLANG%%/articles/rc-scripting/docbook.css
 %%DOCSDIR%%/%%DOCLANG%%/articles/rc-scripting/imagelib/callouts/1.png
 %%DOCSDIR%%/%%DOCLANG%%/articles/rc-scripting/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 0793b124c77..934aae42759 100644
--- a/misc/freebsd-doc-en/pkg-plist.html-split
+++ b/misc/freebsd-doc-en/pkg-plist.html-split
@@ -54,7 +54,6 @@
 %%DOCSDIR%%/%%DOCLANG%%/articles/committers-guide/rules.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/committers-guide/ssh.guide.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/committers-guide/subversion-primer.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/committers-guide/vcs.operations.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/compiz-fusion/TRADEMARKS.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/compiz-fusion/compiz-fusion.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/compiz-fusion/compiz-troubleshooting.html
@@ -355,13 +354,6 @@
 %%DOCSDIR%%/%%DOCLANG%%/articles/problem-reports/pr-problems.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/problem-reports/pr-when.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/problem-reports/pr-writing.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/pxe/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/introduction.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/pxe/server-config.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/rc-scripting/TRADEMARKS.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/rc-scripting/index.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/rc-scripting/rcng-args.html
@@ -1083,8 +1075,8 @@
 %%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/build-cluster.html
 %%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/building.html
 %%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/conflicts.html
-%%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/cvsweb.html
 %%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/dads-after-port-mk.html
+%%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/dads-avoiding-linuxisms.html
 %%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/dads-cc.html
 %%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/dads-cflags.html
 %%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/dads-deprecated.html
@@ -1144,6 +1136,7 @@
 %%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/portsmon.html
 %%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/quick-porting.html
 %%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/rc-scripts.html
+%%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/requiring-kernel-sources.html
 %%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/security-fix.html
 %%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/security-notify.html
 %%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/security.html
@@ -1154,6 +1147,7 @@
 %%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/slow-user-input.html
 %%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/slow.html
 %%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/special.html
+%%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/svnweb.html
 %%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/testing-portlint.html
 %%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/testing-porttools.html
 %%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/testing-tinderbox.html
@@ -1170,6 +1164,7 @@
 %%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/using-mozilla.html
 %%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/using-perl.html
 %%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/using-php.html
+%%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/using-pkg-config.html
 %%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/using-python.html
 %%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/using-qt.html
 %%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/using-ruby.html
@@ -1180,4 +1175,3 @@
 %%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/using-x11.html
 %%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/using-xfce.html
 %%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/why-port.html
-%%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/x5802.html
diff --git a/misc/freebsd-doc-en/pkg-plist.pdf b/misc/freebsd-doc-en/pkg-plist.pdf
index fc7cdbcc8d4..9e847650ba6 100644
--- a/misc/freebsd-doc-en/pkg-plist.pdf
+++ b/misc/freebsd-doc-en/pkg-plist.pdf
@@ -45,7 +45,6 @@
 %%DOCSDIR%%/%%DOCLANG%%/articles/portbuild/article.pdf
 %%DOCSDIR%%/%%DOCLANG%%/articles/pr-guidelines/article.pdf
 %%DOCSDIR%%/%%DOCLANG%%/articles/problem-reports/article.pdf
-%%DOCSDIR%%/%%DOCLANG%%/articles/pxe/article.pdf
 %%DOCSDIR%%/%%DOCLANG%%/articles/rc-scripting/article.pdf
 %%DOCSDIR%%/%%DOCLANG%%/articles/relaydelay/article.pdf
 %%DOCSDIR%%/%%DOCLANG%%/articles/releng-packages/article.pdf
diff --git a/misc/freebsd-doc-en/pkg-plist.ps b/misc/freebsd-doc-en/pkg-plist.ps
index 394945aa0d2..8361bfddefc 100644
--- a/misc/freebsd-doc-en/pkg-plist.ps
+++ b/misc/freebsd-doc-en/pkg-plist.ps
@@ -45,7 +45,6 @@
 %%DOCSDIR%%/%%DOCLANG%%/articles/portbuild/article.ps
 %%DOCSDIR%%/%%DOCLANG%%/articles/pr-guidelines/article.ps
 %%DOCSDIR%%/%%DOCLANG%%/articles/problem-reports/article.ps
-%%DOCSDIR%%/%%DOCLANG%%/articles/pxe/article.ps
 %%DOCSDIR%%/%%DOCLANG%%/articles/rc-scripting/article.ps
 %%DOCSDIR%%/%%DOCLANG%%/articles/relaydelay/article.ps
 %%DOCSDIR%%/%%DOCLANG%%/articles/releng-packages/article.ps
diff --git a/misc/freebsd-doc-en/pkg-plist.txt b/misc/freebsd-doc-en/pkg-plist.txt
index 1d17632cc82..20187a3440e 100644
--- a/misc/freebsd-doc-en/pkg-plist.txt
+++ b/misc/freebsd-doc-en/pkg-plist.txt
@@ -47,7 +47,6 @@
 %%DOCSDIR%%/%%DOCLANG%%/articles/portbuild/article.txt
 %%DOCSDIR%%/%%DOCLANG%%/articles/pr-guidelines/article.txt
 %%DOCSDIR%%/%%DOCLANG%%/articles/problem-reports/article.txt
-%%DOCSDIR%%/%%DOCLANG%%/articles/pxe/article.txt
 %%DOCSDIR%%/%%DOCLANG%%/articles/rc-scripting/article.txt
 %%DOCSDIR%%/%%DOCLANG%%/articles/relaydelay/article.txt
 %%DOCSDIR%%/%%DOCLANG%%/articles/releng-packages/article.txt
diff --git a/misc/freebsd-doc-ja/pkg-plist.html-split b/misc/freebsd-doc-ja/pkg-plist.html-split
index 270bc517ad3..d0f4a65d5c6 100644
--- a/misc/freebsd-doc-ja/pkg-plist.html-split
+++ b/misc/freebsd-doc-ja/pkg-plist.html-split
@@ -296,8 +296,10 @@
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/updating-upgrading-portsnap.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/updating-upgrading.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/userppp.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/users-limiting-and-personalizing.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/users-groups.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/users-limiting.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/users-modifying.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/users-personalizing.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/users-superuser.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/users-system.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/users-user.html
@@ -313,10 +315,10 @@
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/x-xdm.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/x11-wm.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/x11.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/x15516.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/x32076.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/x32120.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/x32164.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/x15539.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/x32248.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/x32292.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/x32336.html
 %%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/LEGALNOTICE.html
 %%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/changes.html
 %%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/dads-after-port-mk.html
diff --git a/misc/freebsd-doc-ru/pkg-plist.html-split b/misc/freebsd-doc-ru/pkg-plist.html-split
index 07f3bada0f7..ebf1dc555f1 100644
--- a/misc/freebsd-doc-ru/pkg-plist.html-split
+++ b/misc/freebsd-doc-ru/pkg-plist.html-split
@@ -588,8 +588,8 @@
 %%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/build-cluster.html
 %%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/building.html
 %%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/conflicts.html
-%%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/cvsweb.html
 %%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/dads-after-port-mk.html
+%%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/dads-avoiding-linuxisms.html
 %%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/dads-cc.html
 %%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/dads-cflags.html
 %%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/dads-deprecated.html
@@ -659,6 +659,7 @@
 %%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/slow-user-input.html
 %%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/slow.html
 %%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/special.html
+%%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/svnweb.html
 %%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/testing-portlint.html
 %%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/testing-porttools.html
 %%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/testing-tinderbox.html
@@ -685,7 +686,7 @@
 %%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/using-x11.html
 %%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/using-xfce.html
 %%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/why-port.html
-%%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/x5716.html
+%%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/x5788.html
 %%DOCSDIR%%/%%DOCLANG%%/books/ppp-primer/c30.html
 %%DOCSDIR%%/%%DOCLANG%%/books/ppp-primer/c309.html
 %%DOCSDIR%%/%%DOCLANG%%/books/ppp-primer/c833.html