Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 3 Feb 2013 19:03:57 +0000 (UTC)
From:      Marc Fonvieille <blackend@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r311479 - in head/misc: freebsd-doc-all freebsd-doc-bn freebsd-doc-da freebsd-doc-de freebsd-doc-el freebsd-doc-en freebsd-doc-es freebsd-doc-fr freebsd-doc-hu freebsd-doc-it freebsd-do...
Message-ID:  <201302031903.r13J3vwY096950@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: blackend (doc committer)
Date: Sun Feb  3 19:03:57 2013
New Revision: 311479
URL: http://svnweb.freebsd.org/changeset/ports/311479

Log:
  Update to r40771 of the FreeBSD docset.
  
  Approved by:	doceng (implicit)

Modified:
  head/misc/freebsd-doc-all/Makefile
  head/misc/freebsd-doc-bn/pkg-plist.html-split
  head/misc/freebsd-doc-da/pkg-plist.common
  head/misc/freebsd-doc-da/pkg-plist.html
  head/misc/freebsd-doc-da/pkg-plist.html-common
  head/misc/freebsd-doc-da/pkg-plist.html-split
  head/misc/freebsd-doc-da/pkg-plist.pdf
  head/misc/freebsd-doc-da/pkg-plist.ps
  head/misc/freebsd-doc-da/pkg-plist.txt
  head/misc/freebsd-doc-de/pkg-plist.common
  head/misc/freebsd-doc-de/pkg-plist.html
  head/misc/freebsd-doc-de/pkg-plist.html-common
  head/misc/freebsd-doc-de/pkg-plist.html-split
  head/misc/freebsd-doc-de/pkg-plist.pdf
  head/misc/freebsd-doc-de/pkg-plist.ps
  head/misc/freebsd-doc-de/pkg-plist.txt
  head/misc/freebsd-doc-el/pkg-plist.common
  head/misc/freebsd-doc-el/pkg-plist.html
  head/misc/freebsd-doc-el/pkg-plist.html-common
  head/misc/freebsd-doc-el/pkg-plist.html-split
  head/misc/freebsd-doc-el/pkg-plist.pdf
  head/misc/freebsd-doc-el/pkg-plist.ps
  head/misc/freebsd-doc-el/pkg-plist.txt
  head/misc/freebsd-doc-en/Makefile
  head/misc/freebsd-doc-en/distinfo
  head/misc/freebsd-doc-en/pkg-plist.common
  head/misc/freebsd-doc-en/pkg-plist.html
  head/misc/freebsd-doc-en/pkg-plist.html-common
  head/misc/freebsd-doc-en/pkg-plist.html-split
  head/misc/freebsd-doc-en/pkg-plist.pdf
  head/misc/freebsd-doc-en/pkg-plist.ps
  head/misc/freebsd-doc-en/pkg-plist.txt
  head/misc/freebsd-doc-es/pkg-plist.common
  head/misc/freebsd-doc-es/pkg-plist.extras
  head/misc/freebsd-doc-es/pkg-plist.html
  head/misc/freebsd-doc-es/pkg-plist.html-common
  head/misc/freebsd-doc-es/pkg-plist.html-split
  head/misc/freebsd-doc-es/pkg-plist.pdf
  head/misc/freebsd-doc-es/pkg-plist.ps
  head/misc/freebsd-doc-es/pkg-plist.txt
  head/misc/freebsd-doc-fr/pkg-plist.common
  head/misc/freebsd-doc-fr/pkg-plist.html
  head/misc/freebsd-doc-fr/pkg-plist.html-common
  head/misc/freebsd-doc-fr/pkg-plist.html-split
  head/misc/freebsd-doc-fr/pkg-plist.pdf
  head/misc/freebsd-doc-fr/pkg-plist.ps
  head/misc/freebsd-doc-fr/pkg-plist.txt
  head/misc/freebsd-doc-hu/pkg-plist.common
  head/misc/freebsd-doc-hu/pkg-plist.html
  head/misc/freebsd-doc-hu/pkg-plist.html-common
  head/misc/freebsd-doc-hu/pkg-plist.html-split
  head/misc/freebsd-doc-hu/pkg-plist.pdf
  head/misc/freebsd-doc-hu/pkg-plist.ps
  head/misc/freebsd-doc-hu/pkg-plist.txt
  head/misc/freebsd-doc-it/pkg-plist.common
  head/misc/freebsd-doc-it/pkg-plist.html
  head/misc/freebsd-doc-it/pkg-plist.html-common
  head/misc/freebsd-doc-it/pkg-plist.html-split
  head/misc/freebsd-doc-it/pkg-plist.pdf
  head/misc/freebsd-doc-it/pkg-plist.ps
  head/misc/freebsd-doc-it/pkg-plist.txt
  head/misc/freebsd-doc-ja/pkg-plist.common
  head/misc/freebsd-doc-ja/pkg-plist.html
  head/misc/freebsd-doc-ja/pkg-plist.html-common
  head/misc/freebsd-doc-ja/pkg-plist.html-split
  head/misc/freebsd-doc-mn/pkg-plist.html-split
  head/misc/freebsd-doc-nl/pkg-plist.html-split
  head/misc/freebsd-doc-pl/pkg-plist.common
  head/misc/freebsd-doc-pl/pkg-plist.html
  head/misc/freebsd-doc-pl/pkg-plist.html-common
  head/misc/freebsd-doc-pl/pkg-plist.html-split
  head/misc/freebsd-doc-pl/pkg-plist.pdf
  head/misc/freebsd-doc-pl/pkg-plist.ps
  head/misc/freebsd-doc-pl/pkg-plist.txt
  head/misc/freebsd-doc-pt/pkg-plist.common
  head/misc/freebsd-doc-pt/pkg-plist.html
  head/misc/freebsd-doc-pt/pkg-plist.html-common
  head/misc/freebsd-doc-pt/pkg-plist.html-split
  head/misc/freebsd-doc-pt/pkg-plist.pdf
  head/misc/freebsd-doc-pt/pkg-plist.ps
  head/misc/freebsd-doc-pt/pkg-plist.txt
  head/misc/freebsd-doc-ru/pkg-plist.common
  head/misc/freebsd-doc-ru/pkg-plist.extras
  head/misc/freebsd-doc-ru/pkg-plist.html
  head/misc/freebsd-doc-ru/pkg-plist.html-common
  head/misc/freebsd-doc-ru/pkg-plist.html-split
  head/misc/freebsd-doc-ru/pkg-plist.txt
  head/misc/freebsd-doc-sr/pkg-plist.common
  head/misc/freebsd-doc-tr/pkg-plist.html-split
  head/misc/freebsd-doc-zh_cn/pkg-plist.common
  head/misc/freebsd-doc-zh_cn/pkg-plist.html-common
  head/misc/freebsd-doc-zh_cn/pkg-plist.html-split
  head/misc/freebsd-doc-zh_tw/pkg-plist.html-split

Modified: head/misc/freebsd-doc-all/Makefile
==============================================================================
--- head/misc/freebsd-doc-all/Makefile	Sun Feb  3 18:45:10 2013	(r311478)
+++ head/misc/freebsd-doc-all/Makefile	Sun Feb  3 19:03:57 2013	(r311479)
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	freebsd-doc-all
-PORTVERSION=	40385
+PORTVERSION=	40771
 PORTEPOCH=	1
 CATEGORIES=	misc docs
 MASTER_SITES=	#empty

