7 files changed, 281 insertions, 289 deletions
diff --git a/misc/freebsd-doc-fr/pkg-plist.common b/misc/freebsd-doc-fr/pkg-plist.common
index 3d1f422f394b..94edc563556d 100644
--- a/misc/freebsd-doc-fr/pkg-plist.common
+++ b/misc/freebsd-doc-fr/pkg-plist.common
@@ -27,7 +27,6 @@
 @dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/fonts
 @dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/filtering-bridges
 @dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/cvsup-advanced
 @dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/contributors
 @dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/contributing-ports
 @dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/contributing
diff --git a/misc/freebsd-doc-fr/pkg-plist.html b/misc/freebsd-doc-fr/pkg-plist.html
index 63d9884d113d..7b3b80cb151c 100644
--- a/misc/freebsd-doc-fr/pkg-plist.html
+++ b/misc/freebsd-doc-fr/pkg-plist.html
@@ -4,7 +4,6 @@
 %%DOCSDIR%%/%%DOCLANG%%/articles/contributing-ports/article.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/contributing/article.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/contributors/article.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/cvsup-advanced/article.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd/article.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/filtering-bridges/article.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/fonts/article.html
diff --git a/misc/freebsd-doc-fr/pkg-plist.html-common b/misc/freebsd-doc-fr/pkg-plist.html-common
index 25b660c8a4d0..a837e111f818 100644
--- a/misc/freebsd-doc-fr/pkg-plist.html-common
+++ b/misc/freebsd-doc-fr/pkg-plist.html-common
@@ -6,7 +6,6 @@
 %%DOCSDIR%%/%%DOCLANG%%/articles/contributing-ports/docbook.css
 %%DOCSDIR%%/%%DOCLANG%%/articles/contributing/docbook.css
 %%DOCSDIR%%/%%DOCLANG%%/articles/contributors/docbook.css
-%%DOCSDIR%%/%%DOCLANG%%/articles/cvsup-advanced/docbook.css
 %%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd/docbook.css
 %%DOCSDIR%%/%%DOCLANG%%/articles/filtering-bridges/docbook.css
 %%DOCSDIR%%/%%DOCLANG%%/articles/fonts/docbook.css
diff --git a/misc/freebsd-doc-fr/pkg-plist.html-split b/misc/freebsd-doc-fr/pkg-plist.html-split
index 1e6c7d3524b3..d00d4fc3cbfd 100644
--- a/misc/freebsd-doc-fr/pkg-plist.html-split
+++ b/misc/freebsd-doc-fr/pkg-plist.html-split
@@ -1,10 +1,12 @@
 @comment $FreeBSD$
-%%DOCSDIR%%/%%DOCLANG%%/articles/building-products/b393.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/building-products/bi01.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/building-products/trademarks.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/committers-guide/ar01s08.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/committers-guide/ar01s09.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/committers-guide/conventions.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/committers-guide/cvs.operations.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/committers-guide/developer.relations.html
@@ -12,8 +14,6 @@
 %%DOCSDIR%%/%%DOCLANG%%/articles/committers-guide/index.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/committers-guide/people.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/committers-guide/ssh.guide.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/committers-guide/x302.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/committers-guide/x434.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
@@ -36,11 +36,6 @@
 %%DOCSDIR%%/%%DOCLANG%%/articles/contributors/staff-core.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/contributors/staff-doc.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/contributors/staff-who.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/comparing-bsd-and-linux.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd/index.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd/trademarks.html
@@ -53,29 +48,29 @@
 %%DOCSDIR%%/%%DOCLANG%%/articles/filtering-bridges/filtering-bridges-ipfirewall.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/filtering-bridges/index.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/filtering-bridges/trademarks.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/fonts/ar01s02.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/fonts/ar01s03.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/fonts/ar01s04.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/fonts/ar01s05.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/fonts/ar01s06.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/fonts/ar01s07.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/fonts/ar01s08.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/fonts/ar01s09.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/fonts/ar01s10.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/fonts/index.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/fonts/x129.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/fonts/x176.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/fonts/x22.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/fonts/x337.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/fonts/x386.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/fonts/x514.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/fonts/x542.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/fonts/x564.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/fonts/x66.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/ipsec-must/IPsec.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/ipsec-must/ar01s02.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/ipsec-must/ar01s03.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/ipsec-must/caveat.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/ipsec-must/code.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/trademarks.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/ipsec-must/x32.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/ipsec-must/x62.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/laptop/ar01s02.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/laptop/ar01s03.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/laptop/ar01s04.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/laptop/index.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/laptop/x23.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/laptop/x27.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/laptop/x46.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/linux-users/commands.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/linux-users/conclusion.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/linux-users/firewall.html
