12 files changed, 25 insertions, 13 deletions
diff --git a/misc/freebsd-doc-all/Makefile b/misc/freebsd-doc-all/Makefile
index 1b5a15013697..a5f912eac475 100644
--- a/misc/freebsd-doc-all/Makefile
+++ b/misc/freebsd-doc-all/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	freebsd-doc-all
-PORTVERSION=	20090325
+PORTVERSION=	20090417
 CATEGORIES=	misc docs
 MASTER_SITES=	#empty
 DISTFILES=	#empty
diff --git a/misc/freebsd-doc-en/Makefile b/misc/freebsd-doc-en/Makefile
index 002f0a976c88..157a562875f1 100644
--- a/misc/freebsd-doc-en/Makefile
+++ b/misc/freebsd-doc-en/Makefile
@@ -28,7 +28,7 @@
 #
 
 PORTNAME=	freebsd-doc
-PORTVERSION=	20090325
+PORTVERSION=	20090417
 CATEGORIES=	misc docs
 MASTER_SITES=	LOCAL/blackend
 PKGNAMEPREFIX?=	en-
diff --git a/misc/freebsd-doc-en/distinfo b/misc/freebsd-doc-en/distinfo
index 690b9bad75f6..32d2014d6ee0 100644
--- a/misc/freebsd-doc-en/distinfo
+++ b/misc/freebsd-doc-en/distinfo
@@ -1,3 +1,3 @@
-MD5 (freebsd-doc-20090325.tar.gz) = 65facfe82d532ea467a6761433cb452f
-SHA256 (freebsd-doc-20090325.tar.gz) = dab3955bb7768c9990292b848f8c8c2533ebff787ea2b08c5de8143f073877c8
-SIZE (freebsd-doc-20090325.tar.gz) = 26812923
+MD5 (freebsd-doc-20090417.tar.gz) = 9870cd8ca9d2cd93558df8021bba92a2
+SHA256 (freebsd-doc-20090417.tar.gz) = 4c63daf6fddd65386605b2520bcf253e57fed94edb1b76a88a90f53725db8df3
+SIZE (freebsd-doc-20090417.tar.gz) = 26893433
diff --git a/misc/freebsd-doc-en/pkg-plist.html-split b/misc/freebsd-doc-en/pkg-plist.html-split
index bd9e200a3fc2..dd4f460b496c 100644
--- a/misc/freebsd-doc-en/pkg-plist.html-split
+++ b/misc/freebsd-doc-en/pkg-plist.html-split
@@ -42,7 +42,6 @@
 %%DOCSDIR%%/%%DOCLANG%%/articles/committers-guide/committer.types.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/committers-guide/conventions.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/committers-guide/coverity.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/committers-guide/cvs.operations.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/committers-guide/developer.relations.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/committers-guide/gnats.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/committers-guide/index.html
@@ -54,6 +53,7 @@
 %%DOCSDIR%%/%%DOCLANG%%/articles/committers-guide/pref-license.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/committers-guide/rules.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/committers-guide/ssh.guide.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
@@ -375,11 +375,10 @@
 %%DOCSDIR%%/%%DOCLANG%%/articles/serial-uart/x1044.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/x119.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/solid-state/x113.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/storage-devices/TRADEMARKS.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/storage-devices/hw-storage-controllers.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/storage-devices/index.html
diff --git a/misc/freebsd-doc-ja/pkg-plist.html-split b/misc/freebsd-doc-ja/pkg-plist.html-split
index 2a415a8ebe36..eae29338732b 100644
--- a/misc/freebsd-doc-ja/pkg-plist.html-split
+++ b/misc/freebsd-doc-ja/pkg-plist.html-split
@@ -229,6 +229,7 @@
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/ports-overview.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/ports-using.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/ports.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/portsnap.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/ppp-and-slip.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/ppp.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/pppoe.html
@@ -278,16 +279,16 @@
 %%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/x10537.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/x10610.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/x11-wm.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/x11.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/x2351.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/x26092.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/x26136.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/x26180.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/x26433.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/x26477.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/x26521.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/x2704.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/x2864.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/x6659.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/x6732.html
 %%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/LEGALNOTICE.html
 %%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/c1059.html
 %%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/c1209.html