Modified: head/misc/freebsd-doc-bn/pkg-plist.html-split
==============================================================================
--- head/misc/freebsd-doc-bn/pkg-plist.html-split	Sun Feb  3 18:45:10 2013	(r311478)
+++ head/misc/freebsd-doc-bn/pkg-plist.html-split	Sun Feb  3 19:03:57 2013	(r311479)
@@ -1,16 +1,16 @@
 @comment $FreeBSD$
 %%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd/index.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd/x115.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd/x65.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd/x92.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd/x117.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd/x67.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd/x94.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/new-users/index.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/new-users/x118.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/new-users/x194.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/new-users/x298.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/new-users/x451.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/new-users/x516.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/new-users/x583.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/new-users/x676.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/new-users/x743.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/new-users/x76.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/new-users/x764.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/new-users/x119.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/new-users/x195.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/new-users/x299.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/new-users/x452.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/new-users/x517.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/new-users/x584.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/new-users/x677.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/new-users/x744.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/new-users/x765.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/new-users/x77.html

Modified: head/misc/freebsd-doc-da/pkg-plist.common
==============================================================================
--- head/misc/freebsd-doc-da/pkg-plist.common	Sun Feb  3 18:45:10 2013	(r311478)
+++ head/misc/freebsd-doc-da/pkg-plist.common	Sun Feb  3 19:03:57 2013	(r311479)
@@ -1,7 +1,6 @@
 @comment $FreeBSD$
 @dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/pxe
 @dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/ipsec-must
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/euro
 @dirrm %%DOCSDIR%%/%%DOCLANG%%/articles
 %%DOCSDIR%%/%%DOCLANG_PREFIX%%
 @dirrm %%DOCSDIR%%/%%DOCLANG%%

Modified: head/misc/freebsd-doc-da/pkg-plist.html
==============================================================================
--- head/misc/freebsd-doc-da/pkg-plist.html	Sun Feb  3 18:45:10 2013	(r311478)
+++ head/misc/freebsd-doc-da/pkg-plist.html	Sun Feb  3 19:03:57 2013	(r311479)
@@ -1,4 +1,3 @@
 @comment $FreeBSD$
-%%DOCSDIR%%/%%DOCLANG%%/articles/euro/article.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/ipsec-must/article.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/pxe/article.html

Modified: head/misc/freebsd-doc-da/pkg-plist.html-common
==============================================================================
--- head/misc/freebsd-doc-da/pkg-plist.html-common	Sun Feb  3 18:45:10 2013	(r311478)
+++ head/misc/freebsd-doc-da/pkg-plist.html-common	Sun Feb  3 19:03:57 2013	(r311479)
@@ -1,4 +1,3 @@
 @comment $FreeBSD$
-%%DOCSDIR%%/%%DOCLANG%%/articles/euro/docbook.css
 %%DOCSDIR%%/%%DOCLANG%%/articles/ipsec-must/docbook.css
 %%DOCSDIR%%/%%DOCLANG%%/articles/pxe/docbook.css

Modified: head/misc/freebsd-doc-da/pkg-plist.html-split
==============================================================================
--- head/misc/freebsd-doc-da/pkg-plist.html-split	Sun Feb  3 18:45:10 2013	(r311478)
+++ head/misc/freebsd-doc-da/pkg-plist.html-split	Sun Feb  3 19:03:57 2013	(r311479)
@@ -1,10 +1,4 @@
 @comment $FreeBSD$
-%%DOCSDIR%%/%%DOCLANG%%/articles/euro/index.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/euro/x161.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/euro/x189.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/euro/x69.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/euro/x79.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
@@ -13,9 +7,10 @@
 %%DOCSDIR%%/%%DOCLANG%%/articles/ipsec-must/ipsec.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/ipsec-must/kernel.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/ipsec-must/solution.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/pxe/TRADEMARKS.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/ipsec-must/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/server-config.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/pxe/trademarks.html

Modified: head/misc/freebsd-doc-da/pkg-plist.pdf
==============================================================================
--- head/misc/freebsd-doc-da/pkg-plist.pdf	Sun Feb  3 18:45:10 2013	(r311478)
+++ head/misc/freebsd-doc-da/pkg-plist.pdf	Sun Feb  3 19:03:57 2013	(r311479)
@@ -1,4 +1,3 @@
 @comment $FreeBSD$
-%%DOCSDIR%%/%%DOCLANG%%/articles/euro/article.pdf
 %%DOCSDIR%%/%%DOCLANG%%/articles/ipsec-must/article.pdf
 %%DOCSDIR%%/%%DOCLANG%%/articles/pxe/article.pdf

Modified: head/misc/freebsd-doc-da/pkg-plist.ps
==============================================================================
--- head/misc/freebsd-doc-da/pkg-plist.ps	Sun Feb  3 18:45:10 2013	(r311478)
+++ head/misc/freebsd-doc-da/pkg-plist.ps	Sun Feb  3 19:03:57 2013	(r311479)
@@ -1,4 +1,3 @@
 @comment $FreeBSD$
-%%DOCSDIR%%/%%DOCLANG%%/articles/euro/article.ps
 %%DOCSDIR%%/%%DOCLANG%%/articles/ipsec-must/article.ps
 %%DOCSDIR%%/%%DOCLANG%%/articles/pxe/article.ps

Modified: head/misc/freebsd-doc-da/pkg-plist.txt
==============================================================================
--- head/misc/freebsd-doc-da/pkg-plist.txt	Sun Feb  3 18:45:10 2013	(r311478)
+++ head/misc/freebsd-doc-da/pkg-plist.txt	Sun Feb  3 19:03:57 2013	(r311479)
@@ -1,4 +1,3 @@
 @comment $FreeBSD$
-%%DOCSDIR%%/%%DOCLANG%%/articles/euro/article.txt
 %%DOCSDIR%%/%%DOCLANG%%/articles/ipsec-must/article.txt
 %%DOCSDIR%%/%%DOCLANG%%/articles/pxe/article.txt

Modified: head/misc/freebsd-doc-de/pkg-plist.common
==============================================================================
--- head/misc/freebsd-doc-de/pkg-plist.common	Sun Feb  3 18:45:10 2013	(r311478)
+++ head/misc/freebsd-doc-de/pkg-plist.common	Sun Feb  3 19:03:57 2013	(r311479)
@@ -20,8 +20,8 @@
 @dirrm %%DOCSDIR%%/%%DOCLANG%%/books/developers-handbook/sockets
 @dirrm %%DOCSDIR%%/%%DOCLANG%%/books/developers-handbook
 @dirrm %%DOCSDIR%%/%%DOCLANG%%/books
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/version-guide
 @dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/solid-state
+@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/port-mentor-guidelines
 @dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/new-users
 @dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/linux-comparison
 @dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/laptop

Modified: head/misc/freebsd-doc-de/pkg-plist.html
==============================================================================
--- head/misc/freebsd-doc-de/pkg-plist.html	Sun Feb  3 18:45:10 2013	(r311478)
+++ head/misc/freebsd-doc-de/pkg-plist.html	Sun Feb  3 19:03:57 2013	(r311479)
@@ -5,8 +5,8 @@
 %%DOCSDIR%%/%%DOCLANG%%/articles/laptop/article.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/linux-comparison/article.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/new-users/article.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/port-mentor-guidelines/article.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/solid-state/article.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/version-guide/article.html
 %%DOCSDIR%%/%%DOCLANG%%/books/developers-handbook/book.html
 %%DOCSDIR%%/%%DOCLANG%%/books/faq/book.html
 %%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/book.html