@@ -87,26 +82,27 @@
 %%DOCSDIR%%/%%DOCLANG%%/articles/linux-users/startup.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/linux-users/trademarks.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/linux-users/updates.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/x155.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/mh/x303.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/mh/x37.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/nanobsd/howto.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/nanobsd/index.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/nanobsd/trademarks.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/new-users/ar01s02.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/new-users/ar01s03.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/new-users/ar01s04.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/new-users/ar01s05.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/new-users/ar01s06.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/new-users/ar01s07.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/new-users/ar01s08.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/new-users/ar01s09.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/new-users/ar01s10.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/new-users/ar01s11.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/new-users/index.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/new-users/trademarks.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/new-users/x176.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/new-users/x282.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/new-users/x420.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/new-users/x465.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/new-users/x529.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/new-users/x57.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/new-users/x609.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/new-users/x648.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/new-users/x668.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/new-users/x86.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/pam/index.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/pam/ln-idp61431552.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/pam/pam-appl-prog.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/pam/pam-config.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/pam/pam-essentials.html
@@ -117,25 +113,42 @@
 %%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/pr-guidelines/ar01s02.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/pr-guidelines/ar01s03.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/pr-guidelines/ar01s04.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/pr-guidelines/index.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/pr-guidelines/x23.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/pr-guidelines/x55.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/pr-guidelines/x89.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/releng-packages/ar01s02.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/releng-packages/index.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/releng-packages/x31.html
+%%DOCSDIR%%/%%DOCLANG%%/books/developers-handbook/Basics.html
 %%DOCSDIR%%/%%DOCLANG%%/books/developers-handbook/afs.html
 %%DOCSDIR%%/%%DOCLANG%%/books/developers-handbook/alpha.html
 %%DOCSDIR%%/%%DOCLANG%%/books/developers-handbook/appendices.html
 %%DOCSDIR%%/%%DOCLANG%%/books/developers-handbook/architectures.html
 %%DOCSDIR%%/%%DOCLANG%%/books/developers-handbook/archoverview.html
-%%DOCSDIR%%/%%DOCLANG%%/books/developers-handbook/basics.html
+%%DOCSDIR%%/%%DOCLANG%%/books/developers-handbook/bi01.html
 %%DOCSDIR%%/%%DOCLANG%%/books/developers-handbook/bsdvision.html
+%%DOCSDIR%%/%%DOCLANG%%/books/developers-handbook/ch05s02.html
+%%DOCSDIR%%/%%DOCLANG%%/books/developers-handbook/ch05s03.html
+%%DOCSDIR%%/%%DOCLANG%%/books/developers-handbook/ch05s04.html
+%%DOCSDIR%%/%%DOCLANG%%/books/developers-handbook/ch05s05.html
+%%DOCSDIR%%/%%DOCLANG%%/books/developers-handbook/ch05s08.html
+%%DOCSDIR%%/%%DOCLANG%%/books/developers-handbook/ch06s03.html
+%%DOCSDIR%%/%%DOCLANG%%/books/developers-handbook/ch06s04.html
+%%DOCSDIR%%/%%DOCLANG%%/books/developers-handbook/ch06s06.html
+%%DOCSDIR%%/%%DOCLANG%%/books/developers-handbook/ch06s07.html
+%%DOCSDIR%%/%%DOCLANG%%/books/developers-handbook/ch08s02.html
+%%DOCSDIR%%/%%DOCLANG%%/books/developers-handbook/ch08s03.html
+%%DOCSDIR%%/%%DOCLANG%%/books/developers-handbook/ch16s02.html
+%%DOCSDIR%%/%%DOCLANG%%/books/developers-handbook/ch16s03.html
+%%DOCSDIR%%/%%DOCLANG%%/books/developers-handbook/ch16s04.html
+%%DOCSDIR%%/%%DOCLANG%%/books/developers-handbook/ch16s05.html
+%%DOCSDIR%%/%%DOCLANG%%/books/developers-handbook/ch17s02.html
 %%DOCSDIR%%/%%DOCLANG%%/books/developers-handbook/chroot.html
 %%DOCSDIR%%/%%DOCLANG%%/books/developers-handbook/compatibility.html
 %%DOCSDIR%%/%%DOCLANG%%/books/developers-handbook/debugging.html
