8 files changed, 69 insertions, 65 deletions
diff --git a/misc/freebsd-doc-all/Makefile b/misc/freebsd-doc-all/Makefile
index 0338a8b3b521..81a1051a1d0e 100644
--- a/misc/freebsd-doc-all/Makefile
+++ b/misc/freebsd-doc-all/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	freebsd-doc-all
-PORTVERSION=	20100625
+PORTVERSION=	20100811
 CATEGORIES=	misc docs
 MASTER_SITES=	#empty
 DISTFILES=	#empty
diff --git a/misc/freebsd-doc-en/Makefile b/misc/freebsd-doc-en/Makefile
index 0bde9ad03e73..a32067d4bf99 100644
--- a/misc/freebsd-doc-en/Makefile
+++ b/misc/freebsd-doc-en/Makefile
@@ -28,7 +28,7 @@
 #
 
 PORTNAME=	freebsd-doc
-PORTVERSION=	20100625
+PORTVERSION=	20100811
 CATEGORIES=	misc docs
 MASTER_SITES=	LOCAL/blackend
 PKGNAMEPREFIX?=	en-
diff --git a/misc/freebsd-doc-en/distinfo b/misc/freebsd-doc-en/distinfo
index cb190ff03c77..92c0b45a3c81 100644
--- a/misc/freebsd-doc-en/distinfo
+++ b/misc/freebsd-doc-en/distinfo
@@ -1,3 +1,3 @@
-MD5 (freebsd-doc-20100625.tar.gz) = 0189f97c2425adde664e3bb770d9dc06
-SHA256 (freebsd-doc-20100625.tar.gz) = 281d8c85aa4df649122478015155b7e664b0104fad68b723fa001c61ac9826e4
-SIZE (freebsd-doc-20100625.tar.gz) = 27657955
+MD5 (freebsd-doc-20100811.tar.gz) = 9c5d480b21fc484d12a74f2443993276
+SHA256 (freebsd-doc-20100811.tar.gz) = c7d287122536bc3609e185b92e57104817cbf9bbf0564ccb9a941345691edf87
+SIZE (freebsd-doc-20100811.tar.gz) = 27636831
diff --git a/misc/freebsd-doc-es/pkg-plist.html-split b/misc/freebsd-doc-es/pkg-plist.html-split
index 961d483192d5..edc6f77ca9d4 100644
--- a/misc/freebsd-doc-es/pkg-plist.html-split
+++ b/misc/freebsd-doc-es/pkg-plist.html-split
@@ -244,7 +244,7 @@
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/linuxemu-matlab.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/linuxemu-oracle.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/linuxemu.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/ln22.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/ln24.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/mac-biba.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/mac-examplehttpd.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/mac-ifoff.html
@@ -378,13 +378,13 @@
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/x-xdm.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/x11-wm.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/x11.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/x30962.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/x30986.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/x31015.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/x31048.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/x31081.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/x31093.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/x31117.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/x31153.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/x32060.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/x9103.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/x30964.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/x30988.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/x31017.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/x31050.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/x31083.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/x31095.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/x31119.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/x31155.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/x32062.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/x9105.html
diff --git a/misc/freebsd-doc-hu/pkg-plist.html-split b/misc/freebsd-doc-hu/pkg-plist.html-split
index 9b140a939746..a752561a084c 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/x45538.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/x45585.html
diff --git a/misc/freebsd-doc-ja/pkg-plist.html-split b/misc/freebsd-doc-ja/pkg-plist.html-split
index 480db5cb6933..d35e7015b764 100644
--- a/misc/freebsd-doc-ja/pkg-plist.html-split
+++ b/misc/freebsd-doc-ja/pkg-plist.html-split
@@ -279,27 +279,28 @@
 %%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/x10956.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/x10958.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/x11-wm.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/x11.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/x2398.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/x26702.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/x26746.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/x26790.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/x26693.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/x26737.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/x26781.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/x2751.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/x2911.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/x7078.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/x7080.html
 %%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/LEGALNOTICE.html
-%%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/c1065.html
-%%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/c1215.html
+%%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/c1007.html
+%%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/c1112.html
+%%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/c1263.html
 %%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/c205.html
-%%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/c2667.html
-%%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/c2675.html
 %%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/c27.html
+%%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/c2772.html
+%%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/c2780.html
 %%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/c374.html
-%%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/c808.html
-%%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/c875.html
-%%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/c960.html
+%%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/c855.html
+%%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/c922.html
+%%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/freebsd-versions.html
 %%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/index.html
 %%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/port-upgrading.html
 %%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/porting-autoplist.html
@@ -310,7 +311,6 @@
 %%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/porting-manpages.html
 %%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/porting-masterdir.html
 %%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/porting-motif.html
-%%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/porting-patchfiles.html
 %%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/porting-pkgname.html
 %%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/porting-plist.html
 %%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/porting-portlint.html
@@ -322,45 +322,41 @@
 %%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/porting-wrkdir.html
 %%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/porting-wrkdirprefix.html
 %%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/quick-porting.html
-%%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/x1083.html
 %%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/x109.html