Modified: head/misc/freebsd-doc-de/pkg-plist.html-common
==============================================================================
--- head/misc/freebsd-doc-de/pkg-plist.html-common	Sun Feb  3 18:45:10 2013	(r311478)
+++ head/misc/freebsd-doc-de/pkg-plist.html-common	Sun Feb  3 19:03:57 2013	(r311479)
@@ -5,8 +5,8 @@
 %%DOCSDIR%%/%%DOCLANG%%/articles/laptop/docbook.css
 %%DOCSDIR%%/%%DOCLANG%%/articles/linux-comparison/docbook.css
 %%DOCSDIR%%/%%DOCLANG%%/articles/new-users/docbook.css
+%%DOCSDIR%%/%%DOCLANG%%/articles/port-mentor-guidelines/docbook.css
 %%DOCSDIR%%/%%DOCLANG%%/articles/solid-state/docbook.css
-%%DOCSDIR%%/%%DOCLANG%%/articles/version-guide/docbook.css
 %%DOCSDIR%%/%%DOCLANG%%/books/developers-handbook/docbook.css
 %%DOCSDIR%%/%%DOCLANG%%/books/developers-handbook/sockets/layers.png
 %%DOCSDIR%%/%%DOCLANG%%/books/developers-handbook/sockets/sain.png

Modified: head/misc/freebsd-doc-de/pkg-plist.html-split
==============================================================================
--- head/misc/freebsd-doc-de/pkg-plist.html-split	Sun Feb  3 18:45:10 2013	(r311478)
+++ head/misc/freebsd-doc-de/pkg-plist.html-split	Sun Feb  3 19:03:57 2013	(r311479)
@@ -1,5 +1,4 @@
 @comment $FreeBSD$
-%%DOCSDIR%%/%%DOCLANG%%/articles/contributing-ports/TRADEMARKS.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/contributing-ports/adopt-port.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/contributing-ports/create-port.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/contributing-ports/fix-broken.html
@@ -7,28 +6,28 @@
 %%DOCSDIR%%/%%DOCLANG%%/articles/contributing-ports/maintain-port.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/contributing-ports/mortal-coil.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/contributing-ports/resources.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/contributing-ports/trademarks.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/contributing-ports/what-contribute.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/contributing/TRADEMARKS.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/contributing/contrib-how.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/contributing/index.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd/TRADEMARKS.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/contributing/trademarks.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd/comparing-bsd-and-linux.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd/index.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd/trademarks.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd/what-a-real-unix.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd/why-is-bsd-not-better-known.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/laptop/TRADEMARKS.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/laptop/index.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/laptop/modems.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/laptop/pcmcia.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/laptop/power-management.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/linux-comparison/TRADEMARKS.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/laptop/trademarks.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
 %%DOCSDIR%%/%%DOCLANG%%/articles/linux-comparison/freebsd-security.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/linux-comparison/freebsd-support.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/linux-comparison/index.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/new-users/TRADEMARKS.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/linux-comparison/trademarks.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/new-users/adding-a-user.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/new-users/comments-welcome.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/new-users/editing-text.html
@@ -39,20 +38,15 @@
 %%DOCSDIR%%/%%DOCLANG%%/articles/new-users/other-useful-commands.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/new-users/other.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/new-users/printing-files-from-dos.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/new-users/trademarks.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/new-users/your-working-environment.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/solid-state/TRADEMARKS.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/port-mentor-guidelines/index.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/x95.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/version-guide/TRADEMARKS.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/version-guide/conclusion.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/version-guide/decision-points.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/version-guide/future-goals.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/version-guide/index.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/version-guide/past-schedules.html
-%%DOCSDIR%%/%%DOCLANG%%/books/developers-handbook/LEGALNOTICE.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/solid-state/trademarks.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/solid-state/x96.html
 %%DOCSDIR%%/%%DOCLANG%%/books/developers-handbook/appendices.html
 %%DOCSDIR%%/%%DOCLANG%%/books/developers-handbook/architectures.html
 %%DOCSDIR%%/%%DOCLANG%%/books/developers-handbook/basics.html
@@ -77,6 +71,7 @@
 %%DOCSDIR%%/%%DOCLANG%%/books/developers-handbook/kerneldebug-options.html
 %%DOCSDIR%%/%%DOCLANG%%/books/developers-handbook/kerneldebug.html
 %%DOCSDIR%%/%%DOCLANG%%/books/developers-handbook/l10n.html
+%%DOCSDIR%%/%%DOCLANG%%/books/developers-handbook/legalnotice.html
 %%DOCSDIR%%/%%DOCLANG%%/books/developers-handbook/policies-contributed.html
 %%DOCSDIR%%/%%DOCLANG%%/books/developers-handbook/policies-encumbered.html
 %%DOCSDIR%%/%%DOCLANG%%/books/developers-handbook/policies-maintainer.html
@@ -113,7 +108,6 @@
 %%DOCSDIR%%/%%DOCLANG%%/books/developers-handbook/x86-the-tools.html
 %%DOCSDIR%%/%%DOCLANG%%/books/developers-handbook/x86-unix-filters.html
 %%DOCSDIR%%/%%DOCLANG%%/books/developers-handbook/x86.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/LEGALNOTICE.html
 %%DOCSDIR%%/%%DOCLANG%%/books/faq/acknowledgments.html
 %%DOCSDIR%%/%%DOCLANG%%/books/faq/admin.html
 %%DOCSDIR%%/%%DOCLANG%%/books/faq/advanced.html
@@ -134,6 +128,7 @@
 %%DOCSDIR%%/%%DOCLANG%%/books/faq/install.html
 %%DOCSDIR%%/%%DOCLANG%%/books/faq/introduction.html
 %%DOCSDIR%%/%%DOCLANG%%/books/faq/kernelconfig.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/legalnotice.html
 %%DOCSDIR%%/%%DOCLANG%%/books/faq/misc.html
 %%DOCSDIR%%/%%DOCLANG%%/books/faq/networking.html
 %%DOCSDIR%%/%%DOCLANG%%/books/faq/ppp.html
@@ -142,13 +137,13 @@
 %%DOCSDIR%%/%%DOCLANG%%/books/faq/support.html
 %%DOCSDIR%%/%%DOCLANG%%/books/faq/troubleshoot.html
 %%DOCSDIR%%/%%DOCLANG%%/books/faq/x.html
-%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/LEGALNOTICE.html
 %%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/doc-build-makefiles.html
 %%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/doc-build.html
 %%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/examples-docbook-article.html
 %%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/examples-formatted.html
 %%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/examples.html
 %%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/index.html
+%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/legalnotice.html
 %%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/make-includes.html
 %%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/overview-before.html
 %%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/overview-quick-start.html
@@ -188,7 +183,6 @@
 %%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/translations.html
 %%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/writing-style-word-list.html
 %%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/writing-style.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/LEGALNOTICE.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/acpi-debug.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/acpi-overview.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/adding-swap-space.html
@@ -339,6 +333,7 @@
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/l10n-compiling.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/l10n.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/lang-setup.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/legalnotice.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/linuxemu-advanced.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/linuxemu-lbc-install.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/linuxemu-maple.html
@@ -498,7 +493,6 @@
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/x-xdm.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/x11-wm.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/x11.html
-%%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/TRADEMARKS.html
 %%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/build-cluster.html
 %%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/building.html
 %%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/conflicts.html
@@ -577,6 +571,7 @@
 %%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/testing-porttools.html
 %%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/testing-tinderbox.html
 %%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/testing.html
+%%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/trademarks.html
 %%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/users-and-groups.html
 %%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/using-autotools.html
 %%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/using-databases.html
@@ -599,4 +594,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/x5593.html
+%%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/x5594.html

