6 files changed, 101 insertions, 179 deletions

diff --git a/misc/freebsd-doc-ru/pkg-plist.common b/misc/freebsd-doc-ru/pkg-plist.common
index a9bea848e264..8ea74e1abe6a 100644
--- a/misc/freebsd-doc-ru/pkg-plist.common
+++ b/misc/freebsd-doc-ru/pkg-plist.common
@@ -1,5 +1,4 @@
 @comment $FreeBSD$
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/ppp-primer
 @dirrm %%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook
 @dirrm %%DOCSDIR%%/%%DOCLANG%%/books/handbook/vinum
 @dirrm %%DOCSDIR%%/%%DOCLANG%%/books/handbook/security
@@ -8,41 +7,33 @@
 @dirrm %%DOCSDIR%%/%%DOCLANG%%/books/handbook/imagelib/callouts
 @dirrm %%DOCSDIR%%/%%DOCLANG%%/books/handbook/imagelib
 @dirrm %%DOCSDIR%%/%%DOCLANG%%/books/handbook/geom
+@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall
 @dirrm %%DOCSDIR%%/%%DOCLANG%%/books/handbook/advanced-networking
 @dirrm %%DOCSDIR%%/%%DOCLANG%%/books/handbook
 @dirrm %%DOCSDIR%%/%%DOCLANG%%/books/faq
 @dirrm %%DOCSDIR%%/%%DOCLANG%%/books
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/zip-drive
 @dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/vm-design
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/version-guide
 @dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/solid-state
 @dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/releng-packages
 @dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/releng
 @dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/relaydelay
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/pxe
 @dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/problem-reports
 @dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/pr-guidelines
 @dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/portbuild
 @dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/pam
 @dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/new-users
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/multi-os
 @dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/mh
 @dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/mailing-list-faq
 @dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/linux-comparison
 @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-questions
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/formatting-media
 @dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/fonts
 @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
@@ -50,8 +41,6 @@
 @dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/contributing
 @dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/console-server
 @dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/committers-guide
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/checkpoint
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/5-roadmap
 @dirrm %%DOCSDIR%%/%%DOCLANG%%/articles
 %%DOCSDIR%%/%%DOCLANG_PREFIX%%
 @dirrm %%DOCSDIR%%/%%DOCLANG%%
diff --git a/misc/freebsd-doc-ru/pkg-plist.extras b/misc/freebsd-doc-ru/pkg-plist.extras
index e12a0d59e0fe..25254ef165a8 100644
--- a/misc/freebsd-doc-ru/pkg-plist.extras
+++ b/misc/freebsd-doc-ru/pkg-plist.extras
@@ -4,9 +4,3 @@
 %%DOCSDIR%%/%%DOCLANG%%/articles/fbsd-from-scratch/stage_2.conf.default
 %%DOCSDIR%%/%%DOCLANG%%/articles/fbsd-from-scratch/stage_2.sh
 %%DOCSDIR%%/%%DOCLANG%%/articles/fbsd-from-scratch/stage_3.mk
-%%DOCSDIR%%/%%DOCLANG%%/articles/pxe/dhcpd.conf
-%%DOCSDIR%%/%%DOCLANG%%/articles/pxe/install.cfg
-%%DOCSDIR%%/%%DOCLANG%%/articles/pxe/loader.rc
-%%DOCSDIR%%/%%DOCLANG%%/articles/pxe/pkgmaker.sh
-%%DOCSDIR%%/%%DOCLANG%%/articles/pxe/post
-%%DOCSDIR%%/%%DOCLANG%%/articles/pxe/pre
diff --git a/misc/freebsd-doc-ru/pkg-plist.html b/misc/freebsd-doc-ru/pkg-plist.html
index a866725f12e5..f549fb811b61 100644
--- a/misc/freebsd-doc-ru/pkg-plist.html
+++ b/misc/freebsd-doc-ru/pkg-plist.html
@@ -1,6 +1,4 @@
 @comment $FreeBSD$
-%%DOCSDIR%%/%%DOCLANG%%/articles/5-roadmap/article.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/checkpoint/article.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/committers-guide/article.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/console-server/article.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/contributing/article.html
@@ -8,38 +6,28 @@
 %%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/fonts/article.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/formatting-media/article.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-questions/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
 %%DOCSDIR%%/%%DOCLANG%%/articles/linux-comparison/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/new-users/article.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/pam/article.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/portbuild/article.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/pr-guidelines/article.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/problem-reports/article.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/pxe/article.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/relaydelay/article.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/releng-packages/article.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/releng/article.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/solid-state/article.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/version-guide/article.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/vm-design/article.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/zip-drive/article.html
 %%DOCSDIR%%/%%DOCLANG%%/books/faq/book.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/book.html
 %%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/book.html
