Update to r41954 of the FreeBSD docset.

Approved by:	doceng (implicit)

5 files changed, 32 insertions, 33 deletions

diff --git a/misc/freebsd-doc-ru/pkg-plist.common b/misc/freebsd-doc-ru/pkg-plist.common
index 8ea74e1abe6a..dc32bf728fe7 100644
--- a/misc/freebsd-doc-ru/pkg-plist.common
+++ b/misc/freebsd-doc-ru/pkg-plist.common
@@ -34,7 +34,6 @@
 @dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/fonts
 @dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/fbsd-from-scratch
 @dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/cvsup-advanced
 @dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/cvs-freebsd
 @dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/custom-gcc
 @dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/cups
diff --git a/misc/freebsd-doc-ru/pkg-plist.html b/misc/freebsd-doc-ru/pkg-plist.html
index f549fb811b61..c2b292e6f53a 100644
--- a/misc/freebsd-doc-ru/pkg-plist.html
+++ b/misc/freebsd-doc-ru/pkg-plist.html
@@ -5,7 +5,6 @@
 %%DOCSDIR%%/%%DOCLANG%%/articles/cups/article.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/custom-gcc/article.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/cvs-freebsd/article.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/cvsup-advanced/article.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd/article.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/fbsd-from-scratch/article.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/fonts/article.html
diff --git a/misc/freebsd-doc-ru/pkg-plist.html-common b/misc/freebsd-doc-ru/pkg-plist.html-common
index 7f2ff4dd94b4..576c84032fef 100644
--- a/misc/freebsd-doc-ru/pkg-plist.html-common
+++ b/misc/freebsd-doc-ru/pkg-plist.html-common
@@ -6,7 +6,6 @@
 %%DOCSDIR%%/%%DOCLANG%%/articles/cups/docbook.css
 %%DOCSDIR%%/%%DOCLANG%%/articles/custom-gcc/docbook.css
 %%DOCSDIR%%/%%DOCLANG%%/articles/cvs-freebsd/docbook.css
-%%DOCSDIR%%/%%DOCLANG%%/articles/cvsup-advanced/docbook.css
 %%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd/docbook.css
 %%DOCSDIR%%/%%DOCLANG%%/articles/fbsd-from-scratch/docbook.css
 %%DOCSDIR%%/%%DOCLANG%%/articles/fonts/docbook.css
diff --git a/misc/freebsd-doc-ru/pkg-plist.html-split b/misc/freebsd-doc-ru/pkg-plist.html-split
index b0bad9b897de..5c074833d611 100644
--- a/misc/freebsd-doc-ru/pkg-plist.html-split
+++ b/misc/freebsd-doc-ru/pkg-plist.html-split
@@ -46,11 +46,6 @@
 %%DOCSDIR%%/%%DOCLANG%%/articles/cvs-freebsd/freebsdspecific.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/cvs-freebsd/index.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/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
@@ -77,15 +72,15 @@
 %%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/freebsd-questions/ar01s02.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-questions/ar01s03.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-questions/ar01s04.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-questions/ar01s05.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-questions/ar01s06.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-questions/ar01s07.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-questions/ar01s08.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-questions/index.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
@@ -105,12 +100,12 @@
 %%DOCSDIR%%/%%DOCLANG%%/articles/hubs/mirror-statpages.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/hubs/mirror-where.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/hubs/trademarks.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/ipsec-must/IPsec.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/ipsec-must/caveat.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/ipsec-must/code.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/ipsec-must/experiment.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/ipsec-must/index.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/ipsec-must/ipsec-install.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/ipsec-must/ipsec.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/ipsec-must/kernel.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/ipsec-must/solution.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/ipsec-must/trademarks.html
@@ -125,17 +120,18 @@
 %%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/legalnotice.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/ar01s02.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/mh/ar01s03.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/mh/ar01s04.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/mh/index.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
@@ -149,6 +145,7 @@
 %%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/ln-idp60522240.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/pam/pam-appl-prog.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/pam/pam-config.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/pam/pam-essentials.html
@@ -159,6 +156,7 @@
 %%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/pam/trademarks.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/portbuild/anatomy.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/portbuild/expbuilds.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/portbuild/index.html
@@ -185,9 +183,9 @@
 %%DOCSDIR%%/%%DOCLANG%%/articles/problem-reports/pr-writing.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/problem-reports/trademarks.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/relaydelay/index.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/releng-packages/ar01s02.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/releng-packages/index.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