Modified: head/misc/freebsd-doc-de/pkg-plist.pdf
==============================================================================
--- head/misc/freebsd-doc-de/pkg-plist.pdf	Sun Feb  3 18:45:10 2013	(r311478)
+++ head/misc/freebsd-doc-de/pkg-plist.pdf	Sun Feb  3 19:03:57 2013	(r311479)
@@ -5,8 +5,8 @@
 %%DOCSDIR%%/%%DOCLANG%%/articles/laptop/article.pdf
 %%DOCSDIR%%/%%DOCLANG%%/articles/linux-comparison/article.pdf
 %%DOCSDIR%%/%%DOCLANG%%/articles/new-users/article.pdf
+%%DOCSDIR%%/%%DOCLANG%%/articles/port-mentor-guidelines/article.pdf
 %%DOCSDIR%%/%%DOCLANG%%/articles/solid-state/article.pdf
-%%DOCSDIR%%/%%DOCLANG%%/articles/version-guide/article.pdf
 %%DOCSDIR%%/%%DOCLANG%%/books/developers-handbook/book.pdf
 %%DOCSDIR%%/%%DOCLANG%%/books/faq/book.pdf
 %%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/book.pdf

Modified: head/misc/freebsd-doc-de/pkg-plist.ps
==============================================================================
--- head/misc/freebsd-doc-de/pkg-plist.ps	Sun Feb  3 18:45:10 2013	(r311478)
+++ head/misc/freebsd-doc-de/pkg-plist.ps	Sun Feb  3 19:03:57 2013	(r311479)
@@ -5,8 +5,8 @@
 %%DOCSDIR%%/%%DOCLANG%%/articles/laptop/article.ps
 %%DOCSDIR%%/%%DOCLANG%%/articles/linux-comparison/article.ps
 %%DOCSDIR%%/%%DOCLANG%%/articles/new-users/article.ps
+%%DOCSDIR%%/%%DOCLANG%%/articles/port-mentor-guidelines/article.ps
 %%DOCSDIR%%/%%DOCLANG%%/articles/solid-state/article.ps
-%%DOCSDIR%%/%%DOCLANG%%/articles/version-guide/article.ps
 %%DOCSDIR%%/%%DOCLANG%%/books/developers-handbook/book.ps
 %%DOCSDIR%%/%%DOCLANG%%/books/faq/book.ps
 %%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/book.ps

Modified: head/misc/freebsd-doc-de/pkg-plist.txt
==============================================================================
--- head/misc/freebsd-doc-de/pkg-plist.txt	Sun Feb  3 18:45:10 2013	(r311478)
+++ head/misc/freebsd-doc-de/pkg-plist.txt	Sun Feb  3 19:03:57 2013	(r311479)
@@ -5,8 +5,8 @@
 %%DOCSDIR%%/%%DOCLANG%%/articles/laptop/article.txt
 %%DOCSDIR%%/%%DOCLANG%%/articles/linux-comparison/article.txt
 %%DOCSDIR%%/%%DOCLANG%%/articles/new-users/article.txt
+%%DOCSDIR%%/%%DOCLANG%%/articles/port-mentor-guidelines/article.txt
 %%DOCSDIR%%/%%DOCLANG%%/articles/solid-state/article.txt
-%%DOCSDIR%%/%%DOCLANG%%/articles/version-guide/article.txt
 %%DOCSDIR%%/%%DOCLANG%%/books/developers-handbook/book.txt
 %%DOCSDIR%%/%%DOCLANG%%/books/faq/book.txt
 %%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/book.txt

Modified: head/misc/freebsd-doc-el/pkg-plist.common
==============================================================================
--- head/misc/freebsd-doc-el/pkg-plist.common	Sun Feb  3 18:45:10 2013	(r311478)
+++ head/misc/freebsd-doc-el/pkg-plist.common	Sun Feb  3 19:03:57 2013	(r311479)
@@ -19,16 +19,13 @@
 @dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/nanobsd/imagelib/callouts
 @dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/nanobsd/imagelib
 @dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/nanobsd
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/multi-os
 @dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/mailing-list-faq
 @dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/linux-users
 @dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/laptop
 @dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/greek-language-support
 @dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/gjournal-desktop
 @dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-questions
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/formatting-media
 @dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/dialup-firewall
 @dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/cvs-freebsd
 @dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/contributing
 @dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/compiz-fusion

Modified: head/misc/freebsd-doc-el/pkg-plist.html
==============================================================================
--- head/misc/freebsd-doc-el/pkg-plist.html	Sun Feb  3 18:45:10 2013	(r311478)
+++ head/misc/freebsd-doc-el/pkg-plist.html	Sun Feb  3 19:03:57 2013	(r311479)
@@ -3,16 +3,13 @@
 %%DOCSDIR%%/%%DOCLANG%%/articles/compiz-fusion/article.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/contributing/article.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/cvs-freebsd/article.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/dialup-firewall/article.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd/article.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/formatting-media/article.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-questions/article.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/gjournal-desktop/article.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/greek-language-support/article.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/laptop/article.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/linux-users/article.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/mailing-list-faq/article.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/multi-os/article.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/nanobsd/article.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/new-users/article.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/problem-reports/article.html

Modified: head/misc/freebsd-doc-el/pkg-plist.html-common
==============================================================================
--- head/misc/freebsd-doc-el/pkg-plist.html-common	Sun Feb  3 18:45:10 2013	(r311478)
+++ head/misc/freebsd-doc-el/pkg-plist.html-common	Sun Feb  3 19:03:57 2013	(r311479)
@@ -3,9 +3,7 @@
 %%DOCSDIR%%/%%DOCLANG%%/articles/compiz-fusion/docbook.css
 %%DOCSDIR%%/%%DOCLANG%%/articles/contributing/docbook.css
 %%DOCSDIR%%/%%DOCLANG%%/articles/cvs-freebsd/docbook.css
-%%DOCSDIR%%/%%DOCLANG%%/articles/dialup-firewall/docbook.css
 %%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd/docbook.css
-%%DOCSDIR%%/%%DOCLANG%%/articles/formatting-media/docbook.css
 %%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-questions/docbook.css
 %%DOCSDIR%%/%%DOCLANG%%/articles/gjournal-desktop/disklabel1.png
 %%DOCSDIR%%/%%DOCLANG%%/articles/gjournal-desktop/disklabel2.png
@@ -14,7 +12,6 @@
 %%DOCSDIR%%/%%DOCLANG%%/articles/laptop/docbook.css
 %%DOCSDIR%%/%%DOCLANG%%/articles/linux-users/docbook.css
 %%DOCSDIR%%/%%DOCLANG%%/articles/mailing-list-faq/docbook.css
-%%DOCSDIR%%/%%DOCLANG%%/articles/multi-os/docbook.css
 %%DOCSDIR%%/%%DOCLANG%%/articles/nanobsd/docbook.css
 %%DOCSDIR%%/%%DOCLANG%%/articles/nanobsd/imagelib/callouts/1.png
 %%DOCSDIR%%/%%DOCLANG%%/articles/nanobsd/imagelib/callouts/2.png

Modified: head/misc/freebsd-doc-el/pkg-plist.html-split
==============================================================================
--- head/misc/freebsd-doc-el/pkg-plist.html-split	Sun Feb  3 18:45:10 2013	(r311478)
+++ head/misc/freebsd-doc-el/pkg-plist.html-split	Sun Feb  3 19:03:57 2013	(r311479)
@@ -1,5 +1,4 @@
 @comment $FreeBSD$