-%%DOCSDIR%%/%%DOCLANG%%/books/ppp-primer/book.html
diff --git a/misc/freebsd-doc-ru/pkg-plist.html-common b/misc/freebsd-doc-ru/pkg-plist.html-common
index 4fbe521c1f31..7f2ff4dd94b4 100644
--- a/misc/freebsd-doc-ru/pkg-plist.html-common
+++ b/misc/freebsd-doc-ru/pkg-plist.html-common
@@ -1,7 +1,4 @@
 @comment $FreeBSD$
-%%DOCSDIR%%/%%DOCLANG%%/articles/5-roadmap/docbook.css
-%%DOCSDIR%%/%%DOCLANG%%/articles/checkpoint/docbook.css
-%%DOCSDIR%%/%%DOCLANG%%/articles/checkpoint/networks.png
 %%DOCSDIR%%/%%DOCLANG%%/articles/committers-guide/docbook.css
 %%DOCSDIR%%/%%DOCLANG%%/articles/console-server/docbook.css
 %%DOCSDIR%%/%%DOCLANG%%/articles/console-server/tk0231-9-1.png
@@ -10,32 +7,25 @@
 %%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/fonts/docbook.css
-%%DOCSDIR%%/%%DOCLANG%%/articles/formatting-media/docbook.css
 %%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-questions/docbook.css
 %%DOCSDIR%%/%%DOCLANG%%/articles/geom-class/docbook.css
 %%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
 %%DOCSDIR%%/%%DOCLANG%%/articles/linux-comparison/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/new-users/docbook.css
 %%DOCSDIR%%/%%DOCLANG%%/articles/pam/docbook.css
 %%DOCSDIR%%/%%DOCLANG%%/articles/portbuild/docbook.css
 %%DOCSDIR%%/%%DOCLANG%%/articles/pr-guidelines/docbook.css
 %%DOCSDIR%%/%%DOCLANG%%/articles/problem-reports/docbook.css
-%%DOCSDIR%%/%%DOCLANG%%/articles/pxe/docbook.css
 %%DOCSDIR%%/%%DOCLANG%%/articles/relaydelay/docbook.css
 %%DOCSDIR%%/%%DOCLANG%%/articles/releng-packages/docbook.css
 %%DOCSDIR%%/%%DOCLANG%%/articles/releng/branches-head.png
@@ -45,21 +35,64 @@
 %%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/branches-releng9.png
 %%DOCSDIR%%/%%DOCLANG%%/articles/releng/docbook.css
 %%DOCSDIR%%/%%DOCLANG%%/articles/solid-state/docbook.css
-%%DOCSDIR%%/%%DOCLANG%%/articles/version-guide/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/zip-drive/docbook.css
 %%DOCSDIR%%/%%DOCLANG%%/books/faq/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
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/advanced-networking/net-routing.png
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/advanced-networking/static-routes.png
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall/bsdinstall-adduser1.png
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall/bsdinstall-adduser2.png
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall/bsdinstall-adduser3.png
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall/bsdinstall-boot-loader-menu.png
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall/bsdinstall-choose-mode.png
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall/bsdinstall-config-components.png
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall/bsdinstall-config-crashdump.png
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall/bsdinstall-config-hostname.png
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall/bsdinstall-config-keymap.png
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall/bsdinstall-config-services.png
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall/bsdinstall-configure-network-interface-ipv4-dhcp.png
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall/bsdinstall-configure-network-interface-ipv4-static.png
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall/bsdinstall-configure-network-interface-ipv4.png
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall/bsdinstall-configure-network-interface-ipv6-static.png
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall/bsdinstall-configure-network-interface-ipv6.png
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall/bsdinstall-configure-network-interface-slaac.png
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall/bsdinstall-configure-network-interface.png
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall/bsdinstall-configure-network-ipv4-dns.png
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall/bsdinstall-configure-wireless-accesspoints.png
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall/bsdinstall-configure-wireless-scan.png
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall/bsdinstall-configure-wireless-wpa2setup.png
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall/bsdinstall-distfile-extracting.png
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall/bsdinstall-distfile-fetching.png
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall/bsdinstall-distfile-verifying.png
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall/bsdinstall-final-confirmation.png
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall/bsdinstall-final-modification-shell.png
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall/bsdinstall-finalconfiguration.png
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall/bsdinstall-keymap-select-default.png
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall/bsdinstall-mainexit.png
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall/bsdinstall-netinstall-files.png
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall/bsdinstall-netinstall-mirrorselect.png
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall/bsdinstall-part-entire-part.png
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall/bsdinstall-part-guided-disk.png
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall/bsdinstall-part-guided-manual.png
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall/bsdinstall-part-manual-addpart.png
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall/bsdinstall-part-manual-create.png
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall/bsdinstall-part-manual-partscheme.png
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall/bsdinstall-part-review.png
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall/bsdinstall-post-root-passwd.png
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall/bsdinstall-set-clock-local-utc.png
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall/bsdinstall-timezone-confirm.png
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall/bsdinstall-timezone-country.png
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall/bsdinstall-timezone-region.png
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall/bsdinstall-timezone-zone.png
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/docbook.css
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/geom/striping.png
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/imagelib/callouts/1.png
@@ -164,4 +197,3 @@
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/vinum/vinum-striped-vol.png
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/vinum/vinum-striped.png
 %%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/docbook.css