@@ -198,16 +196,18 @@
 %%DOCSDIR%%/%%DOCLANG%%/articles/releng/release-build.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/releng/release-proc.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/releng/trademarks.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/solid-state/ar01s04.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/solid-state/index.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/solid-state/kernel.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/solid-state/legalnotice.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/solid-state/ro-fs.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/solid-state/strategies.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
 %%DOCSDIR%%/%%DOCLANG%%/articles/vm-design/index.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/vm-design/ln-idp60513280.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/vm-design/page-coloring-optimizations.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/vm-design/pre-table-optimizations.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/vm-design/prefault-optimizations.html
@@ -241,9 +241,17 @@
 %%DOCSDIR%%/%%DOCLANG%%/books/faq/security.html
 %%DOCSDIR%%/%%DOCLANG%%/books/faq/serial.html
 %%DOCSDIR%%/%%DOCLANG%%/books/faq/support.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/trademarks.html
 %%DOCSDIR%%/%%DOCLANG%%/books/faq/troubleshoot.html
 %%DOCSDIR%%/%%DOCLANG%%/books/faq/x.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/acpi-debug.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/ACPI-debug.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/GEOM-intro.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/GEOM-mirror.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/GEOM-striping.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/GEOM.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/MAC-examplehttpd.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/SMTP-Auth.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/SMTP-dialup.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/acpi-overview.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/adding-swap-space.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/advanced-networking.html
@@ -347,10 +355,6 @@
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/geom-ggate.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/geom-gjournal.html
 %%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-striping.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/geom.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/getting-started.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/handbook.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/history.html
@@ -370,7 +374,7 @@
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/introduction.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/ipsec.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/kerberos5.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/kerberosiv.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/kerberosIV.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/kernelconfig-building.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/kernelconfig-config.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/kernelconfig-custom-kernel.html
@@ -392,7 +396,6 @@
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/linuxemu.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/mac-biba.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/mac-bsdextended.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/mac-examplehttpd.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/mac-ifoff.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/mac-implementing.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/mac-initial.html
@@ -453,6 +456,7 @@
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/pgpkeys-core.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/pgpkeys-developers.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/pgpkeys.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/pkgng-intro.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/ports-broken.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/ports-finding-applications.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/ports-nextsteps.html
@@ -489,9 +493,6 @@
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/shells.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/slip.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/small-lan.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/smtp-auth.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/smtp-dialup.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/smtp-uucp.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/snapshots.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/sound-mp3.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/sound-setup.html
@@ -500,6 +501,7 @@
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/system-administration.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/tcpwrappers.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/term.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/trademarks.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/tvcard.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/updating-upgrading-freebsdupdate.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/updating-upgrading-portsnap.html
@@ -537,6 +539,7 @@
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/x11.html
 %%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/build-cluster.html
 %%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/building.html
+%%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/ch06s25.html
 %%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/conflicts.html
 %%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/dads-after-port-mk.html
 %%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/dads-avoiding-linuxisms.html
@@ -558,6 +561,7 @@
 %%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/index.html
 %%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/install.html
 %%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/keeping-up.html
+%%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/legalnotice.html
 %%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/makefile-categories.html
 %%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/makefile-comment.html
 %%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/makefile-depend.html
@@ -637,4 +641,3 @@
 %%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/x5789.html
diff --git a/misc/freebsd-doc-ru/pkg-plist.txt b/misc/freebsd-doc-ru/pkg-plist.txt
index ba167ebda4ed..c305247d13f9 100644
--- a/misc/freebsd-doc-ru/pkg-plist.txt
+++ b/misc/freebsd-doc-ru/pkg-plist.txt
@@ -5,7 +5,6 @@
 %%DOCSDIR%%/%%DOCLANG%%/articles/cups/article.txt
 %%DOCSDIR%%/%%DOCLANG%%/articles/custom-gcc/article.txt
 %%DOCSDIR%%/%%DOCLANG%%/articles/cvs-freebsd/article.txt
-%%DOCSDIR%%/%%DOCLANG%%/articles/cvsup-advanced/article.txt
 %%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd/article.txt
 %%DOCSDIR%%/%%DOCLANG%%/articles/fbsd-from-scratch/article.txt
 %%DOCSDIR%%/%%DOCLANG%%/articles/fonts/article.txt