-%%DOCSDIR%%/%%DOCLANG%%/articles/bsdl-gpl/TRADEMARKS.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/bsdl-gpl/addenda.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/bsdl-gpl/bsd-advantages.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/bsdl-gpl/conclusion.html
@@ -12,66 +11,53 @@
 %%DOCSDIR%%/%%DOCLANG%%/articles/bsdl-gpl/origins-lgpl.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/bsdl-gpl/orphaning.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/bsdl-gpl/recommendations.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/bsdl-gpl/trademarks.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/bsdl-gpl/unix-license.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/compiz-fusion/TRADEMARKS.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/compiz-fusion/compiz-fusion.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/compiz-fusion/compiz-troubleshooting.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/compiz-fusion/index.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/compiz-fusion/nvidia-setup.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/compiz-fusion/trademarks.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/compiz-fusion/xorg-configuration.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/contributing/TRADEMARKS.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/contributing/contrib-how.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/contributing/index.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/cvs-freebsd/TRADEMARKS.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/contributing/trademarks.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/cvs-freebsd/first-setup.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/cvs-freebsd/freebsdspecific.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/cvs-freebsd/index.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/dialup-firewall/TRADEMARKS.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/dialup-firewall/index.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/dialup-firewall/kernel.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/dialup-firewall/rcconf.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/dialup-firewall/rules.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/dialup-firewall/x75.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/dialup-firewall/x96.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd/TRADEMARKS.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/cvs-freebsd/trademarks.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd/index.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd/x121.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd/x62.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd/x96.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/formatting-media/TRADEMARKS.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/formatting-media/index.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/formatting-media/x165.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/formatting-media/x223.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/formatting-media/x321.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/formatting-media/x76.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-questions/TRADEMARKS.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd/trademarks.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd/x123.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd/x64.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd/x98.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-questions/index.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-questions/x113.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-questions/x204.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-questions/x216.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-questions/x38.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-questions/x52.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-questions/x66.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-questions/x91.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/gjournal-desktop/TRADEMARKS.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-questions/trademarks.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-questions/x114.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-questions/x205.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-questions/x217.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-questions/x39.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-questions/x53.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-questions/x67.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-questions/x92.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/gjournal-desktop/configure-journal.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/gjournal-desktop/further-reading.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/gjournal-desktop/index.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/gjournal-desktop/reserve-space.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/gjournal-desktop/trademarks.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/gjournal-desktop/troubleshooting-gjournal.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/gjournal-desktop/understanding-journaling.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/greek-language-support/TRADEMARKS.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/greek-language-support/console-setup.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/greek-language-support/index.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/greek-language-support/trademarks.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/greek-language-support/various-apps.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/greek-language-support/x11-fonts.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/greek-language-support/xorg-setup.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/laptop/TRADEMARKS.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/laptop/index.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/laptop/modems.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/laptop/pcmcia.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/laptop/power-management.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/linux-users/TRADEMARKS.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/laptop/trademarks.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/linux-users/commands.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/linux-users/conclusion.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/linux-users/firewall.html
@@ -81,24 +67,16 @@
 %%DOCSDIR%%/%%DOCLANG%%/articles/linux-users/shells.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/linux-users/software.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/linux-users/startup.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/linux-users/trademarks.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/linux-users/updates.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/mailing-list-faq/acknowledgments.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/mailing-list-faq/bikeshed.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/mailing-list-faq/etiquette.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/mailing-list-faq/index.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/mailing-list-faq/recurring.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/multi-os/TRADEMARKS.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/multi-os/ch2.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/multi-os/ch3.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/multi-os/ch4.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/multi-os/ch5.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/multi-os/index.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/multi-os/sources.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/multi-os/x188.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/nanobsd/TRADEMARKS.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/nanobsd/howto.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/nanobsd/index.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/new-users/TRADEMARKS.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/nanobsd/trademarks.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/new-users/adding-a-user.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/new-users/comments-welcome.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/new-users/editing-text.html
@@ -109,16 +87,17 @@
 %%DOCSDIR%%/%%DOCLANG%%/articles/new-users/other-useful-commands.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/new-users/other.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/new-users/printing-files-from-dos.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/new-users/trademarks.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/new-users/your-working-environment.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/problem-reports/TRADEMARKS.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/problem-reports/index.html
 %%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-when.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/problem-reports/pr-writing.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/problem-reports/trademarks.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/releng-packages/index.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/releng-packages/x29.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/releng-packages/x30.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/releng/ackno.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/releng/biblio.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/releng/distribution.html
@@ -147,7 +126,7 @@
 %%DOCSDIR%%/%%DOCLANG%%/books/faq/install.html
 %%DOCSDIR%%/%%DOCLANG%%/books/faq/introduction.html
 %%DOCSDIR%%/%%DOCLANG%%/books/faq/kernelconfig.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/ln24.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ln23.html
 %%DOCSDIR%%/%%DOCLANG%%/books/faq/misc.html
 %%DOCSDIR%%/%%DOCLANG%%/books/faq/networking.html
 %%DOCSDIR%%/%%DOCLANG%%/books/faq/ppp.html
@@ -252,6 +231,7 @@
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/eresources-news.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/eresources-web.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/eresources.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/filesystems-linux.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/filesystems-zfs.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/filesystems.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/firewalls-apps.html
@@ -268,6 +248,7 @@
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/geom-glabel.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/geom-intro.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/geom-mirror.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/geom-raid3.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/geom-striping.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/geom.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/getting-started.html
@@ -314,7 +295,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/ln26.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/ln27.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/mac-biba.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/mac-bsdextended.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/mac-ifoff.html

Modified: head/misc/freebsd-doc-el/pkg-plist.pdf
==============================================================================
--- head/misc/freebsd-doc-el/pkg-plist.pdf	Sun Feb  3 18:45:10 2013	(r311478)
+++ head/misc/freebsd-doc-el/pkg-plist.pdf	Sun Feb  3 19:03:57 2013	(r311479)
@@ -3,16 +3,13 @@
 %%DOCSDIR%%/%%DOCLANG%%/articles/compiz-fusion/article.pdf
 %%DOCSDIR%%/%%DOCLANG%%/articles/contributing/article.pdf
 %%DOCSDIR%%/%%DOCLANG%%/articles/cvs-freebsd/article.pdf
-%%DOCSDIR%%/%%DOCLANG%%/articles/dialup-firewall/article.pdf
 %%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd/article.pdf
-%%DOCSDIR%%/%%DOCLANG%%/articles/formatting-media/article.pdf
 %%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-questions/article.pdf
 %%DOCSDIR%%/%%DOCLANG%%/articles/gjournal-desktop/article.pdf
 %%DOCSDIR%%/%%DOCLANG%%/articles/greek-language-support/article.pdf
 %%DOCSDIR%%/%%DOCLANG%%/articles/laptop/article.pdf
 %%DOCSDIR%%/%%DOCLANG%%/articles/linux-users/article.pdf
 %%DOCSDIR%%/%%DOCLANG%%/articles/mailing-list-faq/article.pdf
-%%DOCSDIR%%/%%DOCLANG%%/articles/multi-os/article.pdf
 %%DOCSDIR%%/%%DOCLANG%%/articles/nanobsd/article.pdf
 %%DOCSDIR%%/%%DOCLANG%%/articles/new-users/article.pdf
 %%DOCSDIR%%/%%DOCLANG%%/articles/problem-reports/article.pdf

Modified: head/misc/freebsd-doc-el/pkg-plist.ps
==============================================================================
--- head/misc/freebsd-doc-el/pkg-plist.ps	Sun Feb  3 18:45:10 2013	(r311478)
+++ head/misc/freebsd-doc-el/pkg-plist.ps	Sun Feb  3 19:03:57 2013	(r311479)
@@ -3,16 +3,13 @@
 %%DOCSDIR%%/%%DOCLANG%%/articles/compiz-fusion/article.ps
 %%DOCSDIR%%/%%DOCLANG%%/articles/contributing/article.ps
 %%DOCSDIR%%/%%DOCLANG%%/articles/cvs-freebsd/article.ps