-%%DOCSDIR%%/%%DOCLANG%%/books/ppp-primer/docbook.css
diff --git a/misc/freebsd-doc-ru/pkg-plist.html-split b/misc/freebsd-doc-ru/pkg-plist.html-split
index ebf1dc555f1a..c6851c0b6a8b 100644
--- a/misc/freebsd-doc-ru/pkg-plist.html-split
+++ b/misc/freebsd-doc-ru/pkg-plist.html-split
@@ -1,18 +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/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/committers-guide/archs.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/committers-guide/committer.types.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/committers-guide/conventions.html
@@ -27,7 +13,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/console-server/TRADEMARKS.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/committers-guide/trademarks.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/console-server/cabling.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/console-server/conserver-versions.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/console-server/freebsd.html
@@ -39,10 +25,10 @@
 %%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/TRADEMARKS.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/console-server/trademarks.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/contributing/contrib-how.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/contributing/index.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/cups/TRADEMARKS.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/contributing/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
@@ -50,44 +36,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/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/x71.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/dialup-firewall/x94.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/compairing-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
@@ -95,55 +63,48 @@
 %%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/fonts/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
 %%DOCSDIR%%/%%DOCLANG%%/articles/fonts/truetype-for-other-programs.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/fonts/type1-fonts-ghostscript.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/fonts/type1-fonts-groff.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/fonts/type1-fonts-x11.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/fonts/virtual-console.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/freebsd-questions/index.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-questions/x112.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-questions/x203.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-questions/x215.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-questions/x38.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-questions/x52.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-questions/x65.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-questions/x90.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/geom-class/TRADEMARKS.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-questions/trademarks.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/x39.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-questions/x53.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-questions/x66.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-questions/x91.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/geom-class/geom.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/geom-class/index.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/geom-class/kernelprog.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/geom-class/prelim.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/gjournal-desktop/TRADEMARKS.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/geom-class/trademarks.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/hats/index.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/hubs/TRADEMARKS.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/hubs/index.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/hubs/mirror-howto.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/hubs/mirror-official.html
 %%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/hubs/trademarks.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/ipsec-must/caveat.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/ipsec-must/code.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/ipsec-must/experiment.html
@@ -152,37 +113,29 @@
 %%DOCSDIR%%/%%DOCLANG%%/articles/ipsec-must/ipsec.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/ipsec-must/kernel.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/ipsec-must/solution.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/laptop/TRADEMARKS.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/ipsec-must/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/linux-comparison/trademarks.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/mh/TRADEMARKS.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/mh/index.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/mh/x198.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/mh/x374.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/mh/x55.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/x194.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/new-users/TRADEMARKS.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/mh/trademarks.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/mh/x199.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/mh/x375.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/mh/x56.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
@@ -193,6 +146,7 @@
 %%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/pam/index.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/pam/pam-appl-prog.html
@@ -205,7 +159,6 @@
 %%DOCSDIR%%/%%DOCLANG%%/articles/pam/pam-sample-conv.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/pam/pam-sample-module.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/pam/pam-terms.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/portbuild/TRADEMARKS.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/portbuild/anatomy.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/portbuild/expbuilds.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/portbuild/index.html
@@ -215,14 +168,14 @@
 %%DOCSDIR%%/%%DOCLANG%%/articles/portbuild/release.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/portbuild/setup.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/portbuild/starting.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/portbuild/trademarks.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/portbuild/uploading.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/pr-guidelines/TRADEMARKS.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/pr-guidelines/index.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/pr-guidelines/pr-lifecycle.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/pr-guidelines/pr-states.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/pr-guidelines/pr-types.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/pr-guidelines/references.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/problem-reports/TRADEMARKS.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/pr-guidelines/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