@@ -175,25 +188,202 @@
 %%DOCSDIR%%/%%DOCLANG%%/books/developers-handbook/ufs.html
 %%DOCSDIR%%/%%DOCLANG%%/books/developers-handbook/usb.html
 %%DOCSDIR%%/%%DOCLANG%%/books/developers-handbook/virtualmemory.html
-%%DOCSDIR%%/%%DOCLANG%%/books/developers-handbook/x1174.html
-%%DOCSDIR%%/%%DOCLANG%%/books/developers-handbook/x1212.html
-%%DOCSDIR%%/%%DOCLANG%%/books/developers-handbook/x1308.html
-%%DOCSDIR%%/%%DOCLANG%%/books/developers-handbook/x1372.html
-%%DOCSDIR%%/%%DOCLANG%%/books/developers-handbook/x1380.html
-%%DOCSDIR%%/%%DOCLANG%%/books/developers-handbook/x159.html
-%%DOCSDIR%%/%%DOCLANG%%/books/developers-handbook/x1622.html
-%%DOCSDIR%%/%%DOCLANG%%/books/developers-handbook/x1658.html
-%%DOCSDIR%%/%%DOCLANG%%/books/developers-handbook/x168.html
-%%DOCSDIR%%/%%DOCLANG%%/books/developers-handbook/x1724.html
-%%DOCSDIR%%/%%DOCLANG%%/books/developers-handbook/x1749.html
-%%DOCSDIR%%/%%DOCLANG%%/books/developers-handbook/x1761.html
-%%DOCSDIR%%/%%DOCLANG%%/books/developers-handbook/x1785.html
-%%DOCSDIR%%/%%DOCLANG%%/books/developers-handbook/x1807.html
-%%DOCSDIR%%/%%DOCLANG%%/books/developers-handbook/x254.html
-%%DOCSDIR%%/%%DOCLANG%%/books/developers-handbook/x647.html
 %%DOCSDIR%%/%%DOCLANG%%/books/faq/acknowledgments.html
 %%DOCSDIR%%/%%DOCLANG%%/books/faq/admin.html
 %%DOCSDIR%%/%%DOCLANG%%/books/faq/applications.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch01s02.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch01s03.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch01s04.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch01s05.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch01s06.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch01s07.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch01s08.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch01s09.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch01s10.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch01s11.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch01s12.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch01s13.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch01s14.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch01s15.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch01s16.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch01s17.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch01s18.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch01s19.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch01s20.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch01s21.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch01s22.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch02s02.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch02s03.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch02s04.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch02s05.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch02s06.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch02s07.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch02s08.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch02s09.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch02s10.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch02s11.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch02s12.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch02s13.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch02s14.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch02s15.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch02s16.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch02s17.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch02s18.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch02s19.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch02s20.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch02s21.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch02s22.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch02s23.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch02s24.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch02s25.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch02s26.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch02s27.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch02s28.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch03s02.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch03s03.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch03s04.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch03s05.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch03s06.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch03s07.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch03s08.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch03s09.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch03s10.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch03s11.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch03s12.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch03s13.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch03s14.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch03s15.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch03s16.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch03s17.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch03s18.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch03s19.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch03s20.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch03s21.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch03s22.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch03s23.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch03s24.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch03s25.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch04s02.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch04s03.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch04s04.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch04s05.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch04s06.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch04s07.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch04s08.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch04s09.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch04s10.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch04s11.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch04s12.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch04s13.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch04s14.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch04s15.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch04s16.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch05s02.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch05s03.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch05s04.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch06s02.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch06s03.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch06s04.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch06s05.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch06s06.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch07s02.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch07s03.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch07s04.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch08s02.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch08s03.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch08s04.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch08s05.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch08s06.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch08s07.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch08s08.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch08s09.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch08s10.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch08s11.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch08s12.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch08s13.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch08s14.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch08s15.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch08s16.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch08s17.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch08s18.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch08s19.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch08s20.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch08s21.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch08s22.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch08s23.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch08s24.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch08s25.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch08s26.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch09s02.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch09s03.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch09s04.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch09s05.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch09s06.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch09s07.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch09s08.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch09s09.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch09s10.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch09s11.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch10s02.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch10s03.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch10s04.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch10s05.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch10s06.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch10s07.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch10s08.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch10s09.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch10s10.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch10s11.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch10s12.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch10s13.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch10s14.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch10s15.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch10s16.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch10s17.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch10s18.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch10s19.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch10s20.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch10s21.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch10s22.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch11s02.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch11s03.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch11s04.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch11s05.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch11s06.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch11s07.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch11s08.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch11s09.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch11s10.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch11s11.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch11s12.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch11s13.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch11s14.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch11s15.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch11s16.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch11s17.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch11s18.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch11s19.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch11s20.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch11s21.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch11s22.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch12s02.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch12s03.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch12s04.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch12s05.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch12s06.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch12s07.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch12s08.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch12s09.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch13s02.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch13s03.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch13s04.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch13s05.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch13s06.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch13s07.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch13s08.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch13s09.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch13s10.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/ch13s11.html
 %%DOCSDIR%%/%%DOCLANG%%/books/faq/commercial.html
 %%DOCSDIR%%/%%DOCLANG%%/books/faq/hackers.html
 %%DOCSDIR%%/%%DOCLANG%%/books/faq/hardware.html
