14 files changed, 27 insertions, 14 deletions

diff --git a/misc/freebsd-doc-all/Makefile b/misc/freebsd-doc-all/Makefile
index 3ef7c0487e61..1cb1105290fe 100644
--- a/misc/freebsd-doc-all/Makefile
+++ b/misc/freebsd-doc-all/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	freebsd-doc-all
-PORTVERSION=	20110710
+PORTVERSION=	20110828
 CATEGORIES=	misc docs
 MASTER_SITES=	#empty
 DISTFILES=	#empty
diff --git a/misc/freebsd-doc-de/pkg-plist.html-split b/misc/freebsd-doc-de/pkg-plist.html-split
index e1e9957a72a8..6314039b1b0a 100644
--- a/misc/freebsd-doc-de/pkg-plist.html-split
+++ b/misc/freebsd-doc-de/pkg-plist.html-split
@@ -573,6 +573,7 @@
 %%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/using-java.html
 %%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/using-kde.html
 %%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/using-lua.html
+%%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-python.html
@@ -585,4 +586,4 @@
 %%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/x5549.html
+%%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/x5605.html
diff --git a/misc/freebsd-doc-en/Makefile b/misc/freebsd-doc-en/Makefile
index dbfcb4febf34..fdda4e434f56 100644
--- a/misc/freebsd-doc-en/Makefile
+++ b/misc/freebsd-doc-en/Makefile
@@ -28,7 +28,7 @@
 #
 
 PORTNAME=	freebsd-doc
-PORTVERSION=	20110710
+PORTVERSION=	20110828
 CATEGORIES=	misc docs
 MASTER_SITES=	LOCAL/blackend
 PKGNAMEPREFIX?=	en-
diff --git a/misc/freebsd-doc-en/distinfo b/misc/freebsd-doc-en/distinfo
index 00decbc7344c..97adbdf4f131 100644
--- a/misc/freebsd-doc-en/distinfo
+++ b/misc/freebsd-doc-en/distinfo
@@ -1,2 +1,2 @@
-SHA256 (freebsd-doc-20110710.tar.gz) = 8fb02fc38aed5c4b4b12ad0dc97f5f35457d7c7335622e51a246c6414fd9718d
-SIZE (freebsd-doc-20110710.tar.gz) = 27708905
+SHA256 (freebsd-doc-20110828.tar.gz) = 3d67e55688e6c1c097eaf088f54104aca0df45fcf2320b5ec9d0373578a75018
+SIZE (freebsd-doc-20110828.tar.gz) = 27732200
diff --git a/misc/freebsd-doc-en/pkg-plist.common b/misc/freebsd-doc-en/pkg-plist.common
index f4c74cdb6b60..2b0bddfe5b5e 100644
--- a/misc/freebsd-doc-en/pkg-plist.common
+++ b/misc/freebsd-doc-en/pkg-plist.common
@@ -49,6 +49,7 @@
 @dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/problem-reports
 @dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/pr-guidelines
 @dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/portbuild
+@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/port-mentor-guidelines
 @dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/pam
 @dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/p4-primer
 @dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/new-users
diff --git a/misc/freebsd-doc-en/pkg-plist.html b/misc/freebsd-doc-en/pkg-plist.html
index 90cd307b8cab..3091a98631bc 100644
--- a/misc/freebsd-doc-en/pkg-plist.html
+++ b/misc/freebsd-doc-en/pkg-plist.html
@@ -41,6 +41,7 @@
 %%DOCSDIR%%/%%DOCLANG%%/articles/new-users/article.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/p4-primer/article.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/pam/article.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/port-mentor-guidelines/article.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/portbuild/article.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/pr-guidelines/article.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/problem-reports/article.html
diff --git a/misc/freebsd-doc-en/pkg-plist.html-common b/misc/freebsd-doc-en/pkg-plist.html-common
index 54f414de2408..32e2fd4da323 100644
--- a/misc/freebsd-doc-en/pkg-plist.html-common
+++ b/misc/freebsd-doc-en/pkg-plist.html-common
@@ -56,6 +56,7 @@
 %%DOCSDIR%%/%%DOCLANG%%/articles/new-users/docbook.css
 %%DOCSDIR%%/%%DOCLANG%%/articles/p4-primer/docbook.css
 %%DOCSDIR%%/%%DOCLANG%%/articles/pam/docbook.css
+%%DOCSDIR%%/%%DOCLANG%%/articles/port-mentor-guidelines/docbook.css
 %%DOCSDIR%%/%%DOCLANG%%/articles/portbuild/docbook.css
 %%DOCSDIR%%/%%DOCLANG%%/articles/pr-guidelines/docbook.css
 %%DOCSDIR%%/%%DOCLANG%%/articles/problem-reports/docbook.css
diff --git a/misc/freebsd-doc-en/pkg-plist.html-split b/misc/freebsd-doc-en/pkg-plist.html-split
index 057e5ba95ee7..6d36fd99d5ce 100644
--- a/misc/freebsd-doc-en/pkg-plist.html-split
+++ b/misc/freebsd-doc-en/pkg-plist.html-split
@@ -233,7 +233,6 @@
 %%DOCSDIR%%/%%DOCLANG%%/articles/ldap-auth/ssl-ca.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/ldap-auth/useful.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/linux-comparison/TRADEMARKS.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/linux-comparison/freebsd-addenda.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/linux-comparison/freebsd-advantages.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/linux-comparison/freebsd-conclusion.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/linux-comparison/freebsd-features.html