-%%DOCSDIR%%/%%DOCLANG%%/articles/dialup-firewall/article.ps
 %%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd/article.ps
-%%DOCSDIR%%/%%DOCLANG%%/articles/formatting-media/article.ps
 %%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-questions/article.ps
 %%DOCSDIR%%/%%DOCLANG%%/articles/gjournal-desktop/article.ps
 %%DOCSDIR%%/%%DOCLANG%%/articles/greek-language-support/article.ps
 %%DOCSDIR%%/%%DOCLANG%%/articles/laptop/article.ps
 %%DOCSDIR%%/%%DOCLANG%%/articles/linux-users/article.ps
 %%DOCSDIR%%/%%DOCLANG%%/articles/mailing-list-faq/article.ps
-%%DOCSDIR%%/%%DOCLANG%%/articles/multi-os/article.ps
 %%DOCSDIR%%/%%DOCLANG%%/articles/nanobsd/article.ps
 %%DOCSDIR%%/%%DOCLANG%%/articles/new-users/article.ps
 %%DOCSDIR%%/%%DOCLANG%%/articles/problem-reports/article.ps

Modified: head/misc/freebsd-doc-el/pkg-plist.txt
==============================================================================
--- head/misc/freebsd-doc-el/pkg-plist.txt	Sun Feb  3 18:45:10 2013	(r311478)
+++ head/misc/freebsd-doc-el/pkg-plist.txt	Sun Feb  3 19:03:57 2013	(r311479)
@@ -3,16 +3,13 @@
 %%DOCSDIR%%/%%DOCLANG%%/articles/compiz-fusion/article.txt
 %%DOCSDIR%%/%%DOCLANG%%/articles/contributing/article.txt
 %%DOCSDIR%%/%%DOCLANG%%/articles/cvs-freebsd/article.txt
-%%DOCSDIR%%/%%DOCLANG%%/articles/dialup-firewall/article.txt
 %%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd/article.txt
-%%DOCSDIR%%/%%DOCLANG%%/articles/formatting-media/article.txt
 %%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-questions/article.txt
 %%DOCSDIR%%/%%DOCLANG%%/articles/gjournal-desktop/article.txt
 %%DOCSDIR%%/%%DOCLANG%%/articles/greek-language-support/article.txt
 %%DOCSDIR%%/%%DOCLANG%%/articles/laptop/article.txt
 %%DOCSDIR%%/%%DOCLANG%%/articles/linux-users/article.txt
 %%DOCSDIR%%/%%DOCLANG%%/articles/mailing-list-faq/article.txt
-%%DOCSDIR%%/%%DOCLANG%%/articles/multi-os/article.txt
 %%DOCSDIR%%/%%DOCLANG%%/articles/nanobsd/article.txt
 %%DOCSDIR%%/%%DOCLANG%%/articles/new-users/article.txt
 %%DOCSDIR%%/%%DOCLANG%%/articles/problem-reports/article.txt

Modified: head/misc/freebsd-doc-en/Makefile
==============================================================================
--- head/misc/freebsd-doc-en/Makefile	Sun Feb  3 18:45:10 2013	(r311478)
+++ head/misc/freebsd-doc-en/Makefile	Sun Feb  3 19:03:57 2013	(r311479)
@@ -28,7 +28,7 @@
 #
 
 PORTNAME=	freebsd-doc
-PORTVERSION=	40385
+PORTVERSION=	40771
 PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	misc docs

Modified: head/misc/freebsd-doc-en/distinfo
==============================================================================
--- head/misc/freebsd-doc-en/distinfo	Sun Feb  3 18:45:10 2013	(r311478)
+++ head/misc/freebsd-doc-en/distinfo	Sun Feb  3 19:03:57 2013	(r311479)
@@ -1,2 +1,2 @@
-SHA256 (freebsd-doc-40385.tar.gz) = 753e68af94c860bdab3997cd5a93c33c419931db28443342f9c37d0fd50d8e50
-SIZE (freebsd-doc-40385.tar.gz) = 32680440
+SHA256 (freebsd-doc-40771.tar.gz) = 8edd6717dff3f670234007d77d599b154d19cf3a897f73b6b0c5f8f30121a1ff
+SIZE (freebsd-doc-40771.tar.gz) = 32696016

Modified: head/misc/freebsd-doc-en/pkg-plist.common
==============================================================================
--- head/misc/freebsd-doc-en/pkg-plist.common	Sun Feb  3 18:45:10 2013	(r311478)
+++ head/misc/freebsd-doc-en/pkg-plist.common	Sun Feb  3 19:03:57 2013	(r311479)
@@ -24,17 +24,12 @@
 @dirrm %%DOCSDIR%%/%%DOCLANG%%/books/developers-handbook
 @dirrm %%DOCSDIR%%/%%DOCLANG%%/books/dev-model
 @dirrm %%DOCSDIR%%/%%DOCLANG%%/books/design-44bsd
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/corp-net-guide
 @dirrm %%DOCSDIR%%/%%DOCLANG%%/books/arch-handbook/imagelib/callouts
 @dirrm %%DOCSDIR%%/%%DOCLANG%%/books/arch-handbook/imagelib
 @dirrm %%DOCSDIR%%/%%DOCLANG%%/books/arch-handbook
 @dirrm %%DOCSDIR%%/%%DOCLANG%%/books
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/zip-drive
 @dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/wp-toolbox
 @dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/vm-design
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/vinum
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/version-guide
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/storage-devices
 @dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/solid-state
 @dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/serial-uart
 @dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/remote-install/imagelib/callouts
@@ -56,7 +51,6 @@
 @dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/nanobsd/imagelib/callouts
 @dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/nanobsd/imagelib
 @dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/nanobsd
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/multi-os
 @dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/mh
 @dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/mailing-list-faq
 @dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/linux-users
@@ -66,21 +60,16 @@
 @dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/laptop
 @dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/ipsec-must
 @dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/hubs
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/hats
 @dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/gjournal-desktop
 @dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/geom-class
 @dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-update-server/imagelib/callouts
 @dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-update-server/imagelib
 @dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-update-server
 @dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-questions
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/formatting-media
 @dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/fonts
 @dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/filtering-bridges
 @dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/fbsd-from-scratch
 @dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/euro
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/diskless-x
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/dialup-firewall
 @dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/cvsup-advanced
 @dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/cvs-freebsd
 @dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/custom-gcc
@@ -91,11 +80,9 @@
 @dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/console-server
 @dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/compiz-fusion
 @dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/committers-guide
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/checkpoint
 @dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/casestudy-argentina.com
 @dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/building-products
 @dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/bsdl-gpl
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/5-roadmap
 @dirrm %%DOCSDIR%%/%%DOCLANG%%/articles
 %%DOCSDIR%%/%%DOCLANG_PREFIX%%
 @dirrm %%DOCSDIR%%/%%DOCLANG%%

Modified: head/misc/freebsd-doc-en/pkg-plist.html
==============================================================================
--- head/misc/freebsd-doc-en/pkg-plist.html	Sun Feb  3 18:45:10 2013	(r311478)
+++ head/misc/freebsd-doc-en/pkg-plist.html	Sun Feb  3 19:03:57 2013	(r311479)
@@ -1,9 +1,7 @@
 @comment $FreeBSD$