@@ -207,203 +397,28 @@
 %%DOCSDIR%%/%%DOCLANG%%/books/faq/serial.html
 %%DOCSDIR%%/%%DOCLANG%%/books/faq/troubleshoot.html
 %%DOCSDIR%%/%%DOCLANG%%/books/faq/x.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x103.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x1052.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x1057.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x1078.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x1112.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x1115.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x112.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x1122.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x1139.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x1143.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x1155.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x1162.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x1167.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x117.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x1225.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x1234.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x1238.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x1263.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x1267.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x1276.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x1295.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x130.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x1310.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x1314.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x1324.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x1350.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x1354.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x136.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x1423.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x1432.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x1437.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x1443.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x1450.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x1492.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x1527.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x1534.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x1541.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x1548.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x1552.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x1556.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x1562.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x1591.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x1603.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x1610.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x1640.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x1643.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x1659.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x1675.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x1692.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x170.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x1706.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x1711.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x1721.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x1736.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x174.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x1748.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x1753.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x178.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x1781.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x1790.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x1847.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x1949.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x201.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x2055.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x2060.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x2066.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x2073.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x2078.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x2082.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x2086.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x2092.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x2105.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x2110.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x2126.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x2136.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x2160.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x2179.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x2182.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x2187.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x2201.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x2212.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x2215.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x2236.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x2267.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x2277.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x2291.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x2314.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x2335.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x2345.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x2361.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x2369.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x2380.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x2394.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x240.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x2408.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x2419.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x2429.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x2445.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x2455.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x246.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x2489.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x2514.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x2521.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x2528.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x253.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x2535.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x2541.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x2547.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x2566.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x2584.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x2589.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x260.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x2600.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x2605.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x2609.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x2617.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x2622.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x264.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x2640.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x2644.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x276.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x279.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x341.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x362.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x366.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x371.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x383.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x389.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x393.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x396.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x414.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x421.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x433.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x437.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x464.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x473.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x490.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x50.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x502.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x507.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x511.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x514.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x520.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x532.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x538.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x575.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x578.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x58.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x594.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x597.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x604.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x616.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x62.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x620.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x637.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x646.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x651.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x658.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x664.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x675.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x691.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x697.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x700.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x705.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x709.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x717.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x722.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x726.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x734.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x738.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x74.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x743.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x751.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x756.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x763.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x777.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x783.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x82.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x832.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x844.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x862.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x868.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x874.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x891.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x896.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x901.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x908.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x936.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x943.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x953.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x959.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x964.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/x976.html
-%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/f32.html
+%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/ch01s02.html
+%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/ch02s02.html
+%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/ch03s05.html
+%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/ch03s06.html
+%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/ch03s07.html
+%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/ch03s09.html
+%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/ch04s02.html
+%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/ch04s03.html
+%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/ch05s02.html
+%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/ch07s02.html
+%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/ch07s03.html
+%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/ch12s02.html
+%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/ch12s03.html
+%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/ch12s04.html
+%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/ch12s05.html
 %%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/index.html
-%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/ln15.html
+%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/ln-idp61438592.html
 %%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/overview.html
