11 files changed, 27 insertions, 15 deletions

diff --git a/misc/freebsd-doc-all/Makefile b/misc/freebsd-doc-all/Makefile
index d1aa04c42731..a8314e32b684 100644
--- a/misc/freebsd-doc-all/Makefile
+++ b/misc/freebsd-doc-all/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	freebsd-doc-all
-PORTVERSION=	20091226
+PORTVERSION=	20100120
 CATEGORIES=	misc docs
 MASTER_SITES=	#empty
 DISTFILES=	#empty
diff --git a/misc/freebsd-doc-en/Makefile b/misc/freebsd-doc-en/Makefile
index f0fafe2264f3..bdb39c87359e 100644
--- a/misc/freebsd-doc-en/Makefile
+++ b/misc/freebsd-doc-en/Makefile
@@ -28,7 +28,7 @@
 #
 
 PORTNAME=	freebsd-doc
-PORTVERSION=	20091226
+PORTVERSION=	20100120
 CATEGORIES=	misc docs
 MASTER_SITES=	LOCAL/blackend
 PKGNAMEPREFIX?=	en-
diff --git a/misc/freebsd-doc-en/distinfo b/misc/freebsd-doc-en/distinfo
index da906ba9a58f..8dfb23bf774c 100644
--- a/misc/freebsd-doc-en/distinfo
+++ b/misc/freebsd-doc-en/distinfo
@@ -1,3 +1,3 @@
-MD5 (freebsd-doc-20091226.tar.gz) = 0f966cfd66db471306537a1469b05707
-SHA256 (freebsd-doc-20091226.tar.gz) = 58cc299ef89c6e7cbb4aab6825e56f4761221a46448fd576def622a8223f2dba
-SIZE (freebsd-doc-20091226.tar.gz) = 27192378
+MD5 (freebsd-doc-20100120.tar.gz) = 06b57ed1149f1d664abfa185167f2c58
+SHA256 (freebsd-doc-20100120.tar.gz) = 82e8a841e60f2e7cc86ab35018d0a874334aea8be837588b8fb0b2aad39a0312
+SIZE (freebsd-doc-20100120.tar.gz) = 27210438
diff --git a/misc/freebsd-doc-en/pkg-plist.html-split b/misc/freebsd-doc-en/pkg-plist.html-split
index 38fea46456c5..1e8fcf85f89e 100644
--- a/misc/freebsd-doc-en/pkg-plist.html-split
+++ b/misc/freebsd-doc-en/pkg-plist.html-split
@@ -19,7 +19,7 @@
 %%DOCSDIR%%/%%DOCLANG%%/articles/bsdl-gpl/recommendations.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/bsdl-gpl/unix-license.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/building-products/TRADEMARKS.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/building-products/b379.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/building-products/b382.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/building-products/conclusion.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/building-products/freebsd-collaboration.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/building-products/freebsd-intro.html
diff --git a/misc/freebsd-doc-hu/pkg-plist.html-split b/misc/freebsd-doc-hu/pkg-plist.html-split
index c7fdb6de9c72..c7cb52335045 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/x45519.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/x45598.html
diff --git a/misc/freebsd-doc-ja/pkg-plist.html-split b/misc/freebsd-doc-ja/pkg-plist.html-split
index 938cdaf42eb6..0d06ebfab4a6 100644
--- a/misc/freebsd-doc-ja/pkg-plist.html-split
+++ b/misc/freebsd-doc-ja/pkg-plist.html-split
@@ -279,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/x10790.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/x11-wm.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/x11.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/x2391.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/x26531.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/x26575.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/x26619.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/x2744.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/x2904.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/x6912.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/x11011.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/x2397.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/x26768.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/x26812.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/x26856.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/x2750.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/x2910.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/x7133.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-ru/pkg-plist.common b/misc/freebsd-doc-ru/pkg-plist.common
index 91f62e0b8ce3..a9bea848e264 100644
--- a/misc/freebsd-doc-ru/pkg-plist.common
+++ b/misc/freebsd-doc-ru/pkg-plist.common
@@ -46,6 +46,7 @@
 @dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/cvsup-advanced
 @dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/cvs-freebsd
 @dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/custom-gcc