-%%DOCSDIR%%/%%DOCLANG%%/articles/5-roadmap/article.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/bsdl-gpl/article.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/building-products/article.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/casestudy-argentina.com/article.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/checkpoint/article.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/committers-guide/article.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/compiz-fusion/article.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/console-server/article.html
@@ -14,19 +12,14 @@
 %%DOCSDIR%%/%%DOCLANG%%/articles/custom-gcc/article.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/cvs-freebsd/article.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/cvsup-advanced/article.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/dialup-firewall/article.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/diskless-x/article.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/euro/article.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd/article.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/fbsd-from-scratch/article.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/filtering-bridges/article.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/fonts/article.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/formatting-media/article.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-questions/article.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-update-server/article.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/geom-class/article.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/gjournal-desktop/article.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/hats/article.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/hubs/article.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/ipsec-must/article.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/laptop/article.html
@@ -36,7 +29,6 @@
 %%DOCSDIR%%/%%DOCLANG%%/articles/linux-users/article.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/mailing-list-faq/article.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/mh/article.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/multi-os/article.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/nanobsd/article.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/new-users/article.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/p4-primer/article.html
@@ -52,14 +44,9 @@
 %%DOCSDIR%%/%%DOCLANG%%/articles/remote-install/article.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/serial-uart/article.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/solid-state/article.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/storage-devices/article.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/version-guide/article.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/vinum/article.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/vm-design/article.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/wp-toolbox/article.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/zip-drive/article.html
 %%DOCSDIR%%/%%DOCLANG%%/books/arch-handbook/book.html
-%%DOCSDIR%%/%%DOCLANG%%/books/corp-net-guide/book.html
 %%DOCSDIR%%/%%DOCLANG%%/books/design-44bsd/book.html
 %%DOCSDIR%%/%%DOCLANG%%/books/dev-model/book.html
 %%DOCSDIR%%/%%DOCLANG%%/books/developers-handbook/book.html

Modified: head/misc/freebsd-doc-en/pkg-plist.html-common
==============================================================================
--- head/misc/freebsd-doc-en/pkg-plist.html-common	Sun Feb  3 18:45:10 2013	(r311478)
+++ head/misc/freebsd-doc-en/pkg-plist.html-common	Sun Feb  3 19:03:57 2013	(r311479)
@@ -1,12 +1,9 @@
 @comment $FreeBSD$
-%%DOCSDIR%%/%%DOCLANG%%/articles/5-roadmap/docbook.css
 %%DOCSDIR%%/%%DOCLANG%%/articles/bsdl-gpl/docbook.css
 %%DOCSDIR%%/%%DOCLANG%%/articles/building-products/docbook.css
 %%DOCSDIR%%/%%DOCLANG%%/articles/building-products/freebsd-branches.png
 %%DOCSDIR%%/%%DOCLANG%%/articles/building-products/freebsd-organization.png
 %%DOCSDIR%%/%%DOCLANG%%/articles/casestudy-argentina.com/docbook.css
-%%DOCSDIR%%/%%DOCLANG%%/articles/checkpoint/docbook.css
-%%DOCSDIR%%/%%DOCLANG%%/articles/checkpoint/networks.png
 %%DOCSDIR%%/%%DOCLANG%%/articles/committers-guide/docbook.css
 %%DOCSDIR%%/%%DOCLANG%%/articles/compiz-fusion/docbook.css
 %%DOCSDIR%%/%%DOCLANG%%/articles/console-server/docbook.css
@@ -18,14 +15,10 @@
 %%DOCSDIR%%/%%DOCLANG%%/articles/custom-gcc/docbook.css
 %%DOCSDIR%%/%%DOCLANG%%/articles/cvs-freebsd/docbook.css
 %%DOCSDIR%%/%%DOCLANG%%/articles/cvsup-advanced/docbook.css
-%%DOCSDIR%%/%%DOCLANG%%/articles/dialup-firewall/docbook.css
-%%DOCSDIR%%/%%DOCLANG%%/articles/diskless-x/docbook.css
-%%DOCSDIR%%/%%DOCLANG%%/articles/euro/docbook.css
 %%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd/docbook.css
 %%DOCSDIR%%/%%DOCLANG%%/articles/fbsd-from-scratch/docbook.css
 %%DOCSDIR%%/%%DOCLANG%%/articles/filtering-bridges/docbook.css
 %%DOCSDIR%%/%%DOCLANG%%/articles/fonts/docbook.css
-%%DOCSDIR%%/%%DOCLANG%%/articles/formatting-media/docbook.css
 %%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-questions/docbook.css
 %%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-update-server/docbook.css
 %%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-update-server/imagelib/callouts/1.png
@@ -37,7 +30,6 @@
 %%DOCSDIR%%/%%DOCLANG%%/articles/gjournal-desktop/disklabel1.png
 %%DOCSDIR%%/%%DOCLANG%%/articles/gjournal-desktop/disklabel2.png
 %%DOCSDIR%%/%%DOCLANG%%/articles/gjournal-desktop/docbook.css
-%%DOCSDIR%%/%%DOCLANG%%/articles/hats/docbook.css
 %%DOCSDIR%%/%%DOCLANG%%/articles/hubs/docbook.css
 %%DOCSDIR%%/%%DOCLANG%%/articles/ipsec-must/docbook.css
 %%DOCSDIR%%/%%DOCLANG%%/articles/laptop/docbook.css
@@ -47,7 +39,6 @@
 %%DOCSDIR%%/%%DOCLANG%%/articles/linux-users/docbook.css
 %%DOCSDIR%%/%%DOCLANG%%/articles/mailing-list-faq/docbook.css
 %%DOCSDIR%%/%%DOCLANG%%/articles/mh/docbook.css
-%%DOCSDIR%%/%%DOCLANG%%/articles/multi-os/docbook.css
 %%DOCSDIR%%/%%DOCLANG%%/articles/nanobsd/docbook.css
 %%DOCSDIR%%/%%DOCLANG%%/articles/nanobsd/imagelib/callouts/1.png
 %%DOCSDIR%%/%%DOCLANG%%/articles/nanobsd/imagelib/callouts/2.png
@@ -96,19 +87,12 @@
 %%DOCSDIR%%/%%DOCLANG%%/articles/remote-install/imagelib/callouts/7.png
 %%DOCSDIR%%/%%DOCLANG%%/articles/serial-uart/docbook.css
 %%DOCSDIR%%/%%DOCLANG%%/articles/solid-state/docbook.css
-%%DOCSDIR%%/%%DOCLANG%%/articles/storage-devices/docbook.css
-%%DOCSDIR%%/%%DOCLANG%%/articles/version-guide/docbook.css
-%%DOCSDIR%%/%%DOCLANG%%/articles/vinum/ad0b4aft.png
-%%DOCSDIR%%/%%DOCLANG%%/articles/vinum/ad2b4aft.png
-%%DOCSDIR%%/%%DOCLANG%%/articles/vinum/arch.png
-%%DOCSDIR%%/%%DOCLANG%%/articles/vinum/docbook.css
 %%DOCSDIR%%/%%DOCLANG%%/articles/vm-design/docbook.css
 %%DOCSDIR%%/%%DOCLANG%%/articles/vm-design/fig1.png
 %%DOCSDIR%%/%%DOCLANG%%/articles/vm-design/fig2.png
 %%DOCSDIR%%/%%DOCLANG%%/articles/vm-design/fig3.png
 %%DOCSDIR%%/%%DOCLANG%%/articles/vm-design/fig4.png
 %%DOCSDIR%%/%%DOCLANG%%/articles/wp-toolbox/docbook.css
-%%DOCSDIR%%/%%DOCLANG%%/articles/zip-drive/docbook.css
 %%DOCSDIR%%/%%DOCLANG%%/books/arch-handbook/docbook.css
 %%DOCSDIR%%/%%DOCLANG%%/books/arch-handbook/imagelib/callouts/1.png
 %%DOCSDIR%%/%%DOCLANG%%/books/arch-handbook/imagelib/callouts/10.png