@@ -230,17 +183,11 @@
 %%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
-%%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/problem-reports/trademarks.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/relaydelay/index.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/releng-packages/TRADEMARKS.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/releng-packages/index.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/releng-packages/x39.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/releng/TRADEMARKS.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/releng-packages/trademarks.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/releng-packages/x40.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/releng/ackno.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/releng/biblio.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/releng/distribution.html
@@ -250,19 +197,13 @@
 %%DOCSDIR%%/%%DOCLANG%%/articles/releng/lessons-learned.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/releng/release-build.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/releng/release-proc.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/solid-state/TRADEMARKS.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/releng/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/x94.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%%/articles/vm-design/TRADEMARKS.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/solid-state/trademarks.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/solid-state/x95.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/vm-design/allen-briggs-qa.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/vm-design/conclusion.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/vm-design/freeing-pages.html
@@ -271,12 +212,8 @@
 %%DOCSDIR%%/%%DOCLANG%%/articles/vm-design/pre-table-optimizations.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/vm-design/prefault-optimizations.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/vm-design/swap-layers.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/vm-design/trademarks.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/vm-design/vm-objects.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/zip-drive/TRADEMARKS.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/zip-drive/index.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/zip-drive/x102.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/zip-drive/x53.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
@@ -297,6 +234,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
@@ -305,7 +243,6 @@
 %%DOCSDIR%%/%%DOCLANG%%/books/faq/support.html
 %%DOCSDIR%%/%%DOCLANG%%/books/faq/troubleshoot.html
 %%DOCSDIR%%/%%DOCLANG%%/books/faq/x.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
@@ -343,6 +280,15 @@
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/boot-kernel.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/boot-shutdown.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/boot.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall-final-warning.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall-hardware.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall-install-trouble.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall-netinstall.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall-partitioning.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall-post.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall-pre.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall-start.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/colophon.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/common-tasks.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/config-network-setup.html
@@ -364,7 +310,6 @@
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/crypt.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/ctm.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/current-stable.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/cutting-edge.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/cvs-tags.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/cvsup.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/desktop-browsers.html
@@ -437,6 +382,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
@@ -555,6 +501,9 @@
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/tcpwrappers.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/term.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/tvcard.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/updating-upgrading-freebsdupdate.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/updating-upgrading-portsnap.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/updating-upgrading.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/usb-disks.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/userppp.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/users-groups.html
@@ -565,6 +514,7 @@
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/users-system.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/users-user.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/users.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/using-bsdinstall.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/using-localization.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/using-sysinstall.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/video-playback.html
@@ -584,7 +534,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
@@ -664,6 +613,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
@@ -686,23 +636,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/x5788.html
-%%DOCSDIR%%/%%DOCLANG%%/books/ppp-primer/c30.html
-%%DOCSDIR%%/%%DOCLANG%%/books/ppp-primer/c309.html
-%%DOCSDIR%%/%%DOCLANG%%/books/ppp-primer/c833.html
-%%DOCSDIR%%/%%DOCLANG%%/books/ppp-primer/config-window-system.html
-%%DOCSDIR%%/%%DOCLANG%%/books/ppp-primer/f14.html
-%%DOCSDIR%%/%%DOCLANG%%/books/ppp-primer/index.html
-%%DOCSDIR%%/%%DOCLANG%%/books/ppp-primer/list-lan-hosts.html
-%%DOCSDIR%%/%%DOCLANG%%/books/ppp-primer/system-config.html
-%%DOCSDIR%%/%%DOCLANG%%/books/ppp-primer/testing-the-network.html
-%%DOCSDIR%%/%%DOCLANG%%/books/ppp-primer/verify-ether-if-config.html
-%%DOCSDIR%%/%%DOCLANG%%/books/ppp-primer/x237.html
-%%DOCSDIR%%/%%DOCLANG%%/books/ppp-primer/x274.html
-%%DOCSDIR%%/%%DOCLANG%%/books/ppp-primer/x341.html
-%%DOCSDIR%%/%%DOCLANG%%/books/ppp-primer/x38.html
-%%DOCSDIR%%/%%DOCLANG%%/books/ppp-primer/x569.html
-%%DOCSDIR%%/%%DOCLANG%%/books/ppp-primer/x682.html
-%%DOCSDIR%%/%%DOCLANG%%/books/ppp-primer/x760.html
-%%DOCSDIR%%/%%DOCLANG%%/books/ppp-primer/x830.html
-%%DOCSDIR%%/%%DOCLANG%%/books/ppp-primer/x924.html
+%%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/x5789.html
diff --git a/misc/freebsd-doc-ru/pkg-plist.txt b/misc/freebsd-doc-ru/pkg-plist.txt
index 6ff4ea0a3a02..ba167ebda4ed 100644
--- a/misc/freebsd-doc-ru/pkg-plist.txt
+++ b/misc/freebsd-doc-ru/pkg-plist.txt
@@ -1,6 +1,4 @@
 @comment $FreeBSD$