+@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/cups
 @dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/contributing
 @dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/console-server
 @dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/committers-guide
diff --git a/misc/freebsd-doc-ru/pkg-plist.html b/misc/freebsd-doc-ru/pkg-plist.html
index da2118396ac1..a866725f12e5 100644
--- a/misc/freebsd-doc-ru/pkg-plist.html
+++ b/misc/freebsd-doc-ru/pkg-plist.html
@@ -4,6 +4,7 @@
 %%DOCSDIR%%/%%DOCLANG%%/articles/committers-guide/article.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/console-server/article.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/contributing/article.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/cups/article.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/custom-gcc/article.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/cvs-freebsd/article.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/cvsup-advanced/article.html
diff --git a/misc/freebsd-doc-ru/pkg-plist.html-common b/misc/freebsd-doc-ru/pkg-plist.html-common
index 66ce5ca11a20..ef330a5e637f 100644
--- a/misc/freebsd-doc-ru/pkg-plist.html-common
+++ b/misc/freebsd-doc-ru/pkg-plist.html-common
@@ -6,6 +6,7 @@
 %%DOCSDIR%%/%%DOCLANG%%/articles/console-server/docbook.css
 %%DOCSDIR%%/%%DOCLANG%%/articles/console-server/tk0231-9-1.png
 %%DOCSDIR%%/%%DOCLANG%%/articles/contributing/docbook.css
+%%DOCSDIR%%/%%DOCLANG%%/articles/cups/docbook.css
 %%DOCSDIR%%/%%DOCLANG%%/articles/custom-gcc/docbook.css
 %%DOCSDIR%%/%%DOCLANG%%/articles/cvs-freebsd/docbook.css
 %%DOCSDIR%%/%%DOCLANG%%/articles/cvsup-advanced/docbook.css
diff --git a/misc/freebsd-doc-ru/pkg-plist.html-split b/misc/freebsd-doc-ru/pkg-plist.html-split
index 7207dfbede6c..55e4baccf418 100644
--- a/misc/freebsd-doc-ru/pkg-plist.html-split
+++ b/misc/freebsd-doc-ru/pkg-plist.html-split
@@ -42,6 +42,14 @@
 %%DOCSDIR%%/%%DOCLANG%%/articles/contributing/TRADEMARKS.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/contributing/contrib-how.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/contributing/index.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/cups/TRADEMARKS.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/cups/index.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/cups/printing-cups-clients.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/cups/printing-cups-configuring-printers.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/cups/printing-cups-configuring-server.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/cups/printing-cups-install.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/cups/printing-cups-ports-knobs.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/cups/printing-cups-troubleshooting.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/custom-gcc/TRADEMARKS.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/custom-gcc/configuring-ports-gcc.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/custom-gcc/index.html
diff --git a/misc/freebsd-doc-ru/pkg-plist.txt b/misc/freebsd-doc-ru/pkg-plist.txt
index ef8c836fc861..6ff4ea0a3a02 100644
--- a/misc/freebsd-doc-ru/pkg-plist.txt
+++ b/misc/freebsd-doc-ru/pkg-plist.txt
@@ -4,6 +4,7 @@
 %%DOCSDIR%%/%%DOCLANG%%/articles/committers-guide/article.txt
 %%DOCSDIR%%/%%DOCLANG%%/articles/console-server/article.txt
 %%DOCSDIR%%/%%DOCLANG%%/articles/contributing/article.txt
+%%DOCSDIR%%/%%DOCLANG%%/articles/cups/article.txt
 %%DOCSDIR%%/%%DOCLANG%%/articles/custom-gcc/article.txt
 %%DOCSDIR%%/%%DOCLANG%%/articles/cvs-freebsd/article.txt
 %%DOCSDIR%%/%%DOCLANG%%/articles/cvsup-advanced/article.txt