diff --git a/misc/freebsd-doc-nl/pkg-plist.common b/misc/freebsd-doc-nl/pkg-plist.common
index b3e1aac5356a..cbc8dcb9aaab 100644
--- a/misc/freebsd-doc-nl/pkg-plist.common
+++ b/misc/freebsd-doc-nl/pkg-plist.common
@@ -10,6 +10,7 @@
 @dirrm %%DOCSDIR%%/%%DOCLANG%%/books/handbook/advanced-networking
 @dirrm %%DOCSDIR%%/%%DOCLANG%%/books/handbook
 @dirrm %%DOCSDIR%%/%%DOCLANG%%/books
+@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/solid-state
 @dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/problem-reports
 @dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd
 @dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/contributing-ports
diff --git a/misc/freebsd-doc-nl/pkg-plist.html b/misc/freebsd-doc-nl/pkg-plist.html
index 35a11f327f0b..8dcaa725d4cc 100644
--- a/misc/freebsd-doc-nl/pkg-plist.html
+++ b/misc/freebsd-doc-nl/pkg-plist.html
@@ -3,4 +3,5 @@
 %%DOCSDIR%%/%%DOCLANG%%/articles/contributing/article.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd/article.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/problem-reports/article.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/solid-state/article.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/book.html
diff --git a/misc/freebsd-doc-nl/pkg-plist.html-common b/misc/freebsd-doc-nl/pkg-plist.html-common
index 086374f4fd38..f71ad2b1d0f7 100644
--- a/misc/freebsd-doc-nl/pkg-plist.html-common
+++ b/misc/freebsd-doc-nl/pkg-plist.html-common
@@ -3,6 +3,7 @@
 %%DOCSDIR%%/%%DOCLANG%%/articles/contributing/docbook.css
 %%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd/docbook.css
 %%DOCSDIR%%/%%DOCLANG%%/articles/problem-reports/docbook.css
+%%DOCSDIR%%/%%DOCLANG%%/articles/solid-state/docbook.css
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/advanced-networking/isdn-bus.png
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/advanced-networking/isdn-twisted-pair.png
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/advanced-networking/natd.png
diff --git a/misc/freebsd-doc-nl/pkg-plist.html-split b/misc/freebsd-doc-nl/pkg-plist.html-split
index c71edd527fe3..732b9ac8ea4a 100644
--- a/misc/freebsd-doc-nl/pkg-plist.html-split
+++ b/misc/freebsd-doc-nl/pkg-plist.html-split
@@ -24,6 +24,12 @@
 %%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/solid-state/TRADEMARKS.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/solid-state/index.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/x114.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/LEGALNOTICE.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/acpi-debug.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/acpi-overview.html
diff --git a/misc/freebsd-doc-nl/pkg-plist.pdf b/misc/freebsd-doc-nl/pkg-plist.pdf
index 924845660c73..86c30503141a 100644
--- a/misc/freebsd-doc-nl/pkg-plist.pdf
+++ b/misc/freebsd-doc-nl/pkg-plist.pdf
@@ -3,4 +3,5 @@
 %%DOCSDIR%%/%%DOCLANG%%/articles/contributing/article.pdf
 %%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd/article.pdf
 %%DOCSDIR%%/%%DOCLANG%%/articles/problem-reports/article.pdf
+%%DOCSDIR%%/%%DOCLANG%%/articles/solid-state/article.pdf
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/book.pdf
diff --git a/misc/freebsd-doc-nl/pkg-plist.ps b/misc/freebsd-doc-nl/pkg-plist.ps
index f35cf4a9cb67..cc492dda5ac9 100644
--- a/misc/freebsd-doc-nl/pkg-plist.ps
+++ b/misc/freebsd-doc-nl/pkg-plist.ps
@@ -3,4 +3,5 @@
 %%DOCSDIR%%/%%DOCLANG%%/articles/contributing/article.ps
 %%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd/article.ps
 %%DOCSDIR%%/%%DOCLANG%%/articles/problem-reports/article.ps
+%%DOCSDIR%%/%%DOCLANG%%/articles/solid-state/article.ps
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/book.ps
diff --git a/misc/freebsd-doc-nl/pkg-plist.txt b/misc/freebsd-doc-nl/pkg-plist.txt
index 01424e2e53dd..40d872c4d920 100644
--- a/misc/freebsd-doc-nl/pkg-plist.txt
+++ b/misc/freebsd-doc-nl/pkg-plist.txt
@@ -3,4 +3,5 @@
 %%DOCSDIR%%/%%DOCLANG%%/articles/contributing/article.txt
 %%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd/article.txt
 %%DOCSDIR%%/%%DOCLANG%%/articles/problem-reports/article.txt
+%%DOCSDIR%%/%%DOCLANG%%/articles/solid-state/article.txt
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/book.txt