-%%DOCSDIR%%/%%DOCLANG%%/articles/5-roadmap/article.txt
-%%DOCSDIR%%/%%DOCLANG%%/articles/checkpoint/article.txt
 %%DOCSDIR%%/%%DOCLANG%%/articles/committers-guide/article.txt
 %%DOCSDIR%%/%%DOCLANG%%/articles/console-server/article.txt
 %%DOCSDIR%%/%%DOCLANG%%/articles/contributing/article.txt
@@ -8,38 +6,28 @@
 %%DOCSDIR%%/%%DOCLANG%%/articles/custom-gcc/article.txt
 %%DOCSDIR%%/%%DOCLANG%%/articles/cvs-freebsd/article.txt
 %%DOCSDIR%%/%%DOCLANG%%/articles/cvsup-advanced/article.txt
-%%DOCSDIR%%/%%DOCLANG%%/articles/dialup-firewall/article.txt
-%%DOCSDIR%%/%%DOCLANG%%/articles/diskless-x/article.txt
-%%DOCSDIR%%/%%DOCLANG%%/articles/euro/article.txt
 %%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd/article.txt
 %%DOCSDIR%%/%%DOCLANG%%/articles/fbsd-from-scratch/article.txt
 %%DOCSDIR%%/%%DOCLANG%%/articles/fonts/article.txt
-%%DOCSDIR%%/%%DOCLANG%%/articles/formatting-media/article.txt
 %%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-questions/article.txt
 %%DOCSDIR%%/%%DOCLANG%%/articles/geom-class/article.txt
 %%DOCSDIR%%/%%DOCLANG%%/articles/gjournal-desktop/article.txt
-%%DOCSDIR%%/%%DOCLANG%%/articles/hats/article.txt
 %%DOCSDIR%%/%%DOCLANG%%/articles/hubs/article.txt
 %%DOCSDIR%%/%%DOCLANG%%/articles/ipsec-must/article.txt
 %%DOCSDIR%%/%%DOCLANG%%/articles/laptop/article.txt
 %%DOCSDIR%%/%%DOCLANG%%/articles/linux-comparison/article.txt
 %%DOCSDIR%%/%%DOCLANG%%/articles/mailing-list-faq/article.txt
 %%DOCSDIR%%/%%DOCLANG%%/articles/mh/article.txt
-%%DOCSDIR%%/%%DOCLANG%%/articles/multi-os/article.txt
 %%DOCSDIR%%/%%DOCLANG%%/articles/new-users/article.txt
 %%DOCSDIR%%/%%DOCLANG%%/articles/pam/article.txt
 %%DOCSDIR%%/%%DOCLANG%%/articles/portbuild/article.txt
 %%DOCSDIR%%/%%DOCLANG%%/articles/pr-guidelines/article.txt
 %%DOCSDIR%%/%%DOCLANG%%/articles/problem-reports/article.txt
-%%DOCSDIR%%/%%DOCLANG%%/articles/pxe/article.txt
 %%DOCSDIR%%/%%DOCLANG%%/articles/relaydelay/article.txt
 %%DOCSDIR%%/%%DOCLANG%%/articles/releng-packages/article.txt
 %%DOCSDIR%%/%%DOCLANG%%/articles/releng/article.txt
 %%DOCSDIR%%/%%DOCLANG%%/articles/solid-state/article.txt
-%%DOCSDIR%%/%%DOCLANG%%/articles/version-guide/article.txt
 %%DOCSDIR%%/%%DOCLANG%%/articles/vm-design/article.txt
-%%DOCSDIR%%/%%DOCLANG%%/articles/zip-drive/article.txt
 %%DOCSDIR%%/%%DOCLANG%%/books/faq/book.txt
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/book.txt
 %%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/book.txt
-%%DOCSDIR%%/%%DOCLANG%%/books/ppp-primer/book.txt