+%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/pr01.html
+%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/pr01s02.html
+%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/pr01s03.html
+%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/pr01s04.html
 %%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/psgml-mode.html
 %%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/see-also.html
 %%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/sgml-markup.html
@@ -420,25 +435,15 @@
 %%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/tools.html
 %%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/translations.html
 %%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/writing-style.html
-%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/x1008.html
-%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/x102.html
-%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/x112.html
-%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/x1275.html
-%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/x163.html
-%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/x2029.html
-%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/x2046.html
-%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/x2065.html
-%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/x2134.html
-%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/x2514.html
-%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/x2523.html
-%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/x2532.html
-%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/x2539.html
-%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/x273.html
-%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/x53.html
-%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/x705.html
-%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/x747.html
-%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/x834.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-UUCP.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
@@ -475,6 +480,9 @@
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/boot-kernel.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/boot-shutdown.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/boot.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/ch20s03.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/ch20s04.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/ch20s07.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/colophon.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/common-tasks.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/config-network-setup.html
@@ -536,10 +544,6 @@
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/fs-acl.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/geom-ggate.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
@@ -564,7 +568,7 @@
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/jails-tuning.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/jails.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
@@ -584,7 +588,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-glossary.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/mac-ifoff.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/mac-implementing.html
@@ -679,9 +682,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
@@ -690,6 +690,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
@@ -722,6 +723,3 @@
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/x-xdm.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/x11-wm.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/x11.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/x23593.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/x23639.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/x23844.html
diff --git a/misc/freebsd-doc-fr/pkg-plist.pdf b/misc/freebsd-doc-fr/pkg-plist.pdf
index a61f60cdc384..b44acd2fbfe9 100644
--- a/misc/freebsd-doc-fr/pkg-plist.pdf
+++ b/misc/freebsd-doc-fr/pkg-plist.pdf
@@ -4,7 +4,6 @@
 %%DOCSDIR%%/%%DOCLANG%%/articles/contributing-ports/article.pdf
 %%DOCSDIR%%/%%DOCLANG%%/articles/contributing/article.pdf
 %%DOCSDIR%%/%%DOCLANG%%/articles/contributors/article.pdf
-%%DOCSDIR%%/%%DOCLANG%%/articles/cvsup-advanced/article.pdf
 %%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd/article.pdf
 %%DOCSDIR%%/%%DOCLANG%%/articles/filtering-bridges/article.pdf
 %%DOCSDIR%%/%%DOCLANG%%/articles/fonts/article.pdf
diff --git a/misc/freebsd-doc-fr/pkg-plist.ps b/misc/freebsd-doc-fr/pkg-plist.ps
index 18ea1cd834ce..26b681d85bb8 100644
--- a/misc/freebsd-doc-fr/pkg-plist.ps
+++ b/misc/freebsd-doc-fr/pkg-plist.ps
@@ -4,7 +4,6 @@
 %%DOCSDIR%%/%%DOCLANG%%/articles/contributing-ports/article.ps
 %%DOCSDIR%%/%%DOCLANG%%/articles/contributing/article.ps
 %%DOCSDIR%%/%%DOCLANG%%/articles/contributors/article.ps
-%%DOCSDIR%%/%%DOCLANG%%/articles/cvsup-advanced/article.ps
 %%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd/article.ps
 %%DOCSDIR%%/%%DOCLANG%%/articles/filtering-bridges/article.ps
 %%DOCSDIR%%/%%DOCLANG%%/articles/fonts/article.ps
diff --git a/misc/freebsd-doc-fr/pkg-plist.txt b/misc/freebsd-doc-fr/pkg-plist.txt
index 2edfc1baddc8..117739027b04 100644
--- a/misc/freebsd-doc-fr/pkg-plist.txt
+++ b/misc/freebsd-doc-fr/pkg-plist.txt
@@ -4,7 +4,6 @@
 %%DOCSDIR%%/%%DOCLANG%%/articles/contributing-ports/article.txt
 %%DOCSDIR%%/%%DOCLANG%%/articles/contributing/article.txt
 %%DOCSDIR%%/%%DOCLANG%%/articles/contributors/article.txt
-%%DOCSDIR%%/%%DOCLANG%%/articles/cvsup-advanced/article.txt
 %%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd/article.txt
 %%DOCSDIR%%/%%DOCLANG%%/articles/filtering-bridges/article.txt
 %%DOCSDIR%%/%%DOCLANG%%/articles/fonts/article.txt