@@ -320,6 +319,7 @@
 %%DOCSDIR%%/%%DOCLANG%%/articles/pam/pam-sample-conv.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/pam/pam-sample-module.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/pam/pam-terms.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/port-mentor-guidelines/index.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/portbuild/TRADEMARKS.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/portbuild/anatomy.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/portbuild/build-maintenance.html
@@ -1158,4 +1158,4 @@
 %%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/x5601.html
+%%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/x5575.html
diff --git a/misc/freebsd-doc-en/pkg-plist.pdf b/misc/freebsd-doc-en/pkg-plist.pdf
index cb122508f58a..fc7cdbcc8d4e 100644
--- a/misc/freebsd-doc-en/pkg-plist.pdf
+++ b/misc/freebsd-doc-en/pkg-plist.pdf
@@ -41,6 +41,7 @@
 %%DOCSDIR%%/%%DOCLANG%%/articles/new-users/article.pdf
 %%DOCSDIR%%/%%DOCLANG%%/articles/p4-primer/article.pdf
 %%DOCSDIR%%/%%DOCLANG%%/articles/pam/article.pdf
+%%DOCSDIR%%/%%DOCLANG%%/articles/port-mentor-guidelines/article.pdf
 %%DOCSDIR%%/%%DOCLANG%%/articles/portbuild/article.pdf
 %%DOCSDIR%%/%%DOCLANG%%/articles/pr-guidelines/article.pdf
 %%DOCSDIR%%/%%DOCLANG%%/articles/problem-reports/article.pdf
diff --git a/misc/freebsd-doc-en/pkg-plist.ps b/misc/freebsd-doc-en/pkg-plist.ps
index b32252ef3754..394945aa0d2e 100644
--- a/misc/freebsd-doc-en/pkg-plist.ps
+++ b/misc/freebsd-doc-en/pkg-plist.ps
@@ -41,6 +41,7 @@
 %%DOCSDIR%%/%%DOCLANG%%/articles/new-users/article.ps
 %%DOCSDIR%%/%%DOCLANG%%/articles/p4-primer/article.ps
 %%DOCSDIR%%/%%DOCLANG%%/articles/pam/article.ps
+%%DOCSDIR%%/%%DOCLANG%%/articles/port-mentor-guidelines/article.ps
 %%DOCSDIR%%/%%DOCLANG%%/articles/portbuild/article.ps
 %%DOCSDIR%%/%%DOCLANG%%/articles/pr-guidelines/article.ps
 %%DOCSDIR%%/%%DOCLANG%%/articles/problem-reports/article.ps
diff --git a/misc/freebsd-doc-en/pkg-plist.txt b/misc/freebsd-doc-en/pkg-plist.txt
index 2bd3922cd228..1d17632cc821 100644
--- a/misc/freebsd-doc-en/pkg-plist.txt
+++ b/misc/freebsd-doc-en/pkg-plist.txt
@@ -43,6 +43,7 @@
 %%DOCSDIR%%/%%DOCLANG%%/articles/new-users/article.txt
 %%DOCSDIR%%/%%DOCLANG%%/articles/p4-primer/article.txt
 %%DOCSDIR%%/%%DOCLANG%%/articles/pam/article.txt
+%%DOCSDIR%%/%%DOCLANG%%/articles/port-mentor-guidelines/article.txt
 %%DOCSDIR%%/%%DOCLANG%%/articles/portbuild/article.txt
 %%DOCSDIR%%/%%DOCLANG%%/articles/pr-guidelines/article.txt
 %%DOCSDIR%%/%%DOCLANG%%/articles/problem-reports/article.txt
diff --git a/misc/freebsd-doc-fr/pkg-plist.html-split b/misc/freebsd-doc-fr/pkg-plist.html-split
index 7f059361feb0..14901cffc7fb 100644
--- a/misc/freebsd-doc-fr/pkg-plist.html-split
+++ b/misc/freebsd-doc-fr/pkg-plist.html-split
@@ -547,7 +547,6 @@
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/crypt.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/ctm.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/current-stable.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/cutting-edge.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/cvs-tags.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/cvsup.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/desktop-browsers.html
@@ -566,6 +565,11 @@
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/disks-naming.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/disks-virtual.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/disks.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/dtrace-enable.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/dtrace-implementation.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/dtrace-language.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/dtrace-using.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/dtrace.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/editors.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/eresources-email.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/eresources-news.html
@@ -738,6 +742,9 @@
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/tcpwrappers.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/term.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/tvcard.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
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/users-groups.html
diff --git a/misc/freebsd-doc-hu/pkg-plist.html-split b/misc/freebsd-doc-hu/pkg-plist.html-split
index f796d47c249c..3406a229bb77 100644
--- a/misc/freebsd-doc-hu/pkg-plist.html-split
+++ b/misc/freebsd-doc-hu/pkg-plist.html-split
@@ -443,4 +443,4 @@
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/x-xdm.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/x11-wm.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/x11.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/x45650.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/x45653.html
diff --git a/misc/freebsd-doc-ja/pkg-plist.html-split b/misc/freebsd-doc-ja/pkg-plist.html-split
index e3bf93122361..a125a51a25c3 100644
--- a/misc/freebsd-doc-ja/pkg-plist.html-split
+++ b/misc/freebsd-doc-ja/pkg-plist.html-split
@@ -202,7 +202,6 @@
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/kernelconfig-building.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/kernelconfig-config.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/kernelconfig-custom-kernel.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/kernelconfig-nodes.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/kernelconfig-trouble.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/kernelconfig.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/l10n-basics.html
@@ -295,10 +294,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/x13087.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/x29013.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/x29057.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/x29101.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/x12786.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/x28755.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/x28799.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/x28843.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