@@ -120,13 +104,6 @@
 %%DOCSDIR%%/%%DOCLANG%%/books/arch-handbook/imagelib/callouts/7.png
 %%DOCSDIR%%/%%DOCLANG%%/books/arch-handbook/imagelib/callouts/8.png
 %%DOCSDIR%%/%%DOCLANG%%/books/arch-handbook/imagelib/callouts/9.png
-%%DOCSDIR%%/%%DOCLANG%%/books/corp-net-guide/08-01.png
-%%DOCSDIR%%/%%DOCLANG%%/books/corp-net-guide/08-02.png
-%%DOCSDIR%%/%%DOCLANG%%/books/corp-net-guide/08-03.png
-%%DOCSDIR%%/%%DOCLANG%%/books/corp-net-guide/08-04.png
-%%DOCSDIR%%/%%DOCLANG%%/books/corp-net-guide/08-05.png
-%%DOCSDIR%%/%%DOCLANG%%/books/corp-net-guide/08-06.png
-%%DOCSDIR%%/%%DOCLANG%%/books/corp-net-guide/docbook.css
 %%DOCSDIR%%/%%DOCLANG%%/books/design-44bsd/docbook.css
 %%DOCSDIR%%/%%DOCLANG%%/books/design-44bsd/fig1.png
 %%DOCSDIR%%/%%DOCLANG%%/books/design-44bsd/fig2.png

Modified: head/misc/freebsd-doc-en/pkg-plist.html-split
==============================================================================
--- head/misc/freebsd-doc-en/pkg-plist.html-split	Sun Feb  3 18:45:10 2013	(r311478)
+++ head/misc/freebsd-doc-en/pkg-plist.html-split	Sun Feb  3 19:03:57 2013	(r311479)
@@ -1,10 +1,4 @@
 @comment $FreeBSD$
-%%DOCSDIR%%/%%DOCLANG%%/articles/5-roadmap/TRADEMARKS.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/5-roadmap/future.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/5-roadmap/goals.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/5-roadmap/index.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/5-roadmap/major-issues.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/bsdl-gpl/TRADEMARKS.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/bsdl-gpl/addenda.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/bsdl-gpl/bsd-advantages.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/bsdl-gpl/conclusion.html
@@ -17,27 +11,19 @@
 %%DOCSDIR%%/%%DOCLANG%%/articles/bsdl-gpl/origins-lgpl.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/bsdl-gpl/orphaning.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/bsdl-gpl/recommendations.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/bsdl-gpl/trademarks.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/bsdl-gpl/unix-license.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/building-products/TRADEMARKS.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/building-products/b382.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/building-products/b383.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/building-products/conclusion.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/building-products/freebsd-collaboration.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/building-products/freebsd-intro.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/building-products/index.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/casestudy-argentina.com/TRADEMARKS.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/building-products/trademarks.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/casestudy-argentina.com/challenge.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/casestudy-argentina.com/freebsd.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/casestudy-argentina.com/index.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/casestudy-argentina.com/results.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/checkpoint/LEGALNOTICE.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/checkpoint/index.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/checkpoint/object.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/checkpoint/policy.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/checkpoint/racoon.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/checkpoint/references.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/checkpoint/rulecfg.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/checkpoint/startingvpn.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/committers-guide/TRADEMARKS.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/casestudy-argentina.com/trademarks.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/committers-guide/archs.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/committers-guide/committer.types.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/committers-guide/conventions.html
@@ -54,13 +40,13 @@
 %%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/compiz-fusion/TRADEMARKS.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/committers-guide/trademarks.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/compiz-fusion/compiz-fusion.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/compiz-fusion/compiz-troubleshooting.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/compiz-fusion/index.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/compiz-fusion/nvidia-setup.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/compiz-fusion/trademarks.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/compiz-fusion/xorg-configuration.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/console-server/TRADEMARKS.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/console-server/cabling.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/console-server/conserver-versions.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/console-server/freebsd.html
@@ -72,7 +58,7 @@
 %%DOCSDIR%%/%%DOCLANG%%/articles/console-server/security.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/console-server/setting-up-server.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/console-server/solaris.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/contributing-ports/TRADEMARKS.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/console-server/trademarks.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/contributing-ports/adopt-port.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/contributing-ports/create-port.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/contributing-ports/fix-broken.html
@@ -80,11 +66,11 @@
 %%DOCSDIR%%/%%DOCLANG%%/articles/contributing-ports/maintain-port.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/contributing-ports/mortal-coil.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/contributing-ports/resources.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/contributing-ports/trademarks.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/contributing-ports/what-contribute.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/contributing/TRADEMARKS.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/contributing/contrib-how.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/contributing/index.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/contributors/TRADEMARKS.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/contributing/trademarks.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/contributors/contrib-386bsd.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/contributors/contrib-additional.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/contributors/contrib-corealumni.html
@@ -94,7 +80,7 @@
 %%DOCSDIR%%/%%DOCLANG%%/articles/contributors/contrib-portmgralumni.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/contributors/index.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/contributors/staff-committers.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/cups/TRADEMARKS.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/contributors/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
@@ -102,45 +88,26 @@
 %%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/cups/trademarks.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/custom-gcc/configuring-ports-gcc.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/custom-gcc/index.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/custom-gcc/performance-imparct.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/custom-gcc/prerequisites.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/cvs-freebsd/TRADEMARKS.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/custom-gcc/trademarks.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/cvs-freebsd/first-setup.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/cvs-freebsd/freebsdspecific.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/cvs-freebsd/index.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/cvsup-advanced/TRADEMARKS.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/cvs-freebsd/trademarks.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/cvsup-advanced/examples.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/cvsup-advanced/index.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/cvsup-advanced/introduction.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/cvsup-advanced/script.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/dialup-firewall/TRADEMARKS.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/dialup-firewall/index.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/dialup-firewall/kernel.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/dialup-firewall/rcconf.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/dialup-firewall/rules.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/dialup-firewall/x70.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/dialup-firewall/x91.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/diskless-x/TRADEMARKS.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/diskless-x/index.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/diskless-x/x45.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/diskless-x/x55.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/diskless-x/x62.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/diskless-x/x83.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/euro/TRADEMARKS.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/euro/console.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/euro/general.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/euro/index.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/euro/problems.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/euro/x11.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd/TRADEMARKS.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/cvsup-advanced/trademarks.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd/comparing-bsd-and-linux.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd/index.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd/trademarks.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd/what-a-real-unix.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd/why-is-bsd-not-better-known.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/fbsd-from-scratch/TRADEMARKS.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/fbsd-from-scratch/files.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/fbsd-from-scratch/index.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/fbsd-from-scratch/limitations.html
@@ -148,42 +115,36 @@
 %%DOCSDIR%%/%%DOCLANG%%/articles/fbsd-from-scratch/stage1.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/fbsd-from-scratch/stage2.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/fbsd-from-scratch/stage3.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/fbsd-from-scratch/trademarks.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/fbsd-from-scratch/why.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/filtering-bridges/TRADEMARKS.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/filtering-bridges/filtering-bridges-contributors.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/filtering-bridges/filtering-bridges-enabling.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/filtering-bridges/filtering-bridges-finalprep.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/filtering-bridges/filtering-bridges-how.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/filtering-bridges/filtering-bridges-ipfirewall.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/filtering-bridges/index.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/fonts/TRADEMARKS.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/filtering-bridges/trademarks.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/fonts/additional-questions.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/fonts/convert-truetype.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/fonts/font-formats.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/fonts/index.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/fonts/obtaining-additional-fonts.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/fonts/terminology.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/fonts/trademarks.html

*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201302031903.r13J3vwY096950>