-%%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/x1100.html
-%%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/x1153.html
-%%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/x1279.html
-%%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/x1763.html
-%%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/x1846.html
-%%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/x1870.html
-%%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/x1891.html
-%%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/x1901.html
-%%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/x1907.html
-%%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/x1966.html
-%%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/x1999.html
-%%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/x2010.html
-%%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/x2021.html
-%%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/x2041.html
-%%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/x2053.html
-%%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/x2058.html
-%%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/x2061.html
-%%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/x2067.html
-%%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/x2075.html
-%%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/x2637.html
+%%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/x1130.html
+%%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/x1147.html
+%%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/x1200.html
+%%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/x1327.html
+%%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/x1865.html
+%%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/x1948.html
+%%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/x1972.html
+%%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/x1993.html
+%%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/x2003.html
+%%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/x2009.html
+%%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/x2068.html
+%%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/x2101.html
+%%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/x2112.html
+%%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/x2123.html
+%%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/x2143.html
+%%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/x2155.html
+%%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/x2160.html
+%%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/x2163.html
+%%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/x2169.html
+%%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/x2177.html
+%%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/x2742.html
 %%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/x300.html
 %%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/x327.html
 %%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/x336.html
 %%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/x355.html
 %%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/x363.html
 %%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/x396.html
-%%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/x403.html
-%%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/x499.html
-%%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/x518.html
-%%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/x546.html
-%%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/x558.html
-%%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/x608.html
-%%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/x615.html
+%%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/x534.html
 %%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/x62.html
-%%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/x749.html
-%%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/x770.html
-%%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/x939.html
+%%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/x655.html
+%%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/x662.html
+%%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/x796.html
+%%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/x817.html
+%%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/x986.html
 %%DOCSDIR%%/%%DOCLANG%%/books/ppp-primer/c30.html
 %%DOCSDIR%%/%%DOCLANG%%/books/ppp-primer/c307.html
 %%DOCSDIR%%/%%DOCLANG%%/books/ppp-primer/c832.html
diff --git a/misc/freebsd-doc-ru/pkg-plist.html-common b/misc/freebsd-doc-ru/pkg-plist.html-common
index ef330a5e637f..17b8d3172055 100644
--- a/misc/freebsd-doc-ru/pkg-plist.html-common
+++ b/misc/freebsd-doc-ru/pkg-plist.html-common
@@ -42,6 +42,9 @@
 %%DOCSDIR%%/%%DOCLANG%%/articles/releng/branches-releng3.png
 %%DOCSDIR%%/%%DOCLANG%%/articles/releng/branches-releng4.png
 %%DOCSDIR%%/%%DOCLANG%%/articles/releng/branches-releng5.png
+%%DOCSDIR%%/%%DOCLANG%%/articles/releng/branches-releng6.png
+%%DOCSDIR%%/%%DOCLANG%%/articles/releng/branches-releng7.png
+%%DOCSDIR%%/%%DOCLANG%%/articles/releng/branches-releng8.png
 %%DOCSDIR%%/%%DOCLANG%%/articles/releng/docbook.css
 %%DOCSDIR%%/%%DOCLANG%%/articles/solid-state/docbook.css
 %%DOCSDIR%%/%%DOCLANG%%/articles/version-guide/docbook.css
diff --git a/misc/freebsd-doc-ru/pkg-plist.html-split b/misc/freebsd-doc-ru/pkg-plist.html-split
index 24a4f6af2a2d..28953369e421 100644
--- a/misc/freebsd-doc-ru/pkg-plist.html-split
+++ b/misc/freebsd-doc-ru/pkg-plist.html-split
@@ -143,14 +143,15 @@
 %%DOCSDIR%%/%%DOCLANG%%/articles/hubs/mirror-requirements.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/hubs/mirror-statpages.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/hubs/mirror-where.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/ipsec-must/TRADEMARKS.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/ipsec-must/caveat.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/ipsec-must/code.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/ipsec-must/experiment.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/ipsec-must/index.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/ipsec-must/ipsec-install.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/ipsec-must/ipsec.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/ipsec-must/kernel.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/ipsec-must/x22.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/ipsec-must/x55.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/ipsec-must/solution.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/laptop/TRADEMARKS.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/laptop/index.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/laptop/modems.html
@@ -227,6 +228,7 @@
 %%DOCSDIR%%/%%DOCLANG%%/articles/problem-reports/pr-followup.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/problem-reports/pr-further.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/problem-reports/pr-prep.html
+%%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
@@ -251,11 +253,10 @@
 %%DOCSDIR%%/%%DOCLANG%%/articles/releng/release-proc.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/solid-state/TRADEMARKS.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/solid-state/index.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/solid-state/kern.flp.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/solid-state/kernel.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/solid-state/ro-fs.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/solid-state/strategies.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/solid-state/x120.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/solid-state/x94.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/version-guide/TRADEMARKS.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/version-guide/conclusion.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/version-guide/decision-points.html
@@ -388,6 +389,8 @@
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/eresources-shell.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/eresources-web.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/eresources.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/filesystems-zfs.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/filesystems.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/firewalls-apps.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/firewalls-concepts.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/firewalls-ipf.html
@@ -426,6 +429,8 @@
 %%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-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