aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--bn_BD.ISO10646-1/articles/explaining-bsd/article.xml6
-rw-r--r--bn_BD.ISO10646-1/articles/new-users/article.xml6
-rw-r--r--bn_BD.ISO10646-1/share/xml/catalog.xml16
-rw-r--r--bn_BD.ISO10646-1/share/xml/entities.ent1
-rw-r--r--da_DK.ISO8859-1/articles/ipsec-must/article.xml9
-rw-r--r--da_DK.ISO8859-1/articles/pxe/article.xml9
-rw-r--r--da_DK.ISO8859-1/share/xml/catalog23
-rw-r--r--da_DK.ISO8859-1/share/xml/catalog.xml17
-rw-r--r--da_DK.ISO8859-1/share/xml/entities.ent25
-rw-r--r--da_DK.ISO8859-1/share/xml/mailing-lists.ent1
-rw-r--r--da_DK.ISO8859-1/share/xml/newsgroups.ent1
-rw-r--r--da_DK.ISO8859-1/share/xml/teams.ent1
-rw-r--r--da_DK.ISO8859-1/share/xml/translators.ent1
-rw-r--r--de_DE.ISO8859-1/articles/contributing-ports/article.xml10
-rw-r--r--de_DE.ISO8859-1/articles/contributing/article.xml10
-rw-r--r--de_DE.ISO8859-1/articles/explaining-bsd/article.xml9
-rw-r--r--de_DE.ISO8859-1/articles/laptop/article.xml9
-rw-r--r--de_DE.ISO8859-1/articles/linux-comparison/article.xml10
-rw-r--r--de_DE.ISO8859-1/articles/new-users/article.xml9
-rw-r--r--de_DE.ISO8859-1/articles/port-mentor-guidelines/article.xml13
-rw-r--r--de_DE.ISO8859-1/articles/solid-state/article.xml9
-rw-r--r--de_DE.ISO8859-1/books/developers-handbook/book.xml8
-rw-r--r--de_DE.ISO8859-1/books/developers-handbook/introduction/chapter.xml4
-rw-r--r--de_DE.ISO8859-1/books/developers-handbook/ipv6/chapter.xml2
-rw-r--r--de_DE.ISO8859-1/books/developers-handbook/kernelbuild/chapter.xml2
-rw-r--r--de_DE.ISO8859-1/books/developers-handbook/kerneldebug/chapter.xml2
-rw-r--r--de_DE.ISO8859-1/books/developers-handbook/l10n/chapter.xml2
-rw-r--r--de_DE.ISO8859-1/books/developers-handbook/policies/chapter.xml2
-rw-r--r--de_DE.ISO8859-1/books/developers-handbook/secure/chapter.xml2
-rw-r--r--de_DE.ISO8859-1/books/developers-handbook/sockets/chapter.xml2
-rw-r--r--de_DE.ISO8859-1/books/developers-handbook/testing/chapter.xml2
-rw-r--r--de_DE.ISO8859-1/books/developers-handbook/tools/chapter.xml2
-rw-r--r--de_DE.ISO8859-1/books/developers-handbook/x86/chapter.xml2
-rw-r--r--de_DE.ISO8859-1/books/faq/book.xml14
-rw-r--r--de_DE.ISO8859-1/books/fdp-primer/book.xml8
-rw-r--r--de_DE.ISO8859-1/books/fdp-primer/doc-build/chapter.xml2
-rw-r--r--de_DE.ISO8859-1/books/fdp-primer/examples/appendix.xml2
-rw-r--r--de_DE.ISO8859-1/books/fdp-primer/overview/chapter.xml2
-rw-r--r--de_DE.ISO8859-1/books/fdp-primer/psgml-mode/chapter.xml2
-rw-r--r--de_DE.ISO8859-1/books/fdp-primer/see-also/chapter.xml2
-rw-r--r--de_DE.ISO8859-1/books/fdp-primer/sgml-markup/chapter.xml2
-rw-r--r--de_DE.ISO8859-1/books/fdp-primer/sgml-primer/chapter.xml24
-rw-r--r--de_DE.ISO8859-1/books/fdp-primer/structure/chapter.xml4
-rw-r--r--de_DE.ISO8859-1/books/fdp-primer/stylesheets/chapter.xml2
-rw-r--r--de_DE.ISO8859-1/books/fdp-primer/the-website/chapter.xml2
-rw-r--r--de_DE.ISO8859-1/books/fdp-primer/tools/chapter.xml2
-rw-r--r--de_DE.ISO8859-1/books/fdp-primer/translations/chapter.xml2
-rw-r--r--de_DE.ISO8859-1/books/fdp-primer/writing-style/chapter.xml2
-rw-r--r--de_DE.ISO8859-1/books/handbook/Makefile28
-rw-r--r--de_DE.ISO8859-1/books/handbook/advanced-networking/chapter.xml4
-rw-r--r--de_DE.ISO8859-1/books/handbook/audit/chapter.xml2
-rw-r--r--de_DE.ISO8859-1/books/handbook/basics/chapter.xml2
-rw-r--r--de_DE.ISO8859-1/books/handbook/bibliography/chapter.xml2
-rw-r--r--de_DE.ISO8859-1/books/handbook/book.xml9
-rw-r--r--de_DE.ISO8859-1/books/handbook/boot/chapter.xml2
-rw-r--r--de_DE.ISO8859-1/books/handbook/bsdinstall/chapter.xml2
-rw-r--r--de_DE.ISO8859-1/books/handbook/chapters.ent183
-rw-r--r--de_DE.ISO8859-1/books/handbook/colophon.xml2
-rw-r--r--de_DE.ISO8859-1/books/handbook/config/chapter.xml4
-rw-r--r--de_DE.ISO8859-1/books/handbook/cutting-edge/chapter.xml14
-rw-r--r--de_DE.ISO8859-1/books/handbook/desktop/chapter.xml2
-rw-r--r--de_DE.ISO8859-1/books/handbook/disks/chapter.xml20
-rw-r--r--de_DE.ISO8859-1/books/handbook/dtrace/chapter.xml2
-rw-r--r--de_DE.ISO8859-1/books/handbook/eresources/chapter.xml7
-rw-r--r--de_DE.ISO8859-1/books/handbook/filesystems/chapter.xml4
-rw-r--r--de_DE.ISO8859-1/books/handbook/firewalls/chapter.xml2
-rw-r--r--de_DE.ISO8859-1/books/handbook/geom/chapter.xml2
-rw-r--r--de_DE.ISO8859-1/books/handbook/install/chapter.xml2
-rw-r--r--de_DE.ISO8859-1/books/handbook/introduction/chapter.xml2
-rw-r--r--de_DE.ISO8859-1/books/handbook/jails/chapter.xml2
-rw-r--r--de_DE.ISO8859-1/books/handbook/kernelconfig/chapter.xml2
-rw-r--r--de_DE.ISO8859-1/books/handbook/l10n/chapter.xml2
-rw-r--r--de_DE.ISO8859-1/books/handbook/linuxemu/chapter.xml10
-rw-r--r--de_DE.ISO8859-1/books/handbook/mac/chapter.xml82
-rw-r--r--de_DE.ISO8859-1/books/handbook/mail/chapter.xml8
-rw-r--r--de_DE.ISO8859-1/books/handbook/mirrors/chapter.xml10
-rw-r--r--de_DE.ISO8859-1/books/handbook/multimedia/chapter.xml4
-rw-r--r--de_DE.ISO8859-1/books/handbook/network-servers/chapter.xml2
-rw-r--r--de_DE.ISO8859-1/books/handbook/pgpkeys/chapter.xml2
-rw-r--r--de_DE.ISO8859-1/books/handbook/ports/chapter.xml2
-rw-r--r--de_DE.ISO8859-1/books/handbook/ppp-and-slip/chapter.xml2
-rw-r--r--de_DE.ISO8859-1/books/handbook/preface/preface.xml2
-rw-r--r--de_DE.ISO8859-1/books/handbook/printing/chapter.xml2
-rw-r--r--de_DE.ISO8859-1/books/handbook/security/chapter.xml4
-rw-r--r--de_DE.ISO8859-1/books/handbook/serialcomms/chapter.xml2
-rw-r--r--de_DE.ISO8859-1/books/handbook/users/chapter.xml2
-rw-r--r--de_DE.ISO8859-1/books/handbook/vinum/chapter.xml2
-rw-r--r--de_DE.ISO8859-1/books/handbook/virtualization/chapter.xml2
-rw-r--r--de_DE.ISO8859-1/books/handbook/x11/chapter.xml4
-rw-r--r--de_DE.ISO8859-1/books/porters-handbook/book.xml15
-rw-r--r--de_DE.ISO8859-1/share/xml/catalog57
-rw-r--r--de_DE.ISO8859-1/share/xml/catalog.xml9
-rw-r--r--de_DE.ISO8859-1/share/xml/entities.ent36
-rw-r--r--de_DE.ISO8859-1/share/xml/l10n.ent1
-rw-r--r--de_DE.ISO8859-1/share/xml/mailing-lists.ent1
-rw-r--r--de_DE.ISO8859-1/share/xml/mirrors-local.xsl1
-rw-r--r--de_DE.ISO8859-1/share/xml/newsgroups.ent1
-rw-r--r--de_DE.ISO8859-1/share/xml/teams.ent1
-rw-r--r--de_DE.ISO8859-1/share/xml/trademarks.ent1
-rw-r--r--de_DE.ISO8859-1/share/xml/translators.ent1
-rw-r--r--el_GR.ISO8859-7/articles/bsdl-gpl/article.xml9
-rw-r--r--el_GR.ISO8859-7/articles/compiz-fusion/article.xml10
-rw-r--r--el_GR.ISO8859-7/articles/contributing/article.xml12
-rw-r--r--el_GR.ISO8859-7/articles/cvs-freebsd/article.xml10
-rw-r--r--el_GR.ISO8859-7/articles/explaining-bsd/article.xml9
-rw-r--r--el_GR.ISO8859-7/articles/freebsd-questions/article.xml9
-rw-r--r--el_GR.ISO8859-7/articles/gjournal-desktop/article.xml9
-rw-r--r--el_GR.ISO8859-7/articles/greek-language-support/article.xml8
-rw-r--r--el_GR.ISO8859-7/articles/laptop/article.xml9
-rw-r--r--el_GR.ISO8859-7/articles/linux-users/article.xml10
-rw-r--r--el_GR.ISO8859-7/articles/mailing-list-faq/article.xml9
-rw-r--r--el_GR.ISO8859-7/articles/nanobsd/article.xml9
-rw-r--r--el_GR.ISO8859-7/articles/new-users/article.xml9
-rw-r--r--el_GR.ISO8859-7/articles/problem-reports/article.xml9
-rw-r--r--el_GR.ISO8859-7/articles/releng-packages/article.xml9
-rw-r--r--el_GR.ISO8859-7/articles/releng/article.xml8
-rw-r--r--el_GR.ISO8859-7/books/faq/book.xml8
-rw-r--r--el_GR.ISO8859-7/books/handbook/Makefile31
-rw-r--r--el_GR.ISO8859-7/books/handbook/advanced-networking/chapter.xml4
-rw-r--r--el_GR.ISO8859-7/books/handbook/audit/chapter.xml2
-rw-r--r--el_GR.ISO8859-7/books/handbook/basics/chapter.xml2
-rw-r--r--el_GR.ISO8859-7/books/handbook/bibliography/chapter.xml2
-rw-r--r--el_GR.ISO8859-7/books/handbook/book.xml9
-rw-r--r--el_GR.ISO8859-7/books/handbook/boot/chapter.xml2
-rw-r--r--el_GR.ISO8859-7/books/handbook/chapters.ent199
-rw-r--r--el_GR.ISO8859-7/books/handbook/colophon.xml2
-rw-r--r--el_GR.ISO8859-7/books/handbook/config/chapter.xml6
-rw-r--r--el_GR.ISO8859-7/books/handbook/cutting-edge/chapter.xml10
-rw-r--r--el_GR.ISO8859-7/books/handbook/desktop/chapter.xml2
-rw-r--r--el_GR.ISO8859-7/books/handbook/disks/chapter.xml26
-rw-r--r--el_GR.ISO8859-7/books/handbook/dtrace/chapter.xml2
-rw-r--r--el_GR.ISO8859-7/books/handbook/eresources/chapter.xml6
-rw-r--r--el_GR.ISO8859-7/books/handbook/filesystems/chapter.xml4
-rw-r--r--el_GR.ISO8859-7/books/handbook/firewalls/chapter.xml2
-rw-r--r--el_GR.ISO8859-7/books/handbook/geom/chapter.xml2
-rw-r--r--el_GR.ISO8859-7/books/handbook/install/chapter.xml4
-rw-r--r--el_GR.ISO8859-7/books/handbook/introduction/chapter.xml2
-rw-r--r--el_GR.ISO8859-7/books/handbook/jails/chapter.xml2
-rw-r--r--el_GR.ISO8859-7/books/handbook/kernelconfig/chapter.xml2
-rw-r--r--el_GR.ISO8859-7/books/handbook/l10n/chapter.xml2
-rw-r--r--el_GR.ISO8859-7/books/handbook/linuxemu/chapter.xml10
-rw-r--r--el_GR.ISO8859-7/books/handbook/mac/chapter.xml2
-rw-r--r--el_GR.ISO8859-7/books/handbook/mail/chapter.xml8
-rw-r--r--el_GR.ISO8859-7/books/handbook/mirrors/chapter.xml10
-rw-r--r--el_GR.ISO8859-7/books/handbook/multimedia/chapter.xml4
-rw-r--r--el_GR.ISO8859-7/books/handbook/network-servers/chapter.xml2
-rw-r--r--el_GR.ISO8859-7/books/handbook/pgpkeys/chapter.xml2
-rw-r--r--el_GR.ISO8859-7/books/handbook/ports/chapter.xml2
-rw-r--r--el_GR.ISO8859-7/books/handbook/ppp-and-slip/chapter.xml2
-rw-r--r--el_GR.ISO8859-7/books/handbook/preface/preface.xml2
-rw-r--r--el_GR.ISO8859-7/books/handbook/printing/chapter.xml2
-rw-r--r--el_GR.ISO8859-7/books/handbook/security/chapter.xml2
-rw-r--r--el_GR.ISO8859-7/books/handbook/serialcomms/chapter.xml2
-rw-r--r--el_GR.ISO8859-7/books/handbook/users/chapter.xml2
-rw-r--r--el_GR.ISO8859-7/books/handbook/vinum/chapter.xml2
-rw-r--r--el_GR.ISO8859-7/books/handbook/virtualization/chapter.xml4
-rw-r--r--el_GR.ISO8859-7/books/handbook/x11/chapter.xml4
-rw-r--r--el_GR.ISO8859-7/share/xml/catalog60
-rw-r--r--el_GR.ISO8859-7/share/xml/catalog.xml4
-rw-r--r--el_GR.ISO8859-7/share/xml/entities.ent50
-rw-r--r--el_GR.ISO8859-7/share/xml/freebsd.ent1
-rw-r--r--el_GR.ISO8859-7/share/xml/l10n.ent1
-rw-r--r--el_GR.ISO8859-7/share/xml/mailing-lists.ent1
-rw-r--r--el_GR.ISO8859-7/share/xml/newsgroups.ent1
-rw-r--r--el_GR.ISO8859-7/share/xml/teams.ent1
-rw-r--r--el_GR.ISO8859-7/share/xml/trademarks.ent1
-rw-r--r--el_GR.ISO8859-7/share/xml/translators.ent1
-rw-r--r--el_GR.ISO8859-7/share/xml/urls.ent1
-rw-r--r--en_US.ISO8859-1/articles/bsdl-gpl/article.xml9
-rw-r--r--en_US.ISO8859-1/articles/building-products/article.xml9
-rw-r--r--en_US.ISO8859-1/articles/casestudy-argentina.com/article.xml9
-rw-r--r--en_US.ISO8859-1/articles/committers-guide/article.xml11
-rw-r--r--en_US.ISO8859-1/articles/compiz-fusion/article.xml9
-rw-r--r--en_US.ISO8859-1/articles/console-server/article.xml9
-rw-r--r--en_US.ISO8859-1/articles/contributing-ports/article.xml9
-rw-r--r--en_US.ISO8859-1/articles/contributing/article.xml9
-rw-r--r--en_US.ISO8859-1/articles/contributors/article.xml9
-rw-r--r--en_US.ISO8859-1/articles/contributors/contrib.386bsd.xml2
-rw-r--r--en_US.ISO8859-1/articles/contributors/contrib.additional.xml2
-rw-r--r--en_US.ISO8859-1/articles/contributors/contrib.committers.xml2
-rw-r--r--en_US.ISO8859-1/articles/contributors/contrib.corealumni.xml2
-rw-r--r--en_US.ISO8859-1/articles/contributors/contrib.develalumni.xml2
-rw-r--r--en_US.ISO8859-1/articles/contributors/contrib.develinmemoriam.xml2
-rw-r--r--en_US.ISO8859-1/articles/cups/article.xml9
-rw-r--r--en_US.ISO8859-1/articles/custom-gcc/article.xml21
-rw-r--r--en_US.ISO8859-1/articles/cvs-freebsd/article.xml9
-rw-r--r--en_US.ISO8859-1/articles/cvsup-advanced/article.xml9
-rw-r--r--en_US.ISO8859-1/articles/explaining-bsd/article.xml9
-rw-r--r--en_US.ISO8859-1/articles/fbsd-from-scratch/article.xml20
-rw-r--r--en_US.ISO8859-1/articles/filtering-bridges/article.xml9
-rw-r--r--en_US.ISO8859-1/articles/fonts/article.xml9
-rw-r--r--en_US.ISO8859-1/articles/freebsd-questions/article.xml9
-rw-r--r--en_US.ISO8859-1/articles/freebsd-update-server/article.xml18
-rw-r--r--en_US.ISO8859-1/articles/geom-class/article.xml9
-rw-r--r--en_US.ISO8859-1/articles/gjournal-desktop/article.xml9
-rw-r--r--en_US.ISO8859-1/articles/hubs/article.xml9
-rw-r--r--en_US.ISO8859-1/articles/ipsec-must/article.xml9
-rw-r--r--en_US.ISO8859-1/articles/laptop/article.xml9
-rw-r--r--en_US.ISO8859-1/articles/ldap-auth/article.xml9
-rw-r--r--en_US.ISO8859-1/articles/linux-comparison/article.xml9
-rw-r--r--en_US.ISO8859-1/articles/linux-emulation/article.xml9
-rw-r--r--en_US.ISO8859-1/articles/linux-users/article.xml9
-rw-r--r--en_US.ISO8859-1/articles/mailing-list-faq/article.xml9
-rw-r--r--en_US.ISO8859-1/articles/mh/article.xml9
-rw-r--r--en_US.ISO8859-1/articles/nanobsd/article.xml9
-rw-r--r--en_US.ISO8859-1/articles/new-users/article.xml9
-rw-r--r--en_US.ISO8859-1/articles/p4-primer/article.xml9
-rw-r--r--en_US.ISO8859-1/articles/pam/article.xml20
-rw-r--r--en_US.ISO8859-1/articles/port-mentor-guidelines/article.xml9
-rw-r--r--en_US.ISO8859-1/articles/portbuild/article.xml11
-rw-r--r--en_US.ISO8859-1/articles/pr-guidelines/article.xml8
-rw-r--r--en_US.ISO8859-1/articles/problem-reports/article.xml9
-rw-r--r--en_US.ISO8859-1/articles/rc-scripting/article.xml9
-rw-r--r--en_US.ISO8859-1/articles/relaydelay/article.xml10
-rw-r--r--en_US.ISO8859-1/articles/releng-packages/article.xml9
-rw-r--r--en_US.ISO8859-1/articles/releng/article.xml8
-rw-r--r--en_US.ISO8859-1/articles/remote-install/article.xml9
-rw-r--r--en_US.ISO8859-1/articles/serial-uart/article.xml9
-rw-r--r--en_US.ISO8859-1/articles/solid-state/article.xml9
-rw-r--r--en_US.ISO8859-1/articles/vm-design/article.xml9
-rw-r--r--en_US.ISO8859-1/articles/wp-toolbox/article.xml8
-rw-r--r--en_US.ISO8859-1/books/arch-handbook/book.xml8
-rw-r--r--en_US.ISO8859-1/books/arch-handbook/boot/chapter.xml2
-rw-r--r--en_US.ISO8859-1/books/arch-handbook/chapters.ent2
-rw-r--r--en_US.ISO8859-1/books/arch-handbook/driverbasics/chapter.xml4
-rw-r--r--en_US.ISO8859-1/books/arch-handbook/isa/chapter.xml2
-rw-r--r--en_US.ISO8859-1/books/arch-handbook/jail/chapter.xml2
-rw-r--r--en_US.ISO8859-1/books/arch-handbook/kobj/chapter.xml2
-rw-r--r--en_US.ISO8859-1/books/arch-handbook/locking/chapter.xml2
-rw-r--r--en_US.ISO8859-1/books/arch-handbook/mac/chapter.xml2
-rw-r--r--en_US.ISO8859-1/books/arch-handbook/newbus/chapter.xml2
-rw-r--r--en_US.ISO8859-1/books/arch-handbook/pccard/chapter.xml2
-rw-r--r--en_US.ISO8859-1/books/arch-handbook/pci/chapter.xml2
-rw-r--r--en_US.ISO8859-1/books/arch-handbook/scsi/chapter.xml2
-rw-r--r--en_US.ISO8859-1/books/arch-handbook/smp/chapter.xml2
-rw-r--r--en_US.ISO8859-1/books/arch-handbook/sound/chapter.xml2
-rw-r--r--en_US.ISO8859-1/books/arch-handbook/sysinit/chapter.xml2
-rw-r--r--en_US.ISO8859-1/books/arch-handbook/usb/chapter.xml2
-rw-r--r--en_US.ISO8859-1/books/arch-handbook/vm/chapter.xml2
-rw-r--r--en_US.ISO8859-1/books/bibliography/book.xml8
-rw-r--r--en_US.ISO8859-1/books/design-44bsd/book.xml9
-rw-r--r--en_US.ISO8859-1/books/dev-model/book.xml8
-rw-r--r--en_US.ISO8859-1/books/developers-handbook/book.xml8
-rw-r--r--en_US.ISO8859-1/books/developers-handbook/introduction/chapter.xml2
-rw-r--r--en_US.ISO8859-1/books/developers-handbook/ipv6/chapter.xml2
-rw-r--r--en_US.ISO8859-1/books/developers-handbook/kernelbuild/chapter.xml2
-rw-r--r--en_US.ISO8859-1/books/developers-handbook/kerneldebug/chapter.xml4
-rw-r--r--en_US.ISO8859-1/books/developers-handbook/l10n/chapter.xml2
-rw-r--r--en_US.ISO8859-1/books/developers-handbook/policies/chapter.xml2
-rw-r--r--en_US.ISO8859-1/books/developers-handbook/secure/chapter.xml2
-rw-r--r--en_US.ISO8859-1/books/developers-handbook/sockets/chapter.xml2
-rw-r--r--en_US.ISO8859-1/books/developers-handbook/testing/chapter.xml2
-rw-r--r--en_US.ISO8859-1/books/developers-handbook/tools/chapter.xml2
-rw-r--r--en_US.ISO8859-1/books/developers-handbook/x86/chapter.xml2
-rw-r--r--en_US.ISO8859-1/books/faq/book.xml8
-rw-r--r--en_US.ISO8859-1/books/fdp-primer/book.xml8
-rw-r--r--en_US.ISO8859-1/books/fdp-primer/doc-build/chapter.xml2
-rw-r--r--en_US.ISO8859-1/books/fdp-primer/examples/appendix.xml2
-rw-r--r--en_US.ISO8859-1/books/fdp-primer/overview/chapter.xml2
-rw-r--r--en_US.ISO8859-1/books/fdp-primer/psgml-mode/chapter.xml2
-rw-r--r--en_US.ISO8859-1/books/fdp-primer/see-also/chapter.xml2
-rw-r--r--en_US.ISO8859-1/books/fdp-primer/sgml-markup/chapter.xml2
-rw-r--r--en_US.ISO8859-1/books/fdp-primer/sgml-primer/chapter.xml24
-rw-r--r--en_US.ISO8859-1/books/fdp-primer/structure/chapter.xml2
-rw-r--r--en_US.ISO8859-1/books/fdp-primer/stylesheets/chapter.xml2
-rw-r--r--en_US.ISO8859-1/books/fdp-primer/the-website/chapter.xml2
-rw-r--r--en_US.ISO8859-1/books/fdp-primer/tools/chapter.xml2
-rw-r--r--en_US.ISO8859-1/books/fdp-primer/translations/chapter.xml2
-rw-r--r--en_US.ISO8859-1/books/fdp-primer/writing-style/chapter.xml4
-rw-r--r--en_US.ISO8859-1/books/handbook/Makefile29
-rw-r--r--en_US.ISO8859-1/books/handbook/advanced-networking/chapter.xml2
-rw-r--r--en_US.ISO8859-1/books/handbook/audit/chapter.xml2
-rw-r--r--en_US.ISO8859-1/books/handbook/basics/chapter.xml2
-rw-r--r--en_US.ISO8859-1/books/handbook/bibliography/chapter.xml2
-rw-r--r--en_US.ISO8859-1/books/handbook/book.xml9
-rw-r--r--en_US.ISO8859-1/books/handbook/boot/chapter.xml2
-rw-r--r--en_US.ISO8859-1/books/handbook/bsdinstall/chapter.xml2
-rw-r--r--en_US.ISO8859-1/books/handbook/chapters.ent181
-rw-r--r--en_US.ISO8859-1/books/handbook/colophon.xml2
-rw-r--r--en_US.ISO8859-1/books/handbook/config/chapter.xml4
-rw-r--r--en_US.ISO8859-1/books/handbook/cutting-edge/chapter.xml77
-rw-r--r--en_US.ISO8859-1/books/handbook/desktop/chapter.xml2
-rw-r--r--en_US.ISO8859-1/books/handbook/disks/chapter.xml17
-rw-r--r--en_US.ISO8859-1/books/handbook/dtrace/chapter.xml2
-rw-r--r--en_US.ISO8859-1/books/handbook/eresources/chapter.xml6
-rw-r--r--en_US.ISO8859-1/books/handbook/filesystems/chapter.xml2
-rw-r--r--en_US.ISO8859-1/books/handbook/firewalls/chapter.xml2
-rw-r--r--en_US.ISO8859-1/books/handbook/geom/chapter.xml20
-rw-r--r--en_US.ISO8859-1/books/handbook/index.xml1
-rw-r--r--en_US.ISO8859-1/books/handbook/install/chapter.xml2
-rw-r--r--en_US.ISO8859-1/books/handbook/introduction/chapter.xml2
-rw-r--r--en_US.ISO8859-1/books/handbook/jails/chapter.xml2
-rw-r--r--en_US.ISO8859-1/books/handbook/kernelconfig/chapter.xml2
-rw-r--r--en_US.ISO8859-1/books/handbook/l10n/chapter.xml2
-rw-r--r--en_US.ISO8859-1/books/handbook/linuxemu/chapter.xml4
-rw-r--r--en_US.ISO8859-1/books/handbook/mac/chapter.xml2
-rw-r--r--en_US.ISO8859-1/books/handbook/mail/chapter.xml2
-rw-r--r--en_US.ISO8859-1/books/handbook/mirrors/chapter.xml11
-rw-r--r--en_US.ISO8859-1/books/handbook/multimedia/chapter.xml4
-rw-r--r--en_US.ISO8859-1/books/handbook/network-servers/chapter.xml2
-rw-r--r--en_US.ISO8859-1/books/handbook/pgpkeys/chapter.xml2
-rw-r--r--en_US.ISO8859-1/books/handbook/ports/chapter.xml2
-rw-r--r--en_US.ISO8859-1/books/handbook/ppp-and-slip/chapter.xml2
-rw-r--r--en_US.ISO8859-1/books/handbook/preface/preface.xml2
-rw-r--r--en_US.ISO8859-1/books/handbook/printing/chapter.xml2
-rw-r--r--en_US.ISO8859-1/books/handbook/security/chapter.xml2
-rw-r--r--en_US.ISO8859-1/books/handbook/serialcomms/chapter.xml2
-rw-r--r--en_US.ISO8859-1/books/handbook/users/chapter.xml2
-rw-r--r--en_US.ISO8859-1/books/handbook/vinum/chapter.xml2
-rw-r--r--en_US.ISO8859-1/books/handbook/virtualization/chapter.xml4
-rw-r--r--en_US.ISO8859-1/books/handbook/x11/chapter.xml2
-rw-r--r--en_US.ISO8859-1/books/pmake/answers/chapter.xml2
-rw-r--r--en_US.ISO8859-1/books/pmake/basics/chapter.xml2
-rw-r--r--en_US.ISO8859-1/books/pmake/book.xml26
-rw-r--r--en_US.ISO8859-1/books/pmake/glossary/glossary.xml2
-rw-r--r--en_US.ISO8859-1/books/pmake/gods/chapter.xml2
-rw-r--r--en_US.ISO8859-1/books/pmake/intro/chapter.xml2
-rw-r--r--en_US.ISO8859-1/books/pmake/legalnotice.xml22
-rw-r--r--en_US.ISO8859-1/books/pmake/shortcuts/chapter.xml2
-rw-r--r--en_US.ISO8859-1/books/porters-handbook/book.xml23
-rw-r--r--en_US.ISO8859-1/share/xml/catalog32
-rw-r--r--en_US.ISO8859-1/share/xml/catalog.xml4
-rw-r--r--en_US.ISO8859-1/share/xml/entities.ent27
-rw-r--r--es_ES.ISO8859-1/articles/casestudy-argentina.com/article.xml9
-rw-r--r--es_ES.ISO8859-1/articles/contributing/article.xml9
-rw-r--r--es_ES.ISO8859-1/articles/cvs-freebsd/article.xml9
-rw-r--r--es_ES.ISO8859-1/articles/explaining-bsd/article.xml11
-rw-r--r--es_ES.ISO8859-1/articles/fbsd-from-scratch/article.xml19
-rw-r--r--es_ES.ISO8859-1/articles/fdp-es/article.xml9
-rw-r--r--es_ES.ISO8859-1/articles/laptop/article.xml9
-rw-r--r--es_ES.ISO8859-1/articles/linux-comparison/article.xml9
-rw-r--r--es_ES.ISO8859-1/articles/linux-users/article.xml9
-rw-r--r--es_ES.ISO8859-1/articles/mailing-list-faq/article.xml9
-rw-r--r--es_ES.ISO8859-1/articles/nanobsd/article.xml9
-rw-r--r--es_ES.ISO8859-1/articles/p4-primer/article.xml9
-rw-r--r--es_ES.ISO8859-1/articles/problem-reports/article.xml9
-rw-r--r--es_ES.ISO8859-1/articles/releng/article.xml9
-rw-r--r--es_ES.ISO8859-1/books/faq/book.xml9
-rwxr-xr-xes_ES.ISO8859-1/books/handbook/advanced-networking/chapter.xml26
-rw-r--r--es_ES.ISO8859-1/books/handbook/audit/chapter.xml2
-rwxr-xr-xes_ES.ISO8859-1/books/handbook/basics/chapter.xml4
-rwxr-xr-xes_ES.ISO8859-1/books/handbook/bibliography/chapter.xml2
-rwxr-xr-xes_ES.ISO8859-1/books/handbook/book.xml9
-rw-r--r--es_ES.ISO8859-1/books/handbook/boot/chapter.xml2
-rwxr-xr-xes_ES.ISO8859-1/books/handbook/chapters.ent196
-rw-r--r--es_ES.ISO8859-1/books/handbook/colophon.xml2
-rw-r--r--es_ES.ISO8859-1/books/handbook/config/chapter.xml2
-rwxr-xr-xes_ES.ISO8859-1/books/handbook/cutting-edge/chapter.xml2
-rw-r--r--es_ES.ISO8859-1/books/handbook/desktop/chapter.xml4
-rw-r--r--es_ES.ISO8859-1/books/handbook/disks/chapter.xml33
-rwxr-xr-xes_ES.ISO8859-1/books/handbook/eresources/chapter.xml4
-rw-r--r--es_ES.ISO8859-1/books/handbook/firewalls/chapter.xml2
-rw-r--r--es_ES.ISO8859-1/books/handbook/geom/chapter.xml4
-rwxr-xr-xes_ES.ISO8859-1/books/handbook/install/chapter.xml8
-rwxr-xr-xes_ES.ISO8859-1/books/handbook/introduction/chapter.xml2
-rw-r--r--es_ES.ISO8859-1/books/handbook/jails/chapter.xml2
-rwxr-xr-xes_ES.ISO8859-1/books/handbook/kernelconfig/chapter.xml4
-rwxr-xr-xes_ES.ISO8859-1/books/handbook/l10n/chapter.xml2
-rwxr-xr-xes_ES.ISO8859-1/books/handbook/linuxemu/chapter.xml12
-rw-r--r--es_ES.ISO8859-1/books/handbook/mac/chapter.xml2
-rwxr-xr-xes_ES.ISO8859-1/books/handbook/mail/chapter.xml10
-rwxr-xr-xes_ES.ISO8859-1/books/handbook/mirrors/chapter.xml2
-rw-r--r--es_ES.ISO8859-1/books/handbook/multimedia/chapter.xml2
-rw-r--r--es_ES.ISO8859-1/books/handbook/network-servers/chapter.xml2
-rwxr-xr-xes_ES.ISO8859-1/books/handbook/pgpkeys/chapter.xml2
-rwxr-xr-xes_ES.ISO8859-1/books/handbook/ports/chapter.xml4
-rwxr-xr-xes_ES.ISO8859-1/books/handbook/ppp-and-slip/chapter.xml6
-rw-r--r--es_ES.ISO8859-1/books/handbook/preface/preface.xml2
-rwxr-xr-xes_ES.ISO8859-1/books/handbook/printing/chapter.xml2
-rwxr-xr-xes_ES.ISO8859-1/books/handbook/security/chapter.xml6
-rwxr-xr-xes_ES.ISO8859-1/books/handbook/serialcomms/chapter.xml2
-rw-r--r--es_ES.ISO8859-1/books/handbook/users/chapter.xml2
-rw-r--r--es_ES.ISO8859-1/books/handbook/vinum/chapter.xml2
-rw-r--r--es_ES.ISO8859-1/books/handbook/virtualization/chapter.xml2
-rwxr-xr-xes_ES.ISO8859-1/books/handbook/x11/chapter.xml4
-rw-r--r--es_ES.ISO8859-1/share/xml/catalog53
-rw-r--r--es_ES.ISO8859-1/share/xml/catalog.xml4
-rw-r--r--es_ES.ISO8859-1/share/xml/entities.ent36
-rw-r--r--es_ES.ISO8859-1/share/xml/es-mailing-lists.ent1
-rw-r--r--es_ES.ISO8859-1/share/xml/l10n.ent1
-rwxr-xr-xes_ES.ISO8859-1/share/xml/mailing-lists.ent1
-rw-r--r--es_ES.ISO8859-1/share/xml/newsgroups.ent1
-rw-r--r--es_ES.ISO8859-1/share/xml/teams.ent1
-rw-r--r--es_ES.ISO8859-1/share/xml/trademarks.ent1
-rw-r--r--es_ES.ISO8859-1/share/xml/translators.ent1
-rw-r--r--fr_FR.ISO8859-1/articles/building-products/article.xml22
-rw-r--r--fr_FR.ISO8859-1/articles/committers-guide/article.xml9
-rw-r--r--fr_FR.ISO8859-1/articles/contributing-ports/article.xml9
-rw-r--r--fr_FR.ISO8859-1/articles/contributing/article.xml10
-rw-r--r--fr_FR.ISO8859-1/articles/contributors/article.xml10
-rw-r--r--fr_FR.ISO8859-1/articles/cvsup-advanced/article.xml10
-rw-r--r--fr_FR.ISO8859-1/articles/explaining-bsd/article.xml11
-rw-r--r--fr_FR.ISO8859-1/articles/filtering-bridges/article.xml10
-rwxr-xr-xfr_FR.ISO8859-1/articles/fonts/article.xml10
-rw-r--r--fr_FR.ISO8859-1/articles/ipsec-must/article.xml10
-rw-r--r--fr_FR.ISO8859-1/articles/laptop/article.xml9
-rw-r--r--fr_FR.ISO8859-1/articles/linux-users/article.xml11
-rw-r--r--fr_FR.ISO8859-1/articles/mh/article.xml9
-rw-r--r--fr_FR.ISO8859-1/articles/nanobsd/article.xml9
-rwxr-xr-xfr_FR.ISO8859-1/articles/new-users/article.xml9
-rw-r--r--fr_FR.ISO8859-1/articles/pam/article.xml21
-rw-r--r--fr_FR.ISO8859-1/articles/pr-guidelines/article.xml9
-rw-r--r--fr_FR.ISO8859-1/articles/problem-reports/article.xml9
-rw-r--r--fr_FR.ISO8859-1/articles/releng-packages/article.xml9
-rw-r--r--fr_FR.ISO8859-1/books/developers-handbook/book.xml8
-rw-r--r--fr_FR.ISO8859-1/books/developers-handbook/driverbasics/chapter.xml16
-rw-r--r--fr_FR.ISO8859-1/books/developers-handbook/locking/chapter.xml2
-rw-r--r--fr_FR.ISO8859-1/books/developers-handbook/pci/chapter.xml6
-rw-r--r--fr_FR.ISO8859-1/books/developers-handbook/scsi/chapter.xml2
-rw-r--r--fr_FR.ISO8859-1/books/developers-handbook/secure/chapter.xml4
-rw-r--r--fr_FR.ISO8859-1/books/developers-handbook/tools/chapter.xml16
-rw-r--r--fr_FR.ISO8859-1/books/developers-handbook/usb/chapter.xml2
-rw-r--r--fr_FR.ISO8859-1/books/faq/book.xml26
-rw-r--r--fr_FR.ISO8859-1/books/fdp-primer/book.xml8
-rw-r--r--fr_FR.ISO8859-1/books/fdp-primer/in-progress.xml2
-rw-r--r--fr_FR.ISO8859-1/books/fdp-primer/overview/chapter.xml4
-rw-r--r--fr_FR.ISO8859-1/books/fdp-primer/psgml-mode/chapter.xml2
-rw-r--r--fr_FR.ISO8859-1/books/fdp-primer/see-also/chapter.xml2
-rw-r--r--fr_FR.ISO8859-1/books/fdp-primer/sgml-markup/chapter.xml92
-rw-r--r--fr_FR.ISO8859-1/books/fdp-primer/sgml-primer/chapter.xml70
-rw-r--r--fr_FR.ISO8859-1/books/fdp-primer/stylesheets/chapter.xml2
-rw-r--r--fr_FR.ISO8859-1/books/fdp-primer/the-faq/chapter.xml2
-rw-r--r--fr_FR.ISO8859-1/books/fdp-primer/the-handbook/chapter.xml8
-rw-r--r--fr_FR.ISO8859-1/books/fdp-primer/the-website/chapter.xml2
-rw-r--r--fr_FR.ISO8859-1/books/fdp-primer/todo.xml2
-rw-r--r--fr_FR.ISO8859-1/books/fdp-primer/tools/chapter.xml2
-rw-r--r--fr_FR.ISO8859-1/books/fdp-primer/translations/chapter.xml8
-rw-r--r--fr_FR.ISO8859-1/books/fdp-primer/writing-style/chapter.xml2
-rw-r--r--fr_FR.ISO8859-1/books/handbook/Makefile29
-rw-r--r--fr_FR.ISO8859-1/books/handbook/advanced-networking/chapter.xml6
-rw-r--r--fr_FR.ISO8859-1/books/handbook/audit/chapter.xml2
-rw-r--r--fr_FR.ISO8859-1/books/handbook/basics/chapter.xml2
-rw-r--r--fr_FR.ISO8859-1/books/handbook/bibliography/chapter.xml2
-rw-r--r--fr_FR.ISO8859-1/books/handbook/book.xml8
-rw-r--r--fr_FR.ISO8859-1/books/handbook/boot/chapter.xml2
-rw-r--r--fr_FR.ISO8859-1/books/handbook/chapters.ent195
-rw-r--r--fr_FR.ISO8859-1/books/handbook/colophon.xml2
-rw-r--r--fr_FR.ISO8859-1/books/handbook/config/chapter.xml10
-rw-r--r--fr_FR.ISO8859-1/books/handbook/cutting-edge/chapter.xml2
-rw-r--r--fr_FR.ISO8859-1/books/handbook/desktop/chapter.xml2
-rwxr-xr-xfr_FR.ISO8859-1/books/handbook/disks/chapter.xml27
-rw-r--r--fr_FR.ISO8859-1/books/handbook/eresources/chapter.xml4
-rw-r--r--fr_FR.ISO8859-1/books/handbook/firewalls/chapter.xml2
-rw-r--r--fr_FR.ISO8859-1/books/handbook/geom/chapter.xml2
-rw-r--r--fr_FR.ISO8859-1/books/handbook/install/chapter.xml4
-rw-r--r--fr_FR.ISO8859-1/books/handbook/introduction/chapter.xml2
-rw-r--r--fr_FR.ISO8859-1/books/handbook/jails/chapter.xml2
-rwxr-xr-xfr_FR.ISO8859-1/books/handbook/kernelconfig/chapter.xml4
-rw-r--r--fr_FR.ISO8859-1/books/handbook/l10n/chapter.xml2
-rw-r--r--fr_FR.ISO8859-1/books/handbook/linuxemu/chapter.xml10
-rw-r--r--fr_FR.ISO8859-1/books/handbook/mac/chapter.xml2
-rw-r--r--fr_FR.ISO8859-1/books/handbook/mail/chapter.xml10
-rw-r--r--fr_FR.ISO8859-1/books/handbook/mirrors/chapter.xml2
-rw-r--r--fr_FR.ISO8859-1/books/handbook/multimedia/chapter.xml2
-rw-r--r--fr_FR.ISO8859-1/books/handbook/network-servers/chapter.xml2
-rw-r--r--fr_FR.ISO8859-1/books/handbook/pgpkeys/chapter.xml2
-rw-r--r--fr_FR.ISO8859-1/books/handbook/ports/chapter.xml2
-rw-r--r--fr_FR.ISO8859-1/books/handbook/ppp-and-slip/chapter.xml6
-rw-r--r--fr_FR.ISO8859-1/books/handbook/preface/preface.xml2
-rwxr-xr-xfr_FR.ISO8859-1/books/handbook/printing/chapter.xml2
-rwxr-xr-xfr_FR.ISO8859-1/books/handbook/security/chapter.xml14
-rw-r--r--fr_FR.ISO8859-1/books/handbook/serialcomms/chapter.xml2
-rw-r--r--fr_FR.ISO8859-1/books/handbook/users/chapter.xml2
-rw-r--r--fr_FR.ISO8859-1/books/handbook/vinum/chapter.xml2
-rw-r--r--fr_FR.ISO8859-1/books/handbook/virtualization/chapter.xml2
-rw-r--r--fr_FR.ISO8859-1/books/handbook/x11/chapter.xml6
-rw-r--r--fr_FR.ISO8859-1/books/porters-handbook/book.xml9
-rw-r--r--fr_FR.ISO8859-1/share/xml/abstract.ent1
-rw-r--r--fr_FR.ISO8859-1/share/xml/artheader.ent1
-rw-r--r--fr_FR.ISO8859-1/share/xml/catalog59
-rw-r--r--fr_FR.ISO8859-1/share/xml/catalog.xml3
-rw-r--r--fr_FR.ISO8859-1/share/xml/entities.ent45
-rw-r--r--fr_FR.ISO8859-1/share/xml/mailing-lists.ent1
-rw-r--r--fr_FR.ISO8859-1/share/xml/mirrors-local.xsl1
-rw-r--r--fr_FR.ISO8859-1/share/xml/newsgroups.ent1
-rw-r--r--fr_FR.ISO8859-1/share/xml/teams.ent1
-rw-r--r--fr_FR.ISO8859-1/share/xml/trademarks.ent1
-rw-r--r--fr_FR.ISO8859-1/share/xml/translators.ent1
-rw-r--r--fr_FR.ISO8859-1/share/xml/urls.ent1
-rw-r--r--hu_HU.ISO8859-2/articles/compiz-fusion/Makefile2
-rw-r--r--hu_HU.ISO8859-2/articles/compiz-fusion/article.xml9
-rw-r--r--hu_HU.ISO8859-2/articles/cups/Makefile2
-rw-r--r--hu_HU.ISO8859-2/articles/cups/article.xml9
-rw-r--r--hu_HU.ISO8859-2/articles/explaining-bsd/Makefile6
-rw-r--r--hu_HU.ISO8859-2/articles/explaining-bsd/article.xml9
-rw-r--r--hu_HU.ISO8859-2/articles/gjournal-desktop/Makefile2
-rw-r--r--hu_HU.ISO8859-2/articles/gjournal-desktop/article.xml9
-rw-r--r--hu_HU.ISO8859-2/articles/laptop/Makefile6
-rw-r--r--hu_HU.ISO8859-2/articles/laptop/article.xml9
-rw-r--r--hu_HU.ISO8859-2/articles/linux-comparison/Makefile6
-rw-r--r--hu_HU.ISO8859-2/articles/linux-comparison/article.xml9
-rw-r--r--hu_HU.ISO8859-2/articles/linux-users/Makefile6
-rw-r--r--hu_HU.ISO8859-2/articles/linux-users/article.xml9
-rw-r--r--hu_HU.ISO8859-2/books/faq/Makefile2
-rw-r--r--hu_HU.ISO8859-2/books/faq/book.xml8
-rw-r--r--hu_HU.ISO8859-2/books/fdp-primer/Makefile2
-rw-r--r--hu_HU.ISO8859-2/books/fdp-primer/book.xml8
-rw-r--r--hu_HU.ISO8859-2/books/fdp-primer/sgml-primer/chapter.xml27
-rw-r--r--hu_HU.ISO8859-2/books/handbook/Makefile35
-rw-r--r--hu_HU.ISO8859-2/books/handbook/advanced-networking/chapter.xml6
-rw-r--r--hu_HU.ISO8859-2/books/handbook/audit/chapter.xml2
-rw-r--r--hu_HU.ISO8859-2/books/handbook/basics/chapter.xml2
-rw-r--r--hu_HU.ISO8859-2/books/handbook/bibliography/chapter.xml2
-rw-r--r--hu_HU.ISO8859-2/books/handbook/book.xml9
-rw-r--r--hu_HU.ISO8859-2/books/handbook/boot/chapter.xml2
-rw-r--r--hu_HU.ISO8859-2/books/handbook/chapters.ent196
-rw-r--r--hu_HU.ISO8859-2/books/handbook/colophon.xml2
-rw-r--r--hu_HU.ISO8859-2/books/handbook/config/chapter.xml2
-rw-r--r--hu_HU.ISO8859-2/books/handbook/cutting-edge/chapter.xml96
-rw-r--r--hu_HU.ISO8859-2/books/handbook/desktop/chapter.xml2
-rw-r--r--hu_HU.ISO8859-2/books/handbook/disks/chapter.xml13
-rw-r--r--hu_HU.ISO8859-2/books/handbook/dtrace/chapter.xml2
-rw-r--r--hu_HU.ISO8859-2/books/handbook/eresources/chapter.xml6
-rw-r--r--hu_HU.ISO8859-2/books/handbook/filesystems/chapter.xml4
-rw-r--r--hu_HU.ISO8859-2/books/handbook/firewalls/chapter.xml2
-rw-r--r--hu_HU.ISO8859-2/books/handbook/geom/chapter.xml2
-rw-r--r--hu_HU.ISO8859-2/books/handbook/install/chapter.xml2
-rw-r--r--hu_HU.ISO8859-2/books/handbook/introduction/chapter.xml2
-rw-r--r--hu_HU.ISO8859-2/books/handbook/jails/chapter.xml2
-rw-r--r--hu_HU.ISO8859-2/books/handbook/kernelconfig/chapter.xml2
-rw-r--r--hu_HU.ISO8859-2/books/handbook/l10n/chapter.xml2
-rw-r--r--hu_HU.ISO8859-2/books/handbook/linuxemu/chapter.xml10
-rw-r--r--hu_HU.ISO8859-2/books/handbook/mac/chapter.xml2
-rw-r--r--hu_HU.ISO8859-2/books/handbook/mail/chapter.xml8
-rw-r--r--hu_HU.ISO8859-2/books/handbook/mirrors/chapter.xml10
-rw-r--r--hu_HU.ISO8859-2/books/handbook/multimedia/chapter.xml2
-rw-r--r--hu_HU.ISO8859-2/books/handbook/network-servers/chapter.xml2
-rw-r--r--hu_HU.ISO8859-2/books/handbook/pgpkeys/chapter.xml2
-rw-r--r--hu_HU.ISO8859-2/books/handbook/ports/chapter.xml2
-rw-r--r--hu_HU.ISO8859-2/books/handbook/ppp-and-slip/chapter.xml2
-rw-r--r--hu_HU.ISO8859-2/books/handbook/preface/preface.xml2
-rw-r--r--hu_HU.ISO8859-2/books/handbook/printing/chapter.xml2
-rw-r--r--hu_HU.ISO8859-2/books/handbook/security/chapter.xml2
-rw-r--r--hu_HU.ISO8859-2/books/handbook/serialcomms/chapter.xml2
-rw-r--r--hu_HU.ISO8859-2/books/handbook/users/chapter.xml2
-rw-r--r--hu_HU.ISO8859-2/books/handbook/vinum/chapter.xml2
-rw-r--r--hu_HU.ISO8859-2/books/handbook/virtualization/chapter.xml2
-rw-r--r--hu_HU.ISO8859-2/books/handbook/x11/chapter.xml2
-rw-r--r--hu_HU.ISO8859-2/share/xml/bibliography.xml2
-rw-r--r--hu_HU.ISO8859-2/share/xml/catalog61
-rw-r--r--hu_HU.ISO8859-2/share/xml/catalog.xml3
-rw-r--r--hu_HU.ISO8859-2/share/xml/entities.ent33
-rw-r--r--hu_HU.ISO8859-2/share/xml/freebsd.ent1
-rw-r--r--hu_HU.ISO8859-2/share/xml/l10n.ent1
-rw-r--r--hu_HU.ISO8859-2/share/xml/mailing-lists.ent1
-rw-r--r--hu_HU.ISO8859-2/share/xml/mirrors-local.xsl226
-rw-r--r--hu_HU.ISO8859-2/share/xml/newsgroups.ent1
-rw-r--r--hu_HU.ISO8859-2/share/xml/teams.ent1
-rw-r--r--hu_HU.ISO8859-2/share/xml/trademarks.ent1
-rw-r--r--hu_HU.ISO8859-2/share/xml/translators.ent1
-rw-r--r--it_IT.ISO8859-15/articles/committers-guide/article.xml9
-rw-r--r--it_IT.ISO8859-15/articles/explaining-bsd/article.xml9
-rw-r--r--it_IT.ISO8859-15/articles/filtering-bridges/article.xml9
-rw-r--r--it_IT.ISO8859-15/articles/new-users/article.xml9
-rw-r--r--it_IT.ISO8859-15/articles/vm-design/article.xml9
-rw-r--r--it_IT.ISO8859-15/books/handbook/Makefile29
-rw-r--r--it_IT.ISO8859-15/books/handbook/advanced-networking/chapter.xml2
-rw-r--r--it_IT.ISO8859-15/books/handbook/audit/chapter.xml2
-rw-r--r--it_IT.ISO8859-15/books/handbook/basics/chapter.xml4
-rw-r--r--it_IT.ISO8859-15/books/handbook/bibliography/chapter.xml2
-rw-r--r--it_IT.ISO8859-15/books/handbook/book.xml8
-rw-r--r--it_IT.ISO8859-15/books/handbook/boot/chapter.xml2
-rw-r--r--it_IT.ISO8859-15/books/handbook/chapters.ent190
-rw-r--r--it_IT.ISO8859-15/books/handbook/colophon.xml2
-rw-r--r--it_IT.ISO8859-15/books/handbook/config/chapter.xml6
-rw-r--r--it_IT.ISO8859-15/books/handbook/cutting-edge/chapter.xml2
-rw-r--r--it_IT.ISO8859-15/books/handbook/desktop/chapter.xml2
-rw-r--r--it_IT.ISO8859-15/books/handbook/disks/chapter.xml2
-rw-r--r--it_IT.ISO8859-15/books/handbook/eresources/chapter.xml6
-rw-r--r--it_IT.ISO8859-15/books/handbook/firewalls/chapter.xml2
-rw-r--r--it_IT.ISO8859-15/books/handbook/geom/chapter.xml4
-rw-r--r--it_IT.ISO8859-15/books/handbook/install/chapter.xml8
-rw-r--r--it_IT.ISO8859-15/books/handbook/introduction/chapter.xml6
-rw-r--r--it_IT.ISO8859-15/books/handbook/jails/chapter.xml2
-rw-r--r--it_IT.ISO8859-15/books/handbook/kernelconfig/chapter.xml4
-rw-r--r--it_IT.ISO8859-15/books/handbook/l10n/chapter.xml2
-rw-r--r--it_IT.ISO8859-15/books/handbook/linuxemu/chapter.xml12
-rw-r--r--it_IT.ISO8859-15/books/handbook/mac/chapter.xml2
-rw-r--r--it_IT.ISO8859-15/books/handbook/mail/chapter.xml10
-rw-r--r--it_IT.ISO8859-15/books/handbook/mirrors/chapter.xml14
-rw-r--r--it_IT.ISO8859-15/books/handbook/multimedia/chapter.xml2
-rw-r--r--it_IT.ISO8859-15/books/handbook/network-servers/chapter.xml6
-rw-r--r--it_IT.ISO8859-15/books/handbook/pgpkeys/chapter.xml4
-rw-r--r--it_IT.ISO8859-15/books/handbook/ports/chapter.xml4
-rw-r--r--it_IT.ISO8859-15/books/handbook/ppp-and-slip/chapter.xml2
-rw-r--r--it_IT.ISO8859-15/books/handbook/preface/preface.xml2
-rw-r--r--it_IT.ISO8859-15/books/handbook/printing/chapter.xml2
-rw-r--r--it_IT.ISO8859-15/books/handbook/security/chapter.xml2
-rw-r--r--it_IT.ISO8859-15/books/handbook/serialcomms/chapter.xml2
-rw-r--r--it_IT.ISO8859-15/books/handbook/users/chapter.xml2
-rw-r--r--it_IT.ISO8859-15/books/handbook/vinum/chapter.xml2
-rw-r--r--it_IT.ISO8859-15/books/handbook/virtualization/chapter.xml2
-rw-r--r--it_IT.ISO8859-15/books/handbook/x11/chapter.xml4
-rw-r--r--it_IT.ISO8859-15/books/unix-introduction/bibliography/chapter.xml2
-rw-r--r--it_IT.ISO8859-15/books/unix-introduction/book.xml8
-rw-r--r--it_IT.ISO8859-15/books/unix-introduction/command-summary/chapter.xml2
-rw-r--r--it_IT.ISO8859-15/books/unix-introduction/commands/chapter.xml30
-rw-r--r--it_IT.ISO8859-15/books/unix-introduction/editors/chapter.xml2
-rw-r--r--it_IT.ISO8859-15/books/unix-introduction/getting-started/chapter.xml2
-rw-r--r--it_IT.ISO8859-15/books/unix-introduction/glossary/chapter.xml2
-rw-r--r--it_IT.ISO8859-15/books/unix-introduction/history/chapter.xml2
-rw-r--r--it_IT.ISO8859-15/books/unix-introduction/preface/chapter.xml2
-rw-r--r--it_IT.ISO8859-15/books/unix-introduction/shell-programming/chapter.xml22
-rw-r--r--it_IT.ISO8859-15/books/unix-introduction/shells/chapter.xml2
-rw-r--r--it_IT.ISO8859-15/books/unix-introduction/special-features/chapter.xml10
-rw-r--r--it_IT.ISO8859-15/books/unix-introduction/structure/chapter.xml4
-rw-r--r--it_IT.ISO8859-15/books/unix-introduction/system-resource/chapter.xml6
-rw-r--r--it_IT.ISO8859-15/books/unix-introduction/text-processing/chapter.xml2
-rw-r--r--it_IT.ISO8859-15/share/xml/catalog47
-rw-r--r--it_IT.ISO8859-15/share/xml/catalog.xml3
-rw-r--r--it_IT.ISO8859-15/share/xml/entities.ent36
-rw-r--r--it_IT.ISO8859-15/share/xml/l10n.ent1
-rw-r--r--it_IT.ISO8859-15/share/xml/mailing-lists.ent1
-rw-r--r--it_IT.ISO8859-15/share/xml/trademarks.ent1
-rw-r--r--it_IT.ISO8859-15/share/xml/translators.ent1
-rw-r--r--ja_JP.eucJP/articles/contributing/article.xml10
-rw-r--r--ja_JP.eucJP/articles/contributors/article.xml9
-rw-r--r--ja_JP.eucJP/articles/fbsd-from-scratch/article.xml30
-rw-r--r--ja_JP.eucJP/articles/fonts/article.xml9
-rw-r--r--ja_JP.eucJP/articles/ipsec-must/article.xml9
-rw-r--r--ja_JP.eucJP/articles/problem-reports/article.xml9
-rw-r--r--ja_JP.eucJP/books/design-44bsd/book.xml15
-rw-r--r--ja_JP.eucJP/books/faq/book.xml23
-rw-r--r--ja_JP.eucJP/books/fdp-primer/book.xml8
-rw-r--r--ja_JP.eucJP/books/fdp-primer/examples/appendix.xml2
-rw-r--r--ja_JP.eucJP/books/fdp-primer/overview/chapter.xml2
-rw-r--r--ja_JP.eucJP/books/fdp-primer/psgml-mode/chapter.xml2
-rw-r--r--ja_JP.eucJP/books/fdp-primer/see-also/chapter.xml2
-rw-r--r--ja_JP.eucJP/books/fdp-primer/structure/chapter.xml2
-rw-r--r--ja_JP.eucJP/books/fdp-primer/stylesheets/chapter.xml2
-rw-r--r--ja_JP.eucJP/books/fdp-primer/the-website/chapter.xml2
-rw-r--r--ja_JP.eucJP/books/fdp-primer/tools/chapter.xml2
-rw-r--r--ja_JP.eucJP/books/fdp-primer/translations/chapter.xml2
-rw-r--r--ja_JP.eucJP/books/fdp-primer/writing-style/chapter.xml2
-rw-r--r--ja_JP.eucJP/books/handbook/Makefile46
-rw-r--r--ja_JP.eucJP/books/handbook/advanced-networking/chapter.xml26
-rw-r--r--ja_JP.eucJP/books/handbook/basics/chapter.xml2
-rw-r--r--ja_JP.eucJP/books/handbook/bibliography/chapter.xml2
-rw-r--r--ja_JP.eucJP/books/handbook/book.xml12
-rw-r--r--ja_JP.eucJP/books/handbook/boot/chapter.xml2
-rw-r--r--ja_JP.eucJP/books/handbook/bsdinstall/chapter.xml6
-rw-r--r--ja_JP.eucJP/books/handbook/chapters.ent195
-rw-r--r--ja_JP.eucJP/books/handbook/colophon.xml2
-rw-r--r--ja_JP.eucJP/books/handbook/config/chapter.xml4
-rw-r--r--ja_JP.eucJP/books/handbook/cutting-edge/chapter.xml77
-rw-r--r--ja_JP.eucJP/books/handbook/desktop/chapter.xml4
-rw-r--r--ja_JP.eucJP/books/handbook/disks/chapter.xml19
-rw-r--r--ja_JP.eucJP/books/handbook/eresources/chapter.xml6
-rw-r--r--ja_JP.eucJP/books/handbook/install/chapter.xml10
-rw-r--r--ja_JP.eucJP/books/handbook/introduction/chapter.xml2
-rw-r--r--ja_JP.eucJP/books/handbook/jcontrib/chapter.xml2
-rw-r--r--ja_JP.eucJP/books/handbook/kernelconfig/chapter.xml6
-rw-r--r--ja_JP.eucJP/books/handbook/l10n/chapter.xml2
-rw-r--r--ja_JP.eucJP/books/handbook/linuxemu/chapter.xml4
-rw-r--r--ja_JP.eucJP/books/handbook/mail/chapter.xml4
-rw-r--r--ja_JP.eucJP/books/handbook/mirrors/chapter.xml10
-rw-r--r--ja_JP.eucJP/books/handbook/multimedia/chapter.xml6
-rw-r--r--ja_JP.eucJP/books/handbook/pgpkeys/chapter.xml2
-rw-r--r--ja_JP.eucJP/books/handbook/ports/chapter.xml6
-rw-r--r--ja_JP.eucJP/books/handbook/ppp-and-slip/chapter.xml8
-rw-r--r--ja_JP.eucJP/books/handbook/preface/preface.xml2
-rw-r--r--ja_JP.eucJP/books/handbook/printing/chapter.xml2
-rw-r--r--ja_JP.eucJP/books/handbook/security/chapter.xml14
-rw-r--r--ja_JP.eucJP/books/handbook/serialcomms/chapter.xml2
-rw-r--r--ja_JP.eucJP/books/handbook/users/chapter.xml2
-rw-r--r--ja_JP.eucJP/books/handbook/x11/chapter.xml6
-rw-r--r--ja_JP.eucJP/books/porters-handbook/book.xml21
-rw-r--r--ja_JP.eucJP/share/xml/authors.ent1
-rw-r--r--ja_JP.eucJP/share/xml/catalog44
-rw-r--r--ja_JP.eucJP/share/xml/catalog.xml3
-rw-r--r--ja_JP.eucJP/share/xml/entities.ent45
-rw-r--r--ja_JP.eucJP/share/xml/mailing-lists.ent1
-rw-r--r--ja_JP.eucJP/share/xml/mirrors-local.xsl1
-rw-r--r--ja_JP.eucJP/share/xml/newsgroups.ent1
-rw-r--r--ja_JP.eucJP/share/xml/teams.ent1
-rw-r--r--ja_JP.eucJP/share/xml/trademarks.ent1
-rw-r--r--mn_MN.UTF-8/books/handbook/Makefile29
-rw-r--r--mn_MN.UTF-8/books/handbook/advanced-networking/chapter.xml6
-rw-r--r--mn_MN.UTF-8/books/handbook/audit/chapter.xml2
-rw-r--r--mn_MN.UTF-8/books/handbook/basics/chapter.xml2
-rw-r--r--mn_MN.UTF-8/books/handbook/bibliography/chapter.xml2
-rw-r--r--mn_MN.UTF-8/books/handbook/book.xml9
-rw-r--r--mn_MN.UTF-8/books/handbook/boot/chapter.xml2
-rw-r--r--mn_MN.UTF-8/books/handbook/bsdinstall/chapter.xml4
-rw-r--r--mn_MN.UTF-8/books/handbook/chapters.ent185
-rw-r--r--mn_MN.UTF-8/books/handbook/colophon.xml2
-rw-r--r--mn_MN.UTF-8/books/handbook/config/chapter.xml4
-rw-r--r--mn_MN.UTF-8/books/handbook/cutting-edge/chapter.xml73
-rw-r--r--mn_MN.UTF-8/books/handbook/desktop/chapter.xml2
-rw-r--r--mn_MN.UTF-8/books/handbook/disks/chapter.xml18
-rw-r--r--mn_MN.UTF-8/books/handbook/dtrace/chapter.xml2
-rw-r--r--mn_MN.UTF-8/books/handbook/eresources/chapter.xml9
-rw-r--r--mn_MN.UTF-8/books/handbook/filesystems/chapter.xml4
-rw-r--r--mn_MN.UTF-8/books/handbook/firewalls/chapter.xml2
-rw-r--r--mn_MN.UTF-8/books/handbook/geom/chapter.xml20
-rw-r--r--mn_MN.UTF-8/books/handbook/install/chapter.xml2
-rw-r--r--mn_MN.UTF-8/books/handbook/introduction/chapter.xml2
-rw-r--r--mn_MN.UTF-8/books/handbook/jails/chapter.xml2
-rw-r--r--mn_MN.UTF-8/books/handbook/kernelconfig/chapter.xml2
-rw-r--r--mn_MN.UTF-8/books/handbook/l10n/chapter.xml2
-rw-r--r--mn_MN.UTF-8/books/handbook/linuxemu/chapter.xml10
-rw-r--r--mn_MN.UTF-8/books/handbook/mac/chapter.xml2
-rw-r--r--mn_MN.UTF-8/books/handbook/mail/chapter.xml8
-rw-r--r--mn_MN.UTF-8/books/handbook/mirrors/chapter.xml10
-rw-r--r--mn_MN.UTF-8/books/handbook/multimedia/chapter.xml4
-rw-r--r--mn_MN.UTF-8/books/handbook/network-servers/chapter.xml2
-rw-r--r--mn_MN.UTF-8/books/handbook/pgpkeys/chapter.xml2
-rw-r--r--mn_MN.UTF-8/books/handbook/ports/chapter.xml2
-rw-r--r--mn_MN.UTF-8/books/handbook/ppp-and-slip/chapter.xml2
-rw-r--r--mn_MN.UTF-8/books/handbook/preface/preface.xml2
-rw-r--r--mn_MN.UTF-8/books/handbook/printing/chapter.xml2
-rw-r--r--mn_MN.UTF-8/books/handbook/security/chapter.xml2
-rw-r--r--mn_MN.UTF-8/books/handbook/serialcomms/chapter.xml2
-rw-r--r--mn_MN.UTF-8/books/handbook/txtfiles.ent2
-rw-r--r--mn_MN.UTF-8/books/handbook/users/chapter.xml2
-rw-r--r--mn_MN.UTF-8/books/handbook/vinum/chapter.xml2
-rw-r--r--mn_MN.UTF-8/books/handbook/virtualization/chapter.xml4
-rw-r--r--mn_MN.UTF-8/books/handbook/x11/chapter.xml4
-rw-r--r--mn_MN.UTF-8/share/xml/catalog42
-rw-r--r--mn_MN.UTF-8/share/xml/catalog.xml22
-rw-r--r--mn_MN.UTF-8/share/xml/entities.ent30
-rw-r--r--mn_MN.UTF-8/share/xml/glossary.ent2
-rw-r--r--mn_MN.UTF-8/share/xml/mirrors-local.xsl1
-rw-r--r--mn_MN.UTF-8/share/xml/trademarks.ent2
-rw-r--r--nl_NL.ISO8859-1/articles/contributing-ports/article.xml10
-rw-r--r--nl_NL.ISO8859-1/articles/contributing/article.xml12
-rw-r--r--nl_NL.ISO8859-1/articles/explaining-bsd/article.xml11
-rw-r--r--nl_NL.ISO8859-1/articles/problem-reports/article.xml9
-rw-r--r--nl_NL.ISO8859-1/articles/solid-state/article.xml9
-rw-r--r--nl_NL.ISO8859-1/books/handbook/Makefile29
-rw-r--r--nl_NL.ISO8859-1/books/handbook/advanced-networking/chapter.xml4
-rw-r--r--nl_NL.ISO8859-1/books/handbook/audit/chapter.xml2
-rw-r--r--nl_NL.ISO8859-1/books/handbook/basics/chapter.xml2
-rw-r--r--nl_NL.ISO8859-1/books/handbook/bibliography/chapter.xml2
-rw-r--r--nl_NL.ISO8859-1/books/handbook/book.xml62
-rw-r--r--nl_NL.ISO8859-1/books/handbook/boot/chapter.xml2
-rw-r--r--nl_NL.ISO8859-1/books/handbook/chapters.ent183
-rw-r--r--nl_NL.ISO8859-1/books/handbook/colophon.xml2
-rw-r--r--nl_NL.ISO8859-1/books/handbook/config/chapter.xml4
-rw-r--r--nl_NL.ISO8859-1/books/handbook/cutting-edge/chapter.xml79
-rw-r--r--nl_NL.ISO8859-1/books/handbook/desktop/chapter.xml2
-rw-r--r--nl_NL.ISO8859-1/books/handbook/disks/chapter.xml22
-rw-r--r--nl_NL.ISO8859-1/books/handbook/dtrace/chapter.xml2
-rw-r--r--nl_NL.ISO8859-1/books/handbook/eresources/chapter.xml6
-rw-r--r--nl_NL.ISO8859-1/books/handbook/filesystems/chapter.xml4
-rw-r--r--nl_NL.ISO8859-1/books/handbook/firewalls/chapter.xml4
-rw-r--r--nl_NL.ISO8859-1/books/handbook/geom/chapter.xml20
-rw-r--r--nl_NL.ISO8859-1/books/handbook/install/chapter.xml4
-rw-r--r--nl_NL.ISO8859-1/books/handbook/introduction/chapter.xml2
-rw-r--r--nl_NL.ISO8859-1/books/handbook/jails/chapter.xml2
-rw-r--r--nl_NL.ISO8859-1/books/handbook/kernelconfig/chapter.xml2
-rw-r--r--nl_NL.ISO8859-1/books/handbook/l10n/chapter.xml2
-rw-r--r--nl_NL.ISO8859-1/books/handbook/linuxemu/chapter.xml14
-rw-r--r--nl_NL.ISO8859-1/books/handbook/mac/chapter.xml2
-rw-r--r--nl_NL.ISO8859-1/books/handbook/mail/chapter.xml8
-rw-r--r--nl_NL.ISO8859-1/books/handbook/mirrors/chapter.xml10
-rw-r--r--nl_NL.ISO8859-1/books/handbook/multimedia/chapter.xml2
-rw-r--r--nl_NL.ISO8859-1/books/handbook/network-servers/chapter.xml2
-rw-r--r--nl_NL.ISO8859-1/books/handbook/pgpkeys/chapter.xml2
-rw-r--r--nl_NL.ISO8859-1/books/handbook/ports/chapter.xml2
-rw-r--r--nl_NL.ISO8859-1/books/handbook/ppp-and-slip/chapter.xml2
-rw-r--r--nl_NL.ISO8859-1/books/handbook/preface/preface.xml2
-rw-r--r--nl_NL.ISO8859-1/books/handbook/printing/chapter.xml2
-rw-r--r--nl_NL.ISO8859-1/books/handbook/security/chapter.xml2
-rw-r--r--nl_NL.ISO8859-1/books/handbook/serialcomms/chapter.xml2
-rw-r--r--nl_NL.ISO8859-1/books/handbook/users/chapter.xml2
-rw-r--r--nl_NL.ISO8859-1/books/handbook/vinum/chapter.xml2
-rw-r--r--nl_NL.ISO8859-1/books/handbook/virtualization/chapter.xml4
-rw-r--r--nl_NL.ISO8859-1/books/handbook/x11/chapter.xml4
-rw-r--r--nl_NL.ISO8859-1/share/xml/bibliography.xml2
-rw-r--r--nl_NL.ISO8859-1/share/xml/catalog52
-rw-r--r--nl_NL.ISO8859-1/share/xml/catalog.xml3
-rw-r--r--nl_NL.ISO8859-1/share/xml/entities.ent33
-rw-r--r--nl_NL.ISO8859-1/share/xml/glossary.ent2
-rw-r--r--nl_NL.ISO8859-1/share/xml/l10n.ent1
-rw-r--r--nl_NL.ISO8859-1/share/xml/mailing-lists.ent1
-rw-r--r--nl_NL.ISO8859-1/share/xml/mirrors-local.xsl1
-rw-r--r--nl_NL.ISO8859-1/share/xml/newsgroups.ent1
-rw-r--r--nl_NL.ISO8859-1/share/xml/teams.ent1
-rw-r--r--nl_NL.ISO8859-1/share/xml/trademarks.ent1
-rw-r--r--nl_NL.ISO8859-1/share/xml/translators.ent4
-rw-r--r--no_NO.ISO8859-1/books/handbook/basics/chapter.xml2
-rw-r--r--no_NO.ISO8859-1/books/handbook/bibliography/chapter.xml2
-rw-r--r--no_NO.ISO8859-1/books/handbook/install/chapter.xml2
-rw-r--r--pl_PL.ISO8859-2/articles/filtering-bridges/article.xml9
-rw-r--r--pl_PL.ISO8859-2/articles/new-users/article.xml9
-rw-r--r--pl_PL.ISO8859-2/books/handbook/Makefile29
-rw-r--r--pl_PL.ISO8859-2/books/handbook/advanced-networking/chapter.xml2
-rw-r--r--pl_PL.ISO8859-2/books/handbook/audit/chapter.xml2
-rw-r--r--pl_PL.ISO8859-2/books/handbook/basics/chapter.xml2
-rw-r--r--pl_PL.ISO8859-2/books/handbook/bibliography/chapter.xml2
-rw-r--r--pl_PL.ISO8859-2/books/handbook/book.xml8
-rw-r--r--pl_PL.ISO8859-2/books/handbook/boot/chapter.xml2
-rw-r--r--pl_PL.ISO8859-2/books/handbook/chapters.ent178
-rw-r--r--pl_PL.ISO8859-2/books/handbook/colophon.xml2
-rw-r--r--pl_PL.ISO8859-2/books/handbook/config/chapter.xml4
-rw-r--r--pl_PL.ISO8859-2/books/handbook/cutting-edge/chapter.xml2
-rw-r--r--pl_PL.ISO8859-2/books/handbook/desktop/chapter.xml6
-rw-r--r--pl_PL.ISO8859-2/books/handbook/disks/chapter.xml14
-rw-r--r--pl_PL.ISO8859-2/books/handbook/eresources/chapter.xml6
-rw-r--r--pl_PL.ISO8859-2/books/handbook/firewalls/chapter.xml2
-rw-r--r--pl_PL.ISO8859-2/books/handbook/geom/chapter.xml2
-rw-r--r--pl_PL.ISO8859-2/books/handbook/install/chapter.xml2
-rw-r--r--pl_PL.ISO8859-2/books/handbook/introduction/chapter.xml2
-rw-r--r--pl_PL.ISO8859-2/books/handbook/kernelconfig/chapter.xml2
-rw-r--r--pl_PL.ISO8859-2/books/handbook/l10n/chapter.xml2
-rw-r--r--pl_PL.ISO8859-2/books/handbook/linuxemu/chapter.xml10
-rw-r--r--pl_PL.ISO8859-2/books/handbook/mac/chapter.xml2
-rw-r--r--pl_PL.ISO8859-2/books/handbook/mail/chapter.xml2
-rw-r--r--pl_PL.ISO8859-2/books/handbook/mirrors/chapter.xml10
-rw-r--r--pl_PL.ISO8859-2/books/handbook/multimedia/chapter.xml2
-rw-r--r--pl_PL.ISO8859-2/books/handbook/network-servers/chapter.xml2
-rw-r--r--pl_PL.ISO8859-2/books/handbook/pgpkeys/chapter.xml2
-rw-r--r--pl_PL.ISO8859-2/books/handbook/ports/chapter.xml2
-rw-r--r--pl_PL.ISO8859-2/books/handbook/ppp-and-slip/chapter.xml2
-rw-r--r--pl_PL.ISO8859-2/books/handbook/preface/preface.xml2
-rw-r--r--pl_PL.ISO8859-2/books/handbook/printing/chapter.xml2
-rw-r--r--pl_PL.ISO8859-2/books/handbook/security/chapter.xml2
-rw-r--r--pl_PL.ISO8859-2/books/handbook/serialcomms/chapter.xml2
-rw-r--r--pl_PL.ISO8859-2/books/handbook/users/chapter.xml2
-rw-r--r--pl_PL.ISO8859-2/books/handbook/vinum/chapter.xml2
-rw-r--r--pl_PL.ISO8859-2/books/handbook/x11/chapter.xml2
-rw-r--r--pl_PL.ISO8859-2/share/xml/catalog27
-rw-r--r--pl_PL.ISO8859-2/share/xml/catalog.xml19
-rw-r--r--pl_PL.ISO8859-2/share/xml/entities.ent33
-rw-r--r--pl_PL.ISO8859-2/share/xml/l10n.ent1
-rw-r--r--pl_PL.ISO8859-2/share/xml/mailing-lists.ent1
-rw-r--r--pl_PL.ISO8859-2/share/xml/newsgroups.ent1
-rw-r--r--pl_PL.ISO8859-2/share/xml/teams.ent1
-rw-r--r--pt_BR.ISO8859-1/articles/building-products/article.xml10
-rw-r--r--pt_BR.ISO8859-1/articles/contributing-ports/article.xml11
-rw-r--r--pt_BR.ISO8859-1/articles/contributing/article.xml9
-rw-r--r--pt_BR.ISO8859-1/articles/explaining-bsd/article.xml9
-rw-r--r--pt_BR.ISO8859-1/articles/freebsd-questions/article.xml9
-rw-r--r--pt_BR.ISO8859-1/articles/freebsd-update-server/article.xml18
-rw-r--r--pt_BR.ISO8859-1/articles/hubs/article.xml10
-rw-r--r--pt_BR.ISO8859-1/articles/linux-users/article.xml9
-rw-r--r--pt_BR.ISO8859-1/articles/new-users/article.xml9
-rw-r--r--pt_BR.ISO8859-1/articles/portbuild/article.xml12
-rw-r--r--pt_BR.ISO8859-1/articles/problem-reports/article.xml17
-rw-r--r--pt_BR.ISO8859-1/books/faq/book.xml42
-rw-r--r--pt_BR.ISO8859-1/books/fdp-primer/book.xml9
-rw-r--r--pt_BR.ISO8859-1/books/fdp-primer/doc-build/chapter.xml1
-rw-r--r--pt_BR.ISO8859-1/books/fdp-primer/examples/appendix.xml5
-rw-r--r--pt_BR.ISO8859-1/books/fdp-primer/overview/chapter.xml1
-rw-r--r--pt_BR.ISO8859-1/books/fdp-primer/psgml-mode/chapter.xml1
-rw-r--r--pt_BR.ISO8859-1/books/fdp-primer/see-also/chapter.xml1
-rw-r--r--pt_BR.ISO8859-1/books/fdp-primer/sgml-markup/chapter.xml105
-rw-r--r--pt_BR.ISO8859-1/books/fdp-primer/sgml-primer/chapter.xml110
-rw-r--r--pt_BR.ISO8859-1/books/fdp-primer/structure/chapter.xml3
-rw-r--r--pt_BR.ISO8859-1/books/fdp-primer/stylesheets/chapter.xml1
-rwxr-xr-xpt_BR.ISO8859-1/books/fdp-primer/the-website/chapter.xml1
-rw-r--r--pt_BR.ISO8859-1/books/fdp-primer/tools/chapter.xml1
-rw-r--r--pt_BR.ISO8859-1/books/fdp-primer/translations/chapter.xml1
-rwxr-xr-xpt_BR.ISO8859-1/books/fdp-primer/writing-style/chapter.xml13
-rw-r--r--pt_BR.ISO8859-1/books/handbook/advanced-networking/chapter.xml2
-rw-r--r--pt_BR.ISO8859-1/books/handbook/basics/chapter.xml2
-rw-r--r--pt_BR.ISO8859-1/books/handbook/bibliography/chapter.xml2
-rw-r--r--pt_BR.ISO8859-1/books/handbook/book.xml8
-rw-r--r--pt_BR.ISO8859-1/books/handbook/boot/chapter.xml2
-rw-r--r--pt_BR.ISO8859-1/books/handbook/chapters.ent173
-rw-r--r--pt_BR.ISO8859-1/books/handbook/colophon.xml2
-rw-r--r--pt_BR.ISO8859-1/books/handbook/config/chapter.xml2
-rw-r--r--pt_BR.ISO8859-1/books/handbook/cutting-edge/chapter.xml2
-rw-r--r--pt_BR.ISO8859-1/books/handbook/disks/chapter.xml2
-rw-r--r--pt_BR.ISO8859-1/books/handbook/eresources/chapter.xml2
-rw-r--r--pt_BR.ISO8859-1/books/handbook/install/chapter.xml2
-rw-r--r--pt_BR.ISO8859-1/books/handbook/introduction/chapter.xml2
-rw-r--r--pt_BR.ISO8859-1/books/handbook/kernelconfig/chapter.xml2
-rw-r--r--pt_BR.ISO8859-1/books/handbook/l10n/chapter.xml2
-rw-r--r--pt_BR.ISO8859-1/books/handbook/linuxemu/chapter.xml2
-rw-r--r--pt_BR.ISO8859-1/books/handbook/mail/chapter.xml2
-rw-r--r--pt_BR.ISO8859-1/books/handbook/mirrors/chapter.xml20
-rw-r--r--pt_BR.ISO8859-1/books/handbook/pgpkeys/chapter.xml2
-rw-r--r--pt_BR.ISO8859-1/books/handbook/ports/chapter.xml2
-rw-r--r--pt_BR.ISO8859-1/books/handbook/ppp-and-slip/chapter.xml2
-rw-r--r--pt_BR.ISO8859-1/books/handbook/preface/preface.xml2
-rw-r--r--pt_BR.ISO8859-1/books/handbook/printing/chapter.xml2
-rw-r--r--pt_BR.ISO8859-1/books/handbook/security/chapter.xml2
-rw-r--r--pt_BR.ISO8859-1/books/handbook/serialcomms/chapter.xml2
-rw-r--r--pt_BR.ISO8859-1/books/handbook/users/chapter.xml2
-rw-r--r--pt_BR.ISO8859-1/books/handbook/x11/chapter.xml2
-rw-r--r--pt_BR.ISO8859-1/share/xml/catalog48
-rw-r--r--pt_BR.ISO8859-1/share/xml/catalog.xml22
-rw-r--r--pt_BR.ISO8859-1/share/xml/entities.ent34
-rw-r--r--pt_BR.ISO8859-1/share/xml/l10n.ent1
-rw-r--r--pt_BR.ISO8859-1/share/xml/mailing-lists.ent1
-rw-r--r--pt_BR.ISO8859-1/share/xml/newsgroups.ent1
-rw-r--r--pt_BR.ISO8859-1/share/xml/teams.ent1
-rw-r--r--pt_BR.ISO8859-1/share/xml/trademarks.ent1
-rw-r--r--pt_BR.ISO8859-1/share/xml/translators.ent1
-rw-r--r--pt_BR.ISO8859-1/share/xml/words.ent1
-rw-r--r--ru_RU.KOI8-R/articles/committers-guide/article.xml9
-rw-r--r--ru_RU.KOI8-R/articles/console-server/article.xml9
-rw-r--r--ru_RU.KOI8-R/articles/contributing/article.xml12
-rw-r--r--ru_RU.KOI8-R/articles/cups/article.xml12
-rw-r--r--ru_RU.KOI8-R/articles/custom-gcc/article.xml23
-rw-r--r--ru_RU.KOI8-R/articles/cvs-freebsd/article.xml9
-rw-r--r--ru_RU.KOI8-R/articles/cvsup-advanced/article.xml9
-rw-r--r--ru_RU.KOI8-R/articles/explaining-bsd/article.xml9
-rw-r--r--ru_RU.KOI8-R/articles/fbsd-from-scratch/article.xml34
-rw-r--r--ru_RU.KOI8-R/articles/fonts/article.xml9
-rw-r--r--ru_RU.KOI8-R/articles/freebsd-questions/article.xml9
-rw-r--r--ru_RU.KOI8-R/articles/geom-class/article.xml9
-rw-r--r--ru_RU.KOI8-R/articles/gjournal-desktop/article.xml9
-rw-r--r--ru_RU.KOI8-R/articles/hubs/article.xml9
-rw-r--r--ru_RU.KOI8-R/articles/ipsec-must/article.xml9
-rw-r--r--ru_RU.KOI8-R/articles/laptop/article.xml9
-rw-r--r--ru_RU.KOI8-R/articles/linux-comparison/article.xml9
-rw-r--r--ru_RU.KOI8-R/articles/mailing-list-faq/article.xml9
-rw-r--r--ru_RU.KOI8-R/articles/mh/article.xml9
-rw-r--r--ru_RU.KOI8-R/articles/new-users/article.xml9
-rw-r--r--ru_RU.KOI8-R/articles/pam/article.xml24
-rw-r--r--ru_RU.KOI8-R/articles/portbuild/article.xml9
-rw-r--r--ru_RU.KOI8-R/articles/pr-guidelines/article.xml8
-rw-r--r--ru_RU.KOI8-R/articles/problem-reports/article.xml9
-rw-r--r--ru_RU.KOI8-R/articles/relaydelay/article.xml10
-rw-r--r--ru_RU.KOI8-R/articles/releng-packages/article.xml9
-rw-r--r--ru_RU.KOI8-R/articles/releng/article.xml8
-rw-r--r--ru_RU.KOI8-R/articles/solid-state/article.xml9
-rw-r--r--ru_RU.KOI8-R/articles/vm-design/article.xml9
-rw-r--r--ru_RU.KOI8-R/books/arch-handbook/driverbasics/chapter.xml2
-rw-r--r--ru_RU.KOI8-R/books/arch-handbook/locking/chapter.xml2
-rw-r--r--ru_RU.KOI8-R/books/arch-handbook/sound/chapter.xml2
-rw-r--r--ru_RU.KOI8-R/books/design-44bsd/book.xml9
-rw-r--r--ru_RU.KOI8-R/books/developers-handbook/book.xml8
-rw-r--r--ru_RU.KOI8-R/books/developers-handbook/introduction/chapter.xml2
-rw-r--r--ru_RU.KOI8-R/books/developers-handbook/kerneldebug/chapter.xml2
-rw-r--r--ru_RU.KOI8-R/books/developers-handbook/policies/chapter.xml2
-rw-r--r--ru_RU.KOI8-R/books/developers-handbook/secure/chapter.xml2
-rw-r--r--ru_RU.KOI8-R/books/faq/book.xml22
-rw-r--r--ru_RU.KOI8-R/books/fdp-primer/book.xml8
-rw-r--r--ru_RU.KOI8-R/books/fdp-primer/doc-build/chapter.xml2
-rw-r--r--ru_RU.KOI8-R/books/fdp-primer/overview/chapter.xml2
-rw-r--r--ru_RU.KOI8-R/books/fdp-primer/see-also/chapter.xml2
-rw-r--r--ru_RU.KOI8-R/books/fdp-primer/sgml-markup/chapter.xml2
-rw-r--r--ru_RU.KOI8-R/books/fdp-primer/the-website/chapter.xml2
-rw-r--r--ru_RU.KOI8-R/books/fdp-primer/tools/chapter.xml2
-rw-r--r--ru_RU.KOI8-R/books/fdp-primer/writing-style/chapter.xml2
-rw-r--r--ru_RU.KOI8-R/books/handbook/Makefile29
-rw-r--r--ru_RU.KOI8-R/books/handbook/advanced-networking/chapter.xml4
-rw-r--r--ru_RU.KOI8-R/books/handbook/audit/chapter.xml2
-rw-r--r--ru_RU.KOI8-R/books/handbook/basics/chapter.xml2
-rw-r--r--ru_RU.KOI8-R/books/handbook/bibliography/chapter.xml2
-rw-r--r--ru_RU.KOI8-R/books/handbook/book.xml9
-rw-r--r--ru_RU.KOI8-R/books/handbook/boot/chapter.xml2
-rw-r--r--ru_RU.KOI8-R/books/handbook/bsdinstall/chapter.xml2
-rw-r--r--ru_RU.KOI8-R/books/handbook/chapters.ent181
-rw-r--r--ru_RU.KOI8-R/books/handbook/colophon.xml2
-rw-r--r--ru_RU.KOI8-R/books/handbook/config/chapter.xml4
-rw-r--r--ru_RU.KOI8-R/books/handbook/cutting-edge/chapter.xml2
-rw-r--r--ru_RU.KOI8-R/books/handbook/desktop/chapter.xml2
-rw-r--r--ru_RU.KOI8-R/books/handbook/disks/chapter.xml12
-rw-r--r--ru_RU.KOI8-R/books/handbook/eresources/chapter.xml2
-rw-r--r--ru_RU.KOI8-R/books/handbook/filesystems/chapter.xml4
-rw-r--r--ru_RU.KOI8-R/books/handbook/firewalls/chapter.xml2
-rw-r--r--ru_RU.KOI8-R/books/handbook/geom/chapter.xml2
-rw-r--r--ru_RU.KOI8-R/books/handbook/install/chapter.xml2
-rw-r--r--ru_RU.KOI8-R/books/handbook/introduction/chapter.xml2
-rw-r--r--ru_RU.KOI8-R/books/handbook/kernelconfig/chapter.xml2
-rw-r--r--ru_RU.KOI8-R/books/handbook/l10n/chapter.xml2
-rw-r--r--ru_RU.KOI8-R/books/handbook/linuxemu/chapter.xml10
-rw-r--r--ru_RU.KOI8-R/books/handbook/mac/chapter.xml8
-rw-r--r--ru_RU.KOI8-R/books/handbook/mail/chapter.xml2
-rw-r--r--ru_RU.KOI8-R/books/handbook/mirrors/chapter.xml4
-rw-r--r--ru_RU.KOI8-R/books/handbook/multimedia/chapter.xml2
-rw-r--r--ru_RU.KOI8-R/books/handbook/network-servers/chapter.xml2
-rw-r--r--ru_RU.KOI8-R/books/handbook/pgpkeys/chapter.xml2
-rw-r--r--ru_RU.KOI8-R/books/handbook/ports/chapter.xml2
-rw-r--r--ru_RU.KOI8-R/books/handbook/ppp-and-slip/chapter.xml6
-rw-r--r--ru_RU.KOI8-R/books/handbook/preface/preface.xml2
-rw-r--r--ru_RU.KOI8-R/books/handbook/printing/chapter.xml2
-rw-r--r--ru_RU.KOI8-R/books/handbook/security/chapter.xml2
-rw-r--r--ru_RU.KOI8-R/books/handbook/serialcomms/chapter.xml2
-rw-r--r--ru_RU.KOI8-R/books/handbook/users/chapter.xml2
-rw-r--r--ru_RU.KOI8-R/books/handbook/vinum/chapter.xml2
-rw-r--r--ru_RU.KOI8-R/books/handbook/x11/chapter.xml4
-rw-r--r--ru_RU.KOI8-R/books/porters-handbook/book.xml35
-rw-r--r--ru_RU.KOI8-R/share/xml/catalog59
-rw-r--r--ru_RU.KOI8-R/share/xml/catalog.xml3
-rw-r--r--ru_RU.KOI8-R/share/xml/entities.ent33
-rw-r--r--ru_RU.KOI8-R/share/xml/mailing-lists.ent1
-rw-r--r--ru_RU.KOI8-R/share/xml/mirrors-local.xsl1
-rw-r--r--ru_RU.KOI8-R/share/xml/newsgroups.ent1
-rw-r--r--ru_RU.KOI8-R/share/xml/teams.ent1
-rw-r--r--ru_RU.KOI8-R/share/xml/trademarks.ent1
-rw-r--r--ru_RU.KOI8-R/share/xml/translators.ent1
-rw-r--r--ru_RU.KOI8-R/share/xml/urls.ent1
-rw-r--r--share/misc/svn_props.txt72
-rw-r--r--share/mk/doc.commands.mk171
-rw-r--r--share/mk/doc.common.mk8
-rw-r--r--share/mk/doc.docbook.mk389
-rw-r--r--share/mk/doc.html.mk372
-rw-r--r--share/mk/doc.images.mk36
-rw-r--r--share/mk/doc.project.mk52
-rw-r--r--share/mk/doc.xml.mk13
-rw-r--r--share/mk/web.site.mk68
-rw-r--r--share/pgpkeys/decke.key1
-rw-r--r--share/pgpkeys/pgj.key1
-rw-r--r--share/pgpkeys/rene.key1
-rw-r--r--share/pgpkeys/scop.key1
-rw-r--r--share/pgpkeys/thomas.key1
-rw-r--r--share/xml/bibliography.xml2
-rw-r--r--share/xml/catalog7
-rw-r--r--share/xml/catalog.xml37
-rw-r--r--share/xml/entities.ent22
-rw-r--r--share/xml/freebsd45.dtd (renamed from share/xml/freebsd42.dtd)48
-rw-r--r--share/xml/mirrors-local.xsl1
-rw-r--r--share/xml/mirrors-master.xsl23
-rw-r--r--share/xml/mirrors.dtd26
-rw-r--r--share/xml/mirrors.xml2
-rw-r--r--share/xml/urls.ent33
-rw-r--r--share/xsl/freebsd-common.xsl7
-rw-r--r--share/xsl/freebsd-epub.xsl (renamed from share/xsl/freebsd-html-chunk.xsl)7
-rw-r--r--share/xsl/freebsd-fo.xsl63
-rw-r--r--share/xsl/freebsd-xhtml-chunk.xsl19
-rw-r--r--share/xsl/freebsd-xhtml-common.xsl (renamed from share/xsl/freebsd-html.xsl)10
-rw-r--r--share/xsl/freebsd-xhtml.xsl (renamed from share/xsl/default.xsl)7
-rw-r--r--share/xsl/freebsd.xsl19
-rw-r--r--sr_YU.ISO8859-2/share/xml/catalog11
-rw-r--r--sr_YU.ISO8859-2/share/xml/entities.ent22
-rw-r--r--tr_TR.ISO8859-9/articles/explaining-bsd/article.xml9
-rw-r--r--tr_TR.ISO8859-9/share/xml/catalog12
-rw-r--r--tr_TR.ISO8859-9/share/xml/catalog.xml4
-rw-r--r--tr_TR.ISO8859-9/share/xml/entities.ent22
-rw-r--r--zh_CN.GB2312/articles/contributing/article.xml9
-rw-r--r--zh_CN.GB2312/articles/cvs-freebsd/article.xml9
-rw-r--r--zh_CN.GB2312/articles/linux-users/article.xml11
-rw-r--r--zh_CN.GB2312/articles/nanobsd/article.xml9
-rw-r--r--zh_CN.GB2312/articles/rc-scripting/article.xml13
-rw-r--r--zh_CN.GB2312/articles/remote-install/article.xml9
-rw-r--r--zh_CN.GB2312/books/arch-handbook/book.xml8
-rw-r--r--zh_CN.GB2312/books/arch-handbook/boot/chapter.xml2
-rw-r--r--zh_CN.GB2312/books/arch-handbook/chapters.ent2
-rw-r--r--zh_CN.GB2312/books/arch-handbook/driverbasics/chapter.xml2
-rw-r--r--zh_CN.GB2312/books/arch-handbook/isa/chapter.xml2
-rw-r--r--zh_CN.GB2312/books/arch-handbook/jail/chapter.xml2
-rw-r--r--zh_CN.GB2312/books/arch-handbook/kobj/chapter.xml2
-rw-r--r--zh_CN.GB2312/books/arch-handbook/locking/chapter.xml2
-rw-r--r--zh_CN.GB2312/books/arch-handbook/mac/chapter.xml6
-rw-r--r--zh_CN.GB2312/books/arch-handbook/newbus/chapter.xml2
-rw-r--r--zh_CN.GB2312/books/arch-handbook/pccard/chapter.xml2
-rw-r--r--zh_CN.GB2312/books/arch-handbook/pci/chapter.xml2
-rw-r--r--zh_CN.GB2312/books/arch-handbook/scsi/chapter.xml2
-rw-r--r--zh_CN.GB2312/books/arch-handbook/smp/chapter.xml2
-rw-r--r--zh_CN.GB2312/books/arch-handbook/sound/chapter.xml2
-rw-r--r--zh_CN.GB2312/books/arch-handbook/sysinit/chapter.xml2
-rw-r--r--zh_CN.GB2312/books/arch-handbook/usb/chapter.xml2
-rw-r--r--zh_CN.GB2312/books/arch-handbook/vm/chapter.xml2
-rw-r--r--zh_CN.GB2312/books/handbook/Makefile29
-rw-r--r--zh_CN.GB2312/books/handbook/advanced-networking/chapter.xml8
-rw-r--r--zh_CN.GB2312/books/handbook/audit/chapter.xml4
-rw-r--r--zh_CN.GB2312/books/handbook/basics/chapter.xml2
-rw-r--r--zh_CN.GB2312/books/handbook/bibliography/chapter.xml4
-rw-r--r--zh_CN.GB2312/books/handbook/book.xml9
-rw-r--r--zh_CN.GB2312/books/handbook/boot/chapter.xml2
-rw-r--r--zh_CN.GB2312/books/handbook/bsdinstall/chapter.xml2
-rw-r--r--zh_CN.GB2312/books/handbook/chapters.ent183
-rw-r--r--zh_CN.GB2312/books/handbook/colophon.xml2
-rw-r--r--zh_CN.GB2312/books/handbook/config/chapter.xml4
-rw-r--r--zh_CN.GB2312/books/handbook/cutting-edge/chapter.xml70
-rw-r--r--zh_CN.GB2312/books/handbook/desktop/chapter.xml2
-rw-r--r--zh_CN.GB2312/books/handbook/disks/chapter.xml20
-rw-r--r--zh_CN.GB2312/books/handbook/dtrace/chapter.xml2
-rw-r--r--zh_CN.GB2312/books/handbook/eresources/chapter.xml7
-rw-r--r--zh_CN.GB2312/books/handbook/filesystems/chapter.xml4
-rw-r--r--zh_CN.GB2312/books/handbook/firewalls/chapter.xml2
-rw-r--r--zh_CN.GB2312/books/handbook/geom/chapter.xml2
-rw-r--r--zh_CN.GB2312/books/handbook/install/chapter.xml2
-rw-r--r--zh_CN.GB2312/books/handbook/introduction/chapter.xml2
-rw-r--r--zh_CN.GB2312/books/handbook/jails/chapter.xml2
-rw-r--r--zh_CN.GB2312/books/handbook/kernelconfig/chapter.xml2
-rw-r--r--zh_CN.GB2312/books/handbook/l10n/chapter.xml2
-rw-r--r--zh_CN.GB2312/books/handbook/linuxemu/chapter.xml10
-rw-r--r--zh_CN.GB2312/books/handbook/mac/chapter.xml6
-rw-r--r--zh_CN.GB2312/books/handbook/mail/chapter.xml8
-rw-r--r--zh_CN.GB2312/books/handbook/mirrors/chapter.xml11
-rw-r--r--zh_CN.GB2312/books/handbook/multimedia/chapter.xml2
-rw-r--r--zh_CN.GB2312/books/handbook/network-servers/chapter.xml2
-rw-r--r--zh_CN.GB2312/books/handbook/pgpkeys/chapter.xml2
-rw-r--r--zh_CN.GB2312/books/handbook/ports/chapter.xml2
-rw-r--r--zh_CN.GB2312/books/handbook/ppp-and-slip/chapter.xml2
-rw-r--r--zh_CN.GB2312/books/handbook/preface/preface.xml2
-rw-r--r--zh_CN.GB2312/books/handbook/printing/chapter.xml2
-rw-r--r--zh_CN.GB2312/books/handbook/security/chapter.xml2
-rw-r--r--zh_CN.GB2312/books/handbook/serialcomms/chapter.xml2
-rw-r--r--zh_CN.GB2312/books/handbook/users/chapter.xml2
-rw-r--r--zh_CN.GB2312/books/handbook/vinum/chapter.xml2
-rw-r--r--zh_CN.GB2312/books/handbook/virtualization/chapter.xml8
-rw-r--r--zh_CN.GB2312/books/handbook/x11/chapter.xml8
-rw-r--r--zh_CN.GB2312/books/porters-handbook/book.xml33
-rw-r--r--zh_CN.GB2312/share/xml/authors-in-author-tag.ent1
-rw-r--r--zh_CN.GB2312/share/xml/authors.ent1
-rw-r--r--zh_CN.GB2312/share/xml/catalog48
-rw-r--r--zh_CN.GB2312/share/xml/catalog.xml3
-rw-r--r--zh_CN.GB2312/share/xml/entities.ent36
-rw-r--r--zh_CN.GB2312/share/xml/mailing-lists.ent1
-rw-r--r--zh_CN.GB2312/share/xml/mirrors-local.xsl1
-rw-r--r--zh_CN.GB2312/share/xml/teams.ent1
-rw-r--r--zh_CN.GB2312/share/xml/trademarks.ent6
-rw-r--r--zh_TW.Big5/articles/contributing/article.xml10
-rw-r--r--zh_TW.Big5/articles/cvs-freebsd/article.xml9
-rw-r--r--zh_TW.Big5/articles/freebsd-questions/article.xml9
-rw-r--r--zh_TW.Big5/articles/hubs/article.xml10
-rw-r--r--zh_TW.Big5/articles/mailing-list-faq/article.xml9
-rw-r--r--zh_TW.Big5/articles/nanobsd/article.xml9
-rw-r--r--zh_TW.Big5/articles/pr-guidelines/article.xml8
-rw-r--r--zh_TW.Big5/articles/problem-reports/article.xml9
-rw-r--r--zh_TW.Big5/articles/remote-install/article.xml9
-rw-r--r--zh_TW.Big5/books/developers-handbook/book.xml8
-rw-r--r--zh_TW.Big5/books/developers-handbook/introduction/chapter.xml4
-rw-r--r--zh_TW.Big5/books/developers-handbook/ipv6/chapter.xml2
-rw-r--r--zh_TW.Big5/books/developers-handbook/kerneldebug/chapter.xml2
-rw-r--r--zh_TW.Big5/books/developers-handbook/l10n/chapter.xml2
-rw-r--r--zh_TW.Big5/books/developers-handbook/policies/chapter.xml2
-rw-r--r--zh_TW.Big5/books/developers-handbook/secure/chapter.xml2
-rw-r--r--zh_TW.Big5/books/developers-handbook/sockets/chapter.xml2
-rw-r--r--zh_TW.Big5/books/developers-handbook/testing/chapter.xml2
-rw-r--r--zh_TW.Big5/books/developers-handbook/tools/chapter.xml2
-rw-r--r--zh_TW.Big5/books/developers-handbook/x86/chapter.xml2
-rw-r--r--zh_TW.Big5/books/faq/book.xml14
-rw-r--r--zh_TW.Big5/books/fdp-primer/book.xml8
-rw-r--r--zh_TW.Big5/books/fdp-primer/doc-build/chapter.xml2
-rw-r--r--zh_TW.Big5/books/fdp-primer/examples/appendix.xml6
-rw-r--r--zh_TW.Big5/books/fdp-primer/overview/chapter.xml2
-rw-r--r--zh_TW.Big5/books/fdp-primer/psgml-mode/chapter.xml2
-rw-r--r--zh_TW.Big5/books/fdp-primer/see-also/chapter.xml2
-rw-r--r--zh_TW.Big5/books/fdp-primer/sgml-markup/chapter.xml102
-rw-r--r--zh_TW.Big5/books/fdp-primer/sgml-primer/chapter.xml64
-rw-r--r--zh_TW.Big5/books/fdp-primer/structure/chapter.xml4
-rw-r--r--zh_TW.Big5/books/fdp-primer/stylesheets/chapter.xml2
-rw-r--r--zh_TW.Big5/books/fdp-primer/the-website/chapter.xml2
-rw-r--r--zh_TW.Big5/books/fdp-primer/tools/chapter.xml2
-rw-r--r--zh_TW.Big5/books/fdp-primer/translations/chapter.xml2
-rw-r--r--zh_TW.Big5/books/fdp-primer/writing-style/chapter.xml14
-rw-r--r--zh_TW.Big5/books/handbook/Makefile29
-rw-r--r--zh_TW.Big5/books/handbook/advanced-networking/chapter.xml6
-rw-r--r--zh_TW.Big5/books/handbook/audit/chapter.xml2
-rw-r--r--zh_TW.Big5/books/handbook/basics/chapter.xml6
-rw-r--r--zh_TW.Big5/books/handbook/bibliography/chapter.xml2
-rw-r--r--zh_TW.Big5/books/handbook/book.xml8
-rw-r--r--zh_TW.Big5/books/handbook/boot/chapter.xml2
-rw-r--r--zh_TW.Big5/books/handbook/chapters.ent180
-rw-r--r--zh_TW.Big5/books/handbook/colophon.xml2
-rw-r--r--zh_TW.Big5/books/handbook/config/chapter.xml4
-rw-r--r--zh_TW.Big5/books/handbook/cutting-edge/chapter.xml2
-rw-r--r--zh_TW.Big5/books/handbook/desktop/chapter.xml2
-rw-r--r--zh_TW.Big5/books/handbook/disks/chapter.xml16
-rw-r--r--zh_TW.Big5/books/handbook/eresources/chapter.xml6
-rw-r--r--zh_TW.Big5/books/handbook/firewalls/chapter.xml2
-rw-r--r--zh_TW.Big5/books/handbook/geom/chapter.xml2
-rw-r--r--zh_TW.Big5/books/handbook/install/chapter.xml4
-rw-r--r--zh_TW.Big5/books/handbook/introduction/chapter.xml2
-rw-r--r--zh_TW.Big5/books/handbook/jails/chapter.xml2
-rw-r--r--zh_TW.Big5/books/handbook/kernelconfig/chapter.xml6
-rw-r--r--zh_TW.Big5/books/handbook/l10n/chapter.xml2
-rw-r--r--zh_TW.Big5/books/handbook/linuxemu/chapter.xml10
-rw-r--r--zh_TW.Big5/books/handbook/mac/chapter.xml8
-rw-r--r--zh_TW.Big5/books/handbook/mail/chapter.xml8
-rw-r--r--zh_TW.Big5/books/handbook/mirrors/chapter.xml10
-rw-r--r--zh_TW.Big5/books/handbook/multimedia/chapter.xml2
-rw-r--r--zh_TW.Big5/books/handbook/network-servers/chapter.xml2
-rw-r--r--zh_TW.Big5/books/handbook/pgpkeys/chapter.xml2
-rw-r--r--zh_TW.Big5/books/handbook/ports/chapter.xml2
-rw-r--r--zh_TW.Big5/books/handbook/ppp-and-slip/chapter.xml10
-rw-r--r--zh_TW.Big5/books/handbook/preface/preface.xml2
-rw-r--r--zh_TW.Big5/books/handbook/printing/chapter.xml2
-rw-r--r--zh_TW.Big5/books/handbook/security/chapter.xml4
-rw-r--r--zh_TW.Big5/books/handbook/serialcomms/chapter.xml2
-rw-r--r--zh_TW.Big5/books/handbook/users/chapter.xml2
-rw-r--r--zh_TW.Big5/books/handbook/vinum/chapter.xml2
-rw-r--r--zh_TW.Big5/books/handbook/virtualization/chapter.xml2
-rw-r--r--zh_TW.Big5/books/handbook/x11/chapter.xml4
-rw-r--r--zh_TW.Big5/books/porters-handbook/book.xml31
-rw-r--r--zh_TW.Big5/share/xml/authors.ent1
-rw-r--r--zh_TW.Big5/share/xml/catalog44
-rw-r--r--zh_TW.Big5/share/xml/catalog.xml3
-rw-r--r--zh_TW.Big5/share/xml/entities.ent36
-rw-r--r--zh_TW.Big5/share/xml/mailing-lists.ent1
-rw-r--r--zh_TW.Big5/share/xml/trademarks.ent1
-rw-r--r--zh_TW.Big5/share/xml/urls.ent37
1181 files changed, 4093 insertions, 8959 deletions
diff --git a/bn_BD.ISO10646-1/articles/explaining-bsd/article.xml b/bn_BD.ISO10646-1/articles/explaining-bsd/article.xml
index e8601ada9b..8d5d96470f 100644
--- a/bn_BD.ISO10646-1/articles/explaining-bsd/article.xml
+++ b/bn_BD.ISO10646-1/articles/explaining-bsd/article.xml
@@ -1,7 +1,5 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd">
-
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<!--
The FreeBSD Documentation Project
diff --git a/bn_BD.ISO10646-1/articles/new-users/article.xml b/bn_BD.ISO10646-1/articles/new-users/article.xml
index bae4188ed4..12bb2d7d4d 100644
--- a/bn_BD.ISO10646-1/articles/new-users/article.xml
+++ b/bn_BD.ISO10646-1/articles/new-users/article.xml
@@ -1,7 +1,5 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd">
-
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<!--
The FreeBSD Documentation Project
diff --git a/bn_BD.ISO10646-1/share/xml/catalog.xml b/bn_BD.ISO10646-1/share/xml/catalog.xml
new file mode 100644
index 0000000000..a3feec86ca
--- /dev/null
+++ b/bn_BD.ISO10646-1/share/xml/catalog.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0"?>
+<!DOCTYPE catalog PUBLIC "-//OASIS//DTD Entity Resolution XML Catalog V1.0//EN"
+ "http://www.oasis-open.org/committees/entity/release/1.0/catalog.dtd">
+
+<!-- $FreeBSD$ -->
+
+<catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog">
+ <rewriteSystem systemIdStartString="http://www.FreeBSD.org/XML/www/lang/"
+ rewritePrefix="../../"/>
+ <rewriteURI uriStartString="http://www.FreeBSD.org/XML/www/lang/"
+ rewritePrefix="../../"/>
+
+ <public
+ publicId="-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN"
+ uri="entities.ent" />
+</catalog>
diff --git a/bn_BD.ISO10646-1/share/xml/entities.ent b/bn_BD.ISO10646-1/share/xml/entities.ent
new file mode 100644
index 0000000000..3eb78e7529
--- /dev/null
+++ b/bn_BD.ISO10646-1/share/xml/entities.ent
@@ -0,0 +1 @@
+<!-- $FreeBSD$ -->
diff --git a/da_DK.ISO8859-1/articles/ipsec-must/article.xml b/da_DK.ISO8859-1/articles/ipsec-must/article.xml
index f0d54f350d..209cd67e46 100644
--- a/da_DK.ISO8859-1/articles/ipsec-must/article.xml
+++ b/da_DK.ISO8859-1/articles/ipsec-must/article.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//DA" "../../share/xml/entities.ent">
-%entities;
-]>
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<!--
The FreeBSD Documentation Project
diff --git a/da_DK.ISO8859-1/articles/pxe/article.xml b/da_DK.ISO8859-1/articles/pxe/article.xml
index 35658564ac..69c1a571b0 100644
--- a/da_DK.ISO8859-1/articles/pxe/article.xml
+++ b/da_DK.ISO8859-1/articles/pxe/article.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//DA" "../../share/xml/entities.ent">
-%entities;
-]>
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<!--
The FreeBSD Documentation Project
diff --git a/da_DK.ISO8859-1/share/xml/catalog b/da_DK.ISO8859-1/share/xml/catalog
deleted file mode 100644
index b44849dbf5..0000000000
--- a/da_DK.ISO8859-1/share/xml/catalog
+++ /dev/null
@@ -1,23 +0,0 @@
- -- ...................................................................... --
- -- FreeBSD SGML Public Identifiers ...................................... --
-
- -- $FreeBSD$
- --
-
-PUBLIC "-//FreeBSD//DOCUMENT DocBook Stylesheet//EN"
- "freebsd.dsl"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//DK"
- "mailing-lists.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook Language Specific Entities//EN"
- "l10n.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook Newsgroup Entities//DK"
- "newsgroups.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook Team Entities//DK"
- "teams.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook Translator Entities//DK"
- "translators.ent"
diff --git a/da_DK.ISO8859-1/share/xml/catalog.xml b/da_DK.ISO8859-1/share/xml/catalog.xml
new file mode 100644
index 0000000000..68a49c118f
--- /dev/null
+++ b/da_DK.ISO8859-1/share/xml/catalog.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0"?>
+<!DOCTYPE catalog PUBLIC "-//OASIS//DTD Entity Resolution XML Catalog V1.0//EN"
+ "http://www.oasis-open.org/committees/entity/release/1.0/catalog.dtd">
+
+<!-- $FreeBSD$ -->
+
+<catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog">
+ <rewriteSystem systemIdStartString="http://www.FreeBSD.org/XML/www/lang/"
+ rewritePrefix="../../"/>
+ <rewriteURI uriStartString="http://www.FreeBSD.org/XML/www/lang/"
+ rewritePrefix="../../"/>
+
+ <public publicId="-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN"
+ uri="entities.ent"/>
+ <public publicId="-//FreeBSD//ENTITIES DocBook Translator Entities//DK"
+ uri="translators.ent" />
+</catalog>
diff --git a/da_DK.ISO8859-1/share/xml/entities.ent b/da_DK.ISO8859-1/share/xml/entities.ent
index 2b612813a1..f59c2fe83c 100644
--- a/da_DK.ISO8859-1/share/xml/entities.ent
+++ b/da_DK.ISO8859-1/share/xml/entities.ent
@@ -1,21 +1,24 @@
<?xml version="1.0" encoding="iso-8859-1"?>
<!-- $FreeBSD$ -->
-<!ENTITY % authors PUBLIC "-//FreeBSD//ENTITIES DocBook Author Entities//EN">
-%authors;
-<!ENTITY % man PUBLIC "-//FreeBSD//ENTITIES DocBook Manual Page Entities//EN">
-%man;
-<!ENTITY % freebsd PUBLIC "-//FreeBSD//ENTITIES DocBook Miscellaneous FreeBSD Entities//EN">
+<!ENTITY % freebsd PUBLIC "-//FreeBSD//ENTITIES DocBook Miscellaneous FreeBSD Entities//EN"
+ "nonexistent">
%freebsd;
-<!ENTITY % translators PUBLIC "-//FreeBSD//ENTITIES DocBook Translator Entities//DK">
+<!ENTITY % translators PUBLIC "-//FreeBSD//ENTITIES DocBook Translator Entities//DK"
+ "translators.ent">
%translators;
-<!ENTITY % l10n PUBLIC "-//FreeBSD//ENTITIES DocBook Language Specific Entities//EN">
+<!ENTITY % l10n PUBLIC "-//FreeBSD//ENTITIES DocBook Language Specific Entities//EN"
+ "l10n.ent">
%l10n;
-<!ENTITY % mailing-lists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//DK">
+<!ENTITY % mailing-lists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//DK"
+ "mailing-lists.ent">
%mailing-lists;
-<!ENTITY % newsgroups PUBLIC "-//FreeBSD//ENTITIES DocBook Newsgroup Entities//DK">
+<!ENTITY % newsgroups PUBLIC "-//FreeBSD//ENTITIES DocBook Newsgroup Entities//DK"
+ "newsgroups.ent">
%newsgroups;
-<!ENTITY % teams PUBLIC "-//FreeBSD//ENTITIES DocBook Team Entities//DK">
+<!ENTITY % teams PUBLIC "-//FreeBSD//ENTITIES DocBook Team Entities//DK"
+ "teams.ent">
%teams;
-<!ENTITY % trademarks PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//EN">
+<!ENTITY % trademarks PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//EN"
+ "nonexistent">
%trademarks;
diff --git a/da_DK.ISO8859-1/share/xml/mailing-lists.ent b/da_DK.ISO8859-1/share/xml/mailing-lists.ent
index 080b91e29f..e6647db98c 100644
--- a/da_DK.ISO8859-1/share/xml/mailing-lists.ent
+++ b/da_DK.ISO8859-1/share/xml/mailing-lists.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
Navne p FreeBSD mailing lister og relateret software.
diff --git a/da_DK.ISO8859-1/share/xml/newsgroups.ent b/da_DK.ISO8859-1/share/xml/newsgroups.ent
index fe16bf2b42..85d53e443d 100644
--- a/da_DK.ISO8859-1/share/xml/newsgroups.ent
+++ b/da_DK.ISO8859-1/share/xml/newsgroups.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
Navne p FreeBSD nyhedsgrupper
diff --git a/da_DK.ISO8859-1/share/xml/teams.ent b/da_DK.ISO8859-1/share/xml/teams.ent
index 25a971a3b7..32179d0bbe 100644
--- a/da_DK.ISO8859-1/share/xml/teams.ent
+++ b/da_DK.ISO8859-1/share/xml/teams.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
Navne og email adresser p de teams af folk der arbejder
p specifikke opgaver. Normalt er de bare mail aliaser der
diff --git a/da_DK.ISO8859-1/share/xml/translators.ent b/da_DK.ISO8859-1/share/xml/translators.ent
index 58c5b91f99..df69892e8f 100644
--- a/da_DK.ISO8859-1/share/xml/translators.ent
+++ b/da_DK.ISO8859-1/share/xml/translators.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
The FreeBSD Dannish Documentation Project
diff --git a/de_DE.ISO8859-1/articles/contributing-ports/article.xml b/de_DE.ISO8859-1/articles/contributing-ports/article.xml
index 065f63199c..585df8c56a 100644
--- a/de_DE.ISO8859-1/articles/contributing-ports/article.xml
+++ b/de_DE.ISO8859-1/articles/contributing-ports/article.xml
@@ -1,10 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//DE" "../../share/xml/entities.ent">
-%entities;
-<!ENTITY % not.published "IGNORE">
-]>
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<!-- The FreeBSD Documentation Project
The FreeBSD German Documentation Project
diff --git a/de_DE.ISO8859-1/articles/contributing/article.xml b/de_DE.ISO8859-1/articles/contributing/article.xml
index d009d11d32..6993c696dd 100644
--- a/de_DE.ISO8859-1/articles/contributing/article.xml
+++ b/de_DE.ISO8859-1/articles/contributing/article.xml
@@ -1,10 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//DE" "../../share/xml/entities.ent">
-%entities;
-<!ENTITY % not.published "IGNORE">
-]>
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<!--
The FreeBSD Documentation Project
diff --git a/de_DE.ISO8859-1/articles/explaining-bsd/article.xml b/de_DE.ISO8859-1/articles/explaining-bsd/article.xml
index 9f35d43391..d383c634cf 100644
--- a/de_DE.ISO8859-1/articles/explaining-bsd/article.xml
+++ b/de_DE.ISO8859-1/articles/explaining-bsd/article.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//DE" "../../share/xml/entities.ent">
-%entities;
-]>
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<!-- The FreeBSD Documentation Project
The FreeBSD German Documentation Project
diff --git a/de_DE.ISO8859-1/articles/laptop/article.xml b/de_DE.ISO8859-1/articles/laptop/article.xml
index b3b638f0ba..8c8c2de164 100644
--- a/de_DE.ISO8859-1/articles/laptop/article.xml
+++ b/de_DE.ISO8859-1/articles/laptop/article.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//DE" "../../share/xml/entities.ent">
-%entities;
-]>
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<!-- The FreeBSD Documentation Project
The FreeBSD German Documentation Project
diff --git a/de_DE.ISO8859-1/articles/linux-comparison/article.xml b/de_DE.ISO8859-1/articles/linux-comparison/article.xml
index b462224939..0670e959bd 100644
--- a/de_DE.ISO8859-1/articles/linux-comparison/article.xml
+++ b/de_DE.ISO8859-1/articles/linux-comparison/article.xml
@@ -1,10 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//DE" "../../share/xml/entities.ent">
-%entities;
-<!ENTITY % not.published "IGNORE">
-]>
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<!--
Copyright (c) 2005 Dru Lavigne
diff --git a/de_DE.ISO8859-1/articles/new-users/article.xml b/de_DE.ISO8859-1/articles/new-users/article.xml
index b4ecabca51..8a3c9b1c93 100644
--- a/de_DE.ISO8859-1/articles/new-users/article.xml
+++ b/de_DE.ISO8859-1/articles/new-users/article.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//DE" "../../share/xml/entities.ent">
-%entities;
-]>
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<!-- The FreeBSD Documentation Project
The FreeBSD German Documentation Project
diff --git a/de_DE.ISO8859-1/articles/port-mentor-guidelines/article.xml b/de_DE.ISO8859-1/articles/port-mentor-guidelines/article.xml
index 9dabbdc4f2..275eccc463 100644
--- a/de_DE.ISO8859-1/articles/port-mentor-guidelines/article.xml
+++ b/de_DE.ISO8859-1/articles/port-mentor-guidelines/article.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN" "../../share/xml/entities.ent">
-%entities;
-]>
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<!-- The FreeBSD Documentation Project
The FreeBSD German Documentation Project
@@ -138,8 +135,8 @@
<para>Wir erwarten, dass Mentoren ihre Mentees die Lekt&uuml;re
des <ulink url="&url.books.porters-handbook;">Handbuch
f&uuml;r Ports Committer</ulink>, die <ulink
- url="&url.articles.pr-guidelines">PR-Richtlinien</ulink> sowie
- den <ulink url="&url.articles.committers-guide">Committer's
+ url="&url.articles.pr-guidelines;">PR-Richtlinien</ulink> sowie
+ den <ulink url="&url.articles.committers-guide;">Committer's
Guide</ulink> empfehlen. Obwohl es nicht notwendig ist, all
diese Details im Ged&auml;chtnis zu behalten, sollte jeder
Committer einen &Uuml;berblick &uuml;ber diese Dinge haben, um
diff --git a/de_DE.ISO8859-1/articles/solid-state/article.xml b/de_DE.ISO8859-1/articles/solid-state/article.xml
index 664b85e130..819b02ef07 100644
--- a/de_DE.ISO8859-1/articles/solid-state/article.xml
+++ b/de_DE.ISO8859-1/articles/solid-state/article.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//DE" "../../share/xml/entities.ent">
-%entities;
-]>
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<!-- Copyright (c) 2001 The FreeBSD Documentation Project
diff --git a/de_DE.ISO8859-1/books/developers-handbook/book.xml b/de_DE.ISO8859-1/books/developers-handbook/book.xml
index 2cffde0118..c3b492a770 100644
--- a/de_DE.ISO8859-1/books/developers-handbook/book.xml
+++ b/de_DE.ISO8859-1/books/developers-handbook/book.xml
@@ -1,8 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//DE" "../../share/xml/entities.ent">
-%entities;
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd" [
<!ENTITY % chapters SYSTEM "chapters.ent"> %chapters;
]>
diff --git a/de_DE.ISO8859-1/books/developers-handbook/introduction/chapter.xml b/de_DE.ISO8859-1/books/developers-handbook/introduction/chapter.xml
index dd7ef91614..44ccf7d1c4 100644
--- a/de_DE.ISO8859-1/books/developers-handbook/introduction/chapter.xml
+++ b/de_DE.ISO8859-1/books/developers-handbook/introduction/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
The FreeBSD German Documentation Project
@@ -116,7 +116,7 @@
</listitem>
</itemizedlist>
- <para>Aus Scheifler & Gettys: "X Window System"</para>
+ <para>Aus Scheifler &amp; Gettys: "X Window System"</para>
</sect1>
<sect1 id="introduction-layout">
diff --git a/de_DE.ISO8859-1/books/developers-handbook/ipv6/chapter.xml b/de_DE.ISO8859-1/books/developers-handbook/ipv6/chapter.xml
index d6fc6e55a1..b24a67e27a 100644
--- a/de_DE.ISO8859-1/books/developers-handbook/ipv6/chapter.xml
+++ b/de_DE.ISO8859-1/books/developers-handbook/ipv6/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
The FreeBSD German Documentation Project
diff --git a/de_DE.ISO8859-1/books/developers-handbook/kernelbuild/chapter.xml b/de_DE.ISO8859-1/books/developers-handbook/kernelbuild/chapter.xml
index 1aef995166..a6af8072e1 100644
--- a/de_DE.ISO8859-1/books/developers-handbook/kernelbuild/chapter.xml
+++ b/de_DE.ISO8859-1/books/developers-handbook/kernelbuild/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
The FreeBSD German Documentation Project
diff --git a/de_DE.ISO8859-1/books/developers-handbook/kerneldebug/chapter.xml b/de_DE.ISO8859-1/books/developers-handbook/kerneldebug/chapter.xml
index 4202d00db7..d74d1b70aa 100644
--- a/de_DE.ISO8859-1/books/developers-handbook/kerneldebug/chapter.xml
+++ b/de_DE.ISO8859-1/books/developers-handbook/kerneldebug/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
The FreeBSD German Documentation Project
diff --git a/de_DE.ISO8859-1/books/developers-handbook/l10n/chapter.xml b/de_DE.ISO8859-1/books/developers-handbook/l10n/chapter.xml
index 4974cee9ff..4cbb98738f 100644
--- a/de_DE.ISO8859-1/books/developers-handbook/l10n/chapter.xml
+++ b/de_DE.ISO8859-1/books/developers-handbook/l10n/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
The FreeBSD German Documentation Project
diff --git a/de_DE.ISO8859-1/books/developers-handbook/policies/chapter.xml b/de_DE.ISO8859-1/books/developers-handbook/policies/chapter.xml
index 07abb8ee37..cb736efd1d 100644
--- a/de_DE.ISO8859-1/books/developers-handbook/policies/chapter.xml
+++ b/de_DE.ISO8859-1/books/developers-handbook/policies/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
The FreeBSD German Documentation Project
diff --git a/de_DE.ISO8859-1/books/developers-handbook/secure/chapter.xml b/de_DE.ISO8859-1/books/developers-handbook/secure/chapter.xml
index 1d2db0a404..b136a71534 100644
--- a/de_DE.ISO8859-1/books/developers-handbook/secure/chapter.xml
+++ b/de_DE.ISO8859-1/books/developers-handbook/secure/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
The FreeBSD German Documentation Project
diff --git a/de_DE.ISO8859-1/books/developers-handbook/sockets/chapter.xml b/de_DE.ISO8859-1/books/developers-handbook/sockets/chapter.xml
index 86f9d1e35d..689f3477bf 100644
--- a/de_DE.ISO8859-1/books/developers-handbook/sockets/chapter.xml
+++ b/de_DE.ISO8859-1/books/developers-handbook/sockets/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
The FreeBSD German Documentation Project
diff --git a/de_DE.ISO8859-1/books/developers-handbook/testing/chapter.xml b/de_DE.ISO8859-1/books/developers-handbook/testing/chapter.xml
index 22984d8345..30fde27ed4 100644
--- a/de_DE.ISO8859-1/books/developers-handbook/testing/chapter.xml
+++ b/de_DE.ISO8859-1/books/developers-handbook/testing/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
The FreeBSD German Documentation Project
diff --git a/de_DE.ISO8859-1/books/developers-handbook/tools/chapter.xml b/de_DE.ISO8859-1/books/developers-handbook/tools/chapter.xml
index f70bf8d3c0..cf76487e17 100644
--- a/de_DE.ISO8859-1/books/developers-handbook/tools/chapter.xml
+++ b/de_DE.ISO8859-1/books/developers-handbook/tools/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
The FreeBSD German Documentation Project
diff --git a/de_DE.ISO8859-1/books/developers-handbook/x86/chapter.xml b/de_DE.ISO8859-1/books/developers-handbook/x86/chapter.xml
index ec6f4b3391..f9c2256efd 100644
--- a/de_DE.ISO8859-1/books/developers-handbook/x86/chapter.xml
+++ b/de_DE.ISO8859-1/books/developers-handbook/x86/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
The FreeBSD German Documentation Project
diff --git a/de_DE.ISO8859-1/books/faq/book.xml b/de_DE.ISO8859-1/books/faq/book.xml
index e5fa268010..8bdf375c17 100644
--- a/de_DE.ISO8859-1/books/faq/book.xml
+++ b/de_DE.ISO8859-1/books/faq/book.xml
@@ -1,8 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//DE" "../../share/xml/entities.ent">
-%entities;
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd" [
<!ENTITY bibliography SYSTEM "../../share/xml/bibliography.xml">
<!ENTITY rel.head "<emphasis>10-CURRENT</emphasis>">
<!ENTITY rel.head.relx "10.<replaceable>X</replaceable>">
@@ -6520,7 +6518,7 @@ perm /dev/acd0 0660</programlisting>
die Zeile dort.</para>
<para>Wenn Sie zum Beispiel den mitgelieferten DNS-Server
- &man.named.8 aktivieren wollen, mssen Sie lediglich
+ &man.named.8; aktivieren wollen, mssen Sie lediglich
das folgende Kommando eingeben:</para>
<screen>&prompt.root; <userinput>echo 'named_enable="YES"' &gt;&gt; /etc/rc.conf</userinput></screen>
@@ -10551,9 +10549,9 @@ ATDT1234567
genannten Befehl:</para>
<programlisting>
-sio0: <16550A-compatible COM port> port 0x3f8-0x3ff irq 4 flags 0x10 on acpi0
+sio0: &lt;16550A-compatible COM port&gt; port 0x3f8-0x3ff irq 4 flags 0x10 on acpi0
sio0: type 16550A
-sio1: <16550A-compatible COM port> port 0x2f8-0x2ff irq 3 on acpi0
+sio1: &lt;16550A-compatible COM port&gt; port 0x2f8-0x2ff irq 3 on acpi0
sio1: type 16550A</programlisting>
<para>Es zeigt zwei serielle Schnittstellen. Die erste
diff --git a/de_DE.ISO8859-1/books/fdp-primer/book.xml b/de_DE.ISO8859-1/books/fdp-primer/book.xml
index 26d5f41d5f..47117f0cfb 100644
--- a/de_DE.ISO8859-1/books/fdp-primer/book.xml
+++ b/de_DE.ISO8859-1/books/fdp-primer/book.xml
@@ -1,8 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//DE" "../../share/xml/entities.ent">
-%entities;
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd" [
<!ENTITY % chapters SYSTEM "chapters.ent">
%chapters;
]>
diff --git a/de_DE.ISO8859-1/books/fdp-primer/doc-build/chapter.xml b/de_DE.ISO8859-1/books/fdp-primer/doc-build/chapter.xml
index b2beceeb2d..0f59db4f4f 100644
--- a/de_DE.ISO8859-1/books/fdp-primer/doc-build/chapter.xml
+++ b/de_DE.ISO8859-1/books/fdp-primer/doc-build/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!-- Copyright (c) 1999 Neil Blakey-Milner, All rights reserved.
Redistribution and use in source (SGML DocBook) and 'compiled' forms
diff --git a/de_DE.ISO8859-1/books/fdp-primer/examples/appendix.xml b/de_DE.ISO8859-1/books/fdp-primer/examples/appendix.xml
index fe1ed0d5a9..958bdb08f5 100644
--- a/de_DE.ISO8859-1/books/fdp-primer/examples/appendix.xml
+++ b/de_DE.ISO8859-1/books/fdp-primer/examples/appendix.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!-- Copyright (c) 2000 Nik Clayton, All rights reserved.
Redistribution and use in source (SGML DocBook) and 'compiled' forms
diff --git a/de_DE.ISO8859-1/books/fdp-primer/overview/chapter.xml b/de_DE.ISO8859-1/books/fdp-primer/overview/chapter.xml
index c15db733fb..f19ff6aa9f 100644
--- a/de_DE.ISO8859-1/books/fdp-primer/overview/chapter.xml
+++ b/de_DE.ISO8859-1/books/fdp-primer/overview/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!-- Copyright (c) 1998, 1999 Nik Clayton, All rights reserved.
Redistribution and use in source (SGML DocBook) and 'compiled' forms
diff --git a/de_DE.ISO8859-1/books/fdp-primer/psgml-mode/chapter.xml b/de_DE.ISO8859-1/books/fdp-primer/psgml-mode/chapter.xml
index 8a23ee71c3..8170263207 100644
--- a/de_DE.ISO8859-1/books/fdp-primer/psgml-mode/chapter.xml
+++ b/de_DE.ISO8859-1/books/fdp-primer/psgml-mode/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!-- Copyright (c) 1998, 1999 Nik Clayton, All rights reserved.
Redistribution and use in source (SGML DocBook) and 'compiled' forms
diff --git a/de_DE.ISO8859-1/books/fdp-primer/see-also/chapter.xml b/de_DE.ISO8859-1/books/fdp-primer/see-also/chapter.xml
index 0102cc2b88..cf7bd22aa9 100644
--- a/de_DE.ISO8859-1/books/fdp-primer/see-also/chapter.xml
+++ b/de_DE.ISO8859-1/books/fdp-primer/see-also/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!-- Copyright (c) 1998, 1999 Nik Clayton, All rights reserved.
Redistribution and use in source (SGML DocBook) and 'compiled' forms
diff --git a/de_DE.ISO8859-1/books/fdp-primer/sgml-markup/chapter.xml b/de_DE.ISO8859-1/books/fdp-primer/sgml-markup/chapter.xml
index b0d679b62f..b5237ecd27 100644
--- a/de_DE.ISO8859-1/books/fdp-primer/sgml-markup/chapter.xml
+++ b/de_DE.ISO8859-1/books/fdp-primer/sgml-markup/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!-- Copyright (c) 1998, 1999 Nik Clayton, All rights reserved.
Redistribution and use in source (SGML DocBook) and 'compiled' forms
diff --git a/de_DE.ISO8859-1/books/fdp-primer/sgml-primer/chapter.xml b/de_DE.ISO8859-1/books/fdp-primer/sgml-primer/chapter.xml
index eb55ee8886..b46813fd41 100644
--- a/de_DE.ISO8859-1/books/fdp-primer/sgml-primer/chapter.xml
+++ b/de_DE.ISO8859-1/books/fdp-primer/sgml-primer/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!-- Copyright (c) 1998, 1999 Nik Clayton, All rights reserved.
Redistribution and use in source (SGML DocBook) and 'compiled' forms
@@ -1070,28 +1070,6 @@ onsgmls:beispiel.xml:6:8:E: end tag for "HEAD" which is not finished</screen>
-- mehrzeilige Kommentare. -->]]></programlisting>
</example>
- <!--? Noch zu uebersetzen. Oliver Fischer -->
- <![%output.print;[
- <important>
- <title>Es sind zwei Bindestriche</title>
-
- <para>Es gibt ein Problem mit den PostScript- oder
- PDF-Versionen dieses Dokuments. Das obige Beispiel
- zeigt vielleicht nur einen Bindestrich (<literal>-</literal>)
- hinter <literal>&lt;!</literal> und vor
- <literal>&gt;</literal>.</para>
-
- <para>Es <emphasis>mssen</emphasis> zwei Bindestriche
- und <emphasis>nicht</emphasis> nur einer benutzt werden.
- Die PostScript- und PDF-Versionen haben vielleicht
- beide Bindestriche zu einem l鄚geren Strich, dem
- <emphasis>em-dash</emphasis>, zusammengefasst.</para>
-
- <para>Die HTML-, nur-Text und RTF-Versionen dieses Dokuments
- sind nicht von diesem Problem betroffen.</para>
- </important>
- ]]>
-
<para>Hat man frher schon Erfahrungen mit HTML gesammelt,
wird man vielleicht andere Regeln fr den Gebrauch von
Kommentaren kennengelernt haben. Beispielsweise wird oft
diff --git a/de_DE.ISO8859-1/books/fdp-primer/structure/chapter.xml b/de_DE.ISO8859-1/books/fdp-primer/structure/chapter.xml
index 0883d4184a..39c7607cf4 100644
--- a/de_DE.ISO8859-1/books/fdp-primer/structure/chapter.xml
+++ b/de_DE.ISO8859-1/books/fdp-primer/structure/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!-- Copyright (c) 1998, 1999 Nik Clayton, All rights reserved.
Redistribution and use in source (SGML DocBook) and 'compiled' forms
@@ -255,7 +255,7 @@
<para>Enth鄟t eine Kapiteldatei beispielsweise die
Eintr輍e</para>
- <programlisting><![ CDATA [
+ <programlisting><![CDATA[
<chapter id="kernelconfig">
...
</chapter>]]></programlisting>
diff --git a/de_DE.ISO8859-1/books/fdp-primer/stylesheets/chapter.xml b/de_DE.ISO8859-1/books/fdp-primer/stylesheets/chapter.xml
index 7ca7f746db..c578236df5 100644
--- a/de_DE.ISO8859-1/books/fdp-primer/stylesheets/chapter.xml
+++ b/de_DE.ISO8859-1/books/fdp-primer/stylesheets/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!-- Copyright (c) 1998, 1999 Nik Clayton, All rights reserved.
Redistribution and use in source (SGML DocBook) and 'compiled' forms
diff --git a/de_DE.ISO8859-1/books/fdp-primer/the-website/chapter.xml b/de_DE.ISO8859-1/books/fdp-primer/the-website/chapter.xml
index ee9914899f..76f757a07f 100644
--- a/de_DE.ISO8859-1/books/fdp-primer/the-website/chapter.xml
+++ b/de_DE.ISO8859-1/books/fdp-primer/the-website/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!-- Copyright (c) 1998, 1999 Nik Clayton, All rights reserved.
Redistribution and use in source (SGML DocBook) and 'compiled' forms
diff --git a/de_DE.ISO8859-1/books/fdp-primer/tools/chapter.xml b/de_DE.ISO8859-1/books/fdp-primer/tools/chapter.xml
index de12b43396..bcdcbd7d7e 100644
--- a/de_DE.ISO8859-1/books/fdp-primer/tools/chapter.xml
+++ b/de_DE.ISO8859-1/books/fdp-primer/tools/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!-- Copyright (c) 1998, 1999 Nik Clayton, All rights reserved.
Redistribution and use in source (SGML DocBook) and 'compiled' forms
diff --git a/de_DE.ISO8859-1/books/fdp-primer/translations/chapter.xml b/de_DE.ISO8859-1/books/fdp-primer/translations/chapter.xml
index 17124f9772..ed36ca7129 100644
--- a/de_DE.ISO8859-1/books/fdp-primer/translations/chapter.xml
+++ b/de_DE.ISO8859-1/books/fdp-primer/translations/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!-- Copyright (c) 1999 Nik Clayton, All rights reserved.
Redistribution and use in source (SGML DocBook) and 'compiled' forms
diff --git a/de_DE.ISO8859-1/books/fdp-primer/writing-style/chapter.xml b/de_DE.ISO8859-1/books/fdp-primer/writing-style/chapter.xml
index 0ce0f90354..7739ae90bd 100644
--- a/de_DE.ISO8859-1/books/fdp-primer/writing-style/chapter.xml
+++ b/de_DE.ISO8859-1/books/fdp-primer/writing-style/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!-- Copyright (c) 1998 Nik Clayton, All rights reserved.
Redistribution and use in source (SGML DocBook) and 'compiled' forms
diff --git a/de_DE.ISO8859-1/books/handbook/Makefile b/de_DE.ISO8859-1/books/handbook/Makefile
index 8d10125d59..5787f7d20e 100644
--- a/de_DE.ISO8859-1/books/handbook/Makefile
+++ b/de_DE.ISO8859-1/books/handbook/Makefile
@@ -287,29 +287,43 @@ DOC_PREFIX?= ${.CURDIR}/../../..
#
# rules generating lists of mirror site from XML database.
#
-XMLDOCS= mirrors-ftp:::mirrors.xml.ftp.inc \
+XMLDOCS= lastmod:::mirrors.lastmod.inc \
+ mirrors-ftp-index:::mirrors.xml.ftp.index.inc \
+ mirrors-ftp:::mirrors.xml.ftp.inc \
+ mirrors-cvsup-index:::mirrors.xml.cvsup.index.inc \
mirrors-cvsup:::mirrors.xml.cvsup.inc \
+ eresources-index:::eresources.xml.www.index.inc \
eresources:::eresources.xml.www.inc
DEPENDSET.DEFAULT= transtable mirror
XSLT.DEFAULT= ${XSL_MIRRORS}
XML.DEFAULT= ${XML_MIRRORS}
-NO_TIDY.DEFAULT= yes
+PARAMS.lastmod+= --param 'target' "'lastmod'"
+PARAMS.mirrors-ftp-index+= --param 'type' "'ftp'" \
+ --param 'proto' "'ftp'" \
+ --param 'target' "'index'"
PARAMS.mirrors-ftp+= --param 'type' "'ftp'" \
--param 'proto' "'ftp'" \
--param 'target' "'handbook/mirrors/chapter.xml'"
+PARAMS.mirrors-cvsup-index+= --param 'type' "'cvsup'" \
+ --param 'proto' "'cvsup'" \
+ --param 'target' "'index'"
PARAMS.mirrors-cvsup+= --param 'type' "'cvsup'" \
--param 'proto' "'cvsup'" \
--param 'target' "'handbook/mirrors/chapter.xml'"
+PARAMS.eresources-index+= --param 'type' "'www'" \
+ --param 'proto' "'http'" \
+ --param 'target' "'index'"
PARAMS.eresources+= --param 'type' "'www'" \
--param 'proto' "'http'" \
--param 'target' "'handbook/eresources/chapter.xml'"
-SRCS+= mirrors.xml.ftp.inc \
+SRCS+= mirrors.lastmod.inc \
+ mirrors.xml.ftp.inc \
+ mirrors.xml.ftp.index.inc \
mirrors.xml.cvsup.inc \
- eresources.xml.www.inc
-CLEANFILES+= mirrors.xml.ftp.inc \
- mirrors.xml.cvsup.inc \
- eresources.xml.www.inc
+ mirrors.xml.cvsup.index.inc \
+ eresources.xml.www.inc \
+ eresources.xml.www.index.inc
.include "${DOC_PREFIX}/share/mk/doc.project.mk"
diff --git a/de_DE.ISO8859-1/books/handbook/advanced-networking/chapter.xml b/de_DE.ISO8859-1/books/handbook/advanced-networking/chapter.xml
index a673e9f97b..95c92266d1 100644
--- a/de_DE.ISO8859-1/books/handbook/advanced-networking/chapter.xml
+++ b/de_DE.ISO8859-1/books/handbook/advanced-networking/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
The FreeBSD German Documentation Project
@@ -6636,7 +6636,7 @@ ifconfig_carp1="vhid 2 advskew 100 pass testpass 192.168.1.51/24"</programlistin
<hostid>provider.example.org</hostid> den folgenden
Befehl ein:</para>
- <screen>&prompt.root; <userinput>ifconfig carp0 down && ifconfig carp0 up</userinput></screen>
+ <screen>&prompt.root; <userinput>ifconfig carp0 down &amp;&amp; ifconfig carp0 up</userinput></screen>
<para>Dieser Befehl muss auf das
<devicename>carp</devicename>-Ger酹 ausgefhrt
diff --git a/de_DE.ISO8859-1/books/handbook/audit/chapter.xml b/de_DE.ISO8859-1/books/handbook/audit/chapter.xml
index b5aac5a9e5..e0512ed6da 100644
--- a/de_DE.ISO8859-1/books/handbook/audit/chapter.xml
+++ b/de_DE.ISO8859-1/books/handbook/audit/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
The FreeBSD German Documentation Project
diff --git a/de_DE.ISO8859-1/books/handbook/basics/chapter.xml b/de_DE.ISO8859-1/books/handbook/basics/chapter.xml
index afde1bfbd5..5bca0654f8 100644
--- a/de_DE.ISO8859-1/books/handbook/basics/chapter.xml
+++ b/de_DE.ISO8859-1/books/handbook/basics/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
The FreeBSD German Documentation Project
diff --git a/de_DE.ISO8859-1/books/handbook/bibliography/chapter.xml b/de_DE.ISO8859-1/books/handbook/bibliography/chapter.xml
index aadbd720d3..bfa1d01f8c 100644
--- a/de_DE.ISO8859-1/books/handbook/bibliography/chapter.xml
+++ b/de_DE.ISO8859-1/books/handbook/bibliography/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
The FreeBSD German Documentation Project
diff --git a/de_DE.ISO8859-1/books/handbook/book.xml b/de_DE.ISO8859-1/books/handbook/book.xml
index ff0c917717..de58618ee9 100644
--- a/de_DE.ISO8859-1/books/handbook/book.xml
+++ b/de_DE.ISO8859-1/books/handbook/book.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//DE" "../../share/xml/entities.ent">
-%entities;
-
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd" [
<!ENTITY % chapters SYSTEM "chapters.ent"> %chapters;
<!ENTITY % txtfiles SYSTEM "txtfiles.ent"> %txtfiles;
]>
diff --git a/de_DE.ISO8859-1/books/handbook/boot/chapter.xml b/de_DE.ISO8859-1/books/handbook/boot/chapter.xml
index a6bb602c7b..91931165cd 100644
--- a/de_DE.ISO8859-1/books/handbook/boot/chapter.xml
+++ b/de_DE.ISO8859-1/books/handbook/boot/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
The FreeBSD German Documentation Project
diff --git a/de_DE.ISO8859-1/books/handbook/bsdinstall/chapter.xml b/de_DE.ISO8859-1/books/handbook/bsdinstall/chapter.xml
index 652296a845..b6f0d268bc 100644
--- a/de_DE.ISO8859-1/books/handbook/bsdinstall/chapter.xml
+++ b/de_DE.ISO8859-1/books/handbook/bsdinstall/chapter.xml
@@ -154,7 +154,7 @@
<para>Es gibt zwei Klassen von Prozessoren, die in der Lage sind,
auf &os;/&arch.amd64; zu laufen. Die erste Klasse sind
AMD64-Prozessoren, was sowohl &amd.athlon;64,
- &amd.athlon;64-FX, &amd.opteron oder bessere Prozessoren
+ &amd.athlon;64-FX, &amd.opteron; oder bessere Prozessoren
beinhaltet.</para>
<para>Die zweite Klasse von Prozessoren, die &os;/&arch.amd64;
diff --git a/de_DE.ISO8859-1/books/handbook/chapters.ent b/de_DE.ISO8859-1/books/handbook/chapters.ent
index b9a3d52402..f8bb7e300f 100644
--- a/de_DE.ISO8859-1/books/handbook/chapters.ent
+++ b/de_DE.ISO8859-1/books/handbook/chapters.ent
@@ -15,234 +15,63 @@
<!ENTITY % not.published "INCLUDE">
-<!ENTITY % chap.introduction "IGNORE">
-<!ENTITY % chap.install "IGNORE">
-<!ENTITY % chap.bsdinstall "IGNORE">
-<!ENTITY % chap.basics "IGNORE">
-<!ENTITY % chap.ports "IGNORE">
-<!ENTITY % chap.config "IGNORE">
-<!ENTITY % chap.boot "IGNORE">
-<!ENTITY % chap.users "IGNORE">
-<!ENTITY % chap.kernelconfig "IGNORE">
-<!ENTITY % chap.security "IGNORE">
-<!ENTITY % chap.jails "IGNORE">
-<!ENTITY % chap.mac "IGNORE">
-<!ENTITY % chap.audit "IGNORE">
-<!ENTITY % chap.printing "IGNORE">
-<!ENTITY % chap.disks "IGNORE">
-<!ENTITY % chap.geom "IGNORE">
-<!ENTITY % chap.vinum "IGNORE">
-<!ENTITY % chap.x11 "IGNORE">
-<!ENTITY % chap.l10n "IGNORE">
-<!ENTITY % chap.multimedia "IGNORE">
-<!ENTITY % chap.desktop "IGNORE">
-<!ENTITY % chap.serialcomms "IGNORE">
-<!ENTITY % chap.ppp-and-slip "IGNORE">
-<!ENTITY % chap.network-servers "IGNORE">
-<!ENTITY % chap.firewalls "IGNORE">
-<!ENTITY % chap.advanced-networking "IGNORE">
-<!ENTITY % chap.mail "IGNORE">
-<!ENTITY % chap.cutting-edge "IGNORE">
-<!ENTITY % chap.linuxemu "IGNORE">
-<!ENTITY % chap.mirrors "IGNORE">
-<!ENTITY % chap.mirrors.ftp.inc "INCLUDE">
-<!ENTITY % chap.mirrors.cvsup.inc "INCLUDE">
-<!ENTITY % chap.bibliography "IGNORE">
-<!ENTITY % chap.eresources "IGNORE">
-<!ENTITY % chap.eresources.www.inc "INCLUDE">
-<!ENTITY % chap.pgpkeys "IGNORE">
-<!ENTITY % chap.index "IGNORE">
-<!ENTITY % chap.freebsd-glossary "IGNORE">
-<!ENTITY % chap.filesystems "IGNORE">
-<!ENTITY % chap.dtrace "IGNORE">
-<!ENTITY % chap.colophon "IGNORE">
-
<!ENTITY chap.preface SYSTEM "preface/preface.xml">
<!ENTITY % pgpkeys SYSTEM "../../../share/pgpkeys/pgpkeys.ent"> %pgpkeys;
<!-- Teil Eins -->
-<![%chap.introduction;[
<!ENTITY chap.introduction SYSTEM "introduction/chapter.xml">
-]]>
-<![%chap.install;[
<!ENTITY chap.install SYSTEM "install/chapter.xml">
-]]>
-<![%chap.bsdinstall;[
<!ENTITY chap.bsdinstall SYSTEM "bsdinstall/chapter.xml">
-]]>
-<![%chap.basics;[
<!ENTITY chap.basics SYSTEM "basics/chapter.xml">
-]]>
-<![%chap.ports;[
<!ENTITY chap.ports SYSTEM "ports/chapter.xml">
-]]>
-<![%chap.x11;[
<!ENTITY chap.x11 SYSTEM "x11/chapter.xml">
-]]>
<!-- Teil Zwei -->
-<![%chap.desktop;[
<!ENTITY chap.desktop SYSTEM "desktop/chapter.xml">
-]]>
-<![%chap.multimedia;[
<!ENTITY chap.multimedia SYSTEM "multimedia/chapter.xml">
-]]>
-<![%chap.kernelconfig;[
<!ENTITY chap.kernelconfig SYSTEM "kernelconfig/chapter.xml">
-]]>
-<![%chap.printing;[
<!ENTITY chap.printing SYSTEM "printing/chapter.xml">
-]]>
-<![%chap.linuxemu;[
<!ENTITY chap.linuxemu SYSTEM "linuxemu/chapter.xml">
-]]>
<!-- Teil Drei -->
-<![%chap.config;[
<!ENTITY chap.config SYSTEM "config/chapter.xml">
-]]>
-<![%chap.boot;[
<!ENTITY chap.boot SYSTEM "boot/chapter.xml">
-]]>
-<![%chap.users;[
<!ENTITY chap.users SYSTEM "users/chapter.xml">
-]]>
-<![%chap.security;[
<!ENTITY chap.security SYSTEM "security/chapter.xml">
-]]>
-<![%chap.jails;[
<!ENTITY chap.jails SYSTEM "jails/chapter.xml">
-]]>
-<![%chap.mac;[
<!ENTITY chap.mac SYSTEM "mac/chapter.xml">
-]]>
-<![%chap.audit;[
<!ENTITY chap.audit SYSTEM "audit/chapter.xml">
-]]>
-<![%chap.disks;[
<!ENTITY chap.disks SYSTEM "disks/chapter.xml">
-]]>
-<![%chap.geom;[
<!ENTITY chap.geom SYSTEM "geom/chapter.xml">
-]]>
-<![%chap.filesystems;[
<!ENTITY chap.filesystems SYSTEM "filesystems/chapter.xml">
-]]>
-<![%chap.vinum;[
<!ENTITY chap.vinum SYSTEM "vinum/chapter.xml">
-]]>
-<![%chap.virtualization;[
<!ENTITY chap.virtualization SYSTEM "virtualization/chapter.xml">
-]]>
-<![%chap.l10n;[
<!ENTITY chap.l10n SYSTEM "l10n/chapter.xml">
-]]>
-<![%chap.cutting-edge;[
<!ENTITY chap.cutting-edge SYSTEM "cutting-edge/chapter.xml">
-]]>
-<![%chap.dtrace;[
<!ENTITY chap.dtrace SYSTEM "dtrace/chapter.xml">
-]]>
<!-- Teil Vier -->
-<![%chap.serialcomms;[
<!ENTITY chap.serialcomms SYSTEM "serialcomms/chapter.xml">
-]]>
-<![%chap.ppp-and-slip;[
<!ENTITY chap.ppp-and-slip SYSTEM "ppp-and-slip/chapter.xml">
-]]>
-<![%chap.mail;[
<!ENTITY chap.mail SYSTEM "mail/chapter.xml">
-]]>
-<![%chap.network-servers;[
<!ENTITY chap.network-servers SYSTEM "network-servers/chapter.xml">
-]]>
-<![%chap.firewalls;[
<!ENTITY chap.firewalls SYSTEM "firewalls/chapter.xml">
-]]>
-<![%chap.advanced-networking;[
<!ENTITY chap.advanced-networking SYSTEM "advanced-networking/chapter.xml">
-]]>
<!-- Teil Fuenf (Anhang) -->
-<![%chap.mirrors;[
<!ENTITY chap.mirrors SYSTEM "mirrors/chapter.xml">
-]]>
-<![%chap.mirrors.ftp.inc;[
<!ENTITY chap.mirrors.ftp.inc SYSTEM "mirrors.xml.ftp.inc">
-]]>
-<![%chap.mirrors.cvsup.inc;[
<!ENTITY chap.mirrors.cvsup.inc SYSTEM "mirrors.xml.cvsup.inc">
-]]>
-<![%chap.bibliography;[
<!ENTITY chap.bibliography SYSTEM "bibliography/chapter.xml">
-]]>
-<![%chap.eresources;[
<!ENTITY chap.eresources SYSTEM "eresources/chapter.xml">
-]]>
-<![%chap.eresources.www.inc;[
<!ENTITY chap.eresources.www.inc SYSTEM "eresources.xml.www.inc">
-]]>
-<![%chap.pgpkeys;[
<!ENTITY chap.pgpkeys SYSTEM "pgpkeys/chapter.xml">
-]]>
-<![%chap.freebsd-glossary;[
<!ENTITY chap.freebsd-glossary "&freebsd-glossary;">
-]]>
-<![%chap.index;[
- <!ENTITY chap.index SYSTEM "index.xml">
-]]>
-
-<!ENTITY chap.colophon SYSTEM "colophon.xml">
-
-<!-- IGNORE cases -->
+ <!ENTITY chap.index "">
-<!-- Teil Eins -->
-<!ENTITY chap.introduction "">
-<!ENTITY chap.install "">
-<!ENTITY chap.basics "">
-<!ENTITY chap.ports "">
-<!ENTITY chap.x11 "">
-
-<!-- Teil Zwei -->
-<!ENTITY chap.desktop "">
-<!ENTITY chap.multimedia "">
-<!ENTITY chap.kernelconfig "">
-<!ENTITY chap.printing "">
-<!ENTITY chap.linuxemu "">
+<!ENTITY chap.mirrors.lastmod.inc SYSTEM "mirrors.lastmod.inc">
+<!ENTITY chap.mirrors.ftp.index.inc SYSTEM "mirrors.xml.ftp.index.inc">
+<!ENTITY chap.mirrors.cvsup.index.inc SYSTEM "mirrors.xml.cvsup.index.inc">
+<!ENTITY chap.eresources.www.index.inc SYSTEM "eresources.xml.www.index.inc">
-<!-- Teil Drei -->
-<!ENTITY chap.config "">
-<!ENTITY chap.boot "">
-<!ENTITY chap.users "">
-<!ENTITY chap.security "">
-<!ENTITY chap.jails "">
-<!ENTITY chap.mac "">
-<!ENTITY chap.audit "">
-<!ENTITY chap.disks "">
-<!ENTITY chap.geom "">
-<!ENTITY chap.filesystems "">
-<!ENTITY chap.vinum "">
-<!ENTITY chap.virtualization "">
-<!ENTITY chap.l10n "">
-<!ENTITY chap.cutting-edge "">
-<!ENTITY chap.dtrace "">
-
-<!-- Teil Vier -->
-<!ENTITY chap.serialcomms "">
-<!ENTITY chap.ppp-and-slip "">
-<!ENTITY chap.mail "">
-<!ENTITY chap.network-servers "">
-<!ENTITY chap.firewalls "">
-<!ENTITY chap.advanced-networking "">
-
-<!-- Teil Fuenf (Anhang) -->
-<!ENTITY chap.mirrors "">
-<!ENTITY chap.mirrors.ftp.inc "">
-<!ENTITY chap.mirrors.cvsup.inc "">
-<!ENTITY chap.bibliography "">
-<!ENTITY chap.eresources "">
-<!ENTITY chap.eresources.www.inc "">
-<!ENTITY chap.pgpkeys "">
-<!ENTITY chap.freebsd-glossary "">
-<!ENTITY chap.index "">
+<!ENTITY chap.colophon SYSTEM "colophon.xml">
diff --git a/de_DE.ISO8859-1/books/handbook/colophon.xml b/de_DE.ISO8859-1/books/handbook/colophon.xml
index be6a7ac978..9f3a254fdd 100644
--- a/de_DE.ISO8859-1/books/handbook/colophon.xml
+++ b/de_DE.ISO8859-1/books/handbook/colophon.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
diff --git a/de_DE.ISO8859-1/books/handbook/config/chapter.xml b/de_DE.ISO8859-1/books/handbook/config/chapter.xml
index 8d32c66931..db5f293476 100644
--- a/de_DE.ISO8859-1/books/handbook/config/chapter.xml
+++ b/de_DE.ISO8859-1/books/handbook/config/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
The FreeBSD German Documentation Project
@@ -829,7 +829,7 @@ sshd is running as pid 433.</screen>
Manualpages zu &man.rc.8; sowie &man.rc.subr.8;. Wenn Sie
Ihre eigenen <filename>rc.d</filename>-Skripte schreiben
wollen, sollten Sie den Artikel
- <ulink url="&url.articles.rc-scripting.en">Practical rc.d
+ <ulink url="&url.articles.rc-scripting.en;">Practical rc.d
scripting in BSD</ulink> lesen.</para>
</sect1>
diff --git a/de_DE.ISO8859-1/books/handbook/cutting-edge/chapter.xml b/de_DE.ISO8859-1/books/handbook/cutting-edge/chapter.xml
index d94d98139f..bbf3918646 100644
--- a/de_DE.ISO8859-1/books/handbook/cutting-edge/chapter.xml
+++ b/de_DE.ISO8859-1/books/handbook/cutting-edge/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
The FreeBSD German Documentation Project
@@ -1158,7 +1158,7 @@ DOCSUPFILE?= /usr/share/examples/cvsup/doc-supfile</programlisting>
<listitem>
<para>Schliesslich gibt es noch einen sogenannten <quote>slave
- port</quote> f&&uml;r jede 鈁ersetzung, z.B.: <filename
+ port</quote> fr jede 鈁ersetzung, z.B.: <filename
role="package">misc/freebsd-doc-hu</filename> fr
Dokumentation in ungarischer Sprache. All diese ben飆igen
den Master-Port und installieren die bersetzte
@@ -1300,8 +1300,8 @@ DOCSUPFILE?= /usr/share/examples/cvsup/doc-supfile</programlisting>
</sect3>
</sect2>
-<!-- FIXME: Waiting for a working docsnap server... -->
-<![ IGNORE [
+<!-- FIXME: Waiting for a working docsnap server...
+
<sect2 id="docsnap">
<sect2info>
<authorgroup>
@@ -1358,14 +1358,14 @@ DOCSUPFILE?= /usr/share/examples/cvsup/doc-supfile</programlisting>
above.</para>
</note>
- <para>Do not use the <option>--delete</option> flag here as there
+ <para>Do not use the <option>&dash;&dash;delete</option> flag here as there
are some items installed
into <filename class="directory">/usr/share/doc</filename>
during <command>make installworld</command>, which would
accidentally be removed. To clean up, use this command
instead:</para>
- <screen>&prompt.root; <userinput>rsync -rltvz --delete <replaceable>docsnap.sk.FreeBSD.org</replaceable>::docsnap/??_??\.\* <replaceable>/usr/share/doc</replaceable></userinput></screen>
+ <screen>&prompt.root; <userinput>rsync -rltvz &dash;&dash;delete <replaceable>docsnap.sk.FreeBSD.org</replaceable>::docsnap/??_??\.\* <replaceable>/usr/share/doc</replaceable></userinput></screen>
<para>If a subset of documentation needs to be updated, for
example, the English documentation only, the following command
@@ -1373,7 +1373,7 @@ DOCSUPFILE?= /usr/share/examples/cvsup/doc-supfile</programlisting>
<screen>&prompt.root; <userinput>rsync -rltvz <replaceable>docsnap.sk.FreeBSD.org</replaceable>::docsnap/en_US.ISO8859-1 <replaceable>/usr/share/doc</replaceable></userinput></screen>
</sect2>
-]]>
+-->
</sect1>
<sect1 id="current-stable">
diff --git a/de_DE.ISO8859-1/books/handbook/desktop/chapter.xml b/de_DE.ISO8859-1/books/handbook/desktop/chapter.xml
index 8d09183488..96015c2912 100644
--- a/de_DE.ISO8859-1/books/handbook/desktop/chapter.xml
+++ b/de_DE.ISO8859-1/books/handbook/desktop/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
The FreeBSD German Documentation Project
diff --git a/de_DE.ISO8859-1/books/handbook/disks/chapter.xml b/de_DE.ISO8859-1/books/handbook/disks/chapter.xml
index af06f36a2d..eadbfe69ee 100644
--- a/de_DE.ISO8859-1/books/handbook/disks/chapter.xml
+++ b/de_DE.ISO8859-1/books/handbook/disks/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
The FreeBSD German Documentation Project
@@ -3112,18 +3112,6 @@ cd0: Attempt to query device size failed: NOT READY, Medium not present - tray c
dranh鄚gen, kann Ihnen sp酹er ein weiteres Missgeschick
ersparen.</para>
</sect3>
-
-<![%not.published;[
-
- <sect3>
- <title>* Ich habe mich nicht auf Missgeschicke vorbereitet - was
- nun?</title>
-
- <para></para>
- </sect3>
-
-]]>
-
</sect2>
</sect1>
@@ -5014,7 +5002,7 @@ case "$1" in
# Wait for any "hastd secondary" processes to stop
for disk in ${resources}; do
- while $( pgrep -lf "hastd: ${disk} \(secondary\)" > /dev/null 2>&1 ); do
+ while $( pgrep -lf "hastd: ${disk} \(secondary\)" > /dev/null 2&gt;&amp;1 ); do
sleep 1
done
@@ -5029,7 +5017,7 @@ case "$1" in
# Wait for the /dev/hast/* devices to appear
for disk in ${resources}; do
for I in $( jot 60 ); do
- [ -c "/dev/hast/${disk}" ] && break
+ [ -c "/dev/hast/${disk}" ] &amp;&amp; break
sleep 0.5
done
@@ -5062,7 +5050,7 @@ case "$1" in
umount -f /hast/${disk}
fi
sleep $delay
- hastctl role secondary ${disk} 2>&1
+ hastctl role secondary ${disk} 2&gt;&amp;1
if [ $? -ne 0 ]; then
logger -p $log -t $name "Unable to switch role to secondary for resource ${disk}."
exit 1
diff --git a/de_DE.ISO8859-1/books/handbook/dtrace/chapter.xml b/de_DE.ISO8859-1/books/handbook/dtrace/chapter.xml
index e7f3807937..23d06a80a2 100644
--- a/de_DE.ISO8859-1/books/handbook/dtrace/chapter.xml
+++ b/de_DE.ISO8859-1/books/handbook/dtrace/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
Recently I suggested to myself that this should become a profiling
and debugging chapter, which covers things like ktrace(1) and
diff --git a/de_DE.ISO8859-1/books/handbook/eresources/chapter.xml b/de_DE.ISO8859-1/books/handbook/eresources/chapter.xml
index 4e8b4fc0be..189e45e3e9 100644
--- a/de_DE.ISO8859-1/books/handbook/eresources/chapter.xml
+++ b/de_DE.ISO8859-1/books/handbook/eresources/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
The FreeBSD German Documentation Project
@@ -2151,6 +2151,11 @@
<sect2 id="eresources-web-mirrors">
<title>Official Mirrors</title>
+
+ &chap.eresources.www.index.inc;
+
+ &chap.mirrors.lastmod.inc;
+
&chap.eresources.www.inc;
</sect2>
</sect1>
diff --git a/de_DE.ISO8859-1/books/handbook/filesystems/chapter.xml b/de_DE.ISO8859-1/books/handbook/filesystems/chapter.xml
index 5dba58b61e..7f8d0156c1 100644
--- a/de_DE.ISO8859-1/books/handbook/filesystems/chapter.xml
+++ b/de_DE.ISO8859-1/books/handbook/filesystems/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
The FreeBSD German Documentation Project
@@ -244,7 +244,7 @@ example 17547136 0 17547136 0% /example</screen>
von den Benutzern aufgelistet werden, wie im folgenden Beispiel
gezeigt wird:</para>
- <screen>&prompt.root <userinput>cd /example</userinput>
+ <screen>&prompt.root; <userinput>cd /example</userinput>
&prompt.root; <userinput>ls</userinput>
&prompt.root; <userinput>touch testfile</userinput>
&prompt.root; <userinput>ls -al</userinput>
diff --git a/de_DE.ISO8859-1/books/handbook/firewalls/chapter.xml b/de_DE.ISO8859-1/books/handbook/firewalls/chapter.xml
index f77ee1b386..5a679c9224 100644
--- a/de_DE.ISO8859-1/books/handbook/firewalls/chapter.xml
+++ b/de_DE.ISO8859-1/books/handbook/firewalls/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
The FreeBSD German Documentation Project
diff --git a/de_DE.ISO8859-1/books/handbook/geom/chapter.xml b/de_DE.ISO8859-1/books/handbook/geom/chapter.xml
index ad61804881..6b80fc3b3f 100644
--- a/de_DE.ISO8859-1/books/handbook/geom/chapter.xml
+++ b/de_DE.ISO8859-1/books/handbook/geom/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
The FreeBSD German Documentation Project
diff --git a/de_DE.ISO8859-1/books/handbook/install/chapter.xml b/de_DE.ISO8859-1/books/handbook/install/chapter.xml
index 996c9b6359..d855dcfbee 100644
--- a/de_DE.ISO8859-1/books/handbook/install/chapter.xml
+++ b/de_DE.ISO8859-1/books/handbook/install/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
diff --git a/de_DE.ISO8859-1/books/handbook/introduction/chapter.xml b/de_DE.ISO8859-1/books/handbook/introduction/chapter.xml
index 917deaae84..9c004f9636 100644
--- a/de_DE.ISO8859-1/books/handbook/introduction/chapter.xml
+++ b/de_DE.ISO8859-1/books/handbook/introduction/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
The FreeBSD German Documentation Project
diff --git a/de_DE.ISO8859-1/books/handbook/jails/chapter.xml b/de_DE.ISO8859-1/books/handbook/jails/chapter.xml
index e3790afe6d..d5c7b6b274 100644
--- a/de_DE.ISO8859-1/books/handbook/jails/chapter.xml
+++ b/de_DE.ISO8859-1/books/handbook/jails/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
The FreeBSD German Documentation Project
diff --git a/de_DE.ISO8859-1/books/handbook/kernelconfig/chapter.xml b/de_DE.ISO8859-1/books/handbook/kernelconfig/chapter.xml
index 91a804a89c..a4aaa32765 100644
--- a/de_DE.ISO8859-1/books/handbook/kernelconfig/chapter.xml
+++ b/de_DE.ISO8859-1/books/handbook/kernelconfig/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
The FreeBSD German Documentation Project
diff --git a/de_DE.ISO8859-1/books/handbook/l10n/chapter.xml b/de_DE.ISO8859-1/books/handbook/l10n/chapter.xml
index 2f786cb223..5c28fb6a3d 100644
--- a/de_DE.ISO8859-1/books/handbook/l10n/chapter.xml
+++ b/de_DE.ISO8859-1/books/handbook/l10n/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
The FreeBSD German Documentation Project
diff --git a/de_DE.ISO8859-1/books/handbook/linuxemu/chapter.xml b/de_DE.ISO8859-1/books/handbook/linuxemu/chapter.xml
index 6faf4ab1d7..a63bb0ef13 100644
--- a/de_DE.ISO8859-1/books/handbook/linuxemu/chapter.xml
+++ b/de_DE.ISO8859-1/books/handbook/linuxemu/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
The FreeBSD German Documentation Project
@@ -715,14 +715,14 @@ LOG=/var/log/lmgrd.log
case "$1" in
start)
- lmgrd -c ${LICENSE_FILE} 2&gt;&gt; ${LOG} 1&gt;&2
+ lmgrd -c ${LICENSE_FILE} 2&gt;&gt; ${LOG} 1&gt;&amp;2
echo -n " lmgrd"
;;
stop)
- lmgrd -c ${LICENSE_FILE} -x lmdown 2&gt;&gt; ${LOG} 1&gt;&2
+ lmgrd -c ${LICENSE_FILE} -x lmdown 2&gt;&gt; ${LOG} 1&gt;&amp;2
;;
*)
- echo "Usage: `basename $0` {start|stop}" 1&gt;&2
+ echo "Usage: `basename $0` {start|stop}" 1&gt;&amp;2
exit 64
;;
esac
@@ -1025,7 +1025,7 @@ exit 0</programlisting>
nachstehendem Inhalt:</para>
<programlisting>#!/compat/linux/bin/sh
-(sleep 5; killall -1 matlab_helper) &
+(sleep 5; killall -1 matlab_helper) &amp;
exit 0</programlisting>
</step>
diff --git a/de_DE.ISO8859-1/books/handbook/mac/chapter.xml b/de_DE.ISO8859-1/books/handbook/mac/chapter.xml
index 6fb2a6b88d..289f99fffd 100644
--- a/de_DE.ISO8859-1/books/handbook/mac/chapter.xml
+++ b/de_DE.ISO8859-1/books/handbook/mac/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
The FreeBSD German Documentation Project
@@ -758,49 +758,43 @@ test: biba/high</screen>
Biba, Lomac, <acronym>MLS</acronym> und
<acronym>SEBSD</acronym>.</para>
-<!-- ================================================================================== --
- -- ================================================================================== --
- -- ================================================================================== --
- -- Das folgende Beispiel weigere ich mich zu uebersetzen. Der Autor selbst schreibt --
- -- schreibt ja, dass es only a quick example ist. --
-
-
- -- <para>In many cases, the <option>multilabel</ option> may not need --
- -- to be set at all. Consider the following situation and --
- -- security model:</para> --
- -- <itemizedlist> --
- -- <listitem> --
- -- <para>&os; web-server using the <acronym>MAC</acronym> --
- -- framework and a mix of the various policies.</para> --
- -- </listitem> --
-
- -- <listitem> --
- -- <para>This machine only requires one label, --
- -- <literal>biba/high</literal>, for everything in the system. --
- -- Here the file system would not require the --
- -- <option>multilabel</ option> option as a single label --
- -- will always be in effect.</para> --
- -- </listitem> --
-
- -- <listitem> --
- -- <para>But, this machine will be a web server and should have --
- -- the web server run at <literal>biba/low</literal> to prevent --
- -- write up capabilities. The Biba policy and how it works --
- -- will be discussed later, so if the previous comment was --
- -- difficult to interpret just continue reading and return. --
- -- The server could use a separate partition set at --
- -- <literal>biba/low</literal> for most if not all of its --
- -- runtime state. Much is lacking from this example, for --
- -- instance the restrictions on data, configuration and user --
- -- settings; however, this is just a quick example to prove the --
- -- aforementioned point.</para> --
- -- </listitem> --
- -- </itemizedlist> --
-
- -- end of quick example --
- -- ================================================================================== --
- -- ================================================================================== --
- -- ================================================================================== -->
+<!-- Das folgende Beispiel weigere ich mich zu uebersetzen. Der Autor selbst schreibt
+ schreibt ja, dass es only a quick example ist.
+
+
+ <para>In many cases, the <option>multilabel</ option> may not need
+ to be set at all. Consider the following situation and
+ security model:</para>
+ <itemizedlist>
+ <listitem>
+ <para>&os; web-server using the <acronym>MAC</acronym>
+ framework and a mix of the various policies.</para>
+ </listitem>
+
+ <listitem>
+ <para>This machine only requires one label,
+ <literal>biba/high</literal>, for everything in the system.
+ Here the file system would not require the
+ <option>multilabel</ option> option as a single label
+ will always be in effect.</para>
+ </listitem>
+
+ <listitem>
+ <para>But, this machine will be a web server and should have
+ the web server run at <literal>biba/low</literal> to prevent
+ write up capabilities. The Biba policy and how it works
+ will be discussed later, so if the previous comment was
+ difficult to interpret just continue reading and return.
+ The server could use a separate partition set at
+ <literal>biba/low</literal> for most if not all of its
+ runtime state. Much is lacking from this example, for
+ instance the restrictions on data, configuration and user
+ settings; however, this is just a quick example to prove the
+ aforementioned point.</para>
+ </listitem>
+ </itemizedlist>
+
+ -->
<para>Wenn Richtlinien benutzt werden sollen, die ohne Labels auskommen,
wird die Option <option>multilabel</option> nicht ben飆igt. Dies
diff --git a/de_DE.ISO8859-1/books/handbook/mail/chapter.xml b/de_DE.ISO8859-1/books/handbook/mail/chapter.xml
index 5d74286666..d0f9654228 100644
--- a/de_DE.ISO8859-1/books/handbook/mail/chapter.xml
+++ b/de_DE.ISO8859-1/books/handbook/mail/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
The FreeBSD German Documentation Project
@@ -1804,11 +1804,11 @@ SENDMAIL_LDADD=-lsasl2</programlisting>
den nachstehenden Kommandos:</para>
<screen>&prompt.root; <userinput>cd /usr/src/lib/libsmutil</userinput>
-&prompt.root; <userinput>make cleandir && make obj && make</userinput>
+&prompt.root; <userinput>make cleandir &amp;&amp; make obj &amp;&amp; make</userinput>
&prompt.root; <userinput>cd /usr/src/lib/libsm</userinput>
-&prompt.root; <userinput>make cleandir && make obj && make</userinput>
+&prompt.root; <userinput>make cleandir &amp;&amp; make obj &amp;&amp; make</userinput>
&prompt.root; <userinput>cd /usr/src/usr.sbin/sendmail</userinput>
-&prompt.root; <userinput>make cleandir && make obj && make && make install</userinput></screen>
+&prompt.root; <userinput>make cleandir &amp;&amp; make obj &amp;&amp; make &amp;&amp; make install</userinput></screen>
<para><application>sendmail</application> sollte sich ohne Probleme
bersetzen lassen, wenn die Dateien in
diff --git a/de_DE.ISO8859-1/books/handbook/mirrors/chapter.xml b/de_DE.ISO8859-1/books/handbook/mirrors/chapter.xml
index 9bd6352d33..373bc85959 100644
--- a/de_DE.ISO8859-1/books/handbook/mirrors/chapter.xml
+++ b/de_DE.ISO8859-1/books/handbook/mirrors/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
The FreeBSD German Documentation Project
@@ -253,6 +253,10 @@
stehenden Zugriffsmethoden sind bei jedem Server in Klammern
angegeben.</para>
+ &chap.mirrors.ftp.index.inc;
+
+ &chap.mirrors.lastmod.inc;
+
&chap.mirrors.ftp.inc;
</sect1>
@@ -2402,6 +2406,10 @@ doc/zh_*</screen>
<para>Die folgende Aufz鄣lung enth鄟t
<link linkend="cvsup">CVSup</link> Server fr &os;:</para>
+ &chap.mirrors.cvsup.index.inc;
+
+ &chap.mirrors.lastmod.inc;
+
&chap.mirrors.cvsup.inc;
</sect2>
</sect1>
diff --git a/de_DE.ISO8859-1/books/handbook/multimedia/chapter.xml b/de_DE.ISO8859-1/books/handbook/multimedia/chapter.xml
index ea7f6ef88e..49dfc1d5ca 100644
--- a/de_DE.ISO8859-1/books/handbook/multimedia/chapter.xml
+++ b/de_DE.ISO8859-1/books/handbook/multimedia/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
The FreeBSD German Documentation Project
@@ -1731,7 +1731,7 @@ bktr0: Pinnacle/Miro TV, Philips SECAM tuner.</programlisting>
<para>Richten Sie anschliessend die MythTV-Datenbank ein:</para>
- <screen>&prompt.root; <userinput>mysql -uroot -p < /usr/local/share/mythtv/database/mc.sql</userinput></screen>
+ <screen>&prompt.root; <userinput>mysql -uroot -p &lt; /usr/local/share/mythtv/database/mc.sql</userinput></screen>
<para>Konfigurieren Sie dann das Backend:</para>
diff --git a/de_DE.ISO8859-1/books/handbook/network-servers/chapter.xml b/de_DE.ISO8859-1/books/handbook/network-servers/chapter.xml
index 27724ca3d8..720d0c939a 100644
--- a/de_DE.ISO8859-1/books/handbook/network-servers/chapter.xml
+++ b/de_DE.ISO8859-1/books/handbook/network-servers/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
The FreeBSD German Documentation Project
diff --git a/de_DE.ISO8859-1/books/handbook/pgpkeys/chapter.xml b/de_DE.ISO8859-1/books/handbook/pgpkeys/chapter.xml
index d18e5f1b30..b855de0ba0 100644
--- a/de_DE.ISO8859-1/books/handbook/pgpkeys/chapter.xml
+++ b/de_DE.ISO8859-1/books/handbook/pgpkeys/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
The FreeBSD German Documentation Project
diff --git a/de_DE.ISO8859-1/books/handbook/ports/chapter.xml b/de_DE.ISO8859-1/books/handbook/ports/chapter.xml
index 48fb4648be..25948e7238 100644
--- a/de_DE.ISO8859-1/books/handbook/ports/chapter.xml
+++ b/de_DE.ISO8859-1/books/handbook/ports/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
The FreeBSD German Documentation Project
diff --git a/de_DE.ISO8859-1/books/handbook/ppp-and-slip/chapter.xml b/de_DE.ISO8859-1/books/handbook/ppp-and-slip/chapter.xml
index f8683e8a70..e7fe8e8ffd 100644
--- a/de_DE.ISO8859-1/books/handbook/ppp-and-slip/chapter.xml
+++ b/de_DE.ISO8859-1/books/handbook/ppp-and-slip/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
The FreeBSD German Documentation Project
diff --git a/de_DE.ISO8859-1/books/handbook/preface/preface.xml b/de_DE.ISO8859-1/books/handbook/preface/preface.xml
index 55949300e9..751e9cac4a 100644
--- a/de_DE.ISO8859-1/books/handbook/preface/preface.xml
+++ b/de_DE.ISO8859-1/books/handbook/preface/preface.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
The FreeBSD German Documentation Project
diff --git a/de_DE.ISO8859-1/books/handbook/printing/chapter.xml b/de_DE.ISO8859-1/books/handbook/printing/chapter.xml
index c4ec2b2043..bf1e7185e1 100644
--- a/de_DE.ISO8859-1/books/handbook/printing/chapter.xml
+++ b/de_DE.ISO8859-1/books/handbook/printing/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
The FreeBSD German Documentation Project
diff --git a/de_DE.ISO8859-1/books/handbook/security/chapter.xml b/de_DE.ISO8859-1/books/handbook/security/chapter.xml
index da19ec5b67..71869bb038 100644
--- a/de_DE.ISO8859-1/books/handbook/security/chapter.xml
+++ b/de_DE.ISO8859-1/books/handbook/security/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
The FreeBSD German Documentation Project
@@ -708,7 +708,7 @@
<literal>schg</literal> Flag auf kritische Startdateien,
Verzeichnisse und Scripte (z.B. alles was l酳ft bis zu
dem Punkt auf dem das Securelevel gesetzt ist) zu setzen. Dies
- k霵nte etwas &uuml,bertrieben sein, und auch das Upgrade
+ k霵nte etwas &uuml;bertrieben sein, und auch das Upgrade
des Systems ist sehr viel schwerer, wenn es auf einem hohen
Securelevel l酳ft. Ein strengerer Kompromiss ist es, das
System auf einem h鐬eren Securelevel laufen zu lassen, aber
diff --git a/de_DE.ISO8859-1/books/handbook/serialcomms/chapter.xml b/de_DE.ISO8859-1/books/handbook/serialcomms/chapter.xml
index c78f38d11b..8c85b9a3b0 100644
--- a/de_DE.ISO8859-1/books/handbook/serialcomms/chapter.xml
+++ b/de_DE.ISO8859-1/books/handbook/serialcomms/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
The FreeBSD German Documentation Project
diff --git a/de_DE.ISO8859-1/books/handbook/users/chapter.xml b/de_DE.ISO8859-1/books/handbook/users/chapter.xml
index eda4969f05..d6f34352ed 100644
--- a/de_DE.ISO8859-1/books/handbook/users/chapter.xml
+++ b/de_DE.ISO8859-1/books/handbook/users/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
The FreeBSD German Documentation Project
diff --git a/de_DE.ISO8859-1/books/handbook/vinum/chapter.xml b/de_DE.ISO8859-1/books/handbook/vinum/chapter.xml
index 4784c0247d..3a4089f3e7 100644
--- a/de_DE.ISO8859-1/books/handbook/vinum/chapter.xml
+++ b/de_DE.ISO8859-1/books/handbook/vinum/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The Vinum Volume Manager
By Greg Lehey (grog at lemis dot com)
diff --git a/de_DE.ISO8859-1/books/handbook/virtualization/chapter.xml b/de_DE.ISO8859-1/books/handbook/virtualization/chapter.xml
index 95c771c026..433fc3898c 100644
--- a/de_DE.ISO8859-1/books/handbook/virtualization/chapter.xml
+++ b/de_DE.ISO8859-1/books/handbook/virtualization/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
The FreeBSD German Documentation Project
diff --git a/de_DE.ISO8859-1/books/handbook/x11/chapter.xml b/de_DE.ISO8859-1/books/handbook/x11/chapter.xml
index 2bc9464905..60558f71df 100644
--- a/de_DE.ISO8859-1/books/handbook/x11/chapter.xml
+++ b/de_DE.ISO8859-1/books/handbook/x11/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
@@ -320,7 +320,7 @@
<application>&xorg;</application> ist der von der
X.Org Foundation herausgegebene X-Server des Open-Source
X&nbsp;Window Systems. <application>&xorg;</application>
- beruht auf <application>&xfree86&nbsp;4.4RC2</application> und
+ beruht auf <application>&xfree86;&nbsp;4.4RC2</application> und
X11R6.6. Derzeit ist die Version &xorg.version; von
<application>&xorg;</application> in der Ports-Sammlung
vorhanden.</para>
diff --git a/de_DE.ISO8859-1/books/porters-handbook/book.xml b/de_DE.ISO8859-1/books/porters-handbook/book.xml
index 9976d29893..57ffbb206c 100644
--- a/de_DE.ISO8859-1/books/porters-handbook/book.xml
+++ b/de_DE.ISO8859-1/books/porters-handbook/book.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//DE" "../../share/xml/entities.ent">
-%entities;
-]>
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<!--
The FreeBSD Documentation Project
@@ -10044,7 +10041,7 @@ etc/orbit.conf.sample
<para>Speichern Sie die Verzeichnisstruktur in einer neuen
Datei.</para>
- <screen>&prompt.root; <userinput>(cd /var/tmp/`make -V PORTNAME` && find -d * -type d) | sort &gt; OLD-DIRS</userinput></screen>
+ <screen>&prompt.root; <userinput>(cd /var/tmp/`make -V PORTNAME` &amp;&amp; find -d * -type d) | sort &gt; OLD-DIRS</userinput></screen>
<para>Erstellen Sie eine leere
<filename>pkg-plist</filename>-Datei:</para>
@@ -10056,12 +10053,12 @@ etc/orbit.conf.sample
Paketliste erstellt werden.</para>
<screen>&prompt.root; <userinput>make install PREFIX=/var/tmp/`make -V PORTNAME`</userinput>
-&prompt.root; <userinput>(cd /var/tmp/`make -V PORTNAME` && find -d * \! -type d) | sort &gt; pkg-plist</userinput></screen>
+&prompt.root; <userinput>(cd /var/tmp/`make -V PORTNAME` &amp;&amp; find -d * \! -type d) | sort &gt; pkg-plist</userinput></screen>
<para>Sie mssen auch alle neu erstellten Verzeichnisse in
die Paketliste aufnehmen.</para>
- <screen>&prompt.root; <userinput>(cd /var/tmp/`make -V PORTNAME` && find -d * -type d) | sort | comm -13 OLD-DIRS - | sort -r | sed -e 's#^#@dirrm #' &gt;&gt; pkg-plist</userinput></screen>
+ <screen>&prompt.root; <userinput>(cd /var/tmp/`make -V PORTNAME` &amp;&amp; find -d * -type d) | sort | comm -13 OLD-DIRS - | sort -r | sed -e 's#^#@dirrm #' &gt;&gt; pkg-plist</userinput></screen>
<para>Zu guter Letzt muss die Paketliste noch manuell
aufger酳mt werden - es funktioniert eben nicht
diff --git a/de_DE.ISO8859-1/share/xml/catalog b/de_DE.ISO8859-1/share/xml/catalog
deleted file mode 100644
index 44bca8a074..0000000000
--- a/de_DE.ISO8859-1/share/xml/catalog
+++ /dev/null
@@ -1,57 +0,0 @@
- -- ...................................................................... --
- -- FreeBSD SGML Public Identifiers ...................................... --
-
- -- ...................................................................... --
- -- German specific ...................................................... --
-
- -- $FreeBSD$ --
- -- $FreeBSDde: de-docproj/share/xml/catalog,v 1.10 2004/11/28 18:16:45 jkois Exp $ --
- -- basiert auf: 1.5 --
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//DE"
- "entities.ent"
-
-PUBLIC "-//FreeBSD//DOCUMENT DocBook Stylesheet//EN"
- "freebsd.dsl"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook Language Specific Entities//EN"
- "l10n.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//DE"
- "mailing-lists.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook Newsgroup Entities//DE"
- "newsgroups.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook Team Entities//DE"
- "teams.ent"
-
-PUBLIC "-//FreeBSD//DOCUMENT DocBook Stylesheet//DE"
- "freebsd.dsl"
-
-PUBLIC "-//FreeBSD//DOCUMENT DocBook Language Neutral Stylesheet//DE"
- "freebsd.dsl"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook Glossary Entities//DE"
- "glossary.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook Translator Entities//DE"
- "translators.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//DE"
- "trademarks.ent"
-
- -- ...................................................................... --
- -- HTML docs ........................................................... --
-
-PUBLIC "-//FreeBSD//ENTITIES FreeBSD L10N Entities//EN"
- "l10n.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES FreeBSD Release L10N Entities//EN"
- "release.l10n.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES HTML FreeBSD Header L10N Entities//EN"
- "header.l10n.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES HTML FreeBSD Navigation Bar L10N Entities//EN"
- "navibar.l10n.ent"
diff --git a/de_DE.ISO8859-1/share/xml/catalog.xml b/de_DE.ISO8859-1/share/xml/catalog.xml
index 20a5875de6..6e76ac8d3a 100644
--- a/de_DE.ISO8859-1/share/xml/catalog.xml
+++ b/de_DE.ISO8859-1/share/xml/catalog.xml
@@ -13,7 +13,14 @@
<rewriteURI uriStartString="http://www.FreeBSD.org/XML/www/lang/"
rewritePrefix="../../"/>
- <public publicId="-//FreeBSD//ENTITIES FreeBSD L10N Entities//EN"
+ <public
+ publicId="-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN"
+ uri="entities.ent" />
+ <public
+ publicId="-//FreeBSD//ENTITIES DocBook Translator Entities//DE"
+ uri="translators.ent" />
+ <public
+ publicId="-//FreeBSD//ENTITIES FreeBSD L10N Entities//EN"
uri="l10n.ent" />
<public
publicId="-//FreeBSD//ENTITIES FreeBSD Release L10N Entities//EN"
diff --git a/de_DE.ISO8859-1/share/xml/entities.ent b/de_DE.ISO8859-1/share/xml/entities.ent
index 0048526ffd..d1c5b456a2 100644
--- a/de_DE.ISO8859-1/share/xml/entities.ent
+++ b/de_DE.ISO8859-1/share/xml/entities.ent
@@ -4,29 +4,33 @@
basiert auf: 1.1
-->
-<!ENTITY % man PUBLIC "-//FreeBSD//ENTITIES DocBook Manual Page Entities//EN">
-%man;
-<!ENTITY % freebsd PUBLIC "-//FreeBSD//ENTITIES DocBook Miscellaneous FreeBSD Entities//EN">
+<!ENTITY % freebsd PUBLIC "-//FreeBSD//ENTITIES DocBook Miscellaneous FreeBSD Entities//EN"
+ "nonexistent">
%freebsd;
-<!ENTITY % translators PUBLIC "-//FreeBSD//ENTITIES DocBook Translator Entities//DE">
+<!ENTITY % translators PUBLIC "-//FreeBSD//ENTITIES DocBook Translator Entities//DE"
+ "translators.ent">
%translators;
-<!ENTITY % authors PUBLIC "-//FreeBSD//ENTITIES DocBook Author Entities//EN">
-%authors;
-<!ENTITY % teams PUBLIC "-//FreeBSD//ENTITIES DocBook Team Entities//EN">
+<!ENTITY % teams PUBLIC "-//FreeBSD//ENTITIES DocBook Team Entities//EN"
+ "nonexistent">
%teams;
-<!ENTITY % mailing-lists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//DE">
+<!ENTITY % mailing-lists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//DE"
+ "mailing-lists.ent">
%mailing-lists;
-<!ENTITY % newsgroups PUBLIC "-//FreeBSD//ENTITIES DocBook Newsgroup Entities//EN">
+<!ENTITY % newsgroups PUBLIC "-//FreeBSD//ENTITIES DocBook Newsgroup Entities//EN"
+ "nonexistent">
%newsgroups;
-<!ENTITY % de-trademarks PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//DE">
+<!ENTITY % de-trademarks PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//DE"
+ "trademarks.ent">
%de-trademarks;
-<!ENTITY % trademarks PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//EN">
+<!ENTITY % trademarks PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//EN"
+ "nonexistent">
%trademarks;
-<!ENTITY % l10n PUBLIC "-//FreeBSD//ENTITIES DocBook Language Specific Entities//EN">
+<!ENTITY % l10n PUBLIC "-//FreeBSD//ENTITIES DocBook Language Specific Entities//EN"
+ "l10n.ent">
%l10n;
-<!ENTITY % l10n-common PUBLIC "-//FreeBSD//ENTITIES DocBook Language Neutral Entities//EN">
-%l10n-common;
-<!ENTITY % urls PUBLIC "-//FreeBSD//ENTITIES DocBook URL Entities//EN">
+<!ENTITY % urls PUBLIC "-//FreeBSD//ENTITIES DocBook URL Entities//EN"
+ "nonexistent">
%urls;
-<!ENTITY % glossary PUBLIC "-//FreeBSD//ENTITIES DocBook Glossary Entities//DE">
+<!ENTITY % glossary PUBLIC "-//FreeBSD//ENTITIES DocBook Glossary Entities//DE"
+ "glossary.ent">
%glossary;
diff --git a/de_DE.ISO8859-1/share/xml/l10n.ent b/de_DE.ISO8859-1/share/xml/l10n.ent
index 59defb096c..7e6e2c1de0 100644
--- a/de_DE.ISO8859-1/share/xml/l10n.ent
+++ b/de_DE.ISO8859-1/share/xml/l10n.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
<!-- -*- sgml -*-
DocBook Language Specific Entities for Localization (en).
diff --git a/de_DE.ISO8859-1/share/xml/mailing-lists.ent b/de_DE.ISO8859-1/share/xml/mailing-lists.ent
index ff0b7bd91a..d4011db972 100644
--- a/de_DE.ISO8859-1/share/xml/mailing-lists.ent
+++ b/de_DE.ISO8859-1/share/xml/mailing-lists.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
Namen der FreeBSD Mailinglisten und verwandter Software
diff --git a/de_DE.ISO8859-1/share/xml/mirrors-local.xsl b/de_DE.ISO8859-1/share/xml/mirrors-local.xsl
index efb34f7a79..b7abdc1fdf 100644
--- a/de_DE.ISO8859-1/share/xml/mirrors-local.xsl
+++ b/de_DE.ISO8859-1/share/xml/mirrors-local.xsl
@@ -11,7 +11,6 @@
<xsl:import href="../../../share/xml/mirrors-master.xsl" />
<xsl:output type="xml" encoding="iso-8859-1"
- omit-xml-declaration="yes"
indent="yes"/>
<!-- these params should be externally bound. The values
diff --git a/de_DE.ISO8859-1/share/xml/newsgroups.ent b/de_DE.ISO8859-1/share/xml/newsgroups.ent
index 7b62f42be1..8c647970a5 100644
--- a/de_DE.ISO8859-1/share/xml/newsgroups.ent
+++ b/de_DE.ISO8859-1/share/xml/newsgroups.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
Namen der FreeBSD-Newsgroups
diff --git a/de_DE.ISO8859-1/share/xml/teams.ent b/de_DE.ISO8859-1/share/xml/teams.ent
index 1f67441164..f5ad53f6b3 100644
--- a/de_DE.ISO8859-1/share/xml/teams.ent
+++ b/de_DE.ISO8859-1/share/xml/teams.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
Names and email address of teams of people working on specified
tasks. Usally they're just mail aliases set up at hub.FreeBSD.org
diff --git a/de_DE.ISO8859-1/share/xml/trademarks.ent b/de_DE.ISO8859-1/share/xml/trademarks.ent
index 1c6879d352..218b70a202 100644
--- a/de_DE.ISO8859-1/share/xml/trademarks.ent
+++ b/de_DE.ISO8859-1/share/xml/trademarks.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
Trademark Legend, as required by The Open Group, Sun, etc..
diff --git a/de_DE.ISO8859-1/share/xml/translators.ent b/de_DE.ISO8859-1/share/xml/translators.ent
index 41efe4c6cc..747d5116e1 100644
--- a/de_DE.ISO8859-1/share/xml/translators.ent
+++ b/de_DE.ISO8859-1/share/xml/translators.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
The FreeBSD German Documentation Project
diff --git a/el_GR.ISO8859-7/articles/bsdl-gpl/article.xml b/el_GR.ISO8859-7/articles/bsdl-gpl/article.xml
index 846fc85192..b655014b69 100644
--- a/el_GR.ISO8859-7/articles/bsdl-gpl/article.xml
+++ b/el_GR.ISO8859-7/articles/bsdl-gpl/article.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-7" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EL" "../../share/xml/entities.ent">
-%entities;
-]>
+<?xml version="1.0" encoding="iso-8859-7"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<!--
diff --git a/el_GR.ISO8859-7/articles/compiz-fusion/article.xml b/el_GR.ISO8859-7/articles/compiz-fusion/article.xml
index b31f18f14f..4a64e0bafc 100644
--- a/el_GR.ISO8859-7/articles/compiz-fusion/article.xml
+++ b/el_GR.ISO8859-7/articles/compiz-fusion/article.xml
@@ -1,10 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-7" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EL" "../../share/xml/entities.ent">
-%entities;
-<!ENTITY iso-greek "ISO/IEC&nbsp;8859-7">
-]>
+<?xml version="1.0" encoding="iso-8859-7"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<!--
diff --git a/el_GR.ISO8859-7/articles/contributing/article.xml b/el_GR.ISO8859-7/articles/contributing/article.xml
index 312c69fff9..8417de73ad 100644
--- a/el_GR.ISO8859-7/articles/contributing/article.xml
+++ b/el_GR.ISO8859-7/articles/contributing/article.xml
@@ -1,10 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-7" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EL" "../../share/xml/entities.ent">
-%entities;
-<!ENTITY % not.published "IGNORE">
-]>
+<?xml version="1.0" encoding="iso-8859-7"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<!--
@@ -216,7 +212,7 @@
<para>哢瀀謯鳺裍醲 罅 碫橀醲 摿轚蜤暡 摫 歑裍賚 貘鏷謯 蹠 鐐 &posix;. 泫瀎橀醲
罅 碫橀醲 黼罽楻斀蘪 齀殦濋 懤 斠轗 酃 貘鏷謯 黀賝
澞鐐鵴錈魟 <ulink url="&url.base;/projects/c99/index.html">&os;
- C99 & POSIX Standards Conformance Project</ulink>. 郚蜺麌翴醲 鐋
+ C99 &amp; POSIX Standards Conformance Project</ulink>. 郚蜺麌翴醲 鐋
黼斶殥瀄瀎 鐐 &os; 懤 鐋 摫摋鐐懤耬 摫 酃 貘鏷謯. 鍚
黼斶殥瀄瀎 僸暡楒樥, 毈殧裎殥 鵴 錼贄 勯鵫橎膲濊 鵰懤葐 鐒
貘檷殧蜤暡, 黀橀鋷 擩 摿暡瀎 貘檺錞憼鐐 齀殦濋 懤 斠鏸. 鍚 橀罅 勯罅鏸
diff --git a/el_GR.ISO8859-7/articles/cvs-freebsd/article.xml b/el_GR.ISO8859-7/articles/cvs-freebsd/article.xml
index fdbefd6ce8..f39077162e 100644
--- a/el_GR.ISO8859-7/articles/cvs-freebsd/article.xml
+++ b/el_GR.ISO8859-7/articles/cvs-freebsd/article.xml
@@ -1,10 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-7" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EL" "../../share/xml/entities.ent">
-%entities;
-<!ENTITY iso-greek "ISO/IEC&nbsp;8859-7">
-]>
+<?xml version="1.0" encoding="iso-8859-7"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<!--
diff --git a/el_GR.ISO8859-7/articles/explaining-bsd/article.xml b/el_GR.ISO8859-7/articles/explaining-bsd/article.xml
index de559a7519..871cfc6350 100644
--- a/el_GR.ISO8859-7/articles/explaining-bsd/article.xml
+++ b/el_GR.ISO8859-7/articles/explaining-bsd/article.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-7" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EL" "../../share/xml/entities.ent">
-%entities;
-]>
+<?xml version="1.0" encoding="iso-8859-7"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<!--
diff --git a/el_GR.ISO8859-7/articles/freebsd-questions/article.xml b/el_GR.ISO8859-7/articles/freebsd-questions/article.xml
index bac63efbc8..942163e19b 100644
--- a/el_GR.ISO8859-7/articles/freebsd-questions/article.xml
+++ b/el_GR.ISO8859-7/articles/freebsd-questions/article.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-7" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EL" "../../share/xml/entities.ent">
-%entities;
-]>
+<?xml version="1.0" encoding="iso-8859-7"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<!--
diff --git a/el_GR.ISO8859-7/articles/gjournal-desktop/article.xml b/el_GR.ISO8859-7/articles/gjournal-desktop/article.xml
index e7119be0b1..e044010be0 100644
--- a/el_GR.ISO8859-7/articles/gjournal-desktop/article.xml
+++ b/el_GR.ISO8859-7/articles/gjournal-desktop/article.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-7" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EL" "../../share/xml/entities.ent">
-%entities;
-<!ENTITY iso-greek "ISO/IEC&nbsp;8859-7">
+<?xml version="1.0" encoding="iso-8859-7"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd" [<!ENTITY iso-greek "ISO/IEC&nbsp;8859-7">
]>
<!--
diff --git a/el_GR.ISO8859-7/articles/greek-language-support/article.xml b/el_GR.ISO8859-7/articles/greek-language-support/article.xml
index b7523c8722..9db16e7b84 100644
--- a/el_GR.ISO8859-7/articles/greek-language-support/article.xml
+++ b/el_GR.ISO8859-7/articles/greek-language-support/article.xml
@@ -1,8 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-7" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EL" "../../share/xml/entities.ent">
-%entities;
+<?xml version="1.0" encoding="iso-8859-7"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd" [
<!ENTITY iso-greek "ISO/IEC&nbsp;8859-7">
<!ENTITY iso-ucs "ISO/IEC&nbsp;10646">
]>
diff --git a/el_GR.ISO8859-7/articles/laptop/article.xml b/el_GR.ISO8859-7/articles/laptop/article.xml
index 3187c5524a..78a77fe4d4 100644
--- a/el_GR.ISO8859-7/articles/laptop/article.xml
+++ b/el_GR.ISO8859-7/articles/laptop/article.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-7" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EL" "../../share/xml/entities.ent">
-%entities;
-]>
+<?xml version="1.0" encoding="iso-8859-7"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<!--
diff --git a/el_GR.ISO8859-7/articles/linux-users/article.xml b/el_GR.ISO8859-7/articles/linux-users/article.xml
index 42b459dcc3..3b800dba5e 100644
--- a/el_GR.ISO8859-7/articles/linux-users/article.xml
+++ b/el_GR.ISO8859-7/articles/linux-users/article.xml
@@ -1,10 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-7" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EL" "../../share/xml/entities.ent">
-%entities;
-<!ENTITY iso-greek "ISO/IEC&nbsp;8859-7">
-]>
+<?xml version="1.0" encoding="iso-8859-7"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<!--
diff --git a/el_GR.ISO8859-7/articles/mailing-list-faq/article.xml b/el_GR.ISO8859-7/articles/mailing-list-faq/article.xml
index 8153a9ba78..dafb174122 100644
--- a/el_GR.ISO8859-7/articles/mailing-list-faq/article.xml
+++ b/el_GR.ISO8859-7/articles/mailing-list-faq/article.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-7" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EL" "../../share/xml/entities.ent">
-%entities;
-]>
+<?xml version="1.0" encoding="iso-8859-7"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<!--
diff --git a/el_GR.ISO8859-7/articles/nanobsd/article.xml b/el_GR.ISO8859-7/articles/nanobsd/article.xml
index 1a41f7f944..30b61210e6 100644
--- a/el_GR.ISO8859-7/articles/nanobsd/article.xml
+++ b/el_GR.ISO8859-7/articles/nanobsd/article.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-7" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EL" "../../share/xml/entities.ent">
-%entities;
-]>
+<?xml version="1.0" encoding="iso-8859-7"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<!--
鱔錣臄縤 懤轗瓕摷 鐐: Introduction to NanoBSD
diff --git a/el_GR.ISO8859-7/articles/new-users/article.xml b/el_GR.ISO8859-7/articles/new-users/article.xml
index be31b2e062..66f6747099 100644
--- a/el_GR.ISO8859-7/articles/new-users/article.xml
+++ b/el_GR.ISO8859-7/articles/new-users/article.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-7" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EL" "../../share/xml/entities.ent">
-%entities;
-]>
+<?xml version="1.0" encoding="iso-8859-7"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<!--
diff --git a/el_GR.ISO8859-7/articles/problem-reports/article.xml b/el_GR.ISO8859-7/articles/problem-reports/article.xml
index ffc4fea0d9..5ee2aa9f02 100644
--- a/el_GR.ISO8859-7/articles/problem-reports/article.xml
+++ b/el_GR.ISO8859-7/articles/problem-reports/article.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-7" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EL" "../../share/xml/entities.ent">
-%entities;
-]>
+<?xml version="1.0" encoding="iso-8859-7"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<!--
diff --git a/el_GR.ISO8859-7/articles/releng-packages/article.xml b/el_GR.ISO8859-7/articles/releng-packages/article.xml
index 7c85947b4f..2d070829a7 100644
--- a/el_GR.ISO8859-7/articles/releng-packages/article.xml
+++ b/el_GR.ISO8859-7/articles/releng-packages/article.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-7" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EL" "../../share/xml/entities.ent">
-%entities;
-]>
+<?xml version="1.0" encoding="iso-8859-7"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<!--
砉蜡薋鵰 資儌鵰 鐒 凊縥鐒 呤蜒鶂濋燽 摫 寁裎瀦 鐐 FreeBSD
diff --git a/el_GR.ISO8859-7/articles/releng/article.xml b/el_GR.ISO8859-7/articles/releng/article.xml
index 4659d752fe..590f04ad16 100644
--- a/el_GR.ISO8859-7/articles/releng/article.xml
+++ b/el_GR.ISO8859-7/articles/releng/article.xml
@@ -1,8 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-7" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EL" "../../share/xml/entities.ent">
-%entities;
+<?xml version="1.0" encoding="iso-8859-7"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd" [
<!ENTITY art.re.pkgs '<ulink url="../releng-packages/article.html"> 砉蜡薋鵰 資儌鵰 鐒 凊縥鐒 呤蜒鶂濋燽 摫 寁裎瀦</ulink>'>
]>
diff --git a/el_GR.ISO8859-7/books/faq/book.xml b/el_GR.ISO8859-7/books/faq/book.xml
index ec1d38e9e8..6f5a7c0cd4 100644
--- a/el_GR.ISO8859-7/books/faq/book.xml
+++ b/el_GR.ISO8859-7/books/faq/book.xml
@@ -1,8 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-7" standalone="no"?>
-<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EL" "../../share/xml/entities.ent">
-%entities;
+<?xml version="1.0" encoding="iso-8859-7"?>
+<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd" [
<!ENTITY bibliography SYSTEM "../../../share/xml/bibliography.xml">
]>
diff --git a/el_GR.ISO8859-7/books/handbook/Makefile b/el_GR.ISO8859-7/books/handbook/Makefile
index 00b8ae191e..8038073aa3 100644
--- a/el_GR.ISO8859-7/books/handbook/Makefile
+++ b/el_GR.ISO8859-7/books/handbook/Makefile
@@ -318,30 +318,43 @@ DOC_PREFIX?= ${.CURDIR}/../../..
#
# rules generating lists of mirror site from XML database.
#
-XMLDOCS= mirrors-ftp:::mirrors.xml.ftp.inc \
+XMLDOCS= lastmod:::mirrors.lastmod.inc \
+ mirrors-ftp:::mirrors.xml.ftp.inc \
+ mirrors-ftp-index:::mirrors.xml.ftp.index.inc \
mirrors-cvsup:::mirrors.xml.cvsup.inc \
- eresources:::eresources.xml.www.inc
+ mirrors-cvsup-index:::mirrors.xml.cvsup.index.inc \
+ eresources:::eresources.xml.www.inc \
+ eresources-index:::eresources.xml.www.index.inc
DEPENDSET.DEFAULT= transtable mirror
XSLT.DEFAULT= ${XSL_MIRRORS}
XML.DEFAULT= ${XML_MIRRORS}
-NO_TIDY.DEFAULT= yes
+PARAMS.lastmod+= --param 'target' "'lastmod'"
+PARAMS.mirrors-ftp-index+= --param 'type' "'ftp'" \
+ --param 'proto' "'ftp'" \
+ --param 'target' "'index'"
PARAMS.mirrors-ftp+= --param 'type' "'ftp'" \
--param 'proto' "'ftp'" \
--param 'target' "'handbook/mirrors/chapter.xml'"
+PARAMS.mirrors-cvsup-index+= --param 'type' "'cvsup'" \
+ --param 'proto' "'cvsup'" \
+ --param 'target' "'index'"
PARAMS.mirrors-cvsup+= --param 'type' "'cvsup'" \
--param 'proto' "'cvsup'" \
--param 'target' "'handbook/mirrors/chapter.xml'"
+PARAMS.eresources-index+= --param 'type' "'www'" \
+ --param 'proto' "'http'" \
+ --param 'target' "'index'"
PARAMS.eresources+= --param 'type' "'www'" \
--param 'proto' "'http'" \
--param 'target' "'handbook/eresources/chapter.xml'"
-SRCS+= mirrors.xml.ftp.inc \
+SRCS+= mirrors.lastmod.inc \
+ mirrors.xml.ftp.inc \
+ mirrors.xml.ftp.index.inc \
mirrors.xml.cvsup.inc \
- eresources.xml.www.inc
-
-CLEANFILES+= mirrors.xml.ftp.inc \
- mirrors.xml.cvsup.inc \
- eresources.xml.www.inc
+ mirrors.xml.cvsup.index.inc \
+ eresources.xml.www.inc \
+ eresources.xml.www.index.inc
.include "${DOC_PREFIX}/share/mk/doc.project.mk"
diff --git a/el_GR.ISO8859-7/books/handbook/advanced-networking/chapter.xml b/el_GR.ISO8859-7/books/handbook/advanced-networking/chapter.xml
index 7f143e23b0..81538410ca 100644
--- a/el_GR.ISO8859-7/books/handbook/advanced-networking/chapter.xml
+++ b/el_GR.ISO8859-7/books/handbook/advanced-networking/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-7" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-7"?>
<!--
孲 顯灚濄蛷濈 鐐 FreeBSD: 哢濷鼩徾罅 椷敳 灌臲鵰
@@ -4794,7 +4794,7 @@ ifconfig_carp1="vhid 2 advskew 100 pass testpass 192.168.1.51/24"</programlistin
should be issued on
<hostid>provider.example.org</hostid>:</para>
- <screen>&prompt.root; <userinput>ifconfig carp0 down && ifconfig carp0 up</userinput></screen>
+ <screen>&prompt.root; <userinput>ifconfig carp0 down &amp;&amp; ifconfig carp0 up</userinput></screen>
<para>This should be done on the <devicename>carp</devicename>
interface which corresponds to the correct host.</para>
diff --git a/el_GR.ISO8859-7/books/handbook/audit/chapter.xml b/el_GR.ISO8859-7/books/handbook/audit/chapter.xml
index d4e062a558..8fc903b178 100644
--- a/el_GR.ISO8859-7/books/handbook/audit/chapter.xml
+++ b/el_GR.ISO8859-7/books/handbook/audit/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-7" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-7"?>
<!--
孲 顯灚濄蛷濈 鐐 FreeBSD: 賈樍艬 郚懧塥鐒 闆攠錼葐
diff --git a/el_GR.ISO8859-7/books/handbook/basics/chapter.xml b/el_GR.ISO8859-7/books/handbook/basics/chapter.xml
index 9b19881c83..bbb16b7598 100644
--- a/el_GR.ISO8859-7/books/handbook/basics/chapter.xml
+++ b/el_GR.ISO8859-7/books/handbook/basics/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-7" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-7"?>
<!--
孲 顯灚濄蛷濈 鐐 FreeBSD: 轍鶅縥 貲臩毇 黀 Unix
diff --git a/el_GR.ISO8859-7/books/handbook/bibliography/chapter.xml b/el_GR.ISO8859-7/books/handbook/bibliography/chapter.xml
index d7426c1885..8eb5287d48 100644
--- a/el_GR.ISO8859-7/books/handbook/bibliography/chapter.xml
+++ b/el_GR.ISO8859-7/books/handbook/bibliography/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-7" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-7"?>
<!--
孲 顯灚濄蛷濈 鐐 FreeBSD: 鎊碲濈蜤暡葐
diff --git a/el_GR.ISO8859-7/books/handbook/book.xml b/el_GR.ISO8859-7/books/handbook/book.xml
index ca8bac31b0..3bb9c80aa3 100644
--- a/el_GR.ISO8859-7/books/handbook/book.xml
+++ b/el_GR.ISO8859-7/books/handbook/book.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-7" standalone="no"?>
-<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EL" "../../share/xml/entities.ent">
-%entities;
-
+<?xml version="1.0" encoding="iso-8859-7"?>
+<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd" [
<!ENTITY % chapters SYSTEM "chapters.ent">
%chapters;
<!ENTITY % txtfiles SYSTEM "txtfiles.ent">
diff --git a/el_GR.ISO8859-7/books/handbook/boot/chapter.xml b/el_GR.ISO8859-7/books/handbook/boot/chapter.xml
index 78fd02bb2e..1eb393009f 100644
--- a/el_GR.ISO8859-7/books/handbook/boot/chapter.xml
+++ b/el_GR.ISO8859-7/books/handbook/boot/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-7" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-7"?>
<!--
孲 顯灚濄蛷濈 鐐 FreeBSD: 灌撦濋摷葐 髑罃耬鵰 鐐 FreeBSD
diff --git a/el_GR.ISO8859-7/books/handbook/chapters.ent b/el_GR.ISO8859-7/books/handbook/chapters.ent
index daa4314a4b..eefe8973a2 100644
--- a/el_GR.ISO8859-7/books/handbook/chapters.ent
+++ b/el_GR.ISO8859-7/books/handbook/chapters.ent
@@ -17,235 +17,62 @@
-->
-<!ENTITY % not.published "INCLUDE">
-
-<!ENTITY % chap.introduction "IGNORE">
-<!ENTITY % chap.install "IGNORE">
-<!ENTITY % chap.bsdinstall "IGNORE">
-<!ENTITY % chap.basics "IGNORE">
-<!ENTITY % chap.ports "IGNORE">
-<!ENTITY % chap.config "IGNORE">
-<!ENTITY % chap.boot "IGNORE">
-<!ENTITY % chap.users "IGNORE">
-<!ENTITY % chap.kernelconfig "IGNORE">
-<!ENTITY % chap.security "IGNORE">
-<!ENTITY % chap.jails "IGNORE">
-<!ENTITY % chap.printing "IGNORE">
-<!ENTITY % chap.disks "IGNORE">
-<!ENTITY % chap.geom "IGNORE">
-<!ENTITY % chap.vinum "IGNORE">
-<!ENTITY % chap.x11 "IGNORE">
-<!ENTITY % chap.l10n "IGNORE">
-<!ENTITY % chap.multimedia "IGNORE">
-<!ENTITY % chap.desktop "IGNORE">
-<!ENTITY % chap.serialcomms "IGNORE">
-<!ENTITY % chap.ppp-and-slip "IGNORE">
-<!ENTITY % chap.advanced-networking "IGNORE">
-<!ENTITY % chap.firewalls "IGNORE">
-<!ENTITY % chap.network-servers "IGNORE">
-<!ENTITY % chap.mail "IGNORE">
-<!ENTITY % chap.cutting-edge "IGNORE">
-<!ENTITY % chap.linuxemu "IGNORE">
-<!ENTITY % chap.mirrors "IGNORE">
-<!ENTITY % chap.mirrors.ftp.inc "INCLUDE">
-<!ENTITY % chap.mirrors.cvsup.inc "INCLUDE">
-<!ENTITY % chap.bibliography "IGNORE">
-<!ENTITY % chap.eresources "IGNORE">
-<!ENTITY % chap.eresources.www.inc "INCLUDE">
-<!ENTITY % chap.pgpkeys "IGNORE">
-<!ENTITY % chap.index "IGNORE">
-<!ENTITY % chap.freebsd-glossary "IGNORE">
-<!ENTITY % chap.mac "IGNORE">
-<!ENTITY % chap.audit "IGNORE">
-<!ENTITY % chap.filesystems "IGNORE">
-<!ENTITY % chap.dtrace "IGNORE">
-
<!ENTITY chap.preface SYSTEM "preface/preface.xml">
<!ENTITY % pgpkeys SYSTEM "../../../share/pgpkeys/pgpkeys.ent"> %pgpkeys;
<!-- Part One -->
-<![%chap.introduction;[
<!ENTITY chap.introduction SYSTEM "introduction/chapter.xml">
-]]>
-<![%chap.install;[
<!ENTITY chap.install SYSTEM "install/chapter.xml">
-]]>
-<![%chap.bsdinstall;[
<!ENTITY chap.bsdinstall SYSTEM "bsdinstall/chapter.xml">
-]]>
-<![%chap.basics;[
<!ENTITY chap.basics SYSTEM "basics/chapter.xml">
-]]>
-<![%chap.ports;[
<!ENTITY chap.ports SYSTEM "ports/chapter.xml">
-]]>
-<![%chap.x11;[
<!ENTITY chap.x11 SYSTEM "x11/chapter.xml">
-]]>
<!-- Part Two -->
-<![%chap.desktop;[
<!ENTITY chap.desktop SYSTEM "desktop/chapter.xml">
-]]>
-<![%chap.multimedia;[
<!ENTITY chap.multimedia SYSTEM "multimedia/chapter.xml">
-]]>
-<![%chap.kernelconfig;[
<!ENTITY chap.kernelconfig SYSTEM "kernelconfig/chapter.xml">
-]]>
-<![%chap.printing;[
<!ENTITY chap.printing SYSTEM "printing/chapter.xml">
-]]>
-<![%chap.linuxemu;[
<!ENTITY chap.linuxemu SYSTEM "linuxemu/chapter.xml">
-]]>
<!-- Part Three -->
-<![%chap.config;[
<!ENTITY chap.config SYSTEM "config/chapter.xml">
-]]>
-<![%chap.boot;[
<!ENTITY chap.boot SYSTEM "boot/chapter.xml">
-]]>
-<![%chap.users;[
<!ENTITY chap.users SYSTEM "users/chapter.xml">
-]]>
-<![%chap.security;[
<!ENTITY chap.security SYSTEM "security/chapter.xml">
-]]>
-<![%chap.jails;[
<!ENTITY chap.jails SYSTEM "jails/chapter.xml">
-]]>
-<![%chap.mac;[
<!ENTITY chap.mac SYSTEM "mac/chapter.xml">
-]]>
-<![%chap.audit;[
<!ENTITY chap.audit SYSTEM "audit/chapter.xml">
-]]>
-<![%chap.disks;[
<!ENTITY chap.disks SYSTEM "disks/chapter.xml">
-]]>
-<![%chap.geom;[
<!ENTITY chap.geom SYSTEM "geom/chapter.xml">
-]]>
-<![%chap.filesystems;[
<!ENTITY chap.filesystems SYSTEM "filesystems/chapter.xml">
-]]>
-<![%chap.vinum;[
<!ENTITY chap.vinum SYSTEM "vinum/chapter.xml">
-]]>
-<![%chap.virtualization;[
<!ENTITY chap.virtualization SYSTEM "virtualization/chapter.xml">
-]]>
-<![%chap.l10n;[
<!ENTITY chap.l10n SYSTEM "l10n/chapter.xml">
-]]>
-<![%chap.cutting-edge;[
<!ENTITY chap.cutting-edge SYSTEM "cutting-edge/chapter.xml">
-]]>
-<![%chap.dtrace;[
<!ENTITY chap.dtrace SYSTEM "dtrace/chapter.xml">
-]]>
<!-- Part Four -->
-<![%chap.serialcomms;[
<!ENTITY chap.serialcomms SYSTEM "serialcomms/chapter.xml">
-]]>
-<![%chap.ppp-and-slip;[
<!ENTITY chap.ppp-and-slip SYSTEM "ppp-and-slip/chapter.xml">
-]]>
-<![%chap.mail;[
<!ENTITY chap.mail SYSTEM "mail/chapter.xml">
-]]>
-<![%chap.network-servers;[
<!ENTITY chap.network-servers SYSTEM "network-servers/chapter.xml">
-]]>
-<![%chap.firewalls;[
<!ENTITY chap.firewalls SYSTEM "firewalls/chapter.xml">
-]]>
-<![%chap.advanced-networking;[
<!ENTITY chap.advanced-networking SYSTEM "advanced-networking/chapter.xml">
-]]>
<!-- Part Five (appendices) -->
-<![%chap.mirrors;[
- <!ENTITY chap.mirrors SYSTEM "mirrors/chapter.xml">
-]]>
-<![%chap.mirrors.ftp.inc;[
- <!ENTITY chap.mirrors.ftp.inc SYSTEM "mirrors.xml.ftp.inc">
-]]>
-<![%chap.mirrors.cvsup.inc;[
- <!ENTITY chap.mirrors.cvsup.inc SYSTEM "mirrors.xml.cvsup.inc">
-]]>
-<![%chap.bibliography;[
- <!ENTITY chap.bibliography SYSTEM "bibliography/chapter.xml">
-]]>
-<![%chap.eresources;[
- <!ENTITY chap.eresources SYSTEM "eresources/chapter.xml">
-]]>
-<![%chap.eresources.www.inc;[
- <!ENTITY chap.eresources.www.inc SYSTEM "eresources.xml.www.inc">
-]]>
-<![%chap.pgpkeys;[
- <!ENTITY chap.pgpkeys SYSTEM "pgpkeys/chapter.xml">
-]]>
-<![%chap.freebsd-glossary;[
- <!ENTITY chap.freebsd-glossary "&freebsd-glossary;">
-]]>
-<![%chap.index;[
- <!ENTITY chap.index SYSTEM "index.xml">
-]]>
+ <!ENTITY chap.mirrors SYSTEM "mirrors/chapter.xml">
+ <!ENTITY chap.mirrors.lastmod.inc SYSTEM "mirrors.lastmod.inc">
+ <!ENTITY chap.mirrors.ftp.index.inc SYSTEM "mirrors.xml.ftp.index.inc">
+ <!ENTITY chap.mirrors.ftp.inc SYSTEM "mirrors.xml.ftp.inc">
+ <!ENTITY chap.mirrors.cvsup.index.inc SYSTEM "mirrors.xml.cvsup.index.inc">
+ <!ENTITY chap.mirrors.cvsup.inc SYSTEM "mirrors.xml.cvsup.inc">
+ <!ENTITY chap.bibliography SYSTEM "bibliography/chapter.xml">
+ <!ENTITY chap.eresources SYSTEM "eresources/chapter.xml">
+ <!ENTITY chap.eresources.www.index.inc SYSTEM "eresources.xml.www.index.inc">
+ <!ENTITY chap.eresources.www.inc SYSTEM "eresources.xml.www.inc">
+ <!ENTITY chap.pgpkeys SYSTEM "pgpkeys/chapter.xml">
+ <!ENTITY chap.freebsd-glossary "&freebsd-glossary;">
+ <!ENTITY chap.index "">
<!ENTITY chap.colophon SYSTEM "colophon.xml">
-
-<!-- IGNORE cases -->
-
-<!-- Part One -->
-<!ENTITY chap.introduction "">
-<!ENTITY chap.install "">
-<!ENTITY chap.basics "">
-<!ENTITY chap.ports "">
-<!ENTITY chap.x11 "">
-
-<!-- Part Two -->
-<!ENTITY chap.desktop "">
-<!ENTITY chap.multimedia "">
-<!ENTITY chap.kernelconfig "">
-<!ENTITY chap.printing "">
-<!ENTITY chap.linuxemu "">
-
-<!-- Part Three -->
-<!ENTITY chap.config "">
-<!ENTITY chap.boot "">
-<!ENTITY chap.users "">
-<!ENTITY chap.security "">
-<!ENTITY chap.jails "">
-<!ENTITY chap.mac "">
-<!ENTITY chap.audit "">
-<!ENTITY chap.disks "">
-<!ENTITY chap.geom "">
-<!ENTITY chap.filesystems "">
-<!ENTITY chap.vinum "">
-<!ENTITY chap.virtualization "">
-<!ENTITY chap.l10n "">
-<!ENTITY chap.cutting-edge "">
-<!ENTITY chap.dtrace "">
-
-<!-- Part Four -->
-<!ENTITY chap.serialcomms "">
-<!ENTITY chap.ppp-and-slip "">
-<!ENTITY chap.mail "">
-<!ENTITY chap.network-servers "">
-<!ENTITY chap.firewalls "">
-<!ENTITY chap.advanced-networking "">
-
-<!-- Part Five (appendices) -->
-<!ENTITY chap.mirrors "">
-<!ENTITY chap.mirrors.ftp.inc "">
-<!ENTITY chap.mirrors.cvsup.inc "">
-<!ENTITY chap.bibliography "">
-<!ENTITY chap.eresources "">
-<!ENTITY chap.eresources.www.inc "">
-<!ENTITY chap.pgpkeys "">
-<!ENTITY chap.freebsd-glossary "">
-<!ENTITY chap.index "">
diff --git a/el_GR.ISO8859-7/books/handbook/colophon.xml b/el_GR.ISO8859-7/books/handbook/colophon.xml
index 98df77588e..2db2cb7527 100644
--- a/el_GR.ISO8859-7/books/handbook/colophon.xml
+++ b/el_GR.ISO8859-7/books/handbook/colophon.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-7" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-7"?>
<!--
孲 顯灚濄蛷濈 鐐 FreeBSD: 凎麌錣鸄 鎊碲蜍
diff --git a/el_GR.ISO8859-7/books/handbook/config/chapter.xml b/el_GR.ISO8859-7/books/handbook/config/chapter.xml
index d9c096ae43..7a748980e8 100644
--- a/el_GR.ISO8859-7/books/handbook/config/chapter.xml
+++ b/el_GR.ISO8859-7/books/handbook/config/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-7" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-7"?>
<!--
孲 顯灚濄蛷濈 鐐 FreeBSD: 毦鳻澞 罼 醫鋷澞鐐豵蛖鵰
@@ -403,7 +403,7 @@ stop)
kill -9 `cat /var/run/utility.pid`
;;
*)
- echo "Usage: `basename $0` {start|stop}" &gt;&2
+ echo "Usage: `basename $0` {start|stop}" &gt;&amp;2
exit 64
;;
esac
@@ -854,7 +854,7 @@ $sshd_enable=YES</screen>
斶瀎燽 罅 碫樘燽 黀澽 鵴錈麧 碨賥橀摥 &man.rc.8; 罼 &man.rc.subr.8;.
鍚 樇僸暡楒殢醲 蜒 鐋 樍蜤暡 僸蕘 鶋
鵴罅麌 <filename>rc.d</filename> 蜒 鐋 瞂鋷裐鵰 鐒 碇
- 臝塱艬薀, 魨 碫橀醲 <ulink url="&url.articles.rc-scripting">鐐
+ 臝塱艬薀, 魨 碫橀醲 <ulink url="&url.articles.rc-scripting;">鐐
匷罽殢斀 斠鏸</ulink> 摙耪轗 虀祼濇.</para>
</sect1>
diff --git a/el_GR.ISO8859-7/books/handbook/cutting-edge/chapter.xml b/el_GR.ISO8859-7/books/handbook/cutting-edge/chapter.xml
index 0620644521..2989c85826 100644
--- a/el_GR.ISO8859-7/books/handbook/cutting-edge/chapter.xml
+++ b/el_GR.ISO8859-7/books/handbook/cutting-edge/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-7" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-7"?>
<!--
孲 顯灚濄蛷濈 鐐 FreeBSD: 鱖賚楒鵰 罼 鍚摵塯擩鵰 鐐 FreeBSD
@@ -1272,7 +1272,7 @@ DOCSUPFILE?= /usr/share/examples/cvsup/doc-supfile</programlisting>
</sect3>
</sect2>
-<![ IGNORE [
+<!-- XXX
<sect2 id="docsnap">
<sect2info>
<authorgroup>
@@ -1332,13 +1332,13 @@ DOCSUPFILE?= /usr/share/examples/cvsup/doc-supfile</programlisting>
謯鼁謣薋.</para>
</note>
- <para>杹 虀踠濇瀔毉祼殦 鐋 歑澣檶 <option>--delete</option>, 罼噮
+ <para>杹 虀踠濇瀔毉祼殦 鐋 歑澣檶 <option>&dash;&dash;delete</option>, 罼噮
<command>make installworld</command> 樍罼鴇黀 縔豵殧 貘塨憼酃 黀瀍
罼轗錝蜧 <filename class="directory">/usr/share/doc</filename> 酃
瀔檽 魨 鶌踠鐐. 鏑 罅 罼魨麌鵴醲 酃 謯錁 摙灚葐, 虀踠濇瀔毉祼醲
鐋 謯鼁縔鐒 樇鐐錞:</para>
- <screen>&prompt.root; <userinput>rsync -rltvz --delete <replaceable>docsnap.sk.FreeBSD.org</replaceable>::docsnap/??_??\.\* <replaceable>/usr/share/doc</replaceable></userinput></screen>
+ <screen>&prompt.root; <userinput>rsync -rltvz &dash;&dash;delete <replaceable>docsnap.sk.FreeBSD.org</replaceable>::docsnap/??_??\.\* <replaceable>/usr/share/doc</replaceable></userinput></screen>
<para>鍚 歑氆纍橀醲 罅 樇賚殥鵴醲 楜 臝瀀臩錝 鐋 醲膵趡裐鵰, 蜒
謯鵘麧殫憼 檇臩 鐋 錨蜱濋 醲膵趡裐鵰, 斶瀎橀醲 罅 虀踠濇瀔毉祼殦
@@ -1346,7 +1346,7 @@ DOCSUPFILE?= /usr/share/examples/cvsup/doc-supfile</programlisting>
<screen>&prompt.root; <userinput>rsync -rltvz <replaceable>docsnap.sk.FreeBSD.org</replaceable>::docsnap/en_US.ISO8859-1 <replaceable>/usr/share/doc</replaceable></userinput></screen>
</sect2>
-]]>
+-->
</sect1>
<sect1 id="current-stable">
diff --git a/el_GR.ISO8859-7/books/handbook/desktop/chapter.xml b/el_GR.ISO8859-7/books/handbook/desktop/chapter.xml
index 77b5691edd..6c69393afa 100644
--- a/el_GR.ISO8859-7/books/handbook/desktop/chapter.xml
+++ b/el_GR.ISO8859-7/books/handbook/desktop/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-7" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-7"?>
<!--
孲 顯灚濄蛷濈 鐐 FreeBSD: Desktop 癲摙斀蜙
diff --git a/el_GR.ISO8859-7/books/handbook/disks/chapter.xml b/el_GR.ISO8859-7/books/handbook/disks/chapter.xml
index e865836ba7..59427fc440 100644
--- a/el_GR.ISO8859-7/books/handbook/disks/chapter.xml
+++ b/el_GR.ISO8859-7/books/handbook/disks/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-7" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-7"?>
<!--
孲 顯灚濄蛷濈 鐐 FreeBSD: 闋歞賙氁鏻縔 枍鶋
@@ -2694,7 +2694,7 @@ sa0(ncr1:4:0): Logical unit is in process of becoming ready</screen>
<example>
<title>A Script for Creating a Bootable Floppy</title>
- <programlisting><![ CDATA [#!/bin/sh
+ <programlisting><![CDATA[#!/bin/sh
#
# create a restore floppy
#
@@ -2740,7 +2740,7 @@ mkdir /mnt/var
#
if [ ! -x /sys/compile/MINI/kernel ]
then
- cat << EOM
+ cat &lt;&lt; EOM
The MINI kernel does not exist, please create one.
Here is an example config file:
#
@@ -2822,19 +2822,19 @@ cd /
#
# create minimum file system table
#
-cat > /mnt/etc/fstab <<EOM
+cat > /mnt/etc/fstab &lt;&lt;EOM
/dev/fd0a / ufs rw 1 1
EOM
#
# create minimum passwd file
#
-cat > /mnt/etc/passwd <<EOM
-root:*:0:0:Charlie &:/root:/bin/sh
+cat > /mnt/etc/passwd &lt;&lt;EOM
+root:*:0:0:Charlie &amp;:/root:/bin/sh
EOM
-cat > /mnt/etc/master.passwd <<EOM
-root::0:0::0:0:Charlie &:/root:/bin/sh
+cat > /mnt/etc/master.passwd &lt;&lt;EOM
+root::0:0::0:0:Charlie &amp;:/root:/bin/sh
EOM
chmod 600 /mnt/etc/master.passwd
@@ -2906,16 +2906,6 @@ echo "The floppy has been unmounted and is now ready."]]></programlisting>
Whatever caused the crash or data loss may strike again. Another
hour spent now may save you from further distress later.</para>
</sect3>
-
-<![ %not.published; [
-
- <sect3>
- <title>* I Did Not Prepare for the Disaster, What Now?</title>
-
- <para></para>
- </sect3>
-]]>
-
</sect2>
</sect1>
diff --git a/el_GR.ISO8859-7/books/handbook/dtrace/chapter.xml b/el_GR.ISO8859-7/books/handbook/dtrace/chapter.xml
index ba77da0fa4..3d0a0545b0 100644
--- a/el_GR.ISO8859-7/books/handbook/dtrace/chapter.xml
+++ b/el_GR.ISO8859-7/books/handbook/dtrace/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-7" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-7"?>
<!--
孲 顯灚濄蛷濈 鐐 FreeBSD: DTrace
diff --git a/el_GR.ISO8859-7/books/handbook/eresources/chapter.xml b/el_GR.ISO8859-7/books/handbook/eresources/chapter.xml
index dbd61564f6..3146e779cd 100644
--- a/el_GR.ISO8859-7/books/handbook/eresources/chapter.xml
+++ b/el_GR.ISO8859-7/books/handbook/eresources/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-7" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-7"?>
<!--
孲 顯灚濄蛷濈 鐐 FreeBSD: 剚蜙 剕趡濼鼩鵰 黀 灌撦蛸鏷
@@ -2196,6 +2196,10 @@
<sect2 id="eresources-web-mirrors">
<title>黴裍賚 Mirrors</title>
+ &chap.eresources.www.index.inc;
+
+ &chap.mirrors.lastmod.inc;
+
&chap.eresources.www.inc;
</sect2>
</sect1>
diff --git a/el_GR.ISO8859-7/books/handbook/filesystems/chapter.xml b/el_GR.ISO8859-7/books/handbook/filesystems/chapter.xml
index b9dd86fd33..520d07ee65 100644
--- a/el_GR.ISO8859-7/books/handbook/filesystems/chapter.xml
+++ b/el_GR.ISO8859-7/books/handbook/filesystems/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-7" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-7"?>
<!--
孲 顯灚濄蛷濈 鐐 FreeBSD: 郚黀碡敳 闌灚裐
@@ -241,7 +241,7 @@ example 17547136 0 17547136 0% /example</screen>
罼 塝錝 虀祼醲 斶瀎燽 歑裍趛 罅 鐐 儌罍, 蹠 攠蜁殦摋 黀
謯鼁縔鐒 謯鵘麧殫憼:</para>
- <screen>&prompt.root <userinput>cd /example</userinput>
+ <screen>&prompt.root; <userinput>cd /example</userinput>
&prompt.root; <userinput>ls</userinput>
&prompt.root; <userinput>touch testfile</userinput>
&prompt.root; <userinput>ls -al</userinput>
diff --git a/el_GR.ISO8859-7/books/handbook/firewalls/chapter.xml b/el_GR.ISO8859-7/books/handbook/firewalls/chapter.xml
index b02e5148e6..c58f023aaf 100644
--- a/el_GR.ISO8859-7/books/handbook/firewalls/chapter.xml
+++ b/el_GR.ISO8859-7/books/handbook/firewalls/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-7" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-7"?>
<!--
孲 顯灚濄蛷濈 鐐 FreeBSD: Firewalls
diff --git a/el_GR.ISO8859-7/books/handbook/geom/chapter.xml b/el_GR.ISO8859-7/books/handbook/geom/chapter.xml
index 298c4e9e17..661117e46c 100644
--- a/el_GR.ISO8859-7/books/handbook/geom/chapter.xml
+++ b/el_GR.ISO8859-7/books/handbook/geom/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-7" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-7"?>
<!--
孲 顯灚濄蛷濈 鐐 FreeBSD: GEOM: 灌暠橀齌鵰 郚黀毉玃 懼鵳
diff --git a/el_GR.ISO8859-7/books/handbook/install/chapter.xml b/el_GR.ISO8859-7/books/handbook/install/chapter.xml
index cb7d31d596..66347a8c87 100644
--- a/el_GR.ISO8859-7/books/handbook/install/chapter.xml
+++ b/el_GR.ISO8859-7/books/handbook/install/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-7" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-7"?>
<!--
孲 顯灚濄蛷濈 鐐 FreeBSD: 顯罼鴇黀薀摥 鐐 FreeBSD
@@ -328,7 +328,7 @@
麧儌徾薋 黀 魠鵳, 罼 鏻 歑毈鵘鵴澽 豵 斶瀎橀 貘氋摠楻樥.</para>
<sect3 id="install-where-i386">
- <title>忯酃鐔祼樥 懼鵳 蜒 闌玃醲臲瀍濋 &os/&arch.i386;</title>
+ <title>忯酃鐔祼樥 懼鵳 蜒 闌玃醲臲瀍濋 &os;/&arch.i386;</title>
<para>貲摥 鵳錣嬿 魠鵳濿 PC 斶瀎橀 罅 蠮齌黀橀 鵴 僸摓齌轗 鐔碡敳.
婛 鐔碡敳 斠轗 罼錝薀摋
diff --git a/el_GR.ISO8859-7/books/handbook/introduction/chapter.xml b/el_GR.ISO8859-7/books/handbook/introduction/chapter.xml
index 6df27ecefc..42a539d791 100644
--- a/el_GR.ISO8859-7/books/handbook/introduction/chapter.xml
+++ b/el_GR.ISO8859-7/books/handbook/introduction/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-7" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-7"?>
<!--
孲 顯灚濄蛷濈 鐐 FreeBSD: 體鶋裺蜛
diff --git a/el_GR.ISO8859-7/books/handbook/jails/chapter.xml b/el_GR.ISO8859-7/books/handbook/jails/chapter.xml
index 0149ef15ad..e6e7c88d59 100644
--- a/el_GR.ISO8859-7/books/handbook/jails/chapter.xml
+++ b/el_GR.ISO8859-7/books/handbook/jails/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-7" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-7"?>
<!--
孲 顯灚濄蛷濈 鐐 FreeBSD: Jails
diff --git a/el_GR.ISO8859-7/books/handbook/kernelconfig/chapter.xml b/el_GR.ISO8859-7/books/handbook/kernelconfig/chapter.xml
index 4aa66c2439..e42bb7b4cc 100644
--- a/el_GR.ISO8859-7/books/handbook/kernelconfig/chapter.xml
+++ b/el_GR.ISO8859-7/books/handbook/kernelconfig/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-7" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-7"?>
<!--
孲 顯灚濄蛷濈 鐐 FreeBSD: 欬鳻蛺瀍酃 鐐 哳麎罅 鐐 FreeBSD
diff --git a/el_GR.ISO8859-7/books/handbook/l10n/chapter.xml b/el_GR.ISO8859-7/books/handbook/l10n/chapter.xml
index faa054cd4a..3a0c9e58b9 100644
--- a/el_GR.ISO8859-7/books/handbook/l10n/chapter.xml
+++ b/el_GR.ISO8859-7/books/handbook/l10n/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-7" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-7"?>
<!--
孲 顯灚濄蛷濈 鐐 FreeBSD: 孲謮縥 欬鳻裍樥 - 郩祼 罼 毦鳻澞 I18N/L10N
diff --git a/el_GR.ISO8859-7/books/handbook/linuxemu/chapter.xml b/el_GR.ISO8859-7/books/handbook/linuxemu/chapter.xml
index 6b0bc9d9b9..498c48d5ec 100644
--- a/el_GR.ISO8859-7/books/handbook/linuxemu/chapter.xml
+++ b/el_GR.ISO8859-7/books/handbook/linuxemu/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-7" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-7"?>
<!--
孲 顯灚濄蛷濈 鐐 FreeBSD: 郚懧敳鐋酃 懤 髑醲錧鶅憼 鐐 Linux
@@ -698,14 +698,14 @@ LOG=/var/log/lmgrd.log
case "$1" in
start)
- lmgrd -c ${LICENSE_FILE} 2&gt;&gt; ${LOG} 1&gt;&2
+ lmgrd -c ${LICENSE_FILE} 2&gt;&gt; ${LOG} 1&gt;&amp;2
echo -n " lmgrd"
;;
stop)
- lmgrd -c ${LICENSE_FILE} -x lmdown 2&gt;&gt; ${LOG} 1&gt;&2
+ lmgrd -c ${LICENSE_FILE} -x lmdown 2&gt;&gt; ${LOG} 1&gt;&amp;2
;;
*)
- echo "Usage: `basename $0` {start|stop}" 1&gt;&2
+ echo "Usage: `basename $0` {start|stop}" 1&gt;&amp;2
exit 64
;;
esac
@@ -1002,7 +1002,7 @@ exit 0</programlisting>
謥齌歃樥 酃 謯鼁縔鐒:</para>
<programlisting>#!/compat/linux/bin/sh
-(sleep 5; killall -1 matlab_helper) &
+(sleep 5; killall -1 matlab_helper) &amp;
exit 0</programlisting>
</step>
diff --git a/el_GR.ISO8859-7/books/handbook/mac/chapter.xml b/el_GR.ISO8859-7/books/handbook/mac/chapter.xml
index ccdc74afc0..a674a3147e 100644
--- a/el_GR.ISO8859-7/books/handbook/mac/chapter.xml
+++ b/el_GR.ISO8859-7/books/handbook/mac/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-7" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-7"?>
<!--
孲 顯灚濄蛷濈 鐐 FreeBSD: 涾濷鼫鏻蕓 賈樍艬 哢鶌摷趛
diff --git a/el_GR.ISO8859-7/books/handbook/mail/chapter.xml b/el_GR.ISO8859-7/books/handbook/mail/chapter.xml
index f056b75c19..94d5860884 100644
--- a/el_GR.ISO8859-7/books/handbook/mail/chapter.xml
+++ b/el_GR.ISO8859-7/books/handbook/mail/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-7" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-7"?>
<!--
孲 顯灚濄蛷濈 鐐 FreeBSD: ③樏鐙瀍濋 婛蘻儊瀌橀
@@ -1761,11 +1761,11 @@ SENDMAIL_LDADD=-lsasl2</programlisting>
樏醲錌薀摥 鏻 謯鼁縔鐒 樇鐐錧:</para>
<screen>&prompt.root; <userinput>cd /usr/src/lib/libsmutil</userinput>
-&prompt.root; <userinput>make cleandir && make obj && make</userinput>
+&prompt.root; <userinput>make cleandir &amp;&amp; make obj &amp;&amp; make</userinput>
&prompt.root; <userinput>cd /usr/src/lib/libsm</userinput>
-&prompt.root; <userinput>make cleandir && make obj && make</userinput>
+&prompt.root; <userinput>make cleandir &amp;&amp; make obj &amp;&amp; make</userinput>
&prompt.root; <userinput>cd /usr/src/usr.sbin/sendmail</userinput>
-&prompt.root; <userinput>make cleandir && make obj && make && make install</userinput></screen>
+&prompt.root; <userinput>make cleandir &amp;&amp; make obj &amp;&amp; make &amp;&amp; make install</userinput></screen>
<para> 懤酃蜱鐀澞 鐐 <application>sendmail</application> 麧
貘椲樥 罅 謯厴蘦橎鵴 貘檺錞憼酃, 摿 鐐
diff --git a/el_GR.ISO8859-7/books/handbook/mirrors/chapter.xml b/el_GR.ISO8859-7/books/handbook/mirrors/chapter.xml
index e8e879bbc4..4f54ea2d93 100644
--- a/el_GR.ISO8859-7/books/handbook/mirrors/chapter.xml
+++ b/el_GR.ISO8859-7/books/handbook/mirrors/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-7" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-7"?>
<!--
孲 顯灚濄蛷濈 鐐 FreeBSD: 厞 魨 鎚橀醲 鐐 FreeBSD
@@ -212,6 +212,10 @@
樇摠錆臲濋椯 斀壚椯 匷罽殢趛 摿暡楒瀍酃 鍷蠮齌黀 蜒 縔鳺 site
謯鼁縔鐒:</para>
+ &chap.mirrors.ftp.index.inc;
+
+ &chap.mirrors.lastmod.inc;
+
&chap.mirrors.ftp.inc;
</sect1>
@@ -2376,6 +2380,10 @@ doc/zh_*</screen>
<para>泫瀎橀醲 罅 碫橀醲 槴臝趡殦踣椯 <link linkend="cvsup">CVSup</link>
蜒 鐐 &os; 黀澽 摓錝纇殣 鐐豵鳺鵸殣:</para>
+ &chap.mirrors.cvsup.index.inc;
+
+ &chap.mirrors.lastmod.inc;
+
&chap.mirrors.cvsup.inc;
</sect2>
</sect1>
diff --git a/el_GR.ISO8859-7/books/handbook/multimedia/chapter.xml b/el_GR.ISO8859-7/books/handbook/multimedia/chapter.xml
index d6f26eedf2..f8368676da 100644
--- a/el_GR.ISO8859-7/books/handbook/multimedia/chapter.xml
+++ b/el_GR.ISO8859-7/books/handbook/multimedia/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-7" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-7"?>
<!--
孲 顯灚濄蛷濈 鐐 FreeBSD: 厞錴徾鶋
@@ -1667,7 +1667,7 @@ bktr0: Pinnacle/Miro TV, Philips SECAM tuner.</programlisting>
<para>顯罼酃黀祼醲 鐋 瘌鵰 麧儌徾薋 鐐 MythTV:</para>
- <screen>&prompt.root; <userinput>mysql -uroot -p < /usr/local/share/mythtv/database/mc.sql</userinput></screen>
+ <screen>&prompt.root; <userinput>mysql -uroot -p &lt; /usr/local/share/mythtv/database/mc.sql</userinput></screen>
<para>欬鳻裍醲 鐐 backend:</para>
diff --git a/el_GR.ISO8859-7/books/handbook/network-servers/chapter.xml b/el_GR.ISO8859-7/books/handbook/network-servers/chapter.xml
index cf3eaab2a0..824db9b047 100644
--- a/el_GR.ISO8859-7/books/handbook/network-servers/chapter.xml
+++ b/el_GR.ISO8859-7/books/handbook/network-servers/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-7" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-7"?>
<!--
孲 顯灚濄蛷濈 鐐 FreeBSD: 鷥臝趡殦踣椯 灌臲瀦
diff --git a/el_GR.ISO8859-7/books/handbook/pgpkeys/chapter.xml b/el_GR.ISO8859-7/books/handbook/pgpkeys/chapter.xml
index 4bfb7574f2..f3876f083a 100644
--- a/el_GR.ISO8859-7/books/handbook/pgpkeys/chapter.xml
+++ b/el_GR.ISO8859-7/books/handbook/pgpkeys/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-7" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-7"?>
<!--
孲 顯灚濄蛷濈 鐐 FreeBSD: 抔樥僸 PGP
diff --git a/el_GR.ISO8859-7/books/handbook/ports/chapter.xml b/el_GR.ISO8859-7/books/handbook/ports/chapter.xml
index 8f9f091262..c63420e884 100644
--- a/el_GR.ISO8859-7/books/handbook/ports/chapter.xml
+++ b/el_GR.ISO8859-7/books/handbook/ports/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-7" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-7"?>
<!--
孲 顯灚濄蛷濈 鐐 FreeBSD: 顯罼轗黀摷 癲摙斀裻: Packages 罼 Ports
diff --git a/el_GR.ISO8859-7/books/handbook/ppp-and-slip/chapter.xml b/el_GR.ISO8859-7/books/handbook/ppp-and-slip/chapter.xml
index ef5b3378ea..61f24b024f 100644
--- a/el_GR.ISO8859-7/books/handbook/ppp-and-slip/chapter.xml
+++ b/el_GR.ISO8859-7/books/handbook/ppp-and-slip/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-7" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-7"?>
<!--
孲 顯灚濄蛷濈 鐐 FreeBSD: PPP 罼 SLIP
diff --git a/el_GR.ISO8859-7/books/handbook/preface/preface.xml b/el_GR.ISO8859-7/books/handbook/preface/preface.xml
index 6d945c2eff..3008e81f47 100644
--- a/el_GR.ISO8859-7/books/handbook/preface/preface.xml
+++ b/el_GR.ISO8859-7/books/handbook/preface/preface.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-7" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-7"?>
<!--
孲 顯灚濄蛷濈 鐐 FreeBSD: 哢錝蜧
diff --git a/el_GR.ISO8859-7/books/handbook/printing/chapter.xml b/el_GR.ISO8859-7/books/handbook/printing/chapter.xml
index c5c5eb6f86..d39064cba6 100644
--- a/el_GR.ISO8859-7/books/handbook/printing/chapter.xml
+++ b/el_GR.ISO8859-7/books/handbook/printing/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-7" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-7"?>
<!--
孲 顯灚濄蛷濈 鐐 FreeBSD: 髑鏷蹧鵴澽
diff --git a/el_GR.ISO8859-7/books/handbook/security/chapter.xml b/el_GR.ISO8859-7/books/handbook/security/chapter.xml
index ce0a37b849..4a0eaae769 100644
--- a/el_GR.ISO8859-7/books/handbook/security/chapter.xml
+++ b/el_GR.ISO8859-7/books/handbook/security/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-7" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-7"?>
<!--
孲 顯灚濄蛷濈 鐐 FreeBSD: 闆孌錼殧
diff --git a/el_GR.ISO8859-7/books/handbook/serialcomms/chapter.xml b/el_GR.ISO8859-7/books/handbook/serialcomms/chapter.xml
index 1e1d557673..b309e8b819 100644
--- a/el_GR.ISO8859-7/books/handbook/serialcomms/chapter.xml
+++ b/el_GR.ISO8859-7/books/handbook/serialcomms/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-7" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-7"?>
<!--
孲 顯灚濄蛷濈 鐐 FreeBSD: 趵濄殧縥 黴濋毉薋繄殣
diff --git a/el_GR.ISO8859-7/books/handbook/users/chapter.xml b/el_GR.ISO8859-7/books/handbook/users/chapter.xml
index 9b49303608..3377c0f694 100644
--- a/el_GR.ISO8859-7/books/handbook/users/chapter.xml
+++ b/el_GR.ISO8859-7/books/handbook/users/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-7" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-7"?>
<!--
孲 顯灚濄蛷濈 鐐 FreeBSD: 郩祼醲 罼 轍鶅縤 灌暠橀齌鵰 呤蝁齌摷檎
diff --git a/el_GR.ISO8859-7/books/handbook/vinum/chapter.xml b/el_GR.ISO8859-7/books/handbook/vinum/chapter.xml
index 8ff93bc5df..4d6b51e7bf 100644
--- a/el_GR.ISO8859-7/books/handbook/vinum/chapter.xml
+++ b/el_GR.ISO8859-7/books/handbook/vinum/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-7" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-7"?>
<!--
孲 顯灚濄蛷濈 鐐 FreeBSD: 灌暠樥齌黀硻 崦檛 Vinum
diff --git a/el_GR.ISO8859-7/books/handbook/virtualization/chapter.xml b/el_GR.ISO8859-7/books/handbook/virtualization/chapter.xml
index b55c5811fb..dd2f79e415 100644
--- a/el_GR.ISO8859-7/books/handbook/virtualization/chapter.xml
+++ b/el_GR.ISO8859-7/books/handbook/virtualization/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-7" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-7"?>
<!--
孲 顯灚濄蛷濈 鐐 FreeBSD: 體膬臄膬豵蛖鵰
@@ -1026,7 +1026,7 @@ xenbr1 8000.feffffffffff no vif0.1
role="package">emulators/virtualbox-ose-additions</filename>
黀 灖錝鍷臩懤臩 &os; 錼濊瀦鼖濋.</para>
- <screen>&prompt.root; <userinput>cd /usr/ports/emulators/virtualbox-ose-additions && make install clean</userinput></screen>
+ <screen>&prompt.root; <userinput>cd /usr/ports/emulators/virtualbox-ose-additions &amp;&amp; make install clean</userinput></screen>
<para>哢瀀魦黀 鏻 謯鼁縔鐒 蜤摐徾 黀
<filename>/etc/rc.conf</filename>:</para>
diff --git a/el_GR.ISO8859-7/books/handbook/x11/chapter.xml b/el_GR.ISO8859-7/books/handbook/x11/chapter.xml
index d709336dd8..30231906f0 100644
--- a/el_GR.ISO8859-7/books/handbook/x11/chapter.xml
+++ b/el_GR.ISO8859-7/books/handbook/x11/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-7" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-7"?>
<!--
孲 顯灚濄蛷濈 鐐 FreeBSD: 孲 郤黀賚 X Window
@@ -336,7 +336,7 @@
僸摓瀌澞轘 鐋 纆瀔檽踠趛 X Window System 鐐 X.Org Foundation,
罼 橀罅 摿毉臲燽 蕘僸罼. <application>&xorg;</application> 橀罅
皸鶅鶂楜濿 黀瀍 蕘僸罼 鐐
- <application>&xfree86&nbsp;4.4RC2</application> 罼 鐐 X11R6.6.
+ <application>&xfree86;&nbsp;4.4RC2</application> 罼 鐐 X11R6.6.
椻儌鵰 鐐 <application>&xorg;</application> 豵 僸敳蛵殦摋
摫 鐋 郚錭檶 鐒 Ports 鐐 &os; 橀罅 &xorg.version;.</para>
diff --git a/el_GR.ISO8859-7/share/xml/catalog b/el_GR.ISO8859-7/share/xml/catalog
deleted file mode 100644
index 3effaf96b0..0000000000
--- a/el_GR.ISO8859-7/share/xml/catalog
+++ /dev/null
@@ -1,60 +0,0 @@
- -- ...................................................................... --
- -- FreeBSD SGML Public Identifiers ...................................... --
-
- -- $FreeBSD$
- --
- -- %SOURCE% en_US.ISO8859-1/share/xml/catalog
- -- %SRCID% 1.5
-
- -- It doesn't make sense to translate all the entity files of the
- -- FreeBSD docs to Greek; some of the entities are better left off in
- -- their original English version. Please use your judgement wisely
- -- when adding new entity translations to the Greek translations.
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EL"
- "entities.ent"
-
-PUBLIC "-//FreeBSD//DOCUMENT DocBook Stylesheet//EN"
- "freebsd.dsl"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook Miscellaneous FreeBSD Entities//EN"
- "../../../share/xml/freebsd.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook Miscellaneous FreeBSD Entities//EL"
- "freebsd.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook Glossary Entities//EL"
- "glossary.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//EL"
- "mailing-lists.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook Newsgroup Entities//EL"
- "newsgroups.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook Team Entities//EL"
- "teams.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//EL"
- "trademarks.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook Translator Entities//EL"
- "translators.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook Language Specific Entities//EN"
- "l10n.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook URL Entities//EL"
- "urls.ent"
-
- -- ...................................................................... --
- -- HTML docs ............................................................ --
-
-PUBLIC "-//FreeBSD//ENTITIES FreeBSD L10N Entities//EN"
- "l10n.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES HTML FreeBSD Header L10N Entities//EN"
- "header.l10n.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES HTML FreeBSD Navigation Bar L10N Entities//EN"
- "navibar.l10n.ent"
diff --git a/el_GR.ISO8859-7/share/xml/catalog.xml b/el_GR.ISO8859-7/share/xml/catalog.xml
index 12c0f02504..a3feec86ca 100644
--- a/el_GR.ISO8859-7/share/xml/catalog.xml
+++ b/el_GR.ISO8859-7/share/xml/catalog.xml
@@ -9,4 +9,8 @@
rewritePrefix="../../"/>
<rewriteURI uriStartString="http://www.FreeBSD.org/XML/www/lang/"
rewritePrefix="../../"/>
+
+ <public
+ publicId="-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN"
+ uri="entities.ent" />
</catalog>
diff --git a/el_GR.ISO8859-7/share/xml/entities.ent b/el_GR.ISO8859-7/share/xml/entities.ent
index ad55947dbf..7a156813e3 100644
--- a/el_GR.ISO8859-7/share/xml/entities.ent
+++ b/el_GR.ISO8859-7/share/xml/entities.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="iso-8859-7"?>
<!--
砉澞斀 摫 entities 豵 橀罅 虀祼濇毉 鵴 錆 酃 睾碲葐 鐐 罼酃錪蜧
@@ -12,50 +13,57 @@
-->
-<!ENTITY % l10n PUBLIC "-//FreeBSD//ENTITIES DocBook Language Specific Entities//EN">
+<!ENTITY % l10n PUBLIC "-//FreeBSD//ENTITIES DocBook Language Specific Entities//EN"
+ "l10n.ent">
%l10n;
-<!ENTITY % l10n-common PUBLIC "-//FreeBSD//ENTITIES DocBook Language Neutral Entities//EN">
-%l10n-common;
-<!ENTITY % translators PUBLIC "-//FreeBSD//ENTITIES DocBook Translator Entities//EL">
+<!ENTITY % translators PUBLIC "-//FreeBSD//ENTITIES DocBook Translator Entities//EL"
+ "translators.ent">
%translators;
-<!ENTITY % mailing-lists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//EL">
+<!ENTITY % mailing-lists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//EL"
+ "mailing-lists.ent">
%mailing-lists;
-<!ENTITY % teams PUBLIC "-//FreeBSD//ENTITIES DocBook Team Entities//EL">
+<!ENTITY % teams PUBLIC "-//FreeBSD//ENTITIES DocBook Team Entities//EL"
+ "teams.ent">
%teams;
-<!ENTITY % newsgroups PUBLIC "-//FreeBSD//ENTITIES DocBook Newsgroup Entities//EL">
+<!ENTITY % newsgroups PUBLIC "-//FreeBSD//ENTITIES DocBook Newsgroup Entities//EL"
+ "newsgroups.ent">
%newsgroups;
-<!ENTITY % man PUBLIC "-//FreeBSD//ENTITIES DocBook Manual Page Entities//EN">
-%man;
-<!ENTITY % glossary PUBLIC "-//FreeBSD//ENTITIES DocBook Glossary Entities//EL">
+<!ENTITY % glossary PUBLIC "-//FreeBSD//ENTITIES DocBook Glossary Entities//EL"
+ "glossary.ent">
%glossary;
<!-- 鵴濄 鐒 %freebsd.el; 罼 %freebsd; 橀罅 鵰憼薀濋.
哢濻殥摋鐋酃 歃瀦 酃 entities 豵 瀎蛺瀍酃 貘酃. 哢酃 瀎蛺瀍酃
鶋 歃瀦 懤酃瓕摷醲 黀 鱔錣臄縔, 酃 臝錝潞 楒艬薀摋 摫 鐋
錨蜱濋 椻儌鵰 -->
-<!ENTITY % freebsd.el PUBLIC "-//FreeBSD//ENTITIES DocBook Miscellaneous FreeBSD Entities//EL">
+<!ENTITY % freebsd.el PUBLIC "-//FreeBSD//ENTITIES DocBook Miscellaneous FreeBSD Entities//EL"
+ "freebsd.ent">
%freebsd.el;
-<!ENTITY % freebsd PUBLIC "-//FreeBSD//ENTITIES DocBook Miscellaneous FreeBSD Entities//EN">
+<!ENTITY % freebsd PUBLIC "-//FreeBSD//ENTITIES DocBook Miscellaneous FreeBSD Entities//EN"
+ "nonexistent">
%freebsd;
-
-<!ENTITY % authors PUBLIC "-//FreeBSD//ENTITIES DocBook Author Entities//EN">
-%authors;
-<!ENTITY % teams PUBLIC "-//FreeBSD//ENTITIES DocBook Team Entities//EL">
+<!ENTITY % teams PUBLIC "-//FreeBSD//ENTITIES DocBook Team Entities//EL"
+ "teams.ent">
%teams;
-<!ENTITY % mailing-lists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//EL">
+<!ENTITY % mailing-lists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//EL"
+ "mailing-lists.ent">
%mailing-lists;
-<!ENTITY % newsgroups PUBLIC "-//FreeBSD//ENTITIES DocBook Newsgroup Entities//EL">
+<!ENTITY % newsgroups PUBLIC "-//FreeBSD//ENTITIES DocBook Newsgroup Entities//EL"
+ "newsgroups.ent">
%newsgroups;
-<!ENTITY % trademarks PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//EL">
+<!ENTITY % trademarks PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//EL"
+ "trademarks.ent">
%trademarks;
<!-- 鵴濄 鐒 %urls.el; 罼 %urls; 橀罅 鵰憼薀濋.
哢濻殥摋鐋酃 歃瀦 酃 entities 豵 瀎蛺瀍酃 貘酃. 哢酃 瀎蛺瀍酃
鶋 歃瀦 懤酃瓕摷醲 黀 鱔錣臄縔, 酃 臝錝潞 楒艬薀摋 摫 鐋
錨蜱濋 椻儌鵰 -->
-<!ENTITY % urls.el PUBLIC "-//FreeBSD//ENTITIES DocBook URL Entities//EL">
+<!ENTITY % urls.el PUBLIC "-//FreeBSD//ENTITIES DocBook URL Entities//EL"
+ "urls.ent">
%urls.el;
-<!ENTITY % urls PUBLIC "-//FreeBSD//ENTITIES DocBook URL Entities//EN">
+<!ENTITY % urls PUBLIC "-//FreeBSD//ENTITIES DocBook URL Entities//EN"
+ "nonexistent">
%urls;
<!--
diff --git a/el_GR.ISO8859-7/share/xml/freebsd.ent b/el_GR.ISO8859-7/share/xml/freebsd.ent
index 783ac46705..4f62e17b80 100644
--- a/el_GR.ISO8859-7/share/xml/freebsd.ent
+++ b/el_GR.ISO8859-7/share/xml/freebsd.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="iso-8859-7"?>
<!--
灌媺瀎 DocBook Entities 蜒 鐐 FreeBSD Project.
diff --git a/el_GR.ISO8859-7/share/xml/l10n.ent b/el_GR.ISO8859-7/share/xml/l10n.ent
index 9fe0efeefd..12ba0ae45d 100644
--- a/el_GR.ISO8859-7/share/xml/l10n.ent
+++ b/el_GR.ISO8859-7/share/xml/l10n.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="iso-8859-7"?>
<!--
凊鼁懤鐙瀔檽踠 鐒 黀毉灚裐 謻檹蜭鵰 罼 鐐 HTML charset 鐋 醲膵趡裐鵰
diff --git a/el_GR.ISO8859-7/share/xml/mailing-lists.ent b/el_GR.ISO8859-7/share/xml/mailing-lists.ent
index b75e42da12..314654ee0d 100644
--- a/el_GR.ISO8859-7/share/xml/mailing-lists.ent
+++ b/el_GR.ISO8859-7/share/xml/mailing-lists.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="iso-8859-7"?>
<!--
砅憼酃 摫 鏻 錈黀殣 賨樏鐙瀍濋燽 酃蘻儊瀌橀瀦 鐐 FreeBSD,
diff --git a/el_GR.ISO8859-7/share/xml/newsgroups.ent b/el_GR.ISO8859-7/share/xml/newsgroups.ent
index b937d55599..b43cf09bb9 100644
--- a/el_GR.ISO8859-7/share/xml/newsgroups.ent
+++ b/el_GR.ISO8859-7/share/xml/newsgroups.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="iso-8859-7"?>
<!--
砅憼酃 砒塤 郚緗轘鵴 Usenet 蜒 鐐 FreeBSD
diff --git a/el_GR.ISO8859-7/share/xml/teams.ent b/el_GR.ISO8859-7/share/xml/teams.ent
index 54a2782dac..4465078694 100644
--- a/el_GR.ISO8859-7/share/xml/teams.ent
+++ b/el_GR.ISO8859-7/share/xml/teams.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="iso-8859-7"?>
<!--
婛 瀍憼酃 罼 毉 僸氁噠鵴澽 鐒 瀌塤 豵 歃瀦 黼蜺樏齌徾耬
diff --git a/el_GR.ISO8859-7/share/xml/trademarks.ent b/el_GR.ISO8859-7/share/xml/trademarks.ent
index 520d80b930..a9aa5958de 100644
--- a/el_GR.ISO8859-7/share/xml/trademarks.ent
+++ b/el_GR.ISO8859-7/share/xml/trademarks.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="iso-8859-7"?>
<!--
咂黀 罼鐐蘻夒徾薋 黼懧錩 罼 樦豵齌蕘 黼懧錩, 蹠 摫敳橀酃
diff --git a/el_GR.ISO8859-7/share/xml/translators.ent b/el_GR.ISO8859-7/share/xml/translators.ent
index 90b9e081d8..e851501192 100644
--- a/el_GR.ISO8859-7/share/xml/translators.ent
+++ b/el_GR.ISO8859-7/share/xml/translators.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="iso-8859-7"?>
<!--
砅憼酃 罼 僸氁噠薃樥 賨樏鐙瀍濋硻 摠錣錝蜤暡葐 鐒 懤錌 鐋
diff --git a/el_GR.ISO8859-7/share/xml/urls.ent b/el_GR.ISO8859-7/share/xml/urls.ent
index 8658f8c6de..365c42d573 100644
--- a/el_GR.ISO8859-7/share/xml/urls.ent
+++ b/el_GR.ISO8859-7/share/xml/urls.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="iso-8859-7"?>
<!--
URLs 豵 歃瀦 齀楻 檇臩 懤 鐋 鱔錣臄縤 婍膵趡裐鵰 鐐 FreeBSD.
diff --git a/en_US.ISO8859-1/articles/bsdl-gpl/article.xml b/en_US.ISO8859-1/articles/bsdl-gpl/article.xml
index 74ceada1fc..8f9bb5f693 100644
--- a/en_US.ISO8859-1/articles/bsdl-gpl/article.xml
+++ b/en_US.ISO8859-1/articles/bsdl-gpl/article.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN" "../../share/xml/entities.ent">
-%entities;
-]>
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<article lang='en'>
<title>Why you should use a BSD style license for your Open Source Project</title>
diff --git a/en_US.ISO8859-1/articles/building-products/article.xml b/en_US.ISO8859-1/articles/building-products/article.xml
index 16ab5ec83f..a570e7834c 100644
--- a/en_US.ISO8859-1/articles/building-products/article.xml
+++ b/en_US.ISO8859-1/articles/building-products/article.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN" "../../share/xml/entities.ent">
-%entities;
-]>
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<article lang='en'>
<articleinfo>
diff --git a/en_US.ISO8859-1/articles/casestudy-argentina.com/article.xml b/en_US.ISO8859-1/articles/casestudy-argentina.com/article.xml
index 1b8fcfe06e..3f1e4c7121 100644
--- a/en_US.ISO8859-1/articles/casestudy-argentina.com/article.xml
+++ b/en_US.ISO8859-1/articles/casestudy-argentina.com/article.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN" "../../share/xml/entities.ent">
-%entities;
-]>
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<article lang='en'>
<title>Argentina.com : A Case Study</title>
diff --git a/en_US.ISO8859-1/articles/committers-guide/article.xml b/en_US.ISO8859-1/articles/committers-guide/article.xml
index f94bc0e27c..76ba7fc331 100644
--- a/en_US.ISO8859-1/articles/committers-guide/article.xml
+++ b/en_US.ISO8859-1/articles/committers-guide/article.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN" "../../share/xml/entities.ent">
-%entities;
-]>
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<article lang='en'>
<articleinfo>
@@ -3707,7 +3704,7 @@ ControlPersist yes</screen>
specifically permitted by portmgr. Complete details
about what qualifies as a sweeping change can be found
on the <ulink
- url="&url.base/portmgr;/implementation.html">Portmgr
+ url="&url.base;/portmgr/implementation.html">Portmgr
Implementation page</ulink>.</para>
<para>The benefit of a slush as opposed to a complete
diff --git a/en_US.ISO8859-1/articles/compiz-fusion/article.xml b/en_US.ISO8859-1/articles/compiz-fusion/article.xml
index 5ee28becd1..3c30a2b898 100644
--- a/en_US.ISO8859-1/articles/compiz-fusion/article.xml
+++ b/en_US.ISO8859-1/articles/compiz-fusion/article.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN" "../../share/xml/entities.ent">
-%entities;
-]>
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<article lang="en">
<articleinfo>
diff --git a/en_US.ISO8859-1/articles/console-server/article.xml b/en_US.ISO8859-1/articles/console-server/article.xml
index 0207854871..3ba3b11ca0 100644
--- a/en_US.ISO8859-1/articles/console-server/article.xml
+++ b/en_US.ISO8859-1/articles/console-server/article.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN" "../../share/xml/entities.ent">
-%entities;
-]>
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<article lang='en'>
<articleinfo>
diff --git a/en_US.ISO8859-1/articles/contributing-ports/article.xml b/en_US.ISO8859-1/articles/contributing-ports/article.xml
index 6b81d92b01..f9778f0e7d 100644
--- a/en_US.ISO8859-1/articles/contributing-ports/article.xml
+++ b/en_US.ISO8859-1/articles/contributing-ports/article.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN" "../../share/xml/entities.ent">
-%entities;
-]>
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<article lang='en'>
<articleinfo>
diff --git a/en_US.ISO8859-1/articles/contributing/article.xml b/en_US.ISO8859-1/articles/contributing/article.xml
index c938c2e239..ac6d5f2450 100644
--- a/en_US.ISO8859-1/articles/contributing/article.xml
+++ b/en_US.ISO8859-1/articles/contributing/article.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN" "../../share/xml/entities.ent">
-%entities;
-]>
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<article lang='en'>
<articleinfo>
diff --git a/en_US.ISO8859-1/articles/contributors/article.xml b/en_US.ISO8859-1/articles/contributors/article.xml
index 3f5733ecf8..895a9633f1 100644
--- a/en_US.ISO8859-1/articles/contributors/article.xml
+++ b/en_US.ISO8859-1/articles/contributors/article.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN" "../../share/xml/entities.ent">
-%entities;
-
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd" [
<!ENTITY % contrib.ent SYSTEM "contrib.ent">
%contrib.ent;
<!ENTITY % not.published "IGNORE">
diff --git a/en_US.ISO8859-1/articles/contributors/contrib.386bsd.xml b/en_US.ISO8859-1/articles/contributors/contrib.386bsd.xml
index 1d9100b739..398ff330aa 100644
--- a/en_US.ISO8859-1/articles/contributors/contrib.386bsd.xml
+++ b/en_US.ISO8859-1/articles/contributors/contrib.386bsd.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!-- $FreeBSD$ -->
<itemizedlist>
diff --git a/en_US.ISO8859-1/articles/contributors/contrib.additional.xml b/en_US.ISO8859-1/articles/contributors/contrib.additional.xml
index acc0e01736..fa3b55279e 100644
--- a/en_US.ISO8859-1/articles/contributors/contrib.additional.xml
+++ b/en_US.ISO8859-1/articles/contributors/contrib.additional.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!-- $FreeBSD$ -->
<!--
NOTE TO COMMITTERS: Contributors lists are sorted in alphabetical
diff --git a/en_US.ISO8859-1/articles/contributors/contrib.committers.xml b/en_US.ISO8859-1/articles/contributors/contrib.committers.xml
index 1a2ad8278f..07b1018b5c 100644
--- a/en_US.ISO8859-1/articles/contributors/contrib.committers.xml
+++ b/en_US.ISO8859-1/articles/contributors/contrib.committers.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!-- $FreeBSD$ -->
<!--
NOTE TO NEW COMMITTERS: Core and committers lists are sorted in
diff --git a/en_US.ISO8859-1/articles/contributors/contrib.corealumni.xml b/en_US.ISO8859-1/articles/contributors/contrib.corealumni.xml
index f6027c1e48..45028ce029 100644
--- a/en_US.ISO8859-1/articles/contributors/contrib.corealumni.xml
+++ b/en_US.ISO8859-1/articles/contributors/contrib.corealumni.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!-- $FreeBSD$ -->
<itemizedlist>
diff --git a/en_US.ISO8859-1/articles/contributors/contrib.develalumni.xml b/en_US.ISO8859-1/articles/contributors/contrib.develalumni.xml
index eb2115449b..e11b6ff7f4 100644
--- a/en_US.ISO8859-1/articles/contributors/contrib.develalumni.xml
+++ b/en_US.ISO8859-1/articles/contributors/contrib.develalumni.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!-- $FreeBSD$ -->
<itemizedlist>
diff --git a/en_US.ISO8859-1/articles/contributors/contrib.develinmemoriam.xml b/en_US.ISO8859-1/articles/contributors/contrib.develinmemoriam.xml
index 8516d79d8d..4c7d03fe7c 100644
--- a/en_US.ISO8859-1/articles/contributors/contrib.develinmemoriam.xml
+++ b/en_US.ISO8859-1/articles/contributors/contrib.develinmemoriam.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!-- $FreeBSD$ -->
<itemizedlist>
diff --git a/en_US.ISO8859-1/articles/cups/article.xml b/en_US.ISO8859-1/articles/cups/article.xml
index 35c13dfcc9..7f4f83578b 100644
--- a/en_US.ISO8859-1/articles/cups/article.xml
+++ b/en_US.ISO8859-1/articles/cups/article.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN" "../../share/xml/entities.ent">
-%entities;
-]>
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<article lang='en'>
<articleinfo>
diff --git a/en_US.ISO8859-1/articles/custom-gcc/article.xml b/en_US.ISO8859-1/articles/custom-gcc/article.xml
index 95c88263d6..f003443fe1 100644
--- a/en_US.ISO8859-1/articles/custom-gcc/article.xml
+++ b/en_US.ISO8859-1/articles/custom-gcc/article.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN" "../../share/xml/entities.ent">
-%entities;
-]>
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<article lang='en'>
<articleinfo>
@@ -77,7 +74,7 @@
<application>binutils</application> using the &os; ports tree,
issue the following command:</para>
- <screen>&prompt.root; <userinput>cd /usr/ports/devel/binutils && make install</userinput></screen>
+ <screen>&prompt.root; <userinput>cd /usr/ports/devel/binutils &amp;&amp; make install</userinput></screen>
</sect2>
<sect2 id="installing-gcc">
@@ -94,7 +91,7 @@
<application>GCC</application> ports, run the following
command:</para>
- <screen>&prompt.root; <userinput>cd /usr/ports/lang/<replaceable>gcc44</replaceable> && make install</userinput></screen>
+ <screen>&prompt.root; <userinput>cd /usr/ports/lang/<replaceable>gcc44</replaceable> &amp;&amp; make install</userinput></screen>
</sect2>
</sect1>
@@ -113,7 +110,7 @@
<filename>/etc/make.conf</filename> file (or modify
appropriately):</para>
- <programlisting>.if !empty(.CURDIR:M/usr/ports/*) && exists(/usr/local/bin/gcc44)
+ <programlisting>.if !empty(.CURDIR:M/usr/ports/*) &amp;&amp; exists(/usr/local/bin/gcc44)
CC=gcc44
CXX=g++44
CPP=cpp44
@@ -172,7 +169,7 @@ libstdc++.so.6 gcc44/libstdc++.so.6</programlisting>
<filename>/etc/make.conf</filename> according to the following
example:</para>
- <programlisting>.if !empty(.CURDIR:M/usr/ports/*) && exists(/usr/local/bin/gcc44)
+ <programlisting>.if !empty(.CURDIR:M/usr/ports/*) &amp;&amp; exists(/usr/local/bin/gcc44)
CC=gcc44
CXX=g++44
CPP=cpp44
@@ -195,7 +192,7 @@ CFLAGS+=-mssse3
<filename>/etc/make.conf</filename> according to the following
example:</para>
- <programlisting>.if !empty(.CURDIR:M/usr/ports/*) && exists(/usr/local/bin/gcc44)
+ <programlisting>.if !empty(.CURDIR:M/usr/ports/*) &amp;&amp; exists(/usr/local/bin/gcc44)
.if empty(.CURDIR:M/usr/ports/net/openldap*)
CC=gcc44
CXX=g++44
@@ -208,7 +205,7 @@ CPP=cpp44
<filename role="package">net/openldap</filename>* ports. It is
also possible to specify more ports on a single line:</para>
- <programlisting>.if empty(.CURDIR:M/usr/ports/net/openldap*) && empty(.CURDIR:M/usr/ports/xxx/yyy) && ...</programlisting>
+ <programlisting>.if empty(.CURDIR:M/usr/ports/net/openldap*) &amp;&amp; empty(.CURDIR:M/usr/ports/xxx/yyy) &amp;&amp; ...</programlisting>
</sect2>
</sect1>
diff --git a/en_US.ISO8859-1/articles/cvs-freebsd/article.xml b/en_US.ISO8859-1/articles/cvs-freebsd/article.xml
index e19b4b3dd8..ddf0d2845b 100644
--- a/en_US.ISO8859-1/articles/cvs-freebsd/article.xml
+++ b/en_US.ISO8859-1/articles/cvs-freebsd/article.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN" "../../share/xml/entities.ent">
-%entities;
-]>
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<article lang='en'>
<articleinfo>
diff --git a/en_US.ISO8859-1/articles/cvsup-advanced/article.xml b/en_US.ISO8859-1/articles/cvsup-advanced/article.xml
index e8c2be4f07..c8128e0106 100644
--- a/en_US.ISO8859-1/articles/cvsup-advanced/article.xml
+++ b/en_US.ISO8859-1/articles/cvsup-advanced/article.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN" "../../share/xml/entities.ent">
-%entities;
-]>
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<article lang='en'>
<articleinfo>
diff --git a/en_US.ISO8859-1/articles/explaining-bsd/article.xml b/en_US.ISO8859-1/articles/explaining-bsd/article.xml
index ef3d40ccaa..eb6f1530d5 100644
--- a/en_US.ISO8859-1/articles/explaining-bsd/article.xml
+++ b/en_US.ISO8859-1/articles/explaining-bsd/article.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN" "../../share/xml/entities.ent">
-%entities;
-]>
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<!-- $FreeBSD$ -->
<!-- The FreeBSD Documentation Project -->
diff --git a/en_US.ISO8859-1/articles/fbsd-from-scratch/article.xml b/en_US.ISO8859-1/articles/fbsd-from-scratch/article.xml
index 3ca6798cca..8adbfcb619 100644
--- a/en_US.ISO8859-1/articles/fbsd-from-scratch/article.xml
+++ b/en_US.ISO8859-1/articles/fbsd-from-scratch/article.xml
@@ -1,12 +1,10 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN" "../../share/xml/entities.ent">
-%entities;
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd" [
<!ENTITY scratch.ap "<application>FreeBSD From Scratch</application>">
]>
-<article lang='en'>
+<article xmlns:xi="http://www.w3.org/2001/XInclude" lang='en'>
<articleinfo>
<title>FreeBSD From Scratch</title>
@@ -383,7 +381,7 @@ Do you wish to delete what is left of /var/tmp/temproot.stage1? [no] <userinput>
which you need to modify substantially. The comments give you
enough information what to change.</para>
-<programlisting><inlinegraphic fileref="stage_1.conf.default" format="linespecific"/></programlisting>
+<programlisting><xi:include href="stage_1.conf.default" parse="text"/></programlisting>
<para>Download <ulink
url="stage_1.conf.default"><filename>stage_1.conf.default</filename>
@@ -487,7 +485,7 @@ news inn-stable CONFIGURE_ARGS="--enable-uucp-rnews --enable-setgid-inews"
<filename>LOGDIR/category+port</filename> is created for each port
it actually installs.</para>
-<programlisting><inlinegraphic fileref="stage_2.conf.default" format="linespecific"/></programlisting>
+<programlisting><xi:include href="stage_2.conf.default" parse="text"/></programlisting>
<para>Download <ulink
url="stage_2.conf.default"><filename>stage_2.conf.default</filename></ulink>.</para>
@@ -588,7 +586,7 @@ fi
url="stage_1.sh"><filename>stage_1.sh</filename></ulink>
script, which you should not need to modify.</para>
-<programlisting><inlinegraphic fileref="stage_1.sh" format="linespecific"/></programlisting>
+<programlisting><xi:include href="stage_1.sh" parse="text"/></programlisting>
<para>Download <ulink
url="stage_1.sh"><filename>stage_1.sh</filename></ulink>.</para>
@@ -598,7 +596,7 @@ fi
script. You may want to modify the variables at the
beginning.</para>
-<programlisting><inlinegraphic fileref="stage_2.sh" format="linespecific"/></programlisting>
+<programlisting><xi:include href="stage_2.sh" parse="text"/></programlisting>
<para>Download <ulink
url="stage_2.sh"><filename>stage_2.sh</filename></ulink>.</para>
@@ -607,7 +605,7 @@ fi
url="stage_3.mk"><filename>stage_3.mk</filename></ulink> to
give you an idea how to automate all reconfiguration.</para>
-<programlisting><inlinegraphic fileref="stage_3.mk" format="linespecific"/></programlisting>
+<programlisting><xi:include href="stage_3.mk" parse="text"/></programlisting>
<para>Download <ulink
url="stage_3.mk"><filename>stage_3.mk</filename></ulink>.</para>
diff --git a/en_US.ISO8859-1/articles/filtering-bridges/article.xml b/en_US.ISO8859-1/articles/filtering-bridges/article.xml
index 0ff9690ad1..bf122f7872 100644
--- a/en_US.ISO8859-1/articles/filtering-bridges/article.xml
+++ b/en_US.ISO8859-1/articles/filtering-bridges/article.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN" "../../share/xml/entities.ent">
-%entities;
-]>
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<article lang='en'>
<articleinfo>
diff --git a/en_US.ISO8859-1/articles/fonts/article.xml b/en_US.ISO8859-1/articles/fonts/article.xml
index da22671ed1..8715ce7311 100644
--- a/en_US.ISO8859-1/articles/fonts/article.xml
+++ b/en_US.ISO8859-1/articles/fonts/article.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN" "../../share/xml/entities.ent">
-%entities;
-]>
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<!-- $FreeBSD$ -->
<!-- The FreeBSD Documentation Project -->
diff --git a/en_US.ISO8859-1/articles/freebsd-questions/article.xml b/en_US.ISO8859-1/articles/freebsd-questions/article.xml
index 22168dd0eb..63acc47dc7 100644
--- a/en_US.ISO8859-1/articles/freebsd-questions/article.xml
+++ b/en_US.ISO8859-1/articles/freebsd-questions/article.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN" "../../share/xml/entities.ent">
-%entities;
-]>
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<article lang='en'>
<articleinfo>
diff --git a/en_US.ISO8859-1/articles/freebsd-update-server/article.xml b/en_US.ISO8859-1/articles/freebsd-update-server/article.xml
index 53b381bf69..7f1aff1ba7 100644
--- a/en_US.ISO8859-1/articles/freebsd-update-server/article.xml
+++ b/en_US.ISO8859-1/articles/freebsd-update-server/article.xml
@@ -1,8 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN" "../../share/xml/entities.ent">
-%entities;
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd" [
<!ENTITY fbus.ap "<application>FreeBSD Update Server</application>">
]>
@@ -790,14 +788,14 @@ the new builds.</screen>
<screen> # Build the world
log "Building world"
- cd /usr/src &&
- make -j 2 ${COMPATFLAGS} buildworld 2>&1
+ cd /usr/src &amp;&amp;
+ make -j 2 ${COMPATFLAGS} buildworld 2>&amp;1
# Distribute the world
log "Distributing world"
- cd /usr/src/release &&
- make -j 2 obj &&
- make ${COMPATFLAGS} release.1 release.2 2>&1</screen>
+ cd /usr/src/release &amp;&amp;
+ make -j 2 obj &amp;&amp;
+ make ${COMPATFLAGS} release.1 release.2 2>&amp;1</screen>
</listitem>
<listitem>
diff --git a/en_US.ISO8859-1/articles/geom-class/article.xml b/en_US.ISO8859-1/articles/geom-class/article.xml
index 719fa5a2d6..bb33aaaf8d 100644
--- a/en_US.ISO8859-1/articles/geom-class/article.xml
+++ b/en_US.ISO8859-1/articles/geom-class/article.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN" "../../share/xml/entities.ent">
-%entities;
-]>
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<article lang='en'>
<title>Writing a GEOM Class</title>
diff --git a/en_US.ISO8859-1/articles/gjournal-desktop/article.xml b/en_US.ISO8859-1/articles/gjournal-desktop/article.xml
index cfd89a4664..c10b999ed6 100644
--- a/en_US.ISO8859-1/articles/gjournal-desktop/article.xml
+++ b/en_US.ISO8859-1/articles/gjournal-desktop/article.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN" "../../share/xml/entities.ent">
-%entities;
-]>
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<article lang="en">
<articleinfo>
diff --git a/en_US.ISO8859-1/articles/hubs/article.xml b/en_US.ISO8859-1/articles/hubs/article.xml
index 618ab9a107..c523a24e29 100644
--- a/en_US.ISO8859-1/articles/hubs/article.xml
+++ b/en_US.ISO8859-1/articles/hubs/article.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN" "../../share/xml/entities.ent">
-%entities;
-]>
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<article lang='en'>
<articleinfo>
diff --git a/en_US.ISO8859-1/articles/ipsec-must/article.xml b/en_US.ISO8859-1/articles/ipsec-must/article.xml
index 58a5db6ccb..80abb023d0 100644
--- a/en_US.ISO8859-1/articles/ipsec-must/article.xml
+++ b/en_US.ISO8859-1/articles/ipsec-must/article.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN" "../../share/xml/entities.ent">
-%entities;
-]>
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<!--
The FreeBSD Documentation Project
diff --git a/en_US.ISO8859-1/articles/laptop/article.xml b/en_US.ISO8859-1/articles/laptop/article.xml
index 524bc45724..c283427099 100644
--- a/en_US.ISO8859-1/articles/laptop/article.xml
+++ b/en_US.ISO8859-1/articles/laptop/article.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN" "../../share/xml/entities.ent">
-%entities;
-]>
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<article lang='en'>
<articleinfo>
diff --git a/en_US.ISO8859-1/articles/ldap-auth/article.xml b/en_US.ISO8859-1/articles/ldap-auth/article.xml
index 6a89f2429a..7f055fa72a 100644
--- a/en_US.ISO8859-1/articles/ldap-auth/article.xml
+++ b/en_US.ISO8859-1/articles/ldap-auth/article.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN" "../../share/xml/entities.ent">
-%entities;
-]>
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<article lang="en">
<articleinfo>
diff --git a/en_US.ISO8859-1/articles/linux-comparison/article.xml b/en_US.ISO8859-1/articles/linux-comparison/article.xml
index a2d1b85be5..3d24209113 100644
--- a/en_US.ISO8859-1/articles/linux-comparison/article.xml
+++ b/en_US.ISO8859-1/articles/linux-comparison/article.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN" "../../share/xml/entities.ent">
-%entities;
-]>
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<!--
Copyright (c) 2005 Dru Lavigne
diff --git a/en_US.ISO8859-1/articles/linux-emulation/article.xml b/en_US.ISO8859-1/articles/linux-emulation/article.xml
index 4cd9ddff17..0f7b4e9ee6 100644
--- a/en_US.ISO8859-1/articles/linux-emulation/article.xml
+++ b/en_US.ISO8859-1/articles/linux-emulation/article.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN" "../../share/xml/entities.ent">
-%entities;
-]>
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<!-- $FreeBSD$ -->
<!-- The FreeBSD Documentation Project -->
diff --git a/en_US.ISO8859-1/articles/linux-users/article.xml b/en_US.ISO8859-1/articles/linux-users/article.xml
index 7ab8662b66..d5a00d5dd6 100644
--- a/en_US.ISO8859-1/articles/linux-users/article.xml
+++ b/en_US.ISO8859-1/articles/linux-users/article.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN" "../../share/xml/entities.ent">
-%entities;
-]>
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<article lang='en'>
<articleinfo>
diff --git a/en_US.ISO8859-1/articles/mailing-list-faq/article.xml b/en_US.ISO8859-1/articles/mailing-list-faq/article.xml
index 10298fa7ae..d07bb9ee5e 100644
--- a/en_US.ISO8859-1/articles/mailing-list-faq/article.xml
+++ b/en_US.ISO8859-1/articles/mailing-list-faq/article.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN" "../../share/xml/entities.ent">
-%entities;
-]>
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<!-- $FreeBSD$ -->
<!-- The FreeBSD Documentation Project -->
diff --git a/en_US.ISO8859-1/articles/mh/article.xml b/en_US.ISO8859-1/articles/mh/article.xml
index 5dc3b56d0f..5f31506852 100644
--- a/en_US.ISO8859-1/articles/mh/article.xml
+++ b/en_US.ISO8859-1/articles/mh/article.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN" "../../share/xml/entities.ent">
-%entities;
-]>
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<!-- $FreeBSD$ -->
<!-- FreeBSD Documentation Project -->
diff --git a/en_US.ISO8859-1/articles/nanobsd/article.xml b/en_US.ISO8859-1/articles/nanobsd/article.xml
index 4f921c9c48..a126f2f99f 100644
--- a/en_US.ISO8859-1/articles/nanobsd/article.xml
+++ b/en_US.ISO8859-1/articles/nanobsd/article.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN" "../../share/xml/entities.ent">
-%entities;
-]>
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<article lang='en'>
<articleinfo>
diff --git a/en_US.ISO8859-1/articles/new-users/article.xml b/en_US.ISO8859-1/articles/new-users/article.xml
index ae0fff539e..8dac7048bd 100644
--- a/en_US.ISO8859-1/articles/new-users/article.xml
+++ b/en_US.ISO8859-1/articles/new-users/article.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN" "../../share/xml/entities.ent">
-%entities;
-]>
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<!-- $FreeBSD$ -->
<!-- The FreeBSD Documentation Project -->
diff --git a/en_US.ISO8859-1/articles/p4-primer/article.xml b/en_US.ISO8859-1/articles/p4-primer/article.xml
index 16f8c3ca5f..7d91e1212c 100644
--- a/en_US.ISO8859-1/articles/p4-primer/article.xml
+++ b/en_US.ISO8859-1/articles/p4-primer/article.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN" "../../share/xml/entities.ent">
-%entities;
-]>
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<article lang='en'>
<title>Perforce in &os; Development</title>
diff --git a/en_US.ISO8859-1/articles/pam/article.xml b/en_US.ISO8859-1/articles/pam/article.xml
index 75dfb6bef9..0bf1ea2848 100644
--- a/en_US.ISO8859-1/articles/pam/article.xml
+++ b/en_US.ISO8859-1/articles/pam/article.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN" "../../share/xml/entities.ent">
-%entities;
-]>
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<!--
- Copyright (c) 2001-2003 Networks Associates Technology, Inc.
@@ -39,7 +36,7 @@
- SUCH DAMAGE.
-->
-<article lang='en'>
+<article xmlns:xi="http://www.w3.org/2001/XInclude" lang='en'>
<articleinfo>
<title>Pluggable Authentication Modules</title>
@@ -1237,8 +1234,7 @@ sshd password required pam_permit.so</programlisting>
starting point, but should not be used in real-world
applications.</para>
-<programlisting><inlinegraphic fileref="pam_app.c"
- format="linespecific"/></programlisting>
+<programlisting><xi:include href="su.c" parse="text"/></programlisting>
</appendix>
<appendix id="pam-sample-module">
@@ -1251,8 +1247,7 @@ sshd password required pam_permit.so</programlisting>
&man.pam.get.authtok.3;, which enormously simplifies prompting
the user for a password.</para>
-<programlisting><inlinegraphic fileref="pam_module.c"
- format="linespecific"/></programlisting>
+<programlisting><xi:include href="pam_unix.c" parse="text"/></programlisting>
</appendix>
<appendix id="pam-sample-conv">
@@ -1268,8 +1263,7 @@ sshd password required pam_permit.so</programlisting>
your uses; we believe it to be as robust as a tty-oriented
conversation function can reasonably get.</para>
-<programlisting><inlinegraphic fileref="pam_conv.c"
- format="linespecific"/></programlisting>
+<programlisting><xi:include href="converse.c" parse="text"/></programlisting>
</appendix>
<bibliography id="pam-further">
diff --git a/en_US.ISO8859-1/articles/port-mentor-guidelines/article.xml b/en_US.ISO8859-1/articles/port-mentor-guidelines/article.xml
index 949f37fe59..5d98119f6a 100644
--- a/en_US.ISO8859-1/articles/port-mentor-guidelines/article.xml
+++ b/en_US.ISO8859-1/articles/port-mentor-guidelines/article.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN" "../../share/xml/entities.ent">
-%entities;
-]>
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<article lang="en">
<articleinfo>
diff --git a/en_US.ISO8859-1/articles/portbuild/article.xml b/en_US.ISO8859-1/articles/portbuild/article.xml
index ad51c3c311..03443e1e95 100644
--- a/en_US.ISO8859-1/articles/portbuild/article.xml
+++ b/en_US.ISO8859-1/articles/portbuild/article.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN" "../../share/xml/entities.ent">
-%entities;
-]>
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<article lang='en'>
<articleinfo>
@@ -2368,7 +2365,7 @@ zfs destroy -r a/snap/src-<replaceable>old-branch</replaceable></screen>
</listitem>
<listitem>
- <screen>&prompt.root; cd .ssh && ssh-keygen</screen>
+ <screen>&prompt.root; cd .ssh &amp;&amp; ssh-keygen</screen>
</listitem>
<listitem>
diff --git a/en_US.ISO8859-1/articles/pr-guidelines/article.xml b/en_US.ISO8859-1/articles/pr-guidelines/article.xml
index 754bb548d5..8fcf1d2b9e 100644
--- a/en_US.ISO8859-1/articles/pr-guidelines/article.xml
+++ b/en_US.ISO8859-1/articles/pr-guidelines/article.xml
@@ -1,8 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN" "../../share/xml/entities.ent">
-%entities;
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd" [
<!ENTITY man.edit-pr.1 "<citerefentry><refentrytitle>edit-pr</refentrytitle><manvolnum>1</manvolnum></citerefentry>">
<!ENTITY man.query-pr.1 "<citerefentry><refentrytitle>query-pr</refentrytitle><manvolnum>1</manvolnum></citerefentry>">
]>
diff --git a/en_US.ISO8859-1/articles/problem-reports/article.xml b/en_US.ISO8859-1/articles/problem-reports/article.xml
index 016df6b954..61ad4fa589 100644
--- a/en_US.ISO8859-1/articles/problem-reports/article.xml
+++ b/en_US.ISO8859-1/articles/problem-reports/article.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN" "../../share/xml/entities.ent">
-%entities;
-]>
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<article lang='en'>
<articleinfo>
diff --git a/en_US.ISO8859-1/articles/rc-scripting/article.xml b/en_US.ISO8859-1/articles/rc-scripting/article.xml
index 4fa3f56145..c12a4a58d6 100644
--- a/en_US.ISO8859-1/articles/rc-scripting/article.xml
+++ b/en_US.ISO8859-1/articles/rc-scripting/article.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN" "../../share/xml/entities.ent">
-%entities;
-]>
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<article lang='en'>
<articleinfo>
diff --git a/en_US.ISO8859-1/articles/relaydelay/article.xml b/en_US.ISO8859-1/articles/relaydelay/article.xml
index d332ee73e0..26cfe3903b 100644
--- a/en_US.ISO8859-1/articles/relaydelay/article.xml
+++ b/en_US.ISO8859-1/articles/relaydelay/article.xml
@@ -1,10 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN" "../../share/xml/entities.ent">
-%entities;
-<!ENTITY % not.published "IGNORE">
-]>
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<!--
$FreeBSD$
diff --git a/en_US.ISO8859-1/articles/releng-packages/article.xml b/en_US.ISO8859-1/articles/releng-packages/article.xml
index e4c9903e0d..cfcef421c2 100644
--- a/en_US.ISO8859-1/articles/releng-packages/article.xml
+++ b/en_US.ISO8859-1/articles/releng-packages/article.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN" "../../share/xml/entities.ent">
-%entities;
-]>
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<article lang='en'>
<title>FreeBSD Release Engineering for Third Party Software
diff --git a/en_US.ISO8859-1/articles/releng/article.xml b/en_US.ISO8859-1/articles/releng/article.xml
index 28fbda88e2..0312cfe574 100644
--- a/en_US.ISO8859-1/articles/releng/article.xml
+++ b/en_US.ISO8859-1/articles/releng/article.xml
@@ -1,8 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN" "../../share/xml/entities.ent">
-%entities;
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd" [
<!ENTITY art.re.pkgs '<ulink url="&url.articles.releng-packages;/article.html">The Release Engineering of Third Party Packages</ulink>'>
]>
diff --git a/en_US.ISO8859-1/articles/remote-install/article.xml b/en_US.ISO8859-1/articles/remote-install/article.xml
index ef94bce981..8907656c4a 100644
--- a/en_US.ISO8859-1/articles/remote-install/article.xml
+++ b/en_US.ISO8859-1/articles/remote-install/article.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN" "../../share/xml/entities.ent">
-%entities;
-]>
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<article lang='en'>
<articleinfo>
diff --git a/en_US.ISO8859-1/articles/serial-uart/article.xml b/en_US.ISO8859-1/articles/serial-uart/article.xml
index 04ccddabf2..0e42ec2833 100644
--- a/en_US.ISO8859-1/articles/serial-uart/article.xml
+++ b/en_US.ISO8859-1/articles/serial-uart/article.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN" "../../share/xml/entities.ent">
-%entities;
-]>
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<article lang='en'>
<articleinfo>
diff --git a/en_US.ISO8859-1/articles/solid-state/article.xml b/en_US.ISO8859-1/articles/solid-state/article.xml
index 800610ec93..1290cb19cc 100644
--- a/en_US.ISO8859-1/articles/solid-state/article.xml
+++ b/en_US.ISO8859-1/articles/solid-state/article.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN" "../../share/xml/entities.ent">
-%entities;
-]>
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<!-- Copyright (c) 2001 The FreeBSD Documentation Project
diff --git a/en_US.ISO8859-1/articles/vm-design/article.xml b/en_US.ISO8859-1/articles/vm-design/article.xml
index cfc3726b42..31c07e471d 100644
--- a/en_US.ISO8859-1/articles/vm-design/article.xml
+++ b/en_US.ISO8859-1/articles/vm-design/article.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN" "../../share/xml/entities.ent">
-%entities;
-]>
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<!-- $FreeBSD$ -->
<!-- FreeBSD Documentation Project -->
diff --git a/en_US.ISO8859-1/articles/wp-toolbox/article.xml b/en_US.ISO8859-1/articles/wp-toolbox/article.xml
index 9f36f69053..5b8dc58946 100644
--- a/en_US.ISO8859-1/articles/wp-toolbox/article.xml
+++ b/en_US.ISO8859-1/articles/wp-toolbox/article.xml
@@ -1,8 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN" "../../share/xml/entities.ent">
-%entities;
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd" [
<!ENTITY ports "Ports Collection">
<!ENTITY os.ports "&os; &ports;">
<!ENTITY frisbee "<application>Frisbee</application>">
diff --git a/en_US.ISO8859-1/books/arch-handbook/book.xml b/en_US.ISO8859-1/books/arch-handbook/book.xml
index c78ced629a..be786d5ac9 100644
--- a/en_US.ISO8859-1/books/arch-handbook/book.xml
+++ b/en_US.ISO8859-1/books/arch-handbook/book.xml
@@ -1,8 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN" "../../share/xml/entities.ent">
-%entities;
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd" [
<!ENTITY % chapters SYSTEM "chapters.ent">
%chapters;
<!ENTITY % mac-entities SYSTEM "mac.ent">
diff --git a/en_US.ISO8859-1/books/arch-handbook/boot/chapter.xml b/en_US.ISO8859-1/books/arch-handbook/boot/chapter.xml
index 08776a032e..014d603427 100644
--- a/en_US.ISO8859-1/books/arch-handbook/boot/chapter.xml
+++ b/en_US.ISO8859-1/books/arch-handbook/boot/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
diff --git a/en_US.ISO8859-1/books/arch-handbook/chapters.ent b/en_US.ISO8859-1/books/arch-handbook/chapters.ent
index d36157997c..7fdd3df4ad 100644
--- a/en_US.ISO8859-1/books/arch-handbook/chapters.ent
+++ b/en_US.ISO8859-1/books/arch-handbook/chapters.ent
@@ -33,7 +33,7 @@
<!ENTITY chap.pccard SYSTEM "pccard/chapter.xml">
<!-- Part three - Appendices -->
-<![%chap.index[
+<![%chap.index;[
<!ENTITY chap.index SYSTEM "index.xml">
]]>
<!ENTITY chap.index "">
diff --git a/en_US.ISO8859-1/books/arch-handbook/driverbasics/chapter.xml b/en_US.ISO8859-1/books/arch-handbook/driverbasics/chapter.xml
index 6b95269b08..c4b87c9ba7 100644
--- a/en_US.ISO8859-1/books/arch-handbook/driverbasics/chapter.xml
+++ b/en_US.ISO8859-1/books/arch-handbook/driverbasics/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
@@ -351,7 +351,7 @@ echo_write(struct cdev *dev __unused, struct uio *uio, int ioflag __unused)
* We either write from the beginning or are appending -- do
* not allow random access.
*/
- if (uio-&gt;uio_offset != 0 && (uio-&gt;uio_offset != echomsg-&gt;len))
+ if (uio-&gt;uio_offset != 0 &amp;&amp; (uio-&gt;uio_offset != echomsg-&gt;len))
return (EINVAL);
/*
diff --git a/en_US.ISO8859-1/books/arch-handbook/isa/chapter.xml b/en_US.ISO8859-1/books/arch-handbook/isa/chapter.xml
index 8fc0dcba66..578d7da34b 100644
--- a/en_US.ISO8859-1/books/arch-handbook/isa/chapter.xml
+++ b/en_US.ISO8859-1/books/arch-handbook/isa/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
diff --git a/en_US.ISO8859-1/books/arch-handbook/jail/chapter.xml b/en_US.ISO8859-1/books/arch-handbook/jail/chapter.xml
index 0cd77ee50e..b89c74b760 100644
--- a/en_US.ISO8859-1/books/arch-handbook/jail/chapter.xml
+++ b/en_US.ISO8859-1/books/arch-handbook/jail/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
diff --git a/en_US.ISO8859-1/books/arch-handbook/kobj/chapter.xml b/en_US.ISO8859-1/books/arch-handbook/kobj/chapter.xml
index ee0c27679b..ef59555739 100644
--- a/en_US.ISO8859-1/books/arch-handbook/kobj/chapter.xml
+++ b/en_US.ISO8859-1/books/arch-handbook/kobj/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
diff --git a/en_US.ISO8859-1/books/arch-handbook/locking/chapter.xml b/en_US.ISO8859-1/books/arch-handbook/locking/chapter.xml
index 0818c0fbdd..4486cfb648 100644
--- a/en_US.ISO8859-1/books/arch-handbook/locking/chapter.xml
+++ b/en_US.ISO8859-1/books/arch-handbook/locking/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
The FreeBSD SMP Next Generation Project
diff --git a/en_US.ISO8859-1/books/arch-handbook/mac/chapter.xml b/en_US.ISO8859-1/books/arch-handbook/mac/chapter.xml
index 483889c9dc..0fbd8d6440 100644
--- a/en_US.ISO8859-1/books/arch-handbook/mac/chapter.xml
+++ b/en_US.ISO8859-1/books/arch-handbook/mac/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
Copyright (c) 2002-2005 Networks Associates Technology, Inc.
All rights reserved.
diff --git a/en_US.ISO8859-1/books/arch-handbook/newbus/chapter.xml b/en_US.ISO8859-1/books/arch-handbook/newbus/chapter.xml
index 7fd0152d02..3f62902a88 100644
--- a/en_US.ISO8859-1/books/arch-handbook/newbus/chapter.xml
+++ b/en_US.ISO8859-1/books/arch-handbook/newbus/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
$FreeBSD$
diff --git a/en_US.ISO8859-1/books/arch-handbook/pccard/chapter.xml b/en_US.ISO8859-1/books/arch-handbook/pccard/chapter.xml
index 301de79aee..14e9e36995 100644
--- a/en_US.ISO8859-1/books/arch-handbook/pccard/chapter.xml
+++ b/en_US.ISO8859-1/books/arch-handbook/pccard/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
diff --git a/en_US.ISO8859-1/books/arch-handbook/pci/chapter.xml b/en_US.ISO8859-1/books/arch-handbook/pci/chapter.xml
index 0365ea0f85..15a70da312 100644
--- a/en_US.ISO8859-1/books/arch-handbook/pci/chapter.xml
+++ b/en_US.ISO8859-1/books/arch-handbook/pci/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
diff --git a/en_US.ISO8859-1/books/arch-handbook/scsi/chapter.xml b/en_US.ISO8859-1/books/arch-handbook/scsi/chapter.xml
index bdd4fd3928..9d0c293e2b 100644
--- a/en_US.ISO8859-1/books/arch-handbook/scsi/chapter.xml
+++ b/en_US.ISO8859-1/books/arch-handbook/scsi/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
diff --git a/en_US.ISO8859-1/books/arch-handbook/smp/chapter.xml b/en_US.ISO8859-1/books/arch-handbook/smp/chapter.xml
index 0d0f001e6c..69acb41e19 100644
--- a/en_US.ISO8859-1/books/arch-handbook/smp/chapter.xml
+++ b/en_US.ISO8859-1/books/arch-handbook/smp/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
The FreeBSD SMP Next Generation Project
diff --git a/en_US.ISO8859-1/books/arch-handbook/sound/chapter.xml b/en_US.ISO8859-1/books/arch-handbook/sound/chapter.xml
index faf92f8d31..9686fae370 100644
--- a/en_US.ISO8859-1/books/arch-handbook/sound/chapter.xml
+++ b/en_US.ISO8859-1/books/arch-handbook/sound/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
diff --git a/en_US.ISO8859-1/books/arch-handbook/sysinit/chapter.xml b/en_US.ISO8859-1/books/arch-handbook/sysinit/chapter.xml
index 01b91357c1..7898ee7e2e 100644
--- a/en_US.ISO8859-1/books/arch-handbook/sysinit/chapter.xml
+++ b/en_US.ISO8859-1/books/arch-handbook/sysinit/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
diff --git a/en_US.ISO8859-1/books/arch-handbook/usb/chapter.xml b/en_US.ISO8859-1/books/arch-handbook/usb/chapter.xml
index 95f0a6e5c5..938519b241 100644
--- a/en_US.ISO8859-1/books/arch-handbook/usb/chapter.xml
+++ b/en_US.ISO8859-1/books/arch-handbook/usb/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
diff --git a/en_US.ISO8859-1/books/arch-handbook/vm/chapter.xml b/en_US.ISO8859-1/books/arch-handbook/vm/chapter.xml
index af2d1d5f50..47726b04c3 100644
--- a/en_US.ISO8859-1/books/arch-handbook/vm/chapter.xml
+++ b/en_US.ISO8859-1/books/arch-handbook/vm/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
diff --git a/en_US.ISO8859-1/books/bibliography/book.xml b/en_US.ISO8859-1/books/bibliography/book.xml
index 7fe6b60ef3..778160a2be 100644
--- a/en_US.ISO8859-1/books/bibliography/book.xml
+++ b/en_US.ISO8859-1/books/bibliography/book.xml
@@ -1,8 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN" "../../share/xml/entities.ent">
-%entities;
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd" [
<!ENTITY bibliography SYSTEM "../../../share/xml/bibliography.xml">
]>
diff --git a/en_US.ISO8859-1/books/design-44bsd/book.xml b/en_US.ISO8859-1/books/design-44bsd/book.xml
index 64b66a623c..3b0a11ea93 100644
--- a/en_US.ISO8859-1/books/design-44bsd/book.xml
+++ b/en_US.ISO8859-1/books/design-44bsd/book.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN" "../../share/xml/entities.ent">
-%entities;
-]>
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<!-- $FreeBSD$ -->
<!-- FreeBSD Documentation Project -->
diff --git a/en_US.ISO8859-1/books/dev-model/book.xml b/en_US.ISO8859-1/books/dev-model/book.xml
index 8f5cf68d83..ad561cf0b0 100644
--- a/en_US.ISO8859-1/books/dev-model/book.xml
+++ b/en_US.ISO8859-1/books/dev-model/book.xml
@@ -1,8 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN" "../../share/xml/entities.ent">
-%entities;
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd" [
<!ENTITY % chapters SYSTEM "chapters.ent">
%chapters;
]>
diff --git a/en_US.ISO8859-1/books/developers-handbook/book.xml b/en_US.ISO8859-1/books/developers-handbook/book.xml
index 755ee5d18c..6a9a7f220c 100644
--- a/en_US.ISO8859-1/books/developers-handbook/book.xml
+++ b/en_US.ISO8859-1/books/developers-handbook/book.xml
@@ -1,8 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN" "../../share/xml/entities.ent">
-%entities;
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd" [
<!ENTITY % chapters SYSTEM "chapters.ent"> %chapters;
]>
diff --git a/en_US.ISO8859-1/books/developers-handbook/introduction/chapter.xml b/en_US.ISO8859-1/books/developers-handbook/introduction/chapter.xml
index 6c53a7d0ee..0f7e8270b7 100644
--- a/en_US.ISO8859-1/books/developers-handbook/introduction/chapter.xml
+++ b/en_US.ISO8859-1/books/developers-handbook/introduction/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
diff --git a/en_US.ISO8859-1/books/developers-handbook/ipv6/chapter.xml b/en_US.ISO8859-1/books/developers-handbook/ipv6/chapter.xml
index 15cfb17c23..66c0ff75b9 100644
--- a/en_US.ISO8859-1/books/developers-handbook/ipv6/chapter.xml
+++ b/en_US.ISO8859-1/books/developers-handbook/ipv6/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
diff --git a/en_US.ISO8859-1/books/developers-handbook/kernelbuild/chapter.xml b/en_US.ISO8859-1/books/developers-handbook/kernelbuild/chapter.xml
index 0857fc51d4..0c147b8eb6 100644
--- a/en_US.ISO8859-1/books/developers-handbook/kernelbuild/chapter.xml
+++ b/en_US.ISO8859-1/books/developers-handbook/kernelbuild/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
diff --git a/en_US.ISO8859-1/books/developers-handbook/kerneldebug/chapter.xml b/en_US.ISO8859-1/books/developers-handbook/kerneldebug/chapter.xml
index 709dfa8539..aa80bb4bf9 100644
--- a/en_US.ISO8859-1/books/developers-handbook/kerneldebug/chapter.xml
+++ b/en_US.ISO8859-1/books/developers-handbook/kerneldebug/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
@@ -869,7 +869,7 @@ Debugger (msg=0xf01b0383 "Boot flags requested debugger")
<filename>/etc/make.conf</filename> and rebuild
&man.loader.8;:</para>
- <screen>&prompt.root; <userinput>cd /sys/boot/i386 && make clean && make && make install</userinput></screen>
+ <screen>&prompt.root; <userinput>cd /sys/boot/i386 &amp;&amp; make clean &amp;&amp; make &amp;&amp; make install</userinput></screen>
<para>To enable &man.dcons.4; as an active low-level
console, add <literal>boot_multicons="YES"</literal> to
diff --git a/en_US.ISO8859-1/books/developers-handbook/l10n/chapter.xml b/en_US.ISO8859-1/books/developers-handbook/l10n/chapter.xml
index dd13a7a2fc..cced92ce05 100644
--- a/en_US.ISO8859-1/books/developers-handbook/l10n/chapter.xml
+++ b/en_US.ISO8859-1/books/developers-handbook/l10n/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
diff --git a/en_US.ISO8859-1/books/developers-handbook/policies/chapter.xml b/en_US.ISO8859-1/books/developers-handbook/policies/chapter.xml
index 3dac25f241..6d7432628c 100644
--- a/en_US.ISO8859-1/books/developers-handbook/policies/chapter.xml
+++ b/en_US.ISO8859-1/books/developers-handbook/policies/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
diff --git a/en_US.ISO8859-1/books/developers-handbook/secure/chapter.xml b/en_US.ISO8859-1/books/developers-handbook/secure/chapter.xml
index e35fe1afdd..4a655c189c 100644
--- a/en_US.ISO8859-1/books/developers-handbook/secure/chapter.xml
+++ b/en_US.ISO8859-1/books/developers-handbook/secure/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
diff --git a/en_US.ISO8859-1/books/developers-handbook/sockets/chapter.xml b/en_US.ISO8859-1/books/developers-handbook/sockets/chapter.xml
index 89b29f957a..7cb263be69 100644
--- a/en_US.ISO8859-1/books/developers-handbook/sockets/chapter.xml
+++ b/en_US.ISO8859-1/books/developers-handbook/sockets/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
diff --git a/en_US.ISO8859-1/books/developers-handbook/testing/chapter.xml b/en_US.ISO8859-1/books/developers-handbook/testing/chapter.xml
index 9470863c45..0ac3cbdd6a 100644
--- a/en_US.ISO8859-1/books/developers-handbook/testing/chapter.xml
+++ b/en_US.ISO8859-1/books/developers-handbook/testing/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
diff --git a/en_US.ISO8859-1/books/developers-handbook/tools/chapter.xml b/en_US.ISO8859-1/books/developers-handbook/tools/chapter.xml
index 108e90fd75..08710e0134 100644
--- a/en_US.ISO8859-1/books/developers-handbook/tools/chapter.xml
+++ b/en_US.ISO8859-1/books/developers-handbook/tools/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
diff --git a/en_US.ISO8859-1/books/developers-handbook/x86/chapter.xml b/en_US.ISO8859-1/books/developers-handbook/x86/chapter.xml
index 65e17b742b..dafbb31103 100644
--- a/en_US.ISO8859-1/books/developers-handbook/x86/chapter.xml
+++ b/en_US.ISO8859-1/books/developers-handbook/x86/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
diff --git a/en_US.ISO8859-1/books/faq/book.xml b/en_US.ISO8859-1/books/faq/book.xml
index 362a64d541..8f855241e8 100644
--- a/en_US.ISO8859-1/books/faq/book.xml
+++ b/en_US.ISO8859-1/books/faq/book.xml
@@ -1,8 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN" "../../share/xml/entities.ent">
-%entities;
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd" [
<!ENTITY bibliography SYSTEM "../../../share/xml/bibliography.xml">
<!ENTITY rel.head "<emphasis>10-CURRENT</emphasis>">
<!ENTITY rel.head.relx "10.<replaceable>X</replaceable>">
diff --git a/en_US.ISO8859-1/books/fdp-primer/book.xml b/en_US.ISO8859-1/books/fdp-primer/book.xml
index b86c9439da..b0788ec047 100644
--- a/en_US.ISO8859-1/books/fdp-primer/book.xml
+++ b/en_US.ISO8859-1/books/fdp-primer/book.xml
@@ -1,8 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN" "../../share/xml/entities.ent">
-%entities;
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd" [
<!ENTITY % chapters SYSTEM "chapters.ent"> %chapters;
<!-- ENTITY index SYSTEM "index.xml" -->
]>
diff --git a/en_US.ISO8859-1/books/fdp-primer/doc-build/chapter.xml b/en_US.ISO8859-1/books/fdp-primer/doc-build/chapter.xml
index 7b969da21a..05d5abbea4 100644
--- a/en_US.ISO8859-1/books/fdp-primer/doc-build/chapter.xml
+++ b/en_US.ISO8859-1/books/fdp-primer/doc-build/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!-- Copyright (c) 1999 Neil Blakey-Milner, All rights reserved.
Redistribution and use in source (SGML DocBook) and 'compiled' forms
diff --git a/en_US.ISO8859-1/books/fdp-primer/examples/appendix.xml b/en_US.ISO8859-1/books/fdp-primer/examples/appendix.xml
index 95bd162179..ee6b7e139e 100644
--- a/en_US.ISO8859-1/books/fdp-primer/examples/appendix.xml
+++ b/en_US.ISO8859-1/books/fdp-primer/examples/appendix.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!-- Copyright (c) 2000 Nik Clayton, All rights reserved.
Redistribution and use in source (SGML DocBook) and 'compiled' forms
diff --git a/en_US.ISO8859-1/books/fdp-primer/overview/chapter.xml b/en_US.ISO8859-1/books/fdp-primer/overview/chapter.xml
index 2930c47f9f..c62fbc470e 100644
--- a/en_US.ISO8859-1/books/fdp-primer/overview/chapter.xml
+++ b/en_US.ISO8859-1/books/fdp-primer/overview/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!-- Copyright (c) 1998, 1999 Nik Clayton, All rights reserved.
Redistribution and use in source (SGML DocBook) and 'compiled' forms
diff --git a/en_US.ISO8859-1/books/fdp-primer/psgml-mode/chapter.xml b/en_US.ISO8859-1/books/fdp-primer/psgml-mode/chapter.xml
index 9901723f10..6e8dd4ef35 100644
--- a/en_US.ISO8859-1/books/fdp-primer/psgml-mode/chapter.xml
+++ b/en_US.ISO8859-1/books/fdp-primer/psgml-mode/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!-- Copyright (c) 1998, 1999 Nik Clayton, All rights reserved.
Redistribution and use in source (SGML DocBook) and 'compiled' forms
diff --git a/en_US.ISO8859-1/books/fdp-primer/see-also/chapter.xml b/en_US.ISO8859-1/books/fdp-primer/see-also/chapter.xml
index 64da1923c8..65f4df3962 100644
--- a/en_US.ISO8859-1/books/fdp-primer/see-also/chapter.xml
+++ b/en_US.ISO8859-1/books/fdp-primer/see-also/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!-- Copyright (c) 1998, 1999 Nik Clayton, All rights reserved.
Redistribution and use in source (SGML DocBook) and 'compiled' forms
diff --git a/en_US.ISO8859-1/books/fdp-primer/sgml-markup/chapter.xml b/en_US.ISO8859-1/books/fdp-primer/sgml-markup/chapter.xml
index 1a1e9d9372..9ada557496 100644
--- a/en_US.ISO8859-1/books/fdp-primer/sgml-markup/chapter.xml
+++ b/en_US.ISO8859-1/books/fdp-primer/sgml-markup/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!-- Copyright (c) 1998, 1999 Nik Clayton, All rights reserved.
Redistribution and use in source (SGML DocBook) and 'compiled' forms
diff --git a/en_US.ISO8859-1/books/fdp-primer/sgml-primer/chapter.xml b/en_US.ISO8859-1/books/fdp-primer/sgml-primer/chapter.xml
index 7ba090c6ae..f24a2b0848 100644
--- a/en_US.ISO8859-1/books/fdp-primer/sgml-primer/chapter.xml
+++ b/en_US.ISO8859-1/books/fdp-primer/sgml-primer/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!-- Copyright (c) 1998, 1999 Nik Clayton, All rights reserved.
Redistribution and use in source (SGML DocBook) and 'compiled' forms
@@ -828,28 +828,6 @@ example.xml:5: element head: validity error : Element head content does not foll
-- doing multiline comments -->]]></programlisting>
</example>
- <![%output.print;[
- <important>
- <title>Use 2 Dashes</title>
-
- <para>There is a problem with producing the Postscript and PDF
- versions of this document. The above example probably shows
- just one hyphen symbol, <literal>-</literal> after the
- <literal>&lt;!</literal> and before the
- <literal>&gt;</literal>.</para>
-
- <para>You <emphasis>must</emphasis> use two
- <literal>-</literal>, <emphasis>not</emphasis> one. The
- Postscript and PDF versions have translated the two
- <literal>-</literal> in the original to a longer, more
- professional <emphasis>em-dash</emphasis>, and broken this
- example in the process.</para>
-
- <para>The XHTML, plain text, and RTF versions of this document
- are not affected.</para>
- </important>
- ]]>
-
<para>If you have used XHTML before you may have been shown
different rules for comments. In particular, you may think that
the string <literal>&lt;!--</literal> opens a comment, and it is
diff --git a/en_US.ISO8859-1/books/fdp-primer/structure/chapter.xml b/en_US.ISO8859-1/books/fdp-primer/structure/chapter.xml
index 0111965b9e..7a688264b4 100644
--- a/en_US.ISO8859-1/books/fdp-primer/structure/chapter.xml
+++ b/en_US.ISO8859-1/books/fdp-primer/structure/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!-- Copyright (c) 1998, 1999 Nik Clayton, All rights reserved.
Redistribution and use in source (SGML DocBook) and 'compiled' forms
diff --git a/en_US.ISO8859-1/books/fdp-primer/stylesheets/chapter.xml b/en_US.ISO8859-1/books/fdp-primer/stylesheets/chapter.xml
index 23126ed4b8..bfdbca8f4e 100644
--- a/en_US.ISO8859-1/books/fdp-primer/stylesheets/chapter.xml
+++ b/en_US.ISO8859-1/books/fdp-primer/stylesheets/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!-- Copyright (c) 1998, 1999 Nik Clayton, All rights reserved.
Redistribution and use in source (SGML DocBook) and 'compiled' forms
diff --git a/en_US.ISO8859-1/books/fdp-primer/the-website/chapter.xml b/en_US.ISO8859-1/books/fdp-primer/the-website/chapter.xml
index 4a621e79b5..c72ecfa11a 100644
--- a/en_US.ISO8859-1/books/fdp-primer/the-website/chapter.xml
+++ b/en_US.ISO8859-1/books/fdp-primer/the-website/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!-- Copyright (c) 1998, 1999 Nik Clayton, All rights reserved.
Redistribution and use in source (SGML DocBook) and 'compiled' forms
diff --git a/en_US.ISO8859-1/books/fdp-primer/tools/chapter.xml b/en_US.ISO8859-1/books/fdp-primer/tools/chapter.xml
index 979b907ffd..f915276fb0 100644
--- a/en_US.ISO8859-1/books/fdp-primer/tools/chapter.xml
+++ b/en_US.ISO8859-1/books/fdp-primer/tools/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!-- Copyright (c) 1998, 1999 Nik Clayton, All rights reserved.
Redistribution and use in source (SGML DocBook) and 'compiled' forms
diff --git a/en_US.ISO8859-1/books/fdp-primer/translations/chapter.xml b/en_US.ISO8859-1/books/fdp-primer/translations/chapter.xml
index 296142dbb9..2219e73282 100644
--- a/en_US.ISO8859-1/books/fdp-primer/translations/chapter.xml
+++ b/en_US.ISO8859-1/books/fdp-primer/translations/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!-- Copyright (c) 1999 Nik Clayton, All rights reserved.
Redistribution and use in source (SGML DocBook) and 'compiled' forms
diff --git a/en_US.ISO8859-1/books/fdp-primer/writing-style/chapter.xml b/en_US.ISO8859-1/books/fdp-primer/writing-style/chapter.xml
index b7ea30c769..ba151b3cc8 100644
--- a/en_US.ISO8859-1/books/fdp-primer/writing-style/chapter.xml
+++ b/en_US.ISO8859-1/books/fdp-primer/writing-style/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!-- Copyright (c) 1998 Nik Clayton, All rights reserved.
Redistribution and use in source (SGML DocBook) and 'compiled' forms
@@ -185,7 +185,7 @@
<emphasis>not</emphasis> <sgmltag>PARA</sgmltag>.</para>
<para>Text that appears in SGML contexts is generally written in
- upper case, <literal>&lt!ENTITY&hellip;&gt;</literal>, and
+ upper case, <literal>&lt;!ENTITY&hellip;&gt;</literal>, and
<literal>&lt;!DOCTYPE&hellip;&gt;</literal>,
<emphasis>not</emphasis>
<literal>&lt;!entity&hellip;&gt;</literal> and
diff --git a/en_US.ISO8859-1/books/handbook/Makefile b/en_US.ISO8859-1/books/handbook/Makefile
index d90bc2b9fd..5f31dca821 100644
--- a/en_US.ISO8859-1/books/handbook/Makefile
+++ b/en_US.ISO8859-1/books/handbook/Makefile
@@ -315,30 +315,43 @@ DOC_PREFIX?= ${.CURDIR}/../../..
#
# rules generating lists of mirror site from XML database.
#
-XMLDOCS= mirrors-ftp:::mirrors.xml.ftp.inc \
+XMLDOCS= lastmod:::mirrors.lastmod.inc \
+ mirrors-ftp-index:::mirrors.xml.ftp.index.inc \
+ mirrors-ftp:::mirrors.xml.ftp.inc \
+ mirrors-cvsup-index:::mirrors.xml.cvsup.index.inc \
mirrors-cvsup:::mirrors.xml.cvsup.inc \
+ eresources-index:::eresources.xml.www.index.inc \
eresources:::eresources.xml.www.inc
DEPENDSET.DEFAULT= transtable mirror
XSLT.DEFAULT= ${XSL_MIRRORS}
XML.DEFAULT= ${XML_MIRRORS}
-NO_TIDY.DEFAULT= yes
+PARAMS.lastmod+= --param 'target' "'lastmod'"
+PARAMS.mirrors-ftp-index+= --param 'type' "'ftp'" \
+ --param 'proto' "'ftp'" \
+ --param 'target' "'index'"
PARAMS.mirrors-ftp+= --param 'type' "'ftp'" \
--param 'proto' "'ftp'" \
--param 'target' "'handbook/mirrors/chapter.xml'"
+PARAMS.mirrors-cvsup-index+= --param 'type' "'cvsup'" \
+ --param 'proto' "'cvsup'" \
+ --param 'target' "'index'"
PARAMS.mirrors-cvsup+= --param 'type' "'cvsup'" \
--param 'proto' "'cvsup'" \
--param 'target' "'handbook/mirrors/chapter.xml'"
+PARAMS.eresources-index+= --param 'type' "'www'" \
+ --param 'proto' "'http'" \
+ --param 'target' "'index'"
PARAMS.eresources+= --param 'type' "'www'" \
--param 'proto' "'http'" \
--param 'target' "'handbook/eresources/chapter.xml'"
-SRCS+= mirrors.xml.ftp.inc \
+SRCS+= mirrors.lastmod.inc \
+ mirrors.xml.ftp.inc \
+ mirrors.xml.ftp.index.inc \
mirrors.xml.cvsup.inc \
- eresources.xml.www.inc
-
-CLEANFILES+= mirrors.xml.ftp.inc \
- mirrors.xml.cvsup.inc \
- eresources.xml.www.inc
+ mirrors.xml.cvsup.index.inc \
+ eresources.xml.www.inc \
+ eresources.xml.www.index.inc
.include "${DOC_PREFIX}/share/mk/doc.project.mk"
diff --git a/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.xml b/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.xml
index 42b67269ba..143646add5 100644
--- a/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.xml
+++ b/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
diff --git a/en_US.ISO8859-1/books/handbook/audit/chapter.xml b/en_US.ISO8859-1/books/handbook/audit/chapter.xml
index 642ce6978d..ae55c41d2a 100644
--- a/en_US.ISO8859-1/books/handbook/audit/chapter.xml
+++ b/en_US.ISO8859-1/books/handbook/audit/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
$FreeBSD$
diff --git a/en_US.ISO8859-1/books/handbook/basics/chapter.xml b/en_US.ISO8859-1/books/handbook/basics/chapter.xml
index 096b812ebf..23dde1ae1f 100644
--- a/en_US.ISO8859-1/books/handbook/basics/chapter.xml
+++ b/en_US.ISO8859-1/books/handbook/basics/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
diff --git a/en_US.ISO8859-1/books/handbook/bibliography/chapter.xml b/en_US.ISO8859-1/books/handbook/bibliography/chapter.xml
index 03d8a27211..2b7bdece60 100644
--- a/en_US.ISO8859-1/books/handbook/bibliography/chapter.xml
+++ b/en_US.ISO8859-1/books/handbook/bibliography/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
diff --git a/en_US.ISO8859-1/books/handbook/book.xml b/en_US.ISO8859-1/books/handbook/book.xml
index 71eb296c4e..e6de16b776 100644
--- a/en_US.ISO8859-1/books/handbook/book.xml
+++ b/en_US.ISO8859-1/books/handbook/book.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN" "../../share/xml/entities.ent">
-%entities;
-
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd" [
<!--
The FreeBSD Documentation Project
diff --git a/en_US.ISO8859-1/books/handbook/boot/chapter.xml b/en_US.ISO8859-1/books/handbook/boot/chapter.xml
index ddcad64b91..aec95d1a8b 100644
--- a/en_US.ISO8859-1/books/handbook/boot/chapter.xml
+++ b/en_US.ISO8859-1/books/handbook/boot/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
diff --git a/en_US.ISO8859-1/books/handbook/bsdinstall/chapter.xml b/en_US.ISO8859-1/books/handbook/bsdinstall/chapter.xml
index 06b5ee31b9..125358081a 100644
--- a/en_US.ISO8859-1/books/handbook/bsdinstall/chapter.xml
+++ b/en_US.ISO8859-1/books/handbook/bsdinstall/chapter.xml
@@ -162,7 +162,7 @@
multiple CPUs.</para>
<para>A 32-bit kernel can only use the first 2&nbsp;GB of RAM.
- &firewire; is not supported on the Blue & White PowerMac
+ &firewire; is not supported on the Blue &amp; White PowerMac
G3.</para>
</sect3>
diff --git a/en_US.ISO8859-1/books/handbook/chapters.ent b/en_US.ISO8859-1/books/handbook/chapters.ent
index a2a9455f59..d7efb577fe 100644
--- a/en_US.ISO8859-1/books/handbook/chapters.ent
+++ b/en_US.ISO8859-1/books/handbook/chapters.ent
@@ -10,235 +10,62 @@
$FreeBSD$
-->
-<!ENTITY % not.published "INCLUDE">
-
-<!ENTITY % chap.introduction "IGNORE">
-<!ENTITY % chap.install "IGNORE">
-<!ENTITY % chap.bsdinstall "IGNORE">
-<!ENTITY % chap.basics "IGNORE">
-<!ENTITY % chap.ports "IGNORE">
-<!ENTITY % chap.config "IGNORE">
-<!ENTITY % chap.boot "IGNORE">
-<!ENTITY % chap.users "IGNORE">
-<!ENTITY % chap.kernelconfig "IGNORE">
-<!ENTITY % chap.security "IGNORE">
-<!ENTITY % chap.jails "IGNORE">
-<!ENTITY % chap.printing "IGNORE">
-<!ENTITY % chap.disks "IGNORE">
-<!ENTITY % chap.geom "IGNORE">
-<!ENTITY % chap.vinum "IGNORE">
-<!ENTITY % chap.x11 "IGNORE">
-<!ENTITY % chap.l10n "IGNORE">
-<!ENTITY % chap.multimedia "IGNORE">
-<!ENTITY % chap.desktop "IGNORE">
-<!ENTITY % chap.serialcomms "IGNORE">
-<!ENTITY % chap.ppp-and-slip "IGNORE">
-<!ENTITY % chap.advanced-networking "IGNORE">
-<!ENTITY % chap.firewalls "IGNORE">
-<!ENTITY % chap.network-servers "IGNORE">
-<!ENTITY % chap.mail "IGNORE">
-<!ENTITY % chap.cutting-edge "IGNORE">
-<!ENTITY % chap.linuxemu "IGNORE">
-<!ENTITY % chap.mirrors "IGNORE">
-<!ENTITY % chap.mirrors.ftp.inc "INCLUDE">
-<!ENTITY % chap.mirrors.cvsup.inc "INCLUDE">
-<!ENTITY % chap.bibliography "IGNORE">
-<!ENTITY % chap.eresources "IGNORE">
-<!ENTITY % chap.eresources.www.inc "INCLUDE">
-<!ENTITY % chap.pgpkeys "IGNORE">
-<!ENTITY % chap.index "IGNORE">
-<!ENTITY % chap.freebsd-glossary "IGNORE">
-<!ENTITY % chap.mac "IGNORE">
-<!ENTITY % chap.audit "IGNORE">
-<!ENTITY % chap.filesystems "IGNORE">
-<!ENTITY % chap.dtrace "IGNORE">
-
<!ENTITY chap.preface SYSTEM "preface/preface.xml">
<!ENTITY % pgpkeys SYSTEM "../../../share/pgpkeys/pgpkeys.ent"> %pgpkeys;
<!-- Part One -->
-<![%chap.introduction;[
<!ENTITY chap.introduction SYSTEM "introduction/chapter.xml">
-]]>
-<![%chap.install;[
<!ENTITY chap.install SYSTEM "install/chapter.xml">
-]]>
-<![%chap.bsdinstall;[
<!ENTITY chap.bsdinstall SYSTEM "bsdinstall/chapter.xml">
-]]>
-<![%chap.basics;[
<!ENTITY chap.basics SYSTEM "basics/chapter.xml">
-]]>
-<![%chap.ports;[
<!ENTITY chap.ports SYSTEM "ports/chapter.xml">
-]]>
-<![%chap.x11;[
<!ENTITY chap.x11 SYSTEM "x11/chapter.xml">
-]]>
<!-- Part Two -->
-<![%chap.desktop;[
<!ENTITY chap.desktop SYSTEM "desktop/chapter.xml">
-]]>
-<![%chap.multimedia;[
<!ENTITY chap.multimedia SYSTEM "multimedia/chapter.xml">
-]]>
-<![%chap.kernelconfig;[
<!ENTITY chap.kernelconfig SYSTEM "kernelconfig/chapter.xml">
-]]>
-<![%chap.printing;[
<!ENTITY chap.printing SYSTEM "printing/chapter.xml">
-]]>
-<![%chap.linuxemu;[
<!ENTITY chap.linuxemu SYSTEM "linuxemu/chapter.xml">
-]]>
<!-- Part Three -->
-<![%chap.config;[
<!ENTITY chap.config SYSTEM "config/chapter.xml">
-]]>
-<![%chap.boot;[
<!ENTITY chap.boot SYSTEM "boot/chapter.xml">
-]]>
-<![%chap.users;[
<!ENTITY chap.users SYSTEM "users/chapter.xml">
-]]>
-<![%chap.security;[
<!ENTITY chap.security SYSTEM "security/chapter.xml">
-]]>
-<![%chap.jails;[
<!ENTITY chap.jails SYSTEM "jails/chapter.xml">
-]]>
-<![%chap.mac;[
<!ENTITY chap.mac SYSTEM "mac/chapter.xml">
-]]>
-<![%chap.audit;[
<!ENTITY chap.audit SYSTEM "audit/chapter.xml">
-]]>
-<![%chap.disks;[
<!ENTITY chap.disks SYSTEM "disks/chapter.xml">
-]]>
-<![%chap.geom;[
<!ENTITY chap.geom SYSTEM "geom/chapter.xml">
-]]>
-<![%chap.filesystems;[
<!ENTITY chap.filesystems SYSTEM "filesystems/chapter.xml">
-]]>
-<![%chap.vinum;[
<!ENTITY chap.vinum SYSTEM "vinum/chapter.xml">
-]]>
-<![%chap.virtualization;[
<!ENTITY chap.virtualization SYSTEM "virtualization/chapter.xml">
-]]>
-<![%chap.l10n;[
<!ENTITY chap.l10n SYSTEM "l10n/chapter.xml">
-]]>
-<![%chap.cutting-edge;[
<!ENTITY chap.cutting-edge SYSTEM "cutting-edge/chapter.xml">
-]]>
-<![%chap.dtrace;[
<!ENTITY chap.dtrace SYSTEM "dtrace/chapter.xml">
-]]>
<!-- Part Four -->
-<![%chap.serialcomms;[
<!ENTITY chap.serialcomms SYSTEM "serialcomms/chapter.xml">
-]]>
-<![%chap.ppp-and-slip;[
<!ENTITY chap.ppp-and-slip SYSTEM "ppp-and-slip/chapter.xml">
-]]>
-<![%chap.mail;[
<!ENTITY chap.mail SYSTEM "mail/chapter.xml">
-]]>
-<![%chap.network-servers;[
<!ENTITY chap.network-servers SYSTEM "network-servers/chapter.xml">
-]]>
-<![%chap.firewalls;[
<!ENTITY chap.firewalls SYSTEM "firewalls/chapter.xml">
-]]>
-<![%chap.advanced-networking;[
<!ENTITY chap.advanced-networking SYSTEM "advanced-networking/chapter.xml">
-]]>
<!-- Part Five (appendices) -->
-<![%chap.mirrors;[
<!ENTITY chap.mirrors SYSTEM "mirrors/chapter.xml">
-]]>
-<![%chap.mirrors.ftp.inc;[
+ <!ENTITY chap.mirrors.lastmod.inc SYSTEM "mirrors.lastmod.inc">
+ <!ENTITY chap.mirrors.ftp.index.inc SYSTEM "mirrors.xml.ftp.index.inc">
<!ENTITY chap.mirrors.ftp.inc SYSTEM "mirrors.xml.ftp.inc">
-]]>
-<![%chap.mirrors.cvsup.inc;[
+ <!ENTITY chap.mirrors.cvsup.index.inc SYSTEM "mirrors.xml.cvsup.index.inc">
<!ENTITY chap.mirrors.cvsup.inc SYSTEM "mirrors.xml.cvsup.inc">
-]]>
-<![%chap.bibliography;[
<!ENTITY chap.bibliography SYSTEM "bibliography/chapter.xml">
-]]>
-<![%chap.eresources;[
<!ENTITY chap.eresources SYSTEM "eresources/chapter.xml">
-]]>
-<![%chap.eresources.www.inc;[
+ <!ENTITY chap.eresources.www.index.inc SYSTEM "eresources.xml.www.index.inc">
<!ENTITY chap.eresources.www.inc SYSTEM "eresources.xml.www.inc">
-]]>
-<![%chap.pgpkeys;[
<!ENTITY chap.pgpkeys SYSTEM "pgpkeys/chapter.xml">
-]]>
-<![%chap.freebsd-glossary;[
<!ENTITY chap.freebsd-glossary "&freebsd-glossary;">
-]]>
-<![%chap.index;[
<!ENTITY chap.index SYSTEM "index.xml">
-]]>
<!ENTITY chap.colophon SYSTEM "colophon.xml">
-
-<!-- IGNORE cases -->
-
-<!-- Part One -->
-<!ENTITY chap.introduction "">
-<!ENTITY chap.install "">
-<!ENTITY chap.basics "">
-<!ENTITY chap.ports "">
-<!ENTITY chap.x11 "">
-
-<!-- Part Two -->
-<!ENTITY chap.desktop "">
-<!ENTITY chap.multimedia "">
-<!ENTITY chap.kernelconfig "">
-<!ENTITY chap.printing "">
-<!ENTITY chap.linuxemu "">
-
-<!-- Part Three -->
-<!ENTITY chap.config "">
-<!ENTITY chap.boot "">
-<!ENTITY chap.users "">
-<!ENTITY chap.security "">
-<!ENTITY chap.jails "">
-<!ENTITY chap.mac "">
-<!ENTITY chap.audit "">
-<!ENTITY chap.disks "">
-<!ENTITY chap.geom "">
-<!ENTITY chap.filesystems "">
-<!ENTITY chap.vinum "">
-<!ENTITY chap.virtualization "">
-<!ENTITY chap.l10n "">
-<!ENTITY chap.cutting-edge "">
-<!ENTITY chap.dtrace "">
-
-<!-- Part Four -->
-<!ENTITY chap.serialcomms "">
-<!ENTITY chap.ppp-and-slip "">
-<!ENTITY chap.mail "">
-<!ENTITY chap.network-servers "">
-<!ENTITY chap.firewalls "">
-<!ENTITY chap.advanced-networking "">
-
-<!-- Part Five (appendices) -->
-<!ENTITY chap.mirrors "">
-<!ENTITY chap.mirrors.ftp.inc "">
-<!ENTITY chap.mirrors.cvsup.inc "">
-<!ENTITY chap.bibliography "">
-<!ENTITY chap.eresources "">
-<!ENTITY chap.eresources.www.inc "">
-<!ENTITY chap.pgpkeys "">
-<!ENTITY chap.freebsd-glossary "">
-<!ENTITY chap.index "">
diff --git a/en_US.ISO8859-1/books/handbook/colophon.xml b/en_US.ISO8859-1/books/handbook/colophon.xml
index b7db4156a7..bf5aae5e6f 100644
--- a/en_US.ISO8859-1/books/handbook/colophon.xml
+++ b/en_US.ISO8859-1/books/handbook/colophon.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
diff --git a/en_US.ISO8859-1/books/handbook/config/chapter.xml b/en_US.ISO8859-1/books/handbook/config/chapter.xml
index 1bf324e66d..452fbc3c80 100644
--- a/en_US.ISO8859-1/books/handbook/config/chapter.xml
+++ b/en_US.ISO8859-1/books/handbook/config/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
@@ -805,7 +805,7 @@ sshd is running as pid 433.</screen>
system can be found in the &man.rc.8; and &man.rc.subr.8; manual
pages. If you are interested in writing your own
<filename>rc.d</filename> scripts or improving the existing
- ones, you may find <ulink url="&url.articles.rc-scripting">this
+ ones, you may find <ulink url="&url.articles.rc-scripting;">this
article</ulink> also useful.</para>
</sect1>
diff --git a/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.xml b/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.xml
index d1739f1f92..3a3a73e97a 100644
--- a/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.xml
+++ b/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
@@ -1264,81 +1264,6 @@ Fetching 133 new ports or files... done.</screen>
<screen>&prompt.root; <userinput>portupgrade -PP hu-freebsd-doc</userinput></screen>
</sect3>
</sect2>
-
-<!-- FIXME: Waiting for a working docsnap server... -->
-<![ IGNORE [
- <sect2 id="docsnap">
- <sect2info>
- <authorgroup>
- <author>
- <firstname>Pav</firstname>
- <surname>Lucistnik</surname>
- <contrib>Based on information provided by </contrib>
- </author>
- </authorgroup>
- </sect2info>
-
- <title>Using Docsnap</title>
-
- <indexterm><primary>Updating and Upgrading</primary></indexterm>
-
- <indexterm>
- <primary>Docsnap</primary>
- <see>Updating and Upgrading</see>
- </indexterm>
-
- <para><application>Docsnap</application> is an &man.rsync.1;
- repository for updating installed &os; Documentation in a
- relatively easy and fast way. A
- <quote><application>Docsnap</application> server</quote>
- tracks the documentation sources, and builds them in HTML
- format every hour. The
- <filename role="package">textproc/docproj</filename> is
- unneeded with <application>Docsnap</application> as only
- patches to the built documentation exist.</para>
-
- <para>The only requirement for using this technique is
- the <filename role="package">net/rsync</filename> port or
- package. To add it, use the following command:</para>
-
- <screen>&prompt.root; <userinput>pkg_add -r rsync</userinput></screen>
-
- <note>
- <para><application>Docsnap</application> has been originally
- developed for updating documentation installed to
- <filename class="directory">/usr/share/doc</filename>, but
- the following examples could be adapted for other
- directories as well. For user directories, it does not
- require <username>root</username> privileges.</para>
- </note>
-
- <para>To update the documentation set, issue the following
- command:</para>
-
- <screen>&prompt.root; <userinput>rsync -rltvz <replaceable>docsnap.sk.FreeBSD.org</replaceable>::docsnap <replaceable>/usr/share/doc</replaceable></userinput></screen>
-
- <note>
- <para>There is only one <application>Docsnap</application>
- server at the moment;
- the <hostid>docsnap.sk.FreeBSD.org</hostid> shown
- above.</para>
- </note>
-
- <para>Do not use the <option>--delete</option> flag here as
- there are some items installed into
- <filename class="directory">/usr/share/doc</filename> during
- <command>make installworld</command>, which would accidentally
- be removed. To clean up, use this command instead:</para>
-
- <screen>&prompt.root; <userinput>rsync -rltvz --delete <replaceable>docsnap.sk.FreeBSD.org</replaceable>::docsnap/??_??\.\* <replaceable>/usr/share/doc</replaceable></userinput></screen>
-
- <para>If a subset of documentation needs to be updated, for
- example, the English documentation only, the following command
- should be used:</para>
-
- <screen>&prompt.root; <userinput>rsync -rltvz <replaceable>docsnap.sk.FreeBSD.org</replaceable>::docsnap/en_US.ISO8859-1 <replaceable>/usr/share/doc</replaceable></userinput></screen>
- </sect2>
-]]>
</sect1>
<sect1 id="current-stable">
diff --git a/en_US.ISO8859-1/books/handbook/desktop/chapter.xml b/en_US.ISO8859-1/books/handbook/desktop/chapter.xml
index e04566d215..8beba18e48 100644
--- a/en_US.ISO8859-1/books/handbook/desktop/chapter.xml
+++ b/en_US.ISO8859-1/books/handbook/desktop/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
$FreeBSD$
diff --git a/en_US.ISO8859-1/books/handbook/disks/chapter.xml b/en_US.ISO8859-1/books/handbook/disks/chapter.xml
index 48bbfdc0ec..b9c2ffdcbf 100644
--- a/en_US.ISO8859-1/books/handbook/disks/chapter.xml
+++ b/en_US.ISO8859-1/books/handbook/disks/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
@@ -2778,15 +2778,6 @@ cd0: Attempt to query device size failed: NOT READY, Medium not present - tray c
again. Another hour spent now may save you from further
distress later.</para>
</sect3>
-
-<![%not.published;[
-
- <sect3>
- <title>* I Did Not Prepare for the Disaster, What Now?</title>
-
- <para></para>
- </sect3>
-]]>
</sect2>
</sect1>
@@ -4594,7 +4585,7 @@ case "$1" in
# Wait for any "hastd secondary" processes to stop
for disk in ${resources}; do
- while $( pgrep -lf "hastd: ${disk} \(secondary\)" > /dev/null 2>&1 ); do
+ while $( pgrep -lf "hastd: ${disk} \(secondary\)" > /dev/null 2>&amp;1 ); do
sleep 1
done
@@ -4609,7 +4600,7 @@ case "$1" in
# Wait for the /dev/hast/* devices to appear
for disk in ${resources}; do
for I in $( jot 60 ); do
- [ -c "/dev/hast/${disk}" ] && break
+ [ -c "/dev/hast/${disk}" ] &amp;&amp; break
sleep 0.5
done
@@ -4642,7 +4633,7 @@ case "$1" in
umount -f /hast/${disk}
fi
sleep $delay
- hastctl role secondary ${disk} 2>&1
+ hastctl role secondary ${disk} 2>&amp;1
if [ $? -ne 0 ]; then
logger -p $log -t $name "Unable to switch role to secondary for resource ${disk}."
exit 1
diff --git a/en_US.ISO8859-1/books/handbook/dtrace/chapter.xml b/en_US.ISO8859-1/books/handbook/dtrace/chapter.xml
index eebfb6be9f..e527aab5b8 100644
--- a/en_US.ISO8859-1/books/handbook/dtrace/chapter.xml
+++ b/en_US.ISO8859-1/books/handbook/dtrace/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
Recently I suggested to myself that this should become a profiling
and debugging chapter, which covers things like ktrace(1) and
diff --git a/en_US.ISO8859-1/books/handbook/eresources/chapter.xml b/en_US.ISO8859-1/books/handbook/eresources/chapter.xml
index 60ce63e29c..860935c5fc 100644
--- a/en_US.ISO8859-1/books/handbook/eresources/chapter.xml
+++ b/en_US.ISO8859-1/books/handbook/eresources/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
@@ -2233,6 +2233,10 @@
<sect2 id="eresources-web-mirrors">
<title>Official Mirrors</title>
+ &chap.eresources.www.index.inc;
+
+ &chap.mirrors.lastmod.inc;
+
&chap.eresources.www.inc;
</sect2>
</sect1>
diff --git a/en_US.ISO8859-1/books/handbook/filesystems/chapter.xml b/en_US.ISO8859-1/books/handbook/filesystems/chapter.xml
index 3602d925ca..1380b59c66 100644
--- a/en_US.ISO8859-1/books/handbook/filesystems/chapter.xml
+++ b/en_US.ISO8859-1/books/handbook/filesystems/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
$FreeBSD$
diff --git a/en_US.ISO8859-1/books/handbook/firewalls/chapter.xml b/en_US.ISO8859-1/books/handbook/firewalls/chapter.xml
index 72913cb2df..866fa8f9db 100644
--- a/en_US.ISO8859-1/books/handbook/firewalls/chapter.xml
+++ b/en_US.ISO8859-1/books/handbook/firewalls/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
diff --git a/en_US.ISO8859-1/books/handbook/geom/chapter.xml b/en_US.ISO8859-1/books/handbook/geom/chapter.xml
index a54d1efd12..94875ac9f2 100644
--- a/en_US.ISO8859-1/books/handbook/geom/chapter.xml
+++ b/en_US.ISO8859-1/books/handbook/geom/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
$FreeBSD$
@@ -389,13 +389,13 @@ Done.</screen>
mirror with &man.dump.8; and &man.restore.8;.</para>
<screen>&prompt.root; <userinput>mount /dev/mirror/gm0s1a /mnt</userinput>
-&prompt.root; <userinput>dump -C16 -b64 -0aL -f - / | (cd /mnt && restore -rf -)</userinput>
+&prompt.root; <userinput>dump -C16 -b64 -0aL -f - / | (cd /mnt &amp;&amp; restore -rf -)</userinput>
&prompt.root; <userinput>mount /dev/mirror/gm0s1d /mnt/var</userinput>
&prompt.root; <userinput>mount /dev/mirror/gm0s1e /mnt/tmp</userinput>
&prompt.root; <userinput>mount /dev/mirror/gm0s1f /mnt/usr</userinput>
-&prompt.root; <userinput>dump -C16 -b64 -0aL -f - /var | (cd /mnt/var && restore -rf -)</userinput>
-&prompt.root; <userinput>dump -C16 -b64 -0aL -f - /tmp | (cd /mnt/tmp && restore -rf -)</userinput>
-&prompt.root; <userinput>dump -C16 -b64 -0aL -f - /usr | (cd /mnt/usr && restore -rf -)</userinput></screen>
+&prompt.root; <userinput>dump -C16 -b64 -0aL -f - /var | (cd /mnt/var &amp;&amp; restore -rf -)</userinput>
+&prompt.root; <userinput>dump -C16 -b64 -0aL -f - /tmp | (cd /mnt/tmp &amp;&amp; restore -rf -)</userinput>
+&prompt.root; <userinput>dump -C16 -b64 -0aL -f - /usr | (cd /mnt/usr &amp;&amp; restore -rf -)</userinput></screen>
<para><filename>/mnt/etc/fstab</filename> must be edited to
point to the new mirror filesystems:</para>
@@ -630,15 +630,15 @@ BSD 8
dumped with <command>dump -L</command>.</para>
<screen>&prompt.root; <userinput>mount /dev/mirror/gm0s1a /mnt</userinput>
-&prompt.root; <userinput>dump -C16 -b64 -0aL -f - / | (cd /mnt && restore -rf -)</userinput>
+&prompt.root; <userinput>dump -C16 -b64 -0aL -f - / | (cd /mnt &amp;&amp; restore -rf -)</userinput>
&prompt.root; <userinput>mount /dev/mirror/gm0s1d /mnt/var</userinput>
&prompt.root; <userinput>mount /dev/mirror/gm0s1e /mnt/usr</userinput>
&prompt.root; <userinput>mount /dev/mirror/gm0s1f /mnt/data1</userinput>
&prompt.root; <userinput>mount /dev/mirror/gm0s1g /mnt/data2</userinput>
-&prompt.root; <userinput>dump -C16 -b64 -0aL -f - /usr | (cd /mnt/usr && restore -rf -)</userinput>
-&prompt.root; <userinput>dump -C16 -b64 -0aL -f - /var | (cd /mnt/var && restore -rf -)</userinput>
-&prompt.root; <userinput>dump -C16 -b64 -0aL -f - /data1 | (cd /mnt/data1 && restore -rf -)</userinput>
-&prompt.root; <userinput>dump -C16 -b64 -0aL -f - /data2 | (cd /mnt/data2 && restore -rf -)</userinput></screen>
+&prompt.root; <userinput>dump -C16 -b64 -0aL -f - /usr | (cd /mnt/usr &amp;&amp; restore -rf -)</userinput>
+&prompt.root; <userinput>dump -C16 -b64 -0aL -f - /var | (cd /mnt/var &amp;&amp; restore -rf -)</userinput>
+&prompt.root; <userinput>dump -C16 -b64 -0aL -f - /data1 | (cd /mnt/data1 &amp;&amp; restore -rf -)</userinput>
+&prompt.root; <userinput>dump -C16 -b64 -0aL -f - /data2 | (cd /mnt/data2 &amp;&amp; restore -rf -)</userinput></screen>
<para>Restart the system, booting from
<devicename>ada1</devicename>. If everything is working, the
diff --git a/en_US.ISO8859-1/books/handbook/index.xml b/en_US.ISO8859-1/books/handbook/index.xml
new file mode 100644
index 0000000000..cad9d876e1
--- /dev/null
+++ b/en_US.ISO8859-1/books/handbook/index.xml
@@ -0,0 +1 @@
+<index/>
diff --git a/en_US.ISO8859-1/books/handbook/install/chapter.xml b/en_US.ISO8859-1/books/handbook/install/chapter.xml
index 5f0810a2c8..821abfb3a9 100644
--- a/en_US.ISO8859-1/books/handbook/install/chapter.xml
+++ b/en_US.ISO8859-1/books/handbook/install/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
diff --git a/en_US.ISO8859-1/books/handbook/introduction/chapter.xml b/en_US.ISO8859-1/books/handbook/introduction/chapter.xml
index 916ed30d99..ddd671b20e 100644
--- a/en_US.ISO8859-1/books/handbook/introduction/chapter.xml
+++ b/en_US.ISO8859-1/books/handbook/introduction/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
diff --git a/en_US.ISO8859-1/books/handbook/jails/chapter.xml b/en_US.ISO8859-1/books/handbook/jails/chapter.xml
index 0812972bd3..9c9c777a15 100644
--- a/en_US.ISO8859-1/books/handbook/jails/chapter.xml
+++ b/en_US.ISO8859-1/books/handbook/jails/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
diff --git a/en_US.ISO8859-1/books/handbook/kernelconfig/chapter.xml b/en_US.ISO8859-1/books/handbook/kernelconfig/chapter.xml
index e619e68354..2cb8b4978d 100644
--- a/en_US.ISO8859-1/books/handbook/kernelconfig/chapter.xml
+++ b/en_US.ISO8859-1/books/handbook/kernelconfig/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
diff --git a/en_US.ISO8859-1/books/handbook/l10n/chapter.xml b/en_US.ISO8859-1/books/handbook/l10n/chapter.xml
index 96cc6a1e99..b9fbb4429c 100644
--- a/en_US.ISO8859-1/books/handbook/l10n/chapter.xml
+++ b/en_US.ISO8859-1/books/handbook/l10n/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
diff --git a/en_US.ISO8859-1/books/handbook/linuxemu/chapter.xml b/en_US.ISO8859-1/books/handbook/linuxemu/chapter.xml
index ee33ada712..ae378c57bf 100644
--- a/en_US.ISO8859-1/books/handbook/linuxemu/chapter.xml
+++ b/en_US.ISO8859-1/books/handbook/linuxemu/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
@@ -966,7 +966,7 @@ exit 0</programlisting>
contain the following:</para>
<programlisting>#!/compat/linux/bin/sh
-(sleep 5; killall -1 matlab_helper) &
+(sleep 5; killall -1 matlab_helper) &amp;
exit 0</programlisting>
</step>
diff --git a/en_US.ISO8859-1/books/handbook/mac/chapter.xml b/en_US.ISO8859-1/books/handbook/mac/chapter.xml
index 6d95c5f8ca..5bce8a18d0 100644
--- a/en_US.ISO8859-1/books/handbook/mac/chapter.xml
+++ b/en_US.ISO8859-1/books/handbook/mac/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
$FreeBSD$
diff --git a/en_US.ISO8859-1/books/handbook/mail/chapter.xml b/en_US.ISO8859-1/books/handbook/mail/chapter.xml
index 3c63bbdd61..3cf5e7c9f9 100644
--- a/en_US.ISO8859-1/books/handbook/mail/chapter.xml
+++ b/en_US.ISO8859-1/books/handbook/mail/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
diff --git a/en_US.ISO8859-1/books/handbook/mirrors/chapter.xml b/en_US.ISO8859-1/books/handbook/mirrors/chapter.xml
index a0e056bdd3..f1f7822769 100644
--- a/en_US.ISO8859-1/books/handbook/mirrors/chapter.xml
+++ b/en_US.ISO8859-1/books/handbook/mirrors/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
@@ -132,6 +132,10 @@
access methods available for each site are provided in
parentheses after the hostname.</para>
+ &chap.mirrors.ftp.index.inc;
+
+ &chap.mirrors.lastmod.inc;
+
&chap.mirrors.ftp.inc;
</sect1>
@@ -2381,7 +2385,12 @@ doc/zh_*</programlisting>
<para><link linkend="cvsup">CVSup</link> servers for &os; are
running at the following sites:</para>
+ &chap.mirrors.cvsup.index.inc;
+
+ &chap.mirrors.lastmod.inc;
+
&chap.mirrors.cvsup.inc;
+
</sect2>
</sect1>
diff --git a/en_US.ISO8859-1/books/handbook/multimedia/chapter.xml b/en_US.ISO8859-1/books/handbook/multimedia/chapter.xml
index b592d01df5..3dee59a408 100644
--- a/en_US.ISO8859-1/books/handbook/multimedia/chapter.xml
+++ b/en_US.ISO8859-1/books/handbook/multimedia/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
@@ -1629,7 +1629,7 @@ bktr0: Pinnacle/Miro TV, Philips SECAM tuner.</programlisting>
<para>Set up the MythTV database:</para>
- <screen>&prompt.root; <userinput>mysql -uroot -p < /usr/local/share/mythtv/database/mc.sql</userinput></screen>
+ <screen>&prompt.root; <userinput>mysql -uroot -p &lt; /usr/local/share/mythtv/database/mc.sql</userinput></screen>
<para>Configure the backend:</para>
diff --git a/en_US.ISO8859-1/books/handbook/network-servers/chapter.xml b/en_US.ISO8859-1/books/handbook/network-servers/chapter.xml
index 4e608b1115..e8c035e014 100644
--- a/en_US.ISO8859-1/books/handbook/network-servers/chapter.xml
+++ b/en_US.ISO8859-1/books/handbook/network-servers/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
diff --git a/en_US.ISO8859-1/books/handbook/pgpkeys/chapter.xml b/en_US.ISO8859-1/books/handbook/pgpkeys/chapter.xml
index ecd7b81155..3fef27e198 100644
--- a/en_US.ISO8859-1/books/handbook/pgpkeys/chapter.xml
+++ b/en_US.ISO8859-1/books/handbook/pgpkeys/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
diff --git a/en_US.ISO8859-1/books/handbook/ports/chapter.xml b/en_US.ISO8859-1/books/handbook/ports/chapter.xml
index d4f508d701..80a88030c8 100644
--- a/en_US.ISO8859-1/books/handbook/ports/chapter.xml
+++ b/en_US.ISO8859-1/books/handbook/ports/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
diff --git a/en_US.ISO8859-1/books/handbook/ppp-and-slip/chapter.xml b/en_US.ISO8859-1/books/handbook/ppp-and-slip/chapter.xml
index ec77fb06e7..c91498b7f9 100644
--- a/en_US.ISO8859-1/books/handbook/ppp-and-slip/chapter.xml
+++ b/en_US.ISO8859-1/books/handbook/ppp-and-slip/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
diff --git a/en_US.ISO8859-1/books/handbook/preface/preface.xml b/en_US.ISO8859-1/books/handbook/preface/preface.xml
index 85604b28cc..1d2a2a62e9 100644
--- a/en_US.ISO8859-1/books/handbook/preface/preface.xml
+++ b/en_US.ISO8859-1/books/handbook/preface/preface.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
$FreeBSD$
-->
diff --git a/en_US.ISO8859-1/books/handbook/printing/chapter.xml b/en_US.ISO8859-1/books/handbook/printing/chapter.xml
index 86745a32d5..5d958b57c4 100644
--- a/en_US.ISO8859-1/books/handbook/printing/chapter.xml
+++ b/en_US.ISO8859-1/books/handbook/printing/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
diff --git a/en_US.ISO8859-1/books/handbook/security/chapter.xml b/en_US.ISO8859-1/books/handbook/security/chapter.xml
index 3cd5bd1897..b10a4ab2db 100644
--- a/en_US.ISO8859-1/books/handbook/security/chapter.xml
+++ b/en_US.ISO8859-1/books/handbook/security/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
diff --git a/en_US.ISO8859-1/books/handbook/serialcomms/chapter.xml b/en_US.ISO8859-1/books/handbook/serialcomms/chapter.xml
index 0bba8ba883..5ed8d17942 100644
--- a/en_US.ISO8859-1/books/handbook/serialcomms/chapter.xml
+++ b/en_US.ISO8859-1/books/handbook/serialcomms/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
diff --git a/en_US.ISO8859-1/books/handbook/users/chapter.xml b/en_US.ISO8859-1/books/handbook/users/chapter.xml
index 0af8e71b7e..d63ff64e07 100644
--- a/en_US.ISO8859-1/books/handbook/users/chapter.xml
+++ b/en_US.ISO8859-1/books/handbook/users/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
diff --git a/en_US.ISO8859-1/books/handbook/vinum/chapter.xml b/en_US.ISO8859-1/books/handbook/vinum/chapter.xml
index 62de877c08..ed9aceabc5 100644
--- a/en_US.ISO8859-1/books/handbook/vinum/chapter.xml
+++ b/en_US.ISO8859-1/books/handbook/vinum/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The Vinum Volume Manager
By Greg Lehey (grog at lemis dot com)
diff --git a/en_US.ISO8859-1/books/handbook/virtualization/chapter.xml b/en_US.ISO8859-1/books/handbook/virtualization/chapter.xml
index 6794698f0a..0156ea9091 100644
--- a/en_US.ISO8859-1/books/handbook/virtualization/chapter.xml
+++ b/en_US.ISO8859-1/books/handbook/virtualization/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
@@ -1028,7 +1028,7 @@ xenbr1 8000.feffffffffff no vif0.1
role="package">emulators/virtualbox-ose-additions</filename>
package in the &os; guest.</para>
- <screen>&prompt.root; <userinput>cd /usr/ports/emulators/virtualbox-ose-additions && make install clean</userinput></screen>
+ <screen>&prompt.root; <userinput>cd /usr/ports/emulators/virtualbox-ose-additions &amp;&amp; make install clean</userinput></screen>
<para>Add these lines to
<filename>/etc/rc.conf</filename>:</para>
diff --git a/en_US.ISO8859-1/books/handbook/x11/chapter.xml b/en_US.ISO8859-1/books/handbook/x11/chapter.xml
index 362e3de511..5e09d09fec 100644
--- a/en_US.ISO8859-1/books/handbook/x11/chapter.xml
+++ b/en_US.ISO8859-1/books/handbook/x11/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
diff --git a/en_US.ISO8859-1/books/pmake/answers/chapter.xml b/en_US.ISO8859-1/books/pmake/answers/chapter.xml
index e3f96181fa..68d86a9db3 100644
--- a/en_US.ISO8859-1/books/pmake/answers/chapter.xml
+++ b/en_US.ISO8859-1/books/pmake/answers/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
$FreeBSD$
-->
diff --git a/en_US.ISO8859-1/books/pmake/basics/chapter.xml b/en_US.ISO8859-1/books/pmake/basics/chapter.xml
index 12df062549..4ae0a8b799 100644
--- a/en_US.ISO8859-1/books/pmake/basics/chapter.xml
+++ b/en_US.ISO8859-1/books/pmake/basics/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
$FreeBSD$
-->
diff --git a/en_US.ISO8859-1/books/pmake/book.xml b/en_US.ISO8859-1/books/pmake/book.xml
index c7c31487e1..bbb2b74813 100644
--- a/en_US.ISO8859-1/books/pmake/book.xml
+++ b/en_US.ISO8859-1/books/pmake/book.xml
@@ -1,8 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN" "../../share/xml/entities.ent">
-%entities;
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd" [
<!ENTITY % chapters.ent SYSTEM "chapters.ent">
%chapters.ent;
]>
@@ -16,6 +14,24 @@
<surname>de Boor</surname>
</author>
+ <copyright>
+ <year>1988</year>
+ <year>1989</year>
+ <holder>Adam de Boor</holder>
+ </copyright>
+
+ <copyright>
+ <year>1989</year>
+ <holder>Berkeley Softworks</holder>
+ </copyright>
+
+ <copyright>
+ <year>1988</year>
+ <year>1989</year>
+ <year>1993</year>
+ <holder>The Regents of the University of California.</holder>
+ </copyright>
+
&legalnotice;
<releaseinfo>$FreeBSD$</releaseinfo>
diff --git a/en_US.ISO8859-1/books/pmake/glossary/glossary.xml b/en_US.ISO8859-1/books/pmake/glossary/glossary.xml
index 9b59545ea8..d983027d75 100644
--- a/en_US.ISO8859-1/books/pmake/glossary/glossary.xml
+++ b/en_US.ISO8859-1/books/pmake/glossary/glossary.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
$FreeBSD$
-->
diff --git a/en_US.ISO8859-1/books/pmake/gods/chapter.xml b/en_US.ISO8859-1/books/pmake/gods/chapter.xml
index bc57aba8c9..6bca57995b 100644
--- a/en_US.ISO8859-1/books/pmake/gods/chapter.xml
+++ b/en_US.ISO8859-1/books/pmake/gods/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
$FreeBSD$
-->
diff --git a/en_US.ISO8859-1/books/pmake/intro/chapter.xml b/en_US.ISO8859-1/books/pmake/intro/chapter.xml
index 39597afc0b..b1cfcec310 100644
--- a/en_US.ISO8859-1/books/pmake/intro/chapter.xml
+++ b/en_US.ISO8859-1/books/pmake/intro/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
PMake - A Tutorial
diff --git a/en_US.ISO8859-1/books/pmake/legalnotice.xml b/en_US.ISO8859-1/books/pmake/legalnotice.xml
index d443019036..31254450ce 100644
--- a/en_US.ISO8859-1/books/pmake/legalnotice.xml
+++ b/en_US.ISO8859-1/books/pmake/legalnotice.xml
@@ -1,26 +1,10 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE legalnotice PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd"
<!--
$FreeBSD$
-->
-<copyright>
- <year>1988</year>
- <year>1989</year>
- <holder>Adam de Boor</holder>
-</copyright>
-
-<copyright>
- <year>1989</year>
- <holder>Berkeley Softworks</holder>
-</copyright>
-
-<copyright>
- <year>1988</year>
- <year>1989</year>
- <year>1993</year>
- <holder>The Regents of the University of California.</holder>
-</copyright>
-
<legalnotice id="legalnotice">
<para>All rights reserved.</para>
diff --git a/en_US.ISO8859-1/books/pmake/shortcuts/chapter.xml b/en_US.ISO8859-1/books/pmake/shortcuts/chapter.xml
index 417e3b65a5..9c7a90cac9 100644
--- a/en_US.ISO8859-1/books/pmake/shortcuts/chapter.xml
+++ b/en_US.ISO8859-1/books/pmake/shortcuts/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
$FreeBSD$
-->
diff --git a/en_US.ISO8859-1/books/porters-handbook/book.xml b/en_US.ISO8859-1/books/porters-handbook/book.xml
index 704f74dc1a..6be1dd16c6 100644
--- a/en_US.ISO8859-1/books/porters-handbook/book.xml
+++ b/en_US.ISO8859-1/books/porters-handbook/book.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN" "../../share/xml/entities.ent">
-%entities;
-]>
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<!--
The FreeBSD Documentation Project
@@ -4073,8 +4070,8 @@ PKGNAMESUFFIX= ${RESOLUTION}
:
# default
RESOLUTION?= 300
-.if ${RESOLUTION} != 118 && ${RESOLUTION} != 240 && \
- ${RESOLUTION} != 300 && ${RESOLUTION} != 400
+.if ${RESOLUTION} != 118 &amp;&amp; ${RESOLUTION} != 240 &amp;&amp; \
+ ${RESOLUTION} != 300 &amp;&amp; ${RESOLUTION} != 400
@${ECHO_MSG} "Error: invalid value for RESOLUTION: \"${RESOLUTION}\""
@${ECHO_MSG} "Possible values are: 118, 240, 300 (default) and 400."
@${FALSE}
@@ -6633,7 +6630,7 @@ PLIST_SUB+= QT_INCDIR_REL=${QT_INCDIR_REL} \
<programlisting>HAS_CONFIGURE= yes
do-configure:
- @cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} \
+ @cd ${WRKSRC} &amp;&amp; ${SETENV} ${CONFIGURE_ENV} \
${QMAKE} ${QMAKEFLAGS} PREFIX=${PREFIX} texmaker.pro</programlisting>
<para>Note the similarity to the <command>qmake</command> line
@@ -10001,7 +9998,7 @@ etc/orbit.conf.sample
<para>Store the directory structure in a new file.</para>
- <screen>&prompt.root; <userinput>(cd /var/tmp/`make -V PORTNAME` && find -d * -type d) | sort &gt; OLD-DIRS</userinput></screen>
+ <screen>&prompt.root; <userinput>(cd /var/tmp/`make -V PORTNAME` &amp;&amp; find -d * -type d) | sort &gt; OLD-DIRS</userinput></screen>
<para>Create an empty <filename>pkg-plist</filename>
file:</para>
@@ -10013,12 +10010,12 @@ etc/orbit.conf.sample
list.</para>
<screen>&prompt.root; <userinput>make install PREFIX=/var/tmp/`make -V PORTNAME`</userinput>
-&prompt.root; <userinput>(cd /var/tmp/`make -V PORTNAME` && find -d * \! -type d) | sort &gt; pkg-plist</userinput></screen>
+&prompt.root; <userinput>(cd /var/tmp/`make -V PORTNAME` &amp;&amp; find -d * \! -type d) | sort &gt; pkg-plist</userinput></screen>
<para>You must also add any newly created directories to the
packing list.</para>
- <screen>&prompt.root; <userinput>(cd /var/tmp/`make -V PORTNAME` && find -d * -type d) | sort | comm -13 OLD-DIRS - | sort -r | sed -e 's#^#@dirrm #' &gt;&gt; pkg-plist</userinput></screen>
+ <screen>&prompt.root; <userinput>(cd /var/tmp/`make -V PORTNAME` &amp;&amp; find -d * -type d) | sort | comm -13 OLD-DIRS - | sort -r | sed -e 's#^#@dirrm #' &gt;&gt; pkg-plist</userinput></screen>
<para>Finally, you need to tidy up the packing list by hand; it
is not <emphasis>all</emphasis> automated. Manual pages
@@ -10603,7 +10600,7 @@ as .putsy.conf and edit it.</programlisting>
<sect1 id="svn-diff">
<title>Using <literal>SVN</literal> to Make Patches</title>
- <para>If you can, please submit a &man.svn.1 diff; they are
+ <para>If you can, please submit a &man.svn.1; diff; they are
easier to handle than diffs between <quote>new and old</quote>
directories. Plus it is easier for you to see what you have
changed and to update your diff if something is modified in
diff --git a/en_US.ISO8859-1/share/xml/catalog b/en_US.ISO8859-1/share/xml/catalog
deleted file mode 100644
index a865eaa313..0000000000
--- a/en_US.ISO8859-1/share/xml/catalog
+++ /dev/null
@@ -1,32 +0,0 @@
- -- ...................................................................... --
- -- FreeBSD SGML Public Identifiers ...................................... --
-
- -- $FreeBSD$
- --
-
-PUBLIC "-//FreeBSD//DOCUMENT DocBook Stylesheet//EN"
- "freebsd.dsl"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook Glossary Entities//EN"
- "glossary.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//EN"
- "mailing-lists.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook Language Specific Entities//EN"
- "l10n.ent"
-
- -- ...................................................................... --
- -- HTML docs ............................................................ --
-
-PUBLIC "-//FreeBSD//ENTITIES FreeBSD L10N Entities//EN"
- "l10n.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES FreeBSD Release L10N Entities//EN"
- "release.l10n.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES HTML FreeBSD Header L10N Entities//EN"
- "header.l10n.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES HTML FreeBSD Navigation Bar L10N Entities//EN"
- "navibar.l10n.ent"
diff --git a/en_US.ISO8859-1/share/xml/catalog.xml b/en_US.ISO8859-1/share/xml/catalog.xml
index a077690b34..7f0d5f9037 100644
--- a/en_US.ISO8859-1/share/xml/catalog.xml
+++ b/en_US.ISO8859-1/share/xml/catalog.xml
@@ -13,4 +13,8 @@
rewritePrefix="../../"/>
<rewriteURI uriStartString="http://www.FreeBSD.org/XML/www/lang/"
rewritePrefix="../../"/>
+
+ <public
+ publicId="-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN"
+ uri="entities.ent" />
</catalog>
diff --git a/en_US.ISO8859-1/share/xml/entities.ent b/en_US.ISO8859-1/share/xml/entities.ent
index fe8eb023c8..e5a3813abe 100644
--- a/en_US.ISO8859-1/share/xml/entities.ent
+++ b/en_US.ISO8859-1/share/xml/entities.ent
@@ -3,23 +3,24 @@
<!ENTITY % l10n PUBLIC "-//FreeBSD//ENTITIES DocBook Language Specific Entities//EN"
"l10n.ent">
%l10n;
-<!ENTITY % l10n-common PUBLIC "-//FreeBSD//ENTITIES DocBook Language Neutral Entities//EN">
-%l10n-common;
-<!ENTITY % man PUBLIC "-//FreeBSD//ENTITIES DocBook Manual Page Entities//EN">
-%man;
-<!ENTITY % freebsd PUBLIC "-//FreeBSD//ENTITIES DocBook Miscellaneous FreeBSD Entities//EN">
+<!ENTITY % freebsd PUBLIC "-//FreeBSD//ENTITIES DocBook Miscellaneous FreeBSD Entities//EN"
+ "../../../share/xml/freebsd.ent">
%freebsd;
-<!ENTITY % glossary PUBLIC "-//FreeBSD//ENTITIES DocBook Glossary Entities//EN">
+<!ENTITY % glossary PUBLIC "-//FreeBSD//ENTITIES DocBook Glossary Entities//EN"
+ "glossary.ent">
%glossary;
-<!ENTITY % authors PUBLIC "-//FreeBSD//ENTITIES DocBook Author Entities//EN">
-%authors;
-<!ENTITY % teams PUBLIC "-//FreeBSD//ENTITIES DocBook Team Entities//EN">
+<!ENTITY % teams PUBLIC "-//FreeBSD//ENTITIES DocBook Team Entities//EN"
+ "teams.ent">
%teams;
-<!ENTITY % mailing-lists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//EN">
+<!ENTITY % mailing-lists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//EN"
+ "mailing-lists.ent">
%mailing-lists;
-<!ENTITY % newsgroups PUBLIC "-//FreeBSD//ENTITIES DocBook Newsgroup Entities//EN">
+<!ENTITY % newsgroups PUBLIC "-//FreeBSD//ENTITIES DocBook Newsgroup Entities//EN"
+ "newsgroups.ent">
%newsgroups;
-<!ENTITY % trademarks PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//EN">
+<!ENTITY % trademarks PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//EN"
+ "../../../share/xml/trademarks.ent">
%trademarks;
-<!ENTITY % urls PUBLIC "-//FreeBSD//ENTITIES DocBook URL Entities//EN">
+<!ENTITY % urls PUBLIC "-//FreeBSD//ENTITIES DocBook URL Entities//EN"
+ "../../../share/xml/urls.ent">
%urls;
diff --git a/es_ES.ISO8859-1/articles/casestudy-argentina.com/article.xml b/es_ES.ISO8859-1/articles/casestudy-argentina.com/article.xml
index 598c3888dc..28080609bc 100644
--- a/es_ES.ISO8859-1/articles/casestudy-argentina.com/article.xml
+++ b/es_ES.ISO8859-1/articles/casestudy-argentina.com/article.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//ES" "../../share/xml/entities.ent">
-%entities;
-]>
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<article lang='es'>
<title>Argentina.com : Un estudio de caso</title>
diff --git a/es_ES.ISO8859-1/articles/contributing/article.xml b/es_ES.ISO8859-1/articles/contributing/article.xml
index 84d59e794b..49212c4bef 100644
--- a/es_ES.ISO8859-1/articles/contributing/article.xml
+++ b/es_ES.ISO8859-1/articles/contributing/article.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//ES" "../../share/xml/entities.ent">
-%entities;
-]>
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<article lang="es">
<articleinfo>
diff --git a/es_ES.ISO8859-1/articles/cvs-freebsd/article.xml b/es_ES.ISO8859-1/articles/cvs-freebsd/article.xml
index 0d9af8f764..35f9e5f459 100644
--- a/es_ES.ISO8859-1/articles/cvs-freebsd/article.xml
+++ b/es_ES.ISO8859-1/articles/cvs-freebsd/article.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//ES" "../../share/xml/entities.ent">
-%entities;
-]>
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<!--
The FreeBSD Spanish Documentation Project
diff --git a/es_ES.ISO8859-1/articles/explaining-bsd/article.xml b/es_ES.ISO8859-1/articles/explaining-bsd/article.xml
index 26a31cad7e..4f3e4d17aa 100644
--- a/es_ES.ISO8859-1/articles/explaining-bsd/article.xml
+++ b/es_ES.ISO8859-1/articles/explaining-bsd/article.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//ES" "../../share/xml/entities.ent">
-%entities;
-]>
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<!-- $FreeBSD$ -->
<!-- The FreeBSD Spanish Documentation Project -->
@@ -254,7 +251,7 @@
<listitem>
<para>Existe la creencia de que los proyectos BSD est嫕
fragmentados y enfrentados entre s. El <ulink
- url="http://interactive.wsj.com/bin/login?Tag=/&amp;URI=/archive/retrieve.cgi%253Fid%253DSB952470579348918651.djm&">Wall Street
+ url="http://interactive.wsj.com/bin/login?Tag=/&amp;URI=/archive/retrieve.cgi%253Fid%253DSB952470579348918651.djm&amp;">Wall Street
Journal</ulink> habl de la <quote>balcanizaci鏮
</quote> de los proyectos BSD. Como en el caso del pleito, esa
creencia se fundamenta en historia antigua.</para>
diff --git a/es_ES.ISO8859-1/articles/fbsd-from-scratch/article.xml b/es_ES.ISO8859-1/articles/fbsd-from-scratch/article.xml
index f9b491df3f..fd0fc8e1d6 100644
--- a/es_ES.ISO8859-1/articles/fbsd-from-scratch/article.xml
+++ b/es_ES.ISO8859-1/articles/fbsd-from-scratch/article.xml
@@ -1,12 +1,10 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//ES" "../../share/xml/entities.ent">
-%entities;
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd" [
<!ENTITY scratch.ap "<application>FreeBSD From Scratch</application>">
]>
-<article lang='es'>
+<article xmlns:xi="http://www.w3.org/2001/XInclude" lang='es'>
<articleinfo>
<title>FreeBSD From Scratch</title>
@@ -472,7 +470,8 @@ Do you wish to delete what is left of /var/tmp/temproot.fase1? [no] <userinput>n
dispositivos como corresponda.</para>
</warning>
-<programlisting><inlinegraphic fileref="fase_1.sh" format="linespecific"/></programlisting>
+<programlisting><xi:include href="fase_1.sh" parse="text"
+ encoding="iso-8859-1"/></programlisting>
<para>Descargue <ulink
url="fase_1.sh"><filename>fase_1.sh</filename></ulink>.</para>
@@ -588,7 +587,8 @@ news inn-stable CONFIGURE_ARGS="--enable-uucp-rnews --enable-setgid-inews" make
compartida no olvide copiarlo al sistema nuevo antes de
arrancarlo.</para>
-<programlisting><inlinegraphic fileref="fase_2.sh" format="linespecific"/></programlisting>
+<programlisting><xi:include href="fase_2.sh" parse="text"
+ encoding="iso-8859-1"/></programlisting>
<para>Descargue <ulink
url="fase_2.sh"><filename>fase_2.sh</filename></ulink>.</para>
@@ -626,7 +626,8 @@ news inn-stable CONFIGURE_ARGS="--enable-uucp-rnews --enable-setgid-inews" make
partici鏮 compartida bien copi嫕dolo en algn
lugar dentro del nuevo sistema.</para>
-<programlisting><inlinegraphic fileref="fase_3.mk" format="linespecific"/></programlisting>
+<programlisting><xi:include href="fase_3.mk" parse="text"
+ encoding="iso-8859-1"/></programlisting>
<para>Descargue <ulink
url="fase_3.mk"><filename>fase_3.mk</filename></ulink>.</para>
diff --git a/es_ES.ISO8859-1/articles/fdp-es/article.xml b/es_ES.ISO8859-1/articles/fdp-es/article.xml
index 6d796c031d..02f4f44c32 100644
--- a/es_ES.ISO8859-1/articles/fdp-es/article.xml
+++ b/es_ES.ISO8859-1/articles/fdp-es/article.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//ES" "../../share/xml/entities.ent">
-%entities;
-]>
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<!--
The FreeBSD Spanish Documentation Project
diff --git a/es_ES.ISO8859-1/articles/laptop/article.xml b/es_ES.ISO8859-1/articles/laptop/article.xml
index 7f202815f2..34d6db171a 100644
--- a/es_ES.ISO8859-1/articles/laptop/article.xml
+++ b/es_ES.ISO8859-1/articles/laptop/article.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//ES" "../../share/xml/entities.ent">
-%entities;
-]>
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<article lang="es">
<articleinfo>
diff --git a/es_ES.ISO8859-1/articles/linux-comparison/article.xml b/es_ES.ISO8859-1/articles/linux-comparison/article.xml
index 100dfba3aa..0178b96b45 100644
--- a/es_ES.ISO8859-1/articles/linux-comparison/article.xml
+++ b/es_ES.ISO8859-1/articles/linux-comparison/article.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//ES" "../../share/xml/entities.ent">
-%entities;
-]>
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<!--
Copyright (c) 2005 Dru Lavigne
diff --git a/es_ES.ISO8859-1/articles/linux-users/article.xml b/es_ES.ISO8859-1/articles/linux-users/article.xml
index 1e888ab636..05f59f2195 100644
--- a/es_ES.ISO8859-1/articles/linux-users/article.xml
+++ b/es_ES.ISO8859-1/articles/linux-users/article.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//ES" "../../share/xml/entities.ent">
-%entities;
-]>
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<!-- The FreeBSD Spanish Documentation Project
Original Revision: r1.1 -->
diff --git a/es_ES.ISO8859-1/articles/mailing-list-faq/article.xml b/es_ES.ISO8859-1/articles/mailing-list-faq/article.xml
index 683cab8e61..04cf0f3ec9 100644
--- a/es_ES.ISO8859-1/articles/mailing-list-faq/article.xml
+++ b/es_ES.ISO8859-1/articles/mailing-list-faq/article.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//ES" "../../share/xml/entities.ent">
-%entities;
-]>
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<!-- $FreeBSD$
Traducido de la version 1.4
diff --git a/es_ES.ISO8859-1/articles/nanobsd/article.xml b/es_ES.ISO8859-1/articles/nanobsd/article.xml
index 4a603b736c..5bca3b3ecc 100644
--- a/es_ES.ISO8859-1/articles/nanobsd/article.xml
+++ b/es_ES.ISO8859-1/articles/nanobsd/article.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//ES" "../../share/xml/entities.ent">
-%entities;
-]>
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<!-- The FreeBSD Spanish Documentation Project
Original Revision: r1.3 -->
diff --git a/es_ES.ISO8859-1/articles/p4-primer/article.xml b/es_ES.ISO8859-1/articles/p4-primer/article.xml
index 55023fe416..85a6a05314 100644
--- a/es_ES.ISO8859-1/articles/p4-primer/article.xml
+++ b/es_ES.ISO8859-1/articles/p4-primer/article.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//ES" "../../share/xml/entities.ent">
-%entities;
-]>
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<article lang='es'>
<title><application>Perforce</application> en el contexto del desarrollo de &os;</title>
diff --git a/es_ES.ISO8859-1/articles/problem-reports/article.xml b/es_ES.ISO8859-1/articles/problem-reports/article.xml
index db02c89a9b..ad3ac9ab1b 100644
--- a/es_ES.ISO8859-1/articles/problem-reports/article.xml
+++ b/es_ES.ISO8859-1/articles/problem-reports/article.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//ES" "../../share/xml/entities.ent">
-%entities;
-]>
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<article lang='es'>
<articleinfo>
diff --git a/es_ES.ISO8859-1/articles/releng/article.xml b/es_ES.ISO8859-1/articles/releng/article.xml
index c5b6cf2823..1054c066e8 100644
--- a/es_ES.ISO8859-1/articles/releng/article.xml
+++ b/es_ES.ISO8859-1/articles/releng/article.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//ES" "../../share/xml/entities.ent">
-%entities;
-]>
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<!--
The FreeBSD Documentation Project
diff --git a/es_ES.ISO8859-1/books/faq/book.xml b/es_ES.ISO8859-1/books/faq/book.xml
index 4d8d30a2cd..3cc977e35e 100644
--- a/es_ES.ISO8859-1/books/faq/book.xml
+++ b/es_ES.ISO8859-1/books/faq/book.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//ES" "../../share/xml/entities.ent">
-%entities;
-]>
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<book lang="es">
<bookinfo>
diff --git a/es_ES.ISO8859-1/books/handbook/advanced-networking/chapter.xml b/es_ES.ISO8859-1/books/handbook/advanced-networking/chapter.xml
index a8e054b92f..6dacb31790 100755
--- a/es_ES.ISO8859-1/books/handbook/advanced-networking/chapter.xml
+++ b/es_ES.ISO8859-1/books/handbook/advanced-networking/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
@@ -2696,7 +2696,7 @@ Exports list on foobar:
trabajo de alto rendimiento, como por ejemplo estaciones de Silicon
Graphics y de Sun Microsystems. El montaje del sistema de ficheros
remoto suele funcionar perfectamente y algunas operaciones sobre el
- el sistema de ficheros pueden tener &eacute,xito pero de repente el
+ el sistema de ficheros pueden tener 憖ito pero de repente el
el servidor que no responde a las peticiones del cliente, aunque
peticiones y respuestas de otros clientes funcionan con normalidad y
se continan procesando. Esto sucede en los sistemas clientes,
@@ -3543,7 +3543,7 @@ options BOOTP_NFSROOT # NFS mount root filesystem using BOOTP info
<programlisting>#!/bin/sh
export DESTDIR=/data/misc/diskless
mkdir -p ${DESTDIR}
-cd /usr/src; make world && make kernel
+cd /usr/src; make world &amp;&amp; make kernel
cd /usr/src/etc; make distribution</programlisting>
<para>Una vez ejecutado puede ser necesario ajustar los ficheros
@@ -3637,7 +3637,7 @@ host margaux {
</sect4>
<sect4>
- <title><acronym>NFS</acronym> swap en &os&nbsp;5.X</title>
+ <title><acronym>NFS</acronym> swap en &os;&nbsp;5.X</title>
<para>El ncleo no soporta la activaci鏮 del
intercambio a trav廥 de <acronym>NFS</acronym> en tiempo de
@@ -6888,10 +6888,10 @@ www IN CNAME @</programlisting>
<para>Reorganizar y crear los archivos de configuraci鏮 de
zona b嫳icos:</para>
<screen>&prompt.root; <userinput>cp /etc/localtime etc</userinput><co id="localtime"/>
-&prompt.root; <userinput>mv named.conf etc && ln -sf etc/named.conf</userinput>
+&prompt.root; <userinput>mv named.conf etc &amp;&amp; ln -sf etc/named.conf</userinput>
&prompt.root; <userinput>mv named.root master</userinput>
<!-- I don't like this next bit -->
-&prompt.root; <userinput>sh make-localhost && mv localhost.rev localhost-v6.rev master</userinput>
+&prompt.root; <userinput>sh make-localhost &amp;&amp; mv localhost.rev localhost-v6.rev master</userinput>
&prompt.root; <userinput>cat > master/named.localhost
$ORIGIN localhost.
$TTL 6h
@@ -6921,12 +6921,12 @@ $TTL 6h
del directorio del <quote>sandbox</quote>:</para>
<screen>&prompt.root; <userinput>cd /usr/src/lib/libisc</userinput>
-&prompt.root; <userinput>make cleandir && make cleandir && make depend && make all</userinput>
+&prompt.root; <userinput>make cleandir &amp;&amp; make cleandir &amp;&amp; make depend &amp;&amp; make all</userinput>
&prompt.root; <userinput>cd /usr/src/lib/libbind</userinput>
-&prompt.root; <userinput>make cleandir && make cleandir && make depend && make all</userinput>
+&prompt.root; <userinput>make cleandir &amp;&amp; make cleandir &amp;&amp; make depend &amp;&amp; make all</userinput>
&prompt.root; <userinput>cd /usr/src/libexec/named-xfer</userinput>
-&prompt.root; <userinput>make cleandir && make cleandir && make depend && make NOSHARED=yes all</userinput>
-&prompt.root; <userinput>cp named-xfer /etc/namedb/bin && chmod 555 /etc/namedb/bin/named-xfer</userinput><co id="clean-cruft"/></screen>
+&prompt.root; <userinput>make cleandir &amp;&amp; make cleandir &amp;&amp; make depend &amp;&amp; make NOSHARED=yes all</userinput>
+&prompt.root; <userinput>cp named-xfer /etc/namedb/bin &amp;&amp; chmod 555 /etc/namedb/bin/named-xfer</userinput><co id="clean-cruft"/></screen>
<para>Despue廥 de instalar la versi鏮 est嫢ica
de <command>named-xfer</command> se deben realizar algunas tareas
@@ -6945,11 +6945,11 @@ $TTL 6h
<para>En algunas ocasiones este paso puede fallar. Si es su caso
ejecute lo siguiente:</para>
- <screen>&prompt.root; <userinput>cd /usr/src && make cleandir && make cleandir</userinput></screen>
+ <screen>&prompt.root; <userinput>cd /usr/src &amp;&amp; make cleandir &amp;&amp; make cleandir</userinput></screen>
<para>y borre su directorio <filename>/usr/obj</filename>:</para>
- <screen>&prompt.root; <userinput>rm -fr /usr/obj && mkdir /usr/obj</userinput></screen>
+ <screen>&prompt.root; <userinput>rm -fr /usr/obj &amp;&amp; mkdir /usr/obj</userinput></screen>
<para>Esto limpia cualquier <quote>impureza</quote> del
嫫bol de fuentes y si se repiten los pasos anteriores
@@ -6969,7 +6969,7 @@ $TTL 6h
que <application>named</application> pueda verlo y pueda escribir
sobre 幨:</para>
- <screen>&prompt.root; <userinput>cd /etc/namedb/dev && mknod null c 2 2</userinput>
+ <screen>&prompt.root; <userinput>cd /etc/namedb/dev &amp;&amp; mknod null c 2 2</userinput>
&prompt.root; <userinput>chmod 666 null</userinput></screen>
</listitem>
diff --git a/es_ES.ISO8859-1/books/handbook/audit/chapter.xml b/es_ES.ISO8859-1/books/handbook/audit/chapter.xml
index 40721a2b72..becd1a38a3 100644
--- a/es_ES.ISO8859-1/books/handbook/audit/chapter.xml
+++ b/es_ES.ISO8859-1/books/handbook/audit/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
diff --git a/es_ES.ISO8859-1/books/handbook/basics/chapter.xml b/es_ES.ISO8859-1/books/handbook/basics/chapter.xml
index cc0e7bf93c..307ff0a43f 100755
--- a/es_ES.ISO8859-1/books/handbook/basics/chapter.xml
+++ b/es_ES.ISO8859-1/books/handbook/basics/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
@@ -1534,7 +1534,7 @@ root 5211 0.0 0.2 3620 1724 2 I+ 2:09AM 0:00.01 passwd</screen>
que se preve que ocupen una slice.</para>
<para>Tanto las 哀lice y las unidades f疄icas
- 厚eligrosamente dedicadas&raquo, como otras unidades
+ 厚eligrosamente dedicadas, como otras unidades
contienen <firstterm>particiones</firstterm>, que se designan
mediante letras desde la <literal>a</literal>
hasta <literal>h</literal>. Esta letra se a鎙de al nombre
diff --git a/es_ES.ISO8859-1/books/handbook/bibliography/chapter.xml b/es_ES.ISO8859-1/books/handbook/bibliography/chapter.xml
index adcaf1ef07..cdcb9e9203 100755
--- a/es_ES.ISO8859-1/books/handbook/bibliography/chapter.xml
+++ b/es_ES.ISO8859-1/books/handbook/bibliography/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
diff --git a/es_ES.ISO8859-1/books/handbook/book.xml b/es_ES.ISO8859-1/books/handbook/book.xml
index 92c20ce932..0992d8dcfb 100755
--- a/es_ES.ISO8859-1/books/handbook/book.xml
+++ b/es_ES.ISO8859-1/books/handbook/book.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//ES" "../../share/xml/entities.ent">
-%entities;
-
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd" [
<!ENTITY % chapters SYSTEM "chapters.ent">
%chapters;
<!ENTITY % txtfiles SYSTEM "txtfiles.ent">
diff --git a/es_ES.ISO8859-1/books/handbook/boot/chapter.xml b/es_ES.ISO8859-1/books/handbook/boot/chapter.xml
index c30266dbcb..3a2fa91d94 100644
--- a/es_ES.ISO8859-1/books/handbook/boot/chapter.xml
+++ b/es_ES.ISO8859-1/books/handbook/boot/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
diff --git a/es_ES.ISO8859-1/books/handbook/chapters.ent b/es_ES.ISO8859-1/books/handbook/chapters.ent
index fab3b141f3..2de5ecc113 100755
--- a/es_ES.ISO8859-1/books/handbook/chapters.ent
+++ b/es_ES.ISO8859-1/books/handbook/chapters.ent
@@ -19,231 +19,61 @@
$FreeBSDes: doc/es_ES.ISO8859-1/books/handbook/chapters.ent,v 1.2 2004/10/08 22:36:51 jesusr Exp $
-->
-<!ENTITY % not.published "INCLUDE">
-
-<!ENTITY % chap.introduction "IGNORE">
-<!ENTITY % chap.install "IGNORE">
-<!ENTITY % chap.basics "IGNORE">
-<!ENTITY % chap.ports "IGNORE">
-<!ENTITY % chap.config "IGNORE">
-<!ENTITY % chap.boot "IGNORE">
-<!ENTITY % chap.users "IGNORE">
-<!ENTITY % chap.kernelconfig "IGNORE">
-<!ENTITY % chap.security "IGNORE">
-<!ENTITY % chap.jails "IGNORE">
-<!ENTITY % chap.printing "IGNORE">
-<!ENTITY % chap.disks "IGNORE">
-<!ENTITY % chap.geom "IGNORE">
-<!ENTITY % chap.vinum "IGNORE">
-<!ENTITY % chap.x11 "IGNORE">
-<!ENTITY % chap.l10n "IGNORE">
-<!ENTITY % chap.multimedia "IGNORE">
-<!ENTITY % chap.desktop "IGNORE">
-<!ENTITY % chap.serialcomms "IGNORE">
-<!ENTITY % chap.ppp-and-slip "IGNORE">
-<!ENTITY % chap.advanced-networking "IGNORE">
-<!ENTITY % chap.firewalls "IGNORE">
-<!ENTITY % chap.network-servers "IGNORE">
-<!ENTITY % chap.mail "IGNORE">
-<!ENTITY % chap.cutting-edge "IGNORE">
-<!ENTITY % chap.linuxemu "IGNORE">
-<!ENTITY % chap.mirrors "IGNORE">
-<!ENTITY % chap.mirrors.ftp.inc "INCLUDE">
-<!ENTITY % chap.mirrors.cvsup.inc "INCLUDE">
-<!ENTITY % chap.bibliography "IGNORE">
-<!ENTITY % chap.eresources "IGNORE">
-<!ENTITY % chap.eresources.www.inc "INCLUDE">
-<!ENTITY % chap.pgpkeys "IGNORE">
-<!ENTITY % chap.index "IGNORE">
-<!ENTITY % chap.freebsd-glossary "IGNORE">
-<!ENTITY % chap.mac "IGNORE">
-<!ENTITY % chap.audit "IGNORE">
-<!ENTITY % chap.filesystems "IGNORE">
-<!ENTITY % chap.dtrace "IGNORE">
-
<!ENTITY chap.preface SYSTEM "preface/preface.xml">
<!ENTITY % pgpkeys SYSTEM "../../../share/pgpkeys/pgpkeys.ent"> %pgpkeys;
<!-- Part One -->
-<![%chap.introduction;[
<!ENTITY chap.introduction SYSTEM "introduction/chapter.xml">
-]]>
-<![%chap.install;[
<!ENTITY chap.install SYSTEM "install/chapter.xml">
-]]>
-<![%chap.basics;[
<!ENTITY chap.basics SYSTEM "basics/chapter.xml">
-]]>
-<![%chap.ports;[
<!ENTITY chap.ports SYSTEM "ports/chapter.xml">
-]]>
-<![%chap.x11;[
<!ENTITY chap.x11 SYSTEM "x11/chapter.xml">
-]]>
<!-- Part Two -->
-<![%chap.desktop;[
<!ENTITY chap.desktop SYSTEM "desktop/chapter.xml">
-]]>
-<![%chap.multimedia;[
<!ENTITY chap.multimedia SYSTEM "multimedia/chapter.xml">
-]]>
-<![%chap.kernelconfig;[
<!ENTITY chap.kernelconfig SYSTEM "kernelconfig/chapter.xml">
-]]>
-<![%chap.printing;[
<!ENTITY chap.printing SYSTEM "printing/chapter.xml">
-]]>
-<![%chap.linuxemu;[
<!ENTITY chap.linuxemu SYSTEM "linuxemu/chapter.xml">
-]]>
<!-- Part Three -->
-<![%chap.config;[
<!ENTITY chap.config SYSTEM "config/chapter.xml">
-]]>
-<![%chap.boot;[
<!ENTITY chap.boot SYSTEM "boot/chapter.xml">
-]]>
-<![%chap.users;[
<!ENTITY chap.users SYSTEM "users/chapter.xml">
-]]>
-<![%chap.security;[
<!ENTITY chap.security SYSTEM "security/chapter.xml">
-]]>
-<![%chap.jails;[
<!ENTITY chap.jails SYSTEM "jails/chapter.xml">
-]]>
-<![%chap.mac;[
<!ENTITY chap.mac SYSTEM "mac/chapter.xml">
-]]>
-<![%chap.audit;[
<!ENTITY chap.audit SYSTEM "audit/chapter.xml">
-]]>
-<![%chap.disks;[
<!ENTITY chap.disks SYSTEM "disks/chapter.xml">
-]]>
-<![%chap.geom;[
<!ENTITY chap.geom SYSTEM "geom/chapter.xml">
-]]>
-<![%chap.filesystems;[
<!ENTITY chap.filesystems SYSTEM "filesystems/chapter.xml">
-]]>
-<![%chap.vinum;[
<!ENTITY chap.vinum SYSTEM "vinum/chapter.xml">
-]]>
-<![%chap.virtualization;[
<!ENTITY chap.virtualization SYSTEM "virtualization/chapter.xml">
-]]>
-<![%chap.l10n;[
<!ENTITY chap.l10n SYSTEM "l10n/chapter.xml">
-]]>
-<![%chap.cutting-edge;[
<!ENTITY chap.cutting-edge SYSTEM "cutting-edge/chapter.xml">
-]]>
-<![%chap.dtrace;[
<!ENTITY chap.dtrace SYSTEM "dtrace/chapter.xml">
-]]>
<!-- Part Four -->
-<![%chap.serialcomms;[
<!ENTITY chap.serialcomms SYSTEM "serialcomms/chapter.xml">
-]]>
-<![%chap.ppp-and-slip;[
<!ENTITY chap.ppp-and-slip SYSTEM "ppp-and-slip/chapter.xml">
-]]>
-<![%chap.mail;[
<!ENTITY chap.mail SYSTEM "mail/chapter.xml">
-]]>
-<![%chap.network-servers;[
<!ENTITY chap.network-servers SYSTEM "network-servers/chapter.xml">
-]]>
-<![%chap.firewalls;[
<!ENTITY chap.firewalls SYSTEM "firewalls/chapter.xml">
-]]>
-<![%chap.advanced-networking;[
<!ENTITY chap.advanced-networking SYSTEM "advanced-networking/chapter.xml">
-]]>
<!-- Part Five (appendices) -->
-<![%chap.mirrors;[
- <!ENTITY chap.mirrors SYSTEM "mirrors/chapter.xml">
-]]>
-<![%chap.mirrors.ftp.inc;[
- <!ENTITY chap.mirrors.ftp.inc SYSTEM "mirrors.xml.ftp.inc">
-]]>
-<![%chap.mirrors.cvsup.inc;[
- <!ENTITY chap.mirrors.cvsup.inc SYSTEM "mirrors.xml.cvsup.inc">
-]]>
-<![%chap.bibliography;[
- <!ENTITY chap.bibliography SYSTEM "bibliography/chapter.xml">
-]]>
-<![%chap.eresources;[
- <!ENTITY chap.eresources SYSTEM "eresources/chapter.xml">
-]]>
-<![%chap.eresources.www.inc;[
- <!ENTITY chap.eresources.www.inc SYSTEM "eresources.xml.www.inc">
-]]>
-<![%chap.pgpkeys;[
- <!ENTITY chap.pgpkeys SYSTEM "pgpkeys/chapter.xml">
-]]>
-<![%chap.freebsd-glossary;[
- <!ENTITY chap.freebsd-glossary "&freebsd-glossary;">
-]]>
-<![%chap.index;[
- <!ENTITY chap.index SYSTEM "index.xml">
-]]>
+ <!ENTITY chap.mirrors SYSTEM "mirrors/chapter.xml">
+ <!ENTITY chap.mirrors.lastmod.inc SYSTEM "mirrors.lastmod.inc">
+ <!ENTITY chap.mirrors.ftp.index.inc SYSTEM "mirrors.xml.ftp.index.inc">
+ <!ENTITY chap.mirrors.ftp.inc SYSTEM "mirrors.xml.ftp.inc">
+ <!ENTITY chap.mirrors.cvsup.index.inc SYSTEM "mirrors.xml.cvsup.index.inc">
+ <!ENTITY chap.mirrors.cvsup.inc SYSTEM "mirrors.xml.cvsup.inc">
+ <!ENTITY chap.bibliography SYSTEM "bibliography/chapter.xml">
+ <!ENTITY chap.eresources SYSTEM "eresources/chapter.xml">
+ <!ENTITY chap.eresources.www.index.inc SYSTEM "eresources.xml.www.index.inc">
+ <!ENTITY chap.eresources.www.inc SYSTEM "eresources.xml.www.inc">
+ <!ENTITY chap.pgpkeys SYSTEM "pgpkeys/chapter.xml">
+ <!ENTITY chap.freebsd-glossary "&freebsd-glossary;">
+ <!ENTITY chap.index "">
<!ENTITY chap.colophon SYSTEM "colophon.xml">
-
-<!-- IGNORE cases -->
-
-<!-- Part One -->
-<!ENTITY chap.introduction "">
-<!ENTITY chap.install "">
-<!ENTITY chap.basics "">
-<!ENTITY chap.ports "">
-<!ENTITY chap.x11 "">
-
-<!-- Part Two -->
-<!ENTITY chap.desktop "">
-<!ENTITY chap.multimedia "">
-<!ENTITY chap.kernelconfig "">
-<!ENTITY chap.printing "">
-<!ENTITY chap.linuxemu "">
-
-<!-- Part Three -->
-<!ENTITY chap.config "">
-<!ENTITY chap.boot "">
-<!ENTITY chap.users "">
-<!ENTITY chap.security "">
-<!ENTITY chap.jails "">
-<!ENTITY chap.mac "">
-<!ENTITY chap.audit "">
-<!ENTITY chap.disks "">
-<!ENTITY chap.geom "">
-<!ENTITY chap.filesystems "">
-<!ENTITY chap.vinum "">
-<!ENTITY chap.virtualization "">
-<!ENTITY chap.l10n "">
-<!ENTITY chap.cutting-edge "">
-<!ENTITY chap.dtrace "">
-
-<!-- Part Four -->
-<!ENTITY chap.serialcomms "">
-<!ENTITY chap.ppp-and-slip "">
-<!ENTITY chap.mail "">
-<!ENTITY chap.network-servers "">
-<!ENTITY chap.firewalls "">
-<!ENTITY chap.advanced-networking "">
-
-<!-- Part Five (appendices) -->
-<!ENTITY chap.mirrors "">
-<!ENTITY chap.mirrors.ftp.inc "">
-<!ENTITY chap.mirrors.cvsup.inc "">
-<!ENTITY chap.bibliography "">
-<!ENTITY chap.eresources "">
-<!ENTITY chap.eresources.www.inc "">
-<!ENTITY chap.pgpkeys "">
-<!ENTITY chap.freebsd-glossary "">
-<!ENTITY chap.index "">
diff --git a/es_ES.ISO8859-1/books/handbook/colophon.xml b/es_ES.ISO8859-1/books/handbook/colophon.xml
index 757be7a2dd..36cba45a64 100644
--- a/es_ES.ISO8859-1/books/handbook/colophon.xml
+++ b/es_ES.ISO8859-1/books/handbook/colophon.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
diff --git a/es_ES.ISO8859-1/books/handbook/config/chapter.xml b/es_ES.ISO8859-1/books/handbook/config/chapter.xml
index bdf9fce3a7..b97e06f27d 100644
--- a/es_ES.ISO8859-1/books/handbook/config/chapter.xml
+++ b/es_ES.ISO8859-1/books/handbook/config/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
diff --git a/es_ES.ISO8859-1/books/handbook/cutting-edge/chapter.xml b/es_ES.ISO8859-1/books/handbook/cutting-edge/chapter.xml
index f4f13fc3a0..9656d5dd78 100755
--- a/es_ES.ISO8859-1/books/handbook/cutting-edge/chapter.xml
+++ b/es_ES.ISO8859-1/books/handbook/cutting-edge/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
diff --git a/es_ES.ISO8859-1/books/handbook/desktop/chapter.xml b/es_ES.ISO8859-1/books/handbook/desktop/chapter.xml
index da24efcfd7..e4316d8b02 100644
--- a/es_ES.ISO8859-1/books/handbook/desktop/chapter.xml
+++ b/es_ES.ISO8859-1/books/handbook/desktop/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!-- Version en ingles traducida: 1.45
@@ -199,7 +199,7 @@
electr鏮ico, lector de noticias e incluso ofrece un
editor de p墔inas HTML por si quiere crear
p墔inas web. Los usuarios de
- <application>&netscape</application> encontrar嫕 semejanzas
+ <application>&netscape;</application> encontrar嫕 semejanzas
con la suite <application>Communicator</application>, dado que
ambos navegadores comparten parte de la base de desarrollo.</para>
diff --git a/es_ES.ISO8859-1/books/handbook/disks/chapter.xml b/es_ES.ISO8859-1/books/handbook/disks/chapter.xml
index 797e418fdb..20f4c7839c 100644
--- a/es_ES.ISO8859-1/books/handbook/disks/chapter.xml
+++ b/es_ES.ISO8859-1/books/handbook/disks/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
@@ -2026,7 +2026,7 @@ cd0: Attempt to query device size failed: NOT READY, Medium not present - tray c
<para>Algunas veces las entradas bajo <filename>/dev</filename>
tendr嫕 que ser (re)creadas. Para ello, ejecute:</para>
- <screen>&prompt.root; <userinput>cd /dev && ./MAKEDEV "fd*"</userinput></screen>
+ <screen>&prompt.root; <userinput>cd /dev &amp;&amp; ./MAKEDEV "fd*"</userinput></screen>
</sect4>
<sect4>
@@ -2680,9 +2680,9 @@ sa0(ncr1:4:0): Logical unit is in process of becoming ready</screen>
para mandar los datos a una unidad de cinta remota.</para>
<screen>&prompt.root; <userinput>for f in <replaceable>lista_directorios; do</replaceable></userinput>
-<userinput>find $f >> backup.list</userinput>
+<userinput>find $f &lt;&lt; backup.list</userinput>
<userinput>done</userinput>
-&prompt.root; <userinput>cpio -v -o --format=newc < backup.list | ssh <replaceable>usuario</replaceable>@<replaceable>m嫭uina</replaceable> "cat > <replaceable>dispositivo_de_respaldo</replaceable>"</userinput></screen>
+&prompt.root; <userinput>cpio -v -o --format=newc &lt; backup.list | ssh <replaceable>usuario</replaceable>@<replaceable>m嫭uina</replaceable> "cat > <replaceable>dispositivo_de_respaldo</replaceable>"</userinput></screen>
<para>Donde <replaceable>lista_directorios</replaceable> es la lista de
directorios que desea respaldar,
@@ -2890,7 +2890,7 @@ sa0(ncr1:4:0): Logical unit is in process of becoming ready</screen>
<title>Un <quote>script</quote> para la creaci鏮 de discos
flexibles de arranque</title>
- <programlisting><![ CDATA [#!/bin/sh
+ <programlisting><![CDATA[#!/bin/sh
#
# create a restore floppy
#
@@ -2936,7 +2936,7 @@ mkdir /mnt/var
#
if [ ! -x /sys/compile/MINI/kernel ]
then
- cat << EOM
+ cat &lt;&lt; EOM
The MINI kernel does not exist, please create one.
Here is an example config file:
#
@@ -3018,19 +3018,19 @@ cd /
#
# create minimum file system table
#
-cat > /mnt/etc/fstab <<EOM
+cat > /mnt/etc/fstab &lt;&lt;EOM
/dev/fd0a / ufs rw 1 1
EOM
#
# create minimum passwd file
#
-cat > /mnt/etc/passwd <<EOM
-root:*:0:0:Charlie &:/root:/bin/sh
+cat > /mnt/etc/passwd &lt;&lt;EOM
+root:*:0:0:Charlie &amp;:/root:/bin/sh
EOM
-cat > /mnt/etc/master.passwd <<EOM
-root::0:0::0:0:Charlie &:/root:/bin/sh
+cat > /mnt/etc/master.passwd &lt;&lt;EOM
+root::0:0::0:0:Charlie &amp;:/root:/bin/sh
EOM
chmod 600 /mnt/etc/master.passwd
@@ -3111,17 +3111,6 @@ echo "The floppy has been unmounted and is now ready."]]></programlisting>
Una hora m嫳 que gaste ahora puede ahorrarle mucho
sufrimiento m嫳 adelante.</para>
</sect3>
-
-<![ %not.published; [
-
- <sect3>
- <title>* No tom medidas antes del desastre
- ?Y ahora qu?</title>
-
- <para></para>
- </sect3>
-]]>
-
</sect2>
</sect1>
diff --git a/es_ES.ISO8859-1/books/handbook/eresources/chapter.xml b/es_ES.ISO8859-1/books/handbook/eresources/chapter.xml
index ed00cd1f37..048d4fc722 100755
--- a/es_ES.ISO8859-1/books/handbook/eresources/chapter.xml
+++ b/es_ES.ISO8859-1/books/handbook/eresources/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
@@ -1770,7 +1770,7 @@ help
<entry>SSH only</entry>
<entry>CVS de s鏊o lectura, espacio web personal,
correo electr鏮ico</entry>
- <entry>&a.brian</entry>
+ <entry>&a.brian;</entry>
</row>
<row>
diff --git a/es_ES.ISO8859-1/books/handbook/firewalls/chapter.xml b/es_ES.ISO8859-1/books/handbook/firewalls/chapter.xml
index 27b273129a..daef773e24 100644
--- a/es_ES.ISO8859-1/books/handbook/firewalls/chapter.xml
+++ b/es_ES.ISO8859-1/books/handbook/firewalls/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
diff --git a/es_ES.ISO8859-1/books/handbook/geom/chapter.xml b/es_ES.ISO8859-1/books/handbook/geom/chapter.xml
index 3a3a17c509..fa47c57455 100644
--- a/es_ES.ISO8859-1/books/handbook/geom/chapter.xml
+++ b/es_ES.ISO8859-1/books/handbook/geom/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Spanish Documentation Project
@@ -343,7 +343,7 @@ Done.</screen>
copiar el c鏚igo de arranque. De ese modo, el fallo
estar燰 garantizado.</para>
- <screen>&prompt.root; <userinput>dump -L -0 -f- / |(cd /mnt && restore -r -v -f-)</userinput></screen>
+ <screen>&prompt.root; <userinput>dump -L -0 -f- / |(cd /mnt &amp;&amp; restore -r -v -f-)</userinput></screen>
<para>Se debe hacer esto para cada sistema de ficheros. Simplemente
ponga el sistema de ficheros adecuado en la ubicaci鏮 correcta
diff --git a/es_ES.ISO8859-1/books/handbook/install/chapter.xml b/es_ES.ISO8859-1/books/handbook/install/chapter.xml
index 9561c329e2..1a690d30b6 100755
--- a/es_ES.ISO8859-1/books/handbook/install/chapter.xml
+++ b/es_ES.ISO8859-1/books/handbook/install/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
@@ -1943,7 +1943,7 @@ Mounting root from ufs:/dev/md0c
</figure>
<para>El <keycap>tabulador</keycap> se usa para hacer pasar el
- cursor entre &gui.ok, &gui.cancel;.</para>
+ cursor entre &gui.ok;, &gui.cancel;.</para>
<para>Pulse <keycap>tabulador</keycap> para pasar el cursor a
&gui.ok; y pulse
@@ -3505,7 +3505,7 @@ Pulse [Intro] para abrir /etc/exports en un editor
<para>Esta opci鏮 le permitir cortar y pegar texto en
consola y en otros programas mediante un rat鏮 de tres
- botones. Consulte &man.moused.8 si usa uno de 2 botones, es posible
+ botones. Consulte &man.moused.8; si usa uno de 2 botones, es posible
emular ese tercer bot鏮. En el siguiente ejemplo veremos la
configuraci鏮 de un rat鏮 南o USB (es
decir, PS/2 o de puerto COM):</para>
@@ -4714,7 +4714,7 @@ Please press any key to reboot.</screen>
<para>Cuando el disco de arranque no sea el primer disco
del sistema &os; necesitar un poco de ayuda para
poderlo encontrar. Puede haber dos escenarios donde
- suceda esto y en ambos hay que decirle a &os, d鏮de
+ suceda esto y en ambos hay que decirle a &os;, d鏮de
encontrar el sistema de ficheros ra瞵. Esto se
hace especificando el nmero de disco segn
la BIOS, el tipo de disco y el nmero de disco
diff --git a/es_ES.ISO8859-1/books/handbook/introduction/chapter.xml b/es_ES.ISO8859-1/books/handbook/introduction/chapter.xml
index f7c37db1e5..1e54c65d94 100755
--- a/es_ES.ISO8859-1/books/handbook/introduction/chapter.xml
+++ b/es_ES.ISO8859-1/books/handbook/introduction/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
diff --git a/es_ES.ISO8859-1/books/handbook/jails/chapter.xml b/es_ES.ISO8859-1/books/handbook/jails/chapter.xml
index 3ca141ef23..f5ec23d124 100644
--- a/es_ES.ISO8859-1/books/handbook/jails/chapter.xml
+++ b/es_ES.ISO8859-1/books/handbook/jails/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
diff --git a/es_ES.ISO8859-1/books/handbook/kernelconfig/chapter.xml b/es_ES.ISO8859-1/books/handbook/kernelconfig/chapter.xml
index e6c565ac1f..da31429a20 100755
--- a/es_ES.ISO8859-1/books/handbook/kernelconfig/chapter.xml
+++ b/es_ES.ISO8859-1/books/handbook/kernelconfig/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
@@ -367,7 +367,7 @@ ath_hal(4) - Atheros Hardware Access Layer (HAL)</programlisting>
&prompt.root; <userinput>cp GENERIC MIKERNEL</userinput></screen>
<para>Por tradici鏮 el nombre se escribe con maysuculas y
- si tiene varias maquinas &os, con diferente hardware es recomendable
+ si tiene varias maquinas &os;, con diferente hardware es recomendable
darle a cada kernel el mismo nombre que la m嫭uina en la que va
a ejecutarse. En este ejemplo usaremos el nombre de
<filename>MIKERNEL</filename> .</para>
diff --git a/es_ES.ISO8859-1/books/handbook/l10n/chapter.xml b/es_ES.ISO8859-1/books/handbook/l10n/chapter.xml
index 8eb69d1a3d..ef9caf7f8b 100755
--- a/es_ES.ISO8859-1/books/handbook/l10n/chapter.xml
+++ b/es_ES.ISO8859-1/books/handbook/l10n/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Spanish Documentation Project
diff --git a/es_ES.ISO8859-1/books/handbook/linuxemu/chapter.xml b/es_ES.ISO8859-1/books/handbook/linuxemu/chapter.xml
index 29f119cd53..1c75327839 100755
--- a/es_ES.ISO8859-1/books/handbook/linuxemu/chapter.xml
+++ b/es_ES.ISO8859-1/books/handbook/linuxemu/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
@@ -60,7 +60,7 @@
su producto si existieran esas versiones para &os;, y
la mayor燰 contina desarrollando nicamente
para Linux.
- Vista la situaci鏮 ?que puede hacer un usuario de &os?
+ Vista la situaci鏮 ?que puede hacer un usuario de &os;?
Aqu es donde entra en juego la compatibilidad binaria con
Linux.</para>
@@ -686,14 +686,14 @@ LOG=/var/log/lmgrd.log
case "$1" in
start)
- lmgrd -c ${LICENSE_FILE} 2>> ${LOG} 1>&2
+ lmgrd -c ${LICENSE_FILE} 2&lt;&lt; ${LOG} 1&lt;&amp;2
echo -n " lmgrd"
;;
stop)
- lmgrd -c ${LICENSE_FILE} -x lmdown 2>> ${LOG} 1>&2
+ lmgrd -c ${LICENSE_FILE} -x lmdown 2&lt;&lt; ${LOG} 1&lt;&amp;2
;;
*)
- echo "Usage: `basename $0` {start|stop}" 1>&2
+ echo "Usage: `basename $0` {start|stop}" 1&lt;&amp;2
exit 64
;;
esac
@@ -992,7 +992,7 @@ exit 0</programlisting>
contenido:</para>
<programlisting>#!/usr/compat/linux/bin/sh
-(sleep 5; killall -1 matlab_helper) &
+(sleep 5; killall -1 matlab_helper) &amp;
exit 0</programlisting>
</step>
diff --git a/es_ES.ISO8859-1/books/handbook/mac/chapter.xml b/es_ES.ISO8859-1/books/handbook/mac/chapter.xml
index bf520959eb..a91a700e55 100644
--- a/es_ES.ISO8859-1/books/handbook/mac/chapter.xml
+++ b/es_ES.ISO8859-1/books/handbook/mac/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
diff --git a/es_ES.ISO8859-1/books/handbook/mail/chapter.xml b/es_ES.ISO8859-1/books/handbook/mail/chapter.xml
index 972aca5bcf..e386dd54fb 100755
--- a/es_ES.ISO8859-1/books/handbook/mail/chapter.xml
+++ b/es_ES.ISO8859-1/books/handbook/mail/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
@@ -2053,7 +2053,7 @@ sasl_pwcheck_program="/usr/local/sbin/pwcheck"</programlisting>
el nmero del mensaje que queremos leer.
En este ejemplo vamos a leer el primer correo:</para>
- <screen>& <userinput>t 1</userinput>
+ <screen>&prompt.user; <userinput>t 1</userinput>
Message 1:
From root@localhost Mon Mar 8 14:05:52 2004
X-Original-To: marcs@localhost
@@ -2086,7 +2086,7 @@ This is a test message, please reply if you receive it.</screen>
(<keycap>.</keycap>) a continuaci鏮 de un salto de
l璯ea. Veamos un ejemplo:</para>
- <screen>& <userinput>R 1</userinput>
+ <screen>&prompt.user; <userinput>R 1</userinput>
To: root@localhost
Subject: Re: test
@@ -2105,7 +2105,7 @@ EOT</screen>
<keycap>.</keycap> tras un saldo de l璯ea y pulsando la
tecla <quote>enter</quote>.</para>
- <screen>& <userinput>mail root@localhost</userinput>
+ <screen>&prompt.user; <userinput>mail root@localhost</userinput>
Subject: <userinput>I mastered mail
Now I can send and receive email using mail ... :)
@@ -2537,7 +2537,7 @@ user "john", with password "XXXXX", is "myth" here;</programlisting>
a la direcci鏮 <literal>corredefiar@ejemplo2.com</literal>:</para>
<programlisting>:0
-* < 1000
+* &lt; 1000
! correodefiar@ejemplo2.com</programlisting>
<para>Env甐 de todos los correos dirigidos a
diff --git a/es_ES.ISO8859-1/books/handbook/mirrors/chapter.xml b/es_ES.ISO8859-1/books/handbook/mirrors/chapter.xml
index 95d76fe814..2ad2162903 100755
--- a/es_ES.ISO8859-1/books/handbook/mirrors/chapter.xml
+++ b/es_ES.ISO8859-1/books/handbook/mirrors/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
diff --git a/es_ES.ISO8859-1/books/handbook/multimedia/chapter.xml b/es_ES.ISO8859-1/books/handbook/multimedia/chapter.xml
index 36d7389b18..28684c2af3 100644
--- a/es_ES.ISO8859-1/books/handbook/multimedia/chapter.xml
+++ b/es_ES.ISO8859-1/books/handbook/multimedia/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
diff --git a/es_ES.ISO8859-1/books/handbook/network-servers/chapter.xml b/es_ES.ISO8859-1/books/handbook/network-servers/chapter.xml
index a1f505b2c2..fa6bfd3767 100644
--- a/es_ES.ISO8859-1/books/handbook/network-servers/chapter.xml
+++ b/es_ES.ISO8859-1/books/handbook/network-servers/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
diff --git a/es_ES.ISO8859-1/books/handbook/pgpkeys/chapter.xml b/es_ES.ISO8859-1/books/handbook/pgpkeys/chapter.xml
index a67436d033..8408f8d52e 100755
--- a/es_ES.ISO8859-1/books/handbook/pgpkeys/chapter.xml
+++ b/es_ES.ISO8859-1/books/handbook/pgpkeys/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
diff --git a/es_ES.ISO8859-1/books/handbook/ports/chapter.xml b/es_ES.ISO8859-1/books/handbook/ports/chapter.xml
index bb5822a5d4..c70dad0efb 100755
--- a/es_ES.ISO8859-1/books/handbook/ports/chapter.xml
+++ b/es_ES.ISO8859-1/books/handbook/ports/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
@@ -1165,7 +1165,7 @@ ftp://ftp.FreeBSD.org/pub/FreeBSD/ports/distfiles/ fetch</userinput></screen>
<screen>&prompt.root; <userinput>portupgrade -ai</userinput></screen>
<para>Si solamente quiere actualizar una sola aplicaci鏮 (y no
- absolutamente todos los ports) utilice la orden <<command>portupgrade
+ absolutamente todos los ports) utilice la orden <command>portupgrade
<replaceable>nombre-de-aplicaci鏮</replaceable></command>.
A鎙da el modificador <option>-R</option> si quiere que
<application>portupgrade</application> actualice antes todos los
diff --git a/es_ES.ISO8859-1/books/handbook/ppp-and-slip/chapter.xml b/es_ES.ISO8859-1/books/handbook/ppp-and-slip/chapter.xml
index f382b7cf30..35d8e0d4df 100755
--- a/es_ES.ISO8859-1/books/handbook/ppp-and-slip/chapter.xml
+++ b/es_ES.ISO8859-1/books/handbook/ppp-and-slip/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
@@ -1895,7 +1895,7 @@ reinput 1 {\255}
if success goto slhup
reinput 1 {\127}
if success goto slhup
-if < \%x 60 goto look
+if &lt; \%x 60 goto look
else goto slhup
:sllogin ; login
@@ -1916,7 +1916,7 @@ reinput 1 {\255}
if success goto slhup
reinput 1 {\127}
if success goto slhup
-if < \%x 10 goto slloop ; intentar 10 veces para obtener un login
+if &lt; \%x 10 goto slloop ; intentar 10 veces para obtener un login
else goto slhup ; colgar y empezar de nuevo si a la decima falla
:sluid
diff --git a/es_ES.ISO8859-1/books/handbook/preface/preface.xml b/es_ES.ISO8859-1/books/handbook/preface/preface.xml
index 19ecae79f7..5c719c142f 100644
--- a/es_ES.ISO8859-1/books/handbook/preface/preface.xml
+++ b/es_ES.ISO8859-1/books/handbook/preface/preface.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
$FreeBSD$
diff --git a/es_ES.ISO8859-1/books/handbook/printing/chapter.xml b/es_ES.ISO8859-1/books/handbook/printing/chapter.xml
index c1c19adca6..4362195974 100755
--- a/es_ES.ISO8859-1/books/handbook/printing/chapter.xml
+++ b/es_ES.ISO8859-1/books/handbook/printing/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
diff --git a/es_ES.ISO8859-1/books/handbook/security/chapter.xml b/es_ES.ISO8859-1/books/handbook/security/chapter.xml
index d70d2a0398..6de38d9e3d 100755
--- a/es_ES.ISO8859-1/books/handbook/security/chapter.xml
+++ b/es_ES.ISO8859-1/books/handbook/security/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
@@ -4817,7 +4817,7 @@ COPYRIGHT 100% |*****************************| 4735
<title>ssh-keygen</title>
<para>&man.ssh-keygen.1; le permite validar a un usuario sin
- pedirle la contrase鎙:<</para>
+ pedirle la contrase鎙:</para>
<screen>&prompt.user; <userinput>ssh-keygen -t <replaceable>dsa</replaceable></userinput>
Generating public/private dsa key pair.
@@ -5320,7 +5320,7 @@ drwxr-xr-x 2 robert robert 512 Nov 10 11:54 public_html</programlisting>
<para>Si quiere usar <application>Portaudit</application>
inst嫮elo desde la colecci鏮 de ports:</para>
- <screen>&prompt.root; <userinput>cd /usr/ports/security/portaudit && make install clean</userinput></screen>
+ <screen>&prompt.root; <userinput>cd /usr/ports/security/portaudit &amp;&amp; make install clean</userinput></screen>
<para>Durante el proceso de instalaci鏮 los ficheros
de configuraci鏮 de &man.periodic.8; se actualizan
diff --git a/es_ES.ISO8859-1/books/handbook/serialcomms/chapter.xml b/es_ES.ISO8859-1/books/handbook/serialcomms/chapter.xml
index e4ede53d79..c8af2d1fe4 100755
--- a/es_ES.ISO8859-1/books/handbook/serialcomms/chapter.xml
+++ b/es_ES.ISO8859-1/books/handbook/serialcomms/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
diff --git a/es_ES.ISO8859-1/books/handbook/users/chapter.xml b/es_ES.ISO8859-1/books/handbook/users/chapter.xml
index 7f231264e3..8dbf408674 100644
--- a/es_ES.ISO8859-1/books/handbook/users/chapter.xml
+++ b/es_ES.ISO8859-1/books/handbook/users/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
diff --git a/es_ES.ISO8859-1/books/handbook/vinum/chapter.xml b/es_ES.ISO8859-1/books/handbook/vinum/chapter.xml
index 5873bc6cf0..4d44745af3 100644
--- a/es_ES.ISO8859-1/books/handbook/vinum/chapter.xml
+++ b/es_ES.ISO8859-1/books/handbook/vinum/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Spanish Documentation Project
diff --git a/es_ES.ISO8859-1/books/handbook/virtualization/chapter.xml b/es_ES.ISO8859-1/books/handbook/virtualization/chapter.xml
index 5c4ba92666..c51654db4d 100644
--- a/es_ES.ISO8859-1/books/handbook/virtualization/chapter.xml
+++ b/es_ES.ISO8859-1/books/handbook/virtualization/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
diff --git a/es_ES.ISO8859-1/books/handbook/x11/chapter.xml b/es_ES.ISO8859-1/books/handbook/x11/chapter.xml
index 8d881d66d2..81a8b50fb9 100755
--- a/es_ES.ISO8859-1/books/handbook/x11/chapter.xml
+++ b/es_ES.ISO8859-1/books/handbook/x11/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
@@ -356,7 +356,7 @@
<para><application>&xorg;</application> es la implementaci鏮
de X11 por omisi鏮 en &os;. <application>&xorg;</application>
est basado en c鏚igo de
- <application>&xfree86&nbsp;4.4RC2</application> y X11R6.6.
+ <application>&xfree86;&nbsp;4.4RC2</application> y X11R6.6.
La versi鏮 de <application>&xorg;</application> que se
distribuye actualmente en la Colecci鏮 de Ports de &os; es
la &xorg.version;.</para>
diff --git a/es_ES.ISO8859-1/share/xml/catalog b/es_ES.ISO8859-1/share/xml/catalog
deleted file mode 100644
index 7a81027959..0000000000
--- a/es_ES.ISO8859-1/share/xml/catalog
+++ /dev/null
@@ -1,53 +0,0 @@
- -- ...................................................................... --
- -- FreeBSD SGML Public Identifiers ...................................... --
-
- -- ...................................................................... --
- -- Spanish specific ..................................................... --
-
- -- $FreeBSD$
- -- $FreeBSDes: doc/es_ES.ISO8859-1/share/xml/catalog,v 1.5 2004/08/05 17:11:47 carvay Exp $
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//ES"
- "entities.ent"
-
-PUBLIC "-//FreeBSD//DOCUMENT DocBook Stylesheet//EN"
- "freebsd.dsl"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//ES"
- "mailing-lists.ent"
-
-PUBLIC "-//FreeBSD//DOCUMENT DocBook Stylesheet//ES"
- "freebsd.dsl"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook Newsgroup Entities//ES"
- "newsgroups.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook Team Entities//ES"
- "teams.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//ES"
- "trademarks.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook Translator Entities//ES"
- "translators.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook Spanish Mailing List Entities//ES"
- "es-mailing-lists.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook Glossary Entities//ES"
- "glossary.ent"
-
- -- ...................................................................... --
- -- HTML docs ............................................................ --
-
-PUBLIC "-//FreeBSD//ENTITIES FreeBSD L10N Entities//EN"
- "l10n.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES FreeBSD Release L10N Entities//EN"
- "release.l10n.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES HTML FreeBSD Header L10N Entities//EN"
- "header.l10n.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES HTML FreeBSD Navigation Bar L10N Entities//EN"
- "navibar.l10n.ent"
diff --git a/es_ES.ISO8859-1/share/xml/catalog.xml b/es_ES.ISO8859-1/share/xml/catalog.xml
index 3553c62fbc..72795603b7 100644
--- a/es_ES.ISO8859-1/share/xml/catalog.xml
+++ b/es_ES.ISO8859-1/share/xml/catalog.xml
@@ -10,6 +10,10 @@
<rewriteURI uriStartString="http://www.FreeBSD.org/XML/www/lang/"
rewritePrefix="../../"/>
+ <public
+ publicId="-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN"
+ uri="entities.ent" />
+
<public publicId="-//FreeBSD//ENTITIES FreeBSD L10N Entities//EN"
uri="l10n.ent" />
<public
diff --git a/es_ES.ISO8859-1/share/xml/entities.ent b/es_ES.ISO8859-1/share/xml/entities.ent
index efe217eed8..a651859d38 100644
--- a/es_ES.ISO8859-1/share/xml/entities.ent
+++ b/es_ES.ISO8859-1/share/xml/entities.ent
@@ -2,29 +2,33 @@
$FreeBSD$
-->
-<!ENTITY % l10n PUBLIC "-//FreeBSD//ENTITIES DocBook Language Specific Entities//EN">
+<!ENTITY % l10n PUBLIC "-//FreeBSD//ENTITIES DocBook Language Specific Entities//EN"
+ "l10n.ent">
%l10n;
-<!ENTITY % l10n-common PUBLIC "-//FreeBSD//ENTITIES DocBook Language Neutral Entities//EN">
-%l10n-common;
-<!ENTITY % man PUBLIC "-//FreeBSD//ENTITIES DocBook Manual Page Entities//EN">
-%man;
-<!ENTITY % freebsd PUBLIC "-//FreeBSD//ENTITIES DocBook Miscellaneous FreeBSD Entities//EN">
+<!ENTITY % freebsd PUBLIC "-//FreeBSD//ENTITIES DocBook Miscellaneous FreeBSD Entities//EN"
+ "nonexistent">
%freebsd;
-<!ENTITY % authors PUBLIC "-//FreeBSD//ENTITIES DocBook Author Entities//EN">
-%authors;
-<!ENTITY % teams PUBLIC "-//FreeBSD//ENTITIES DocBook Team Entities//ES">
+<!ENTITY % teams PUBLIC "-//FreeBSD//ENTITIES DocBook Team Entities//ES"
+ "teams.ent">
%teams;
-<!ENTITY % mailing-lists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//ES">
+<!ENTITY % mailing-lists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//ES"
+ "mailing-lists.ent">
%mailing-lists;
-<!ENTITY % es-mailing-lists PUBLIC "-//FreeBSD//ENTITIES DocBook Spanish Mailing List Entities//ES">
+<!ENTITY % es-mailing-lists PUBLIC "-//FreeBSD//ENTITIES DocBook Spanish Mailing List Entities//ES"
+ "es-mailing-lists.ent">
%es-mailing-lists;
-<!ENTITY % newsgroups PUBLIC "-//FreeBSD//ENTITIES DocBook Newsgroup Entities//ES">
+<!ENTITY % newsgroups PUBLIC "-//FreeBSD//ENTITIES DocBook Newsgroup Entities//ES"
+ "newsgroups.ent">
%newsgroups;
-<!ENTITY % trademarks PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//ES">
+<!ENTITY % trademarks PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//ES"
+ "trademarks.ent">
%trademarks;
-<!ENTITY % translators PUBLIC "-//FreeBSD//ENTITIES DocBook Translator Entities//ES">
+<!ENTITY % translators PUBLIC "-//FreeBSD//ENTITIES DocBook Translator Entities//ES"
+ "translators.ent">
%translators;
-<!ENTITY % urls PUBLIC "-//FreeBSD//ENTITIES DocBook URL Entities//EN">
+<!ENTITY % urls PUBLIC "-//FreeBSD//ENTITIES DocBook URL Entities//EN"
+ "nonexistent">
%urls;
-<!ENTITY % glossary PUBLIC "-//FreeBSD//ENTITIES DocBook Glossary Entities//ES">
+<!ENTITY % glossary PUBLIC "-//FreeBSD//ENTITIES DocBook Glossary Entities//ES"
+ "glossary.ent">
%glossary;
diff --git a/es_ES.ISO8859-1/share/xml/es-mailing-lists.ent b/es_ES.ISO8859-1/share/xml/es-mailing-lists.ent
index 5183360936..17a24c6e09 100644
--- a/es_ES.ISO8859-1/share/xml/es-mailing-lists.ent
+++ b/es_ES.ISO8859-1/share/xml/es-mailing-lists.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
Listas de correo oficiales de FreeBSD en castellano.
diff --git a/es_ES.ISO8859-1/share/xml/l10n.ent b/es_ES.ISO8859-1/share/xml/l10n.ent
index 61b5e9d79c..891c4a7cee 100644
--- a/es_ES.ISO8859-1/share/xml/l10n.ent
+++ b/es_ES.ISO8859-1/share/xml/l10n.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
<!-- -*- sgml -*-
DocBook Language Specific Entities for Localization (es).
diff --git a/es_ES.ISO8859-1/share/xml/mailing-lists.ent b/es_ES.ISO8859-1/share/xml/mailing-lists.ent
index 0cce7a953a..cd219e1139 100755
--- a/es_ES.ISO8859-1/share/xml/mailing-lists.ent
+++ b/es_ES.ISO8859-1/share/xml/mailing-lists.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
Nombres de las listas de correo de FreeBSD y software relacionado.
diff --git a/es_ES.ISO8859-1/share/xml/newsgroups.ent b/es_ES.ISO8859-1/share/xml/newsgroups.ent
index add9889dfb..22c0898e7c 100644
--- a/es_ES.ISO8859-1/share/xml/newsgroups.ent
+++ b/es_ES.ISO8859-1/share/xml/newsgroups.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
Nombres de los grupos de noticias de FreeBSD
diff --git a/es_ES.ISO8859-1/share/xml/teams.ent b/es_ES.ISO8859-1/share/xml/teams.ent
index 8e43da6f0a..2228734cd5 100644
--- a/es_ES.ISO8859-1/share/xml/teams.ent
+++ b/es_ES.ISO8859-1/share/xml/teams.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
Names and email address of teams of people working on specified
tasks. Usally they're just mail aliases set up at hub.FreeBSD.org
diff --git a/es_ES.ISO8859-1/share/xml/trademarks.ent b/es_ES.ISO8859-1/share/xml/trademarks.ent
index 0417ce6cf8..3d2ed3c283 100644
--- a/es_ES.ISO8859-1/share/xml/trademarks.ent
+++ b/es_ES.ISO8859-1/share/xml/trademarks.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
Trademark Legend, as required by The Open Group, Sun, etc..
diff --git a/es_ES.ISO8859-1/share/xml/translators.ent b/es_ES.ISO8859-1/share/xml/translators.ent
index 4045e9ff6d..5d3f1384ac 100644
--- a/es_ES.ISO8859-1/share/xml/translators.ent
+++ b/es_ES.ISO8859-1/share/xml/translators.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Spanish Documentation Project
diff --git a/fr_FR.ISO8859-1/articles/building-products/article.xml b/fr_FR.ISO8859-1/articles/building-products/article.xml
index bc645c8020..986d32b720 100644
--- a/fr_FR.ISO8859-1/articles/building-products/article.xml
+++ b/fr_FR.ISO8859-1/articles/building-products/article.xml
@@ -1,10 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//FR" "../../share/xml/entities.ent">
-%entities;
-<!ENTITY % not.published "IGNORE">
-]>
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<!--
The FreeBSD Documentation Project
@@ -871,12 +867,12 @@ bde 2005-10-29 16:34:50 UTC
66 1.14 (bde 29-Oct-05): int32_t e0,i,nx,n,ix,hx;
67 1.1 (jkh 19-Aug-94):
68 1.1 (jkh 19-Aug-94): GET_FLOAT_WORD(hx,x);
-69 1.1 (jkh 19-Aug-94): ix = hx&0x7fffffff;
-70 1.1 (jkh 19-Aug-94): if(ix<=0x3f490fd8) /* |x| ~<= pi/4 , no need for reduction */
+69 1.1 (jkh 19-Aug-94): ix = hx&amp;0x7fffffff;
+70 1.1 (jkh 19-Aug-94): if(ix&lt;=0x3f490fd8) /* |x| ~&lt;= pi/4 , no need for reduction */
71 1.1 (jkh 19-Aug-94): {y[0] = x; y[1] = 0; return 0;}
72 1.14 (bde 29-Oct-05): /* 33+53 bit pi is good enough for special and medium size cases */
-73 1.2 (bde 07-Apr-95): if(ix<0x4016cbe4) { /* |x| < 3pi/4, special case with n=+-1 */
-74 1.14 (bde 29-Oct-05): if(hx>0) {
+73 1.2 (bde 07-Apr-95): if(ix&lt;0x4016cbe4) { /* |x| &lt; 3pi/4, special case with n=+-1 */
+74 1.14 (bde 29-Oct-05): if(hx&gt;0) {
75 1.15 (bde 06-Nov-05): z = x - pio2;
76 1.15 (bde 06-Nov-05): n = 1;
77 1.15 (bde 06-Nov-05): } else {
@@ -887,7 +883,7 @@ bde 2005-10-29 16:34:50 UTC
82 1.15 (bde 06-Nov-05): y[1] = z - y[0];
83 1.15 (bde 06-Nov-05): return n;
84 1.15 (bde 06-Nov-05): }
-85 1.15 (bde 06-Nov-05): if(ix<0x407b53d1) { /* |x| < 5*pi/4, special case with n=+-2 */
+85 1.15 (bde 06-Nov-05): if(ix&lt;0x407b53d1) { /* |x| &lt; 5*pi/4, special case with n=+-2 */
</programlisting>
</figure>
@@ -956,7 +952,7 @@ bde 2005-10-29 16:34:50 UTC
rapproch嶪s, il est recommand d'embaucher
ou de s'attacher les services d'un d憝eloppeur ou
d'une firme qui a de l'exp廨ience avec &os;. La
- &a.jobs est un canal de communication utile si vous
+ &a.jobs; est un canal de communication utile si vous
皻es &agrave; la recherche de talents dans le
domaine. Le projet &os; maintient une <ulink
url="&url.base;/commercial/consult_bycat.html"> liste
diff --git a/fr_FR.ISO8859-1/articles/committers-guide/article.xml b/fr_FR.ISO8859-1/articles/committers-guide/article.xml
index c9d09132f0..ec417b9f4e 100644
--- a/fr_FR.ISO8859-1/articles/committers-guide/article.xml
+++ b/fr_FR.ISO8859-1/articles/committers-guide/article.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//FR" "../../share/xml/entities.ent">
-%entities;
-]>
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<!--
The FreeBSD Documentation Project
diff --git a/fr_FR.ISO8859-1/articles/contributing-ports/article.xml b/fr_FR.ISO8859-1/articles/contributing-ports/article.xml
index 0459343d27..8af66ba7b2 100644
--- a/fr_FR.ISO8859-1/articles/contributing-ports/article.xml
+++ b/fr_FR.ISO8859-1/articles/contributing-ports/article.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//FR" "../../share/xml/entities.ent">
-%entities;
-]>
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<!--
The FreeBSD Documentation Project
diff --git a/fr_FR.ISO8859-1/articles/contributing/article.xml b/fr_FR.ISO8859-1/articles/contributing/article.xml
index 6aebc1c185..b560aa2b68 100644
--- a/fr_FR.ISO8859-1/articles/contributing/article.xml
+++ b/fr_FR.ISO8859-1/articles/contributing/article.xml
@@ -1,10 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//FR" "../../share/xml/entities.ent">
-%entities;
-<!ENTITY % not.published "IGNORE">
-]>
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<!--
The FreeBSD Documentation Project
diff --git a/fr_FR.ISO8859-1/articles/contributors/article.xml b/fr_FR.ISO8859-1/articles/contributors/article.xml
index d8dd56d741..92913e883e 100644
--- a/fr_FR.ISO8859-1/articles/contributors/article.xml
+++ b/fr_FR.ISO8859-1/articles/contributors/article.xml
@@ -1,10 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//FR" "../../share/xml/entities.ent">
-%entities;
-<!ENTITY % not.published "IGNORE">
-]>
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<!--
The FreeBSD Documentation Project
diff --git a/fr_FR.ISO8859-1/articles/cvsup-advanced/article.xml b/fr_FR.ISO8859-1/articles/cvsup-advanced/article.xml
index f8a6a7a520..f2a7cd79d0 100644
--- a/fr_FR.ISO8859-1/articles/cvsup-advanced/article.xml
+++ b/fr_FR.ISO8859-1/articles/cvsup-advanced/article.xml
@@ -1,10 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//FR" "../../share/xml/entities.ent">
-%entities;
-<!ENTITY % not.published "IGNORE">
-]>
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<!--
The FreeBSD Documentation Project
diff --git a/fr_FR.ISO8859-1/articles/explaining-bsd/article.xml b/fr_FR.ISO8859-1/articles/explaining-bsd/article.xml
index 189a052967..382f416e25 100644
--- a/fr_FR.ISO8859-1/articles/explaining-bsd/article.xml
+++ b/fr_FR.ISO8859-1/articles/explaining-bsd/article.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//FR" "../../share/xml/entities.ent">
-%entities;
-]>
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<!--
The FreeBSD Documentation Project
@@ -304,7 +301,7 @@
<listitem>
<para>Il existe une id嶪 selon laquelle les projets BSD
seraient fragment廥 et concurrents. Le <ulink
- url="http://interactive.wsj.com/bin/login?Tag=/&amp;URI=/archive/retrieve.cgi%253Fid%253DSB952470579348918651.djm&">Wall
+ url="http://interactive.wsj.com/bin/login?Tag=/&amp;URI=/archive/retrieve.cgi%253Fid%253DSB952470579348918651.djm&amp;">Wall
Street Journal</ulink> a m瘱e parl d'une
<quote>balkanisation</quote> des projets BSD. Tout comme
les poursuites judiciaires, cette perception se base sur de
diff --git a/fr_FR.ISO8859-1/articles/filtering-bridges/article.xml b/fr_FR.ISO8859-1/articles/filtering-bridges/article.xml
index dd88d3a120..032b3146a1 100644
--- a/fr_FR.ISO8859-1/articles/filtering-bridges/article.xml
+++ b/fr_FR.ISO8859-1/articles/filtering-bridges/article.xml
@@ -1,10 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//FR" "../../share/xml/entities.ent">
-%entities;
-<!ENTITY % not.published "IGNORE">
-]>
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<!--
The FreeBSD Project - http://www.FreeBSD.org
diff --git a/fr_FR.ISO8859-1/articles/fonts/article.xml b/fr_FR.ISO8859-1/articles/fonts/article.xml
index 2620de0106..3932729d06 100755
--- a/fr_FR.ISO8859-1/articles/fonts/article.xml
+++ b/fr_FR.ISO8859-1/articles/fonts/article.xml
@@ -1,10 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//FR" "../../share/xml/entities.ent">
-%entities;
-<!ENTITY % not.published "IGNORE">
-]>
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<!--
The FreeBSD Documentation Project
diff --git a/fr_FR.ISO8859-1/articles/ipsec-must/article.xml b/fr_FR.ISO8859-1/articles/ipsec-must/article.xml
index a917063e3e..ea23b38459 100644
--- a/fr_FR.ISO8859-1/articles/ipsec-must/article.xml
+++ b/fr_FR.ISO8859-1/articles/ipsec-must/article.xml
@@ -1,10 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//FR" "../../share/xml/entities.ent">
-%entities;
-<!ENTITY % not.published "IGNORE">
-]>
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<!--
The FreeBSD Documentation Project
diff --git a/fr_FR.ISO8859-1/articles/laptop/article.xml b/fr_FR.ISO8859-1/articles/laptop/article.xml
index 695253903e..a3cb19c6b0 100644
--- a/fr_FR.ISO8859-1/articles/laptop/article.xml
+++ b/fr_FR.ISO8859-1/articles/laptop/article.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//FR" "../../share/xml/entities.ent">
-%entities;
-]>
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<!--
The FreeBSD Documentation Project
diff --git a/fr_FR.ISO8859-1/articles/linux-users/article.xml b/fr_FR.ISO8859-1/articles/linux-users/article.xml
index 30bf94cf7c..a3c95c3ab0 100644
--- a/fr_FR.ISO8859-1/articles/linux-users/article.xml
+++ b/fr_FR.ISO8859-1/articles/linux-users/article.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//FR" "../../share/xml/entities.ent">
-%entities;
-]>
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<!--
The FreeBSD French Documentation Project
@@ -414,7 +411,7 @@ apache22_flags="-DSSL"</programlisting>
une interface r廥eau, &os; utilise le nom du pilote
suivi d'un nombre en tant qu'identifiant. La sortie suivante
de &man.ifconfig.8; montre deux interfaces r廥eau
- &intel&nbsp;Pro&nbsp;1000 (<devicename>em0</devicename> et
+ &intel;&nbsp;Pro&nbsp;1000 (<devicename>em0</devicename> et
<devicename>em1</devicename>):</para>
<screen>&prompt.user; <userinput>ifconfig</userinput>
diff --git a/fr_FR.ISO8859-1/articles/mh/article.xml b/fr_FR.ISO8859-1/articles/mh/article.xml
index 5978e969e9..accbfaa79c 100644
--- a/fr_FR.ISO8859-1/articles/mh/article.xml
+++ b/fr_FR.ISO8859-1/articles/mh/article.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//FR" "../../share/xml/entities.ent">
-%entities;
-]>
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<!--
The FreeBSD Documentation Project
diff --git a/fr_FR.ISO8859-1/articles/nanobsd/article.xml b/fr_FR.ISO8859-1/articles/nanobsd/article.xml
index 9ea8414f13..402bc17dc5 100644
--- a/fr_FR.ISO8859-1/articles/nanobsd/article.xml
+++ b/fr_FR.ISO8859-1/articles/nanobsd/article.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//FR" "../../share/xml/entities.ent">
-%entities;
-]>
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<!--
The FreeBSD Documentation Project
diff --git a/fr_FR.ISO8859-1/articles/new-users/article.xml b/fr_FR.ISO8859-1/articles/new-users/article.xml
index 4337df6b18..e4e4cd3114 100755
--- a/fr_FR.ISO8859-1/articles/new-users/article.xml
+++ b/fr_FR.ISO8859-1/articles/new-users/article.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//FR" "../../share/xml/entities.ent">
-%entities;
-]>
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<!--
The FreeBSD Documentation Project
diff --git a/fr_FR.ISO8859-1/articles/pam/article.xml b/fr_FR.ISO8859-1/articles/pam/article.xml
index 4407f4880b..f9459e0883 100644
--- a/fr_FR.ISO8859-1/articles/pam/article.xml
+++ b/fr_FR.ISO8859-1/articles/pam/article.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//FR" "../../share/xml/entities.ent">
-%entities;
-]>
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<!--
- Copyright (c) 2001-2003 Networks Associates Technology, Inc.
@@ -39,7 +36,7 @@
- SUCH DAMAGE.
-->
-<article lang='fr'>
+<article xmlns:xi="http://www.w3.org/2001/XInclude" lang='fr'>
<articleinfo>
<title>Pluggable Authentication Modules</title>
@@ -1221,8 +1218,7 @@ sshd password required pam_permit.so</programlisting>
r嶪lles.</para>
<programlisting>
-<inlinegraphic fileref="pam_app.c"
- format="linespecific"/>
+<xi:include href="su.c" parse="text"/>
</programlisting>
</appendix>
@@ -1239,8 +1235,7 @@ sshd password required pam_permit.so</programlisting>
<programlisting>
-<inlinegraphic fileref="pam_module.c"
- format="linespecific"/>
+<xi:include href="pam_unix.c" parse="text"/>
</programlisting>
</appendix>
@@ -1259,9 +1254,7 @@ sshd password required pam_permit.so</programlisting>
orient嶪 tty peut l'皻re.</para>
<programlisting>
-
-<inlinegraphic fileref="pam_conv.c"
- format="linespecific"/>
+<xi:include href="converse.c" parse="text"/>
</programlisting>
</appendix>
diff --git a/fr_FR.ISO8859-1/articles/pr-guidelines/article.xml b/fr_FR.ISO8859-1/articles/pr-guidelines/article.xml
index 57da8c89ba..f127b5941a 100644
--- a/fr_FR.ISO8859-1/articles/pr-guidelines/article.xml
+++ b/fr_FR.ISO8859-1/articles/pr-guidelines/article.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//FR" "../../share/xml/entities.ent">
-%entities;
-]>
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<!--
Problem Report Handling Guidelines
diff --git a/fr_FR.ISO8859-1/articles/problem-reports/article.xml b/fr_FR.ISO8859-1/articles/problem-reports/article.xml
index 7e624179c9..6b6eccd30f 100644
--- a/fr_FR.ISO8859-1/articles/problem-reports/article.xml
+++ b/fr_FR.ISO8859-1/articles/problem-reports/article.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//FR" "../../share/xml/entities.ent">
-%entities;
-]>
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<!--
The FreeBSD Documentation Project
diff --git a/fr_FR.ISO8859-1/articles/releng-packages/article.xml b/fr_FR.ISO8859-1/articles/releng-packages/article.xml
index 2e2cb9e43c..9beaa50d61 100644
--- a/fr_FR.ISO8859-1/articles/releng-packages/article.xml
+++ b/fr_FR.ISO8859-1/articles/releng-packages/article.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//FR" "../../share/xml/entities.ent">
-%entities;
-]>
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<!--
The FreeBSD Documentation Project
diff --git a/fr_FR.ISO8859-1/books/developers-handbook/book.xml b/fr_FR.ISO8859-1/books/developers-handbook/book.xml
index 44f6ae4f0e..f07e83dca7 100644
--- a/fr_FR.ISO8859-1/books/developers-handbook/book.xml
+++ b/fr_FR.ISO8859-1/books/developers-handbook/book.xml
@@ -1,8 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//FR" "../../share/xml/entities.ent">
-%entities;
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd" [
<!ENTITY % chapters SYSTEM "chapters.ent"> %chapters;
]>
diff --git a/fr_FR.ISO8859-1/books/developers-handbook/driverbasics/chapter.xml b/fr_FR.ISO8859-1/books/developers-handbook/driverbasics/chapter.xml
index 398cec854c..87e701e170 100644
--- a/fr_FR.ISO8859-1/books/developers-handbook/driverbasics/chapter.xml
+++ b/fr_FR.ISO8859-1/books/developers-handbook/driverbasics/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
The FreeBSD French Documentation Project
@@ -122,7 +122,7 @@ KMOD=skeleton
<para>Lancer simplement la commande <command>make</command> avec ce fichier Makefile
cr嶪ra un fichier <filename>skeleton.ko</filename> qui peut
皻re charg dans votre syst鋗e en tapant :
-<screen> &prompt.root
+<screen> &prompt.root;
kldload -v ./skeleton.ko
</screen>
</para>
@@ -179,7 +179,7 @@ KMOD=skeleton
* Murray Stokely
*/
-#define MIN(a,b) (((a) < (b)) ? (a) : (b))
+#define MIN(a,b) (((a) &lt; (b)) ? (a) : (b))
#include &lt;sys/types.h&gt;
#include &lt;sys/module.h&gt;
@@ -244,7 +244,7 @@ echo_loader(struct module *m, int what, void *arg)
switch (what) {
case MOD_LOAD: /* kldload */
- sdev = make_dev(<literal>&</literal>echo_cdevsw,
+ sdev = make_dev(<literal>&amp;</literal>echo_cdevsw,
0,
UID_ROOT,
GID_WHEEL,
@@ -298,7 +298,7 @@ echo_read(dev_t dev, struct uio *uio, int ioflag)
/* De quelle taille est cette operation read ? Aussi grande que l'utilisateur le veut,
ou aussi grande que les donnees restantes */
- amt = MIN(uio->uio_resid, (echomsg->len - uio->uio_offset > 0) ? echomsg->len - uio->uio_offset : 0);
+ amt = MIN(uio->uio_resid, (echomsg->len - uio->uio_offset &gt; 0) ? echomsg->len - uio->uio_offset : 0);
if ((err = uiomove(echomsg->msg + uio->uio_offset,amt,uio)) != 0) {
uprintf("uiomove echoue!\n");
}
@@ -338,15 +338,15 @@ DEV_MODULE(echo,echo_loader,NULL);</programlisting>
votre syst鋗e de fichiers avec une commande comme : </para>
<screen>
- &prompt.root mknod /dev/echo c 33 0
+ &prompt.root; mknod /dev/echo c 33 0
</screen>
<para>Avec ce pilote charg, vous devriez maintenant 皻r capable de taper
quelque chose comme :</para>
<screen>
- &prompt.root echo -n "Test Donnees" > /dev/echo
- &prompt.root cat /dev/echo
+ &prompt.root; echo -n "Test Donnees" > /dev/echo
+ &prompt.root; cat /dev/echo
Test Donnees
</screen>
diff --git a/fr_FR.ISO8859-1/books/developers-handbook/locking/chapter.xml b/fr_FR.ISO8859-1/books/developers-handbook/locking/chapter.xml
index c3a703c746..ca308534df 100644
--- a/fr_FR.ISO8859-1/books/developers-handbook/locking/chapter.xml
+++ b/fr_FR.ISO8859-1/books/developers-handbook/locking/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
The FreeBSD French Documentation Project
diff --git a/fr_FR.ISO8859-1/books/developers-handbook/pci/chapter.xml b/fr_FR.ISO8859-1/books/developers-handbook/pci/chapter.xml
index 129ef1be60..22b31e9a33 100644
--- a/fr_FR.ISO8859-1/books/developers-handbook/pci/chapter.xml
+++ b/fr_FR.ISO8859-1/books/developers-handbook/pci/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
The FreeBSD French Documentation Project
@@ -29,7 +29,7 @@
* Murray Stokely
*/
-#define MIN(a,b) (((a) < (b)) ? (a) : (b))
+#define MIN(a,b) (((a) &lt; (b)) ? (a) : (b))
#include &lt;sys/types.h&gt;
#include &lt;sys/module.h&gt;
@@ -138,7 +138,7 @@ static int
mypci_attach(device_t dev)
{
uprintf("Rattachement de MonPCI pour: ID Peripherique: 0x%x\n",pci_get_vendor(dev));
- sdev = make_dev(<literal>&</literal>mypci_cdevsw,
+ sdev = make_dev(<literal>&amp;</literal>mypci_cdevsw,
0,
UID_ROOT,
GID_WHEEL,
diff --git a/fr_FR.ISO8859-1/books/developers-handbook/scsi/chapter.xml b/fr_FR.ISO8859-1/books/developers-handbook/scsi/chapter.xml
index 9692f16ecb..f56c6a51f9 100644
--- a/fr_FR.ISO8859-1/books/developers-handbook/scsi/chapter.xml
+++ b/fr_FR.ISO8859-1/books/developers-handbook/scsi/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
The FreeBSD French Documentation Project
diff --git a/fr_FR.ISO8859-1/books/developers-handbook/secure/chapter.xml b/fr_FR.ISO8859-1/books/developers-handbook/secure/chapter.xml
index 19f5de9645..473dbc6f90 100644
--- a/fr_FR.ISO8859-1/books/developers-handbook/secure/chapter.xml
+++ b/fr_FR.ISO8859-1/books/developers-handbook/secure/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
The FreeBSD French Documentation Project
@@ -343,7 +343,7 @@ int main() {
les permissions d'un fichier, le propri彋aire, le groupe, la taille,
la date d'acc鋊, et la date de modification.</simpara></listitem>
<listitem><simpara>Se lier &agrave; des ports privil嶲i廥 sur Internet
- (ports < 1024)</simpara></listitem>
+ (ports &lt; 1024)</simpara></listitem>
</itemizedlist>
<para><function>Jail</function> est un outil tr鋊 utile pour ex嶰uter
diff --git a/fr_FR.ISO8859-1/books/developers-handbook/tools/chapter.xml b/fr_FR.ISO8859-1/books/developers-handbook/tools/chapter.xml
index 6bf317ae99..6a7400b235 100644
--- a/fr_FR.ISO8859-1/books/developers-handbook/tools/chapter.xml
+++ b/fr_FR.ISO8859-1/books/developers-handbook/tools/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
The FreeBSD French Documentation Project
@@ -974,7 +974,7 @@ free(foo);
<para>Si vous voulez cr嶪r un fichier <filename>core</filename> depuis
l'ext廨ieur de votre programme, mais ne voulez pas que le processus
s'arr皻,vous pouvez utiliser le programme <command>gcore</command>.
- Voir la page de manuel en ligne de &man.gcore.1 pour plus d'informations.
+ Voir la page de manuel en ligne de &man.gcore.1; pour plus d'informations.
</para>
</answer>
@@ -1005,7 +1005,7 @@ free(foo);
Aussi, nous pourrions avoir quelque chose comme 蓷:
</para>
- <screen>&prompt.user; <userinput>cc fichier1.o fichier2.o</userinput> &hellip; <userinput>fichier37.c</userinput> &hellip
+ <screen>&prompt.user; <userinput>cc fichier1.o fichier2.o</userinput> &hellip; <userinput>fichier37.c</userinput> &hellip;
</screen>
<para>si nous avions chang le fichier <filename>fichier37.c</filename> mais aucun
@@ -1472,7 +1472,7 @@ main() {
i = 5;
printf("C'est mon programme\n");
-<lineannotation>&hellip</lineannotation></programlisting>
+<lineannotation>&hellip;</lineannotation></programlisting>
<para>mais nous n'avions pas mis la ligne <literal>i=5;</literal>. Comme
nous n'avons pas initialis <symbol>i</symbol>, il a pris le nombre se trouvant
@@ -1591,17 +1591,17 @@ Cannot access memory at address 0x7020796d.
de <command>gdb</command>):
</para>
- <screen><lineannotation>&hellip</lineannotation>
-if ((pid = fork()) < 0) /* _Toujours_ verifier cela */
+ <screen><lineannotation>&hellip;</lineannotation>
+if ((pid = fork()) &lt; 0) /* _Toujours_ verifier cela */
error();
else if (pid == 0) { /* le fils */
int PauseMode = 1;
while (PauseMode)
sleep(10); /* Attendre jusqu'a ce que quelqu'un se brache sur nous */
- <lineannotation>&hellip</lineannotation>
+ <lineannotation>&hellip;</lineannotation>
} else { /* le pere */
- <lineannotation>&hellip</lineannotation>
+ <lineannotation>&hellip;</lineannotation>
</screen>
<para>Maintenant tout ce que nous avons &agrave; faire est de nous brancher sur le processus fils,
diff --git a/fr_FR.ISO8859-1/books/developers-handbook/usb/chapter.xml b/fr_FR.ISO8859-1/books/developers-handbook/usb/chapter.xml
index 66a7dbcfc7..201363d704 100644
--- a/fr_FR.ISO8859-1/books/developers-handbook/usb/chapter.xml
+++ b/fr_FR.ISO8859-1/books/developers-handbook/usb/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
The FreeBSD French Documentation Project
diff --git a/fr_FR.ISO8859-1/books/faq/book.xml b/fr_FR.ISO8859-1/books/faq/book.xml
index 4dabbccf71..fd2070aeae 100644
--- a/fr_FR.ISO8859-1/books/faq/book.xml
+++ b/fr_FR.ISO8859-1/books/faq/book.xml
@@ -1,8 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//FR" "../../share/xml/entities.ent">
-%entities;
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd" [
<!ENTITY bibliography SYSTEM "../../../share/xml/bibliography.xml">
<!ENTITY isbn.amazon 'http://www.amazon.com/exec/obidos/ASIN'>
]>
@@ -62,7 +60,7 @@
<para>N.d.T.: Contactez la &a.fr-doc; si vous voulez
collaborer &agrave; ce projet.</para>
&trans.a.gioria;
- <para><emphasis>Premi鋨e version de &a.fr.gioria et
+ <para><emphasis>Premi鋨e version de &a.fr.gioria; et
&a.fr.dntt;</emphasis></para>
</abstract>
@@ -739,7 +737,7 @@ besoin de reformater ces fichiers sous une forme plus lisible, lancez
la commande col sur le fichier&nbsp;:
<programlisting>
-$ col -b < fichierOrigine > fichierSortie
+$ col -b &lt; fichierOrigine &gt; fichierSortie
</programlisting>
</para>
</sect1>
@@ -1181,7 +1179,7 @@ lp0 des deux c矌廥 en tant que <username>root</username>.</para>
<para>Par exemple, si vous voulez connecter l'ordinateur max avec moritz&nbsp;:</para>
<programlisting>
- max <-----> moritz
+ max &lt;-----&gt; moritz
IP Address 10.0.0.1 10.0.0.2
</programlisting>
@@ -1199,7 +1197,7 @@ IP Address 10.0.0.1 10.0.0.2
# ifconfig lp0 10.0.0.2 10.0.0.1
</programlisting>
-<para>C'est tout&nbsp! Lisez aussi les manpages
+<para>C'est tout&nbsp;! Lisez aussi les manpages
<citerefentry><refentrytitle>lp</refentrytitle><manvolnum>4</manvolnum></citerefentry> and
<citerefentry><refentrytitle>lpt</refentrytitle><manvolnum>4</manvolnum></citerefentry>.</para>
@@ -1361,7 +1359,7 @@ dans les 504 premiers Mo.</para>
<sect1>
- <title>A propos des gestionnaires de disque&nbsp;? Ou bien, j'ai un disque de grande capacit&nbsp!</title>
+ <title>A propos des gestionnaires de disque&nbsp;? Ou bien, j'ai un disque de grande capacit&nbsp;!</title>
<para>FreeBSD reconnait le gestionnaire "Ontrack Disk Manager" et le tol鋨e.
Les autres gestionnaires de disque ne sont pas support廥.</para>
@@ -2045,7 +2043,7 @@ moused_flags=""
</sect1>
<sect1>
- <title>Je n'ai pas de coprocesseur arithm彋ique. Est-ce un probl鋗e&nbsp?</title>
+ <title>Je n'ai pas de coprocesseur arithm彋ique. Est-ce un probl鋗e&nbsp;?</title>
<note>
<para>Cela ne touche que ceux qui ont un 386/486SX/486SLC -
@@ -4077,12 +4075,12 @@ quitter ce mode tapez Control-D.</para>
j@uriah 191% sendmail -bt
ADDRESS TEST MODE (ruleset 3 NOT automatically invoked)
Enter &lt;ruleset&gt; &lt;address&gt;
-> 0 foo@interface-business.de
+&gt; 0 foo@interface-business.de
rewrite: ruleset 0 input: foo @ interface-business . de
...
rewrite: ruleset 0 returns: $# uucp-dom $@ if-bus $: foo \
-< @ interface-business . de >
-> ^D
+&lt; @ interface-business . de &gt;
+&gt; ^D
j@uriah 192%
</programlisting></para>
</sect1>
diff --git a/fr_FR.ISO8859-1/books/fdp-primer/book.xml b/fr_FR.ISO8859-1/books/fdp-primer/book.xml
index bc654bf9a2..c07499df82 100644
--- a/fr_FR.ISO8859-1/books/fdp-primer/book.xml
+++ b/fr_FR.ISO8859-1/books/fdp-primer/book.xml
@@ -1,8 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//FR" "../../share/xml/entities.ent">
-%entities;
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd" [
<!ENTITY % chapters SYSTEM "chapters.ent">
%chapters;
<!ENTITY sgml.in-progress SYSTEM "in-progress.xml">
diff --git a/fr_FR.ISO8859-1/books/fdp-primer/in-progress.xml b/fr_FR.ISO8859-1/books/fdp-primer/in-progress.xml
index 046d7c6684..032513ab6f 100644
--- a/fr_FR.ISO8859-1/books/fdp-primer/in-progress.xml
+++ b/fr_FR.ISO8859-1/books/fdp-primer/in-progress.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
The FreeBSD French Documentation Project
diff --git a/fr_FR.ISO8859-1/books/fdp-primer/overview/chapter.xml b/fr_FR.ISO8859-1/books/fdp-primer/overview/chapter.xml
index bf4faee0c1..c4499afa41 100644
--- a/fr_FR.ISO8859-1/books/fdp-primer/overview/chapter.xml
+++ b/fr_FR.ISO8859-1/books/fdp-primer/overview/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!-- Copyright (c) 1998, 1999 Nik Clayton, All rights reserved.
Redistribution and use in source (SGML DocBook) and 'compiled' forms
@@ -163,7 +163,7 @@
<application>CVSup</application> ou <application>CTM</application>),
ou en vous servant de <application>CVSup</application> pour ne
t幨嶰harger que la version
- extraite&nbsp;-&nbsp<emphasis>courante</emphasis>.</para>
+ extraite&nbsp;-&nbsp;<emphasis>courante</emphasis>.</para>
</listitem>
<listitem>
diff --git a/fr_FR.ISO8859-1/books/fdp-primer/psgml-mode/chapter.xml b/fr_FR.ISO8859-1/books/fdp-primer/psgml-mode/chapter.xml
index 4090ac8e5f..aadb3dc30a 100644
--- a/fr_FR.ISO8859-1/books/fdp-primer/psgml-mode/chapter.xml
+++ b/fr_FR.ISO8859-1/books/fdp-primer/psgml-mode/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!-- Copyright (c) 1998, 1999 Nik Clayton, All rights reserved.
Redistribution and use in source (SGML DocBook) and 'compiled' forms
diff --git a/fr_FR.ISO8859-1/books/fdp-primer/see-also/chapter.xml b/fr_FR.ISO8859-1/books/fdp-primer/see-also/chapter.xml
index 5c79b71093..6213db8893 100644
--- a/fr_FR.ISO8859-1/books/fdp-primer/see-also/chapter.xml
+++ b/fr_FR.ISO8859-1/books/fdp-primer/see-also/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!-- Copyright (c) 1998, 1999 Nik Clayton, All rights reserved.
Redistribution and use in source (SGML DocBook) and 'compiled' forms
diff --git a/fr_FR.ISO8859-1/books/fdp-primer/sgml-markup/chapter.xml b/fr_FR.ISO8859-1/books/fdp-primer/sgml-markup/chapter.xml
index 2bede1293e..173191d4c6 100644
--- a/fr_FR.ISO8859-1/books/fdp-primer/sgml-markup/chapter.xml
+++ b/fr_FR.ISO8859-1/books/fdp-primer/sgml-markup/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!-- Copyright (c) 1998, 1999 Nik Clayton, All rights reserved.
Redistribution and use in source (SGML DocBook) and 'compiled' forms
@@ -159,7 +159,7 @@ PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"</programlisting>
<para>Utilisez&nbsp;:</para>
<programlisting>
-<![ CDATA [<h1>Premi鋨e section</h1>
+<![CDATA[<h1>Premi鋨e section</h1>
<!-- Introduction du document -->
@@ -191,7 +191,7 @@ PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"</programlisting>
<para>Use:</para>
<programlisting>
-<![ CDATA [<h1>Premi鋨e section</h1>
+<![CDATA[<h1>Premi鋨e section</h1>
<!-- Introduction du document -->
@@ -213,7 +213,7 @@ PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"</programlisting>
<para>Utilisez&nbsp;:</para>
<programlisting>
-<![ CDATA [<p>C'est un paragraphe. Il peut contenir pratiquement
+<![CDATA[<p>C'est un paragraphe. Il peut contenir pratiquement
n'importe quel 幨幦ent.</p>]]></programlisting>
</example>
</sect3>
@@ -231,7 +231,7 @@ PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"</programlisting>
<para>Utilisez&nbsp;:</para>
<programlisting>
-<![ CDATA [<p>Un court extrait de la Constitution des Etats-Unis&nbsp;:</p>
+<![CDATA[<p>Un court extrait de la Constitution des Etats-Unis&nbsp;:</p>
<blockquote>Nous le Peuple des Etats-Unis, dans le But de former
une Union plus parfaite, d'彋ablir la Justice, d'assurer
@@ -276,7 +276,7 @@ PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"</programlisting>
<para>Utilisez&nbsp;:</para>
<programlisting>
-<![ CDATA [<p>Une liste non ordonn嶪. Les 幨幦ents de la liste seront
+<![CDATA[<p>Une liste non ordonn嶪. Les 幨幦ents de la liste seront
probablement pr嶰嶮廥 par des puces.</p>
<ul>
@@ -307,7 +307,7 @@ PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"</programlisting>
<para>Utilisez&nbsp;:</para>
<programlisting>
-<![ CDATA [<dl>
+<![CDATA[<dl>
<dt>Terme 1</dt>
<dd><p>Paragraphe 1 de la d嶨inition 1.</p></dd>
@@ -345,7 +345,7 @@ PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"</programlisting>
texte d'un courrier 幨ectronique&nbsp;:</para>
<programlisting>
-<![ CDATA [<pre>
+<![CDATA[<pre>
From: nik@freebsd.org
To: freebsd-doc@freebsd.org
Subject: Nouvelle documentation disponible
@@ -389,7 +389,7 @@ PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"</programlisting>
<para>Utilisez&nbsp;:</para>
<programlisting>
-<![ CDATA [<p>C'est une table 2x2 simple.</p>
+<![CDATA[<p>C'est une table 2x2 simple.</p>
<table>
<tr>
@@ -416,7 +416,7 @@ PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"</programlisting>
<para>Utilisez&nbsp;:</para>
<programlisting>
-<![ CDATA [<p>Une grande cellule &agrave; gauche, deux petites cellule &agrave; droite.</p>
+<![CDATA[<p>Une grande cellule &agrave; gauche, deux petites cellule &agrave; droite.</p>
<table>
<tr>
@@ -437,7 +437,7 @@ PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"</programlisting>
<para>Utilisez&nbsp;:</para>
<programlisting>
-<![ CDATA [<p>Une grande cellule en haut, deux petites cellules en dessous.</p>
+<![CDATA[<p>Une grande cellule en haut, deux petites cellules en dessous.</p>
<table>
<tr>
@@ -459,7 +459,7 @@ PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"</programlisting>
<para>Use:</para>
<programlisting>
-<![ CDATA [<p>Sur une grille 3x3, la cellule en haut &agrave; gauche s'彋end sur deux
+<![CDATA[<p>Sur une grille 3x3, la cellule en haut &agrave; gauche s'彋end sur deux
lignes et deux colonnes. Les autres cellules sont normales.</p>
<table>
@@ -510,7 +510,7 @@ PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"</programlisting>
<para>Utilisez&nbsp;:</para>
<programlisting>
-<![ CDATA [<p><em>Ceci</em> est accentu, et
+<![CDATA[<p><em>Ceci</em> est accentu, et
<strong>cela</strong> l'est encore plus.</p>]]></programlisting>
</example>
</sect3>
@@ -527,7 +527,7 @@ PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"</programlisting>
<title><sgmltag>b</sgmltag> et <sgmltag>i</sgmltag></title>
<programlisting>
-<![ CDATA [<p><b>Ceci</b> est en gras, tandis que <i>cela</i> est
+<![CDATA[<p><b>Ceci</b> est en gras, tandis que <i>cela</i> est
en italiques.</p>]]></programlisting>
</example>
</sect3>
@@ -545,7 +545,7 @@ PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"</programlisting>
<para>Utilisez&nbsp;:</para>
<programlisting>
-<![ CDATA [<p>L'auteur original de ce document est
+<![CDATA[<p>L'auteur original de ce document est
Nik Clayton, qui peut 皻re contact par courrier
幨ectronique &agrave; l'adresse : <tt>nik@freebsd.org</tt>.</p>]]></programlisting>
</example>
@@ -590,7 +590,7 @@ PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"</programlisting>
<para>Les trois extraits suivants ont le m瘱e r廥ultat&nbsp;:</para>
<programlisting>
-<![ CDATA [<p>Ce texte est <small>un peu plus petit</small>.
+<![CDATA[<p>Ce texte est <small>un peu plus petit</small>.
Mais celui-l&agrave; <big>est un peu plus gros</big>.</p>
<p>Ce texte est <font size="-1">un peu plus petit</font>.
@@ -628,7 +628,7 @@ PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"</programlisting>
<para>Utilisez&nbsp;:</para>
<programlisting>
-<![ CDATA [<p>Vous trouverez plus d'informations sur le
+<![CDATA[<p>Vous trouverez plus d'informations sur le
<a href="http://www.freebsd.org/">site Web de FreeBSD</a>.</p>]]></programlisting>
</example>
@@ -653,7 +653,7 @@ PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"</programlisting>
<para>Utilisez&nbsp;:</para>
<programlisting>
-<![ CDATA [<p><a name="para1">Ce</a> paragraphe peut 皻re r嶨廨enc
+<![CDATA[<p><a name="para1">Ce</a> paragraphe peut 皻re r嶨廨enc
par d'autres liens via le nom <tt>para1</tt>.</p>]]></programlisting>
</example>
@@ -668,7 +668,7 @@ PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"</programlisting>
dans un document appel <filename>foo.html</filename>.</para>
<programlisting>
-<![ CDATA [<p>Vous trouverez plus d'informations au
+<![CDATA[<p>Vous trouverez plus d'informations au
<a href="foo.html#para1">premier paragraphe</a> de
<tt>foo.html</tt>.</p>]]></programlisting>
</example>
@@ -684,7 +684,7 @@ PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"</programlisting>
de ce document.</para>
<programlisting>
-<![ CDATA [<p>Vous trouverez plus d'informations au
+<![CDATA[<p>Vous trouverez plus d'informations au
<a href="#para1">premier paragraphe</a> de
ce document.</p>]]></programlisting>
</example>
@@ -913,7 +913,7 @@ PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"</programlisting>
<example>
<title>Un chapitre</title>
- <programlisting><![ CDATA [<chapter>
+ <programlisting><![CDATA[<chapter>
<title>Le titre du chapitre</title>
...
@@ -927,7 +927,7 @@ PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"</programlisting>
<example>
<title>Chapitres vides</title>
- <programlisting><![ CDATA [<chapter>
+ <programlisting><![CDATA[<chapter>
<title>C'est un chapitre vide</title>
<para></para>
@@ -956,7 +956,7 @@ PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"</programlisting>
<example>
<title>Sections dans les chapitres</title>
- <programlisting><![ RCDATA [<chapter>
+ <programlisting><![CDATA[<chapter>
<title>Exemple de chapitre</title>
<para>Du texte dans le chapitre.</para>
@@ -1005,7 +1005,7 @@ PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"</programlisting>
d嶨inissant une ou plusieurs <sgmltag>part</sgmltag>s. Ce n'est pas
possible dans un <sgmltag>article</sgmltag>.</para>
- <programlisting><![ CDATA [<part>
+ <programlisting><![CDATA[<part>
<title>Introduction</title>
<chapter>
@@ -1050,7 +1050,7 @@ PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"</programlisting>
<para>Utilisez&nbsp;:</para>
- <programlisting><![ CDATA [<para>C'est un paragraphe. Il peut contenir
+ <programlisting><![CDATA[<para>C'est un paragraphe. Il peut contenir
presque n'importe quel autre 幨幦ent.</para> ]]></programlisting>
<para>Apparence&nbsp;:</para>
@@ -1075,7 +1075,7 @@ PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"</programlisting>
<para>Utilisez&nbsp;:</para>
- <programlisting><![ CDATA [<para>Un court extrait de la constitution des Etats-Unis&nbsp;:</para>
+ <programlisting><![CDATA[<para>Un court extrait de la constitution des Etats-Unis&nbsp;:</para>
<blockquote>
<title>Pr嶧mbule &agrave; la Constitution des Etats-Unis</title>
@@ -1159,7 +1159,7 @@ PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"</programlisting>
<para>Utilisez&nbsp;:</para>
- <programlisting><![ CDATA [<warning>
+ <programlisting><![CDATA[<warning>
<para>Installer FreeBSD peut vous donner envie de supprimer
Windows de votre disque dur.</para>
</warning>]]></programlisting>
@@ -1209,7 +1209,7 @@ PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"</programlisting>
<para>Utilisez&nbsp;:</para>
- <programlisting><![ CDATA [<itemizedlist>
+ <programlisting><![CDATA[<itemizedlist>
<listitem>
<para>C'est le premier 幨幦ent de la liste.</para>
</listitem>
@@ -1304,7 +1304,7 @@ PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"</programlisting>
<para>Utilisez&nbsp;:</para>
- <programlisting><![ CDATA[<para>Quand vous aurez fini, votre programme
+ <programlisting><![CDATA[<para>Quand vous aurez fini, votre programme
ressemblera &agrave; cela :</para>
<programlisting>#include &lt;stdio.h&gt;
@@ -1375,7 +1375,7 @@ main(void)
<para>Utilisez&nbsp;:</para>
- <programlisting><![ CDATA [<informaltable>
+ <programlisting><![CDATA[<informaltable>
<tgroup cols="2">
<thead>
<row>
@@ -1532,7 +1532,7 @@ main(void)
<para>Utilisez&nbsp;:</para>
- <programlisting><![ CDATA [<screen>&prompt.user; <userinput>ls -1</userinput>
+ <programlisting><![CDATA[<screen>&prompt.user; <userinput>ls -1</userinput>
foo1
foo2
foo3
@@ -1591,7 +1591,7 @@ C'est le fichier 'foo2'</screen>
<para>Utilisez&nbsp;:</para>
- <programlisting><![ CDATA [<para>FreeBSD est sans aucun doute
+ <programlisting><![CDATA[<para>FreeBSD est sans aucun doute
<emphasis>le</emphasis> premier syst鋗e
d'exploitation de type Unix pour
architecture Intel.</para>]]></programlisting>
@@ -1678,7 +1678,7 @@ C'est le fichier 'foo2'</screen>
<para>Utilisez&nbsp;:</para>
- <programlisting><![ CDATA [<para><application>Sendmail</application> est le logiciel de
+ <programlisting><![CDATA[<para><application>Sendmail</application> est le logiciel de
courrier 幨ectronique le plus employ sous Unix.</para>
<para><application>Sendmail</application> comporte les
@@ -1730,7 +1730,7 @@ C'est le fichier 'foo2'</screen>
<para>Utilisez&nbsp;:</para>
- <programlisting><![ CDATA [<para>Vous trouverez le source SGML du Manuel
+ <programlisting><![CDATA[<para>Vous trouverez le source SGML du Manuel
de R嶨廨ence en Anglais dans
<filename>/usr/doc/en/handbook/</filename>. Le
fichier principal, dans ce r廧ertoire, s'appelle
@@ -1776,7 +1776,7 @@ C'est le fichier 'foo2'</screen>
<para>Utilisez&nbsp;:</para>
- <programlisting><![ CDATA [<para><devicename>sio</devicename> sert
+ <programlisting><![CDATA[<para><devicename>sio</devicename> sert
sous FreeBSD aux communications s廨ies.
<devicename>sio</devicename> correspond
&agrave; un certain nombre d'entr嶪s dans
@@ -1899,7 +1899,7 @@ C'est le fichier 'foo2'</screen>
<para>Utilisez&nbsp;:</para>
- <programlisting><![ CDATA [<para>La machine locale peut toujours
+ <programlisting><![CDATA[<para>La machine locale peut toujours
皻re d廥ign嶪 par <hostid>localhost</hostid>,
et aura l'adresse IP
<hostid role="ipaddr">127.0.0.1</hostid>.</para>
@@ -1965,7 +1965,7 @@ C'est le fichier 'foo2'</screen>
<para>Utilisez&nbsp;:</para>
- <programlisting><![ CDATA [<para>Pour effectuer la plupart des
+ <programlisting><![CDATA[<para>Pour effectuer la plupart des
t歊hes d'administration syst鋗e,
vous aurez besoin d'皻re
<username>root</username>.</para>]]></programlisting>
@@ -2004,7 +2004,7 @@ C'est le fichier 'foo2'</screen>
<para>Utilisez&nbsp;:</para>
- <programlisting><![ CDATA [<para>Il y a deux cibles courantes dans les
+ <programlisting><![CDATA[<para>Il y a deux cibles courantes dans les
<filename>Makefile</filename>&nbsp;:
<maketarget>all</maketarget> et
<maketarget>clean</maketarget>.</para>
@@ -2058,7 +2058,7 @@ C'est le fichier 'foo2'</screen>
<para>Utilisez&nbsp;:</para>
- <programlisting><![ CDATA [<para>La ligne <literal>maxusers 10</literal> du fichier
+ <programlisting><![CDATA[<para>La ligne <literal>maxusers 10</literal> du fichier
de configuration du noyau d彋ermine la table de nombreuses
tables syst鋗e et d嶨init approximativement le nombre de
connexions simultan嶪s qu'acceptera le syst鋗e.</para>]]></programlisting>
@@ -2091,7 +2091,7 @@ C'est le fichier 'foo2'</screen>
<para>Utilisez&nbsp;:</para>
- <programlisting><![ CDATA [<informalexample>
+ <programlisting><![CDATA[<informalexample>
<screen>&prompt.user; <userinput>man
<replaceable>command</replaceable></userinput></screen>
</informalexample>]]></programlisting>
@@ -2110,7 +2110,7 @@ C'est le fichier 'foo2'</screen>
<para>Utilisez&nbsp;:</para>
- <programlisting><![ CDATA [<para>La ligne <literal>maxusers 10</literal> du fichier
+ <programlisting><![CDATA[<para>La ligne <literal>maxusers 10</literal> du fichier
de configuration du noyau d彋ermine la table de nombreuses
tables syst鋗e et d嶨init approximativement le nombre
de connexions simultan嶪s qu'acceptera le syst鋗e.</para>
@@ -2160,7 +2160,7 @@ C'est le fichier 'foo2'</screen>
<example>
<title><literal>id</literal> de chapitres et de section</title>
- <programlisting><![ CDATA [<chapter id="chapitre1">
+ <programlisting><![CDATA[<chapter id="chapitre1">
<title>Introduction</title>
<para>C'est l'introduction. Elle comporte une sous-section,
@@ -2190,7 +2190,7 @@ C'est le fichier 'foo2'</screen>
<example>
<title><sgmltag>anchor</sgmltag></title>
- <programlisting><![ CDATA [<para>Ce paragraphe inclut un
+ <programlisting><![CDATA[<para>Ce paragraphe inclut un
<anchor id="para1">lien interne. Il n'appara褾
pas dans le document.</para>]]></programlisting>
</example>
@@ -2217,7 +2217,7 @@ C'est le fichier 'foo2'</screen>
document qui contienne l'exemple que nous avons donn pour
<literal>id</literal>&nbsp;:</para>
- <programlisting><![ CDATA [<para>Vous trouverez plus d'information
+ <programlisting><![CDATA[<para>Vous trouverez plus d'information
au <xref linkend="chapter1">.</para>
<para>Vous trouverez des informations plus d彋aill嶪s dans
@@ -2259,7 +2259,7 @@ C'est le fichier 'foo2'</screen>
document qui contienne l'exemple que nous avons donn pour
<literal>id</literal>&nbsp;:</para>
- <programlisting><![ CDATA [<para>Vous trouverez plus d'information
+ <programlisting><![CDATA[<para>Vous trouverez plus d'information
au <link linkend="chapter1">premier chapitre</link>.</para>
<para>Vous trouverez des informations plus d彋aill嶪s dans
@@ -2310,7 +2310,7 @@ C'est le fichier 'foo2'</screen>
<para>Utilisez&nbsp;:</para>
- <programlisting><![ CDATA [<para>Vous pouvez bien sr cessez de lire
+ <programlisting><![CDATA[<para>Vous pouvez bien sr cessez de lire
ce document, et aller au lieu de cela sur la <ulink
url="http://www.FreeBSD.org/"> page Web de FreeBSD</ulink>.</para>]]></programlisting>
diff --git a/fr_FR.ISO8859-1/books/fdp-primer/sgml-primer/chapter.xml b/fr_FR.ISO8859-1/books/fdp-primer/sgml-primer/chapter.xml
index 0af6c8fe1d..6dd690c5fd 100644
--- a/fr_FR.ISO8859-1/books/fdp-primer/sgml-primer/chapter.xml
+++ b/fr_FR.ISO8859-1/books/fdp-primer/sgml-primer/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!-- Copyright (c) 1998, 1999 Nik Clayton, All rights reserved.
Redistribution and use in source (SGML DocBook) and 'compiled' forms
@@ -107,7 +107,7 @@
<para>L'exemple pr嶰嶮ent est cod comme suit dans le pr廥ent
document&nbsp;:</para>
- <programlisting><![ CDATA [
+ <programlisting><![CDATA[
<para>Pour effacer <filename>/tmp/foo</filename>, utilisez
&man.rm.1;.</para>
@@ -232,7 +232,7 @@
de d嶵ut et une de fin.</para>
<programlisting>
-<![ CDATA [<p>C'est un paragraphe. Il commence avec la marque de d嶵ut pour
+<![CDATA[<p>C'est un paragraphe. Il commence avec la marque de d嶵ut pour
l'幨幦ent 'p', et se terminera avec la marque de fin pour
l'幨幦ent 'p'</p>
@@ -254,7 +254,7 @@
donc qu'une marque de d嶵ut.</para>
<programlisting>
-<![ CDATA [<p>C'est un paragraphe.</p>
+<![CDATA[<p>C'est un paragraphe.</p>
<hr>
@@ -271,7 +271,7 @@
<title>El幦ents dans des 幨幦ents&nbsp;; <sgmltag>em</sgmltag></title>
<programlisting>
-<![ CDATA [<p>C'est un <em>paragraphe</em> simple o certains
+<![CDATA[<p>C'est un <em>paragraphe</em> simple o certains
<em>mots</em> ont 彋 <em>mis en valeur</em>.</p>]]></programlisting>
</example>
@@ -322,7 +322,7 @@
<title>Utiliser un 幨幦ent avec un attribut</title>
<programlisting>
-<![ CDATA [<p align="left">L'attribut align est superflus pour ce paragraphe,
+<![CDATA[<p align="left">L'attribut align est superflus pour ce paragraphe,
puisque 'left' est la valeur par d嶨aut.</p>
<p align="center">Ce paragraphe sera peut-皻re centr.</p>]]></programlisting>
@@ -338,7 +338,7 @@
<title>Simples quotes dans un attribut</title>
<programlisting>
-<![ CDATA [<p align='right'>Je suis &agrave; droite&nbsp;!</p>]]></programlisting>
+<![CDATA[<p align='right'>Je suis &agrave; droite&nbsp;!</p>]]></programlisting>
</example>
<para>Vous n'avez pas toujours besoin de mettre la valeur de l'attribut
@@ -401,7 +401,7 @@ setenv SGML_CATALOG_FILES ${SGML_ROOT}/docbook/catalog:$SGML_CATALOG_FILES</prog
mettrez&nbsp;:</para>
<programlisting>
-<![ CDATA [<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0
+<![CDATA[<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0
Transitional//EN">
<html>
@@ -563,7 +563,7 @@ nsgmls:example.xml:6:8:E: end tag for "HEAD" which is not finished</screen>
4.0 de la DTD HTML&nbsp;:</para>
<programlisting>
-<![ CDATA [<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0//EN">]]></programlisting>
+<![CDATA[<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0//EN">]]></programlisting>
<para>Cette ligne a plusieurs composants distincts&nbsp;:</para>
@@ -797,7 +797,7 @@ PUBLIC "-//W3C//DTD HTML 4.0//EN" "4.0/strict.dtd"</programlisting>
<para>La syntaxe pour le faire est l嶲鋨ement diff廨ente&nbsp;:</para>
<programlisting>
-<![ CDATA [<!DOCTYPE html SYSTEM "/path/to/file.dtd">]]></programlisting>
+<![CDATA[<!DOCTYPE html SYSTEM "/path/to/file.dtd">]]></programlisting>
<para>Le mot-cl <literal>SYSTEM</literal> indique que le processeur
SGML doit localiser le fichier d'une fa蔞n qui d廧end du syst鋗e. Cela
@@ -856,7 +856,7 @@ PUBLIC "-//W3C//DTD HTML 4.0//EN" "4.0/strict.dtd"</programlisting>
<programlisting>
<!-- commentaire de test --></programlisting>
- <programlisting><![ CDATA [
+ <programlisting><![CDATA[
<!-- C'est le texte du commentaire -->
<!-- C'est un autre commentaire -->
@@ -868,7 +868,8 @@ PUBLIC "-//W3C//DTD HTML 4.0//EN" "4.0/strict.dtd"</programlisting>
-- de le faire -->]]></programlisting>
</example>
- <![ %output.print; [
+<!--
+ <![%output.print;[
<important>
<title>Utilisez 2 tirets</title>
@@ -887,6 +888,7 @@ PUBLIC "-//W3C//DTD HTML 4.0//EN" "4.0/strict.dtd"</programlisting>
sujettes &agrave; ce probl鋗e.</para>
</important>
]]>
+-->
<para>Si vous avez d嶴&agrave; utilis HTML auparavant, on vous a peut-皻re
donn des r銶les diff廨entes pour les commentaires. En particulier, vous
@@ -901,7 +903,7 @@ PUBLIC "-//W3C//DTD HTML 4.0//EN" "4.0/strict.dtd"</programlisting>
<example>
<title>Commentaires SGML erronn廥</title>
- <programlisting><![ CDATA [
+ <programlisting><![CDATA[
<!-- C'est en commentaire --
CE N'EST PAS EN COMMENTAIRE!
@@ -917,13 +919,13 @@ PUBLIC "-//W3C//DTD HTML 4.0//EN" "4.0/strict.dtd"</programlisting>
source de confusion.</para>
<programlisting>
-<![ CDATA [<!--------------- C'est un tr鋊 mauvaise id嶪 --------------->]]></programlisting>
+<![CDATA[<!--------------- C'est un tr鋊 mauvaise id嶪 --------------->]]></programlisting>
<para>Comme l'exemple le sugg鋨e, ne mettez <emphasis>pas</emphasis> de
commentaires de ce type.</para>
<programlisting>
-<![ CDATA [<!--===================================================-->]]></programlisting>
+<![CDATA[<!--===================================================-->]]></programlisting>
<para>C'est une (l嶲鋨ement) meilleure id嶪, mais c'est toute de m瘱e
une source de confusion potentielle pour les d嶵utants en SGML.</para>
@@ -980,7 +982,7 @@ PUBLIC "-//W3C//DTD HTML 4.0//EN" "4.0/strict.dtd"</programlisting>
courante de votre produit. Vous pourriez 嶰rire&nbsp;:</para>
<programlisting>
-<![ CDATA [<para>La version courante de notre produit est la
+<![CDATA[<para>La version courante de notre produit est la
&version.courante;.</para>]]></programlisting>
<para>Quand le num廨o de version change, il vous suffit de modifier la
@@ -1007,7 +1009,7 @@ PUBLIC "-//W3C//DTD HTML 4.0//EN" "4.0/strict.dtd"</programlisting>
<title>D嶨inition d'entit廥 g幯廨ales</title>
<programlisting>
-<![ CDATA [<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0//EN" [
+<![CDATA[<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0//EN" [
<!ENTITY version.courante "3.0-RELEASE">
<!ENTITY derniere.version "2.2.7-RELEASE">
]>]]></programlisting>
@@ -1047,7 +1049,7 @@ PUBLIC "-//W3C//DTD HTML 4.0//EN" "4.0/strict.dtd"</programlisting>
<title>D嶨inition d'entit廥 param鋈res</title>
<programlisting>
-<![ CDATA [<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0//EN" [
+<![CDATA[<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0//EN" [
<!ENTITY % param.du "du">
<!ENTITY % param.texte "text">
<!ENTITY % param.encore "encore %param.du more %param.texte">
@@ -1069,7 +1071,7 @@ PUBLIC "-//W3C//DTD HTML 4.0//EN" "4.0/strict.dtd"</programlisting>
<filename>exemple.xml</filename>.</para>
<programlisting>
-<![ CDATA [<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" [
+<![CDATA[<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" [
<!ENTITY version "1.1">
]>
@@ -1169,7 +1171,7 @@ PUBLIC "-//W3C//DTD HTML 4.0//EN" "4.0/strict.dtd"</programlisting>
fichiers</title>
<programlisting>
-<![ CDATA [<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0//EN" [
+<![CDATA[<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0//EN" [
<!ENTITY chapitre.1 SYSTEM "chapitre1.xml">
<!ENTITY chapitre.2 SYSTEM "chapitre2.xml">
<!ENTITY chapitre.3 SYSTEM "chapitre3.xml">
@@ -1225,7 +1227,7 @@ PUBLIC "-//W3C//DTD HTML 4.0//EN" "4.0/strict.dtd"</programlisting>
contiendra&nbsp;:</para>
<programlisting>
-<![ CDATA [<!ENTITY chapitre.1 SYSTEM "chapitre1.xml">
+<![CDATA[<!ENTITY chapitre.1 SYSTEM "chapitre1.xml">
<!ENTITY chapitre.2 SYSTEM "chapitre2.xml">
<!ENTITY chapitre.3 SYSTEM "chapitre3.xml">]]></programlisting>
@@ -1236,7 +1238,7 @@ PUBLIC "-//W3C//DTD HTML 4.0//EN" "4.0/strict.dtd"</programlisting>
pr嶰嶮emment&nbsp;:</para>
<programlisting>
-<![ CDATA [<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0//EN" [
+<![CDATA[<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0//EN" [
<!--
D嶨inissez une entit param鋈re pour inclure le fichier
des entit廥 g幯廨ales pour les chapitres
@@ -1270,7 +1272,7 @@ PUBLIC "-//W3C//DTD HTML 4.0//EN" "4.0/strict.dtd"</programlisting>
<para>Mettez-y quelque chose qui ressemble &agrave; ceci&nbsp;:</para>
<programlisting>
-<![ CDATA [<p>C'est le premier paragraphe.</p>]]></programlisting>
+<![CDATA[<p>C'est le premier paragraphe.</p>]]></programlisting>
</step>
<step>
@@ -1278,7 +1280,7 @@ PUBLIC "-//W3C//DTD HTML 4.0//EN" "4.0/strict.dtd"</programlisting>
suivante&nbsp;:</para>
<programlisting>
-<![ CDATA [<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0//EN" [
+<![CDATA[<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0//EN" [
<!ENTITY version "1.1">
<!ENTITY para1 SYSTEM "para1.xml">
<!ENTITY para2 SYSTEM "para2.xml">
@@ -1331,7 +1333,7 @@ PUBLIC "-//W3C//DTD HTML 4.0//EN" "4.0/strict.dtd"</programlisting>
<filename>exemple.xml</filename>&nbsp;:</para>
<programlisting>
-<![ CDATA [<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0//EN" [
+<![CDATA[<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0//EN" [
<!ENTITY % entites SYSTEM "entites.xml"> %entites;
]>
@@ -1355,7 +1357,7 @@ PUBLIC "-//W3C//DTD HTML 4.0//EN" "4.0/strict.dtd"</programlisting>
qui contienne&nbsp;:</para>
<programlisting>
-<![ CDATA [<!ENTITY version "1.1">
+<![CDATA[<!ENTITY version "1.1">
<!ENTITY para1 SYSTEM "para1.xml">
<!ENTITY para2 SYSTEM "para2.xml">
<!ENTITY para3 SYSTEM "para3.xml">]]></programlisting>
@@ -1396,7 +1398,7 @@ PUBLIC "-//W3C//DTD HTML 4.0//EN" "4.0/strict.dtd"</programlisting>
</example>
<para>Comme vous pouviez vous y attendre, une section marqu嶪 est une
- fonctionnalit SGML et commence donc par <literal>&lt!</literal>.</para>
+ fonctionnalit SGML et commence donc par <literal>&lt;!</literal>.</para>
<para>Le premier crochet ouvrant d幨imite la section marqu嶪.</para>
@@ -1467,7 +1469,7 @@ PUBLIC "-//W3C//DTD HTML 4.0//EN" "4.0/strict.dtd"</programlisting>
&lt;programlisting>) est du DocBook.&lt;/para>
&lt;programlisting>
- &lt![ CDATA [ <![ CDATA [
+ &lt;![CDATA[<![CDATA[
<p>Cet exemple vous montre quelques 幨幦ents de HTML. Comme les
caract鋨es < et > y sont si fr廦uemment utilis廥, il est plus
facile de marquer tout l'exemple comme CDATA plut矌 que de se
@@ -1482,7 +1484,7 @@ PUBLIC "-//W3C//DTD HTML 4.0//EN" "4.0/strict.dtd"</programlisting>
<p>C'est la fin de l'exemple.</p>]]>
]]&gt;
-&lt/programlisting></programlisting>
+&lt;/programlisting></programlisting>
<para>Si vous consultez le source de ce document, vous verrez qu'il
utilise constamment cette technique.</para>
@@ -1557,7 +1559,7 @@ PUBLIC "-//W3C//DTD HTML 4.0//EN" "4.0/strict.dtd"</programlisting>
l'entit en&nbsp;:</para>
<programlisting>
-&lt!ENTiTY % version.electronique "IGNORE"></programlisting>
+&lt;!ENTiTY % version.electronique "IGNORE"></programlisting>
<para>A la seconde passe sur le document, les sections marqu嶪s qui
utilisent <literal>%version.electronique</literal> comme mot-cl
@@ -1585,17 +1587,17 @@ PUBLIC "-//W3C//DTD HTML 4.0//EN" "4.0/strict.dtd"</programlisting>
&lt;/head>
&lt;body>
- &lt;p>Ce paragraphe &lt;![ CDATA [contient de nombreux
+ &lt;p>Ce paragraphe &lt;![CDATA[contient de nombreux
caract鋨es &lt; (&lt; &lt; &lt; &lt; &lt;) il est donc
plus facile de l'inclure dans une section marqu嶪
- CDATA ]]&gt;&lt/p>
+ CDATA ]]&gt;&lt;/p>
- &lt;![ IGNORE [
+ &lt;![IGNORE[
&lt;p>Ce paragraphe n'appara褾ra jamais dans les
sorties.&lt;/p>
]]&gt;
- &lt;![ <![ CDATA [%sortie.texte]]> [
+ &lt;![ <![CDATA[%sortie.texte]]> [
&lt;p>Ce paragraphe appara褾ra peut-皻re dans les
sorties.&lt;/p>
diff --git a/fr_FR.ISO8859-1/books/fdp-primer/stylesheets/chapter.xml b/fr_FR.ISO8859-1/books/fdp-primer/stylesheets/chapter.xml
index 4255e6939e..e7f63861fd 100644
--- a/fr_FR.ISO8859-1/books/fdp-primer/stylesheets/chapter.xml
+++ b/fr_FR.ISO8859-1/books/fdp-primer/stylesheets/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!-- Copyright (c) 1998, 1999 Nik Clayton, All rights reserved.
Redistribution and use in source (SGML DocBook) and 'compiled' forms
diff --git a/fr_FR.ISO8859-1/books/fdp-primer/the-faq/chapter.xml b/fr_FR.ISO8859-1/books/fdp-primer/the-faq/chapter.xml
index cf5a56b93f..100df04e41 100644
--- a/fr_FR.ISO8859-1/books/fdp-primer/the-faq/chapter.xml
+++ b/fr_FR.ISO8859-1/books/fdp-primer/the-faq/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!-- Copyright (c) 1998, 1999 Nik Clayton, All rights reserved.
Redistribution and use in source (SGML DocBook) and 'compiled' forms
diff --git a/fr_FR.ISO8859-1/books/fdp-primer/the-handbook/chapter.xml b/fr_FR.ISO8859-1/books/fdp-primer/the-handbook/chapter.xml
index b9b6035187..048a36aebc 100644
--- a/fr_FR.ISO8859-1/books/fdp-primer/the-handbook/chapter.xml
+++ b/fr_FR.ISO8859-1/books/fdp-primer/the-handbook/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!-- Copyright (c) 1998, 1999 Nik Clayton, All rights reserved.
Redistribution and use in source (SGML DocBook) and 'compiled' forms
@@ -107,7 +107,7 @@
<para>Si par exemple, un des chapitres contient&nbsp;:</para>
- <programlisting><![ CDATA [
+ <programlisting><![CDATA[
<chapter id="kernelconfiguration">
...
</chapter>]]></programlisting>
@@ -190,7 +190,7 @@
<literal>&lt;PARA&gt;</literal>.</para>
<para>Le texte dans les contextes SGML est normalement en majuscules,
- <literal>&lt!ENTITY&hellip;&gt;</literal> ou
+ <literal>&lt;!ENTITY&hellip;&gt;</literal> ou
<literal>&lt;!DOCTYPE&hellip;&gt;</literal> et
<emphasis>non</emphasis> <literal>&lt;!entity&hellip;&gt;</literal>
ou <literal>&lt;!doctype&hellip;&gt;</literal>.</para>
@@ -211,7 +211,7 @@
section&nbsp;:</para>
<programlisting>
-<![ CDATA [+--- C'est la colonne 0
+<![CDATA[+--- C'est la colonne 0
<chapter>
<title>...</title>
diff --git a/fr_FR.ISO8859-1/books/fdp-primer/the-website/chapter.xml b/fr_FR.ISO8859-1/books/fdp-primer/the-website/chapter.xml
index 832c07f2d5..5c72c201ec 100644
--- a/fr_FR.ISO8859-1/books/fdp-primer/the-website/chapter.xml
+++ b/fr_FR.ISO8859-1/books/fdp-primer/the-website/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!-- Copyright (c) 1998, 1999 Nik Clayton, All rights reserved.
Redistribution and use in source (SGML DocBook) and 'compiled' forms
diff --git a/fr_FR.ISO8859-1/books/fdp-primer/todo.xml b/fr_FR.ISO8859-1/books/fdp-primer/todo.xml
index 15867fb5c2..68c1adc5c0 100644
--- a/fr_FR.ISO8859-1/books/fdp-primer/todo.xml
+++ b/fr_FR.ISO8859-1/books/fdp-primer/todo.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
The FreeBSD French Documentation Project
diff --git a/fr_FR.ISO8859-1/books/fdp-primer/tools/chapter.xml b/fr_FR.ISO8859-1/books/fdp-primer/tools/chapter.xml
index a2d21f8326..ff6b93e468 100644
--- a/fr_FR.ISO8859-1/books/fdp-primer/tools/chapter.xml
+++ b/fr_FR.ISO8859-1/books/fdp-primer/tools/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!-- Copyright (c) 1998, 1999 Nik Clayton, All rights reserved.
Redistribution and use in source (SGML DocBook) and 'compiled' forms
diff --git a/fr_FR.ISO8859-1/books/fdp-primer/translations/chapter.xml b/fr_FR.ISO8859-1/books/fdp-primer/translations/chapter.xml
index 3bae95c1d3..d4649355dd 100644
--- a/fr_FR.ISO8859-1/books/fdp-primer/translations/chapter.xml
+++ b/fr_FR.ISO8859-1/books/fdp-primer/translations/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!-- Copyright (c) 1999 Nik Clayton, All rights reserved.
Redistribution and use in source (SGML DocBook) and 'compiled' forms
@@ -82,7 +82,7 @@
<qandaentry>
<question>
<para>Y-a-t-il une liste de diffusion pour les
- traducteurs&nbsp?</para>
+ traducteurs&nbsp;?</para>
</question>
<answer>
@@ -458,7 +458,7 @@
<para>Les en-t皻es de la version anglaise du document ressembleront &agrave;
ceci&nbsp;:</para>
- <programlisting><![ CDATA [<!--
+ <programlisting><![CDATA[<!--
The FreeBSD Documentation Project
&dollar;Id: chapter.xml,v 1.11 1999/06/20 21:18:57 billf Exp $
@@ -481,7 +481,7 @@
<para>Donc, la version espagnole du pr廥ent fichier commencerait
par&nbsp;:</para>
- <programlisting><![ CDATA [<!--
+ <programlisting><![CDATA[<!--
The FreeBSD Spanish Documentation Project
&dollar;Id: chapter.xml,v 1.3 1999/06/24 19:12:32 jesusr Exp $
diff --git a/fr_FR.ISO8859-1/books/fdp-primer/writing-style/chapter.xml b/fr_FR.ISO8859-1/books/fdp-primer/writing-style/chapter.xml
index 69636eb910..9fa77093d2 100644
--- a/fr_FR.ISO8859-1/books/fdp-primer/writing-style/chapter.xml
+++ b/fr_FR.ISO8859-1/books/fdp-primer/writing-style/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!-- Copyright (c) 1998 Nik Clayton, All rights reserved.
Redistribution and use in source (SGML DocBook) and 'compiled' forms
diff --git a/fr_FR.ISO8859-1/books/handbook/Makefile b/fr_FR.ISO8859-1/books/handbook/Makefile
index c686b96a12..7547f19f3f 100644
--- a/fr_FR.ISO8859-1/books/handbook/Makefile
+++ b/fr_FR.ISO8859-1/books/handbook/Makefile
@@ -247,30 +247,43 @@ DOC_PREFIX?= ${.CURDIR}/../../..
#
# rules generating lists of mirror site from XML database.
#
-XMLDOCS= mirrors-ftp:::mirrors.xml.ftp.inc \
+XMLDOCS= lastmod:::mirrors.lastmod.inc \
+ mirrors-ftp-index:::mirrors.xml.ftp.index.inc \
+ mirrors-ftp:::mirrors.xml.ftp.inc \
+ mirrors-cvsup-index:::mirrors.xml.cvsup.index.inc \
mirrors-cvsup:::mirrors.xml.cvsup.inc \
+ eresources-index:::eresources.xml.www.index.inc \
eresources:::eresources.xml.www.inc
DEPENDSET.DEFAULT= transtable mirror
XSLT.DEFAULT= ${XSL_MIRRORS}
XML.DEFAULT= ${XML_MIRRORS}
-NO_TIDY.DEFAULT= yes
+PARAMS.lastmod+= --param 'target' "'lastmod'"
+PARAMS.mirrors-ftp-index+= --param 'type' "'ftp'" \
+ --param 'proto' "'ftp'" \
+ --param 'target' "'index'"
PARAMS.mirrors-ftp+= --param 'type' "'ftp'" \
--param 'proto' "'ftp'" \
--param 'target' "'handbook/mirrors/chapter.xml'"
+PARAMS.mirrors-cvsup-index+= --param 'type' "'cvsup'" \
+ --param 'proto' "'cvsup'" \
+ --param 'target' "'index'"
PARAMS.mirrors-cvsup+= --param 'type' "'cvsup'" \
--param 'proto' "'cvsup'" \
--param 'target' "'handbook/mirrors/chapter.xml'"
+PARAMS.eresources-index+= --param 'type' "'www'" \
+ --param 'proto' "'http'" \
+ --param 'target' "'index'"
PARAMS.eresources+= --param 'type' "'www'" \
--param 'proto' "'http'" \
--param 'target' "'handbook/eresources/chapter.xml'"
-SRCS+= mirrors.xml.ftp.inc \
+SRCS+= mirrors.lastmod.inc \
+ mirrors.xml.ftp.inc \
+ mirrors.xml.ftp.index.inc \
mirrors.xml.cvsup.inc \
- eresources.xml.www.inc
-
-CLEANFILES+= mirrors.xml.ftp.inc \
- mirrors.xml.cvsup.inc \
- eresources.xml.www.inc
+ mirrors.xml.cvsup.index.inc \
+ eresources.xml.www.inc \
+ eresources.xml.www.index.inc
.include "${DOC_PREFIX}/share/mk/doc.project.mk"
diff --git a/fr_FR.ISO8859-1/books/handbook/advanced-networking/chapter.xml b/fr_FR.ISO8859-1/books/handbook/advanced-networking/chapter.xml
index 8ef8052277..271dcc3991 100644
--- a/fr_FR.ISO8859-1/books/handbook/advanced-networking/chapter.xml
+++ b/fr_FR.ISO8859-1/books/handbook/advanced-networking/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
The FreeBSD French Documentation Project
@@ -1410,7 +1410,7 @@ linuxemu/chapter.xml -->
<para>Nous pouvons enfin compiler et installer le module du
pilote:</para>
- <screen>&prompt.root; <userinput>make && make install</userinput></screen>
+ <screen>&prompt.root; <userinput>make &amp;&amp; make install</userinput></screen>
<para>Pour utiliser le pilote, vous devez charger les
modules appropri廥:</para>
@@ -3299,7 +3299,7 @@ host margaux {
<sect4>
<title>Pagination via <acronym>NFS</acronym> sous
- &os&nbsp;5.X</title>
+ &os;&nbsp;5.X</title>
<para>Le noyau ne supporte pas l'activation de la pagination
par <acronym>NFS</acronym> au d幦arrage. L'espace
diff --git a/fr_FR.ISO8859-1/books/handbook/audit/chapter.xml b/fr_FR.ISO8859-1/books/handbook/audit/chapter.xml
index a2c6f06d53..ffb73ffcee 100644
--- a/fr_FR.ISO8859-1/books/handbook/audit/chapter.xml
+++ b/fr_FR.ISO8859-1/books/handbook/audit/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
The FreeBSD French Documentation Project
diff --git a/fr_FR.ISO8859-1/books/handbook/basics/chapter.xml b/fr_FR.ISO8859-1/books/handbook/basics/chapter.xml
index f148ff7c60..b4c8e3a726 100644
--- a/fr_FR.ISO8859-1/books/handbook/basics/chapter.xml
+++ b/fr_FR.ISO8859-1/books/handbook/basics/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
The FreeBSD French Documentation Project
diff --git a/fr_FR.ISO8859-1/books/handbook/bibliography/chapter.xml b/fr_FR.ISO8859-1/books/handbook/bibliography/chapter.xml
index d01562747c..f1f741e208 100644
--- a/fr_FR.ISO8859-1/books/handbook/bibliography/chapter.xml
+++ b/fr_FR.ISO8859-1/books/handbook/bibliography/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
The FreeBSD French Documentation Project
diff --git a/fr_FR.ISO8859-1/books/handbook/book.xml b/fr_FR.ISO8859-1/books/handbook/book.xml
index 9455ef0d16..a3446dc4fe 100644
--- a/fr_FR.ISO8859-1/books/handbook/book.xml
+++ b/fr_FR.ISO8859-1/books/handbook/book.xml
@@ -1,8 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//FR" "../../share/xml/entities.ent">
-%entities;
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd" [
<!ENTITY % chapters SYSTEM "chapters.ent"> %chapters;
<!ENTITY % txtfiles SYSTEM "../../../en_US.ISO8859-1/books/handbook/txtfiles.ent"> %txtfiles;
]>
diff --git a/fr_FR.ISO8859-1/books/handbook/boot/chapter.xml b/fr_FR.ISO8859-1/books/handbook/boot/chapter.xml
index a669a14f65..68cd24ce49 100644
--- a/fr_FR.ISO8859-1/books/handbook/boot/chapter.xml
+++ b/fr_FR.ISO8859-1/books/handbook/boot/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
The FreeBSD French Documentation Project
diff --git a/fr_FR.ISO8859-1/books/handbook/chapters.ent b/fr_FR.ISO8859-1/books/handbook/chapters.ent
index d7a930da14..b6aac4feae 100644
--- a/fr_FR.ISO8859-1/books/handbook/chapters.ent
+++ b/fr_FR.ISO8859-1/books/handbook/chapters.ent
@@ -14,229 +14,60 @@
Original revision: 1.37
-->
-<!ENTITY % not.published "INCLUDE">
-
-<!ENTITY % chap.introduction "IGNORE">
-<!ENTITY % chap.install "IGNORE">
-<!ENTITY % chap.bsdinstall "IGNORE">
-<!ENTITY % chap.basics "IGNORE">
-<!ENTITY % chap.ports "IGNORE">
-<!ENTITY % chap.config "IGNORE">
-<!ENTITY % chap.boot "IGNORE">
-<!ENTITY % chap.users "IGNORE">
-<!ENTITY % chap.kernelconfig "IGNORE">
-<!ENTITY % chap.security "IGNORE">
-<!ENTITY % chap.jails "IGNORE">
-<!ENTITY % chap.printing "IGNORE">
-<!ENTITY % chap.disks "IGNORE">
-<!ENTITY % chap.geom "IGNORE">
-<!ENTITY % chap.vinum "IGNORE">
-<!ENTITY % chap.x11 "IGNORE">
-<!ENTITY % chap.l10n "IGNORE">
-<!ENTITY % chap.multimedia "IGNORE">
-<!ENTITY % chap.desktop "IGNORE">
-<!ENTITY % chap.serialcomms "IGNORE">
-<!ENTITY % chap.ppp-and-slip "IGNORE">
-<!ENTITY % chap.advanced-networking "IGNORE">
-<!ENTITY % chap.firewalls "IGNORE">
-<!ENTITY % chap.network-servers "IGNORE">
-<!ENTITY % chap.mail "IGNORE">
-<!ENTITY % chap.cutting-edge "IGNORE">
-<!ENTITY % chap.linuxemu "IGNORE">
-<!ENTITY % chap.mirrors "IGNORE">
-<!ENTITY % chap.mirrors.ftp.inc "INCLUDE">
-<!ENTITY % chap.mirrors.cvsup.inc "INCLUDE">
-<!ENTITY % chap.bibliography "IGNORE">
-<!ENTITY % chap.eresources "IGNORE">
-<!ENTITY % chap.eresources.www.inc "INCLUDE">
-<!ENTITY % chap.pgpkeys "IGNORE">
-<!ENTITY % chap.index "IGNORE">
-<!ENTITY % chap.freebsd-glossary "IGNORE">
-<!ENTITY % chap.mac "IGNORE">
-<!ENTITY % chap.audit "IGNORE">
-<!ENTITY % chap.filesystems "IGNORE">
-<!ENTITY % chap.dtrace "IGNORE">
-
<!ENTITY chap.preface SYSTEM "preface/preface.xml">
<!ENTITY % pgpkeys SYSTEM "../../../share/pgpkeys/pgpkeys.ent"> %pgpkeys;
<!-- Part One -->
-<![%chap.introduction;[
<!ENTITY chap.introduction SYSTEM "introduction/chapter.xml">
-]]>
-<![%chap.install;[
<!ENTITY chap.install SYSTEM "install/chapter.xml">
-]]>
-<![%chap.basics;[
<!ENTITY chap.basics SYSTEM "basics/chapter.xml">
-]]>
-<![%chap.ports;[
<!ENTITY chap.ports SYSTEM "ports/chapter.xml">
-]]>
-<![%chap.x11;[
<!ENTITY chap.x11 SYSTEM "x11/chapter.xml">
-]]>
<!-- Part Two -->
-<![%chap.desktop;[
<!ENTITY chap.desktop SYSTEM "desktop/chapter.xml">
-]]>
-<![%chap.multimedia;[
<!ENTITY chap.multimedia SYSTEM "multimedia/chapter.xml">
-]]>
-<![%chap.kernelconfig;[
<!ENTITY chap.kernelconfig SYSTEM "kernelconfig/chapter.xml">
-]]>
-<![%chap.printing;[
<!ENTITY chap.printing SYSTEM "printing/chapter.xml">
-]]>
-<![%chap.linuxemu;[
<!ENTITY chap.linuxemu SYSTEM "linuxemu/chapter.xml">
-]]>
<!-- Part Three -->
-<![%chap.config;[
<!ENTITY chap.config SYSTEM "config/chapter.xml">
-]]>
-<![%chap.boot;[
<!ENTITY chap.boot SYSTEM "boot/chapter.xml">
-]]>
-<![%chap.users;[
<!ENTITY chap.users SYSTEM "users/chapter.xml">
-]]>
-<![%chap.security;[
<!ENTITY chap.security SYSTEM "security/chapter.xml">
-]]>
-<![%chap.jails;[
<!ENTITY chap.jails SYSTEM "jails/chapter.xml">
-]]>
-<![%chap.mac;[
<!ENTITY chap.mac SYSTEM "mac/chapter.xml">
-]]>
-<![%chap.audit;[
<!ENTITY chap.audit SYSTEM "audit/chapter.xml">
-]]>
-<![%chap.disks;[
<!ENTITY chap.disks SYSTEM "disks/chapter.xml">
-]]>
-<![%chap.geom;[
<!ENTITY chap.geom SYSTEM "geom/chapter.xml">
-]]>
-<![%chap.vinum;[
<!ENTITY chap.vinum SYSTEM "vinum/chapter.xml">
-]]>
-<![%chap.virtualization;[
<!ENTITY chap.virtualization SYSTEM "virtualization/chapter.xml">
-]]>
-<![%chap.l10n;[
<!ENTITY chap.l10n SYSTEM "l10n/chapter.xml">
-]]>
-<![%chap.cutting-edge;[
<!ENTITY chap.cutting-edge SYSTEM "cutting-edge/chapter.xml">
-]]>
-<![%chap.dtrace;[
<!ENTITY chap.dtrace SYSTEM "dtrace/chapter.xml">
-]]>
<!-- Part Four -->
-<![%chap.serialcomms;[
<!ENTITY chap.serialcomms SYSTEM "serialcomms/chapter.xml">
-]]>
-<![%chap.ppp-and-slip;[
<!ENTITY chap.ppp-and-slip SYSTEM "ppp-and-slip/chapter.xml">
-]]>
-<![%chap.mail;[
<!ENTITY chap.mail SYSTEM "mail/chapter.xml">
-]]>
-<![%chap.network-servers;[
<!ENTITY chap.network-servers SYSTEM "network-servers/chapter.xml">
-]]>
-<![%chap.firewalls;[
<!ENTITY chap.firewalls SYSTEM "firewalls/chapter.xml">
-]]>
-<![%chap.advanced-networking;[
<!ENTITY chap.advanced-networking SYSTEM "advanced-networking/chapter.xml">
-]]>
<!-- Part Five (appendices) -->
-<![%chap.mirrors;[
- <!ENTITY chap.mirrors SYSTEM "mirrors/chapter.xml">
-]]>
-<![%chap.mirrors.ftp.inc;[
- <!ENTITY chap.mirrors.ftp.inc SYSTEM "mirrors.xml.ftp.inc">
-]]>
-<![%chap.mirrors.cvsup.inc;[
- <!ENTITY chap.mirrors.cvsup.inc SYSTEM "mirrors.xml.cvsup.inc">
-]]>
-<![%chap.bibliography;[
- <!ENTITY chap.bibliography SYSTEM "bibliography/chapter.xml">
-]]>
-<![%chap.eresources;[
- <!ENTITY chap.eresources SYSTEM "eresources/chapter.xml">
-]]>
-<![%chap.eresources.www.inc;[
- <!ENTITY chap.eresources.www.inc SYSTEM "eresources.xml.www.inc">
-]]>
-<![%chap.pgpkeys;[
- <!ENTITY chap.pgpkeys SYSTEM "pgpkeys/chapter.xml">
-]]>
-<![%chap.freebsd-glossary;[
- <!ENTITY chap.freebsd-glossary "&freebsd-glossary;">
-]]>
-<![%chap.index;[
- <!ENTITY chap.index SYSTEM "index.xml">
-]]>
+ <!ENTITY chap.mirrors SYSTEM "mirrors/chapter.xml">
+ <!ENTITY chap.mirrors.lastmod.inc SYSTEM "mirrors.lastmod.inc">
+ <!ENTITY chap.mirrors.ftp.index.inc SYSTEM "mirrors.xml.ftp.index.inc">
+ <!ENTITY chap.mirrors.ftp.inc SYSTEM "mirrors.xml.ftp.inc">
+ <!ENTITY chap.mirrors.cvsup.index.inc SYSTEM "mirrors.xml.cvsup.index.inc">
+ <!ENTITY chap.mirrors.cvsup.inc SYSTEM "mirrors.xml.cvsup.inc">
+ <!ENTITY chap.bibliography SYSTEM "bibliography/chapter.xml">
+ <!ENTITY chap.eresources SYSTEM "eresources/chapter.xml">
+ <!ENTITY chap.eresources.www.index.inc SYSTEM "eresources.xml.www.index.inc">
+ <!ENTITY chap.eresources.www.inc SYSTEM "eresources.xml.www.inc">
+ <!ENTITY chap.pgpkeys SYSTEM "pgpkeys/chapter.xml">
+ <!ENTITY chap.freebsd-glossary "&freebsd-glossary;">
+ <!ENTITY chap.index "">
<!ENTITY chap.colophon SYSTEM "colophon.xml">
-
-<!-- IGNORE cases -->
-
-<!-- Part One -->
-<!ENTITY chap.introduction "">
-<!ENTITY chap.install "">
-<!ENTITY chap.basics "">
-<!ENTITY chap.ports "">
-<!ENTITY chap.x11 "">
-
-<!-- Part Two -->
-<!ENTITY chap.desktop "">
-<!ENTITY chap.multimedia "">
-<!ENTITY chap.kernelconfig "">
-<!ENTITY chap.printing "">
-<!ENTITY chap.linuxemu "">
-
-<!-- Part Three -->
-<!ENTITY chap.config "">
-<!ENTITY chap.boot "">
-<!ENTITY chap.users "">
-<!ENTITY chap.security "">
-<!ENTITY chap.jails "">
-<!ENTITY chap.mac "">
-<!ENTITY chap.audit "">
-<!ENTITY chap.disks "">
-<!ENTITY chap.geom "">
-<!ENTITY chap.filesystems "">
-<!ENTITY chap.vinum "">
-<!ENTITY chap.virtualization "">
-<!ENTITY chap.l10n "">
-<!ENTITY chap.cutting-edge "">
-<!ENTITY chap.dtrace "">
-
-<!-- Part Four -->
-<!ENTITY chap.serialcomms "">
-<!ENTITY chap.ppp-and-slip "">
-<!ENTITY chap.mail "">
-<!ENTITY chap.network-servers "">
-<!ENTITY chap.firewalls "">
-<!ENTITY chap.advanced-networking "">
-
-<!-- Part Five (appendices) -->
-<!ENTITY chap.mirrors "">
-<!ENTITY chap.mirrors.ftp.inc "">
-<!ENTITY chap.mirrors.cvsup.inc "">
-<!ENTITY chap.bibliography "">
-<!ENTITY chap.eresources "">
-<!ENTITY chap.eresources.www.inc "">
-<!ENTITY chap.pgpkeys "">
-<!ENTITY chap.freebsd-glossary "">
-<!ENTITY chap.index "">
diff --git a/fr_FR.ISO8859-1/books/handbook/colophon.xml b/fr_FR.ISO8859-1/books/handbook/colophon.xml
index b4788e5303..c622d39f1b 100644
--- a/fr_FR.ISO8859-1/books/handbook/colophon.xml
+++ b/fr_FR.ISO8859-1/books/handbook/colophon.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
The FreeBSD French Documentation Project
diff --git a/fr_FR.ISO8859-1/books/handbook/config/chapter.xml b/fr_FR.ISO8859-1/books/handbook/config/chapter.xml
index bc6153e124..f8b243bb47 100644
--- a/fr_FR.ISO8859-1/books/handbook/config/chapter.xml
+++ b/fr_FR.ISO8859-1/books/handbook/config/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
The FreeBSD French Documentation Project
@@ -416,7 +416,7 @@
&man.cron.8;, sont lanc廥 par l'interm嶮iaire des
proc嶮ures de d幦arrage du syst鋗e. Ces
proc嶮ures peuvent varier en fonction de la version de
- &os,; ou du fournisseur; cependant, l'aspect le plus important
+ &os;, ou du fournisseur; cependant, l'aspect le plus important
&agrave; consid廨er est que leur configuration de
d幦arrage peut 皻re g廨嶪 &agrave;
l'aide de proc嶮ures de d幦arrage simples.</para>
@@ -468,7 +468,7 @@ stop)
kill -9 `cat /var/run/utility.pid`
;;
*)
- echo "Usage: `basename $0` {start|stop}" &gt;&2
+ echo "Usage: `basename $0` {start|stop}" &gt;&amp;2
exit 64
;;
esac
@@ -839,7 +839,7 @@ HOME=/var/log
</authorgroup>
</sect1info>
- <title>Utilisation du syst鋗e rc sous &os</title>
+ <title>Utilisation du syst鋗e rc sous &os;</title>
<para>En 2002, le syst鋗e <filename>rc.d</filename> de NetBSD pour
l'initialisation du syst鋗e a
@@ -993,7 +993,7 @@ sshd is running as pid 433.</screen>
int廨ess par l'嶰riture de vos propres
proc嶮ures <filename>rc.d</filename> ou pour
l'am幨ioration des proc嶮ures existantes, vous
- trouverez <ulink url="&url.articles.rc-scripting">cette
+ trouverez <ulink url="&url.articles.rc-scripting;">cette
article</ulink> utile.</para>
</sect1>
diff --git a/fr_FR.ISO8859-1/books/handbook/cutting-edge/chapter.xml b/fr_FR.ISO8859-1/books/handbook/cutting-edge/chapter.xml
index 727e99804e..b3b2c95f49 100644
--- a/fr_FR.ISO8859-1/books/handbook/cutting-edge/chapter.xml
+++ b/fr_FR.ISO8859-1/books/handbook/cutting-edge/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
The FreeBSD French Documentation Project
diff --git a/fr_FR.ISO8859-1/books/handbook/desktop/chapter.xml b/fr_FR.ISO8859-1/books/handbook/desktop/chapter.xml
index 95f8d89ecb..e9c353f69d 100644
--- a/fr_FR.ISO8859-1/books/handbook/desktop/chapter.xml
+++ b/fr_FR.ISO8859-1/books/handbook/desktop/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
The FreeBSD French Documentation Project
diff --git a/fr_FR.ISO8859-1/books/handbook/disks/chapter.xml b/fr_FR.ISO8859-1/books/handbook/disks/chapter.xml
index 5eb97a5822..f50d7ee16a 100755
--- a/fr_FR.ISO8859-1/books/handbook/disks/chapter.xml
+++ b/fr_FR.ISO8859-1/books/handbook/disks/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
The FreeBSD French Documentation Project
@@ -3151,7 +3151,7 @@ sa0(ncr1:4:0): Logical unit is in process of becoming ready</screen>
<title>Proc嶮ure de cr嶧tion d'une disquette
de d幦arrage</title>
- <programlisting><![ CDATA [#!/bin/sh
+ <programlisting><![CDATA[#!/bin/sh
#
# create a restore floppy
#
@@ -3197,7 +3197,7 @@ mkdir /mnt/var
#
if [ ! -x /sys/compile/MINI/kernel ]
then
- cat << EOM
+ cat &lt;&lt; EOM
The MINI kernel does not exist, please create one.
Here is an example config file:
#
@@ -3279,19 +3279,19 @@ cd /
#
# create minimum file system table
#
-cat > /mnt/etc/fstab <<EOM
+cat &lt; /mnt/etc/fstab &lt;&lt;EOM
/dev/fd0a / ufs rw 1 1
EOM
#
# create minimum passwd file
#
-cat > /mnt/etc/passwd <<EOM
-root:*:0:0:Charlie &:/root:/bin/sh
+cat &lt; /mnt/etc/passwd &lt;&lt;EOM
+root:*:0:0:Charlie &amp;:/root:/bin/sh
EOM
-cat > /mnt/etc/master.passwd <<EOM
-root::0:0::0:0:Charlie &:/root:/bin/sh
+cat &lt; /mnt/etc/master.passwd &lt;&lt;EOM
+root::0:0::0:0:Charlie &amp;:/root:/bin/sh
EOM
chmod 600 /mnt/etc/master.passwd
@@ -3376,17 +3376,6 @@ echo "The floppy has been unmounted and is now ready."]]></programlisting>
reproduire. Une heure de perdue maintenant peut vous
廧argner d'autres ennuis plus tard.</para>
</sect3>
-
-<![ %not.published; [
-
- <sect3>
- <title>* Je ne me suis pas pr廧ar au d廥astre,
- que faire?</title>
-
- <para></para>
- </sect3>
-]]>
-
</sect2>
</sect1>
diff --git a/fr_FR.ISO8859-1/books/handbook/eresources/chapter.xml b/fr_FR.ISO8859-1/books/handbook/eresources/chapter.xml
index a5bde54d41..cee2b1844c 100644
--- a/fr_FR.ISO8859-1/books/handbook/eresources/chapter.xml
+++ b/fr_FR.ISO8859-1/books/handbook/eresources/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
The FreeBSD French Documentation Project
@@ -787,7 +787,7 @@
Pour la plupart des listes, il y a d嶴&agrave; beaucoup de
souscripteurs communs, et mis &agrave; part les cas les plus
廥ot廨iques (par exemple
- &ldquo;-stable & -scsi&rdquo;), il n'y a pas vraiment de
+ &ldquo;-stable &amp; -scsi&rdquo;), il n'y a pas vraiment de
raison de poster sur plus d'une liste &agrave; la fois.
Si vous recevez un message o apparaissent sur la
ligne <literal>Cc</literal> plusieurs listes de diffusion,
diff --git a/fr_FR.ISO8859-1/books/handbook/firewalls/chapter.xml b/fr_FR.ISO8859-1/books/handbook/firewalls/chapter.xml
index cc942dde79..c98fc76040 100644
--- a/fr_FR.ISO8859-1/books/handbook/firewalls/chapter.xml
+++ b/fr_FR.ISO8859-1/books/handbook/firewalls/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
The FreeBSD French Documentation Project
diff --git a/fr_FR.ISO8859-1/books/handbook/geom/chapter.xml b/fr_FR.ISO8859-1/books/handbook/geom/chapter.xml
index a82fe8ce2a..a322c2a23a 100644
--- a/fr_FR.ISO8859-1/books/handbook/geom/chapter.xml
+++ b/fr_FR.ISO8859-1/books/handbook/geom/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
The FreeBSD French Documentation Project
diff --git a/fr_FR.ISO8859-1/books/handbook/install/chapter.xml b/fr_FR.ISO8859-1/books/handbook/install/chapter.xml
index 657ea32ddc..aa29c95f44 100644
--- a/fr_FR.ISO8859-1/books/handbook/install/chapter.xml
+++ b/fr_FR.ISO8859-1/books/handbook/install/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
The FreeBSD French Documentation Project
@@ -2562,7 +2562,7 @@ Mounting root from ufs:/dev/md0c
The ports collection is a very valuable resource and well worth having
on your /usr partition, so it is advisable to say Yes to this option.
- For more information on the ports collection & the latest ports,
+ For more information on the ports collection &amp; the latest ports,
visit:
http://www.FreeBSD.org/ports
diff --git a/fr_FR.ISO8859-1/books/handbook/introduction/chapter.xml b/fr_FR.ISO8859-1/books/handbook/introduction/chapter.xml
index c088d921a4..731a4740c8 100644
--- a/fr_FR.ISO8859-1/books/handbook/introduction/chapter.xml
+++ b/fr_FR.ISO8859-1/books/handbook/introduction/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
The FreeBSD French Documentation Project
diff --git a/fr_FR.ISO8859-1/books/handbook/jails/chapter.xml b/fr_FR.ISO8859-1/books/handbook/jails/chapter.xml
index 435cdfacbb..bb2af7c138 100644
--- a/fr_FR.ISO8859-1/books/handbook/jails/chapter.xml
+++ b/fr_FR.ISO8859-1/books/handbook/jails/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
The FreeBSD French Documentation Project
diff --git a/fr_FR.ISO8859-1/books/handbook/kernelconfig/chapter.xml b/fr_FR.ISO8859-1/books/handbook/kernelconfig/chapter.xml
index f5b6ce611f..d1ce15fee1 100755
--- a/fr_FR.ISO8859-1/books/handbook/kernelconfig/chapter.xml
+++ b/fr_FR.ISO8859-1/books/handbook/kernelconfig/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
The FreeBSD French Documentation Project
@@ -1371,7 +1371,7 @@ device fwe # Ethernet over FireWire (non-standard!)</programl
familles de microprocesseurs &pentium; Pro et
suivantes.</para>
- <para>L'extension de l'adressage physique&mdash,&ldquo;Physical
+ <para>L'extension de l'adressage physique&mdash;,&ldquo;Physical
Address Extension&rdquo; (<acronym>PAE</acronym>) est une
caract廨istique des microprocesseurs &intel; &pentium;
Pro et suivants autorisant les configurations m幦oires
diff --git a/fr_FR.ISO8859-1/books/handbook/l10n/chapter.xml b/fr_FR.ISO8859-1/books/handbook/l10n/chapter.xml
index 6d14310f94..075a004055 100644
--- a/fr_FR.ISO8859-1/books/handbook/l10n/chapter.xml
+++ b/fr_FR.ISO8859-1/books/handbook/l10n/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
The FreeBSD French Documentation Project
diff --git a/fr_FR.ISO8859-1/books/handbook/linuxemu/chapter.xml b/fr_FR.ISO8859-1/books/handbook/linuxemu/chapter.xml
index e57131cdde..d69586216a 100644
--- a/fr_FR.ISO8859-1/books/handbook/linuxemu/chapter.xml
+++ b/fr_FR.ISO8859-1/books/handbook/linuxemu/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
The FreeBSD French Documentation Project
@@ -736,14 +736,14 @@ LOG=/var/log/lmgrd.log
case "$1" in
start)
- lmgrd -c ${LICENSE_FILE} 2&gt;&gt; ${LOG} 1&gt;&2
+ lmgrd -c ${LICENSE_FILE} 2&gt;&gt; ${LOG} 1&gt;&amp;2
echo -n " lmgrd"
;;
stop)
- lmgrd -c ${LICENSE_FILE} -x lmdown 2&gt;&gt; ${LOG} 1&gt;&2
+ lmgrd -c ${LICENSE_FILE} -x lmdown 2&gt;&gt; ${LOG} 1&gt;&amp;2
;;
*)
- echo "Usage: `basename $0` {start|stop}" 1&gt;&2
+ echo "Usage: `basename $0` {start|stop}" 1&gt;&amp;2
exit 64
;;
esac
@@ -1061,7 +1061,7 @@ exit 0</programlisting>
ce qui suit:</para>
<programlisting>#!/usr/compat/linux/bin/sh
-(sleep 5; killall -1 matlab_helper) &
+(sleep 5; killall -1 matlab_helper) &amp;
exit 0</programlisting>
</step>
diff --git a/fr_FR.ISO8859-1/books/handbook/mac/chapter.xml b/fr_FR.ISO8859-1/books/handbook/mac/chapter.xml
index 95cc5ee3d7..fbe8daea67 100644
--- a/fr_FR.ISO8859-1/books/handbook/mac/chapter.xml
+++ b/fr_FR.ISO8859-1/books/handbook/mac/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
$FreeBSD$
diff --git a/fr_FR.ISO8859-1/books/handbook/mail/chapter.xml b/fr_FR.ISO8859-1/books/handbook/mail/chapter.xml
index 99feb4e4d0..1bba5dd2c0 100644
--- a/fr_FR.ISO8859-1/books/handbook/mail/chapter.xml
+++ b/fr_FR.ISO8859-1/books/handbook/mail/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
The FreeBSD French Documentation Project
@@ -2107,7 +2107,7 @@ sasl_pwcheck_program="/usr/local/sbin/pwcheck"</programlisting>
qui devra 皻re affich. Dans cet exemple, nous
lirons le premier courrier 幨ectronique:</para>
- <screen>& <userinput>t 1</userinput>
+ <screen>&prompt.user; <userinput>t 1</userinput>
Message 1:
From root@localhost Mon Mar 8 14:05:52 2004
X-Original-To: marcs@localhost
@@ -2141,7 +2141,7 @@ This is a test message, please reply if you receive it.</screen>
<keycap>.</keycap> sur une nouvelle ligne. Ci-dessous est
pr廥ent un exemple:</para>
- <screen>& <userinput>R 1</userinput>
+ <screen>&prompt.user; <userinput>R 1</userinput>
To: root@localhost
Subject: Re: test
@@ -2159,7 +2159,7 @@ EOT</screen>
d'un message doit 皻re indiqu嶪 en mettant un
<keycap>.</keycap> seul sur une nouvelle ligne.</para>
- <screen>& <userinput>mail root@localhost</userinput>
+ <screen>&prompt.user; <userinput>mail root@localhost</userinput>
Subject: <userinput>I mastered mail
Now I can send and receive email using mail ... :)
@@ -2628,7 +2628,7 @@ user "john", with password "XXXXX", is "myth" here;</programlisting>
<literal>goodmail@example2.com</literal>:</para>
<programlisting>:0
-* < 1000
+* &lt; 1000
! goodmail@example2.com</programlisting>
<para>Mettre tout le courrier &agrave; destination de
diff --git a/fr_FR.ISO8859-1/books/handbook/mirrors/chapter.xml b/fr_FR.ISO8859-1/books/handbook/mirrors/chapter.xml
index 2bcec5bbd0..e179c71c3b 100644
--- a/fr_FR.ISO8859-1/books/handbook/mirrors/chapter.xml
+++ b/fr_FR.ISO8859-1/books/handbook/mirrors/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
The FreeBSD French Documentation Project
diff --git a/fr_FR.ISO8859-1/books/handbook/multimedia/chapter.xml b/fr_FR.ISO8859-1/books/handbook/multimedia/chapter.xml
index 4155773d9e..9beeb7bdef 100644
--- a/fr_FR.ISO8859-1/books/handbook/multimedia/chapter.xml
+++ b/fr_FR.ISO8859-1/books/handbook/multimedia/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
The FreeBSD French Documentation Project
diff --git a/fr_FR.ISO8859-1/books/handbook/network-servers/chapter.xml b/fr_FR.ISO8859-1/books/handbook/network-servers/chapter.xml
index 1459610b9c..815669e5dd 100644
--- a/fr_FR.ISO8859-1/books/handbook/network-servers/chapter.xml
+++ b/fr_FR.ISO8859-1/books/handbook/network-servers/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
The FreeBSD French Documentation Project
diff --git a/fr_FR.ISO8859-1/books/handbook/pgpkeys/chapter.xml b/fr_FR.ISO8859-1/books/handbook/pgpkeys/chapter.xml
index f4f623adcf..29d9f64b50 100644
--- a/fr_FR.ISO8859-1/books/handbook/pgpkeys/chapter.xml
+++ b/fr_FR.ISO8859-1/books/handbook/pgpkeys/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
The FreeBSD French Documentation Project
diff --git a/fr_FR.ISO8859-1/books/handbook/ports/chapter.xml b/fr_FR.ISO8859-1/books/handbook/ports/chapter.xml
index 3626333f8c..8ede17b082 100644
--- a/fr_FR.ISO8859-1/books/handbook/ports/chapter.xml
+++ b/fr_FR.ISO8859-1/books/handbook/ports/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
The FreeBSD French Documentation Project
diff --git a/fr_FR.ISO8859-1/books/handbook/ppp-and-slip/chapter.xml b/fr_FR.ISO8859-1/books/handbook/ppp-and-slip/chapter.xml
index d8ef215988..a5f3ddaa3c 100644
--- a/fr_FR.ISO8859-1/books/handbook/ppp-and-slip/chapter.xml
+++ b/fr_FR.ISO8859-1/books/handbook/ppp-and-slip/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
The FreeBSD French Documentation Project
@@ -566,7 +566,7 @@ reinput 1 {\255}
if success goto slhup
reinput 1 {\127}
if success goto slhup
-if < \%x 60 goto look
+if &lt; \%x 60 goto look
else goto slhup
:sllogin ; ouverture de session
@@ -587,7 +587,7 @@ reinput 1 {\255}
if success goto slhup
reinput 1 {\127}
if success goto slhup
-if < \%x 10 goto slloop ; essayer 10 fois d'obtenir une invite de session
+if &lt; \%x 10 goto slloop ; essayer 10 fois d'obtenir une invite de session
else goto slhup ; raccrocher et recommencer apr鋊 10 嶰hecs
:sluid
diff --git a/fr_FR.ISO8859-1/books/handbook/preface/preface.xml b/fr_FR.ISO8859-1/books/handbook/preface/preface.xml
index ea04cf7aa8..707d2a2cf6 100644
--- a/fr_FR.ISO8859-1/books/handbook/preface/preface.xml
+++ b/fr_FR.ISO8859-1/books/handbook/preface/preface.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
The FreeBSD French Documentation Project
diff --git a/fr_FR.ISO8859-1/books/handbook/printing/chapter.xml b/fr_FR.ISO8859-1/books/handbook/printing/chapter.xml
index 5e08df4535..1cb089d513 100755
--- a/fr_FR.ISO8859-1/books/handbook/printing/chapter.xml
+++ b/fr_FR.ISO8859-1/books/handbook/printing/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
The FreeBSD French Documentation Project
diff --git a/fr_FR.ISO8859-1/books/handbook/security/chapter.xml b/fr_FR.ISO8859-1/books/handbook/security/chapter.xml
index 784ac56c29..55e0abff1b 100755
--- a/fr_FR.ISO8859-1/books/handbook/security/chapter.xml
+++ b/fr_FR.ISO8859-1/books/handbook/security/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
The FreeBSD French Documentation Project
@@ -2162,7 +2162,7 @@ options IPSEC_ESP #IP security (crypto; define w/IPSEC)</progr
<screen>
(1)
- Machine A ------> Machine B
+ Machine A ------&gt; Machine B
(1)PROTO=AH
ALG=MD5(RFC1826)
@@ -2170,8 +2170,8 @@ options IPSEC_ESP #IP security (crypto; define w/IPSEC)</progr
SPI=1000
(2.1)
- Machine A <------ Machine B
- <------
+ Machine A &lt;------ Machine B
+ &lt;------
(2.2)
(2.1)
@@ -2224,10 +2224,10 @@ C矌 B:
Machine A --------------------------> Machine E
10.2.3.4 10.6.7.8
| |
- ========= ancien AH keyed-md5 ========>
+ ========= ancien AH keyed-md5 ========&gt;
- <======== nouveau AH hmac-sha1 ========
- <======== nouveau ESP des-cbc =========
+ &lt;======== nouveau AH hmac-sha1 ========
+ &lt;======== nouveau ESP des-cbc =========
</screen>
</sect2>
diff --git a/fr_FR.ISO8859-1/books/handbook/serialcomms/chapter.xml b/fr_FR.ISO8859-1/books/handbook/serialcomms/chapter.xml
index d4e4fd8974..0a659096ed 100644
--- a/fr_FR.ISO8859-1/books/handbook/serialcomms/chapter.xml
+++ b/fr_FR.ISO8859-1/books/handbook/serialcomms/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
The FreeBSD French Documentation Project
diff --git a/fr_FR.ISO8859-1/books/handbook/users/chapter.xml b/fr_FR.ISO8859-1/books/handbook/users/chapter.xml
index 413638d912..83bc588601 100644
--- a/fr_FR.ISO8859-1/books/handbook/users/chapter.xml
+++ b/fr_FR.ISO8859-1/books/handbook/users/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
The FreeBSD French Documentation Project
diff --git a/fr_FR.ISO8859-1/books/handbook/vinum/chapter.xml b/fr_FR.ISO8859-1/books/handbook/vinum/chapter.xml
index 06df24be69..d3e6bc9bdf 100644
--- a/fr_FR.ISO8859-1/books/handbook/vinum/chapter.xml
+++ b/fr_FR.ISO8859-1/books/handbook/vinum/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The Vinum Volume Manager
Par Greg Lehey (grog at lemis dot com)
diff --git a/fr_FR.ISO8859-1/books/handbook/virtualization/chapter.xml b/fr_FR.ISO8859-1/books/handbook/virtualization/chapter.xml
index e5682a6873..bf11412fcb 100644
--- a/fr_FR.ISO8859-1/books/handbook/virtualization/chapter.xml
+++ b/fr_FR.ISO8859-1/books/handbook/virtualization/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
The FreeBSD French Documentation Project
diff --git a/fr_FR.ISO8859-1/books/handbook/x11/chapter.xml b/fr_FR.ISO8859-1/books/handbook/x11/chapter.xml
index 710c3e7781..c504fae19b 100644
--- a/fr_FR.ISO8859-1/books/handbook/x11/chapter.xml
+++ b/fr_FR.ISO8859-1/books/handbook/x11/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
The FreeBSD French Documentation Project
@@ -112,7 +112,7 @@
juste la lettre suivante dans l'alphabet romain.</para>
<para>X peut 皻re appel &ldquo;X&rdquo;,
- &ldquo;Syst鋗e X Window&rdquo;, <quote>X11&</quote>, et sous d'autres
+ &ldquo;Syst鋗e X Window&rdquo;, <quote>X11</quote>, et sous d'autres
noms. Il se peut que vous puissiez trouver que nommer
X11 <quote>X Windows</quote> peut 皻re offensant pour
certaines personnes; consultez &man.X.7; pour un peu plus
@@ -364,7 +364,7 @@
l'impl幦entation open source du syst鋗e X Window
publi嶪 par la fondation X.Org.
<application>&xorg;</application> est bas嶪 sur le code
- de <application>&xfree86&nbsp;4.4RC2</application> et d'X11R6.6.
+ de <application>&xfree86;&nbsp;4.4RC2</application> et d'X11R6.6.
la version d'<application>&xorg;</application> actuellement disponible dans le catalogue des logiciels
port廥 de &os; est la &xorg.version;.</para>
diff --git a/fr_FR.ISO8859-1/books/porters-handbook/book.xml b/fr_FR.ISO8859-1/books/porters-handbook/book.xml
index 577af96668..d239aba36a 100644
--- a/fr_FR.ISO8859-1/books/porters-handbook/book.xml
+++ b/fr_FR.ISO8859-1/books/porters-handbook/book.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//FR" "../../share/xml/entities.ent">
-%entities;
-]>
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<!--
The FreeBSD Documentation Project
diff --git a/fr_FR.ISO8859-1/share/xml/abstract.ent b/fr_FR.ISO8859-1/share/xml/abstract.ent
index a4e8a1e907..2d75349f46 100644
--- a/fr_FR.ISO8859-1/share/xml/abstract.ent
+++ b/fr_FR.ISO8859-1/share/xml/abstract.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
The FreeBSD French Documentation Project
diff --git a/fr_FR.ISO8859-1/share/xml/artheader.ent b/fr_FR.ISO8859-1/share/xml/artheader.ent
index 76c9b9f728..36d17523ae 100644
--- a/fr_FR.ISO8859-1/share/xml/artheader.ent
+++ b/fr_FR.ISO8859-1/share/xml/artheader.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
The FreeBSD French Documentation Project
diff --git a/fr_FR.ISO8859-1/share/xml/catalog b/fr_FR.ISO8859-1/share/xml/catalog
deleted file mode 100644
index fb22c6654c..0000000000
--- a/fr_FR.ISO8859-1/share/xml/catalog
+++ /dev/null
@@ -1,59 +0,0 @@
- -- ...................................................................... --
- -- FreeBSD SGML Public Identifiers ...................................... --
-
- -- ...................................................................... --
- -- French specific ...................................................... --
-
- -- $FreeBSD$
- --
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//FR"
- "entities.ent"
-
-PUBLIC "-//FreeBSD//DOCUMENT DocBook Stylesheet//EN"
- "freebsd.dsl"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook Language Specific Entities//EN"
- "l10n.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//FR"
- "mailing-lists.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook Newsgroup Entities//FR"
- "newsgroups.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook Team Entities//FR"
- "teams.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook URL Entities//FR"
- "urls.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook Translator Entities//FR"
- "translators.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook Abstract Entities//FR"
- "abstract.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook ArtHeader Entities//FR"
- "artheader.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//FR"
- "trademarks.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook Glossary Entities//FR"
- "glossary.ent"
-
- -- ...................................................................... --
- -- HTML docs ............................................................ --
-
-PUBLIC "-//FreeBSD//ENTITIES FreeBSD L10N Entities//EN"
- "l10n.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES FreeBSD Release L10N Entities//EN"
- "release.l10n.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES HTML FreeBSD Header L10N Entities//EN"
- "header.l10n.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES HTML FreeBSD Navigation Bar L10N Entities//EN"
- "navibar.l10n.ent"
diff --git a/fr_FR.ISO8859-1/share/xml/catalog.xml b/fr_FR.ISO8859-1/share/xml/catalog.xml
index 3553c62fbc..0b06d43c89 100644
--- a/fr_FR.ISO8859-1/share/xml/catalog.xml
+++ b/fr_FR.ISO8859-1/share/xml/catalog.xml
@@ -10,6 +10,9 @@
<rewriteURI uriStartString="http://www.FreeBSD.org/XML/www/lang/"
rewritePrefix="../../"/>
+ <public
+ publicId="-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN"
+ uri="entities.ent" />
<public publicId="-//FreeBSD//ENTITIES FreeBSD L10N Entities//EN"
uri="l10n.ent" />
<public
diff --git a/fr_FR.ISO8859-1/share/xml/entities.ent b/fr_FR.ISO8859-1/share/xml/entities.ent
index 90b26890c8..fd5cf3bbea 100644
--- a/fr_FR.ISO8859-1/share/xml/entities.ent
+++ b/fr_FR.ISO8859-1/share/xml/entities.ent
@@ -2,35 +2,44 @@
Original revision: 1.2
-->
-<!ENTITY % l10n PUBLIC "-//FreeBSD//ENTITIES DocBook Language Specific Entities//EN">
+<!ENTITY % l10n PUBLIC "-//FreeBSD//ENTITIES DocBook Language Specific Entities//EN"
+ "l10n.ent">
%l10n;
-<!ENTITY % l10n-common PUBLIC "-//FreeBSD//ENTITIES DocBook Language Neutral Entities//EN">
-%l10n-common;
-<!ENTITY % translators PUBLIC "-//FreeBSD//ENTITIES DocBook Translator Entities//FR">
+<!ENTITY % translators PUBLIC "-//FreeBSD//ENTITIES DocBook Translator Entities//FR"
+ "translators.ent">
%translators;
-<!ENTITY % mailing-lists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//FR">
+<!ENTITY % mailing-lists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//FR"
+ "mailing-lists.ent">
%mailing-lists;
-<!ENTITY % teams PUBLIC "-//FreeBSD//ENTITIES DocBook Team Entities//FR">
+<!ENTITY % teams PUBLIC "-//FreeBSD//ENTITIES DocBook Team Entities//FR"
+ "teams.ent">
%teams;
-<!ENTITY % newsgroups PUBLIC "-//FreeBSD//ENTITIES DocBook Newsgroup Entities//FR">
+<!ENTITY % newsgroups PUBLIC "-//FreeBSD//ENTITIES DocBook Newsgroup Entities//FR"
+ "newsgroups.ent">
%newsgroups;
-<!ENTITY % man PUBLIC "-//FreeBSD//ENTITIES DocBook Manual Page Entities//EN">
-%man;
-<!ENTITY % freebsd PUBLIC "-//FreeBSD//ENTITIES DocBook Miscellaneous FreeBSD Entities//EN">
+<!ENTITY % freebsd PUBLIC "-//FreeBSD//ENTITIES DocBook Miscellaneous FreeBSD Entities//EN"
+ "nonexistent">
%freebsd;
-<!ENTITY % authors PUBLIC "-//FreeBSD//ENTITIES DocBook Author Entities//EN">
-%authors;
-<!ENTITY % glossary PUBLIC "-//FreeBSD//ENTITIES DocBook Glossary Entities//FR">
+<!ENTITY % glossary PUBLIC "-//FreeBSD//ENTITIES DocBook Glossary Entities//FR"
+ "glossary.ent">
%glossary;
<!--
-<!ENTITY % teams PUBLIC "-//FreeBSD//ENTITIES DocBook Team Entities//EN">
+<!ENTITY % teams PUBLIC "-//FreeBSD//ENTITIES DocBook Team Entities//EN"
+ "nonexistent">
%teams;
-<!ENTITY % mailing-lists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//EN">
+<!ENTITY % mailing-lists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//EN"
+ "nonexistent">
%mailing-lists;
-<!ENTITY % newsgroups PUBLIC "-//FreeBSD//ENTITIES DocBook Newsgroup Entities//EN">
+<!ENTITY % newsgroups PUBLIC "-//FreeBSD//ENTITIES DocBook Newsgroup Entities//EN"
+ "nonexistent">
%newsgroups;
-->
-<!ENTITY % trademarks PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//EN">
+<!ENTITY % trademarks PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//EN"
+ "nonexistent">
%trademarks;
-<!ENTITY % urls PUBLIC "-//FreeBSD//ENTITIES DocBook URL Entities//EN">
+<!ENTITY % urls PUBLIC "-//FreeBSD//ENTITIES DocBook URL Entities//FR"
+ "urls.ent">
%urls;
+<!ENTITY % urls-en PUBLIC "-//FreeBSD//ENTITIES DocBook URL Entities//EN"
+ "nonexistent">
+%urls-en;
diff --git a/fr_FR.ISO8859-1/share/xml/mailing-lists.ent b/fr_FR.ISO8859-1/share/xml/mailing-lists.ent
index 6d1ba10546..14c5772c09 100644
--- a/fr_FR.ISO8859-1/share/xml/mailing-lists.ent
+++ b/fr_FR.ISO8859-1/share/xml/mailing-lists.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
The FreeBSD French Documentation Project
diff --git a/fr_FR.ISO8859-1/share/xml/mirrors-local.xsl b/fr_FR.ISO8859-1/share/xml/mirrors-local.xsl
index d95a126a65..afcc035684 100644
--- a/fr_FR.ISO8859-1/share/xml/mirrors-local.xsl
+++ b/fr_FR.ISO8859-1/share/xml/mirrors-local.xsl
@@ -14,7 +14,6 @@
<xsl:import href="../../../share/xml/mirrors-master.xsl" />
<xsl:output type="xml" encoding="iso-8859-1"
- omit-xml-declaration="yes"
indent="yes"/>
<!-- template: "mirrors-docbook-contact" -->
diff --git a/fr_FR.ISO8859-1/share/xml/newsgroups.ent b/fr_FR.ISO8859-1/share/xml/newsgroups.ent
index 7cdc47e2dc..b336f9f126 100644
--- a/fr_FR.ISO8859-1/share/xml/newsgroups.ent
+++ b/fr_FR.ISO8859-1/share/xml/newsgroups.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
The FreeBSD French Documentation Project
diff --git a/fr_FR.ISO8859-1/share/xml/teams.ent b/fr_FR.ISO8859-1/share/xml/teams.ent
index 184cb8e2fe..f4db86c00d 100644
--- a/fr_FR.ISO8859-1/share/xml/teams.ent
+++ b/fr_FR.ISO8859-1/share/xml/teams.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
The FreeBSD French Documentation Project
diff --git a/fr_FR.ISO8859-1/share/xml/trademarks.ent b/fr_FR.ISO8859-1/share/xml/trademarks.ent
index 24f72ae816..4616c292ab 100644
--- a/fr_FR.ISO8859-1/share/xml/trademarks.ent
+++ b/fr_FR.ISO8859-1/share/xml/trademarks.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
The FreeBSD French Documentation Project
diff --git a/fr_FR.ISO8859-1/share/xml/translators.ent b/fr_FR.ISO8859-1/share/xml/translators.ent
index 24f4a06bad..e65790ce54 100644
--- a/fr_FR.ISO8859-1/share/xml/translators.ent
+++ b/fr_FR.ISO8859-1/share/xml/translators.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
The FreeBSD French Documentation Project
diff --git a/fr_FR.ISO8859-1/share/xml/urls.ent b/fr_FR.ISO8859-1/share/xml/urls.ent
index 6bcbdf8d31..2ebd4513b2 100644
--- a/fr_FR.ISO8859-1/share/xml/urls.ent
+++ b/fr_FR.ISO8859-1/share/xml/urls.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
The FreeBSD French Documentation Project
diff --git a/hu_HU.ISO8859-2/articles/compiz-fusion/Makefile b/hu_HU.ISO8859-2/articles/compiz-fusion/Makefile
index 1a841fa1fe..156f6d70b8 100644
--- a/hu_HU.ISO8859-2/articles/compiz-fusion/Makefile
+++ b/hu_HU.ISO8859-2/articles/compiz-fusion/Makefile
@@ -7,8 +7,6 @@
# %SRCID% 1.1
#
-NO_TIDY = yes
-
MAINTAINER = doc@FreeBSD.org
DOC?= article
diff --git a/hu_HU.ISO8859-2/articles/compiz-fusion/article.xml b/hu_HU.ISO8859-2/articles/compiz-fusion/article.xml
index a090177e9e..d3fb1c2c2d 100644
--- a/hu_HU.ISO8859-2/articles/compiz-fusion/article.xml
+++ b/hu_HU.ISO8859-2/articles/compiz-fusion/article.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-2" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//HU" "../../share/xml/entities.ent">
-%entities;
-]>
+<?xml version="1.0" encoding="iso-8859-2"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<!-- $FreeBSD$ -->
diff --git a/hu_HU.ISO8859-2/articles/cups/Makefile b/hu_HU.ISO8859-2/articles/cups/Makefile
index ae7697c49b..5c1c095cbe 100644
--- a/hu_HU.ISO8859-2/articles/cups/Makefile
+++ b/hu_HU.ISO8859-2/articles/cups/Makefile
@@ -7,8 +7,6 @@
# %SRCID% 1.2
#
-NO_TIDY= yes
-
MAINTAINER= doc@FreeBSD.org
DOC?= article
diff --git a/hu_HU.ISO8859-2/articles/cups/article.xml b/hu_HU.ISO8859-2/articles/cups/article.xml
index 59f349006d..acf35d5b9f 100644
--- a/hu_HU.ISO8859-2/articles/cups/article.xml
+++ b/hu_HU.ISO8859-2/articles/cups/article.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-2" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//HU" "../../share/xml/entities.ent">
-%entities;
-]>
+<?xml version="1.0" encoding="iso-8859-2"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<!-- The FreeBSD Hungarian Documentation Project
Translated by: PALI, Gabor <pgj@FreeBSD.org>
diff --git a/hu_HU.ISO8859-2/articles/explaining-bsd/Makefile b/hu_HU.ISO8859-2/articles/explaining-bsd/Makefile
index 6c7d521e6a..3d3f3220ed 100644
--- a/hu_HU.ISO8859-2/articles/explaining-bsd/Makefile
+++ b/hu_HU.ISO8859-2/articles/explaining-bsd/Makefile
@@ -6,12 +6,6 @@
# %SRCID% 1.6
#
-#
-# Tidy messes up iso-8859-2 characters
-#
-
-NO_TIDY= yes
-
MAINTAINER= gabor@FreeBSD.org
DOC?= article
diff --git a/hu_HU.ISO8859-2/articles/explaining-bsd/article.xml b/hu_HU.ISO8859-2/articles/explaining-bsd/article.xml
index bb27cddb99..00332db692 100644
--- a/hu_HU.ISO8859-2/articles/explaining-bsd/article.xml
+++ b/hu_HU.ISO8859-2/articles/explaining-bsd/article.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-2" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//HU" "../../share/xml/entities.ent">
-%entities;
-]>
+<?xml version="1.0" encoding="iso-8859-2"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<!-- $FreeBSD$ -->
diff --git a/hu_HU.ISO8859-2/articles/gjournal-desktop/Makefile b/hu_HU.ISO8859-2/articles/gjournal-desktop/Makefile
index f397ca0ebf..a1ea94ceb9 100644
--- a/hu_HU.ISO8859-2/articles/gjournal-desktop/Makefile
+++ b/hu_HU.ISO8859-2/articles/gjournal-desktop/Makefile
@@ -7,8 +7,6 @@
# %SRCID% 1.1
#
-NO_TIDY= yes
-
MAINTAINER= doc@FreeBSD.org
DOC?= article
diff --git a/hu_HU.ISO8859-2/articles/gjournal-desktop/article.xml b/hu_HU.ISO8859-2/articles/gjournal-desktop/article.xml
index 5407cf2524..8b12a19ddb 100644
--- a/hu_HU.ISO8859-2/articles/gjournal-desktop/article.xml
+++ b/hu_HU.ISO8859-2/articles/gjournal-desktop/article.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-2" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//HU" "../../share/xml/entities.ent">
-%entities;
-]>
+<?xml version="1.0" encoding="iso-8859-2"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<!-- $FreeBSD$ -->
diff --git a/hu_HU.ISO8859-2/articles/laptop/Makefile b/hu_HU.ISO8859-2/articles/laptop/Makefile
index d150d68778..f11d6e7e59 100644
--- a/hu_HU.ISO8859-2/articles/laptop/Makefile
+++ b/hu_HU.ISO8859-2/articles/laptop/Makefile
@@ -6,12 +6,6 @@
# %SRCID% 1.4
#
-#
-# Tidy messes up iso-8859-2 characters
-#
-
-NO_TIDY= yes
-
MAINTAINER= doc@FreeBSD.org
DOC?= article
diff --git a/hu_HU.ISO8859-2/articles/laptop/article.xml b/hu_HU.ISO8859-2/articles/laptop/article.xml
index 5b1268299e..b8b046fa3a 100644
--- a/hu_HU.ISO8859-2/articles/laptop/article.xml
+++ b/hu_HU.ISO8859-2/articles/laptop/article.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-2" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//HU" "../../share/xml/entities.ent">
-%entities;
-]>
+<?xml version="1.0" encoding="iso-8859-2"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<!-- The FreeBSD Hungarian Documentation Project
Translated by: PALI, Gabor <pgj@FreeBSD.org>
diff --git a/hu_HU.ISO8859-2/articles/linux-comparison/Makefile b/hu_HU.ISO8859-2/articles/linux-comparison/Makefile
index 7e5040c4dd..ec5b75a2cd 100644
--- a/hu_HU.ISO8859-2/articles/linux-comparison/Makefile
+++ b/hu_HU.ISO8859-2/articles/linux-comparison/Makefile
@@ -6,12 +6,6 @@
# %SRCID% 1.1
#
-#
-# Tidy messes up iso-8859-2 characters
-#
-
-NO_TIDY= yes
-
MAINTAINER= gabor@FreeBSD.org
DOC?= article
diff --git a/hu_HU.ISO8859-2/articles/linux-comparison/article.xml b/hu_HU.ISO8859-2/articles/linux-comparison/article.xml
index 7af790b2ec..1f4c4645d6 100644
--- a/hu_HU.ISO8859-2/articles/linux-comparison/article.xml
+++ b/hu_HU.ISO8859-2/articles/linux-comparison/article.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-2" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//HU" "../../share/xml/entities.ent">
-%entities;
-]>
+<?xml version="1.0" encoding="iso-8859-2"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<!--
Copyright (c) 2005 Dru Lavigne
diff --git a/hu_HU.ISO8859-2/articles/linux-users/Makefile b/hu_HU.ISO8859-2/articles/linux-users/Makefile
index 61647af74b..e258717fb9 100644
--- a/hu_HU.ISO8859-2/articles/linux-users/Makefile
+++ b/hu_HU.ISO8859-2/articles/linux-users/Makefile
@@ -7,12 +7,6 @@
# %SRCID% 1.1
#
-#
-# Tidy messes up iso-8859-2 characters
-#
-
-NO_TIDY = yes
-
MAINTAINER = doc@FreeBSD.org
DOC?= article
diff --git a/hu_HU.ISO8859-2/articles/linux-users/article.xml b/hu_HU.ISO8859-2/articles/linux-users/article.xml
index 0e54a29591..67ec405b2c 100644
--- a/hu_HU.ISO8859-2/articles/linux-users/article.xml
+++ b/hu_HU.ISO8859-2/articles/linux-users/article.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-2" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//HU" "../../share/xml/entities.ent">
-%entities;
-]>
+<?xml version="1.0" encoding="iso-8859-2"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<!-- $FreeBSD$ -->
diff --git a/hu_HU.ISO8859-2/books/faq/Makefile b/hu_HU.ISO8859-2/books/faq/Makefile
index ee9666705e..5b5a6838be 100644
--- a/hu_HU.ISO8859-2/books/faq/Makefile
+++ b/hu_HU.ISO8859-2/books/faq/Makefile
@@ -8,8 +8,6 @@
MAINTAINER=doc@FreeBSD.org
-NO_TIDY = yes
-
DOC?= book
FORMATS?= html-split html
diff --git a/hu_HU.ISO8859-2/books/faq/book.xml b/hu_HU.ISO8859-2/books/faq/book.xml
index 5d8fb7e0cf..6187090e35 100644
--- a/hu_HU.ISO8859-2/books/faq/book.xml
+++ b/hu_HU.ISO8859-2/books/faq/book.xml
@@ -1,8 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-2" standalone="no"?>
-<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//HU" "../../share/xml/entities.ent">
-%entities;
+<?xml version="1.0" encoding="iso-8859-2"?>
+<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd" [
<!ENTITY enbase "http://www.FreeBSD.org">
<!ENTITY bibliography SYSTEM "../../share/xml/bibliography.xml">
<!ENTITY url.base.hu "&enbase;/hu">
diff --git a/hu_HU.ISO8859-2/books/fdp-primer/Makefile b/hu_HU.ISO8859-2/books/fdp-primer/Makefile
index 760d0fc5c8..1e071055f9 100644
--- a/hu_HU.ISO8859-2/books/fdp-primer/Makefile
+++ b/hu_HU.ISO8859-2/books/fdp-primer/Makefile
@@ -7,8 +7,6 @@
# Build the FreeBSD Documentation Project Primer.
#
-NO_TIDY=yes
-
MAINTAINER=doc@FreeBSD.org
DOC?= book
diff --git a/hu_HU.ISO8859-2/books/fdp-primer/book.xml b/hu_HU.ISO8859-2/books/fdp-primer/book.xml
index 8ee2b33599..2a729e7d53 100644
--- a/hu_HU.ISO8859-2/books/fdp-primer/book.xml
+++ b/hu_HU.ISO8859-2/books/fdp-primer/book.xml
@@ -1,8 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-2" standalone="no"?>
-<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//HU" "../../share/xml/entities.ent">
-%entities;
+<?xml version="1.0" encoding="iso-8859-2"?>
+<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd" [
<!ENTITY % chapters SYSTEM "chapters.ent"> %chapters;
]>
diff --git a/hu_HU.ISO8859-2/books/fdp-primer/sgml-primer/chapter.xml b/hu_HU.ISO8859-2/books/fdp-primer/sgml-primer/chapter.xml
index 4e29f4e028..763f5100b4 100644
--- a/hu_HU.ISO8859-2/books/fdp-primer/sgml-primer/chapter.xml
+++ b/hu_HU.ISO8859-2/books/fdp-primer/sgml-primer/chapter.xml
@@ -1166,31 +1166,6 @@ onsgmls:pr鏏a.xml:6:8:E: end tag for "HEAD" which is not finished</screen>
--]]> t鐽bsoros megjegyz廥ek 甏嫳嫕ak <![CDATA[-->]]></programlisting>
</example>
- <![%output.print;[
- <important>
- <title>A k彋 k飆鰋el haszn嫮ata</title>
-
- <para>A Postscript 廥 PDF v嫮tozatok eset幯
- kisebb probl幦嫜 jelentkeznek enn幨 a
- p幨d嫕嫮, ugyanis bennk csak egyetlen
- k飆鰋el fog l嫢szani a <literal>&lt;!</literal>
- 廥 <literal>&gt;</literal> szimb鏊umok
- mellett.</para>
-
- <para>A forr嫳k鏚ban azonban k彋
- <literal>-</literal> (k飆鰋el) szimb鏊umot
- <emphasis>kell</emphasis> haszn嫮nunk,
- <emphasis>nem</emphasis> pedig egyet. A Postscript 廥
- PDF v嫮tozatokban az eredetileg k彋
- k飆鰋elet 飉szevonj嫜 egyetlen hosszabb
- k飆鰋ell, ez嫮tal elrontj嫜 az
- im幯ti p幨d嫢.</para>
-
- <para>A dokumentum HTML, sz饘eges 廥 RTF
- v嫮tozatait ez nem 廨inti.</para>
- </important>
- ]]>
-
<para>Ha dolgoztunk m嫫 kor墎ban HTML k鏚dal,
akkor el髆ordulhat, hogy m嫳 meghat嫫oz嫳t
l嫢tunk a megjegyz廥ekre. Ez廨t
@@ -1814,7 +1789,7 @@ onsgmls:pr鏏a.xml:6:8:E: end tag for "HEAD" which is not finished</screen>
<para>A kor墎biakban tapasztaltak szerint
term廥zetesen a jel闤t szakaszokat az SGML
- r廥zek幯t a <literal>&lt!</literal>
+ r廥zek幯t a <literal>&lt;!</literal>
szimb鏊ummal vezetjk be.</para>
<para>Ezt k饘et髊n az els sz鐷letes
diff --git a/hu_HU.ISO8859-2/books/handbook/Makefile b/hu_HU.ISO8859-2/books/handbook/Makefile
index 00a705f322..5096c38eb2 100644
--- a/hu_HU.ISO8859-2/books/handbook/Makefile
+++ b/hu_HU.ISO8859-2/books/handbook/Makefile
@@ -38,12 +38,6 @@
.PATH: ${.CURDIR}/../../share/xml/glossary
-#
-# Tidy messes up iso-8859-2 characters
-#
-
-NO_TIDY= yes
-
MAINTAINER= doc@FreeBSD.org
DOC?= book
@@ -280,30 +274,43 @@ DOC_PREFIX?= ${.CURDIR}/../../..
#
# rules generating lists of mirror site from XML database.
#
-XMLDOCS= mirrors-ftp:::mirrors.xml.ftp.inc \
+XMLDOCS= lastmod:::mirrors.lastmod.inc \
+ mirrors-ftp-index:::mirrors.xml.ftp.index.inc \
+ mirrors-ftp:::mirrors.xml.ftp.inc \
+ mirrors-cvsup-index:::mirrors.xml.cvsup.index.inc \
mirrors-cvsup:::mirrors.xml.cvsup.inc \
+ eresources-index:::eresources.xml.www.index.inc \
eresources:::eresources.xml.www.inc
DEPENDSET.DEFAULT= transtable mirror
XSLT.DEFAULT= ${XSL_MIRRORS}
XML.DEFAULT= ${XML_MIRRORS}
-NO_TIDY.DEFAULT= yes
+PARAMS.lastmod+= --param 'target' "'lastmod'"
+PARAMS.mirrors-ftp-index+= --param 'type' "'ftp'" \
+ --param 'proto' "'ftp'" \
+ --param 'target' "'index'"
PARAMS.mirrors-ftp+= --param 'type' "'ftp'" \
--param 'proto' "'ftp'" \
--param 'target' "'handbook/mirrors/chapter.xml'"
+PARAMS.mirrors-cvsup-index+= --param 'type' "'cvsup'" \
+ --param 'proto' "'cvsup'" \
+ --param 'target' "'index'"
PARAMS.mirrors-cvsup+= --param 'type' "'cvsup'" \
--param 'proto' "'cvsup'" \
--param 'target' "'handbook/mirrors/chapter.xml'"
+PARAMS.eresources-index+= --param 'type' "'www'" \
+ --param 'proto' "'http'" \
+ --param 'target' "'index'"
PARAMS.eresources+= --param 'type' "'www'" \
--param 'proto' "'http'" \
--param 'target' "'handbook/eresources/chapter.xml'"
-SRCS+= mirrors.xml.ftp.inc \
- mirrors.xml.cvsup.inc \
- eresources.xml.www.inc
-
-CLEANFILES+= mirrors.xml.ftp.inc \
+SRCS+= mirrors.lastmod.inc \
+ mirrors.xml.ftp.inc \
+ mirrors.xml.ftp.index.inc \
mirrors.xml.cvsup.inc \
- eresources.xml.www.inc
+ mirrors.xml.cvsup.index.inc \
+ eresources.xml.www.inc \
+ eresources.xml.www.index.inc
.include "${DOC_PREFIX}/share/mk/doc.project.mk"
diff --git a/hu_HU.ISO8859-2/books/handbook/advanced-networking/chapter.xml b/hu_HU.ISO8859-2/books/handbook/advanced-networking/chapter.xml
index 7d236f68a6..c4beaade54 100644
--- a/hu_HU.ISO8859-2/books/handbook/advanced-networking/chapter.xml
+++ b/hu_HU.ISO8859-2/books/handbook/advanced-networking/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-2" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-2"?>
<!--
The FreeBSD Documentation Project
@@ -2823,7 +2823,7 @@ wpa_pairwise=CCMP TKIP <co id="co-ap-wpapsk-pwise"/></programlisting>
<application>hostapd</application>
elind癃嫳a:</para>
- <screen>&prompt.root <userinput>/etc/rc.d/hostapd forcestart</userinput></screen>
+ <screen>&prompt.root; <userinput>/etc/rc.d/hostapd forcestart</userinput></screen>
<screen>&prompt.root; <userinput>ifconfig <replaceable>wlan0</replaceable></userinput>
wlan0: flags=8843&lt;UP,BROADCAST,RUNNING,SIMPLEX,MULTICAST&gt; mtu 2290
@@ -8102,7 +8102,7 @@ ifconfig_carp1="vhid 2 advskew 100 pass testpass 192.168.1.51/24"</programlistin
k饘etkez parancsot kell kiadnia a
<hostid>szolgaltato.minta.org</hostid> g廧en:</para>
- <screen>&prompt.root; <userinput>ifconfig carp0 down && ifconfig carp0 up</userinput></screen>
+ <screen>&prompt.root; <userinput>ifconfig carp0 down &amp;&amp; ifconfig carp0 up</userinput></screen>
<para>Ezt az adott g廧hez tartoz
<devicename>carp</devicename> fellettel kell
diff --git a/hu_HU.ISO8859-2/books/handbook/audit/chapter.xml b/hu_HU.ISO8859-2/books/handbook/audit/chapter.xml
index a6ee4e1726..144e36ad2b 100644
--- a/hu_HU.ISO8859-2/books/handbook/audit/chapter.xml
+++ b/hu_HU.ISO8859-2/books/handbook/audit/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-2" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-2"?>
<!--
The FreeBSD Documentation Project
$FreeBSD$
diff --git a/hu_HU.ISO8859-2/books/handbook/basics/chapter.xml b/hu_HU.ISO8859-2/books/handbook/basics/chapter.xml
index cae9986ffd..2d0498e19c 100644
--- a/hu_HU.ISO8859-2/books/handbook/basics/chapter.xml
+++ b/hu_HU.ISO8859-2/books/handbook/basics/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-2" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-2"?>
<!--
The FreeBSD Documentation Project
diff --git a/hu_HU.ISO8859-2/books/handbook/bibliography/chapter.xml b/hu_HU.ISO8859-2/books/handbook/bibliography/chapter.xml
index 95c00eb831..2fb59e89c3 100644
--- a/hu_HU.ISO8859-2/books/handbook/bibliography/chapter.xml
+++ b/hu_HU.ISO8859-2/books/handbook/bibliography/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-2" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-2"?>
<!--
The FreeBSD Documentation Project
$FreeBSD$
diff --git a/hu_HU.ISO8859-2/books/handbook/book.xml b/hu_HU.ISO8859-2/books/handbook/book.xml
index 6528435392..4f2a5509fb 100644
--- a/hu_HU.ISO8859-2/books/handbook/book.xml
+++ b/hu_HU.ISO8859-2/books/handbook/book.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-2" standalone="no"?>
-<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//HU" "../../share/xml/entities.ent">
-%entities;
-
+<?xml version="1.0" encoding="iso-8859-2"?>
+<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd" [
<!ENTITY % chapters SYSTEM "chapters.ent">
%chapters;
<!ENTITY % txtfiles SYSTEM "txtfiles.ent">
diff --git a/hu_HU.ISO8859-2/books/handbook/boot/chapter.xml b/hu_HU.ISO8859-2/books/handbook/boot/chapter.xml
index 8abc84d77d..4641eb9718 100644
--- a/hu_HU.ISO8859-2/books/handbook/boot/chapter.xml
+++ b/hu_HU.ISO8859-2/books/handbook/boot/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-2" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-2"?>
<!--
The FreeBSD Documentation Project
diff --git a/hu_HU.ISO8859-2/books/handbook/chapters.ent b/hu_HU.ISO8859-2/books/handbook/chapters.ent
index 8eaef370e2..fb50794c97 100644
--- a/hu_HU.ISO8859-2/books/handbook/chapters.ent
+++ b/hu_HU.ISO8859-2/books/handbook/chapters.ent
@@ -15,231 +15,61 @@
%SRCID% 1.39
-->
-<!ENTITY % not.published "INCLUDE">
-
-<!ENTITY % chap.introduction "IGNORE">
-<!ENTITY % chap.install "IGNORE">
-<!ENTITY % chap.basics "IGNORE">
-<!ENTITY % chap.ports "IGNORE">
-<!ENTITY % chap.config "IGNORE">
-<!ENTITY % chap.boot "IGNORE">
-<!ENTITY % chap.users "IGNORE">
-<!ENTITY % chap.kernelconfig "IGNORE">
-<!ENTITY % chap.security "IGNORE">
-<!ENTITY % chap.jails "IGNORE">
-<!ENTITY % chap.printing "IGNORE">
-<!ENTITY % chap.disks "IGNORE">
-<!ENTITY % chap.geom "IGNORE">
-<!ENTITY % chap.vinum "IGNORE">
-<!ENTITY % chap.x11 "IGNORE">
-<!ENTITY % chap.l10n "IGNORE">
-<!ENTITY % chap.multimedia "IGNORE">
-<!ENTITY % chap.desktop "IGNORE">
-<!ENTITY % chap.serialcomms "IGNORE">
-<!ENTITY % chap.ppp-and-slip "IGNORE">
-<!ENTITY % chap.advanced-networking "IGNORE">
-<!ENTITY % chap.firewalls "IGNORE">
-<!ENTITY % chap.network-servers "IGNORE">
-<!ENTITY % chap.mail "IGNORE">
-<!ENTITY % chap.cutting-edge "IGNORE">
-<!ENTITY % chap.linuxemu "IGNORE">
-<!ENTITY % chap.mirrors "IGNORE">
-<!ENTITY % chap.mirrors.ftp.inc "INCLUDE">
-<!ENTITY % chap.mirrors.cvsup.inc "INCLUDE">
-<!ENTITY % chap.bibliography "IGNORE">
-<!ENTITY % chap.eresources "IGNORE">
-<!ENTITY % chap.eresources.www.inc "INCLUDE">
-<!ENTITY % chap.pgpkeys "IGNORE">
-<!ENTITY % chap.index "IGNORE">
-<!ENTITY % chap.freebsd-glossary "IGNORE">
-<!ENTITY % chap.mac "IGNORE">
-<!ENTITY % chap.audit "IGNORE">
-<!ENTITY % chap.filesystems "IGNORE">
-<!ENTITY % chap.dtrace "IGNORE">
-
<!ENTITY chap.preface SYSTEM "preface/preface.xml">
<!ENTITY % pgpkeys SYSTEM "../../../share/pgpkeys/pgpkeys.ent"> %pgpkeys;
<!-- Part One -->
-<![%chap.introduction;[
<!ENTITY chap.introduction SYSTEM "introduction/chapter.xml">
-]]>
-<![%chap.install;[
<!ENTITY chap.install SYSTEM "install/chapter.xml">
-]]>
-<![%chap.basics;[
<!ENTITY chap.basics SYSTEM "basics/chapter.xml">
-]]>
-<![%chap.ports;[
<!ENTITY chap.ports SYSTEM "ports/chapter.xml">
-]]>
-<![%chap.x11;[
<!ENTITY chap.x11 SYSTEM "x11/chapter.xml">
-]]>
<!-- Part Two -->
-<![%chap.desktop;[
<!ENTITY chap.desktop SYSTEM "desktop/chapter.xml">
-]]>
-<![%chap.multimedia;[
<!ENTITY chap.multimedia SYSTEM "multimedia/chapter.xml">
-]]>
-<![%chap.kernelconfig;[
<!ENTITY chap.kernelconfig SYSTEM "kernelconfig/chapter.xml">
-]]>
-<![%chap.printing;[
<!ENTITY chap.printing SYSTEM "printing/chapter.xml">
-]]>
-<![%chap.linuxemu;[
<!ENTITY chap.linuxemu SYSTEM "linuxemu/chapter.xml">
-]]>
<!-- Part Three -->
-<![%chap.config;[
<!ENTITY chap.config SYSTEM "config/chapter.xml">
-]]>
-<![%chap.boot;[
<!ENTITY chap.boot SYSTEM "boot/chapter.xml">
-]]>
-<![%chap.users;[
<!ENTITY chap.users SYSTEM "users/chapter.xml">
-]]>
-<![%chap.security;[
<!ENTITY chap.security SYSTEM "security/chapter.xml">
-]]>
-<![%chap.jails;[
<!ENTITY chap.jails SYSTEM "jails/chapter.xml">
-]]>
-<![%chap.mac;[
<!ENTITY chap.mac SYSTEM "mac/chapter.xml">
-]]>
-<![%chap.audit;[
<!ENTITY chap.audit SYSTEM "audit/chapter.xml">
-]]>
-<![%chap.disks;[
<!ENTITY chap.disks SYSTEM "disks/chapter.xml">
-]]>
-<![%chap.geom;[
<!ENTITY chap.geom SYSTEM "geom/chapter.xml">
-]]>
-<![%chap.filesystems;[
<!ENTITY chap.filesystems SYSTEM "filesystems/chapter.xml">
-]]>
-<![%chap.vinum;[
<!ENTITY chap.vinum SYSTEM "vinum/chapter.xml">
-]]>
-<![%chap.virtualization;[
<!ENTITY chap.virtualization SYSTEM "virtualization/chapter.xml">
-]]>
-<![%chap.l10n;[
<!ENTITY chap.l10n SYSTEM "l10n/chapter.xml">
-]]>
-<![%chap.cutting-edge;[
<!ENTITY chap.cutting-edge SYSTEM "cutting-edge/chapter.xml">
-]]>
-<![%chap.dtrace;[
<!ENTITY chap.dtrace SYSTEM "dtrace/chapter.xml">
-]]>
<!-- Part Four -->
-<![%chap.serialcomms;[
<!ENTITY chap.serialcomms SYSTEM "serialcomms/chapter.xml">
-]]>
-<![%chap.ppp-and-slip;[
<!ENTITY chap.ppp-and-slip SYSTEM "ppp-and-slip/chapter.xml">
-]]>
-<![%chap.mail;[
<!ENTITY chap.mail SYSTEM "mail/chapter.xml">
-]]>
-<![%chap.network-servers;[
<!ENTITY chap.network-servers SYSTEM "network-servers/chapter.xml">
-]]>
-<![%chap.firewalls;[
<!ENTITY chap.firewalls SYSTEM "firewalls/chapter.xml">
-]]>
-<![%chap.advanced-networking;[
<!ENTITY chap.advanced-networking SYSTEM "advanced-networking/chapter.xml">
-]]>
<!-- Part Five (appendices) -->
-<![%chap.mirrors;[
- <!ENTITY chap.mirrors SYSTEM "mirrors/chapter.xml">
-]]>
-<![%chap.mirrors.ftp.inc;[
- <!ENTITY chap.mirrors.ftp.inc SYSTEM "mirrors.xml.ftp.inc">
-]]>
-<![%chap.mirrors.cvsup.inc;[
- <!ENTITY chap.mirrors.cvsup.inc SYSTEM "mirrors.xml.cvsup.inc">
-]]>
-<![%chap.bibliography;[
- <!ENTITY chap.bibliography SYSTEM "bibliography/chapter.xml">
-]]>
-<![%chap.eresources;[
- <!ENTITY chap.eresources SYSTEM "eresources/chapter.xml">
-]]>
-<![%chap.eresources.www.inc;[
- <!ENTITY chap.eresources.www.inc SYSTEM "eresources.xml.www.inc">
-]]>
-<![%chap.pgpkeys;[
- <!ENTITY chap.pgpkeys SYSTEM "pgpkeys/chapter.xml">
-]]>
-<![%chap.freebsd-glossary;[
- <!ENTITY chap.freebsd-glossary "&freebsd-glossary;">
-]]>
-<![%chap.index;[
- <!ENTITY chap.index SYSTEM "index.xml">
-]]>
+ <!ENTITY chap.mirrors SYSTEM "mirrors/chapter.xml">
+ <!ENTITY chap.mirrors.lastmod.inc SYSTEM "mirrors.lastmod.inc">
+ <!ENTITY chap.mirrors.ftp.index.inc SYSTEM "mirrors.xml.ftp.index.inc">
+ <!ENTITY chap.mirrors.ftp.inc SYSTEM "mirrors.xml.ftp.inc">
+ <!ENTITY chap.mirrors.cvsup.index.inc SYSTEM "mirrors.xml.cvsup.index.inc">
+ <!ENTITY chap.mirrors.cvsup.inc SYSTEM "mirrors.xml.cvsup.inc">
+ <!ENTITY chap.bibliography SYSTEM "bibliography/chapter.xml">
+ <!ENTITY chap.eresources SYSTEM "eresources/chapter.xml">
+ <!ENTITY chap.eresources.www.index.inc SYSTEM "eresources.xml.www.index.inc">
+ <!ENTITY chap.eresources.www.inc SYSTEM "eresources.xml.www.inc">
+ <!ENTITY chap.pgpkeys SYSTEM "pgpkeys/chapter.xml">
+ <!ENTITY chap.freebsd-glossary "&freebsd-glossary;">
+ <!ENTITY chap.index "">
<!ENTITY chap.colophon SYSTEM "colophon.xml">
-
-<!-- IGNORE cases -->
-
-<!-- Part One -->
-<!ENTITY chap.introduction "">
-<!ENTITY chap.install "">
-<!ENTITY chap.basics "">
-<!ENTITY chap.ports "">
-<!ENTITY chap.x11 "">
-
-<!-- Part Two -->
-<!ENTITY chap.desktop "">
-<!ENTITY chap.multimedia "">
-<!ENTITY chap.kernelconfig "">
-<!ENTITY chap.printing "">
-<!ENTITY chap.linuxemu "">
-
-<!-- Part Three -->
-<!ENTITY chap.config "">
-<!ENTITY chap.boot "">
-<!ENTITY chap.users "">
-<!ENTITY chap.security "">
-<!ENTITY chap.jails "">
-<!ENTITY chap.mac "">
-<!ENTITY chap.audit "">
-<!ENTITY chap.disks "">
-<!ENTITY chap.geom "">
-<!ENTITY chap.filesystems "">
-<!ENTITY chap.vinum "">
-<!ENTITY chap.virtualization "">
-<!ENTITY chap.l10n "">
-<!ENTITY chap.cutting-edge "">
-<!ENTITY chap.dtrace "">
-
-<!-- Part Four -->
-<!ENTITY chap.serialcomms "">
-<!ENTITY chap.ppp-and-slip "">
-<!ENTITY chap.mail "">
-<!ENTITY chap.network-servers "">
-<!ENTITY chap.firewalls "">
-<!ENTITY chap.advanced-networking "">
-
-<!-- Part Five (appendices) -->
-<!ENTITY chap.mirrors "">
-<!ENTITY chap.mirrors.ftp.inc "">
-<!ENTITY chap.mirrors.cvsup.inc "">
-<!ENTITY chap.bibliography "">
-<!ENTITY chap.eresources "">
-<!ENTITY chap.eresources.www.inc "">
-<!ENTITY chap.pgpkeys "">
-<!ENTITY chap.freebsd-glossary "">
-<!ENTITY chap.index "">
diff --git a/hu_HU.ISO8859-2/books/handbook/colophon.xml b/hu_HU.ISO8859-2/books/handbook/colophon.xml
index 63b68017ec..8c1e46030c 100644
--- a/hu_HU.ISO8859-2/books/handbook/colophon.xml
+++ b/hu_HU.ISO8859-2/books/handbook/colophon.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-2" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-2"?>
<!--
The FreeBSD Documentation Project
diff --git a/hu_HU.ISO8859-2/books/handbook/config/chapter.xml b/hu_HU.ISO8859-2/books/handbook/config/chapter.xml
index e661ddaa21..f489ff510d 100644
--- a/hu_HU.ISO8859-2/books/handbook/config/chapter.xml
+++ b/hu_HU.ISO8859-2/books/handbook/config/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-2" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-2"?>
<!--
The FreeBSD Documentation Project
diff --git a/hu_HU.ISO8859-2/books/handbook/cutting-edge/chapter.xml b/hu_HU.ISO8859-2/books/handbook/cutting-edge/chapter.xml
index 93566945fe..15b45b2f54 100644
--- a/hu_HU.ISO8859-2/books/handbook/cutting-edge/chapter.xml
+++ b/hu_HU.ISO8859-2/books/handbook/cutting-edge/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-2" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-2"?>
<!--
The FreeBSD Documentation Project
@@ -1000,7 +1000,7 @@ Fetching 133 new ports or files... done.</screen>
<screen>&prompt.root; <userinput>portsnap fetch update</userinput></screen>
- <para>Ez a parancs let闤ti a Portgy&251;jtem幯y
+ <para>Ez a parancs let闤ti a Portgyjtem幯y
legfrissebb v嫮tozat嫢, majd
kit闣顤癃i azt a helyi <filename
class="directory">/usr/ports</filename>
@@ -1663,98 +1663,6 @@ DOCSUPFILE?= /usr/share/examples/cvsup/doc-supfile</programlisting>
<screen>&prompt.root; <userinput>portupgrade -PP hu-freebsd-doc</userinput></screen>
</sect3>
</sect2>
-
-<![ IGNORE [
- <sect2 id="docsnap">
- <sect2info>
- <authorgroup>
- <author>
- <firstname>Pav</firstname>
- <surname>Lucistnik</surname>
- <contrib>A szks嶲es inform塶i鏦at
- szolg嫮tatta: </contrib>
- </author>
- </authorgroup>
- </sect2info>
-
- <title>A Docsnap haszn嫮ata</title>
-
- <indexterm><primary>friss癃廥 廥 frissen
- tart嫳</primary></indexterm>
-
- <indexterm>
- <primary>Docsnap</primary>
- <see>friss癃廥 廥 frissen tart嫳</see>
- </indexterm>
-
- <para>A <application>Docsnap</application> a &os;
- dokument塶i鎩嫕ak egy viszonylag gyors
- 廥 k霵ny friss癃廥廨e
- alkalmas &man.rsync.1; repository. Az n.
- <quote><application>Docsnap</application> szerver</quote>
- folyamatosan k饘eti a dokument塶i
- forr嫳ainak v嫮toz嫳ait, majd minden
- 鏎墎an el礭ll癃ja a HTML
- v嫮tozatukat. A <application>Docsnap</application>
- haszn嫮atakor nincs szks嶲nk a
- <filename role="package">textproc/docproj</filename> port
- telep癃廥廨e, mivel mindig csak a
- m嫫 el礭ll癃ott
- dokument塶i鏒 friss癃jk.</para>
-
- <para>A m鏚szer haszn嫮at墏oz mind飉sze
- a <filename role="package">net/rsync</filename> port vagy csomag
- telep癃廥e szks嶲eltetik. Ezt a
- k饘etkez paranccsal tudjuk elv嶲ezni:</para>
-
- <screen>&prompt.root; <userinput>pkg_add -r rsync</userinput></screen>
-
- <note>
- <para>A <application>Docsnap</application>
- m鏚szer彋 eredetileg a <filename
- class="directory">/usr/share/doc</filename>
- k霵yvt嫫ban t嫫olt
- dokument塶i friss癃廥廨e
- fejlesztett幧 ki, de a bemutatott p幨d嫜
- tetsz鯷eges k霵yvt嫫ra alkalmazhat鏇k.
- Felhaszn嫮鏙 k霵yvt嫫ak
- eset幯 m嶲 rendszergazdai jogosults墔okra
- sincs szks嶲nk a feladat
- elv嶲z廥嶭ez.</para>
- </note>
-
- <para>A dokument塶i 璲y az al墎bi
- paranccsal friss癃het:</para>
-
- <screen>&prompt.root; <userinput>rsync -rltvz <replaceable>docsnap.sk.FreeBSD.org</replaceable>::docsnap <replaceable>/usr/share/doc</replaceable></userinput></screen>
-
- <note>
- <para>Jelenleg csak egyetlen <application>Docsnap</application>
- szerver 廨het el, ez a fentebb is
- l嫢hat
- <hostid>docsnap.sk.FreeBSD.org</hostid>.</para>
- </note>
-
- <para>K驆vetlenl ne haszn嫮juk a
- <option>--delete</option> param彋ert, mert a <command>make
- installworld</command> parancs fut嫳a k驆ben olyan
- elemeket is telep癃hetett a <filename
- class="directory">/usr/share/doc</filename>
- k霵yvt嫫ba, amelyek 璲y
- t顤l髇n幯ek. Helyette ink墎b 璲y
- haszn嫮juk a parancsot:</para>
-
- <screen>&prompt.root; <userinput>rsync -rltvz --delete <replaceable>docsnap.sk.FreeBSD.org</replaceable>::docsnap/??_??\.\* <replaceable>/usr/share/doc</replaceable></userinput></screen>
-
- <para>Ha csak a dokument塶i egy
- r廥z彋 akarjuk friss癃eni,
- p幨d嫠l csak az angol nyelv
- v嫮tozat嫢, akkor pedig ezt a parancsot
- haszn嫮juk:</para>
-
- <screen>&prompt.root; <userinput>rsync -rltvz <replaceable>docsnap.sk.FreeBSD.org</replaceable>::docsnap/en_US.ISO8859-1 <replaceable>/usr/share/doc</replaceable></userinput></screen>
- </sect2>
-]]>
</sect1>
<sect1 id="current-stable">
diff --git a/hu_HU.ISO8859-2/books/handbook/desktop/chapter.xml b/hu_HU.ISO8859-2/books/handbook/desktop/chapter.xml
index 08fcf9a485..504547e8b7 100644
--- a/hu_HU.ISO8859-2/books/handbook/desktop/chapter.xml
+++ b/hu_HU.ISO8859-2/books/handbook/desktop/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-2" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-2"?>
<!--
The FreeBSD Documentation Project
$FreeBSD$
diff --git a/hu_HU.ISO8859-2/books/handbook/disks/chapter.xml b/hu_HU.ISO8859-2/books/handbook/disks/chapter.xml
index 931ca60809..fd4c0ef218 100644
--- a/hu_HU.ISO8859-2/books/handbook/disks/chapter.xml
+++ b/hu_HU.ISO8859-2/books/handbook/disks/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-2" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-2"?>
<!--
The FreeBSD Documentation Project
@@ -3936,17 +3936,6 @@ return billentyt</screen>
magunkat.</para>
</sect3>
-
-<![ %not.published; [
-
- <sect3>
- <title>* Mit tegyek, ha nem k廥zltem fel a
- katasztr鏹嫫a?</title>
-
- <para></para>
- </sect3>
-]]>
-
</sect2>
</sect1>
diff --git a/hu_HU.ISO8859-2/books/handbook/dtrace/chapter.xml b/hu_HU.ISO8859-2/books/handbook/dtrace/chapter.xml
index 2007d0b765..efffd80788 100644
--- a/hu_HU.ISO8859-2/books/handbook/dtrace/chapter.xml
+++ b/hu_HU.ISO8859-2/books/handbook/dtrace/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-2" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-2"?>
<!--
The FreeBSD Documentation Project
$FreeBSD$
diff --git a/hu_HU.ISO8859-2/books/handbook/eresources/chapter.xml b/hu_HU.ISO8859-2/books/handbook/eresources/chapter.xml
index 01b979b6de..b90c0555e6 100644
--- a/hu_HU.ISO8859-2/books/handbook/eresources/chapter.xml
+++ b/hu_HU.ISO8859-2/books/handbook/eresources/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-2" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-2"?>
<!--
The FreeBSD Documentation Project
@@ -2610,6 +2610,10 @@
<sect2 id="eresources-web-mirrors">
<title>Hivatalos tkr驆廥ek</title>
+ &chap.eresources.www.index.inc;
+
+ &chap.mirrors.lastmod.inc;
+
&chap.eresources.www.inc;
</sect2>
</sect1>
diff --git a/hu_HU.ISO8859-2/books/handbook/filesystems/chapter.xml b/hu_HU.ISO8859-2/books/handbook/filesystems/chapter.xml
index 7cdb7529f6..ea3716707a 100644
--- a/hu_HU.ISO8859-2/books/handbook/filesystems/chapter.xml
+++ b/hu_HU.ISO8859-2/books/handbook/filesystems/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-2" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-2"?>
<!--
The FreeBSD Documentation Project
$FreeBSD$
@@ -314,7 +314,7 @@ minta 17547136 0 17547136 0% /minta</screen>
嫮lom嫕yok hozhat鏇k rajta l彋re
vagy list嫙hat a tartalma:</para>
- <screen>&prompt.root <userinput>cd /minta</userinput>
+ <screen>&prompt.root; <userinput>cd /minta</userinput>
&prompt.root; <userinput>ls</userinput>
&prompt.root; <userinput>touch proba</userinput>
&prompt.root; <userinput>ls -al</userinput>
diff --git a/hu_HU.ISO8859-2/books/handbook/firewalls/chapter.xml b/hu_HU.ISO8859-2/books/handbook/firewalls/chapter.xml
index e1b72c2819..b1929ab607 100644
--- a/hu_HU.ISO8859-2/books/handbook/firewalls/chapter.xml
+++ b/hu_HU.ISO8859-2/books/handbook/firewalls/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-2" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-2"?>
<!--
The FreeBSD Documentation Project
diff --git a/hu_HU.ISO8859-2/books/handbook/geom/chapter.xml b/hu_HU.ISO8859-2/books/handbook/geom/chapter.xml
index ad674c1e9a..fdca1d5761 100644
--- a/hu_HU.ISO8859-2/books/handbook/geom/chapter.xml
+++ b/hu_HU.ISO8859-2/books/handbook/geom/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-2" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-2"?>
<!--
The FreeBSD Documentation Project
$FreeBSD$
diff --git a/hu_HU.ISO8859-2/books/handbook/install/chapter.xml b/hu_HU.ISO8859-2/books/handbook/install/chapter.xml
index ea9be46471..3eb62e7aa5 100644
--- a/hu_HU.ISO8859-2/books/handbook/install/chapter.xml
+++ b/hu_HU.ISO8859-2/books/handbook/install/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-2" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-2"?>
<!--
The FreeBSD Documentation Project
diff --git a/hu_HU.ISO8859-2/books/handbook/introduction/chapter.xml b/hu_HU.ISO8859-2/books/handbook/introduction/chapter.xml
index afcd4fc3e6..be14b8e209 100644
--- a/hu_HU.ISO8859-2/books/handbook/introduction/chapter.xml
+++ b/hu_HU.ISO8859-2/books/handbook/introduction/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-2" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-2"?>
<!--
The FreeBSD Documentation Project
diff --git a/hu_HU.ISO8859-2/books/handbook/jails/chapter.xml b/hu_HU.ISO8859-2/books/handbook/jails/chapter.xml
index 9391061d45..faddb51710 100644
--- a/hu_HU.ISO8859-2/books/handbook/jails/chapter.xml
+++ b/hu_HU.ISO8859-2/books/handbook/jails/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-2" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-2"?>
<!--
The FreeBSD Documentation Project
diff --git a/hu_HU.ISO8859-2/books/handbook/kernelconfig/chapter.xml b/hu_HU.ISO8859-2/books/handbook/kernelconfig/chapter.xml
index 2b66058407..65684cb9b7 100644
--- a/hu_HU.ISO8859-2/books/handbook/kernelconfig/chapter.xml
+++ b/hu_HU.ISO8859-2/books/handbook/kernelconfig/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-2" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-2"?>
<!--
The FreeBSD Documentation Project
diff --git a/hu_HU.ISO8859-2/books/handbook/l10n/chapter.xml b/hu_HU.ISO8859-2/books/handbook/l10n/chapter.xml
index 3e78307827..0772ecf635 100644
--- a/hu_HU.ISO8859-2/books/handbook/l10n/chapter.xml
+++ b/hu_HU.ISO8859-2/books/handbook/l10n/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-2" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-2"?>
<!--
The FreeBSD Documentation Project
diff --git a/hu_HU.ISO8859-2/books/handbook/linuxemu/chapter.xml b/hu_HU.ISO8859-2/books/handbook/linuxemu/chapter.xml
index fa8a3fbfca..5599112f6b 100644
--- a/hu_HU.ISO8859-2/books/handbook/linuxemu/chapter.xml
+++ b/hu_HU.ISO8859-2/books/handbook/linuxemu/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-2" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-2"?>
<!--
The FreeBSD Documentation Project
@@ -880,14 +880,14 @@ LOG=/var/log/lmgrd.log
case "$1" in
start)
- lmgrd -c ${LICENSE_FILE} 2&gt;&gt; ${LOG} 1&gt;&2
+ lmgrd -c ${LICENSE_FILE} 2&gt;&gt; ${LOG} 1&gt;&amp;2
echo -n " lmgrd"
;;
stop)
- lmgrd -c ${LICENSE_FILE} -x lmdown 2&gt;&gt; ${LOG} 1&gt;&2
+ lmgrd -c ${LICENSE_FILE} -x lmdown 2&gt;&gt; ${LOG} 1&gt;&amp;2
;;
*)
- echo "Usage: `basename $0` {start|stop}" 1&gt;&2
+ echo "Usage: `basename $0` {start|stop}" 1&gt;&amp;2
exit 64
;;
esac
@@ -1241,7 +1241,7 @@ exit 0</programlisting>
k饘etkez:</para>
<programlisting>#!/usr/compat/linux/bin/sh
-(sleep 5; killall -1 matlab_helper) &
+(sleep 5; killall -1 matlab_helper) &amp;
exit 0</programlisting>
</step>
diff --git a/hu_HU.ISO8859-2/books/handbook/mac/chapter.xml b/hu_HU.ISO8859-2/books/handbook/mac/chapter.xml
index 971f865e29..d8b479e2bf 100644
--- a/hu_HU.ISO8859-2/books/handbook/mac/chapter.xml
+++ b/hu_HU.ISO8859-2/books/handbook/mac/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-2" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-2"?>
<!--
The FreeBSD Documentation Project
$FreeBSD$
diff --git a/hu_HU.ISO8859-2/books/handbook/mail/chapter.xml b/hu_HU.ISO8859-2/books/handbook/mail/chapter.xml
index 1ac404ad39..538a5aaa68 100644
--- a/hu_HU.ISO8859-2/books/handbook/mail/chapter.xml
+++ b/hu_HU.ISO8859-2/books/handbook/mail/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-2" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-2"?>
<!--
The FreeBSD Documentation Project
@@ -2241,11 +2241,11 @@ SENDMAIL_LDADD=-lsasl2</programlisting>
el:</para>
<screen>&prompt.root; <userinput>cd /usr/src/lib/libsmutil</userinput>
-&prompt.root; <userinput>make cleandir && make obj && make</userinput>
+&prompt.root; <userinput>make cleandir &amp;&amp; make obj &amp;&amp; make</userinput>
&prompt.root; <userinput>cd /usr/src/lib/libsm</userinput>
-&prompt.root; <userinput>make cleandir && make obj && make</userinput>
+&prompt.root; <userinput>make cleandir &amp;&amp; make obj &amp;&amp; make</userinput>
&prompt.root; <userinput>cd /usr/src/usr.sbin/sendmail</userinput>
-&prompt.root; <userinput>make cleandir && make obj && make && make install</userinput></screen>
+&prompt.root; <userinput>make cleandir &amp;&amp; make obj &amp;&amp; make &amp;&amp; make install</userinput></screen>
<para>A <application>sendmail</application>
ford癃嫳a eset幯 semmilyen
diff --git a/hu_HU.ISO8859-2/books/handbook/mirrors/chapter.xml b/hu_HU.ISO8859-2/books/handbook/mirrors/chapter.xml
index 99cdd2a284..a21d3085ab 100644
--- a/hu_HU.ISO8859-2/books/handbook/mirrors/chapter.xml
+++ b/hu_HU.ISO8859-2/books/handbook/mirrors/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-2" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-2"?>
<!--
The FreeBSD Documentation Project
@@ -282,6 +282,10 @@
m鏚szereket a nevk ut嫕
z嫫鎩elben k驆ljk.</para>
+ &chap.mirrors.ftp.index.inc;
+
+ &chap.mirrors.lastmod.inc;
+
&chap.mirrors.ftp.inc;
</sect1>
@@ -2999,6 +3003,10 @@ doc/zh_*</screen>
<para>A &os; <link linkend="cvsup">CVSup</link> szerverei az
al墎bi oldalakon 廨het髊k el:</para>
+ &chap.mirrors.cvsup.index.inc;
+
+ &chap.mirrors.lastmod.inc;
+
&chap.mirrors.cvsup.inc;
</sect2>
diff --git a/hu_HU.ISO8859-2/books/handbook/multimedia/chapter.xml b/hu_HU.ISO8859-2/books/handbook/multimedia/chapter.xml
index 19603a94df..afb85355f7 100644
--- a/hu_HU.ISO8859-2/books/handbook/multimedia/chapter.xml
+++ b/hu_HU.ISO8859-2/books/handbook/multimedia/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-2" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-2"?>
<!--
The FreeBSD Documentation Project
diff --git a/hu_HU.ISO8859-2/books/handbook/network-servers/chapter.xml b/hu_HU.ISO8859-2/books/handbook/network-servers/chapter.xml
index 9dfe80d894..f09b877955 100644
--- a/hu_HU.ISO8859-2/books/handbook/network-servers/chapter.xml
+++ b/hu_HU.ISO8859-2/books/handbook/network-servers/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-2" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-2"?>
<!--
The FreeBSD Documentation Project
diff --git a/hu_HU.ISO8859-2/books/handbook/pgpkeys/chapter.xml b/hu_HU.ISO8859-2/books/handbook/pgpkeys/chapter.xml
index aaf079153b..e9cc9cab89 100644
--- a/hu_HU.ISO8859-2/books/handbook/pgpkeys/chapter.xml
+++ b/hu_HU.ISO8859-2/books/handbook/pgpkeys/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-2" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-2"?>
<!--
The FreeBSD Documentation Project
$FreeBSD$
diff --git a/hu_HU.ISO8859-2/books/handbook/ports/chapter.xml b/hu_HU.ISO8859-2/books/handbook/ports/chapter.xml
index 86df55f0db..688945f54c 100644
--- a/hu_HU.ISO8859-2/books/handbook/ports/chapter.xml
+++ b/hu_HU.ISO8859-2/books/handbook/ports/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-2" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-2"?>
<!--
The FreeBSD Documentation Project
diff --git a/hu_HU.ISO8859-2/books/handbook/ppp-and-slip/chapter.xml b/hu_HU.ISO8859-2/books/handbook/ppp-and-slip/chapter.xml
index a8d8ad1e16..2d684502b3 100644
--- a/hu_HU.ISO8859-2/books/handbook/ppp-and-slip/chapter.xml
+++ b/hu_HU.ISO8859-2/books/handbook/ppp-and-slip/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-2" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-2"?>
<!--
The FreeBSD Documentation Project
diff --git a/hu_HU.ISO8859-2/books/handbook/preface/preface.xml b/hu_HU.ISO8859-2/books/handbook/preface/preface.xml
index 96a205cf0c..9b9f015c0f 100644
--- a/hu_HU.ISO8859-2/books/handbook/preface/preface.xml
+++ b/hu_HU.ISO8859-2/books/handbook/preface/preface.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-2" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-2"?>
<!--
$FreeBSD$
-->
diff --git a/hu_HU.ISO8859-2/books/handbook/printing/chapter.xml b/hu_HU.ISO8859-2/books/handbook/printing/chapter.xml
index 059b6d216f..548546f0ea 100644
--- a/hu_HU.ISO8859-2/books/handbook/printing/chapter.xml
+++ b/hu_HU.ISO8859-2/books/handbook/printing/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-2" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-2"?>
<!--
The FreeBSD Documentation Project
diff --git a/hu_HU.ISO8859-2/books/handbook/security/chapter.xml b/hu_HU.ISO8859-2/books/handbook/security/chapter.xml
index 8e0e5e2f98..1b536465be 100644
--- a/hu_HU.ISO8859-2/books/handbook/security/chapter.xml
+++ b/hu_HU.ISO8859-2/books/handbook/security/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-2" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-2"?>
<!--
The FreeBSD Documentation Project
diff --git a/hu_HU.ISO8859-2/books/handbook/serialcomms/chapter.xml b/hu_HU.ISO8859-2/books/handbook/serialcomms/chapter.xml
index e92c197311..e1371dfc67 100644
--- a/hu_HU.ISO8859-2/books/handbook/serialcomms/chapter.xml
+++ b/hu_HU.ISO8859-2/books/handbook/serialcomms/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-2" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-2"?>
<!--
The FreeBSD Documentation Project
diff --git a/hu_HU.ISO8859-2/books/handbook/users/chapter.xml b/hu_HU.ISO8859-2/books/handbook/users/chapter.xml
index 1e046a17b7..6e540f5e58 100644
--- a/hu_HU.ISO8859-2/books/handbook/users/chapter.xml
+++ b/hu_HU.ISO8859-2/books/handbook/users/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-2" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-2"?>
<!--
The FreeBSD Documentation Project
diff --git a/hu_HU.ISO8859-2/books/handbook/vinum/chapter.xml b/hu_HU.ISO8859-2/books/handbook/vinum/chapter.xml
index e03ef42112..032905b69e 100644
--- a/hu_HU.ISO8859-2/books/handbook/vinum/chapter.xml
+++ b/hu_HU.ISO8859-2/books/handbook/vinum/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-2" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-2"?>
<!--
The Vinum Volume Manager
By Greg Lehey (grog at lemis dot com)
diff --git a/hu_HU.ISO8859-2/books/handbook/virtualization/chapter.xml b/hu_HU.ISO8859-2/books/handbook/virtualization/chapter.xml
index fce0116b0a..c299662d14 100644
--- a/hu_HU.ISO8859-2/books/handbook/virtualization/chapter.xml
+++ b/hu_HU.ISO8859-2/books/handbook/virtualization/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-2" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-2"?>
<!--
The FreeBSD Documentation Project
diff --git a/hu_HU.ISO8859-2/books/handbook/x11/chapter.xml b/hu_HU.ISO8859-2/books/handbook/x11/chapter.xml
index 9b2dcc7874..1c1af26583 100644
--- a/hu_HU.ISO8859-2/books/handbook/x11/chapter.xml
+++ b/hu_HU.ISO8859-2/books/handbook/x11/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-2" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-2"?>
<!--
The FreeBSD Documentation Project
diff --git a/hu_HU.ISO8859-2/share/xml/bibliography.xml b/hu_HU.ISO8859-2/share/xml/bibliography.xml
index 2a73c12864..47ed73976a 100644
--- a/hu_HU.ISO8859-2/share/xml/bibliography.xml
+++ b/hu_HU.ISO8859-2/share/xml/bibliography.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-2" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-2"?>
<!--
$FreeBSD$
-->
diff --git a/hu_HU.ISO8859-2/share/xml/catalog b/hu_HU.ISO8859-2/share/xml/catalog
deleted file mode 100644
index b7bb103082..0000000000
--- a/hu_HU.ISO8859-2/share/xml/catalog
+++ /dev/null
@@ -1,61 +0,0 @@
- -- ...................................................................... --
- -- FreeBSD SGML Public Identifiers ...................................... --
-
- -- ...................................................................... --
- -- Hungarian specific ...................................................... --
-
- -- $FreeBSD$ --
-
- -- %SOURCE% share/xml/catalog
- -- %SRCID% 1.32
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//HU"
- "entities.ent"
-
-PUBLIC "-//FreeBSD//DOCUMENT DocBook Stylesheet//EN"
- "freebsd.dsl"
-
-PUBLIC "-//FreeBSD//DOCUMENT DocBook Stylesheet//HU"
- "freebsd.dsl"
-
-PUBLIC "-//FreeBSD//DOCUMENT DocBook Language Neutral Stylesheet//HU"
- "freebsd.dsl"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook Miscellaneous FreeBSD Entities//HU"
- "freebsd.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook Language Specific Entities//EN"
- "l10n.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//HU"
- "mailing-lists.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook Newsgroup Entities//HU"
- "newsgroups.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook Team Entities//HU"
- "teams.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook Translator Entities//HU"
- "translators.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//HU"
- "trademarks.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook Glossary Entities//HU"
- "glossary.ent"
-
- -- ...................................................................... --
- -- HTML docs ............................................................ --
-
-PUBLIC "-//FreeBSD//ENTITIES FreeBSD L10N Entities//EN"
- "l10n.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES FreeBSD Release L10N Entities//EN"
- "release.l10n.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES HTML FreeBSD Header L10N Entities//EN"
- "header.l10n.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES HTML FreeBSD Navigation Bar L10N Entities//EN"
- "navibar.l10n.ent"
diff --git a/hu_HU.ISO8859-2/share/xml/catalog.xml b/hu_HU.ISO8859-2/share/xml/catalog.xml
index 3553c62fbc..0b06d43c89 100644
--- a/hu_HU.ISO8859-2/share/xml/catalog.xml
+++ b/hu_HU.ISO8859-2/share/xml/catalog.xml
@@ -10,6 +10,9 @@
<rewriteURI uriStartString="http://www.FreeBSD.org/XML/www/lang/"
rewritePrefix="../../"/>
+ <public
+ publicId="-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN"
+ uri="entities.ent" />
<public publicId="-//FreeBSD//ENTITIES FreeBSD L10N Entities//EN"
uri="l10n.ent" />
<public
diff --git a/hu_HU.ISO8859-2/share/xml/entities.ent b/hu_HU.ISO8859-2/share/xml/entities.ent
index c16d43fd24..97b921021f 100644
--- a/hu_HU.ISO8859-2/share/xml/entities.ent
+++ b/hu_HU.ISO8859-2/share/xml/entities.ent
@@ -5,27 +5,30 @@
%SRCID% 1.2
-->
-<!ENTITY % l10n PUBLIC "-//FreeBSD//ENTITIES DocBook Language Specific Entities//EN">
+<!ENTITY % l10n PUBLIC "-//FreeBSD//ENTITIES DocBook Language Specific Entities//EN"
+ "l10n.ent">
%l10n;
-<!ENTITY % l10n-common PUBLIC "-//FreeBSD//ENTITIES DocBook Language Neutral Entities//EN">
-%l10n-common;
-<!ENTITY % man PUBLIC "-//FreeBSD//ENTITIES DocBook Manual Page Entities//EN">
-%man;
-<!ENTITY % freebsd PUBLIC "-//FreeBSD//ENTITIES DocBook Miscellaneous FreeBSD Entities//HU">
+<!ENTITY % freebsd PUBLIC "-//FreeBSD//ENTITIES DocBook Miscellaneous FreeBSD Entities//HU"
+ "freebsd.ent">
%freebsd;
-<!ENTITY % authors PUBLIC "-//FreeBSD//ENTITIES DocBook Author Entities//EN">
-%authors;
-<!ENTITY % teams PUBLIC "-//FreeBSD//ENTITIES DocBook Team Entities//HU">
+<!ENTITY % teams PUBLIC "-//FreeBSD//ENTITIES DocBook Team Entities//HU"
+ "teams.ent">
%teams;
-<!ENTITY % mailing-lists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//HU">
+<!ENTITY % mailing-lists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//HU"
+ "mailing-lists.ent">
%mailing-lists;
-<!ENTITY % newsgroups PUBLIC "-//FreeBSD//ENTITIES DocBook Newsgroup Entities//HU">
+<!ENTITY % newsgroups PUBLIC "-//FreeBSD//ENTITIES DocBook Newsgroup Entities//HU"
+ "newsgroups.ent">
%newsgroups;
-<!ENTITY % trademarks PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//HU">
+<!ENTITY % trademarks PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//HU"
+ "trademarks.ent">
%trademarks;
-<!ENTITY % translators PUBLIC "-//FreeBSD//ENTITIES DocBook Translator Entities//HU">
+<!ENTITY % translators PUBLIC "-//FreeBSD//ENTITIES DocBook Translator Entities//HU"
+ "translators.ent">
%translators;
-<!ENTITY % urls PUBLIC "-//FreeBSD//ENTITIES DocBook URL Entities//EN">
+<!ENTITY % urls PUBLIC "-//FreeBSD//ENTITIES DocBook URL Entities//EN"
+ "nonexistent">
%urls;
-<!ENTITY % glossary PUBLIC "-//FreeBSD//ENTITIES DocBook Glossary Entities//HU">
+<!ENTITY % glossary PUBLIC "-//FreeBSD//ENTITIES DocBook Glossary Entities//HU"
+ "glossary.ent">
%glossary;
diff --git a/hu_HU.ISO8859-2/share/xml/freebsd.ent b/hu_HU.ISO8859-2/share/xml/freebsd.ent
index be9b49e4e5..0f05aae175 100644
--- a/hu_HU.ISO8859-2/share/xml/freebsd.ent
+++ b/hu_HU.ISO8859-2/share/xml/freebsd.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="iso-8859-2"?>
<!-- -*- sgml -*-
DocBook Miscellaneous FreeBSD Entities.
diff --git a/hu_HU.ISO8859-2/share/xml/l10n.ent b/hu_HU.ISO8859-2/share/xml/l10n.ent
index fcf514af55..5412f263c2 100644
--- a/hu_HU.ISO8859-2/share/xml/l10n.ent
+++ b/hu_HU.ISO8859-2/share/xml/l10n.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="iso-8859-2"?>
<!-- -*- sgml -*-
DocBook Language Specific Entities for Localization (hu).
diff --git a/hu_HU.ISO8859-2/share/xml/mailing-lists.ent b/hu_HU.ISO8859-2/share/xml/mailing-lists.ent
index f6d57d919b..61952e93c8 100644
--- a/hu_HU.ISO8859-2/share/xml/mailing-lists.ent
+++ b/hu_HU.ISO8859-2/share/xml/mailing-lists.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="iso-8859-2"?>
<!--
Names of FreeBSD mailing lists and related software.
diff --git a/hu_HU.ISO8859-2/share/xml/mirrors-local.xsl b/hu_HU.ISO8859-2/share/xml/mirrors-local.xsl
index 67da8c7b18..51ce50a143 100644
--- a/hu_HU.ISO8859-2/share/xml/mirrors-local.xsl
+++ b/hu_HU.ISO8859-2/share/xml/mirrors-local.xsl
@@ -14,6 +14,9 @@
exclude-result-prefixes="cvs"
extension-element-prefixes="str">
+ <!-- must point to master copy, doc/share/xml/mirrors-master.xsl -->
+ <xsl:import href="../../../share/xml/mirrors-master.xsl" />
+
<xsl:variable name="svnKeyword">
<xsl:value-of select="normalize-space(//cvs:keyword[1])"/>
</xsl:variable>
@@ -23,15 +26,8 @@
</xsl:variable>
<xsl:output type="xml" encoding="iso-8859-2"
- omit-xml-declaration="yes"
indent="yes"/>
- <!-- these params should be externally bound. The values
- here are not used actually -->
- <xsl:param name="type" select="''" />
- <xsl:param name="proto" select="''" />
- <xsl:param name="target" select="''" />
-
<xsl:param name="mirrors-docbook-country-anchor-id" select="translate($target, '/.', '--')" />
<!--
@@ -39,29 +35,8 @@
* "mirrors-lastmodified"
* "mirrors-docbook-contact"
- * "mirrors-docbook-country-index-all"
- * "mirrors-docbook-variablelist"
- * "mirrors-docbook-itemizedlist"
-->
- <xsl:template match="/">
- <xsl:choose>
- <xsl:when test="$target = 'handbook/mirrors/chapter.xml'">
- <xsl:call-template name="mirrors-docbook-country-index-all" />
- <para>(<xsl:call-template name="mirrors-lastmodified" />)</para>
- <xsl:call-template name="mirrors-docbook-variablelist" />
- </xsl:when>
- <xsl:when test="$target = 'handbook/eresources/chapter.xml'">
- <xsl:call-template name="mirrors-docbook-country-index-all" />
- <para>(<xsl:call-template name="mirrors-lastmodified" />)</para>
- <xsl:call-template name="mirrors-docbook-itemizedlist" />
- </xsl:when>
- <xsl:otherwise>
- <xsl:value-of select="'*** processing error ***'" />
- </xsl:otherwise>
- </xsl:choose>
- </xsl:template>
-
<!-- template: "mirrors-docbook-contact" -->
<xsl:template name="mirrors-docbook-contact">
@@ -77,199 +52,4 @@
<xsl:text>D嫢um: </xsl:text>
<xsl:call-template name="mirrors-lastmodified-utc" />
</xsl:template>
-
- <!-- template: "mirrors-docbook-country-index-all" -->
-
- <xsl:template name="mirrors-docbook-country-index-all">
- <para>
- <xsl:for-each select="mirrors/entry[country/@role = 'primary'
- and host[@type = $type]]">
- <xsl:call-template name="mirrors-docbook-country-index">
- <xsl:with-param name="mirrors-docbook-country-index-without-period" select="'true'" />
- </xsl:call-template>
- </xsl:for-each>
-
- <xsl:for-each select="mirrors/entry[(not(country/@role) or country/@role != 'primary') and
- host[@type = $type]]">
- <xsl:sort select="country/@sortkey" data-type="number"/>
- <xsl:sort select="country" />
-
- <xsl:call-template name="mirrors-docbook-country-index">
- <xsl:with-param name="mirrors-docbook-country-index-without-period" select="'false'" />
- </xsl:call-template>
- </xsl:for-each>
- </para>
- </xsl:template>
-
- <xsl:template name="mirrors-docbook-country-index">
- <xsl:param name="mirrors-docbook-country-index-without-period" />
- <link>
- <xsl:attribute name="linkend">
- <xsl:value-of select="concat($mirrors-docbook-country-anchor-id, '-', @id, '-', $type)" />
- </xsl:attribute>
- <xsl:value-of select="country" />
- </link>
- <xsl:choose>
- <xsl:when test='$mirrors-docbook-country-index-without-period != "true" and
- position() = last()'><xsl:text>.</xsl:text></xsl:when>
- <xsl:otherwise><xsl:text>, </xsl:text></xsl:otherwise>
- </xsl:choose>
- </xsl:template>
-
- <!-- template: "mirrors-docbook-variablelist" -->
-
- <xsl:template name="mirrors-docbook-variablelist">
- <variablelist>
- <xsl:for-each select="mirrors/entry[country/@role = 'primary' and
- host[@type = $type]]">
- <xsl:call-template name="mirrors-docbook-variablelist-entry" />
- </xsl:for-each>
-
- <xsl:for-each select="mirrors/entry[(not(country/@role) or country/@role != 'primary') and
- host[@type = $type]]">
- <xsl:sort select="country/@sortkey" data-type="number"/>
- <xsl:sort select="country" />
-
- <xsl:call-template name="mirrors-docbook-variablelist-entry" />
- </xsl:for-each>
- </variablelist>
- </xsl:template>
-
- <xsl:template name="mirrors-docbook-variablelist-entry">
- <varlistentry>
- <term>
- <anchor>
- <xsl:attribute name="id">
- <xsl:value-of select="concat($mirrors-docbook-country-anchor-id, '-', @id, '-', $type)" />
- </xsl:attribute>
- </anchor>
- <xsl:value-of select="country" />
- </term>
-
- <listitem>
- <xsl:if test="$type = 'ftp' and email">
- <xsl:call-template name="mirrors-docbook-contact">
- <xsl:with-param name="email" select="email" />
- </xsl:call-template>
- </xsl:if>
-
- <itemizedlist>
- <xsl:for-each select="host[@type = $type]">
- <listitem>
- <para>
- <xsl:choose>
- <xsl:when test="url[@proto = $proto]">
- <xsl:for-each select="url[@proto = $proto]">
- <ulink>
- <xsl:attribute name="url"><xsl:value-of select="." /></xsl:attribute>
- <xsl:value-of select="name" />
- </ulink>
- </xsl:for-each>
-
- <xsl:value-of select="' (ftp'" />
-
- <xsl:choose>
- <xsl:when test="url[@proto != $proto]">
- <xsl:for-each select="url[@proto != $proto]">
- <xsl:value-of select="' / '" />
- <xsl:choose>
- <xsl:when test=". != ''">
- <ulink>
- <xsl:attribute name="url"><xsl:value-of select="." /></xsl:attribute>
- <xsl:value-of select="@proto" />
- </ulink>
- </xsl:when>
- <xsl:otherwise>
- <xsl:value-of select="@proto" />
- </xsl:otherwise>
- </xsl:choose>
- </xsl:for-each>
- </xsl:when>
- </xsl:choose>
-
- <xsl:value-of select="') '" />
- </xsl:when>
-
- <xsl:otherwise>
- <xsl:value-of select="name" />
- </xsl:otherwise>
- </xsl:choose>
- </para>
- </listitem>
- </xsl:for-each>
- </itemizedlist>
- </listitem>
- </varlistentry>
- </xsl:template>
-
- <!-- template: "mirrors-docbook-itemizedlist" -->
-
- <xsl:template name="mirrors-docbook-itemizedlist">
- <itemizedlist>
- <xsl:for-each select="mirrors/entry[country/@role = 'primary' and
- host[@type = $type]]">
- <xsl:call-template name="mirrors-docbook-itemizedlist-listitem" />
- </xsl:for-each>
-
- <xsl:for-each select="mirrors/entry[(not(country/@role) or country/@role != 'primary') and
- host[@type = $type]]">
- <xsl:sort select="country/@sortkey" data-type="number"/>
- <xsl:sort select="country" />
-
- <xsl:call-template name="mirrors-docbook-itemizedlist-listitem" />
- </xsl:for-each>
- </itemizedlist>
- </xsl:template>
-
- <xsl:template name="mirrors-docbook-itemizedlist-listitem">
- <listitem>
- <anchor>
- <xsl:attribute name="id">
- <xsl:value-of select="concat($mirrors-docbook-country-anchor-id, '-', @id, '-', $type)" />
- </xsl:attribute>
- </anchor>
-
- <para><xsl:value-of select="country" /></para>
-
- <itemizedlist>
- <xsl:for-each select="host[@type = $type]">
- <listitem>
- <para>
- <xsl:choose>
- <xsl:when test="url[@proto = $proto]">
- <xsl:for-each select="url[@proto = $proto]">
- <ulink>
- <xsl:attribute name="url"><xsl:value-of select="." /></xsl:attribute>
- <xsl:value-of select="name" />
- </ulink>
- </xsl:for-each>
-
- <xsl:if test="url[
- contains(@proto, 'ftpv6')
- or contains(@proto, 'httpv6')
- or contains(@proto, 'rsyncv6')]">
- <xsl:text> (IPv6)</xsl:text>
- </xsl:if>
- </xsl:when>
-
- <xsl:otherwise>
- <xsl:value-of select="name" />
- </xsl:otherwise>
- </xsl:choose>
- </para>
- </listitem>
- </xsl:for-each>
- </itemizedlist>
- </listitem>
- </xsl:template>
-
- <!-- template: "mirrors-lastmodified-utc" -->
-
- <xsl:template name="mirrors-lastmodified-utc">
- <xsl:param name="basestr" select="substring-after(substring-after($date, ',v '), ' ')" />
- <xsl:param name="datestr" select="substring-before($basestr, ' ')" />
- <xsl:param name="timestr" select="substring-before(substring-after($basestr, ' '), ' ')" />
-
- <xsl:value-of select="concat($datestr, ' ', $timestr, ' UTC')" />
- </xsl:template>
</xsl:stylesheet>
diff --git a/hu_HU.ISO8859-2/share/xml/newsgroups.ent b/hu_HU.ISO8859-2/share/xml/newsgroups.ent
index b828bf5d85..7df30d0c4f 100644
--- a/hu_HU.ISO8859-2/share/xml/newsgroups.ent
+++ b/hu_HU.ISO8859-2/share/xml/newsgroups.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="iso-8859-2"?>
<!--
Names of FreeBSD newsgroups
diff --git a/hu_HU.ISO8859-2/share/xml/teams.ent b/hu_HU.ISO8859-2/share/xml/teams.ent
index cb1aa614f6..9c3d708ea4 100644
--- a/hu_HU.ISO8859-2/share/xml/teams.ent
+++ b/hu_HU.ISO8859-2/share/xml/teams.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="iso-8859-2"?>
<!--
Names and email address of teams of people working on specified
tasks. Usally they're just mail aliases set up at hub.FreeBSD.org
diff --git a/hu_HU.ISO8859-2/share/xml/trademarks.ent b/hu_HU.ISO8859-2/share/xml/trademarks.ent
index c39ebc2e4f..0047602504 100644
--- a/hu_HU.ISO8859-2/share/xml/trademarks.ent
+++ b/hu_HU.ISO8859-2/share/xml/trademarks.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="iso-8859-2"?>
<!--
Trademark Legend, as required by The Open Group, Sun, etc..
diff --git a/hu_HU.ISO8859-2/share/xml/translators.ent b/hu_HU.ISO8859-2/share/xml/translators.ent
index ebecb0c89f..e4fee6f43b 100644
--- a/hu_HU.ISO8859-2/share/xml/translators.ent
+++ b/hu_HU.ISO8859-2/share/xml/translators.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="iso-8859-2"?>
<!--
The FreeBSD Hungarian Documentation Project
diff --git a/it_IT.ISO8859-15/articles/committers-guide/article.xml b/it_IT.ISO8859-15/articles/committers-guide/article.xml
index 192c27e6f3..7f1d560ea9 100644
--- a/it_IT.ISO8859-15/articles/committers-guide/article.xml
+++ b/it_IT.ISO8859-15/articles/committers-guide/article.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-15" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//IT" "../../share/xml/entities.ent">
-%entities;
-]>
+<?xml version="1.0" encoding="iso-8859-15"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<!--
The FreeBSD Italian Documentation Project
diff --git a/it_IT.ISO8859-15/articles/explaining-bsd/article.xml b/it_IT.ISO8859-15/articles/explaining-bsd/article.xml
index 47260430b8..c21bfe494e 100644
--- a/it_IT.ISO8859-15/articles/explaining-bsd/article.xml
+++ b/it_IT.ISO8859-15/articles/explaining-bsd/article.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-15" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//IT" "../../share/xml/entities.ent">
-%entities;
-]>
+<?xml version="1.0" encoding="iso-8859-15"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<!--
The FreeBSD Italian Documentation Project
diff --git a/it_IT.ISO8859-15/articles/filtering-bridges/article.xml b/it_IT.ISO8859-15/articles/filtering-bridges/article.xml
index 85e05a8669..e6c7a87667 100644
--- a/it_IT.ISO8859-15/articles/filtering-bridges/article.xml
+++ b/it_IT.ISO8859-15/articles/filtering-bridges/article.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-15" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//IT" "../../share/xml/entities.ent">
-%entities;
-]>
+<?xml version="1.0" encoding="iso-8859-15"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<!--
The FreeBSD Italian Documentation Project
diff --git a/it_IT.ISO8859-15/articles/new-users/article.xml b/it_IT.ISO8859-15/articles/new-users/article.xml
index d21aa73adb..e4cfb54492 100644
--- a/it_IT.ISO8859-15/articles/new-users/article.xml
+++ b/it_IT.ISO8859-15/articles/new-users/article.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-15" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//IT" "../../share/xml/entities.ent">
-%entities;
-]>
+<?xml version="1.0" encoding="iso-8859-15"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<!--
The FreeBSD Italian Documentation Project
diff --git a/it_IT.ISO8859-15/articles/vm-design/article.xml b/it_IT.ISO8859-15/articles/vm-design/article.xml
index 481ba23bbc..5206368afe 100644
--- a/it_IT.ISO8859-15/articles/vm-design/article.xml
+++ b/it_IT.ISO8859-15/articles/vm-design/article.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-15" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//IT" "../../share/xml/entities.ent">
-%entities;
-]>
+<?xml version="1.0" encoding="iso-8859-15"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<!--
The FreeBSD Italian Documentation Project
diff --git a/it_IT.ISO8859-15/books/handbook/Makefile b/it_IT.ISO8859-15/books/handbook/Makefile
index cdb9231eca..ac5c446808 100644
--- a/it_IT.ISO8859-15/books/handbook/Makefile
+++ b/it_IT.ISO8859-15/books/handbook/Makefile
@@ -248,30 +248,43 @@ DOC_PREFIX?= ${.CURDIR}/../../..
#
# rules generating lists of mirror site from XML database.
#
-XMLDOCS= mirrors-ftp:::mirrors.xml.ftp.inc \
+XMLDOCS= lastmod:::mirrors.lastmod.inc \
+ mirrors-ftp-index:::mirrors.xml.ftp.index.inc \
+ mirrors-ftp:::mirrors.xml.ftp.inc \
+ mirrors-cvsup-index:::mirrors.xml.cvsup.index.inc \
mirrors-cvsup:::mirrors.xml.cvsup.inc \
+ eresources-index:::eresources.xml.www.index.inc \
eresources:::eresources.xml.www.inc
DEPENDSET.DEFAULT= transtable mirror
XSLT.DEFAULT= ${XSL_MIRRORS}
XML.DEFAULT= ${XML_MIRRORS}
-NO_TIDY.DEFAULT= yes
+PARAMS.lastmod+= --param 'target' "'lastmod'"
+PARAMS.mirrors-ftp-index+= --param 'type' "'ftp'" \
+ --param 'proto' "'ftp'" \
+ --param 'target' "'index'"
PARAMS.mirrors-ftp+= --param 'type' "'ftp'" \
--param 'proto' "'ftp'" \
--param 'target' "'handbook/mirrors/chapter.xml'"
+PARAMS.mirrors-cvsup-index+= --param 'type' "'cvsup'" \
+ --param 'proto' "'cvsup'" \
+ --param 'target' "'index'"
PARAMS.mirrors-cvsup+= --param 'type' "'cvsup'" \
--param 'proto' "'cvsup'" \
--param 'target' "'handbook/mirrors/chapter.xml'"
+PARAMS.eresources-index+= --param 'type' "'www'" \
+ --param 'proto' "'http'" \
+ --param 'target' "'index'"
PARAMS.eresources+= --param 'type' "'www'" \
--param 'proto' "'http'" \
--param 'target' "'handbook/eresources/chapter.xml'"
-SRCS+= mirrors.xml.ftp.inc \
+SRCS+= mirrors.lastmod.inc \
+ mirrors.xml.ftp.inc \
+ mirrors.xml.ftp.index.inc \
mirrors.xml.cvsup.inc \
- eresources.xml.www.inc
-
-CLEANFILES+= mirrors.xml.ftp.inc \
- mirrors.xml.cvsup.inc \
- eresources.xml.www.inc
+ mirrors.xml.cvsup.index.inc \
+ eresources.xml.www.inc \
+ eresources.xml.www.index.inc
.include "${DOC_PREFIX}/share/mk/doc.project.mk"
diff --git a/it_IT.ISO8859-15/books/handbook/advanced-networking/chapter.xml b/it_IT.ISO8859-15/books/handbook/advanced-networking/chapter.xml
index ed63027375..292ce6984b 100644
--- a/it_IT.ISO8859-15/books/handbook/advanced-networking/chapter.xml
+++ b/it_IT.ISO8859-15/books/handbook/advanced-networking/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-15" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-15"?>
<!--
The FreeBSD Italian Documentation Project
diff --git a/it_IT.ISO8859-15/books/handbook/audit/chapter.xml b/it_IT.ISO8859-15/books/handbook/audit/chapter.xml
index 134f42f4ec..2621b4d925 100644
--- a/it_IT.ISO8859-15/books/handbook/audit/chapter.xml
+++ b/it_IT.ISO8859-15/books/handbook/audit/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-15" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-15"?>
<!--
The FreeBSD Italian Documentation Project
diff --git a/it_IT.ISO8859-15/books/handbook/basics/chapter.xml b/it_IT.ISO8859-15/books/handbook/basics/chapter.xml
index dda1e24083..b8a5bcabba 100644
--- a/it_IT.ISO8859-15/books/handbook/basics/chapter.xml
+++ b/it_IT.ISO8859-15/books/handbook/basics/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-15" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-15"?>
<!--
The FreeBSD Italian Documentation Project
@@ -1028,7 +1028,7 @@ total 530
memoria montato in
<filename class="directory">/var</filename>.
Questo pu essere automatizzato usando le variabili
- relative a varmfs di &man.rc.conf.5 (o con un entry in
+ relative a varmfs di &man.rc.conf.5; (o con un entry in
<filename>/etc/fstab</filename>; consultare
&man.mdmfs.8;).</entry>
</row>
diff --git a/it_IT.ISO8859-15/books/handbook/bibliography/chapter.xml b/it_IT.ISO8859-15/books/handbook/bibliography/chapter.xml
index 567fe467c7..2a0ee13a6b 100644
--- a/it_IT.ISO8859-15/books/handbook/bibliography/chapter.xml
+++ b/it_IT.ISO8859-15/books/handbook/bibliography/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-15" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-15"?>
<!--
The FreeBSD Italian Documentation Project
diff --git a/it_IT.ISO8859-15/books/handbook/book.xml b/it_IT.ISO8859-15/books/handbook/book.xml
index 5ac5e126b2..67a381dbc2 100644
--- a/it_IT.ISO8859-15/books/handbook/book.xml
+++ b/it_IT.ISO8859-15/books/handbook/book.xml
@@ -1,8 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-15" standalone="no"?>
-<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//IT" "../../share/xml/entities.ent">
-%entities;
+<?xml version="1.0" encoding="iso-8859-15"?>
+<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd" [
<!ENTITY % chapters SYSTEM "chapters.ent">
%chapters;
diff --git a/it_IT.ISO8859-15/books/handbook/boot/chapter.xml b/it_IT.ISO8859-15/books/handbook/boot/chapter.xml
index 3da9ea9e16..4e0ad5bb75 100644
--- a/it_IT.ISO8859-15/books/handbook/boot/chapter.xml
+++ b/it_IT.ISO8859-15/books/handbook/boot/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-15" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-15"?>
<!--
The FreeBSD Italian Documentation Project
diff --git a/it_IT.ISO8859-15/books/handbook/chapters.ent b/it_IT.ISO8859-15/books/handbook/chapters.ent
index 0267af8510..9ceb77664e 100644
--- a/it_IT.ISO8859-15/books/handbook/chapters.ent
+++ b/it_IT.ISO8859-15/books/handbook/chapters.ent
@@ -13,231 +13,61 @@
Original revision: 1.37
-->
-<!ENTITY % not.published "INCLUDE">
-
-<!ENTITY % chap.introduction "IGNORE">
-<!ENTITY % chap.install "IGNORE">
-<!ENTITY % chap.basics "IGNORE">
-<!ENTITY % chap.ports "IGNORE">
-<!ENTITY % chap.config "IGNORE">
-<!ENTITY % chap.boot "IGNORE">
-<!ENTITY % chap.users "IGNORE">
-<!ENTITY % chap.kernelconfig "IGNORE">
-<!ENTITY % chap.security "IGNORE">
-<!ENTITY % chap.jails "IGNORE">
-<!ENTITY % chap.printing "IGNORE">
-<!ENTITY % chap.disks "IGNORE">
-<!ENTITY % chap.geom "IGNORE">
-<!ENTITY % chap.vinum "IGNORE">
-<!ENTITY % chap.x11 "IGNORE">
-<!ENTITY % chap.l10n "IGNORE">
-<!ENTITY % chap.multimedia "IGNORE">
-<!ENTITY % chap.desktop "IGNORE">
-<!ENTITY % chap.serialcomms "IGNORE">
-<!ENTITY % chap.ppp-and-slip "IGNORE">
-<!ENTITY % chap.advanced-networking "IGNORE">
-<!ENTITY % chap.firewalls "IGNORE">
-<!ENTITY % chap.network-servers "IGNORE">
-<!ENTITY % chap.mail "IGNORE">
-<!ENTITY % chap.cutting-edge "IGNORE">
-<!ENTITY % chap.linuxemu "IGNORE">
-<!ENTITY % chap.mirrors "IGNORE">
-<!ENTITY % chap.mirrors.ftp.inc "INCLUDE">
-<!ENTITY % chap.mirrors.cvsup.inc "INCLUDE">
-<!ENTITY % chap.bibliography "IGNORE">
-<!ENTITY % chap.eresources "IGNORE">
-<!ENTITY % chap.eresources.www.inc "INCLUDE">
-<!ENTITY % chap.pgpkeys "IGNORE">
-<!ENTITY % chap.index "IGNORE">
-<!ENTITY % chap.freebsd-glossary "IGNORE">
-<!ENTITY % chap.mac "IGNORE">
-<!ENTITY % chap.audit "IGNORE">
-<!ENTITY % chap.filesystems "IGNORE">
-<!ENTITY % chap.dtrace "IGNORE">
-
<!ENTITY chap.preface SYSTEM "preface/preface.xml">
<!ENTITY % pgpkeys SYSTEM "../../../share/pgpkeys/pgpkeys.ent"> %pgpkeys;
<!-- Part One -->
-<![%chap.introduction;[
<!ENTITY chap.introduction SYSTEM "introduction/chapter.xml">
-]]>
-<![%chap.install;[
<!ENTITY chap.install SYSTEM "install/chapter.xml">
-]]>
-<![%chap.basics;[
<!ENTITY chap.basics SYSTEM "basics/chapter.xml">
-]]>
-<![%chap.ports;[
<!ENTITY chap.ports SYSTEM "ports/chapter.xml">
-]]>
-<![%chap.x11;[
<!ENTITY chap.x11 SYSTEM "x11/chapter.xml">
-]]>
<!-- Part Two -->
-<![%chap.desktop;[
<!ENTITY chap.desktop SYSTEM "desktop/chapter.xml">
-]]>
-<![%chap.multimedia;[
<!ENTITY chap.multimedia SYSTEM "multimedia/chapter.xml">
-]]>
-<![%chap.kernelconfig;[
<!ENTITY chap.kernelconfig SYSTEM "kernelconfig/chapter.xml">
-]]>
-<![%chap.printing;[
<!ENTITY chap.printing SYSTEM "printing/chapter.xml">
-]]>
-<![%chap.linuxemu;[
<!ENTITY chap.linuxemu SYSTEM "linuxemu/chapter.xml">
-]]>
<!-- Part Three -->
-<![%chap.config;[
<!ENTITY chap.config SYSTEM "config/chapter.xml">
-]]>
-<![%chap.boot;[
<!ENTITY chap.boot SYSTEM "boot/chapter.xml">
-]]>
-<![%chap.users;[
<!ENTITY chap.users SYSTEM "users/chapter.xml">
-]]>
-<![%chap.security;[
<!ENTITY chap.security SYSTEM "security/chapter.xml">
-]]>
-<![%chap.jails;[
<!ENTITY chap.jails SYSTEM "jails/chapter.xml">
-]]>
-<![%chap.mac;[
<!ENTITY chap.mac SYSTEM "mac/chapter.xml">
-]]>
-<![%chap.audit;[
<!ENTITY chap.audit SYSTEM "audit/chapter.xml">
-]]>
-<![%chap.disks;[
<!ENTITY chap.disks SYSTEM "disks/chapter.xml">
-]]>
-<![%chap.geom;[
<!ENTITY chap.geom SYSTEM "geom/chapter.xml">
-]]>
-<![%chap.filesystems;[
<!ENTITY chap.filesystems SYSTEM "filesystems/chapter.xml">
-]]>
-<![%chap.vinum;[
<!ENTITY chap.vinum SYSTEM "vinum/chapter.xml">
-]]>
-<![%chap.virtualization;[
<!ENTITY chap.virtualization SYSTEM "virtualization/chapter.xml">
-]]>
-<![%chap.l10n;[
<!ENTITY chap.l10n SYSTEM "l10n/chapter.xml">
-]]>
-<![%chap.cutting-edge;[
<!ENTITY chap.cutting-edge SYSTEM "cutting-edge/chapter.xml">
-]]>
-<![%chap.dtrace;[
<!ENTITY chap.dtrace SYSTEM "dtrace/chapter.xml">
-]]>
<!-- Part Four -->
-<![%chap.serialcomms;[
<!ENTITY chap.serialcomms SYSTEM "serialcomms/chapter.xml">
-]]>
-<![%chap.ppp-and-slip;[
<!ENTITY chap.ppp-and-slip SYSTEM "ppp-and-slip/chapter.xml">
-]]>
-<![%chap.mail;[
<!ENTITY chap.mail SYSTEM "mail/chapter.xml">
-]]>
-<![%chap.network-servers;[
<!ENTITY chap.network-servers SYSTEM "network-servers/chapter.xml">
-]]>
-<![%chap.firewalls;[
<!ENTITY chap.firewalls SYSTEM "firewalls/chapter.xml">
-]]>
-<![%chap.advanced-networking;[
<!ENTITY chap.advanced-networking SYSTEM "advanced-networking/chapter.xml">
-]]>
<!-- Part Five (appendices) -->
-<![%chap.mirrors;[
- <!ENTITY chap.mirrors SYSTEM "mirrors/chapter.xml">
-]]>
-<![%chap.mirrors.ftp.inc;[
- <!ENTITY chap.mirrors.ftp.inc SYSTEM "mirrors.xml.ftp.inc">
-]]>
-<![%chap.mirrors.cvsup.inc;[
- <!ENTITY chap.mirrors.cvsup.inc SYSTEM "mirrors.xml.cvsup.inc">
-]]>
-<![%chap.bibliography;[
+ <!ENTITY chap.mirrors SYSTEM "mirrors/chapter.xml">
+ <!ENTITY chap.mirrors.lastmod.inc SYSTEM "mirrors.lastmod.inc">
+ <!ENTITY chap.mirrors.ftp.index.inc SYSTEM "mirrors.xml.ftp.index.inc">
+ <!ENTITY chap.mirrors.ftp.inc SYSTEM "mirrors.xml.ftp.inc">
+ <!ENTITY chap.mirrors.cvsup.index.inc SYSTEM "mirrors.xml.cvsup.index.inc">
+ <!ENTITY chap.mirrors.cvsup.inc SYSTEM "mirrors.xml.cvsup.inc">
<!ENTITY chap.bibliography SYSTEM "bibliography/chapter.xml">
-]]>
-<![%chap.eresources;[
- <!ENTITY chap.eresources SYSTEM "eresources/chapter.xml">
-]]>
-<![%chap.eresources.www.inc;[
- <!ENTITY chap.eresources.www.inc SYSTEM "eresources.xml.www.inc">
-]]>
-<![%chap.pgpkeys;[
+ <!ENTITY chap.eresources SYSTEM "eresources/chapter.xml">
+ <!ENTITY chap.eresources.www.index.inc SYSTEM "eresources.xml.www.index.inc">
+ <!ENTITY chap.eresources.www.inc SYSTEM "eresources.xml.www.inc">
<!ENTITY chap.pgpkeys SYSTEM "pgpkeys/chapter.xml">
-]]>
-<![%chap.freebsd-glossary;[
<!ENTITY chap.freebsd-glossary "&freebsd-glossary;">
-]]>
-<![%chap.index;[
- <!ENTITY chap.index SYSTEM "index.xml">
-]]>
+ <!ENTITY chap.index "">
<!ENTITY chap.colophon SYSTEM "colophon.xml">
-
-<!-- IGNORE cases -->
-
-<!-- Part One -->
-<!ENTITY chap.introduction "">
-<!ENTITY chap.install "">
-<!ENTITY chap.basics "">
-<!ENTITY chap.ports "">
-<!ENTITY chap.x11 "">
-
-<!-- Part Two -->
-<!ENTITY chap.desktop "">
-<!ENTITY chap.multimedia "">
-<!ENTITY chap.kernelconfig "">
-<!ENTITY chap.printing "">
-<!ENTITY chap.linuxemu "">
-
-<!-- Part Three -->
-<!ENTITY chap.config "">
-<!ENTITY chap.boot "">
-<!ENTITY chap.users "">
-<!ENTITY chap.security "">
-<!ENTITY chap.jails "">
-<!ENTITY chap.mac "">
-<!ENTITY chap.audit "">
-<!ENTITY chap.disks "">
-<!ENTITY chap.geom "">
-<!ENTITY chap.filesystems "">
-<!ENTITY chap.vinum "">
-<!ENTITY chap.virtualization "">
-<!ENTITY chap.l10n "">
-<!ENTITY chap.cutting-edge "">
-<!ENTITY chap.dtrace "">
-
-<!-- Part Four -->
-<!ENTITY chap.serialcomms "">
-<!ENTITY chap.ppp-and-slip "">
-<!ENTITY chap.mail "">
-<!ENTITY chap.network-servers "">
-<!ENTITY chap.firewalls "">
-<!ENTITY chap.advanced-networking "">
-
-<!-- Part Five (appendices) -->
-<!ENTITY chap.mirrors "">
-<!ENTITY chap.mirrors.ftp.inc "">
-<!ENTITY chap.mirrors.cvsup.inc "">
-<!ENTITY chap.bibliography "">
-<!ENTITY chap.eresources "">
-<!ENTITY chap.eresources.www.inc "">
-<!ENTITY chap.pgpkeys "">
-<!ENTITY chap.freebsd-glossary "">
-<!ENTITY chap.index "">
diff --git a/it_IT.ISO8859-15/books/handbook/colophon.xml b/it_IT.ISO8859-15/books/handbook/colophon.xml
index 12584e1292..f2164d55cc 100644
--- a/it_IT.ISO8859-15/books/handbook/colophon.xml
+++ b/it_IT.ISO8859-15/books/handbook/colophon.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-15" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-15"?>
<!--
The FreeBSD Italian Documentation Project
diff --git a/it_IT.ISO8859-15/books/handbook/config/chapter.xml b/it_IT.ISO8859-15/books/handbook/config/chapter.xml
index 301ee5cbf4..ed4c936181 100644
--- a/it_IT.ISO8859-15/books/handbook/config/chapter.xml
+++ b/it_IT.ISO8859-15/books/handbook/config/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-15" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-15"?>
<!--
The FreeBSD Italian Documentation Project
@@ -412,7 +412,7 @@ stop)
kill -9 `cat /var/run/utility.pid`
;;
*)
- echo "Usage: `basename $0` {start|stop}" &gt;&2
+ echo "Usage: `basename $0` {start|stop}" &gt;&amp;2
exit 64
;;
esac
@@ -876,7 +876,7 @@ sshd is running as pid 433.</screen>
&man.rc.8; e &man.rc.subr.8;. Se sei interessato
a scrivere un tuo script <filename>rc.d</filename> o
a migliorarne uno esisente, ti pu essere utile
- <ulink url="&url.articles.rc-scripting">questo
+ <ulink url="&url.articles.rc-scripting;">questo
articolo</ulink>.</para>
</sect1>
diff --git a/it_IT.ISO8859-15/books/handbook/cutting-edge/chapter.xml b/it_IT.ISO8859-15/books/handbook/cutting-edge/chapter.xml
index cf65803818..1f4591d92d 100644
--- a/it_IT.ISO8859-15/books/handbook/cutting-edge/chapter.xml
+++ b/it_IT.ISO8859-15/books/handbook/cutting-edge/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-15" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-15"?>
<!--
The FreeBSD Italian Documentation Project
diff --git a/it_IT.ISO8859-15/books/handbook/desktop/chapter.xml b/it_IT.ISO8859-15/books/handbook/desktop/chapter.xml
index 527a64779f..2ea19b4d15 100644
--- a/it_IT.ISO8859-15/books/handbook/desktop/chapter.xml
+++ b/it_IT.ISO8859-15/books/handbook/desktop/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-15" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-15"?>
<!--
The FreeBSD Italian Documentation Project
diff --git a/it_IT.ISO8859-15/books/handbook/disks/chapter.xml b/it_IT.ISO8859-15/books/handbook/disks/chapter.xml
index d1ca1c8bfd..8ddc5083f2 100644
--- a/it_IT.ISO8859-15/books/handbook/disks/chapter.xml
+++ b/it_IT.ISO8859-15/books/handbook/disks/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-15" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-15"?>
<!--
The FreeBSD Italian Documentation Project
diff --git a/it_IT.ISO8859-15/books/handbook/eresources/chapter.xml b/it_IT.ISO8859-15/books/handbook/eresources/chapter.xml
index 32bcf454c5..bc25ce5876 100644
--- a/it_IT.ISO8859-15/books/handbook/eresources/chapter.xml
+++ b/it_IT.ISO8859-15/books/handbook/eresources/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-15" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-15"?>
<!--
The FreeBSD Italian Documentation Project
@@ -1900,6 +1900,10 @@
<sect1 id="eresources-web">
<title>Server World Wide Web</title>
+ &chap.eresources.www.index.inc;
+
+ &chap.mirrors.lastmod.inc;
+
&chap.eresources.www.inc;
</sect1>
diff --git a/it_IT.ISO8859-15/books/handbook/firewalls/chapter.xml b/it_IT.ISO8859-15/books/handbook/firewalls/chapter.xml
index 9a1175e512..22a53ccfbd 100644
--- a/it_IT.ISO8859-15/books/handbook/firewalls/chapter.xml
+++ b/it_IT.ISO8859-15/books/handbook/firewalls/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-15" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-15"?>
<!--
The FreeBSD Italian Documentation Project
diff --git a/it_IT.ISO8859-15/books/handbook/geom/chapter.xml b/it_IT.ISO8859-15/books/handbook/geom/chapter.xml
index db18e85c1d..c01e0fb637 100644
--- a/it_IT.ISO8859-15/books/handbook/geom/chapter.xml
+++ b/it_IT.ISO8859-15/books/handbook/geom/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-15" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-15"?>
<!--
The FreeBSD Documentation Project
$FreeBSD$
@@ -330,7 +330,7 @@ Done.</screen>
codice di boot. In caso contrario il fallimento
garantito.</para>
- <screen>&prompt.root; <userinput>dump -L -0 -f- / |(cd /mnt && restore -r -v -f-)</userinput></screen>
+ <screen>&prompt.root; <userinput>dump -L -0 -f- / |(cd /mnt &amp;&amp; restore -r -v -f-)</userinput></screen>
<para>Questo deve essere fatto per ciascun filesystem. Disponi
semplicemente il filesystem appropriato nella posizione corretta quando
diff --git a/it_IT.ISO8859-15/books/handbook/install/chapter.xml b/it_IT.ISO8859-15/books/handbook/install/chapter.xml
index 1b14263f69..fb6bddbab6 100644
--- a/it_IT.ISO8859-15/books/handbook/install/chapter.xml
+++ b/it_IT.ISO8859-15/books/handbook/install/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-15" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-15"?>
<!--
The FreeBSD Italian Documentation Project
@@ -105,7 +105,7 @@
processo venga completato con successo, quindi potrai avere bisogno
di modificare la tua configurazione.</para>
- <para>Se hai gi&agrave un altro sistema operativo installato, ad
+ <para>Se hai gi un altro sistema operativo installato, ad
esempio &windows; o Linux, potrebbe essere una buona idea vedere come
configurato l'hardware su quei sistemi operativi. Se non sei
sicuro della configurazione usata da una certa scheda di espansione,
@@ -683,7 +683,7 @@ pqb0.0.1.4.0 PQB0 PCI EIDE</screen>
<para>Su FreeBSD, <filename>/dev/fd0</filename>
riferito al primo floppy disk (il dispositivo
<devicename>A:</devicename>). <filename>/dev/fd1</filename> sarebbe
- il dispositivo <devicename>B:</devicename>, e cos&iacute via. Altre
+ il dispositivo <devicename>B:</devicename>, e cosi via. Altre
varianti &unix; potrebbero avere nomi differenti per i dispositivi
floppy disk, e se necessario consulta la documentazione del sistema
che stai usando.</para>
@@ -5159,7 +5159,7 @@ Please press any key to reboot.</screen>
necessario.</para>
<para>Usa l'immagine del disco uno se vuoi installare una release
- di &os e se vuoi anche un
+ di &os; e se vuoi anche un
modesto assortimento di package di terze parti.</para>
<para>Le altre immagini sono utili, ma non essenziali,
diff --git a/it_IT.ISO8859-15/books/handbook/introduction/chapter.xml b/it_IT.ISO8859-15/books/handbook/introduction/chapter.xml
index 14df612ca5..ec4ce89f21 100644
--- a/it_IT.ISO8859-15/books/handbook/introduction/chapter.xml
+++ b/it_IT.ISO8859-15/books/handbook/introduction/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-15" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-15"?>
<!--
The FreeBSD Italian Documentation Project
@@ -732,7 +732,7 @@
<para>Quel codice nel nostro albero dei sorgenti che cade sotto
la GNU General Public Licence (GPL) o la GNU Lesser General Public
- License (LGPL) ha un po' pi&ugrave di vincoli, sebbene
+ License (LGPL) ha un po' pi di vincoli, sebbene
almeno dal lato di rafforzare l'accesso piuttosto che l'opposto.
Date le complessit aggiuntive che possono
risultare dall'uso commerciale di software GPL noi preferiamo,
@@ -932,7 +932,7 @@
&i486;, &pentium;, &pentium;&nbsp;Pro, &celeron;, &pentium;&nbsp;II,
&pentium;&nbsp;III, &pentium;&nbsp;4 (o compatibili), &xeon;, DEC
<trademark>Alpha</trademark> e Sun &ultrasparc;.
- &Egrave basato principalmente su software del gruppo CSRG della
+ basato principalmente su software del gruppo CSRG della
U.C. Berkeley, con alcuni miglioramenti presi da NetBSD, OpenBSD,
386BSD, e dalla Free Software Foundation.</para>
diff --git a/it_IT.ISO8859-15/books/handbook/jails/chapter.xml b/it_IT.ISO8859-15/books/handbook/jails/chapter.xml
index caca9ab330..4b3bb7fd23 100644
--- a/it_IT.ISO8859-15/books/handbook/jails/chapter.xml
+++ b/it_IT.ISO8859-15/books/handbook/jails/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-15" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-15"?>
<!--
The FreeBSD Italian Documentation Project
diff --git a/it_IT.ISO8859-15/books/handbook/kernelconfig/chapter.xml b/it_IT.ISO8859-15/books/handbook/kernelconfig/chapter.xml
index ed2eb3a398..71d5a0e450 100644
--- a/it_IT.ISO8859-15/books/handbook/kernelconfig/chapter.xml
+++ b/it_IT.ISO8859-15/books/handbook/kernelconfig/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-15" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-15"?>
<!--
The FreeBSD Documentation Project
@@ -434,7 +434,7 @@
<programlisting>machine i386</programlisting>
- <para>Questa &egrave la architettura della macchina. Deve essere
+ <para>Questa la architettura della macchina. Deve essere
una fra <literal>alpha</literal>, <literal>amd64</literal>,
<literal>i386</literal>, <literal>ia64</literal>,
<literal>pc98</literal>, <literal>powerpc</literal>, o
diff --git a/it_IT.ISO8859-15/books/handbook/l10n/chapter.xml b/it_IT.ISO8859-15/books/handbook/l10n/chapter.xml
index b425244c63..145fc004e4 100644
--- a/it_IT.ISO8859-15/books/handbook/l10n/chapter.xml
+++ b/it_IT.ISO8859-15/books/handbook/l10n/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-15" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-15"?>
<!--
The FreeBSD Italian Documentation Project
diff --git a/it_IT.ISO8859-15/books/handbook/linuxemu/chapter.xml b/it_IT.ISO8859-15/books/handbook/linuxemu/chapter.xml
index b89fed7182..b7066c731a 100644
--- a/it_IT.ISO8859-15/books/handbook/linuxemu/chapter.xml
+++ b/it_IT.ISO8859-15/books/handbook/linuxemu/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-15" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-15"?>
<!--
The FreeBSD Italian Documentation Project
@@ -662,14 +662,14 @@ LOG=/var/log/lmgrd.log
case "$1" in
start)
- lmgrd -c ${LICENSE_FILE} 2&gt;&gt; ${LOG} 1&gt;&2
+ lmgrd -c ${LICENSE_FILE} 2&gt;&gt; ${LOG} 1&gt;&amp;2
echo -n " lmgrd"
;;
stop)
- llmgrd -c ${LICENSE_FILE} -x lmdown 2&gt;&gt; ${LOG} 1&gt;&2
+ llmgrd -c ${LICENSE_FILE} -x lmdown 2&gt;&gt; ${LOG} 1&gt;&amp;2
;;
*)
- echo "Usage: `basename $0` {start|stop}" 1&gt;&2
+ echo "Usage: `basename $0` {start|stop}" 1&gt;&amp;2
exit 64
;;
esac
@@ -964,7 +964,7 @@ exit 0</programlisting>
che segue:</para>
<programlisting>#!/usr/compat/linux/bin/sh
-(sleep 5; killall -1 matlab_helper) &
+(sleep 5; killall -1 matlab_helper) &amp;
exit 0</programlisting>
</step>
@@ -3739,7 +3739,7 @@ options SHMMAXPGS=393216
<para>Se sei curioso di come funziona la compatibilit con i binari
di Linux, questa la sezione da leggere. Molto di ci
- che segue basato pesantemente su una email scritta a &a.chat
+ che segue basato pesantemente su una email scritta a &a.chat;
da Terry Lambert <email>tlambert@primenet.com</email> (ID del messaggio:
<literal>&lt;199906020108.SAA07001@usr09.primenet.com&gt;</literal>).</para>
diff --git a/it_IT.ISO8859-15/books/handbook/mac/chapter.xml b/it_IT.ISO8859-15/books/handbook/mac/chapter.xml
index 6cb97ff857..1e0bc0d344 100644
--- a/it_IT.ISO8859-15/books/handbook/mac/chapter.xml
+++ b/it_IT.ISO8859-15/books/handbook/mac/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-15" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-15"?>
<!--
The FreeBSD Italian Documentation Project
diff --git a/it_IT.ISO8859-15/books/handbook/mail/chapter.xml b/it_IT.ISO8859-15/books/handbook/mail/chapter.xml
index 795d4fc7dc..413aa662fd 100644
--- a/it_IT.ISO8859-15/books/handbook/mail/chapter.xml
+++ b/it_IT.ISO8859-15/books/handbook/mail/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-15" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-15"?>
<!--
The FreeBSD Italian Documentation Project
@@ -1040,7 +1040,7 @@ in /etc/mail/sendmail.cf.</programlisting>
<para>L'altro trovare un server Internet a tempo pieno
che fornisca un servizio MX secondario per il tuo dominio.
- Per esempio, se il dominio della tua societ &egrave
+ Per esempio, se il dominio della tua societ
<hostid role="domainname">example.com</hostid> e il tuo fornitore
di servizi Internet ha attivato <hostid
role="domainname">example.net</hostid> per fornire il servizio
@@ -1756,11 +1756,11 @@ SENDMAIL_LDADD=-lsasl2</programlisting>
seguenti comandi:</para>
<screen>&prompt.root; <userinput>cd /usr/src/lib/libsmutil</userinput>
-&prompt.root; <userinput>make cleandir && make obj && make</userinput>
+&prompt.root; <userinput>make cleandir &amp;&amp; make obj &amp;&amp; make</userinput>
&prompt.root; <userinput>cd /usr/src/lib/libsm</userinput>
-&prompt.root; <userinput>make cleandir && make obj && make</userinput>
+&prompt.root; <userinput>make cleandir &amp;&amp; make obj &amp;&amp; make</userinput>
&prompt.root; <userinput>cd /usr/src/usr.sbin/sendmail</userinput>
-&prompt.root; <userinput>make cleandir && make obj && make && make install</userinput></screen>
+&prompt.root; <userinput>make cleandir &amp;&amp; make obj &amp;&amp; make &amp;&amp; make install</userinput></screen>
<para>Se <filename>/usr/src</filename> non ha subito enormi cambiamenti
e se le librerie condivise di cui si ha bisogno sono disponibili, la
diff --git a/it_IT.ISO8859-15/books/handbook/mirrors/chapter.xml b/it_IT.ISO8859-15/books/handbook/mirrors/chapter.xml
index 68d8fd6d78..4ce9c0f6bf 100644
--- a/it_IT.ISO8859-15/books/handbook/mirrors/chapter.xml
+++ b/it_IT.ISO8859-15/books/handbook/mirrors/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-15" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-15"?>
<!--
The FreeBSD Italian Documentation Project
@@ -289,6 +289,10 @@
I metodi di accesso disponibili per ogni sito sono elencati fra parentesi
dopo il nome dell'host.</para>
+ &chap.mirrors.ftp.index.inc;
+
+ &chap.mirrors.lastmod.inc;
+
&chap.mirrors.ftp.inc;
</sect1>
@@ -312,7 +316,7 @@
progetto FreeBSD. Per utilizzarlo sufficiente impostare la
variabile di ambiente <envar>CVSROOT</envar> facendola puntare al server
anoncvs appropriato, immettere la password <quote>anoncvs</quote> con il
- comando <command>cvs login</command>, e poi usare il comando &man.cvs.1
+ comando <command>cvs login</command>, e poi usare il comando &man.cvs.1;
per accederci come se fosse un deposito locale.</para>
<note>
@@ -676,7 +680,7 @@ Warning: Permanently added 'anoncvs.freebsd.org' (DSA) to the list of known host
toccher il tuo albero. Per verificare una delta puoi usare
l'opzione <option>-c</option> e di fatto <application>CTM</application>
non toccher il tuo albero; verificher soltanto
- l'integrit&agrave della delta e se questa pu essere applicata
+ l'integrit della delta e se questa pu essere applicata
in modo pulito al tuo albero attuale.</para>
<para>Ci sono altre opzioni di <application>CTM</application>, guarda
@@ -2281,6 +2285,10 @@ doc/zh_*</screen>
<para>I server <link linkend="cvsup">CVSup</link> per FreeBSD si trovano
ai seguenti siti:</para>
+ &chap.mirrors.cvsup.index.inc;
+
+ &chap.mirrors.lastmod.inc;
+
&chap.mirrors.cvsup.inc;
</sect2>
</sect1>
diff --git a/it_IT.ISO8859-15/books/handbook/multimedia/chapter.xml b/it_IT.ISO8859-15/books/handbook/multimedia/chapter.xml
index c000807d38..30c439f4d0 100644
--- a/it_IT.ISO8859-15/books/handbook/multimedia/chapter.xml
+++ b/it_IT.ISO8859-15/books/handbook/multimedia/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-15" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-15"?>
<!--
The FreeBSD Italian Documentation Project
diff --git a/it_IT.ISO8859-15/books/handbook/network-servers/chapter.xml b/it_IT.ISO8859-15/books/handbook/network-servers/chapter.xml
index 9853790ca7..6086fb74c9 100644
--- a/it_IT.ISO8859-15/books/handbook/network-servers/chapter.xml
+++ b/it_IT.ISO8859-15/books/handbook/network-servers/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-15" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-15"?>
<!--
The FreeBSD Italian Documentation Project
@@ -2949,7 +2949,7 @@ domain</replaceable>,<replaceable>server</replaceable>"</programlisting>
disponibile nel port <filename
role="package">net/isc-dhcp3-server</filename>. Le
pagine di manuale &man.dhclient.8;, &man.dhcp-options.5;, e
- &man.dhclient.conf.5, oltre ai riferimenti
+ &man.dhclient.conf.5;, oltre ai riferimenti
elencati oltre, sono risorse utili.</para>
</sect2>
@@ -4054,7 +4054,7 @@ www IN CNAME @</programlisting>
<literal>www</literal> si trasformerebbe in
<hostid>www.example.org</hostid>.</para>
- <para>Il formato di un file di zona &egrave
+ <para>Il formato di un file di zona
il seguente:</para>
<programlisting>recordname IN recordtype
diff --git a/it_IT.ISO8859-15/books/handbook/pgpkeys/chapter.xml b/it_IT.ISO8859-15/books/handbook/pgpkeys/chapter.xml
index 892d47e998..019a186673 100644
--- a/it_IT.ISO8859-15/books/handbook/pgpkeys/chapter.xml
+++ b/it_IT.ISO8859-15/books/handbook/pgpkeys/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-15" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-15"?>
<!--
The FreeBSD Italian Documentation Project
@@ -20,7 +20,7 @@
<sect1 id="pgpkeys-officers">
<title>Cariche Ufficiali</title>
- &section.pgpkeys-officers
+ &section.pgpkeys-officers;
</sect1>
<sect1 id="pgpkeys-core">
diff --git a/it_IT.ISO8859-15/books/handbook/ports/chapter.xml b/it_IT.ISO8859-15/books/handbook/ports/chapter.xml
index d27179da5e..3380d29503 100644
--- a/it_IT.ISO8859-15/books/handbook/ports/chapter.xml
+++ b/it_IT.ISO8859-15/books/handbook/ports/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-15" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-15"?>
<!--
The FreeBSD Italian Documentation Project
@@ -1250,7 +1250,7 @@ ftp://ftp.FreeBSD.org/pub/FreeBSD/ports/distfiles/ fetch</userinput></screen>
<para>Di solito dopo aver installato una nuova applicazione dovresti
leggere la documentazione che potrebbe essere stata inclusa, modificare
qualche file di configurazione, assicurarti che l'applicazione parta nella
- fase di avvio (se un demone), e cos&igrave via;.</para>
+ fase di avvio (se un demone), e cos via;.</para>
<para>I passi precisi che devi seguire per configurare un'applicazione
sono ovviamente diversi da applicazione a applicazione. Comunque, se hai
diff --git a/it_IT.ISO8859-15/books/handbook/ppp-and-slip/chapter.xml b/it_IT.ISO8859-15/books/handbook/ppp-and-slip/chapter.xml
index 3aa926563a..a1c5b38e0c 100644
--- a/it_IT.ISO8859-15/books/handbook/ppp-and-slip/chapter.xml
+++ b/it_IT.ISO8859-15/books/handbook/ppp-and-slip/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-15" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-15"?>
<!--
The FreeBSD Italian Documentation Project
diff --git a/it_IT.ISO8859-15/books/handbook/preface/preface.xml b/it_IT.ISO8859-15/books/handbook/preface/preface.xml
index 75f61ad0d2..a23929126e 100644
--- a/it_IT.ISO8859-15/books/handbook/preface/preface.xml
+++ b/it_IT.ISO8859-15/books/handbook/preface/preface.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-15" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-15"?>
<!--
The FreeBSD Italian Documentation Project
diff --git a/it_IT.ISO8859-15/books/handbook/printing/chapter.xml b/it_IT.ISO8859-15/books/handbook/printing/chapter.xml
index bcb9a63616..b892a989c2 100644
--- a/it_IT.ISO8859-15/books/handbook/printing/chapter.xml
+++ b/it_IT.ISO8859-15/books/handbook/printing/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-15" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-15"?>
<!--
The FreeBSD Italian Documentation Project
diff --git a/it_IT.ISO8859-15/books/handbook/security/chapter.xml b/it_IT.ISO8859-15/books/handbook/security/chapter.xml
index 6d983c6e33..379ee0644e 100644
--- a/it_IT.ISO8859-15/books/handbook/security/chapter.xml
+++ b/it_IT.ISO8859-15/books/handbook/security/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-15" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-15"?>
<!--
The FreeBSD Italian Documentation Project
diff --git a/it_IT.ISO8859-15/books/handbook/serialcomms/chapter.xml b/it_IT.ISO8859-15/books/handbook/serialcomms/chapter.xml
index d879ce1aae..c26f7aeddc 100644
--- a/it_IT.ISO8859-15/books/handbook/serialcomms/chapter.xml
+++ b/it_IT.ISO8859-15/books/handbook/serialcomms/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-15" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-15"?>
<!--
The FreeBSD Italian Documentation Project
diff --git a/it_IT.ISO8859-15/books/handbook/users/chapter.xml b/it_IT.ISO8859-15/books/handbook/users/chapter.xml
index 2885dfab92..5f6d67652a 100644
--- a/it_IT.ISO8859-15/books/handbook/users/chapter.xml
+++ b/it_IT.ISO8859-15/books/handbook/users/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-15" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-15"?>
<!--
The FreeBSD Italian Documentation Project
diff --git a/it_IT.ISO8859-15/books/handbook/vinum/chapter.xml b/it_IT.ISO8859-15/books/handbook/vinum/chapter.xml
index 426a61e26a..333e299d01 100644
--- a/it_IT.ISO8859-15/books/handbook/vinum/chapter.xml
+++ b/it_IT.ISO8859-15/books/handbook/vinum/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-15" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-15"?>
<!--
The FreeBSD Italian Documentation Project
diff --git a/it_IT.ISO8859-15/books/handbook/virtualization/chapter.xml b/it_IT.ISO8859-15/books/handbook/virtualization/chapter.xml
index b584655cdb..c42e8fef36 100644
--- a/it_IT.ISO8859-15/books/handbook/virtualization/chapter.xml
+++ b/it_IT.ISO8859-15/books/handbook/virtualization/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-15" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-15"?>
<!--
The FreeBSD Italian Documentation Project
diff --git a/it_IT.ISO8859-15/books/handbook/x11/chapter.xml b/it_IT.ISO8859-15/books/handbook/x11/chapter.xml
index 6f8fee3c4d..e65ad7dab0 100644
--- a/it_IT.ISO8859-15/books/handbook/x11/chapter.xml
+++ b/it_IT.ISO8859-15/books/handbook/x11/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-15" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-15"?>
<!--
The FreeBSD Italian Documentation Project
@@ -337,7 +337,7 @@
l'implementazione
dell'X server dell'X Window System rilasciato dalla Fondazione X.Org.
<application>&xorg;</application> basato sul codice di
- <application>&xfree86&nbsp;4.4RC2</application> e X11R6.6.
+ <application>&xfree86;&nbsp;4.4RC2</application> e X11R6.6.
La versione di <application>&xorg;</application> disponibile al momento
nella Collezione dei Ports &xorg.version;.</para>
diff --git a/it_IT.ISO8859-15/books/unix-introduction/bibliography/chapter.xml b/it_IT.ISO8859-15/books/unix-introduction/bibliography/chapter.xml
index 4cd3a6bee9..53c457123d 100644
--- a/it_IT.ISO8859-15/books/unix-introduction/bibliography/chapter.xml
+++ b/it_IT.ISO8859-15/books/unix-introduction/bibliography/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-15" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-15"?>
<!--
The FreeBSD Italian Documentation Project
diff --git a/it_IT.ISO8859-15/books/unix-introduction/book.xml b/it_IT.ISO8859-15/books/unix-introduction/book.xml
index 644f307a4c..02390711ae 100644
--- a/it_IT.ISO8859-15/books/unix-introduction/book.xml
+++ b/it_IT.ISO8859-15/books/unix-introduction/book.xml
@@ -1,8 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-15" standalone="no"?>
-<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//IT" "../../share/xml/entities.ent">
-%entities;
+<?xml version="1.0" encoding="iso-8859-15"?>
+<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd" [
<!ENTITY % chapters SYSTEM "chapters.ent"> %chapters;
]>
diff --git a/it_IT.ISO8859-15/books/unix-introduction/command-summary/chapter.xml b/it_IT.ISO8859-15/books/unix-introduction/command-summary/chapter.xml
index cb86713741..bfa23cb4d5 100644
--- a/it_IT.ISO8859-15/books/unix-introduction/command-summary/chapter.xml
+++ b/it_IT.ISO8859-15/books/unix-introduction/command-summary/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-15" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-15"?>
<!--
The FreeBSD Italian Documentation Project
diff --git a/it_IT.ISO8859-15/books/unix-introduction/commands/chapter.xml b/it_IT.ISO8859-15/books/unix-introduction/commands/chapter.xml
index 198dd8f603..c0e86cc887 100644
--- a/it_IT.ISO8859-15/books/unix-introduction/commands/chapter.xml
+++ b/it_IT.ISO8859-15/books/unix-introduction/commands/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-15" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-15"?>
<!--
The FreeBSD Italian Documentation Project
@@ -278,13 +278,13 @@ mon.logins tues.logins differ: char 9, line 2</screen>
<screen>&prompt.user; <userinput>diff mon.logins tues.logins</userinput>
2d1
-< bsmith
+&lt; bsmith
4a4
-> jdoe
+&gt; jdoe
7c7
-< mschmidt
+&lt; mschmidt
---
-> proy</screen>
+&gt; proy</screen>
<para>Notare che l'output mostra sia l'elenco delle differenze sia in
quale file queste esistono. Le linee del primo file sono precedute da
@@ -1542,7 +1542,7 @@ source.tar.Z: Blocchi di dati compressi 16 bit</screen>
<para><emphasis>Esempi:</emphasis></para>
<para>L'esempio seguente usa come file di input una lista di libri di
- P. G. Wodehouse Jeeves & Wooster.</para>
+ P. G. Wodehouse Jeeves &amp; Wooster.</para>
<programlisting>The Inimitable Jeeves [1923] The Mating Season [1949]
Carry On, Jeeves [1925] Ring for Jeeves [1953]
@@ -2207,22 +2207,22 @@ beauty:01/31/94:#total logins,2175:#different UIDs,1194</screen>
<programlisting>begin 555 binary_filename
-M?T5,1@$" 0 " ( ! %"W #0 5"< T "
+M?T5,1@$" 0 " ( ! %"W #0 5"&lt; T "
M!0 H !4 % 8 T $ - "@ H 4 P
M -0 !$ ! ! ! %"
-M%P !0A< % $ $ 4(8 -"& W& W% < 0
+M%P !0A&lt; % $ $ 4(8 -"&amp; W&amp; W% &lt; 0
M @ !0B T(@ )@ !P O=7-R+VQI8B]L9"YS
-M;RXQ ?< 'Y VP "O !VP )8 &6 !G0
-M %[ U0 %G !3 ;< #Q %Q !
+M;RXQ ?&lt; 'Y VP "O !VP )8 &amp;6 !G0
+M %[ U0 %G !3 ;&lt; #Q %Q !
MEP :P !_ '@ !PP (P
-M N0 =H _0 $D Y < #F /L
-M01 $' $ & ! P #0A@ 4(8
+M N0 =H _0 $D Y &lt; #F /L
+M01 $' $ &amp; ! P #0A@ 4(8
M" ! 0 !E !@ , T(@ %"( )@ $
M 0 ( ;@ $ ' -"N !0K@ /H
M $ # ', ! P #1J 4:@ #8 !
M !Y 0 , TH %* !=X 0
M@ @ # -/X !3^ "E, $ (4 !
-M 4_> )0 0 ". P
+M 4_&gt; )0 0 ". P
; %0 P )@ $
end</programlisting>
@@ -2885,7 +2885,7 @@ DeBula, e Linda Condron, mentre insegnavano ad usare una nuova versione
di Unix workshop sviluppata per l'UTS.
Sperando di aver insegnato qualcosa.
-Frank, Linda, & Linda</screen>
+Frank, Linda, &amp; Linda</screen>
<screen>brigadier: condron [77]> <userinput>finger</userinput>
Login Name TTY Idle When Where
@@ -2956,7 +2956,7 @@ frank Frank G. Fiamingo p1 Mon 16:19 nyssa</screen>
<replaceable>username</replaceable></option></entry>
<entry>si connette all' host remoto con il nome utente specificato
- (&man.rlogin.1; & &man.rsh.1;)</entry>
+ (&man.rlogin.1; &amp; &man.rsh.1;)</entry>
</row>
</tbody>
</tgroup>
diff --git a/it_IT.ISO8859-15/books/unix-introduction/editors/chapter.xml b/it_IT.ISO8859-15/books/unix-introduction/editors/chapter.xml
index e33d4eb84c..ed00d8df12 100644
--- a/it_IT.ISO8859-15/books/unix-introduction/editors/chapter.xml
+++ b/it_IT.ISO8859-15/books/unix-introduction/editors/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-15" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-15"?>
<!--
The FreeBSD Italian Documentation Project
diff --git a/it_IT.ISO8859-15/books/unix-introduction/getting-started/chapter.xml b/it_IT.ISO8859-15/books/unix-introduction/getting-started/chapter.xml
index b5c3a6f7c1..a39c012fc3 100644
--- a/it_IT.ISO8859-15/books/unix-introduction/getting-started/chapter.xml
+++ b/it_IT.ISO8859-15/books/unix-introduction/getting-started/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-15" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-15"?>
<!--
The FreeBSD Italian Documentation Project
diff --git a/it_IT.ISO8859-15/books/unix-introduction/glossary/chapter.xml b/it_IT.ISO8859-15/books/unix-introduction/glossary/chapter.xml
index 62002d43f9..9e2df2e6d4 100644
--- a/it_IT.ISO8859-15/books/unix-introduction/glossary/chapter.xml
+++ b/it_IT.ISO8859-15/books/unix-introduction/glossary/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-15" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-15"?>
<!--
The FreeBSD Italian Documentation Project
diff --git a/it_IT.ISO8859-15/books/unix-introduction/history/chapter.xml b/it_IT.ISO8859-15/books/unix-introduction/history/chapter.xml
index b618f2410c..935ad0f810 100644
--- a/it_IT.ISO8859-15/books/unix-introduction/history/chapter.xml
+++ b/it_IT.ISO8859-15/books/unix-introduction/history/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-15" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-15"?>
<!--
The FreeBSD Italian Documentation Project
diff --git a/it_IT.ISO8859-15/books/unix-introduction/preface/chapter.xml b/it_IT.ISO8859-15/books/unix-introduction/preface/chapter.xml
index af7f8cdf9e..bec6644d87 100644
--- a/it_IT.ISO8859-15/books/unix-introduction/preface/chapter.xml
+++ b/it_IT.ISO8859-15/books/unix-introduction/preface/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-15" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-15"?>
<!--
The FreeBSD Italian Documentation Project
diff --git a/it_IT.ISO8859-15/books/unix-introduction/shell-programming/chapter.xml b/it_IT.ISO8859-15/books/unix-introduction/shell-programming/chapter.xml
index bcfa02ae7e..b00d3a97df 100644
--- a/it_IT.ISO8859-15/books/unix-introduction/shell-programming/chapter.xml
+++ b/it_IT.ISO8859-15/books/unix-introduction/shell-programming/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-15" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-15"?>
<!--
The FreeBSD Italian Documentation Project
@@ -550,9 +550,9 @@ $#argv: 5</screen>
<programlisting>#!/bin/sh
param0=$0
-test -n "$1" && param1=$1
-test -n "$2" && param2=$2
-test -n "$3" && param3=$3
+test -n "$1" &amp;&amp; param1=$1
+test -n "$2" &amp;&amp; param2=$2
+test -n "$3" &amp;&amp; param3=$3
echo 0: $param0
echo "1: ${param1-1}: \c" ;echo $param1
echo "2: ${param2=2}: \c" ;echo $param2
@@ -680,7 +680,7 @@ param=hello frank</screen>
<para>&man.csh.1; usa il simbolo <literal>$&lt;</literal> per leggere una
linea da &man.stdin.4;, esempio:</para>
- <para><command>set param = $<</command></para>
+ <para><command>set param = $&lt;</command></para>
<para>Gli spazi bianchi intorno al segno di uguale sono importanti.
Il seguente script illustra come usarlo:</para>
@@ -744,7 +744,7 @@ Rewind="$Mt -f $device rewind"
Offline="$Mt -f $device rewoffl"
# Failure - exit
failure () {
- $Mail -s "Backup fallito - $HOST" $admin << EOF_failure
+ $Mail -s "Backup fallito - $HOST" $admin &lt;&lt; EOF_failure
$HOST
Script cron backup fallito. A quanto pare non c' il nastro nel dispositivo.
EOF_failure
@@ -752,7 +752,7 @@ failure () {
}
# Dump failure - exit
dumpfail () {
- $Mail -s "Backup fallito - $HOST" $admin << EOF_dumpfail
+ $Mail -s "Backup fallito - $HOST" $admin &lt;&lt; EOF_dumpfail
$HOST
Script cron backup fallito. A quanto pare non c' il nastro nel dispositivo.
EOF_dumpfail
@@ -760,7 +760,7 @@ dumpfail () {
}
# Success
success () {
- $Mail -s "Backup completato con successo - $HOST" $admin << EOF_success
+ $Mail -s "Backup completato con successo - $HOST" $admin &lt;&lt; EOF_success
$HOST
Script cron backup apparentemente riuscito. Il file /etc/dumpdates :
`/bin/cat /etc/dumpdates`
@@ -772,7 +772,7 @@ $Dump 0uf $device / || dumpfail
$Dump 0uf $device /usr || dumpfail
$Dump 0uf $device /home || dumpfail
$Dump 0uf $device /var || dumpfail
-($Dump 0uf $device /var/spool/mail || dumpfail) && success
+($Dump 0uf $device /var/spool/mail || dumpfail) &amp;&amp; success
$Offline</programlisting>
<para>Questo script illustra alcuni argomenti che sono stati trattati in
@@ -790,7 +790,7 @@ $Offline</programlisting>
la forma <emphasis>here document</emphasis> per realizzare il contenuto
della funzione stessa. Si introducono ora gli operatori logici
<emphasis>OR</emphasis> (<emphasis>||</emphasis>) e
- <emphasis>AND</emphasis> (<emphasis>&&</emphasis>); ciascuno
+ <emphasis>AND</emphasis> (<emphasis>&amp;&amp;</emphasis>); ciascuno
posizionato tra una coppia di comandi. Per l'operatore
<emphasis>OR</emphasis>, il secondo comando viene eseguito solamente se
il primo comando non stato completato con successo. Per
@@ -808,7 +808,7 @@ $Offline</programlisting>
(<literal>|| dumpfail</literal>). Se questa operazione non viene eseguita
completamente con successo si esegue la procedura
<command>dumpfail</command> e si esce. Se l'ultimo backup ha successo si
- procede con la funzione <command>success</command> (<literal>(...) &&
+ procede con la funzione <command>success</command> (<literal>(...) &amp;&amp;
success</literal>). In fine si riavvolge il nastro e lo si manda fuori
linea affinch altri utenti non possano accidentalmente scriverci
sopra.</para>
diff --git a/it_IT.ISO8859-15/books/unix-introduction/shells/chapter.xml b/it_IT.ISO8859-15/books/unix-introduction/shells/chapter.xml
index 2c24348841..8ed4cca78f 100644
--- a/it_IT.ISO8859-15/books/unix-introduction/shells/chapter.xml
+++ b/it_IT.ISO8859-15/books/unix-introduction/shells/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-15" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-15"?>
<!--
The FreeBSD Italian Documentation Project
diff --git a/it_IT.ISO8859-15/books/unix-introduction/special-features/chapter.xml b/it_IT.ISO8859-15/books/unix-introduction/special-features/chapter.xml
index d5f6144716..674a3649c4 100644
--- a/it_IT.ISO8859-15/books/unix-introduction/special-features/chapter.xml
+++ b/it_IT.ISO8859-15/books/unix-introduction/special-features/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-15" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-15"?>
<!--
The FreeBSD Italian Documentation Project
@@ -247,7 +247,7 @@
si deve prima redirigere &man.stdout.4; in una sotto-shell,
cos:</para>
- <screen>&prompt.user; <userinput>(<replaceable>comando</replaceable> > <replaceable>out_file</replaceable>) >& <replaceable>err_file</replaceable></userinput></screen>
+ <screen>&prompt.user; <userinput>(<replaceable>comando</replaceable> > <replaceable>out_file</replaceable>) &gt;&amp; <replaceable>err_file</replaceable></userinput></screen>
</sect2>
<sect2 id="special-features-file-redir-sh">
@@ -330,14 +330,14 @@
supporto, 3. Si redirige prima 3 su 2, quindi 2 su 1 e in fine si
redirige 1 su 3.</para>
- <screen>$ <userinput>(<replaceable>comando</replaceable> 3>&2 2>&1 1>&3) > <replaceable>file</replaceable></userinput></screen>
+ <screen>$ <userinput>(<replaceable>comando</replaceable> 3&gt;&amp;2 2&gt;&amp;1 1&gt;&amp;3) &gt; <replaceable>file</replaceable></userinput></screen>
<para>Questo manda &man.stderr.4; in 1 e &man.stdout.4; in 3 che
rediretto su 2. In questo modo, in effetti, si ribaltano i normali
significati dei descrittori di file 1 e 2. Si pu sperimentare
tutto questo con l'esempio seguente:</para>
- <screen>$ <userinput>(cat <replaceable>file</replaceable> 3>&2 2>&1 1>&3) > <replaceable>errfile</replaceable></userinput></screen>
+ <screen>$ <userinput>(cat <replaceable>file</replaceable> 3&gt;&amp;2 2&gt;&amp;1 1&gt;&amp;3) &gt; <replaceable>errfile</replaceable></userinput></screen>
<para>Quindi se <filename><replaceable>file</replaceable></filename>
letto, l'informazione scartata dall'output del
@@ -413,7 +413,7 @@
<entry>esegue il comando seguente (a questo simbolo) solamente se il
comando precedente (a questo simbolo) stato completato
con successo, esempio:
- <command>grep <replaceable>stringa file</replaceable> && cat
+ <command>grep <replaceable>stringa file</replaceable> &amp;&amp; cat
<replaceable>file</replaceable></command></entry>
</row>
diff --git a/it_IT.ISO8859-15/books/unix-introduction/structure/chapter.xml b/it_IT.ISO8859-15/books/unix-introduction/structure/chapter.xml
index 69db41145d..9815125d3d 100644
--- a/it_IT.ISO8859-15/books/unix-introduction/structure/chapter.xml
+++ b/it_IT.ISO8859-15/books/unix-introduction/structure/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-15" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-15"?>
<!--
The FreeBSD Italian Documentation Project
@@ -17,7 +17,7 @@
interagisce direttamente con l'hardware e fornisce i servizi ai programmi
utente. I programmi utente non necessitano di conoscere informazioni
sull'hardware. Devono solo sapere come interagire con il kernel ed
- quest'ultimo a fornire i servizi richiesti. Uno dei pi&ugrave
+ quest'ultimo a fornire i servizi richiesti. Uno dei pi
grandi fattori che ha contribuito alla richiesta di Unix da parte dei
programmatori stato che molti programmi utente corretti
sono indipendenti dall'hardware sottostante, e ci li rende
diff --git a/it_IT.ISO8859-15/books/unix-introduction/system-resource/chapter.xml b/it_IT.ISO8859-15/books/unix-introduction/system-resource/chapter.xml
index eb837ed39a..9613715563 100644
--- a/it_IT.ISO8859-15/books/unix-introduction/system-resource/chapter.xml
+++ b/it_IT.ISO8859-15/books/unix-introduction/system-resource/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-15" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-15"?>
<!--
The FreeBSD Italian Documentation Project
@@ -353,7 +353,7 @@ peri:/acs/peri/2
</informaltable>
<note>
- <para>Poich il comando &man.ps.1 molto dipendente dal
+ <para>Poich il comando &man.ps.1; molto dipendente dal
sistema, si raccomanda di consultare le <emphasis>pagine
man</emphasis> del proprio sistema per i dettagli delle opzioni e per
l'interpretazione dell'output di &man.ps.1;.</para>
@@ -784,7 +784,7 @@ Mon 06/10/96</screen>
</table>
<para>I comandi di stampa permettono di stampare file sullo standard output
- (&man.pr.1;) o attraverso una stampante (&man.lp.1; e &man.lpr.1) fino a
+ (&man.pr.1;) o attraverso una stampante (&man.lp.1; e &man.lpr.1;) fino a
filtrare l'output. I comandi di stampa di <emphasis>BSD</emphasis> e
<emphasis>SysV</emphasis> usano diversi nomi e diverse opzioni per
produrre lo stesso risultato: &man.lpr.1;, &man.lprm.1; e &man.lpq.1;
diff --git a/it_IT.ISO8859-15/books/unix-introduction/text-processing/chapter.xml b/it_IT.ISO8859-15/books/unix-introduction/text-processing/chapter.xml
index e1dc50360a..477714c80c 100644
--- a/it_IT.ISO8859-15/books/unix-introduction/text-processing/chapter.xml
+++ b/it_IT.ISO8859-15/books/unix-introduction/text-processing/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-15" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-15"?>
<!--
The FreeBSD Italian Documentation Project
diff --git a/it_IT.ISO8859-15/share/xml/catalog b/it_IT.ISO8859-15/share/xml/catalog
deleted file mode 100644
index ad65424b71..0000000000
--- a/it_IT.ISO8859-15/share/xml/catalog
+++ /dev/null
@@ -1,47 +0,0 @@
- -- ...................................................................... --
- -- FreeBSD SGML Public Identifiers ...................................... --
-
- -- ...................................................................... --
- -- Italian specific ..................................................... --
-
- -- $FreeBSD$
- --
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//IT"
- "entities.ent"
-
-PUBLIC "-//FreeBSD//DOCUMENT DocBook Stylesheet//EN"
- "freebsd.dsl"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook Language Specific Entities//EN"
- "l10n.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//IT"
- "mailing-lists.ent"
-
-PUBLIC "-//FreeBSD//DOCUMENT DocBook Stylesheet//IT"
- "freebsd.dsl"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook Translator Entities//IT"
- "translators.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//IT"
- "trademarks.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook Glossary Entities//IT"
- "glossary.ent"
-
- -- ...................................................................... --
- -- HTML docs ............................................................ --
-
-PUBLIC "-//FreeBSD//ENTITIES FreeBSD L10N Entities//EN"
- "l10n.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES FreeBSD Release L10N Entities//EN"
- "release.l10n.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES HTML FreeBSD Header L10N Entities//EN"
- "header.l10n.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES HTML FreeBSD Navigation Bar L10N Entities//EN"
- "navibar.l10n.ent"
diff --git a/it_IT.ISO8859-15/share/xml/catalog.xml b/it_IT.ISO8859-15/share/xml/catalog.xml
index 3553c62fbc..0b06d43c89 100644
--- a/it_IT.ISO8859-15/share/xml/catalog.xml
+++ b/it_IT.ISO8859-15/share/xml/catalog.xml
@@ -10,6 +10,9 @@
<rewriteURI uriStartString="http://www.FreeBSD.org/XML/www/lang/"
rewritePrefix="../../"/>
+ <public
+ publicId="-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN"
+ uri="entities.ent" />
<public publicId="-//FreeBSD//ENTITIES FreeBSD L10N Entities//EN"
uri="l10n.ent" />
<public
diff --git a/it_IT.ISO8859-15/share/xml/entities.ent b/it_IT.ISO8859-15/share/xml/entities.ent
index dde7e8ad76..5b4e18e7e0 100644
--- a/it_IT.ISO8859-15/share/xml/entities.ent
+++ b/it_IT.ISO8859-15/share/xml/entities.ent
@@ -4,29 +4,33 @@
$FreeBSD$
-->
-<!ENTITY % l10n PUBLIC "-//FreeBSD//ENTITIES DocBook Language Specific Entities//EN">
+<!ENTITY % l10n PUBLIC "-//FreeBSD//ENTITIES DocBook Language Specific Entities//EN"
+ "l10n.ent">
%l10n;
-<!ENTITY % l10n-common PUBLIC "-//FreeBSD//ENTITIES DocBook Language Neutral Entities//EN">
-%l10n-common;
-<!ENTITY % man PUBLIC "-//FreeBSD//ENTITIES DocBook Manual Page Entities//EN">
-%man;
-<!ENTITY % freebsd PUBLIC "-//FreeBSD//ENTITIES DocBook Miscellaneous FreeBSD Entities//EN">
+<!ENTITY % freebsd PUBLIC "-//FreeBSD//ENTITIES DocBook Miscellaneous FreeBSD Entities//EN"
+ "nonexistent">
%freebsd;
-<!ENTITY % authors PUBLIC "-//FreeBSD//ENTITIES DocBook Author Entities//EN">
-%authors;
-<!ENTITY % teams PUBLIC "-//FreeBSD//ENTITIES DocBook Team Entities//EN">
+<!ENTITY % teams PUBLIC "-//FreeBSD//ENTITIES DocBook Team Entities//EN"
+ "nonexistent">
%teams;
-<!ENTITY % mailing-lists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//IT">
+<!ENTITY % mailing-lists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//IT"
+ "mailing-lists.ent">
%mailing-lists;
-<!ENTITY % newsgroups PUBLIC "-//FreeBSD//ENTITIES DocBook Newsgroup Entities//EN">
+<!ENTITY % newsgroups PUBLIC "-//FreeBSD//ENTITIES DocBook Newsgroup Entities//EN"
+ "nonexistent">
%newsgroups;
-<!ENTITY % it-trademarks PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//IT">
+<!ENTITY % it-trademarks PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//IT"
+ "trademarks.ent">
%it-trademarks;
-<!ENTITY % trademarks PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//EN">
+<!ENTITY % trademarks PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//EN"
+ "nonexistent">
%trademarks;
-<!ENTITY % urls PUBLIC "-//FreeBSD//ENTITIES DocBook URL Entities//EN">
+<!ENTITY % urls PUBLIC "-//FreeBSD//ENTITIES DocBook URL Entities//EN"
+ "nonexistent">
%urls;
-<!ENTITY % translators PUBLIC "-//FreeBSD//ENTITIES DocBook Translator Entities//IT">
+<!ENTITY % translators PUBLIC "-//FreeBSD//ENTITIES DocBook Translator Entities//IT"
+ "translators.ent">
%translators;
-<!ENTITY % glossary PUBLIC "-//FreeBSD//ENTITIES DocBook Glossary Entities//IT">
+<!ENTITY % glossary PUBLIC "-//FreeBSD//ENTITIES DocBook Glossary Entities//IT"
+ "glossary.ent">
%glossary;
diff --git a/it_IT.ISO8859-15/share/xml/l10n.ent b/it_IT.ISO8859-15/share/xml/l10n.ent
index aaffe110e5..d04a282367 100644
--- a/it_IT.ISO8859-15/share/xml/l10n.ent
+++ b/it_IT.ISO8859-15/share/xml/l10n.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="iso-8859-15"?>
<!--
The FreeBSD Italian Documentation Project
diff --git a/it_IT.ISO8859-15/share/xml/mailing-lists.ent b/it_IT.ISO8859-15/share/xml/mailing-lists.ent
index 71f549f748..f38a62b089 100644
--- a/it_IT.ISO8859-15/share/xml/mailing-lists.ent
+++ b/it_IT.ISO8859-15/share/xml/mailing-lists.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="iso-8859-15"?>
<!--
The FreeBSD Italian Documentation Project
diff --git a/it_IT.ISO8859-15/share/xml/trademarks.ent b/it_IT.ISO8859-15/share/xml/trademarks.ent
index 7b4b57d673..db963c92ba 100644
--- a/it_IT.ISO8859-15/share/xml/trademarks.ent
+++ b/it_IT.ISO8859-15/share/xml/trademarks.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="iso-8859-15"?>
<!--
The FreeBSD Italian Documentation Project
diff --git a/it_IT.ISO8859-15/share/xml/translators.ent b/it_IT.ISO8859-15/share/xml/translators.ent
index bc6fdc7abd..11ec3f45bb 100644
--- a/it_IT.ISO8859-15/share/xml/translators.ent
+++ b/it_IT.ISO8859-15/share/xml/translators.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="iso-8859-15"?>
<!--
The FreeBSD Italian Documentation Project
diff --git a/ja_JP.eucJP/articles/contributing/article.xml b/ja_JP.eucJP/articles/contributing/article.xml
index bf5e628bb0..d249b475d1 100644
--- a/ja_JP.eucJP/articles/contributing/article.xml
+++ b/ja_JP.eucJP/articles/contributing/article.xml
@@ -1,10 +1,6 @@
-<?xml version="1.0" encoding="euc-jp" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//JA" "../../share/xml/entities.ent">
-%entities;
-<!ENTITY % not.published "IGNORE">
-]>
+<?xml version="1.0" encoding="euc-jp"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<!--
The FreeBSD Documentation Project
diff --git a/ja_JP.eucJP/articles/contributors/article.xml b/ja_JP.eucJP/articles/contributors/article.xml
index 4beeacef5a..405c2e00db 100644
--- a/ja_JP.eucJP/articles/contributors/article.xml
+++ b/ja_JP.eucJP/articles/contributors/article.xml
@@ -1,11 +1,8 @@
-<?xml version="1.0" encoding="euc-jp" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//JA" "../../share/xml/entities.ent">
-%entities;
+<?xml version="1.0" encoding="euc-jp"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd" [
<!ENTITY % contrib.ent SYSTEM "../../../en_US.ISO8859-1/articles/contributors/contrib.ent">
%contrib.ent;
-<!ENTITY % not.published "IGNORE">
]>
<!--
diff --git a/ja_JP.eucJP/articles/fbsd-from-scratch/article.xml b/ja_JP.eucJP/articles/fbsd-from-scratch/article.xml
index 40d72ce701..e2f4733638 100644
--- a/ja_JP.eucJP/articles/fbsd-from-scratch/article.xml
+++ b/ja_JP.eucJP/articles/fbsd-from-scratch/article.xml
@@ -1,8 +1,6 @@
-<?xml version="1.0" encoding="euc-jp" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//JA" "../../share/xml/entities.ent">
-%entities;
+<?xml version="1.0" encoding="euc-jp"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd" [
<!ENTITY scratch.ap "<application>FreeBSD 毛未伕井日澀爛允月</application>">
]>
@@ -11,7 +9,7 @@
Original revision: 1.11
-->
-<article lang='ja'>
+<article xmlns:xi="http://www.w3.org/2001/XInclude" lang='ja'>
<articleinfo>
<title>FreeBSD 毛未伕井日澀爛允月卞反</title>
@@ -432,7 +430,9 @@ Do you wish to delete what is left of /var/tmp/temproot.stage1? [no] <userinput>
犯田奶旦抩及庍凳反鏜啦蕉仁墊卅勻化仁分今中﹝</para>
</warning>
-<programlisting><inlinegraphic fileref="../../../en_US.ISO8859-1/articles/fbsd-from-scratch/stage_1.conf.default" format="linespecific"/></programlisting>
+<programlisting>
+<xi:include href="../../../en_US.ISO8859-1/articles/fbsd-from-scratch/stage_1.conf.default" parse="text"/>
+</programlisting>
<para>母它件伕□玉: <ulink
url="../../../en_US.ISO8859-1/articles/fbsd-from-scratch/stage_1.conf.default"><filename>stage_1.conf.default</filename>
@@ -538,7 +538,9 @@ news inn-stable CONFIGURE_ARGS="--enable-uucp-rnews --enable-setgid-inews" make
<filename>LOGDIR/category+port</filename>
午中丹抩蟆及伕弘白央奶伙互綜嶽今木引允﹝</para>
-<programlisting><inlinegraphic fileref="../../../en_US.ISO8859-1/articles/fbsd-from-scratch/stage_2.conf.default" format="linespecific"/></programlisting>
+<programlisting>
+<xi:include href="../../../en_US.ISO8859-1/articles/fbsd-from-scratch/stage_2.conf.default" parse="text"/>
+</programlisting>
<para>母它件伕□玉: <ulink
url="../../../en_US.ISO8859-1/articles/fbsd-from-scratch/stage_2.conf.default"><filename>stage_2.conf.default</filename></ulink>.</para>
@@ -674,7 +676,9 @@ fi
url="../../../en_US.ISO8859-1/articles/fbsd-from-scratch/stage_1.sh"><filename>stage_1.sh</filename></ulink>
旦弁伉皿玄匹允﹝ま芢毛庍凳允月优邰反卅中匹仄斤丹﹝</para>
-<programlisting><inlinegraphic fileref="../../../en_US.ISO8859-1/articles/fbsd-from-scratch/stage_1.sh" format="linespecific"/></programlisting>
+<programlisting>
+<xi:include href="../../../en_US.ISO8859-1/articles/fbsd-from-scratch/stage_1.sh" parse="text"/>
+</programlisting>
<para>母它件伕□玉: <ulink
url="../../../en_US.ISO8859-1/articles/fbsd-from-scratch/stage_1.sh"><filename>stage_1.sh</filename></ulink>.</para>
@@ -683,7 +687,9 @@ fi
url="../../../en_US.ISO8859-1/articles/fbsd-from-scratch/stage_2.sh"><filename>stage_2.sh</filename></ulink>
旦弁伉皿玄匹允﹝瘉賡及朿坌卞丐月庍醒毛庍凳仄引仄斤丹﹝</para>
-<programlisting><inlinegraphic fileref="../../../en_US.ISO8859-1/articles/fbsd-from-scratch/stage_2.sh" format="linespecific"/></programlisting>
+<programlisting>
+<xi:include href="../../../en_US.ISO8859-1/articles/fbsd-from-scratch/stage_2.sh" parse="text"/>
+</programlisting>
<para>母它件伕□玉: <ulink
url="../../../en_US.ISO8859-1/articles/fbsd-from-scratch/stage_2.sh"><filename>stage_2.sh</filename></ulink>.</para>
@@ -692,7 +698,9 @@ fi
url="../../../en_US.ISO8859-1/articles/fbsd-from-scratch/stage_3.mk"><filename>stage_3.mk</filename></ulink> 匹允﹝
澀爛毛憤が讀卞云仇卅丹凶戶及澎賜毛﹜仇仇卞ェ木引允﹝</para>
-<programlisting><inlinegraphic fileref="../../../en_US.ISO8859-1/articles/fbsd-from-scratch/stage_3.mk" format="linespecific"/></programlisting>
+<programlisting>
+<xi:include href="../../../en_US.ISO8859-1/articles/fbsd-from-scratch/stage_3.mk" parse="text"/>
+</programlisting>
<para>母它件伕□玉: <ulink
url="../../../en_US.ISO8859-1/articles/fbsd-from-scratch/stage_3.mk"><filename>stage_3.mk</filename></ulink>.</para>
diff --git a/ja_JP.eucJP/articles/fonts/article.xml b/ja_JP.eucJP/articles/fonts/article.xml
index 1c20df9bca..cf40417297 100644
--- a/ja_JP.eucJP/articles/fonts/article.xml
+++ b/ja_JP.eucJP/articles/fonts/article.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="euc-jp" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//JA" "../../share/xml/entities.ent">
-%entities;
-]>
+<?xml version="1.0" encoding="euc-jp"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<!--
The FreeBSD Documentation Project
diff --git a/ja_JP.eucJP/articles/ipsec-must/article.xml b/ja_JP.eucJP/articles/ipsec-must/article.xml
index 0d4840e369..effac68cf6 100644
--- a/ja_JP.eucJP/articles/ipsec-must/article.xml
+++ b/ja_JP.eucJP/articles/ipsec-must/article.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="euc-jp" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//JA" "../../share/xml/entities.ent">
-%entities;
-]>
+<?xml version="1.0" encoding="euc-jp"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<!--
The FreeBSD Documentation Project
diff --git a/ja_JP.eucJP/articles/problem-reports/article.xml b/ja_JP.eucJP/articles/problem-reports/article.xml
index 00df7c8adf..b34a1ba53f 100644
--- a/ja_JP.eucJP/articles/problem-reports/article.xml
+++ b/ja_JP.eucJP/articles/problem-reports/article.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="euc-jp" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//JA" "../../share/xml/entities.ent">
-%entities;
-]>
+<?xml version="1.0" encoding="euc-jp"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<!--
The FreeBSD Japanese Documentation Project
diff --git a/ja_JP.eucJP/books/design-44bsd/book.xml b/ja_JP.eucJP/books/design-44bsd/book.xml
index f8036854de..ff83f9d3fa 100644
--- a/ja_JP.eucJP/books/design-44bsd/book.xml
+++ b/ja_JP.eucJP/books/design-44bsd/book.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="euc-jp" standalone="no"?>
-<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//JA" "../../share/xml/entities.ent">
-%entities;
-]>
+<?xml version="1.0" encoding="euc-jp"?>
+<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<!--
The FreeBSD Documentation Project
@@ -2242,7 +2239,7 @@
</biblioentry>
<biblioentry id="biblio-kernighan">
- <abbrev>Kernighan & Pike, 1984</abbrev>
+ <abbrev>Kernighan &amp; Pike, 1984</abbrev>
<title>The UNIX Programming Environment</title>
@@ -2299,7 +2296,7 @@
</biblioentry>
<biblioentry id="biblio-mckusick-2">
- <abbrev>McKusick & Karels, 1988</abbrev>
+ <abbrev>McKusick &amp; Karels, 1988</abbrev>
<biblioset relation="article">
<title>Design of a General Purpose Memory Allocator for the 4.3BSD
@@ -2393,7 +2390,7 @@
</biblioentry>
<biblioentry id="biblio-rosenblum">
- <abbrev>Rosenblum & Ousterhout, 1992</abbrev>
+ <abbrev>Rosenblum &amp; Ousterhout, 1992</abbrev>
<biblioset relation="article">
<title>The Design and Implementation of a Log-Structured File
diff --git a/ja_JP.eucJP/books/faq/book.xml b/ja_JP.eucJP/books/faq/book.xml
index 142989c7a2..e73c949b6d 100644
--- a/ja_JP.eucJP/books/faq/book.xml
+++ b/ja_JP.eucJP/books/faq/book.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="euc-jp" standalone="no"?>
-<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//JA" "../../share/xml/entities.ent">
-%entities;
-]>
+<?xml version="1.0" encoding="euc-jp"?>
+<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<!-- The FreeBSD Japanese Documentation Project -->
<!-- Original revision: 1.204 -->
@@ -3596,11 +3593,11 @@ diff -u -r1.60.2.1 -r1.60.2.2
if (verbose >= 2)
printf("psm%d: SET_DEFAULTS return code:%04x\n", unit, i);
+#endif
- if (sc->config & PSM_CONFIG_RESOLUTION) {
+ if (sc->config &amp; PSM_CONFIG_RESOLUTION) {
sc->mode.resolution
= set_mouse_resolution(sc->kbdc,
-- (sc->config & PSM_CONFIG_RESOLUTION) - 1);
-+ (sc->config & PSM_CONFIG_RESOLUTION) - 1);
+- (sc->config &amp; PSM_CONFIG_RESOLUTION) - 1);
++ (sc->config &amp; PSM_CONFIG_RESOLUTION) - 1);
+ } else if (sc->mode.resolution >= 0) {
+ sc->mode.resolution
+ = set_mouse_resolution(sc->kbdc, sc->dflt_mode.resolution);
@@ -3611,7 +3608,7 @@ diff -u -r1.60.2.1 -r1.60.2.2
+ set_mouse_scaling(sc->kbdc, 1);
/* request a data packet and extract sync. bits */
- if (get_mouse_status(sc->kbdc, stat, 1, 3) < 3) {</programlisting>
+ if (get_mouse_status(sc->kbdc, stat, 1, 3) &lt; 3) {</programlisting>
<para>FreeBSD 3.2
方曰蕙仄中伉伉□旦匹反五切氏午が綜允月反內匹允﹝
@@ -4980,7 +4977,7 @@ Checking for Plug-n-Play devices...
Card assigned CSN #1
Vendor ID PMC2430 (0x3024a341), Serial Number 0xffffffff
PnP Version 1.0, Vendor Version 0
-Device Description: Pace 56 Voice Internal Plug & Play Modem
+Device Description: Pace 56 Voice Internal Plug &amp; Play Modem
Logical Device ID: PMC2430 0x3024a341 #0
Device supports I/O Range Check
@@ -5998,7 +5995,7 @@ crw-rw-rw- 1 root wheel 41, 1 Oct 15 22:14 spx</screen>
<para>扑旦氾丞互橘凜紳が仄化中月卅日壬﹜
<filename>/etc/periodic.conf</filename> 卞
<literal>weekly_status_pkg_enable="YES"</literal> 毛
- 澀爛仄化﹜&man.periodic.8 扑旦氾丞卞方勻化咍蔥凳蕙互优邰卅 ports
+ 澀爛仄化﹜&man.periodic.8; 扑旦氾丞卞方勻化咍蔥凳蕙互优邰卅 ports
及域厖毛戲嶽匹五引允﹝</para>
</answer>
</qandaentry>
@@ -12096,7 +12093,7 @@ nat port udp <replaceable>internal</replaceable>:5009 5009</programlisting>
Base</ulink> 卞丐月﹜
砦 <quote>Q158474 - Windows TCPIP Registry Entries</quote>﹜
云方太砦
- <quote>Q120642 - TCPIP & NBT Configuration Parameters for Windows NT</quote>
+ <quote>Q120642 - TCPIP &amp; NBT Configuration Parameters for Windows NT</quote>
毛輔寰仄化仁分今中﹝
</para>
diff --git a/ja_JP.eucJP/books/fdp-primer/book.xml b/ja_JP.eucJP/books/fdp-primer/book.xml
index 2ea35255dd..62c69bfe09 100644
--- a/ja_JP.eucJP/books/fdp-primer/book.xml
+++ b/ja_JP.eucJP/books/fdp-primer/book.xml
@@ -1,8 +1,6 @@
-<?xml version="1.0" encoding="euc-jp" standalone="no"?>
-<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//JA" "../../share/xml
-%entities;
+<?xml version="1.0" encoding="euc-jp"?>
+<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd" [
<!ENTITY % chapters SYSTEM "chapters.ent"> %chapters;
<!-- ENTITY index SYSTEM "index.xml" -->
]>
diff --git a/ja_JP.eucJP/books/fdp-primer/examples/appendix.xml b/ja_JP.eucJP/books/fdp-primer/examples/appendix.xml
index 46b5ff22fe..b1167c771d 100644
--- a/ja_JP.eucJP/books/fdp-primer/examples/appendix.xml
+++ b/ja_JP.eucJP/books/fdp-primer/examples/appendix.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="euc-jp" standalone="no"?>
+<?xml version="1.0" encoding="euc-jp"?>
<!-- Copyright (c) 2000 Nik Clayton, All rights reserved.
Redistribution and use in source (SGML DocBook) and 'compiled' forms
diff --git a/ja_JP.eucJP/books/fdp-primer/overview/chapter.xml b/ja_JP.eucJP/books/fdp-primer/overview/chapter.xml
index a445bd6814..3682257ca5 100644
--- a/ja_JP.eucJP/books/fdp-primer/overview/chapter.xml
+++ b/ja_JP.eucJP/books/fdp-primer/overview/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="euc-jp" standalone="no"?>
+<?xml version="1.0" encoding="euc-jp"?>
<!-- Copyright (c) 1998, 1999 Nik Clayton, All rights reserved.
Redistribution and use in source (SGML DocBook) and 'compiled' forms
diff --git a/ja_JP.eucJP/books/fdp-primer/psgml-mode/chapter.xml b/ja_JP.eucJP/books/fdp-primer/psgml-mode/chapter.xml
index ebfcd50583..f4c9d5de15 100644
--- a/ja_JP.eucJP/books/fdp-primer/psgml-mode/chapter.xml
+++ b/ja_JP.eucJP/books/fdp-primer/psgml-mode/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="euc-jp" standalone="no"?>
+<?xml version="1.0" encoding="euc-jp"?>
<!-- Copyright (c) 1998, 1999 Nik Clayton, All rights reserved.
Redistribution and use in source (SGML DocBook) and 'compiled' forms
diff --git a/ja_JP.eucJP/books/fdp-primer/see-also/chapter.xml b/ja_JP.eucJP/books/fdp-primer/see-also/chapter.xml
index 8bab5e67ef..c556097fe0 100644
--- a/ja_JP.eucJP/books/fdp-primer/see-also/chapter.xml
+++ b/ja_JP.eucJP/books/fdp-primer/see-also/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="euc-jp" standalone="no"?>
+<?xml version="1.0" encoding="euc-jp"?>
<!-- Copyright (c) 1998, 1999 Nik Clayton, All rights reserved.
Redistribution and use in source (SGML DocBook) and 'compiled' forms
diff --git a/ja_JP.eucJP/books/fdp-primer/structure/chapter.xml b/ja_JP.eucJP/books/fdp-primer/structure/chapter.xml
index b01b5c2894..f2aeaae77b 100644
--- a/ja_JP.eucJP/books/fdp-primer/structure/chapter.xml
+++ b/ja_JP.eucJP/books/fdp-primer/structure/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="euc-jp" standalone="no"?>
+<?xml version="1.0" encoding="euc-jp"?>
<!-- Copyright (c) 1998, 1999 Nik Clayton, All rights reserved.
Redistribution and use in source (SGML DocBook) and 'compiled' forms
diff --git a/ja_JP.eucJP/books/fdp-primer/stylesheets/chapter.xml b/ja_JP.eucJP/books/fdp-primer/stylesheets/chapter.xml
index 6d98f02ddc..a58ad4a427 100644
--- a/ja_JP.eucJP/books/fdp-primer/stylesheets/chapter.xml
+++ b/ja_JP.eucJP/books/fdp-primer/stylesheets/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="euc-jp" standalone="no"?>
+<?xml version="1.0" encoding="euc-jp"?>
<!-- Copyright (c) 1998, 1999 Nik Clayton, All rights reserved.
Redistribution and use in source (SGML DocBook) and 'compiled' forms
diff --git a/ja_JP.eucJP/books/fdp-primer/the-website/chapter.xml b/ja_JP.eucJP/books/fdp-primer/the-website/chapter.xml
index c5073db9e4..dbb34be62c 100644
--- a/ja_JP.eucJP/books/fdp-primer/the-website/chapter.xml
+++ b/ja_JP.eucJP/books/fdp-primer/the-website/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="euc-jp" standalone="no"?>
+<?xml version="1.0" encoding="euc-jp"?>
<!-- Copyright (c) 1998, 1999 Nik Clayton, All rights reserved.
Redistribution and use in source (SGML DocBook) and 'compiled' forms
diff --git a/ja_JP.eucJP/books/fdp-primer/tools/chapter.xml b/ja_JP.eucJP/books/fdp-primer/tools/chapter.xml
index b1a42a17cf..374e691101 100644
--- a/ja_JP.eucJP/books/fdp-primer/tools/chapter.xml
+++ b/ja_JP.eucJP/books/fdp-primer/tools/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="euc-jp" standalone="no"?>
+<?xml version="1.0" encoding="euc-jp"?>
<!-- Copyright (c) 1998, 1999 Nik Clayton, All rights reserved.
Redistribution and use in source (SGML DocBook) and 'compiled' forms
diff --git a/ja_JP.eucJP/books/fdp-primer/translations/chapter.xml b/ja_JP.eucJP/books/fdp-primer/translations/chapter.xml
index 07a8f09690..9aef3181e4 100644
--- a/ja_JP.eucJP/books/fdp-primer/translations/chapter.xml
+++ b/ja_JP.eucJP/books/fdp-primer/translations/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="euc-jp" standalone="no"?>
+<?xml version="1.0" encoding="euc-jp"?>
<!-- Copyright (c) 1999 Nik Clayton, All rights reserved.
Redistribution and use in source (SGML DocBook) and 'compiled' forms
diff --git a/ja_JP.eucJP/books/fdp-primer/writing-style/chapter.xml b/ja_JP.eucJP/books/fdp-primer/writing-style/chapter.xml
index 6b3deda627..2bf75efc2d 100644
--- a/ja_JP.eucJP/books/fdp-primer/writing-style/chapter.xml
+++ b/ja_JP.eucJP/books/fdp-primer/writing-style/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="euc-jp" standalone="no"?>
+<?xml version="1.0" encoding="euc-jp"?>
<!-- Copyright (c) 1998 Nik Clayton, All rights reserved.
Redistribution and use in source (SGML DocBook) and 'compiled' forms
diff --git a/ja_JP.eucJP/books/handbook/Makefile b/ja_JP.eucJP/books/handbook/Makefile
index 72dfc94960..c8d615af24 100644
--- a/ja_JP.eucJP/books/handbook/Makefile
+++ b/ja_JP.eucJP/books/handbook/Makefile
@@ -320,42 +320,44 @@ DOC_PREFIX?= ${.CURDIR}/../../..
#
# rules generating lists of mirror site from XML database.
#
-XMLDOCS= mirrors-ftp:::mirrors.xml.ftp.inc.tmp \
- mirrors-cvsup:::mirrors.xml.cvsup.inc.tmp \
- eresources:::eresources.xml.www.inc.tmp
+XMLDOCS= lastmod:::mirrors.lastmod.inc \
+ mirrors-ftp-index:::mirrors.xml.ftp.index.inc \
+ mirrors-ftp:::mirrors.xml.ftp.inc \
+ mirrors-cvsup-index:::mirrors.xml.cvsup.index.inc \
+ mirrors-cvsup:::mirrors.xml.cvsup.inc \
+ eresources-index:::eresources.xml.www.index.inc \
+ eresources:::eresources.xml.www.inc
DEPENDSET.DEFAULT= transtable mirror
XSLT.DEFAULT= ${XSL_MIRRORS}
XML.DEFAULT= ${XML_MIRRORS}
-NO_TIDY.DEFAULT= yes
+
+PARAMS.lastmod+= --param 'target' "'lastmod'"
+PARAMS.mirrors-ftp-index+= --param 'type' "'ftp'" \
+ --param 'proto' "'ftp'" \
+ --param 'target' "'index'"
PARAMS.mirrors-ftp+= --param 'type' "'ftp'" \
--param 'proto' "'ftp'" \
--param 'target' "'handbook/mirrors/chapter.xml'"
+PARAMS.mirrors-cvsup-index+= --param 'type' "'cvsup'" \
+ --param 'proto' "'cvsup'" \
+ --param 'target' "'index'"
PARAMS.mirrors-cvsup+= --param 'type' "'cvsup'" \
--param 'proto' "'cvsup'" \
--param 'target' "'handbook/mirrors/chapter.xml'"
+PARAMS.eresources-index+= --param 'type' "'www'" \
+ --param 'proto' "'http'" \
+ --param 'target' "'index'"
PARAMS.eresources+= --param 'type' "'www'" \
--param 'proto' "'http'" \
--param 'target' "'handbook/eresources/chapter.xml'"
-SRCS+= mirrors.xml.ftp.inc \
+SRCS+= mirrors.lastmod.inc \
+ mirrors.xml.ftp.inc \
+ mirrors.xml.ftp.index.inc \
mirrors.xml.cvsup.inc \
- eresources.xml.www.inc
-
-CLEANFILES+= mirrors.xml.ftp.inc mirrors.xml.ftp.inc.tmp \
- mirrors.xml.cvsup.inc mirrors.xml.cvsup.inc.tmp \
- eresources.xml.www.inc eresources.xml.www.inc.tmp
+ mirrors.xml.cvsup.index.inc \
+ eresources.xml.www.inc \
+ eresources.xml.www.index.inc
.include "${DOC_PREFIX}/share/mk/doc.project.mk"
-
-.for p in ftp cvsup
-mirrors.xml.${p}.inc: mirrors.xml.${p}.inc.tmp
- ${CP} ${.ALLSRC} ${.TARGET}
-# ${SED} -e 's,<\([^ >]*\)\([^>]*\)/>,<\1\2></\1>,;s,</anchor>,,'\
-# < $@.tmp > $@ || (${RM} -f $@ && false)
-.endfor
-
-eresources.xml.www.inc: eresources.xml.www.inc.tmp
- ${CP} ${.ALLSRC} ${.TARGET}
-# ${SED} -e 's,<\([^ >]*\)\([^>]*\)/>,<\1\2></\1>,;s,</anchor>,,'\
-# < $@.tmp > $@ || (${RM} -f $@ && false)
diff --git a/ja_JP.eucJP/books/handbook/advanced-networking/chapter.xml b/ja_JP.eucJP/books/handbook/advanced-networking/chapter.xml
index 9de99c185e..213714bc5a 100644
--- a/ja_JP.eucJP/books/handbook/advanced-networking/chapter.xml
+++ b/ja_JP.eucJP/books/handbook/advanced-networking/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="euc-jp" standalone="no"?>
+<?xml version="1.0" encoding="euc-jp"?>
<!--
The FreeBSD Documentation Project
The FreeBSD Japanese Documentation Project
@@ -1792,7 +1792,7 @@ rfcomm_sppd[94692]: Starting on /dev/ttyp6...</screen>
<para>(<replaceable>if1</replaceable> 云方太
<replaceable>if2</replaceable>
反わ勾及生永玄伐□弁奶件正白尼□旦及抩蟆卞譆五晶尹化仁分今中)﹝
- 皮伉永斥毛煩苀仄凶由弗永玄毛 &man.ipfw.8 匹白奴伙正仄凶中樺寧卞反﹜
+ 皮伉永斥毛煩苀仄凶由弗永玄毛 &man.ipfw.8; 匹白奴伙正仄凶中樺寧卞反﹜
動票及墊手尥仃笛尹月优邰互丐曰引允</para>
<programlisting>net.link.ether.bridge_ipfw=1</programlisting>
@@ -4629,7 +4629,7 @@ nis_client_flags="-S <replaceable>NIS domain</replaceable>,<replaceable>server</
由旦伐□玉溥摯及詢晶嶺互丐曰引允﹝
NIS 扔□田互 DES 剪寞祭由旦伐□玉銀勻化中月樺寧卞反﹜
き迋卞 DES 毛銀迕仄化中月弁仿奶失件玄仄井覆殺匹五引六氏﹝
- 凶午尹壬 &solaris” 及 NIS 弁仿奶失件玄互生永玄伐□弁ま卞丐月樺寧﹜
+ 凶午尹壬 &solaris;” 及 NIS 弁仿奶失件玄互生永玄伐□弁ま卞丐月樺寧﹜
幻廿割撢卞 DES 剪寞祭由旦伐□玉毛銀迕仄卅仃木壬卅日卅中匹仄斤丹﹝</para>
<para>扔□田午弁仿奶失件玄互升及仿奶皮仿伉毛銀迕仄化中月井反﹜
<filename>/etc/login.conf</filename> 毛割ロ仄化仁分今中﹝
@@ -5839,10 +5839,10 @@ www IN CNAME @</programlisting>
<listitem>
<para>湘呿札□件白央奶伙午澀爛白央奶伙及彸螂午綜嶽毛墊中引允﹝</para>
<screen>&prompt.root; <userinput>cp /etc/localtime etc</userinput><co id="localtime"/>
-&prompt.root; <userinput>mv named.conf etc && ln -sf etc/named.conf</userinput>
+&prompt.root; <userinput>mv named.conf etc &amp;&amp; ln -sf etc/named.conf</userinput>
&prompt.root; <userinput>mv named.root master</userinput>
<!-- I don't like this next bit -->
-&prompt.root; <userinput>sh make-localhost && mv localhost.rev localhost-v6.rev master</userinput>
+&prompt.root; <userinput>sh make-localhost &amp;&amp; mv localhost.rev localhost-v6.rev master</userinput>
&prompt.root; <userinput>cat > master/named.localhost
$ORIGIN localhost.
$TTL 6h
@@ -5870,12 +5870,12 @@ $TTL 6h
毛厭蹲仄﹜瑤樺卞戊疋□仄化仁分今中﹝</para>
<screen>&prompt.root; <userinput>cd /usr/src/lib/libisc</userinput>
-&prompt.root; <userinput>make cleandir && make cleandir && make depend && make all</userinput>
+&prompt.root; <userinput>make cleandir &amp;&amp; make cleandir &amp;&amp; make depend &amp;&amp; make all</userinput>
&prompt.root; <userinput>cd /usr/src/lib/libbind</userinput>
-&prompt.root; <userinput>make cleandir && make cleandir && make depend && make all</userinput>
+&prompt.root; <userinput>make cleandir &amp;&amp; make cleandir &amp;&amp; make depend &amp;&amp; make all</userinput>
&prompt.root; <userinput>cd /usr/src/libexec/named-xfer</userinput>
-&prompt.root; <userinput>make cleandir && make cleandir && make depend && make NOSHARED=yes all</userinput>
-&prompt.root; <userinput>cp named-xfer /etc/namedb/bin && chmod 555 /etc/namedb/bin/named-xfer</userinput><co id="clean-cruft"/></screen>
+&prompt.root; <userinput>make cleandir &amp;&amp; make cleandir &amp;&amp; make depend &amp;&amp; make NOSHARED=yes all</userinput>
+&prompt.root; <userinput>cp named-xfer /etc/namedb/bin &amp;&amp; chmod 555 /etc/namedb/bin/named-xfer</userinput><co id="clean-cruft"/></screen>
<para>斃讀伉件弁今木凶 <command>named-xfer</command>
毛奶件旦玄□伙仄凶日﹜
@@ -5894,12 +5894,12 @@ $TTL 6h
<para>仇及旦氾永皿反凜★撩л允月仇午互扷屢今木化中引允﹝
手仄撩л仄凶樺寧﹜慼及戊穴件玉毛撢墊仄化仁分今中﹝</para>
- <screen>&prompt.root; <userinput>cd /usr/src && make cleandir && make cleandir</userinput></screen>
+ <screen>&prompt.root; <userinput>cd /usr/src &amp;&amp; make cleandir &amp;&amp; make cleandir</userinput></screen>
<para>公仄化 <filename>/usr/obj</filename>
汁伉□毛綽輪仄引允﹝</para>
- <screen>&prompt.root; <userinput>rm -fr /usr/obj && mkdir /usr/obj</userinput></screen>
+ <screen>&prompt.root; <userinput>rm -fr /usr/obj &amp;&amp; mkdir /usr/obj</userinput></screen>
<para>仇木反末□旦汁伉□井日允屯化及
<quote>互日仁凶</quote> 毛域鄹仄引允﹝
@@ -5919,7 +5919,7 @@ $TTL 6h
踏五慇戈仇午及匹五月 <devicename>dev/null</devicename>
毛綜嶽仄引允﹝</para>
- <screen>&prompt.root; <userinput>cd /etc/namedb/dev && mknod null c 2 2</userinput>
+ <screen>&prompt.root; <userinput>cd /etc/namedb/dev &amp;&amp; mknod null c 2 2</userinput>
&prompt.root; <userinput>chmod 666 null</userinput></screen>
</listitem>
@@ -7269,7 +7269,7 @@ hint.ppc.0.irq="7"</programlisting>
<literal>device plip</literal> 午中丹墊互丐月井﹜引凶反
<filename>plip.ko</filename>
市□生伙乒斥亙□伙互づ心慇引木化中月仇午毛割ロ仄化仁分今中﹝
- 升切日及樺寧匹手 &man.ifconfig.8 戊穴件玉毛躂濤撢墊仄凶午五卞﹜
+ 升切日及樺寧匹手 &man.ifconfig.8; 戊穴件玉毛躂濤撢墊仄凶午五卞﹜
由仿伊伙生永玄伐□弁奶件正白尼□旦互蜇木月反內匹允﹝
&os;&nbsp;4.X 匹反仇及方丹卞卅曰引允﹝</para>
diff --git a/ja_JP.eucJP/books/handbook/basics/chapter.xml b/ja_JP.eucJP/books/handbook/basics/chapter.xml
index 68e93842c8..66afe5e08c 100644
--- a/ja_JP.eucJP/books/handbook/basics/chapter.xml
+++ b/ja_JP.eucJP/books/handbook/basics/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="euc-jp" standalone="no"?>
+<?xml version="1.0" encoding="euc-jp"?>
<!--
The FreeBSD Documentation Project
The FreeBSD Japanese Documentation Project
diff --git a/ja_JP.eucJP/books/handbook/bibliography/chapter.xml b/ja_JP.eucJP/books/handbook/bibliography/chapter.xml
index dcecb9cff9..ae2c0a083f 100644
--- a/ja_JP.eucJP/books/handbook/bibliography/chapter.xml
+++ b/ja_JP.eucJP/books/handbook/bibliography/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="euc-jp" standalone="no"?>
+<?xml version="1.0" encoding="euc-jp"?>
<!--
The FreeBSD Documentation Project
The FreeBSD Japanese Documentation Project
diff --git a/ja_JP.eucJP/books/handbook/book.xml b/ja_JP.eucJP/books/handbook/book.xml
index 6d0559532d..ff5d5dbbef 100644
--- a/ja_JP.eucJP/books/handbook/book.xml
+++ b/ja_JP.eucJP/books/handbook/book.xml
@@ -1,9 +1,6 @@
<?xml version="1.0" encoding="euc-jp"?>
-<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//JA" "../../share/xml/entities.ent">
-%entities;
-
+<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd" [
<!ENTITY % chapters SYSTEM "chapters.ent">
%chapters;
<!ENTITY % txtfiles SYSTEM "txtfiles.ent">
@@ -248,13 +245,10 @@
&chap.security;
<!--
&chap.jails;
--->
&chap.mac;
-<!--
&chap.audit;
-->
&chap.disks;
- &chap.geom;
<!--
&chap.filesystems;
&chap.vinum;
@@ -308,8 +302,10 @@
&chap.serialcomms;
&chap.ppp-and-slip;
&chap.mail;
+<!--
&chap.network-servers;
&chap.firewalls;
+-->
&chap.advanced-networking;
</part>
diff --git a/ja_JP.eucJP/books/handbook/boot/chapter.xml b/ja_JP.eucJP/books/handbook/boot/chapter.xml
index 821d8083c0..5c39217ace 100644
--- a/ja_JP.eucJP/books/handbook/boot/chapter.xml
+++ b/ja_JP.eucJP/books/handbook/boot/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="euc-jp" standalone="no"?>
+<?xml version="1.0" encoding="euc-jp"?>
<!--
The FreeBSD Documentation Project
The FreeBSD Japanese Documentation Project
diff --git a/ja_JP.eucJP/books/handbook/bsdinstall/chapter.xml b/ja_JP.eucJP/books/handbook/bsdinstall/chapter.xml
index b906f9909b..9823b6e039 100644
--- a/ja_JP.eucJP/books/handbook/bsdinstall/chapter.xml
+++ b/ja_JP.eucJP/books/handbook/bsdinstall/chapter.xml
@@ -117,7 +117,7 @@
<sect3>
<title>&os;/&arch.i386;</title>
- <para>&os;/&arch.i386 失□平氾弁民乓反﹜
+ <para>&os;/&arch.i386; 失□平氾弁民乓反﹜
486 動曉及皿伕本永扔午﹜
劑卅仁午手 64&nbsp;MB 及 RAM 互优邰匹允﹝
瘉凝及奶件旦玄□伙匹反﹜
@@ -161,7 +161,7 @@
呁醒及 CPU 毛儅勾戊件疋亙□正反 SMP 卞覆殺仄化中引允﹝</para>
<para>32-bit 市□生伙反﹜RAM 及瘉賡及 2&nbsp;GB 分仃毛厙迕匹五引允﹝
- Blue & White PowerMac G3 匹反﹜&firewire; 卞覆殺仄化中引六氏﹝</para>
+ Blue &amp; White PowerMac G3 匹反﹜&firewire; 卞覆殺仄化中引六氏﹝</para>
</sect3>
<sect3>
@@ -2594,7 +2594,7 @@ login:</screen>
</sect2>
<sect2>
- <title>玄仿皮伙扑亙□氾奴件弘卞楮允月 Q & A</title>
+ <title>玄仿皮伙扑亙□氾奴件弘卞楮允月 Q &amp; A</title>
<qandaset>
<qandaentry>
diff --git a/ja_JP.eucJP/books/handbook/chapters.ent b/ja_JP.eucJP/books/handbook/chapters.ent
index 1505851dc2..a8690771db 100644
--- a/ja_JP.eucJP/books/handbook/chapters.ent
+++ b/ja_JP.eucJP/books/handbook/chapters.ent
@@ -14,232 +14,57 @@
Chapters should be listed in the order in which they are referenced.
-->
-<!ENTITY % not.published "INCLUDE">
-
-<!ENTITY % chap.introduction "IGNORE">
-<!ENTITY % chap.install "IGNORE">
-<!ENTITY % chap.bsdinstall "IGNORE">
-<!ENTITY % chap.basics "IGNORE">
-<!ENTITY % chap.ports "IGNORE">
-<!ENTITY % chap.config "IGNORE">
-<!ENTITY % chap.boot "IGNORE">
-<!ENTITY % chap.users "IGNORE">
-<!ENTITY % chap.kernelconfig "IGNORE">
-<!ENTITY % chap.security "IGNORE">
-<!ENTITY % chap.jails "IGNORE">
-<!ENTITY % chap.printing "IGNORE">
-<!ENTITY % chap.disks "IGNORE">
-<!ENTITY % chap.geom "IGNORE">
-<!ENTITY % chap.vinum "IGNORE">
-<!ENTITY % chap.x11 "IGNORE">
-<!ENTITY % chap.l10n "IGNORE">
-<!ENTITY % chap.multimedia "IGNORE">
-<!ENTITY % chap.desktop "IGNORE">
-<!ENTITY % chap.serialcomms "IGNORE">
-<!ENTITY % chap.ppp-and-slip "IGNORE">
-<!ENTITY % chap.advanced-networking "IGNORE">
-<!ENTITY % chap.firewalls "IGNORE">
-<!ENTITY % chap.network-servers "IGNORE">
-<!ENTITY % chap.mail "IGNORE">
-<!ENTITY % chap.cutting-edge "IGNORE">
-<!ENTITY % chap.linuxemu "IGNORE">
-<!ENTITY % chap.mirrors "IGNORE">
-<!ENTITY % chap.mirrors.ftp.inc "INCLUDE">
-<!ENTITY % chap.mirrors.cvsup.inc "INCLUDE">
-<!ENTITY % chap.bibliography "IGNORE">
-<!ENTITY % chap.eresources "IGNORE">
-<!ENTITY % chap.eresources.www.inc "INCLUDE">
-<!ENTITY % chap.pgpkeys "IGNORE">
-<!ENTITY % chap.index "IGNORE">
-<!ENTITY % chap.freebsd-glossary "IGNORE">
-<!ENTITY % chap.mac "IGNORE">
-<!ENTITY % chap.audit "IGNORE">
-<!ENTITY % chap.filesystems "IGNORE">
-<!ENTITY % chap.dtrace "IGNORE">
-
<!ENTITY chap.preface SYSTEM "preface/preface.xml">
<!ENTITY % pgpkeys SYSTEM "../../../share/pgpkeys/pgpkeys.ent"> %pgpkeys;
<!-- Part One -->
-<![%chap.introduction;[
<!ENTITY chap.introduction SYSTEM "introduction/chapter.xml">
-]]>
-<![%chap.install;[
<!ENTITY chap.install SYSTEM "install/chapter.xml">
-]]>
-<![%chap.bsdinstall;[
<!ENTITY chap.bsdinstall SYSTEM "bsdinstall/chapter.xml">
-]]>
-<![%chap.basics;[
<!ENTITY chap.basics SYSTEM "basics/chapter.xml">
-]]>
-<![%chap.ports;[
<!ENTITY chap.ports SYSTEM "ports/chapter.xml">
-]]>
-<![%chap.x11;[
<!ENTITY chap.x11 SYSTEM "x11/chapter.xml">
-]]>
<!-- Part Two -->
-<![%chap.desktop;[
<!ENTITY chap.desktop SYSTEM "desktop/chapter.xml">
-]]>
-<![%chap.multimedia;[
<!ENTITY chap.multimedia SYSTEM "multimedia/chapter.xml">
-]]>
-<![%chap.kernelconfig;[
<!ENTITY chap.kernelconfig SYSTEM "kernelconfig/chapter.xml">
-]]>
-<![%chap.printing;[
<!ENTITY chap.printing SYSTEM "printing/chapter.xml">
-]]>
-<![%chap.linuxemu;[
<!ENTITY chap.linuxemu SYSTEM "linuxemu/chapter.xml">
-]]>
<!-- Part Three -->
-<![%chap.config;[
<!ENTITY chap.config SYSTEM "config/chapter.xml">
-]]>
-<![%chap.boot;[
<!ENTITY chap.boot SYSTEM "boot/chapter.xml">
-]]>
-<![%chap.users;[
<!ENTITY chap.users SYSTEM "users/chapter.xml">
-]]>
-<![%chap.security;[
<!ENTITY chap.security SYSTEM "security/chapter.xml">
-]]>
-<![%chap.jails;[
<!ENTITY chap.jails SYSTEM "jails/chapter.xml">
-]]>
-<![%chap.mac;[
- <!ENTITY chap.mac SYSTEM "mac/chapter.xml">
-]]>
-<![%chap.audit;[
<!ENTITY chap.audit SYSTEM "audit/chapter.xml">
-]]>
-<![%chap.disks;[
<!ENTITY chap.disks SYSTEM "disks/chapter.xml">
-]]>
-<![%chap.geom;[
- <!ENTITY chap.geom SYSTEM "geom/chapter.xml">
-]]>
-<![%chap.filesystems;[
<!ENTITY chap.filesystems SYSTEM "filesystems/chapter.xml">
-]]>
-<![%chap.vinum;[
<!ENTITY chap.vinum SYSTEM "vinum/chapter.xml">
-]]>
-<![%chap.l10n;[
<!ENTITY chap.l10n SYSTEM "l10n/chapter.xml">
-]]>
-<![%chap.cutting-edge;[
<!ENTITY chap.cutting-edge SYSTEM "cutting-edge/chapter.xml">
-]]>
-<![%chap.dtrace;[
<!ENTITY chap.dtrace SYSTEM "dtrace/chapter.xml">
-]]>
<!-- Part Four -->
-<![%chap.serialcomms;[
<!ENTITY chap.serialcomms SYSTEM "serialcomms/chapter.xml">
-]]>
-<![%chap.ppp-and-slip;[
<!ENTITY chap.ppp-and-slip SYSTEM "ppp-and-slip/chapter.xml">
-]]>
-<![%chap.mail;[
<!ENTITY chap.mail SYSTEM "mail/chapter.xml">
-]]>
-<![%chap.network-servers;[
- <!ENTITY chap.network-servers SYSTEM "network-servers/chapter.xml">
-]]>
-<![%chap.firewalls;[
- <!ENTITY chap.firewalls SYSTEM "firewalls/chapter.xml">
-]]>
-<![%chap.advanced-networking;[
<!ENTITY chap.advanced-networking SYSTEM "advanced-networking/chapter.xml">
-]]>
<!-- Part Five (appendices) -->
-<![%chap.mirrors;[
- <!ENTITY chap.mirrors SYSTEM "mirrors/chapter.xml">
-]]>
-<![%chap.mirrors.ftp.inc;[
- <!ENTITY chap.mirrors.ftp.inc SYSTEM "mirrors.xml.ftp.inc">
-]]>
-<![%chap.mirrors.cvsup.inc;[
- <!ENTITY chap.mirrors.cvsup.inc SYSTEM "mirrors.xml.cvsup.inc">
-]]>
-<![%chap.bibliography;[
+ <!ENTITY chap.mirrors SYSTEM "mirrors/chapter.xml">
+ <!ENTITY chap.mirrors.lastmod.inc SYSTEM "mirrors.lastmod.inc">
+ <!ENTITY chap.mirrors.ftp.index.inc SYSTEM "mirrors.xml.ftp.index.inc">
+ <!ENTITY chap.mirrors.ftp.inc SYSTEM "mirrors.xml.ftp.inc">
+ <!ENTITY chap.mirrors.cvsup.index.inc SYSTEM "mirrors.xml.cvsup.index.inc">
+ <!ENTITY chap.mirrors.cvsup.inc SYSTEM "mirrors.xml.cvsup.inc">
<!ENTITY chap.bibliography SYSTEM "bibliography/chapter.xml">
-]]>
-<![%chap.eresources;[
- <!ENTITY chap.eresources SYSTEM "eresources/chapter.xml">
-]]>
-<![%chap.eresources.www.inc;[
- <!ENTITY chap.eresources.www.inc SYSTEM "eresources.xml.www.inc">
-]]>
-<![%chap.pgpkeys;[
+ <!ENTITY chap.eresources SYSTEM "eresources/chapter.xml">
+ <!ENTITY chap.eresources.www.index.inc SYSTEM "eresources.xml.www.index.inc">
+ <!ENTITY chap.eresources.www.inc SYSTEM "eresources.xml.www.inc">
<!ENTITY chap.pgpkeys SYSTEM "pgpkeys/chapter.xml">
-]]>
-<![%chap.freebsd-glossary;[
<!ENTITY chap.freebsd-glossary "&freebsd-glossary;">
-]]>
-<![%chap.index;[
- <!ENTITY chap.index SYSTEM "index.xml">
-]]>
+ <!ENTITY chap.index "">
<!ENTITY chap.colophon SYSTEM "colophon.xml">
-
-<!-- IGNORE cases -->
-
-<!-- Part One -->
-<!ENTITY chap.introduction "">
-<!ENTITY chap.install "">
-<!ENTITY chap.basics "">
-<!ENTITY chap.ports "">
-<!ENTITY chap.x11 "">
-
-<!-- Part Two -->
-<!ENTITY chap.desktop "">
-<!ENTITY chap.multimedia "">
-<!ENTITY chap.kernelconfig "">
-<!ENTITY chap.printing "">
-<!ENTITY chap.linuxemu "">
-
-<!-- Part Three -->
-<!ENTITY chap.config "">
-<!ENTITY chap.boot "">
-<!ENTITY chap.users "">
-<!ENTITY chap.security "">
-<!ENTITY chap.jails "">
-<!ENTITY chap.mac "">
-<!ENTITY chap.audit "">
-<!ENTITY chap.disks "">
-<!ENTITY chap.geom "">
-<!ENTITY chap.filesystems "">
-<!ENTITY chap.vinum "">
-<!ENTITY chap.virtualization "">
-<!ENTITY chap.l10n "">
-<!ENTITY chap.cutting-edge "">
-<!ENTITY chap.dtrace "">
-
-<!-- Part Four -->
-<!ENTITY chap.serialcomms "">
-<!ENTITY chap.ppp-and-slip "">
-<!ENTITY chap.mail "">
-<!ENTITY chap.network-servers "">
-<!ENTITY chap.firewalls "">
-<!ENTITY chap.advanced-networking "">
-
-<!-- Part Five (appendices) -->
-<!ENTITY chap.mirrors "">
-<!ENTITY chap.mirrors.ftp.inc "">
-<!ENTITY chap.mirrors.cvsup.inc "">
-<!ENTITY chap.bibliography "">
-<!ENTITY chap.eresources "">
-<!ENTITY chap.eresources.www.inc "">
-<!ENTITY chap.pgpkeys "">
-<!ENTITY chap.freebsd-glossary "">
-<!ENTITY chap.index "">
diff --git a/ja_JP.eucJP/books/handbook/colophon.xml b/ja_JP.eucJP/books/handbook/colophon.xml
index f0bd815755..c39677f324 100644
--- a/ja_JP.eucJP/books/handbook/colophon.xml
+++ b/ja_JP.eucJP/books/handbook/colophon.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="euc-jp" standalone="no"?>
+<?xml version="1.0" encoding="euc-jp"?>
<!--
The FreeBSD Documentation Project
The FreeBSD Japanese Documentation Project
diff --git a/ja_JP.eucJP/books/handbook/config/chapter.xml b/ja_JP.eucJP/books/handbook/config/chapter.xml
index fbbb32a03c..9b9f81fe1e 100644
--- a/ja_JP.eucJP/books/handbook/config/chapter.xml
+++ b/ja_JP.eucJP/books/handbook/config/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="euc-jp" standalone="no"?>
+<?xml version="1.0" encoding="euc-jp"?>
<!--
The FreeBSD Documentation Project
The FreeBSD Japanese Documentation Project
@@ -372,7 +372,7 @@ stop)
kill -9 `cat /var/run/foobar.pid`
;;
*)
- echo "Usage: `basename $0` {start|stop}" >&2
+ echo "Usage: `basename $0` {start|stop}" &gt;&amp;2
exit 64
;;
esac
diff --git a/ja_JP.eucJP/books/handbook/cutting-edge/chapter.xml b/ja_JP.eucJP/books/handbook/cutting-edge/chapter.xml
index bf12cc1bb9..97d8ea746b 100644
--- a/ja_JP.eucJP/books/handbook/cutting-edge/chapter.xml
+++ b/ja_JP.eucJP/books/handbook/cutting-edge/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="euc-jp" standalone="no"?>
+<?xml version="1.0" encoding="euc-jp"?>
<!--
The FreeBSD Documentation Project
The FreeBSD Japanese Documentation Project
@@ -1254,81 +1254,6 @@ Fetching 133 new ports or files... done.</screen>
<screen>&prompt.root; <userinput>portupgrade -PP hu-freebsd-doc</userinput></screen>
</sect3>
</sect2>
-
-<!-- FIXME: Waiting for a working docsnap server... -->
-<![ IGNORE [
- <sect2 id="docsnap">
- <sect2info>
- <authorgroup>
- <author>
- <firstname>Pav</firstname>
- <surname>Lucistnik</surname>
- <contrib>Based on information provided by </contrib>
- </author>
- </authorgroup>
- </sect2info>
-
- <title>Using Docsnap</title>
-
- <indexterm><primary>Updating and Upgrading</primary></indexterm>
-
- <indexterm>
- <primary>Docsnap</primary>
- <see>Updating and Upgrading</see>
- </indexterm>
-
- <para><application>Docsnap</application> is an &man.rsync.1;
- repository for updating installed &os; Documentation in a
- relatively easy and fast way. A
- <quote><application>Docsnap</application> server</quote> tracks
- the documentation sources, and builds them in HTML format every
- hour. The <filename role="package">textproc/docproj</filename>
- is unneeded with <application>Docsnap</application> as only
- patches to the built documentation exist.</para>
-
- <para>The only requirement for using this technique is
- the <filename role="package">net/rsync</filename> port or
- package. To add it, use the following command:</para>
-
- <screen>&prompt.root; <userinput>pkg_add -r rsync</userinput></screen>
-
- <note>
- <para><application>Docsnap</application> has been originally
- developed for updating documentation installed
- to <filename class="directory">/usr/share/doc</filename>, but
- the following examples could be adapted for other directories
- as well. For user directories, it does not require
- <username>root</username> privileges.</para>
- </note>
-
- <para>To update the documentation set, issue the following
- command:</para>
-
- <screen>&prompt.root; <userinput>rsync -rltvz <replaceable>docsnap.sk.FreeBSD.org</replaceable>::docsnap <replaceable>/usr/share/doc</replaceable></userinput></screen>
-
- <note>
- <para>There is only one <application>Docsnap</application>
- server at the moment;
- the <hostid>docsnap.sk.FreeBSD.org</hostid> shown
- above.</para>
- </note>
-
- <para>Do not use the <option>--delete</option> flag here as there
- are some items installed
- into <filename class="directory">/usr/share/doc</filename>
- during <command>make installworld</command>, which would
- accidentally be removed. To clean up, use this command
- instead:</para>
-
- <screen>&prompt.root; <userinput>rsync -rltvz --delete <replaceable>docsnap.sk.FreeBSD.org</replaceable>::docsnap/??_??\.\* <replaceable>/usr/share/doc</replaceable></userinput></screen>
-
- <para>If a subset of documentation needs to be updated, for
- example, the English documentation only, the following command
- should be used:</para>
-
- <screen>&prompt.root; <userinput>rsync -rltvz <replaceable>docsnap.sk.FreeBSD.org</replaceable>::docsnap/en_US.ISO8859-1 <replaceable>/usr/share/doc</replaceable></userinput></screen>
- </sect2>
-]]>
</sect1>
<sect1 id="current-stable">
diff --git a/ja_JP.eucJP/books/handbook/desktop/chapter.xml b/ja_JP.eucJP/books/handbook/desktop/chapter.xml
index 7740518f0d..6c5a970307 100644
--- a/ja_JP.eucJP/books/handbook/desktop/chapter.xml
+++ b/ja_JP.eucJP/books/handbook/desktop/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="euc-jp" standalone="no"?>
+<?xml version="1.0" encoding="euc-jp"?>
<!--
The FreeBSD Documentation Project
The FreeBSD Japanese Documentation Project
@@ -273,7 +273,7 @@
<para>&os; 迕及 &adobe; &flash; 皿仿弘奶件反羼間今木化中引六氏﹝
仄井仄卅互日﹜Linux 田□斥亦件及皿仿弘奶件毛撢墊允月凶戶及末白玄它尼失伊奶乩 (wrapper) 互繡箕仄引允﹝
仇及 wrapper 反﹜&adobe; &acrobat; 皿仿弘奶件支
- &realplayer 皿仿弘奶件卅升卞手覆殺仄化中引允﹝</para>
+ &realplayer; 皿仿弘奶件卅升卞手覆殺仄化中引允﹝</para>
<para>銀迕仄化中月 &os; 及田□斥亦件卞方勻化优邰卅綜僅反唱卅曰引允﹝</para>
diff --git a/ja_JP.eucJP/books/handbook/disks/chapter.xml b/ja_JP.eucJP/books/handbook/disks/chapter.xml
index 7c884b07d3..1bd3106faa 100644
--- a/ja_JP.eucJP/books/handbook/disks/chapter.xml
+++ b/ja_JP.eucJP/books/handbook/disks/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="euc-jp" standalone="no"?>
+<?xml version="1.0" encoding="euc-jp"?>
<!--
The FreeBSD Documentation Project
The FreeBSD Japanese Documentation Project
@@ -1319,7 +1319,7 @@ cd0: Attempt to query device size failed: NOT READY, Medium not present - tray c
<para>凜★ <filename>/dev</filename> 票及巨件玄伉反 (瘋)
綜嶽今木卅仃木壬卅曰引六氏﹝慼及戊穴件玉匹仇木毛墊中引允﹝</para>
- <screen>&prompt.root; <userinput>cd /dev && ./MAKEDEV "fd*"</userinput></screen>
+ <screen>&prompt.root; <userinput>cd /dev &amp;&amp; ./MAKEDEV "fd*"</userinput></screen>
</sect4>
<sect4>
@@ -1935,9 +1935,9 @@ sa0(ncr1:4:0): Logical unit is in process of becoming ready</screen>
毛迕中化伉乒□玄氾□皿玉仿奶皮卞犯□正毛霜月仇午互匹五引允﹝</para>
<screen>&prompt.root; <userinput>for f in <replaceable>directory_list; do</replaceable></userinput>
-<userinput>find $f >> backup.list</userinput>
+<userinput>find $f &gt;&gt; backup.list</userinput>
<userinput>done</userinput>
-&prompt.root; <userinput>cpio -v -o --format=newc < backup.list | ssh <replaceable>user</replaceable>@<replaceable>host</replaceable> "cat > <replaceable>backup_device</replaceable>"</userinput></screen>
+&prompt.root; <userinput>cpio -v -o --format=newc &lt; backup.list | ssh <replaceable>user</replaceable>@<replaceable>host</replaceable> "cat &gt; <replaceable>backup_device</replaceable>"</userinput></screen>
<para><replaceable>directory_list</replaceable>
反田永弁失永皿仄凶中犯奴伊弁玄伉及伉旦玄匹﹜
@@ -2147,7 +2147,7 @@ sa0(ncr1:4:0): Logical unit is in process of becoming ready</screen>
<example>
<title>皮□玄白伕永疋□毛綜嶽允月旦弁伉皿玄</title>
- <programlisting><![ CDATA [#!/bin/sh
+ <programlisting><![CDATA[#!/bin/sh
#
# create a restore floppy
#
@@ -2275,7 +2275,7 @@ cd /
#
# create minimum file system table
#
-cat > /mnt/etc/fstab <<EOM
+cat &gt; /mnt/etc/fstab &lt;&lt;EOM
/dev/fd0a / ufs rw 1 1
EOM
@@ -2361,13 +2361,6 @@ echo "The floppy has been unmounted and is now ready."]]></programlisting>
升及方丹卅咥苀匹瘋太儀裕互粟五凶曰﹜犯□正互撩歹木月井歹井曰引六氏﹝
仇木卞醒凜棉毛韙馱酗匹﹜詨★及碳ろ井日菌歹木引允﹝</para>
</sect3>
-
-<![ %not.published; [
- <sect3>
- <title>* 碳ろ覆綺毛仄化中引六氏匹仄凶﹝
- 升丹仄凶日中中匹仄斤丹井?</title>
- </sect3>
-]]>
</sect2>
</sect1>
diff --git a/ja_JP.eucJP/books/handbook/eresources/chapter.xml b/ja_JP.eucJP/books/handbook/eresources/chapter.xml
index cfddafbd1b..64cc3d2da3 100644
--- a/ja_JP.eucJP/books/handbook/eresources/chapter.xml
+++ b/ja_JP.eucJP/books/handbook/eresources/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="euc-jp" standalone="no"?>
+<?xml version="1.0" encoding="euc-jp"?>
<!--
The FreeBSD Documentation Project
The FreeBSD Japanese Documentation Project
@@ -1651,6 +1651,10 @@
<sect1 id="eresources-web">
<title>World Wide Web 扔奶玄</title>
+ &chap.eresources.www.index.inc;
+
+ &chap.mirrors.lastmod.inc;
+
&chap.eresources.www.inc;
</sect1>
diff --git a/ja_JP.eucJP/books/handbook/install/chapter.xml b/ja_JP.eucJP/books/handbook/install/chapter.xml
index 5adae8e467..0412a28d4c 100644
--- a/ja_JP.eucJP/books/handbook/install/chapter.xml
+++ b/ja_JP.eucJP/books/handbook/install/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="euc-jp" standalone="no"?>
+<?xml version="1.0" encoding="euc-jp"?>
<!--
The FreeBSD Documentation Project
The FreeBSD Japanese Documentation Project
@@ -111,7 +111,7 @@
<sect3>
<title>&os;/&arch.i386; 云方太 &os;/&arch.pc98;</title>
- <para>&os;/&arch.i386 午 &os;/&arch.pc98 及徆杅及失□平氾弁民乓反﹜
+ <para>&os;/&arch.i386; 午 &os;/&arch.pc98; 及徆杅及失□平氾弁民乓反﹜
486 動曉及皿伕本永扔午﹜
劑卅仁午手 24&nbsp;MB 及 RAM 互优邰匹允﹝
瘉凝及奶件旦玄□伙匹反﹜
@@ -3060,7 +3060,7 @@ Press [Enter] now to invoke an editor on /etc/exports
</mediaobject>
</figure>
- <para>襖毛庍凳仄凶日 &gui.ok 毛薊鎗仄﹜
+ <para>襖毛庍凳仄凶日 &gui.ok; 毛薊鎗仄﹜
<keycap>Enter</keycap> 毛瓷仄化﹜
扑旦氾丞戊件末□伙及澀爛丟瓦亙□卞枑勻化仁分今中﹝</para>
@@ -4228,7 +4228,7 @@ Please press any key to reboot.</screen>
</sect2>
<sect2>
- <title>玄仿皮伙扑亙□氾奴件弘卞楮允月 Q & A</title>
+ <title>玄仿皮伙扑亙□氾奴件弘卞楮允月 Q &amp; A</title>
<qandaset>
<qandaentry>
@@ -4368,7 +4368,7 @@ Please press any key to reboot.</screen>
<para>銀迕仄化中月市□玉及 IRQ 互﹜
<filename>/boot/device.hints</filename>
白央奶伙匹隙爛今木凶 IRQ 午唱卅月第Х嶺互丐曰引允﹝
- &man.ed.4 玉仿奶田反﹜犯白巧伙玄匹反 <quote>末白玄它尼失</quote> 戊件白奴弘伊□扑亦件
+ &man.ed.4; 玉仿奶田反﹜犯白巧伙玄匹反 <quote>末白玄它尼失</quote> 戊件白奴弘伊□扑亦件
(&ms-dos; 及 EZSETUP 匹ェ恘今木凶襖) 毛迕中引六氏﹝
奶件正□白尼□旦及甲件玄樹扷卞 <literal>-1</literal> 毛隙爛仄凶樺寧卞反﹜
末白玄它尼失戊件白奴弘伊□扑亦件互迕中日木引允﹝</para>
diff --git a/ja_JP.eucJP/books/handbook/introduction/chapter.xml b/ja_JP.eucJP/books/handbook/introduction/chapter.xml
index 2de1adf193..3eb38ae54d 100644
--- a/ja_JP.eucJP/books/handbook/introduction/chapter.xml
+++ b/ja_JP.eucJP/books/handbook/introduction/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="euc-jp" standalone="no"?>
+<?xml version="1.0" encoding="euc-jp"?>
<!--
The FreeBSD Documentation Project
The FreeBSD Japanese Documentation Project
diff --git a/ja_JP.eucJP/books/handbook/jcontrib/chapter.xml b/ja_JP.eucJP/books/handbook/jcontrib/chapter.xml
index dcb68446f7..45ad47378b 100644
--- a/ja_JP.eucJP/books/handbook/jcontrib/chapter.xml
+++ b/ja_JP.eucJP/books/handbook/jcontrib/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="euc-jp" standalone="no"?>
+<?xml version="1.0" encoding="euc-jp"?>
<!--
The FreeBSD Documentation Project
The FreeBSD Japanese Documentation Project
diff --git a/ja_JP.eucJP/books/handbook/kernelconfig/chapter.xml b/ja_JP.eucJP/books/handbook/kernelconfig/chapter.xml
index 6a6cefdb00..902a840cee 100644
--- a/ja_JP.eucJP/books/handbook/kernelconfig/chapter.xml
+++ b/ja_JP.eucJP/books/handbook/kernelconfig/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="euc-jp" standalone="no"?>
+<?xml version="1.0" encoding="euc-jp"?>
<!--
The FreeBSD Documentation Project
The FreeBSD Japanese Documentation Project
@@ -831,7 +831,7 @@ options NFS_ROOT # NFS usable as /, requires NFSCLIENT</progra
<para>伉失伙正奶丞傀艦互 1993 &posix; 卞馨笛今木引仄凶﹝
Ports Collection 及ま及中仁勾井及失皿伉弗□扑亦件
- (凶午尹壬 <application>&staroffice</application>)
+ (凶午尹壬 <application>&staroffice;</application>)
反仇木毛銀勻化中引允﹝</para>
<programlisting>options KBD_INSTALL_CDEV # install a CDEV entry in /dev</programlisting>
@@ -1171,7 +1171,7 @@ device ppc</programlisting>
<programlisting>#device puc</programlisting>
- <para>&man.puc.4 glue 玉仿奶田互扔禾□玄仄化中月
+ <para>&man.puc.4; glue 玉仿奶田互扔禾□玄仄化中月
<quote>dumb</quote> 扑伉失伙﹜
引凶反由仿伊伙 PCI 市□玉毛儅勻化中月及匹丐木壬﹜
仇及犯田奶旦毛肣躲卞仄化仁分今中﹝</para>
diff --git a/ja_JP.eucJP/books/handbook/l10n/chapter.xml b/ja_JP.eucJP/books/handbook/l10n/chapter.xml
index b4352e3ec7..902cf258f4 100644
--- a/ja_JP.eucJP/books/handbook/l10n/chapter.xml
+++ b/ja_JP.eucJP/books/handbook/l10n/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="euc-jp" standalone="no"?>
+<?xml version="1.0" encoding="euc-jp"?>
<!--
The FreeBSD Documentation Project
The FreeBSD Japanese Documentation Project
diff --git a/ja_JP.eucJP/books/handbook/linuxemu/chapter.xml b/ja_JP.eucJP/books/handbook/linuxemu/chapter.xml
index c1221a72ea..afed0f6046 100644
--- a/ja_JP.eucJP/books/handbook/linuxemu/chapter.xml
+++ b/ja_JP.eucJP/books/handbook/linuxemu/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="euc-jp" standalone="no"?>
+<?xml version="1.0" encoding="euc-jp"?>
<!--
The FreeBSD Documentation Project
The FreeBSD Japanese Documentation Project
@@ -2258,7 +2258,7 @@ drwxrwxr-x 11 idsadm sapsys 512 May 4 14:20 trans </screen>
<indexterm><primary>execution class loader</primary></indexterm>
<para>FreeBSD 反﹜&ldquo;撢墊弁仿旦伕□母 (execution class loader) &rdquo;
- 午裟壬木月鏟擂讀卅窗厭毛儅勻化中引允﹝仇木反 &man.execve.2
+ 午裟壬木月鏟擂讀卅窗厭毛儅勻化中引允﹝仇木反 &man.execve.2;
扑旦氾丞戊□伙尺及僄午中丹溥匹撢隸今木化中引允﹝
</para>
diff --git a/ja_JP.eucJP/books/handbook/mail/chapter.xml b/ja_JP.eucJP/books/handbook/mail/chapter.xml
index e8b1d2bba9..1ed5b554a8 100644
--- a/ja_JP.eucJP/books/handbook/mail/chapter.xml
+++ b/ja_JP.eucJP/books/handbook/mail/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="euc-jp" standalone="no"?>
+<?xml version="1.0" encoding="euc-jp"?>
<!--
The FreeBSD Documentation Project
The FreeBSD Japanese Documentation Project
@@ -452,7 +452,7 @@ mail.example.com</programlisting>
<para><application>sendmail</application> 及潛澀爛白央奶伙反
<application>sendmail</application> 及窗Х午が綜毛瑁爛允月
- &man.m4.1 穴弁伕井日厭蹲匹五引允﹝
+ &man.m4.1; 穴弁伕井日厭蹲匹五引允﹝
擇稱卞勾中化反
<filename>/usr/src/contrib/sendmail/cf/README</filename>
毛輔寰仄化仁分今中﹝</para>
diff --git a/ja_JP.eucJP/books/handbook/mirrors/chapter.xml b/ja_JP.eucJP/books/handbook/mirrors/chapter.xml
index 91bc7c95ea..915d061a98 100644
--- a/ja_JP.eucJP/books/handbook/mirrors/chapter.xml
+++ b/ja_JP.eucJP/books/handbook/mirrors/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="euc-jp" standalone="no"?>
+<?xml version="1.0" encoding="euc-jp"?>
<!--
The FreeBSD Documentation Project
The FreeBSD Japanese Documentation Project
@@ -127,6 +127,10 @@
備扔奶玄匹羼間仄化中月失弁本旦杅芊反﹜
石旦玄抩卞糧仁喟裡及醱卞筏竭今木化中引允﹝</para>
+ &chap.mirrors.ftp.index.inc;
+
+ &chap.mirrors.lastmod.inc;
+
&chap.mirrors.ftp.inc;
</sect1>
@@ -2327,6 +2331,10 @@ doc/zh_*</programlisting>
<para>&os; 及 <link linkend="cvsup">CVSup</link>
扔□田反動票及扔奶玄匹紳か仄化中引允﹝</para>
+ &chap.mirrors.cvsup.index.inc;
+
+ &chap.mirrors.lastmod.inc;
+
&chap.mirrors.cvsup.inc;
</sect2>
</sect1>
diff --git a/ja_JP.eucJP/books/handbook/multimedia/chapter.xml b/ja_JP.eucJP/books/handbook/multimedia/chapter.xml
index 2e479740a9..4ca1575e82 100644
--- a/ja_JP.eucJP/books/handbook/multimedia/chapter.xml
+++ b/ja_JP.eucJP/books/handbook/multimedia/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="euc-jp" standalone="no"?>
+<?xml version="1.0" encoding="euc-jp"?>
<!--
The FreeBSD Documentation Project
The FreeBSD Japanese Documentation Project
@@ -1656,7 +1656,7 @@ bktr0: Pinnacle/Miro TV, Philips SECAM tuner.</programlisting>
<para>MythTV 犯□正矛□旦毛澀爛仄化仁分今中﹝</para>
- <screen>&prompt.root; <userinput>mysql -uroot -p < /usr/local/share/mythtv/database/mc.sql</userinput></screen>
+ <screen>&prompt.root; <userinput>mysql -uroot -p &lt; /usr/local/share/mythtv/database/mc.sql</userinput></screen>
<para>田永弁巨件玉毛澀爛仄化仁分今中﹝</para>
@@ -1714,7 +1714,7 @@ bktr0: Pinnacle/Miro TV, Philips SECAM tuner.</programlisting>
<sect2>
<title>市□生伙及戊件白奴弘伊□扑亦件</title>
- <para>蟆課及方丹卞﹜&os 反旦平乓瓜及奶件正白尼□旦午仄化
+ <para>蟆課及方丹卞﹜&os; 反旦平乓瓜及奶件正白尼□旦午仄化
SCSI 午 USB 及徆杅卞覆殺仄化中引允﹝
旦平乓瓜及奶件正白尼□旦卞方勻化﹜优邰午卅月玉仿奶田互唱卅曰引允﹝</para>
diff --git a/ja_JP.eucJP/books/handbook/pgpkeys/chapter.xml b/ja_JP.eucJP/books/handbook/pgpkeys/chapter.xml
index 3270bcba7a..33e9250c26 100644
--- a/ja_JP.eucJP/books/handbook/pgpkeys/chapter.xml
+++ b/ja_JP.eucJP/books/handbook/pgpkeys/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="euc-jp" standalone="no"?>
+<?xml version="1.0" encoding="euc-jp"?>
<!--
The FreeBSD Documentation Project
The FreeBSD Japanese Documentation Project
diff --git a/ja_JP.eucJP/books/handbook/ports/chapter.xml b/ja_JP.eucJP/books/handbook/ports/chapter.xml
index ea88f508cf..d7aa1d4796 100644
--- a/ja_JP.eucJP/books/handbook/ports/chapter.xml
+++ b/ja_JP.eucJP/books/handbook/ports/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="euc-jp" standalone="no"?>
+<?xml version="1.0" encoding="euc-jp"?>
<!--
The FreeBSD Documentation Project
The FreeBSD Japanese Documentation Project
@@ -1374,7 +1374,7 @@ Deinstalling ca_root_nss-3.13.5... done</screen>
仇及方丹卅白央奶伙毛迕中化た潰卅橇須卞手覆殺仄化中引允﹝
仇木日及白央奶伙卞勾中化及擇稱云方太
ports 及域旼炊岍獑壑豸臚中々洁<ulink
- url="&url.books.porters-handbook/index.html">port
+ url="&url.books.porters-handbook;/index.html">port
綜嶽樊及凶戶及甩件玉皮永弁</ulink> 毛仍厖票今中﹝</para>
<para>port 反末□旦戊□玉井日失皿伉弗□扑亦件毛厭蹲允月杅芊毛羼間仄引允互﹜
@@ -2074,7 +2074,7 @@ ftp://ftp.FreeBSD.org/pub/FreeBSD/ports/distfiles/ fetch</userinput></screen>
<listitem>
<para>憤坌匹躂仄引仄斤丹!
<quote>Ports</quote> 扑旦氾丞卞楮允月擇稱卅樹扷反 <ulink
- url="&url.books.porters-handbook/index.html">
+ url="&url.books.porters-handbook;/index.html">
port 綜嶽樊及凶戶及甩件玉皮永弁</ulink> 卞丐曰引允﹝
仇及本弁扑亦件毛づ戈午﹜莽木化仄引勻凶 port 毛躂仄凶曰﹜
憤坌匹綜勻凶 port 毛羼請仄凶曰匹五月方丹卞卅曰引允!</para>
diff --git a/ja_JP.eucJP/books/handbook/ppp-and-slip/chapter.xml b/ja_JP.eucJP/books/handbook/ppp-and-slip/chapter.xml
index d6611c60ae..859d7ecf73 100644
--- a/ja_JP.eucJP/books/handbook/ppp-and-slip/chapter.xml
+++ b/ja_JP.eucJP/books/handbook/ppp-and-slip/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="euc-jp" standalone="no"?>
+<?xml version="1.0" encoding="euc-jp"?>
<!--
The FreeBSD Documentation Project
The FreeBSD Japanese Documentation Project
@@ -454,7 +454,7 @@ nameserver <replaceable>y.y.y.y</replaceable></programlisting>
<para>仇及皿伕田奶母及齬狪砦璊羃媊磥楔牏.
呁醒及齬狪砦璊 <literal>:</literal> 支
<literal>|</literal> 匹嗉濠勻化隙爛允月仇午互匹五引允.
- 仇木日嗉濠曰妐儂及啜中卞勾中化反, &man.ppp.8
+ 仇木日嗉濠曰妐儂及啜中卞勾中化反, &man.ppp.8;
卞 擇仄仁踏井木化中引允.
邰沶允月午, 咍莢啜丹砦璊 井仃凶中及匹丐木壬
<literal>:</literal> 毛銀中引允. 橘卞
@@ -1718,7 +1718,7 @@ reinput 1 {\255}
if success goto slhup
reinput 1 {\127}
if success goto slhup
-if < \%x 60 goto look
+if &lt; \%x 60 goto look
else goto slhup
:sllogin ; login
@@ -1739,7 +1739,7 @@ reinput 1 {\255}
if success goto slhup
reinput 1 {\127}
if success goto slhup
-if < \%x 10 goto slloop ; try 10 times to get a login prompt
+if &lt; \%x 10 goto slloop ; try 10 times to get a login prompt
else goto slhup ; hang up and start again if 10 failures
:sluid
diff --git a/ja_JP.eucJP/books/handbook/preface/preface.xml b/ja_JP.eucJP/books/handbook/preface/preface.xml
index 541ce41af6..44078b6854 100644
--- a/ja_JP.eucJP/books/handbook/preface/preface.xml
+++ b/ja_JP.eucJP/books/handbook/preface/preface.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="euc-jp" standalone="no"?>
+<?xml version="1.0" encoding="euc-jp"?>
<!--
The FreeBSD Documentation Project
The FreeBSD Japanese Documentation Project
diff --git a/ja_JP.eucJP/books/handbook/printing/chapter.xml b/ja_JP.eucJP/books/handbook/printing/chapter.xml
index 33deeea85e..39554c77fb 100644
--- a/ja_JP.eucJP/books/handbook/printing/chapter.xml
+++ b/ja_JP.eucJP/books/handbook/printing/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="euc-jp" standalone="no"?>
+<?xml version="1.0" encoding="euc-jp"?>
<!--
The FreeBSD Documentation Project
The FreeBSD Japanese Documentation Project
diff --git a/ja_JP.eucJP/books/handbook/security/chapter.xml b/ja_JP.eucJP/books/handbook/security/chapter.xml
index 941450d408..e8ccf73288 100644
--- a/ja_JP.eucJP/books/handbook/security/chapter.xml
+++ b/ja_JP.eucJP/books/handbook/security/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="euc-jp" standalone="no"?>
+<?xml version="1.0" encoding="euc-jp"?>
<!--
The FreeBSD Documentation Project
The FreeBSD Japanese Documentation Project
@@ -3171,7 +3171,7 @@ options IPSEC_ESP #IP security (crypto; define w/IPSEC)</progr
<screen>
(1)
- 石旦玄 A ------> 石旦玄 B
+ 石旦玄 A ------&gt; 石旦玄 B
(1)PROTO=AH
ALG=MD5(RFC1826)
@@ -3179,8 +3179,8 @@ options IPSEC_ESP #IP security (crypto; define w/IPSEC)</progr
SPI=1000
(2.1)
- 石旦玄 A <------ 石旦玄 B
- <------
+ 石旦玄 A &lt;------ 石旦玄 B
+ &lt;------
(2.2)
(2.1)
@@ -3231,10 +3231,10 @@ B 匹:
石旦玄 A -------------------------------------> 石旦玄 B
10.2.3.4 10.6.7.8
| |
- ========== old AH keyed-md5 ==========>
+ ========== old AH keyed-md5 ==========&gt;
- <========= new AH hmac-sha1 ===========
- <========= new ESP des-cbc ============
+ &lt;========= new AH hmac-sha1 ===========
+ &lt;========= new ESP des-cbc ============
</screen>
</sect2>
diff --git a/ja_JP.eucJP/books/handbook/serialcomms/chapter.xml b/ja_JP.eucJP/books/handbook/serialcomms/chapter.xml
index 58f9bc6b68..6dd0b42bf3 100644
--- a/ja_JP.eucJP/books/handbook/serialcomms/chapter.xml
+++ b/ja_JP.eucJP/books/handbook/serialcomms/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="euc-jp" standalone="no"?>
+<?xml version="1.0" encoding="euc-jp"?>
<!--
The FreeBSD Documentation Project
The FreeBSD Japanese Documentation Project
diff --git a/ja_JP.eucJP/books/handbook/users/chapter.xml b/ja_JP.eucJP/books/handbook/users/chapter.xml
index c9b658f9bb..5cb6f46c0e 100644
--- a/ja_JP.eucJP/books/handbook/users/chapter.xml
+++ b/ja_JP.eucJP/books/handbook/users/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="euc-jp" standalone="no"?>
+<?xml version="1.0" encoding="euc-jp"?>
<!--
The FreeBSD Documentation Project
The FreeBSD Japanese Documentation Project
diff --git a/ja_JP.eucJP/books/handbook/x11/chapter.xml b/ja_JP.eucJP/books/handbook/x11/chapter.xml
index 80df9f8c88..16a25ba7af 100644
--- a/ja_JP.eucJP/books/handbook/x11/chapter.xml
+++ b/ja_JP.eucJP/books/handbook/x11/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="euc-jp" standalone="no"?>
+<?xml version="1.0" encoding="euc-jp"?>
<!--
The FreeBSD Documentation Project
The FreeBSD Japanese Documentation Project
@@ -322,12 +322,12 @@
<sect1 id="x-install">
<title>X11 及奶件旦玄□伙</title>
- <para>&os 及犯白巧伙玄及 X11 反﹜<application>&xorg;</application>
+ <para>&os; 及犯白巧伙玄及 X11 反﹜<application>&xorg;</application>
匹允﹝
<application>&xorg;</application> 反 X.Org Foundation
互伉伉□旦仄化中月 X Window System 及左□皿件末□旦卅撢隸匹允﹝
<application>&xorg;</application> 反
- <application>&xfree86&nbsp;4.4RC2</application>
+ <application>&xfree86;&nbsp;4.4RC2</application>
午 X11R6.6 及戊□玉毛葭卞仄化中引允﹝
蜇箕 &os; Ports Collection 匹厙迕第Х卅
<application>&xorg;</application> 及田□斥亦件反
diff --git a/ja_JP.eucJP/books/porters-handbook/book.xml b/ja_JP.eucJP/books/porters-handbook/book.xml
index cb62bb58d5..a2635fce50 100644
--- a/ja_JP.eucJP/books/porters-handbook/book.xml
+++ b/ja_JP.eucJP/books/porters-handbook/book.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="euc-jp" standalone="no"?>
-<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//JA" "../../share/xml/entities.ent">
-%entities;
-]>
+<?xml version="1.0" encoding="euc-jp"?>
+<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<!--
The FreeBSD Documentation Project
@@ -4650,7 +4647,7 @@ USE_SDL+= mixer
<para>仇及庍醒反﹜動票及方丹卞仄化
<filename>bsd.port.mk</filename> 醱匹澀爛今木引允﹝</para>
- <programlisting>PORTOBJFORMAT!= test -x /usr/bin/objformat && /usr/bin/objformat || echo aout</programlisting>
+ <programlisting>PORTOBJFORMAT!= test -x /usr/bin/objformat &amp;&amp; /usr/bin/objformat || echo aout</programlisting>
<para>仇及庍醒毛銀勻化﹜port 及 make
及聊蠢匹窒毛允屯五井毛瑁爛允屯五匹允互﹜
@@ -4803,8 +4800,8 @@ PKGNAMESUFFIX= ${RESOLUTION}
:
# default
RESOLUTION?= 300
-.if ${RESOLUTION} != 118 && ${RESOLUTION} != 240 && \
- ${RESOLUTION} != 300 && ${RESOLUTION} != 400
+.if ${RESOLUTION} != 118 &amp;&amp; ${RESOLUTION} != 240 &amp;&amp; \
+ ${RESOLUTION} != 300 &amp;&amp; ${RESOLUTION} != 400
@${ECHO} "Error: invalid value for RESOLUTION: \"${RESOLUTION}\""
@${ECHO} "Possible values are: 118, 240, 300 (default) and 400."
@${FALSE}
@@ -7587,7 +7584,7 @@ pre-install:
<para>仇及犯奴伊弁玄伉厭瞻毛蕙仄中白央奶伙卞忡繡仄化仁分今中﹝</para>
- <screen>&prompt.root; <userinput>(cd /var/tmp/<replaceable>port-name</replaceable> && find -d * -type d) | sort &gt; OLD-DIRS</userinput></screen>
+ <screen>&prompt.root; <userinput>(cd /var/tmp/<replaceable>port-name</replaceable> &amp;&amp; find -d * -type d) | sort &gt; OLD-DIRS</userinput></screen>
<para>塢及 <filename>pkg-plist</filename>
白央奶伙毛綜嶽仄化仁分今中﹝</para>
@@ -7598,11 +7595,11 @@ pre-install:
仇仇匹 port 毛奶件旦玄□伙仄化由永平件弘伉旦玄毛綜月仇午互匹五引允﹝</para>
<screen>&prompt.root; <userinput>make install PREFIX=/var/tmp</userinput>
-&prompt.root; <userinput>(cd /var/tmp/<replaceable>port-name</replaceable> && find -d * \! -type d) | sort &gt; pkg-plist</userinput></screen>
+&prompt.root; <userinput>(cd /var/tmp/<replaceable>port-name</replaceable> &amp;&amp; find -d * \! -type d) | sort &gt; pkg-plist</userinput></screen>
<para>蕙仄仁戲嶽今木凶犯奴伊弁玄伉反允屯化由永平件弘伉旦玄卞馨笛允月优邰互丐曰引允﹝</para>
- <screen>&prompt.root; <userinput>(cd /var/tmp/<replaceable>port-name</replaceable> && find -d * -type d) | sort | comm -13 OLD-DIRS - | sort -r | sed -e 's#^#@dirrm #' &gt;&gt; pkg-plist</userinput></screen>
+ <screen>&prompt.root; <userinput>(cd /var/tmp/<replaceable>port-name</replaceable> &amp;&amp; find -d * -type d) | sort | comm -13 OLD-DIRS - | sort -r | sed -e 's#^#@dirrm #' &gt;&gt; pkg-plist</userinput></screen>
<para>瘉詨卞由永平件弘伉旦玄毛澎匹幫尹月优邰互丐曰引允;
<emphasis>允屯化</emphasis>互憤が祭今木化中月歹仃匹反丐曰引六氏﹝
diff --git a/ja_JP.eucJP/share/xml/authors.ent b/ja_JP.eucJP/share/xml/authors.ent
index 3aa7fc4d0c..5e1b8be541 100644
--- a/ja_JP.eucJP/share/xml/authors.ent
+++ b/ja_JP.eucJP/share/xml/authors.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="euc-jp"?>
<!--
The FreeBSD Documentation Project
The FreeBSD Japanese Documentation Project
diff --git a/ja_JP.eucJP/share/xml/catalog b/ja_JP.eucJP/share/xml/catalog
deleted file mode 100644
index 3f6c44e4ce..0000000000
--- a/ja_JP.eucJP/share/xml/catalog
+++ /dev/null
@@ -1,44 +0,0 @@
- -- ...................................................................... --
- -- FreeBSD SGML Public Identifiers ...................................... --
-
- -- $FreeBSD$
- --
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//JA"
- "entities.ent"
-
-PUBLIC "-//FreeBSD//DOCUMENT DocBook Stylesheet//EN"
- "freebsd.dsl"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//JA"
- "mailing-lists.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook Newsgroup Entities//JA"
- "newsgroups.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook Language Specific Entities//EN"
- "l10n.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook Author Entities//JA"
- "authors.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook Team Entities//JA"
- "teams.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//JA"
- "trademarks.ent"
-
- -- ...................................................................... --
- -- HTML docs ............................................................ --
-
-PUBLIC "-//FreeBSD//ENTITIES FreeBSD L10N Entities//EN"
- "l10n.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES FreeBSD Release L10N Entities//EN"
- "release.l10n.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES HTML FreeBSD Header L10N Entities//EN"
- "header.l10n.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES HTML FreeBSD Navigation Bar L10N Entities//EN"
- "navibar.l10n.ent"
diff --git a/ja_JP.eucJP/share/xml/catalog.xml b/ja_JP.eucJP/share/xml/catalog.xml
index 3553c62fbc..0b06d43c89 100644
--- a/ja_JP.eucJP/share/xml/catalog.xml
+++ b/ja_JP.eucJP/share/xml/catalog.xml
@@ -10,6 +10,9 @@
<rewriteURI uriStartString="http://www.FreeBSD.org/XML/www/lang/"
rewritePrefix="../../"/>
+ <public
+ publicId="-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN"
+ uri="entities.ent" />
<public publicId="-//FreeBSD//ENTITIES FreeBSD L10N Entities//EN"
uri="l10n.ent" />
<public
diff --git a/ja_JP.eucJP/share/xml/entities.ent b/ja_JP.eucJP/share/xml/entities.ent
index 679ba28ec6..1450780b91 100644
--- a/ja_JP.eucJP/share/xml/entities.ent
+++ b/ja_JP.eucJP/share/xml/entities.ent
@@ -1,38 +1,45 @@
<!-- $FreeBSD$ -->
-<!ENTITY % l10n PUBLIC "-//FreeBSD//ENTITIES DocBook Language Specific Entities//EN">
+<!ENTITY % l10n PUBLIC "-//FreeBSD//ENTITIES DocBook Language Specific Entities//EN"
+ "l10n.ent">
%l10n;
-<!ENTITY % l10n-common PUBLIC "-//FreeBSD//ENTITIES DocBook Language Neutral Entities//EN">
-%l10n-common;
-<!ENTITY % man PUBLIC "-//FreeBSD//ENTITIES DocBook Manual Page Entities//EN">
-%man;
-<!ENTITY % freebsd PUBLIC "-//FreeBSD//ENTITIES DocBook Miscellaneous FreeBSD Entities//EN">
+<!ENTITY % freebsd PUBLIC "-//FreeBSD//ENTITIES DocBook Miscellaneous FreeBSD Entities//EN"
+ "nonexistent">
%freebsd;
-<!ENTITY % authors-ja PUBLIC "-//FreeBSD//ENTITIES DocBook Author Entities//JA">
+<!ENTITY % authors-ja PUBLIC "-//FreeBSD//ENTITIES DocBook Author Entities//JA"
+ "authors.ent">
%authors-ja;
-<!ENTITY % authors PUBLIC "-//FreeBSD//ENTITIES DocBook Author Entities//EN">
-%authors;
-<!ENTITY % teams-ja PUBLIC "-//FreeBSD//ENTITIES DocBook Team Entities//JA">
+<!ENTITY % teams-ja PUBLIC "-//FreeBSD//ENTITIES DocBook Team Entities//JA"
+ "teams.ent">
%teams-ja;
-<!ENTITY % teams PUBLIC "-//FreeBSD//ENTITIES DocBook Team Entities//EN">
+<!ENTITY % teams PUBLIC "-//FreeBSD//ENTITIES DocBook Team Entities//EN"
+ "nonexistent">
%teams;
-<!ENTITY % mailing-lists-ja PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//JA">
+<!ENTITY % mailing-lists-ja PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//JA"
+ "mailing-lists.ent">
%mailing-lists-ja;
<!--
-<!ENTITY % mailing-lists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//EN">
+<!ENTITY % mailing-lists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//EN"
+ "nonexistent">
%mailing-lists;
-->
-<!ENTITY % newsgroups-ja PUBLIC "-//FreeBSD//ENTITIES DocBook Newsgroup Entities//JA">
+<!ENTITY % newsgroups-ja PUBLIC "-//FreeBSD//ENTITIES DocBook Newsgroup Entities//JA"
+ "newsgroups.ent">
%newsgroups-ja;
<!--
-<!ENTITY % newsgroups PUBLIC "-//FreeBSD//ENTITIES DocBook Newsgroup Entities//EN">
+<!ENTITY % newsgroups PUBLIC "-//FreeBSD//ENTITIES DocBook Newsgroup Entities//EN"
+ "nonexistent">
%newsgroups;
-->
-<!ENTITY % trademarks-ja PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//JA">
+<!ENTITY % trademarks-ja PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//JA"
+ "trademarks.ent">
%trademarks-ja;
-<!ENTITY % trademarks PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//EN">
+<!ENTITY % trademarks PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//EN"
+ "nonexistent">
%trademarks;
-<!ENTITY % urls PUBLIC "-//FreeBSD//ENTITIES DocBook URL Entities//EN">
+<!ENTITY % urls PUBLIC "-//FreeBSD//ENTITIES DocBook URL Entities//EN"
+ "nonexistent">
%urls;
-<!ENTITY % glossary PUBLIC "-//FreeBSD//ENTITIES DocBook Glossary Entities//EN">
+<!ENTITY % glossary PUBLIC "-//FreeBSD//ENTITIES DocBook Glossary Entities//EN"
+ "nonexistent">
%glossary;
diff --git a/ja_JP.eucJP/share/xml/mailing-lists.ent b/ja_JP.eucJP/share/xml/mailing-lists.ent
index e1f1643157..7846f33d9e 100644
--- a/ja_JP.eucJP/share/xml/mailing-lists.ent
+++ b/ja_JP.eucJP/share/xml/mailing-lists.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="euc-jp"?>
<!--
The FreeBSD Documentation Project
The FreeBSD Japanese Documentation Project
diff --git a/ja_JP.eucJP/share/xml/mirrors-local.xsl b/ja_JP.eucJP/share/xml/mirrors-local.xsl
index 849d4cda79..dfeea04e7a 100644
--- a/ja_JP.eucJP/share/xml/mirrors-local.xsl
+++ b/ja_JP.eucJP/share/xml/mirrors-local.xsl
@@ -7,7 +7,6 @@
<xsl:import href="../../../share/xml/mirrors-master.xsl" />
<xsl:output type="xml" encoding="euc-jp"
- omit-xml-declaration="yes"
indent="yes"/>
<!-- template: "mirrors-docbook-contact" -->
diff --git a/ja_JP.eucJP/share/xml/newsgroups.ent b/ja_JP.eucJP/share/xml/newsgroups.ent
index c61635ad19..577e49f89a 100644
--- a/ja_JP.eucJP/share/xml/newsgroups.ent
+++ b/ja_JP.eucJP/share/xml/newsgroups.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="euc-jp"?>
<!--
Names of FreeBSD newsgroups
diff --git a/ja_JP.eucJP/share/xml/teams.ent b/ja_JP.eucJP/share/xml/teams.ent
index 341e8610c8..d70b8b0043 100644
--- a/ja_JP.eucJP/share/xml/teams.ent
+++ b/ja_JP.eucJP/share/xml/teams.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="euc-jp"?>
<!--
Names and email address of teams of people working on specified
tasks. Usally they're just mail aliases set up at hub.FreeBSD.org
diff --git a/ja_JP.eucJP/share/xml/trademarks.ent b/ja_JP.eucJP/share/xml/trademarks.ent
index 55b954d3b1..61a66d06af 100644
--- a/ja_JP.eucJP/share/xml/trademarks.ent
+++ b/ja_JP.eucJP/share/xml/trademarks.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="euc-jp"?>
<!--
Trademark Legend, as required by The Open Group, Sun, etc..
diff --git a/mn_MN.UTF-8/books/handbook/Makefile b/mn_MN.UTF-8/books/handbook/Makefile
index 040fab1286..3b0258dab4 100644
--- a/mn_MN.UTF-8/books/handbook/Makefile
+++ b/mn_MN.UTF-8/books/handbook/Makefile
@@ -318,30 +318,43 @@ DOC_PREFIX?= ${.CURDIR}/../../..
#
# rules generating lists of mirror site from XML database.
#
-XMLDOCS= mirrors-ftp:::mirrors.xml.ftp.inc \
+XMLDOCS= lastmod:::mirrors.lastmod.inc \
+ mirrors-ftp-index:::mirrors.xml.ftp.index.inc \
+ mirrors-ftp:::mirrors.xml.ftp.inc \
+ mirrors-cvsup-index:::mirrors.xml.cvsup.index.inc \
mirrors-cvsup:::mirrors.xml.cvsup.inc \
+ eresources-index:::eresources.xml.www.index.inc \
eresources:::eresources.xml.www.inc
DEPENDSET.DEFAULT= transtable mirror
XSLT.DEFAULT= ${XSL_MIRRORS}
XML.DEFAULT= ${XML_MIRRORS}
-NO_TIDY.DEFAULT= yes
+PARAMS.lastmod+= --param 'target' "'lastmod'"
+PARAMS.mirrors-ftp-index+= --param 'type' "'ftp'" \
+ --param 'proto' "'ftp'" \
+ --param 'target' "'index'"
PARAMS.mirrors-ftp+= --param 'type' "'ftp'" \
--param 'proto' "'ftp'" \
--param 'target' "'handbook/mirrors/chapter.xml'"
+PARAMS.mirrors-cvsup-index+= --param 'type' "'cvsup'" \
+ --param 'proto' "'cvsup'" \
+ --param 'target' "'index'"
PARAMS.mirrors-cvsup+= --param 'type' "'cvsup'" \
--param 'proto' "'cvsup'" \
--param 'target' "'handbook/mirrors/chapter.xml'"
+PARAMS.eresources-index+= --param 'type' "'www'" \
+ --param 'proto' "'http'" \
+ --param 'target' "'index'"
PARAMS.eresources+= --param 'type' "'www'" \
--param 'proto' "'http'" \
--param 'target' "'handbook/eresources/chapter.xml'"
-SRCS+= mirrors.xml.ftp.inc \
+SRCS+= mirrors.lastmod.inc \
+ mirrors.xml.ftp.inc \
+ mirrors.xml.ftp.index.inc \
mirrors.xml.cvsup.inc \
- eresources.xml.www.inc
-
-CLEANFILES+= mirrors.xml.ftp.inc \
- mirrors.xml.cvsup.inc \
- eresources.xml.www.inc
+ mirrors.xml.cvsup.index.inc \
+ eresources.xml.www.inc \
+ eresources.xml.www.index.inc
.include "${DOC_PREFIX}/share/mk/doc.project.mk"
diff --git a/mn_MN.UTF-8/books/handbook/advanced-networking/chapter.xml b/mn_MN.UTF-8/books/handbook/advanced-networking/chapter.xml
index c964d41a64..dace6c01dc 100644
--- a/mn_MN.UTF-8/books/handbook/advanced-networking/chapter.xml
+++ b/mn_MN.UTF-8/books/handbook/advanced-networking/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<?xml version="1.0" encoding="utf-8"?>
<!--
The FreeBSD Mongolian Documentation Project
@@ -1911,7 +1911,7 @@ wpa_pairwise=CCMP TKIP <co id="co-ap-wpapsk-pwise"/></programlisting>
<para>訄訄訄迣邽邿郇 訄郅訄邾 郇 <application>hostapd</application>-迣 郅玼玼郅:</para>
- <screen>&prompt.root <userinput>/etc/rc.d/hostapd forcestart</userinput></screen>
+ <screen>&prompt.root; <userinput>/etc/rc.d/hostapd forcestart</userinput></screen>
<screen>&prompt.root; <userinput>ifconfig <replaceable>wlan0</replaceable></userinput>
wlan0: flags=8843&lt;UP,BROADCAST,RUNNING,SIMPLEX,MULTICAST&gt; mtu 2290
@@ -5990,7 +5990,7 @@ ifconfig_carp1="vhid 2 advskew 100 pass testpass 192.168.1.51/24"</programlistin
IP-迣 玼邽郅迠 訇郋郅郋 邾. 訄訄訄 訄訄郅迣 <hostid>provider.example.org</hostid>
迡 訄迠邽郅郅郅訄 訄訄迡郅訄迣訄訄邿:</para>
- <screen>&prompt.root; <userinput>ifconfig carp0 down && ifconfig carp0 up</userinput></screen>
+ <screen>&prompt.root; <userinput>ifconfig carp0 down &amp;&amp; ifconfig carp0 up</userinput></screen>
<para>苭郋郋迡 郋邽郋 <devicename>carp</devicename> 邽郇迮邿 迡
玼玼郇邽邿迣 邽邿 郋邿.</para>
diff --git a/mn_MN.UTF-8/books/handbook/audit/chapter.xml b/mn_MN.UTF-8/books/handbook/audit/chapter.xml
index 8515a3f3e7..ff0b08b64c 100644
--- a/mn_MN.UTF-8/books/handbook/audit/chapter.xml
+++ b/mn_MN.UTF-8/books/handbook/audit/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<?xml version="1.0" encoding="utf-8"?>
<!--
The FreeBSD Mongolian Documentation Project
diff --git a/mn_MN.UTF-8/books/handbook/basics/chapter.xml b/mn_MN.UTF-8/books/handbook/basics/chapter.xml
index f13560c945..cbe05d7935 100644
--- a/mn_MN.UTF-8/books/handbook/basics/chapter.xml
+++ b/mn_MN.UTF-8/books/handbook/basics/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<?xml version="1.0" encoding="utf-8"?>
<!--
The FreeBSD Mongolian Documentation Project
diff --git a/mn_MN.UTF-8/books/handbook/bibliography/chapter.xml b/mn_MN.UTF-8/books/handbook/bibliography/chapter.xml
index 029293b543..037fba34b3 100644
--- a/mn_MN.UTF-8/books/handbook/bibliography/chapter.xml
+++ b/mn_MN.UTF-8/books/handbook/bibliography/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<?xml version="1.0" encoding="utf-8"?>
<!--
The FreeBSD Mongolian Documentation Project
diff --git a/mn_MN.UTF-8/books/handbook/book.xml b/mn_MN.UTF-8/books/handbook/book.xml
index ca11242551..3c1ca07945 100644
--- a/mn_MN.UTF-8/books/handbook/book.xml
+++ b/mn_MN.UTF-8/books/handbook/book.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
-<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//MN" "../../share/xml/entities.ent">
-%entities;
-
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd" [
<!ENTITY % chapters SYSTEM "chapters.ent">
%chapters;
<!ENTITY % txtfiles SYSTEM "txtfiles.ent">
diff --git a/mn_MN.UTF-8/books/handbook/boot/chapter.xml b/mn_MN.UTF-8/books/handbook/boot/chapter.xml
index 81521ec38d..74e296f265 100644
--- a/mn_MN.UTF-8/books/handbook/boot/chapter.xml
+++ b/mn_MN.UTF-8/books/handbook/boot/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<?xml version="1.0" encoding="utf-8"?>
<!--
The FreeBSD Mongolian Documentation Project
diff --git a/mn_MN.UTF-8/books/handbook/bsdinstall/chapter.xml b/mn_MN.UTF-8/books/handbook/bsdinstall/chapter.xml
index 158139ccf4..5af6487681 100644
--- a/mn_MN.UTF-8/books/handbook/bsdinstall/chapter.xml
+++ b/mn_MN.UTF-8/books/handbook/bsdinstall/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<?xml version="1.0" encoding="utf-8"?>
<!--
The FreeBSD Mongolian Documentation Project
@@ -670,7 +670,7 @@ Loading /boot/defaults/loader.conf
<keycap>Alt</keycap>
<keycap>O</keycap>
<keycap>F</keycap>
- </keycombo> 郋赲郅迡迣 &apple 訇邽 迣訄 迡 迡訄迠 邽邿郇.
+ </keycombo> 郋赲郅迡迣 &apple; 訇邽 迣訄 迡 迡訄迠 邽邿郇.
<prompt>0 ></prompt> 迣訄 邽迡 迡郋郋邽邿迣 訇邽郇.</para>
<screen><userinput>boot cd:,\ppc\loader cd:0</userinput></screen>
diff --git a/mn_MN.UTF-8/books/handbook/chapters.ent b/mn_MN.UTF-8/books/handbook/chapters.ent
index 0956278d0e..af58bdce2a 100644
--- a/mn_MN.UTF-8/books/handbook/chapters.ent
+++ b/mn_MN.UTF-8/books/handbook/chapters.ent
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<?xml version="1.0" encoding="utf-8"?>
<!--
The FreeBSD Mongolian Documentation Project
@@ -16,235 +16,62 @@
-->
-<!ENTITY % not.published "INCLUDE">
-
-<!ENTITY % chap.introduction "IGNORE">
-<!ENTITY % chap.install "IGNORE">
-<!ENTITY % chap.bsdinstall "IGNORE">
-<!ENTITY % chap.basics "IGNORE">
-<!ENTITY % chap.ports "IGNORE">
-<!ENTITY % chap.config "IGNORE">
-<!ENTITY % chap.boot "IGNORE">
-<!ENTITY % chap.users "IGNORE">
-<!ENTITY % chap.kernelconfig "IGNORE">
-<!ENTITY % chap.security "IGNORE">
-<!ENTITY % chap.jails "IGNORE">
-<!ENTITY % chap.printing "IGNORE">
-<!ENTITY % chap.disks "IGNORE">
-<!ENTITY % chap.geom "IGNORE">
-<!ENTITY % chap.vinum "IGNORE">
-<!ENTITY % chap.x11 "IGNORE">
-<!ENTITY % chap.l10n "IGNORE">
-<!ENTITY % chap.multimedia "IGNORE">
-<!ENTITY % chap.desktop "IGNORE">
-<!ENTITY % chap.serialcomms "IGNORE">
-<!ENTITY % chap.ppp-and-slip "IGNORE">
-<!ENTITY % chap.advanced-networking "IGNORE">
-<!ENTITY % chap.firewalls "IGNORE">
-<!ENTITY % chap.network-servers "IGNORE">
-<!ENTITY % chap.mail "IGNORE">
-<!ENTITY % chap.cutting-edge "IGNORE">
-<!ENTITY % chap.linuxemu "IGNORE">
-<!ENTITY % chap.mirrors "IGNORE">
-<!ENTITY % chap.mirrors.ftp.inc "INCLUDE">
-<!ENTITY % chap.mirrors.cvsup.inc "INCLUDE">
-<!ENTITY % chap.bibliography "IGNORE">
-<!ENTITY % chap.eresources "IGNORE">
-<!ENTITY % chap.eresources.www.inc "INCLUDE">
-<!ENTITY % chap.pgpkeys "IGNORE">
-<!ENTITY % chap.index "IGNORE">
-<!ENTITY % chap.freebsd-glossary "IGNORE">
-<!ENTITY % chap.mac "IGNORE">
-<!ENTITY % chap.audit "IGNORE">
-<!ENTITY % chap.filesystems "IGNORE">
-<!ENTITY % chap.dtrace "IGNORE">
-
<!ENTITY chap.preface SYSTEM "preface/preface.xml">
<!ENTITY % pgpkeys SYSTEM "../../../share/pgpkeys/pgpkeys.ent"> %pgpkeys;
<!-- Part One -->
-<![%chap.introduction;[
<!ENTITY chap.introduction SYSTEM "introduction/chapter.xml">
-]]>
-<![%chap.install;[
<!ENTITY chap.install SYSTEM "install/chapter.xml">
-]]>
-<![%chap.bsdinstall;[
<!ENTITY chap.bsdinstall SYSTEM "bsdinstall/chapter.xml">
-]]>
-<![%chap.basics;[
<!ENTITY chap.basics SYSTEM "basics/chapter.xml">
-]]>
-<![%chap.ports;[
<!ENTITY chap.ports SYSTEM "ports/chapter.xml">
-]]>
-<![%chap.x11;[
<!ENTITY chap.x11 SYSTEM "x11/chapter.xml">
-]]>
<!-- Part Two -->
-<![%chap.desktop;[
<!ENTITY chap.desktop SYSTEM "desktop/chapter.xml">
-]]>
-<![%chap.multimedia;[
<!ENTITY chap.multimedia SYSTEM "multimedia/chapter.xml">
-]]>
-<![%chap.kernelconfig;[
<!ENTITY chap.kernelconfig SYSTEM "kernelconfig/chapter.xml">
-]]>
-<![%chap.printing;[
<!ENTITY chap.printing SYSTEM "printing/chapter.xml">
-]]>
-<![%chap.linuxemu;[
<!ENTITY chap.linuxemu SYSTEM "linuxemu/chapter.xml">
-]]>
<!-- Part Three -->
-<![%chap.config;[
<!ENTITY chap.config SYSTEM "config/chapter.xml">
-]]>
-<![%chap.boot;[
<!ENTITY chap.boot SYSTEM "boot/chapter.xml">
-]]>
-<![%chap.users;[
<!ENTITY chap.users SYSTEM "users/chapter.xml">
-]]>
-<![%chap.security;[
<!ENTITY chap.security SYSTEM "security/chapter.xml">
-]]>
-<![%chap.jails;[
<!ENTITY chap.jails SYSTEM "jails/chapter.xml">
-]]>
-<![%chap.mac;[
<!ENTITY chap.mac SYSTEM "mac/chapter.xml">
-]]>
-<![%chap.audit;[
<!ENTITY chap.audit SYSTEM "audit/chapter.xml">
-]]>
-<![%chap.disks;[
<!ENTITY chap.disks SYSTEM "disks/chapter.xml">
-]]>
-<![%chap.geom;[
<!ENTITY chap.geom SYSTEM "geom/chapter.xml">
-]]>
-<![%chap.filesystems;[
<!ENTITY chap.filesystems SYSTEM "filesystems/chapter.xml">
-]]>
-<![%chap.vinum;[
<!ENTITY chap.vinum SYSTEM "vinum/chapter.xml">
-]]>
-<![%chap.virtualization;[
<!ENTITY chap.virtualization SYSTEM "virtualization/chapter.xml">
-]]>
-<![%chap.l10n;[
<!ENTITY chap.l10n SYSTEM "l10n/chapter.xml">
-]]>
-<![%chap.cutting-edge;[
<!ENTITY chap.cutting-edge SYSTEM "cutting-edge/chapter.xml">
-]]>
-<![%chap.dtrace;[
<!ENTITY chap.dtrace SYSTEM "dtrace/chapter.xml">
-]]>
<!-- Part Four -->
-<![%chap.serialcomms;[
<!ENTITY chap.serialcomms SYSTEM "serialcomms/chapter.xml">
-]]>
-<![%chap.ppp-and-slip;[
<!ENTITY chap.ppp-and-slip SYSTEM "ppp-and-slip/chapter.xml">
-]]>
-<![%chap.mail;[
<!ENTITY chap.mail SYSTEM "mail/chapter.xml">
-]]>
-<![%chap.network-servers;[
<!ENTITY chap.network-servers SYSTEM "network-servers/chapter.xml">
-]]>
-<![%chap.firewalls;[
<!ENTITY chap.firewalls SYSTEM "firewalls/chapter.xml">
-]]>
-<![%chap.advanced-networking;[
<!ENTITY chap.advanced-networking SYSTEM "advanced-networking/chapter.xml">
-]]>
<!-- Part Five (appendices) -->
-<![%chap.mirrors;[
<!ENTITY chap.mirrors SYSTEM "mirrors/chapter.xml">
-]]>
-<![%chap.mirrors.ftp.inc;[
+ <!ENTITY chap.mirrors.lastmod.inc SYSTEM "mirrors.lastmod.inc">
+ <!ENTITY chap.mirrors.ftp.index.inc SYSTEM "mirrors.xml.ftp.index.inc">
<!ENTITY chap.mirrors.ftp.inc SYSTEM "mirrors.xml.ftp.inc">
-]]>
-<![%chap.mirrors.cvsup.inc;[
+ <!ENTITY chap.mirrors.cvsup.index.inc SYSTEM "mirrors.xml.cvsup.index.inc">
<!ENTITY chap.mirrors.cvsup.inc SYSTEM "mirrors.xml.cvsup.inc">
-]]>
-<![%chap.bibliography;[
<!ENTITY chap.bibliography SYSTEM "bibliography/chapter.xml">
-]]>
-<![%chap.eresources;[
<!ENTITY chap.eresources SYSTEM "eresources/chapter.xml">
-]]>
-<![%chap.eresources.www.inc;[
+ <!ENTITY chap.eresources.www.index.inc SYSTEM "eresources.xml.www.index.inc">
<!ENTITY chap.eresources.www.inc SYSTEM "eresources.xml.www.inc">
-]]>
-<![%chap.pgpkeys;[
<!ENTITY chap.pgpkeys SYSTEM "pgpkeys/chapter.xml">
-]]>
-<![%chap.freebsd-glossary;[
<!ENTITY chap.freebsd-glossary "&freebsd-glossary;">
-]]>
-<![%chap.index;[
- <!ENTITY chap.index SYSTEM "index.xml">
-]]>
+ <!ENTITY chap.index "">
<!ENTITY chap.colophon SYSTEM "colophon.xml">
-
-<!-- IGNORE cases -->
-
-<!-- Part One -->
-<!ENTITY chap.introduction "">
-<!ENTITY chap.install "">
-<!ENTITY chap.basics "">
-<!ENTITY chap.ports "">
-<!ENTITY chap.x11 "">
-
-<!-- Part Two -->
-<!ENTITY chap.desktop "">
-<!ENTITY chap.multimedia "">
-<!ENTITY chap.kernelconfig "">
-<!ENTITY chap.printing "">
-<!ENTITY chap.linuxemu "">
-
-<!-- Part Three -->
-<!ENTITY chap.config "">
-<!ENTITY chap.boot "">
-<!ENTITY chap.users "">
-<!ENTITY chap.security "">
-<!ENTITY chap.jails "">
-<!ENTITY chap.mac "">
-<!ENTITY chap.audit "">
-<!ENTITY chap.disks "">
-<!ENTITY chap.geom "">
-<!ENTITY chap.filesystems "">
-<!ENTITY chap.vinum "">
-<!ENTITY chap.virtualization "">
-<!ENTITY chap.l10n "">
-<!ENTITY chap.cutting-edge "">
-<!ENTITY chap.dtrace "">
-
-<!-- Part Four -->
-<!ENTITY chap.serialcomms "">
-<!ENTITY chap.ppp-and-slip "">
-<!ENTITY chap.mail "">
-<!ENTITY chap.network-servers "">
-<!ENTITY chap.firewalls "">
-<!ENTITY chap.advanced-networking "">
-
-<!-- Part Five (appendices) -->
-<!ENTITY chap.mirrors "">
-<!ENTITY chap.mirrors.ftp.inc "">
-<!ENTITY chap.mirrors.cvsup.inc "">
-<!ENTITY chap.bibliography "">
-<!ENTITY chap.eresources "">
-<!ENTITY chap.eresources.www.inc "">
-<!ENTITY chap.pgpkeys "">
-<!ENTITY chap.freebsd-glossary "">
-<!ENTITY chap.index "">
diff --git a/mn_MN.UTF-8/books/handbook/colophon.xml b/mn_MN.UTF-8/books/handbook/colophon.xml
index 69a5700b05..dff3fc7762 100644
--- a/mn_MN.UTF-8/books/handbook/colophon.xml
+++ b/mn_MN.UTF-8/books/handbook/colophon.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<?xml version="1.0" encoding="utf-8"?>
<!--
The FreeBSD Mongolian Documentation Project
diff --git a/mn_MN.UTF-8/books/handbook/config/chapter.xml b/mn_MN.UTF-8/books/handbook/config/chapter.xml
index a48d75dc87..86c94559a9 100644
--- a/mn_MN.UTF-8/books/handbook/config/chapter.xml
+++ b/mn_MN.UTF-8/books/handbook/config/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<?xml version="1.0" encoding="utf-8"?>
<!--
The FreeBSD Mongolian Documentation Project
@@ -756,7 +756,7 @@ sshd is running as pid 433.</screen>
<para><filename>rc.d</filename> 邽迮邾邽邿郇 訄郅訄訄 郇邾郅 邾迡郅郅邽邿迣 &man.rc.8;
訇郋郅郋郇 &man.rc.subr.8; 迣訄郇 訄赲郅訄迣郇 迡訄郇迡訄訄 郋郅迠 訇郋郅郇郋. 苭赲 訄 茤茤邽邿郇
rc.d 郕邽郈玼玼迡 訇邽邽 赲郅 訇訄邿迣訄訄迣訄訄 訄邿迠郅訄迣 郋郇邽郋迠 訇訄邿迣訄訄 訇郋郅 訄郇迡 訇訄
- <ulink url="&url.articles.rc-scripting">郇 郇邽邿郅郅</ulink> 迣邿 訇訄邿迠
+ <ulink url="&url.articles.rc-scripting;">郇 郇邽邿郅郅</ulink> 迣邿 訇訄邿迠
訇郋郅郋 邾.</para>
</sect1>
diff --git a/mn_MN.UTF-8/books/handbook/cutting-edge/chapter.xml b/mn_MN.UTF-8/books/handbook/cutting-edge/chapter.xml
index d6c722dc67..331db39e75 100644
--- a/mn_MN.UTF-8/books/handbook/cutting-edge/chapter.xml
+++ b/mn_MN.UTF-8/books/handbook/cutting-edge/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<?xml version="1.0" encoding="utf-8"?>
<!--
The FreeBSD Mongolian Documentation Project
@@ -1121,77 +1121,6 @@ Fetching 133 new ports or files... done.</screen>
<screen>&prompt.root; <userinput>portupgrade -PP hu-freebsd-doc</userinput></screen>
</sect3>
</sect2>
-
-<!-- FIXME: Waiting for a working docsnap server... -->
-<![ IGNORE [
- <sect2 id="docsnap">
- <sect2info>
- <authorgroup>
- <author>
- <firstname>訄赲</firstname>
- <surname>郕邽郇邽郕</surname>
- <contrib>迡郅郅 訄郇迣訄訄郇 </contrib>
- </author>
- </authorgroup>
- </sect2info>
-
- <title>Docsnap-邽邿迣 訄邽迣郅訄 郇</title>
-
- <indexterm><primary>Updating and Upgrading</primary></indexterm>
-
- <indexterm>
- <primary>Docsnap</primary>
- <see>Updating and Upgrading</see>
- </indexterm>
-
- <para><application>Docsnap</application> 郇 &os;-邽邿郇 訇訄邽邾迡迣
- 郅訇訄, 迡訄郇 訄迣訄訄 邽郇郅迡 郱郋邽郅訄迣迡訄郇 &man.rsync.1;
- 迮郈郋郱邽郋 邾. <quote><application>Docsnap</application> 迮赲迮</quote>
- 郇 訇訄邽邾郇 玼玼迡邽邿迣 迡訄迣訄迠 迡迣邽邿迣 訄迣 訇玼 HTML 郅訇 訇玼迠
- 訇訄邿迡訄迣. <filename role="package">textproc/docproj</filename> 郇
- <application>Docsnap</application>-迡 迣迣玼邿 訇訄邿迡訄迣. 苺邽 郇
- 郱茤赲茤郇 訇玼郇 訇訄邽邾訄迡 郱郋邽郅訄郇 郇茤茤茤玼玼迡 訇訄邿迡訄迣 訇郋郅郋郋郋 邾.</para>
-
- <para>衪郇 迮郇邽郕邽邿迣 訄邽迣郅訄訄迡 訄訄迡郅訄迣訄訄邿 郋郇 迣訄郇 郱玼邿郅 郇
- <filename role="package">net/rsync</filename> 郈郋 邾 赲郅 訇訄迣
- 訇訄邿迡訄迣. 珖玼郇邽邿迣 郇邾邽邿郇 郅迡 迡訄訄訄 訄訄郅迣 訄邽迣郅訄郇訄:</para>
-
- <screen>&prompt.root; <userinput>pkg_add -r rsync</userinput></screen>
-
- <note>
- <para><application>Docsnap</application> 郇
- <filename class="directory">/usr/share/doc</filename>-迡 郅迣訄迣迡訄郇
- 訇訄邽邾迣 邽郇郅迡 郱郋邽郅迠 訄郇郅訄郇 茤迣迠玼玼郅迣迡郇 訇郋郅郋赲 迡訄訄訄 迠邽郇玼玼迡邽邿迣
- 訇訄迡 訄郇迣迡郇 赲迡 郋邽郅訄郇 訄邽迣郅訄迠 訇郋郅郇郋. 苭迣郅迣邽邿郇 訄郇迣迡郇
- 赲迡 郇 郇 <username>root</username> 邽邿迣 訄訄迡迡訄迣迣玼邿.</para>
- </note>
-
- <para>訄邽邾郇 迣郅郅迣迣 邽郇郅邽邿郇 郅迡 迡訄訄訄 訄訄郅迣
- 訄迠邽郅郅郅郇訄:</para>
-
- <screen>&prompt.root; <userinput>rsync -rltvz <replaceable>docsnap.sk.FreeBSD.org</replaceable>::docsnap <replaceable>/usr/share/doc</replaceable></userinput></screen>
-
- <note>
- <para>迡郋郋迣郋郋 郱茤赲茤郇 郇迣 <application>Docsnap</application>
- 迮赲迮 訇訄邿迣訄訄, <hostid>docsnap.sk.FreeBSD.org</hostid> 迡
- 訄郅訄迣迡訄郇 訇訄邿迣訄訄.</para>
- </note>
-
- <para>衪郇迡 <option>--delete</option> 郋邽郅迣 訄邽迣郅訄 迣迣玼邿,
- 邽 郇 <command>make installworld</command> 訄訄郅郇 玼迮
- <filename class="directory">/usr/share/doc</filename>
- 訄郇迡 郅迣訄迣迡訄郇 郱訄邽邾 郱玼邿郅邽邿迣 訄郇訄邾訄迣玼邿迣 迣訄迠 訇郋郅郋 邾.
- 虷赲郅邽邿郇 郅迡 郇 訄訄郅迣 訄邽迣郅訄郇訄:</para>
-
- <screen>&prompt.root; <userinput>rsync -rltvz --delete <replaceable>docsnap.sk.FreeBSD.org</replaceable>::docsnap/??_??\.\* <replaceable>/usr/share/doc</replaceable></userinput></screen>
-
- <para>苭赲 訇訄邽邾郇 迣邽邿迣 邽郇郅 訄訄迡郅訄迣訄訄邿 訇郋郅 迠邽 郇
- 郇迣郅邽 訇訄邽邾迣 郱茤赲茤郇 邽郇郅 訇郋郅 迡訄訄訄 訄訄郅迣 訄邽迣郅訄
- 訄訄迡郅訄迣訄訄邿:</para>
-
- <screen>&prompt.root; <userinput>rsync -rltvz <replaceable>docsnap.sk.FreeBSD.org</replaceable>::docsnap/en_US.ISO8859-1 <replaceable>/usr/share/doc</replaceable></userinput></screen>
- </sect2>
-]]>
</sect1>
<sect1 id="current-stable">
diff --git a/mn_MN.UTF-8/books/handbook/desktop/chapter.xml b/mn_MN.UTF-8/books/handbook/desktop/chapter.xml
index c8e695bbb7..93df24b3b2 100644
--- a/mn_MN.UTF-8/books/handbook/desktop/chapter.xml
+++ b/mn_MN.UTF-8/books/handbook/desktop/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<?xml version="1.0" encoding="utf-8"?>
<!--
The FreeBSD Mongolian Documentation Project
diff --git a/mn_MN.UTF-8/books/handbook/disks/chapter.xml b/mn_MN.UTF-8/books/handbook/disks/chapter.xml
index 172f5afa60..2d8aab61f7 100644
--- a/mn_MN.UTF-8/books/handbook/disks/chapter.xml
+++ b/mn_MN.UTF-8/books/handbook/disks/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<?xml version="1.0" encoding="utf-8"?>
<!--
The FreeBSD Mongolian Documentation Project
@@ -2698,16 +2698,6 @@ sa0(ncr1:4:0): Logical unit is in process of becoming ready</screen>
苤玼邿郅 赲郅 茤迣茤迣迡郅邽邿郇 訄郅迡訄迣迡訄郅迡 玼迣郇 赲迡訄郅 迡訄邽郇 訇郋郅迠 訇郋郅郋 邾. 迡郋郋 郱訄郅訄郇
郇迣 訄迣 訄郇迣 郱郋赲郅郋郇迡 訄訄訄 郋迠邽邾 訄赲訄 訇郋郅郋 邾.</para>
</sect3>
-
-<![ %not.published; [
-
- <sect3>
- <title>* I Did Not Prepare for the Disaster, What Now?</title>
-
- <para></para>
- </sect3>
-]]>
-
</sect2>
</sect1>
@@ -4401,7 +4391,7 @@ case "$1" in
# Wait for any "hastd secondary" processes to stop
for disk in ${resources}; do
- while $( pgrep -lf "hastd: ${disk} \(secondary\)" > /dev/null 2>&1 ); do
+ while $( pgrep -lf "hastd: ${disk} \(secondary\)" > /dev/null 2>&amp;1 ); do
sleep 1
done
@@ -4416,7 +4406,7 @@ case "$1" in
# Wait for the /dev/hast/* devices to appear
for disk in ${resources}; do
for I in $( jot 60 ); do
- [ -c "/dev/hast/${disk}" ] && break
+ [ -c "/dev/hast/${disk}" ] &amp;&amp; break
sleep 0.5
done
@@ -4449,7 +4439,7 @@ case "$1" in
umount -f /hast/${disk}
fi
sleep $delay
- hastctl role secondary ${disk} 2>&1
+ hastctl role secondary ${disk} 2>&amp;1
if [ $? -ne 0 ]; then
logger -p $log -t $name "Unable to switch role to secondary for resource ${disk}."
exit 1
diff --git a/mn_MN.UTF-8/books/handbook/dtrace/chapter.xml b/mn_MN.UTF-8/books/handbook/dtrace/chapter.xml
index 5a1d3ac276..8adb49090f 100644
--- a/mn_MN.UTF-8/books/handbook/dtrace/chapter.xml
+++ b/mn_MN.UTF-8/books/handbook/dtrace/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<?xml version="1.0" encoding="utf-8"?>
<!--
The FreeBSD Mongolian Documentation Project
diff --git a/mn_MN.UTF-8/books/handbook/eresources/chapter.xml b/mn_MN.UTF-8/books/handbook/eresources/chapter.xml
index 361c97b752..5c58169935 100644
--- a/mn_MN.UTF-8/books/handbook/eresources/chapter.xml
+++ b/mn_MN.UTF-8/books/handbook/eresources/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<?xml version="1.0" encoding="utf-8"?>
<!--
The FreeBSD Mongolian Documentation Project
@@ -356,7 +356,7 @@
<row>
<entry>&a.mips.name;</entry>
- <entry>FreeBSD-迣 &mips 玼玼 郈郋 邽邿;</entry>
+ <entry>FreeBSD-迣 &mips; 玼玼 郈郋 邽邿;</entry>
</row>
<row>
@@ -2086,6 +2086,11 @@
<sect2 id="eresources-web-mirrors">
<title>郅訇訄郇 郇 郋郅邽郇 迡訄郇迡</title>
+
+ &chap.eresources.www.index.inc;
+
+ &chap.mirrors.lastmod.inc;
+
&chap.eresources.www.inc;
</sect2>
</sect1>
diff --git a/mn_MN.UTF-8/books/handbook/filesystems/chapter.xml b/mn_MN.UTF-8/books/handbook/filesystems/chapter.xml
index fcc0a71777..816ac8c640 100644
--- a/mn_MN.UTF-8/books/handbook/filesystems/chapter.xml
+++ b/mn_MN.UTF-8/books/handbook/filesystems/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<?xml version="1.0" encoding="utf-8"?>
<!--
The FreeBSD Mongolian Documentation Project
@@ -220,7 +220,7 @@ example 17547136 0 17547136 0% /example</screen>
邽迣 訄郇迡訄 訇郋郅郋邾迠郋邿, 玼玼郇 迡 訄邿郅迡 玼玼迣迠 迣郅迣邽迡
迡訄訄訄 迠邽郇 迡 邽迣 玼郱 訇郋郅郋邾迠郋邿 訇訄邿郇訄:</para>
- <screen>&prompt.root <userinput>cd /example</userinput>
+ <screen>&prompt.root; <userinput>cd /example</userinput>
&prompt.root; <userinput>ls</userinput>
&prompt.root; <userinput>touch testfile</userinput>
&prompt.root; <userinput>ls -al</userinput>
diff --git a/mn_MN.UTF-8/books/handbook/firewalls/chapter.xml b/mn_MN.UTF-8/books/handbook/firewalls/chapter.xml
index 6a3e5825d2..4816cab684 100644
--- a/mn_MN.UTF-8/books/handbook/firewalls/chapter.xml
+++ b/mn_MN.UTF-8/books/handbook/firewalls/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<?xml version="1.0" encoding="utf-8"?>
<!--
The FreeBSD Mongolian Documentation Project
diff --git a/mn_MN.UTF-8/books/handbook/geom/chapter.xml b/mn_MN.UTF-8/books/handbook/geom/chapter.xml
index baa2108992..66bb464ee9 100644
--- a/mn_MN.UTF-8/books/handbook/geom/chapter.xml
+++ b/mn_MN.UTF-8/books/handbook/geom/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<?xml version="1.0" encoding="utf-8"?>
<!--
The FreeBSD Mongolian Documentation Project
@@ -393,13 +393,13 @@ Done.</screen>
訄訄郅迣 訄邽迣郅訄郇 郅迠 訇郋郅郇郋.</para>
<screen>&prompt.root; <userinput>mount /dev/mirror/gm0s1a /mnt</userinput>
-&prompt.root; <userinput>dump -C16 -b64 -0aL -f - / | (cd /mnt && restore -rf -)</userinput>
+&prompt.root; <userinput>dump -C16 -b64 -0aL -f - / | (cd /mnt &amp;&amp; restore -rf -)</userinput>
&prompt.root; <userinput>mount /dev/mirror/gm0s1d /mnt/var</userinput>
&prompt.root; <userinput>mount /dev/mirror/gm0s1e /mnt/tmp</userinput>
&prompt.root; <userinput>mount /dev/mirror/gm0s1f /mnt/usr</userinput>
-&prompt.root; <userinput>dump -C16 -b64 -0aL -f - /var | (cd /mnt/var && restore -rf -)</userinput>
-&prompt.root; <userinput>dump -C16 -b64 -0aL -f - /tmp | (cd /mnt/tmp && restore -rf -)</userinput>
-&prompt.root; <userinput>dump -C16 -b64 -0aL -f - /usr | (cd /mnt/usr && restore -rf -)</userinput></screen>
+&prompt.root; <userinput>dump -C16 -b64 -0aL -f - /var | (cd /mnt/var &amp;&amp; restore -rf -)</userinput>
+&prompt.root; <userinput>dump -C16 -b64 -0aL -f - /tmp | (cd /mnt/tmp &amp;&amp; restore -rf -)</userinput>
+&prompt.root; <userinput>dump -C16 -b64 -0aL -f - /usr | (cd /mnt/usr &amp;&amp; restore -rf -)</userinput></screen>
<para><filename>/mnt/etc/fstab</filename>-迣 邽郇 郋郅邽郇
迣訄郅 訄邿郅郇 邽迮邾 玼玼 郱訄訄迣迡訄郇 訇訄邿訄訄 郱訄赲訄郅訄
@@ -640,15 +640,15 @@ BSD 8
訄訄迡訄迣迡訄迠 邾訄迣訄迡迣玼邿迣 訄郇訄訄訄邿.</para>
<screen>&prompt.root; <userinput>mount /dev/mirror/gm0s1a /mnt</userinput>
-&prompt.root; <userinput>dump -C16 -b64 -0aL -f - / | (cd /mnt && restore -rf -)</userinput>
+&prompt.root; <userinput>dump -C16 -b64 -0aL -f - / | (cd /mnt &amp;&amp; restore -rf -)</userinput>
&prompt.root; <userinput>mount /dev/mirror/gm0s1d /mnt/var</userinput>
&prompt.root; <userinput>mount /dev/mirror/gm0s1e /mnt/usr</userinput>
&prompt.root; <userinput>mount /dev/mirror/gm0s1f /mnt/data1</userinput>
&prompt.root; <userinput>mount /dev/mirror/gm0s1g /mnt/data2</userinput>
-&prompt.root; <userinput>dump -C16 -b64 -0aL -f - /usr | (cd /mnt/usr && restore -rf -)</userinput>
-&prompt.root; <userinput>dump -C16 -b64 -0aL -f - /var | (cd /mnt/var && restore -rf -)</userinput>
-&prompt.root; <userinput>dump -C16 -b64 -0aL -f - /data1 | (cd /mnt/data1 && restore -rf -)</userinput>
-&prompt.root; <userinput>dump -C16 -b64 -0aL -f - /data2 | (cd /mnt/data2 && restore -rf -)</userinput></screen>
+&prompt.root; <userinput>dump -C16 -b64 -0aL -f - /usr | (cd /mnt/usr &amp;&amp; restore -rf -)</userinput>
+&prompt.root; <userinput>dump -C16 -b64 -0aL -f - /var | (cd /mnt/var &amp;&amp; restore -rf -)</userinput>
+&prompt.root; <userinput>dump -C16 -b64 -0aL -f - /data1 | (cd /mnt/data1 &amp;&amp; restore -rf -)</userinput>
+&prompt.root; <userinput>dump -C16 -b64 -0aL -f - /data2 | (cd /mnt/data2 &amp;&amp; restore -rf -)</userinput></screen>
<para><devicename>ada1</devicename>- 訄訄訄郅迠
邽迮邾邽邿迣 迡訄邽郇 訄訄訄郅郇訄. 玼迣迡 訄迠邽郅郅訄迠 訇訄邿迣訄訄 訇郋郅
diff --git a/mn_MN.UTF-8/books/handbook/install/chapter.xml b/mn_MN.UTF-8/books/handbook/install/chapter.xml
index 095ccc1395..bc67b687ce 100644
--- a/mn_MN.UTF-8/books/handbook/install/chapter.xml
+++ b/mn_MN.UTF-8/books/handbook/install/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<?xml version="1.0" encoding="utf-8"?>
<!--
The FreeBSD Mongolian Documentation Project
diff --git a/mn_MN.UTF-8/books/handbook/introduction/chapter.xml b/mn_MN.UTF-8/books/handbook/introduction/chapter.xml
index 78db1ed976..f62e733418 100644
--- a/mn_MN.UTF-8/books/handbook/introduction/chapter.xml
+++ b/mn_MN.UTF-8/books/handbook/introduction/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<?xml version="1.0" encoding="utf-8"?>
<!--
The FreeBSD Mongolian Documentation Project
diff --git a/mn_MN.UTF-8/books/handbook/jails/chapter.xml b/mn_MN.UTF-8/books/handbook/jails/chapter.xml
index e8d2083e06..7df18920a2 100644
--- a/mn_MN.UTF-8/books/handbook/jails/chapter.xml
+++ b/mn_MN.UTF-8/books/handbook/jails/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<?xml version="1.0" encoding="utf-8"?>
<!--
The FreeBSD Mongolian Documentation Project
diff --git a/mn_MN.UTF-8/books/handbook/kernelconfig/chapter.xml b/mn_MN.UTF-8/books/handbook/kernelconfig/chapter.xml
index a5fa3ac99e..d862fdb8f2 100644
--- a/mn_MN.UTF-8/books/handbook/kernelconfig/chapter.xml
+++ b/mn_MN.UTF-8/books/handbook/kernelconfig/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<?xml version="1.0" encoding="utf-8"?>
<!--
The FreeBSD Mongolian Documentation Project
diff --git a/mn_MN.UTF-8/books/handbook/l10n/chapter.xml b/mn_MN.UTF-8/books/handbook/l10n/chapter.xml
index 87888a0498..7ccec9b377 100644
--- a/mn_MN.UTF-8/books/handbook/l10n/chapter.xml
+++ b/mn_MN.UTF-8/books/handbook/l10n/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<?xml version="1.0" encoding="utf-8"?>
<!--
The FreeBSD Mongolian Documentation Project
diff --git a/mn_MN.UTF-8/books/handbook/linuxemu/chapter.xml b/mn_MN.UTF-8/books/handbook/linuxemu/chapter.xml
index 8b18ee7446..c3a36e1b3b 100644
--- a/mn_MN.UTF-8/books/handbook/linuxemu/chapter.xml
+++ b/mn_MN.UTF-8/books/handbook/linuxemu/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<?xml version="1.0" encoding="utf-8"?>
<!--
The FreeBSD Mongolian Documentation Project
@@ -627,14 +627,14 @@ LOG=/var/log/lmgrd.log
case "$1" in
start)
- lmgrd -c ${LICENSE_FILE} 2&gt;&gt; ${LOG} 1&gt;&2
+ lmgrd -c ${LICENSE_FILE} 2&gt;&gt; ${LOG} 1&gt;&amp;2
echo -n " lmgrd"
;;
stop)
- lmgrd -c ${LICENSE_FILE} -x lmdown 2&gt;&gt; ${LOG} 1&gt;&2
+ lmgrd -c ${LICENSE_FILE} -x lmdown 2&gt;&gt; ${LOG} 1&gt;&amp;2
;;
*)
- echo "Usage: `basename $0` {start|stop}" 1&gt;&2
+ echo "Usage: `basename $0` {start|stop}" 1&gt;&amp;2
exit 64
;;
esac
@@ -905,7 +905,7 @@ exit 0</programlisting>
玼玼迣郇:</para>
<programlisting>#!/compat/linux/bin/sh
-(sleep 5; killall -1 matlab_helper) &
+(sleep 5; killall -1 matlab_helper) &amp;
exit 0</programlisting>
</step>
diff --git a/mn_MN.UTF-8/books/handbook/mac/chapter.xml b/mn_MN.UTF-8/books/handbook/mac/chapter.xml
index c101012491..ea37718734 100644
--- a/mn_MN.UTF-8/books/handbook/mac/chapter.xml
+++ b/mn_MN.UTF-8/books/handbook/mac/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<?xml version="1.0" encoding="utf-8"?>
<!--
The FreeBSD Mongolian Documentation Project
diff --git a/mn_MN.UTF-8/books/handbook/mail/chapter.xml b/mn_MN.UTF-8/books/handbook/mail/chapter.xml
index 2f55783b2e..69c2e8025e 100644
--- a/mn_MN.UTF-8/books/handbook/mail/chapter.xml
+++ b/mn_MN.UTF-8/books/handbook/mail/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<?xml version="1.0" encoding="utf-8"?>
<!--
The FreeBSD Mongolian Documentation Project
@@ -1600,11 +1600,11 @@ SENDMAIL_LDADD=-lsasl2</programlisting>
<para>訄訄訄 訄訄郅迡迣 訄迠邽郅郅郅迠 <application>sendmail</application>-迣 迡訄邽郇 邾迣郇:</para>
<screen>&prompt.root; <userinput>cd /usr/src/lib/libsmutil</userinput>
-&prompt.root; <userinput>make cleandir && make obj && make</userinput>
+&prompt.root; <userinput>make cleandir &amp;&amp; make obj &amp;&amp; make</userinput>
&prompt.root; <userinput>cd /usr/src/lib/libsm</userinput>
-&prompt.root; <userinput>make cleandir && make obj && make</userinput>
+&prompt.root; <userinput>make cleandir &amp;&amp; make obj &amp;&amp; make</userinput>
&prompt.root; <userinput>cd /usr/src/usr.sbin/sendmail</userinput>
-&prompt.root; <userinput>make cleandir && make obj && make && make install</userinput></screen>
+&prompt.root; <userinput>make cleandir &amp;&amp; make obj &amp;&amp; make &amp;&amp; make install</userinput></screen>
<para><filename>/usr/src</filename> 邽邿邾 邽 茤茤郅茤迣迡茤茤迣玼邿 訇茤迣茤茤迡
迣邿 赲訄訄郅迡訄迣 訄郇迣迡 訇訄邿迣訄訄 郋邽郋郅迡郋郅迡 <application>sendmail</application>-邽邿郇 邾迣郅
diff --git a/mn_MN.UTF-8/books/handbook/mirrors/chapter.xml b/mn_MN.UTF-8/books/handbook/mirrors/chapter.xml
index 6b7818462b..8a9dfc74ab 100644
--- a/mn_MN.UTF-8/books/handbook/mirrors/chapter.xml
+++ b/mn_MN.UTF-8/books/handbook/mirrors/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<?xml version="1.0" encoding="utf-8"?>
<!--
The FreeBSD Mongolian Documentation Project
@@ -124,6 +124,10 @@
苤訄邿 訇郋郅迣郋郇 赲迡 訄郇迡訄 訄迣迡 郇 郋郇 郇邽邿郇 迡訄訄訄 訄訄郅訄郇迡 茤迣茤迣迡茤郇
訇訄邿迣訄訄 訇郋郅郇郋.</para>
+ &chap.mirrors.ftp.index.inc;
+
+ &chap.mirrors.lastmod.inc;
+
&chap.mirrors.ftp.inc;
</sect1>
@@ -2161,6 +2165,10 @@ doc/zh_*</programlisting>
<para>&os;-迡 郱郋邽郅訄郇 <link linkend="cvsup">CVSup</link> 迮赲迮玼玼迡 迡訄訄訄 訄迣迡 迡
訄迠邽郅郅訄迠 訇訄邿迣訄訄:</para>
+ &chap.mirrors.cvsup.index.inc;
+
+ &chap.mirrors.lastmod.inc;
+
&chap.mirrors.cvsup.inc;
</sect2>
</sect1>
diff --git a/mn_MN.UTF-8/books/handbook/multimedia/chapter.xml b/mn_MN.UTF-8/books/handbook/multimedia/chapter.xml
index 83b3e4498b..19d0f02939 100644
--- a/mn_MN.UTF-8/books/handbook/multimedia/chapter.xml
+++ b/mn_MN.UTF-8/books/handbook/multimedia/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<?xml version="1.0" encoding="utf-8"?>
<!--
The FreeBSD Mongolian Documentation Project
@@ -1556,7 +1556,7 @@ bktr0: Pinnacle/Miro TV, Philips SECAM tuner.</programlisting>
<para>MythTV 茤迣茤迣迡郅邽邿郇 訄郇迣 郅迣訄郇訄:</para>
- <screen>&prompt.root; <userinput>mysql -uroot -p < /usr/local/share/mythtv/database/mc.sql</userinput></screen>
+ <screen>&prompt.root; <userinput>mysql -uroot -p &lt; /usr/local/share/mythtv/database/mc.sql</userinput></screen>
<para>郇 郋邽迣郋郋迣 邽邿郇:</para>
diff --git a/mn_MN.UTF-8/books/handbook/network-servers/chapter.xml b/mn_MN.UTF-8/books/handbook/network-servers/chapter.xml
index 08ceaeffd9..be082a82db 100644
--- a/mn_MN.UTF-8/books/handbook/network-servers/chapter.xml
+++ b/mn_MN.UTF-8/books/handbook/network-servers/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<?xml version="1.0" encoding="utf-8"?>
<!--
The FreeBSD Mongolian Documentation Project
diff --git a/mn_MN.UTF-8/books/handbook/pgpkeys/chapter.xml b/mn_MN.UTF-8/books/handbook/pgpkeys/chapter.xml
index 9fce65a91b..f0e6482cb1 100644
--- a/mn_MN.UTF-8/books/handbook/pgpkeys/chapter.xml
+++ b/mn_MN.UTF-8/books/handbook/pgpkeys/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<?xml version="1.0" encoding="utf-8"?>
<!--
The FreeBSD Mongolian Documentation Project
diff --git a/mn_MN.UTF-8/books/handbook/ports/chapter.xml b/mn_MN.UTF-8/books/handbook/ports/chapter.xml
index f8d4dbd1f0..21ba16ff53 100644
--- a/mn_MN.UTF-8/books/handbook/ports/chapter.xml
+++ b/mn_MN.UTF-8/books/handbook/ports/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<?xml version="1.0" encoding="utf-8"?>
<!--
The FreeBSD Mongolian Documentation Project
diff --git a/mn_MN.UTF-8/books/handbook/ppp-and-slip/chapter.xml b/mn_MN.UTF-8/books/handbook/ppp-and-slip/chapter.xml
index fee27be3f4..a591304be5 100644
--- a/mn_MN.UTF-8/books/handbook/ppp-and-slip/chapter.xml
+++ b/mn_MN.UTF-8/books/handbook/ppp-and-slip/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<?xml version="1.0" encoding="utf-8"?>
<!--
The FreeBSD Mongolian Documentation Project
diff --git a/mn_MN.UTF-8/books/handbook/preface/preface.xml b/mn_MN.UTF-8/books/handbook/preface/preface.xml
index 57bcb3ddf3..48ae9c1b4f 100644
--- a/mn_MN.UTF-8/books/handbook/preface/preface.xml
+++ b/mn_MN.UTF-8/books/handbook/preface/preface.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<?xml version="1.0" encoding="utf-8"?>
<!--
The FreeBSD Mongolian Documentation Project
diff --git a/mn_MN.UTF-8/books/handbook/printing/chapter.xml b/mn_MN.UTF-8/books/handbook/printing/chapter.xml
index 766d3d6c5b..bbbb1a5882 100644
--- a/mn_MN.UTF-8/books/handbook/printing/chapter.xml
+++ b/mn_MN.UTF-8/books/handbook/printing/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<?xml version="1.0" encoding="utf-8"?>
<!--
The FreeBSD Mongolian Documentation Project
diff --git a/mn_MN.UTF-8/books/handbook/security/chapter.xml b/mn_MN.UTF-8/books/handbook/security/chapter.xml
index 34299103c9..045eee50df 100644
--- a/mn_MN.UTF-8/books/handbook/security/chapter.xml
+++ b/mn_MN.UTF-8/books/handbook/security/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<?xml version="1.0" encoding="utf-8"?>
<!--
The FreeBSD Mongolian Documentation Project
diff --git a/mn_MN.UTF-8/books/handbook/serialcomms/chapter.xml b/mn_MN.UTF-8/books/handbook/serialcomms/chapter.xml
index 00e71fc6db..68f32e6bf9 100644
--- a/mn_MN.UTF-8/books/handbook/serialcomms/chapter.xml
+++ b/mn_MN.UTF-8/books/handbook/serialcomms/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<?xml version="1.0" encoding="utf-8"?>
<!--
The FreeBSD Mongolian Documentation Project
diff --git a/mn_MN.UTF-8/books/handbook/txtfiles.ent b/mn_MN.UTF-8/books/handbook/txtfiles.ent
index f37cdbb854..0cf7bab3e2 100644
--- a/mn_MN.UTF-8/books/handbook/txtfiles.ent
+++ b/mn_MN.UTF-8/books/handbook/txtfiles.ent
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<?xml version="1.0" encoding="utf-8"?>
<!--
The FreeBSD Mongolian Documentation Project
diff --git a/mn_MN.UTF-8/books/handbook/users/chapter.xml b/mn_MN.UTF-8/books/handbook/users/chapter.xml
index cf3d49bbd8..a21494175d 100644
--- a/mn_MN.UTF-8/books/handbook/users/chapter.xml
+++ b/mn_MN.UTF-8/books/handbook/users/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<?xml version="1.0" encoding="utf-8"?>
<!--
The FreeBSD Mongolian Documentation Project
diff --git a/mn_MN.UTF-8/books/handbook/vinum/chapter.xml b/mn_MN.UTF-8/books/handbook/vinum/chapter.xml
index d1375c54cb..535dd94e9b 100644
--- a/mn_MN.UTF-8/books/handbook/vinum/chapter.xml
+++ b/mn_MN.UTF-8/books/handbook/vinum/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<?xml version="1.0" encoding="utf-8"?>
<!--
The FreeBSD Mongolian Documentation Project
diff --git a/mn_MN.UTF-8/books/handbook/virtualization/chapter.xml b/mn_MN.UTF-8/books/handbook/virtualization/chapter.xml
index e112fe4648..acaafc113f 100644
--- a/mn_MN.UTF-8/books/handbook/virtualization/chapter.xml
+++ b/mn_MN.UTF-8/books/handbook/virtualization/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<?xml version="1.0" encoding="utf-8"?>
<!--
The FreeBSD Mongolian Documentation Project
@@ -1009,7 +1009,7 @@ xenbr1 8000.feffffffffff no vif0.1
role="package">emulators/virtualbox-ose-additions</filename> 訇訄迣迣
&os; 郱郋邽郇 迡 郅迣訄郇訄.</para>
- <screen>&prompt.root; <userinput>cd /usr/ports/emulators/virtualbox-ose-additions && make install clean</userinput></screen>
+ <screen>&prompt.root; <userinput>cd /usr/ports/emulators/virtualbox-ose-additions &amp;&amp; make install clean</userinput></screen>
<para>訄訄訄 邾茤玼玼迡邽邿迣 <filename>/etc/rc.conf</filename>-迡 郇邾郇:</para>
diff --git a/mn_MN.UTF-8/books/handbook/x11/chapter.xml b/mn_MN.UTF-8/books/handbook/x11/chapter.xml
index abb5e9e1c0..ec9253225b 100644
--- a/mn_MN.UTF-8/books/handbook/x11/chapter.xml
+++ b/mn_MN.UTF-8/books/handbook/x11/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<?xml version="1.0" encoding="utf-8"?>
<!--
The FreeBSD Mongolian Documentation Project
@@ -315,7 +315,7 @@
迣玼邿迣郅 邾. <application>&xorg;</application> 郇 X.Org 訄郇迣訄訄
迣訄迣訄訄郇 苭 郋郇郋 邽迮邾邽邿郇 苭 迮赲迮.
<application>&xorg;</application> 郇
- <application>&xfree86&nbsp;4.4RC2</application> 訇郋郅郋郇 X11R6.6
+ <application>&xfree86;&nbsp;4.4RC2</application> 訇郋郅郋郇 X11R6.6
郋郇 訇邽郅迣 迡 玼郇迡郅迣迡郇 訇邽郅.
&os;-郇 郈郋郇 迣郅郅迣訄 迡郋郋 訇訄邿迣訄訄
<application>&xorg;</application>-郇 赲邽郅訇訄 郇 &xorg.version; 迣迠 訇邿.</para>
diff --git a/mn_MN.UTF-8/share/xml/catalog b/mn_MN.UTF-8/share/xml/catalog
deleted file mode 100644
index 5e9a47fac0..0000000000
--- a/mn_MN.UTF-8/share/xml/catalog
+++ /dev/null
@@ -1,42 +0,0 @@
- -- ...................................................................... --
- -- FreeBSD SGML Public Identifiers ...................................... --
-
- -- ...................................................................... --
- -- Mongolian specific ..................................................... --
-
- -- ...................................................................... --
- -- The FreeBSD Mongolian Documentation Project
- -- ...................................................................... --
- --
- --
- -- ...................................................................... --
- -- Original revision: 1.5
- -- $FreeBSD$
- --
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//MN"
- "entities.ent"
-
-PUBLIC "-//FreeBSD//DOCUMENT DocBook Stylesheet//EN"
- "freebsd.dsl"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//MN"
- "mailing-lists.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook Language Specific Entities//EN"
- "l10n.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook Newsgroup Entities//MN"
- "newsgroups.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook Team Entities//MN"
- "teams.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//MN"
- "trademarks.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook Mongolian Translators Entities//MN"
- "translators.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook Glossary Entities//MN"
- "glossary.ent"
diff --git a/mn_MN.UTF-8/share/xml/catalog.xml b/mn_MN.UTF-8/share/xml/catalog.xml
new file mode 100644
index 0000000000..0e9826192d
--- /dev/null
+++ b/mn_MN.UTF-8/share/xml/catalog.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0"?>
+<!DOCTYPE catalog PUBLIC "-//OASIS//DTD Entity Resolution XML Catalog V1.0//EN"
+ "http://www.oasis-open.org/committees/entity/release/1.0/catalog.dtd">
+
+<!-- $FreeBSD$ -->
+
+<catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog">
+ <rewriteSystem systemIdStartString="http://www.FreeBSD.org/XML/www/lang/"
+ rewritePrefix="../../"/>
+ <rewriteURI uriStartString="http://www.FreeBSD.org/XML/www/lang/"
+ rewritePrefix="../../"/>
+
+ <public
+ publicId="-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN"
+ uri="entities.ent" />
+ <public
+ publicId="-//FreeBSD//ENTITIES DocBook Translator Entities//MN"
+ uri="translators.ent" />
+ <public
+ publicId="-//FreeBSD//ENTITIES FreeBSD L10N Entities//EN"
+ uri="l10n.ent" />
+</catalog>
diff --git a/mn_MN.UTF-8/share/xml/entities.ent b/mn_MN.UTF-8/share/xml/entities.ent
index 3be4888484..a7528cc690 100644
--- a/mn_MN.UTF-8/share/xml/entities.ent
+++ b/mn_MN.UTF-8/share/xml/entities.ent
@@ -6,25 +6,27 @@
$FreeBSD$
-->
-<!ENTITY % man PUBLIC "-//FreeBSD//ENTITIES DocBook Manual Page Entities//EN">
-%man;
-<!ENTITY % freebsd PUBLIC "-//FreeBSD//ENTITIES DocBook Miscellaneous FreeBSD Entities//EN">
+<!ENTITY % freebsd PUBLIC "-//FreeBSD//ENTITIES DocBook Miscellaneous FreeBSD Entities//EN"
+ "nonexistent">
%freebsd;
-<!ENTITY % authors PUBLIC "-//FreeBSD//ENTITIES DocBook Author Entities//EN">
-%authors;
-<!ENTITY % teams PUBLIC "-//FreeBSD//ENTITIES DocBook Team Entities//MN">
+<!ENTITY % teams PUBLIC "-//FreeBSD//ENTITIES DocBook Team Entities//MN"
+ "teams.ent">
%teams;
-<!ENTITY % mailing-lists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//MN">
+<!ENTITY % mailing-lists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//MN"
+ "mailing-lists.ent">
%mailing-lists;
-<!ENTITY % newsgroups PUBLIC "-//FreeBSD//ENTITIES DocBook Newsgroup Entities//MN">
+<!ENTITY % newsgroups PUBLIC "-//FreeBSD//ENTITIES DocBook Newsgroup Entities//MN"
+ "newsgroups.ent">
%newsgroups;
-<!ENTITY % trademarks PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//MN">
+<!ENTITY % trademarks PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//MN"
+ "trademarks.ent">
%trademarks;
-<!ENTITY % l10n PUBLIC "-//FreeBSD//ENTITIES DocBook Language Specific Entities//EN">
+<!ENTITY % l10n PUBLIC "-//FreeBSD//ENTITIES DocBook Language Specific Entities//EN"
+ "l10n.ent">
%l10n;
-<!ENTITY % l10n-common PUBLIC "-//FreeBSD//ENTITIES DocBook Language Neutral Entities//EN">
-%l10n-common;
-<!ENTITY % urls PUBLIC "-//FreeBSD//ENTITIES DocBook URL Entities//EN">
+<!ENTITY % urls PUBLIC "-//FreeBSD//ENTITIES DocBook URL Entities//EN"
+ "nonexistent">
%urls;
-<!ENTITY % glossary PUBLIC "-//FreeBSD//ENTITIES DocBook Glossary Entities//MN">
+<!ENTITY % glossary PUBLIC "-//FreeBSD//ENTITIES DocBook Glossary Entities//MN"
+ "glossary.ent">
%glossary;
diff --git a/mn_MN.UTF-8/share/xml/glossary.ent b/mn_MN.UTF-8/share/xml/glossary.ent
index 4f47b61551..4e17355b36 100644
--- a/mn_MN.UTF-8/share/xml/glossary.ent
+++ b/mn_MN.UTF-8/share/xml/glossary.ent
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<?xml version="1.0" encoding="utf-8"?>
<!--
The FreeBSD Mongolian Documentation Project
diff --git a/mn_MN.UTF-8/share/xml/mirrors-local.xsl b/mn_MN.UTF-8/share/xml/mirrors-local.xsl
index c924a48cb8..e6340a1dd8 100644
--- a/mn_MN.UTF-8/share/xml/mirrors-local.xsl
+++ b/mn_MN.UTF-8/share/xml/mirrors-local.xsl
@@ -13,7 +13,6 @@
<xsl:import href="../../../share/xml/mirrors-master.xsl" />
<xsl:output type="xml" encoding="utf-8"
- omit-xml-declaration="yes"
indent="yes"/>
<!-- template: "mirrors-docbook-contact" -->
diff --git a/mn_MN.UTF-8/share/xml/trademarks.ent b/mn_MN.UTF-8/share/xml/trademarks.ent
index 6d5f388174..173624eaee 100644
--- a/mn_MN.UTF-8/share/xml/trademarks.ent
+++ b/mn_MN.UTF-8/share/xml/trademarks.ent
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<?xml version="1.0" encoding="utf-8"?>
<!--
The FreeBSD Mongolian Documentation Project
diff --git a/nl_NL.ISO8859-1/articles/contributing-ports/article.xml b/nl_NL.ISO8859-1/articles/contributing-ports/article.xml
index 39c92a8352..f675648f3b 100644
--- a/nl_NL.ISO8859-1/articles/contributing-ports/article.xml
+++ b/nl_NL.ISO8859-1/articles/contributing-ports/article.xml
@@ -1,10 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//NL" "../../share/xml/entities.ent">
-%entities;
-<!ENTITY % not.published "IGNORE">
-]>
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<!--
$FreeBSD$
diff --git a/nl_NL.ISO8859-1/articles/contributing/article.xml b/nl_NL.ISO8859-1/articles/contributing/article.xml
index a958dda3fe..357f884c63 100644
--- a/nl_NL.ISO8859-1/articles/contributing/article.xml
+++ b/nl_NL.ISO8859-1/articles/contributing/article.xml
@@ -1,10 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//NL" "../../share/xml/entities.ent">
-%entities;
-<!ENTITY % not.published "IGNORE">
-]>
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<!--
$FreeBSD$
@@ -201,7 +197,7 @@
<para>Verkrijg kopie螚 van formele standaarden zoals
&posix;. Enkele links over deze standaarden staan op de
website van het <ulink
- url="&url.base;/projects/c99/index.html">&os; C99 & POSIX
+ url="&url.base;/projects/c99/index.html">&os; C99 &amp; POSIX
Standards Conformance Project</ulink>. Vergelijk het
gedrag van &os; met dat wat de standaard voorschrijft. Als
het gedrag verschilt, met name in subtiele of obscure
diff --git a/nl_NL.ISO8859-1/articles/explaining-bsd/article.xml b/nl_NL.ISO8859-1/articles/explaining-bsd/article.xml
index eed761f211..97c2636cdf 100644
--- a/nl_NL.ISO8859-1/articles/explaining-bsd/article.xml
+++ b/nl_NL.ISO8859-1/articles/explaining-bsd/article.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//NL" "../../share/xml/entities.ent">
-%entities;
-]>
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<!--
$FreeBSD$
@@ -257,7 +254,7 @@
<listitem>
<para>De indruk heerst dat de BSD-projecten gefragmenteerd en
oorlogvoerend zijn. De <ulink
- url="http://interactive.wsj.com/bin/login?Tag=/&amp;URI=/archive/retrieve.cgi%253Fid%253DSB952470579348918651.djm&">Wall
+ url="http://interactive.wsj.com/bin/login?Tag=/&amp;URI=/archive/retrieve.cgi%253Fid%253DSB952470579348918651.djm&amp;">Wall
Street Journal</ulink> sprak van <quote>balkanizatie</quote> van de
BSD-projecten. Net als de rechtszaak is dit beeld
voornamelijk op een oude geschiedenis gebaseerd.</para>
diff --git a/nl_NL.ISO8859-1/articles/problem-reports/article.xml b/nl_NL.ISO8859-1/articles/problem-reports/article.xml
index ebddb2de3b..35359fcfe7 100644
--- a/nl_NL.ISO8859-1/articles/problem-reports/article.xml
+++ b/nl_NL.ISO8859-1/articles/problem-reports/article.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//NL" "../../share/xml/entities.ent">
-%entities;
-]>
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<!--
$FreeBSD$
diff --git a/nl_NL.ISO8859-1/articles/solid-state/article.xml b/nl_NL.ISO8859-1/articles/solid-state/article.xml
index 409de08f05..cdbfa3e8d1 100644
--- a/nl_NL.ISO8859-1/articles/solid-state/article.xml
+++ b/nl_NL.ISO8859-1/articles/solid-state/article.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//NL" "../../share/xml/entities.ent">
-%entities;
-]>
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<!-- Copyright (c) 2001 The FreeBSD Documentation Project
diff --git a/nl_NL.ISO8859-1/books/handbook/Makefile b/nl_NL.ISO8859-1/books/handbook/Makefile
index 77f17c1417..ae8a4d7ab1 100644
--- a/nl_NL.ISO8859-1/books/handbook/Makefile
+++ b/nl_NL.ISO8859-1/books/handbook/Makefile
@@ -318,30 +318,43 @@ DOC_PREFIX?= ${.CURDIR}/../../..
#
# regels die lijsten met mirrors vanuit de XML-database genereren.
#
-XMLDOCS= mirrors-ftp:::mirrors.xml.ftp.inc \
+XMLDOCS= lastmod:::mirrors.lastmod.inc \
+ mirrors-ftp-index:::mirrors.xml.ftp.index.inc \
+ mirrors-ftp:::mirrors.xml.ftp.inc \
+ mirrors-cvsup-index:::mirrors.xml.cvsup.index.inc \
mirrors-cvsup:::mirrors.xml.cvsup.inc \
+ eresources-index:::eresources.xml.www.index.inc \
eresources:::eresources.xml.www.inc
DEPENDSET.DEFAULT= transtable mirror
XSLT.DEFAULT= ${XSL_MIRRORS}
XML.DEFAULT= ${XML_MIRRORS}
-NO_TIDY.DEFAULT= yes
+PARAMS.lastmod+= --param 'target' "'lastmod'"
+PARAMS.mirrors-ftp-index+= --param 'type' "'ftp'" \
+ --param 'proto' "'ftp'" \
+ --param 'target' "'index'"
PARAMS.mirrors-ftp+= --param 'type' "'ftp'" \
--param 'proto' "'ftp'" \
--param 'target' "'handbook/mirrors/chapter.xml'"
+PARAMS.mirrors-cvsup-index+= --param 'type' "'cvsup'" \
+ --param 'proto' "'cvsup'" \
+ --param 'target' "'index'"
PARAMS.mirrors-cvsup+= --param 'type' "'cvsup'" \
--param 'proto' "'cvsup'" \
--param 'target' "'handbook/mirrors/chapter.xml'"
+PARAMS.eresources-index+= --param 'type' "'www'" \
+ --param 'proto' "'http'" \
+ --param 'target' "'index'"
PARAMS.eresources+= --param 'type' "'www'" \
--param 'proto' "'http'" \
--param 'target' "'handbook/eresources/chapter.xml'"
-SRCS+= mirrors.xml.ftp.inc \
+SRCS+= mirrors.lastmod.inc \
+ mirrors.xml.ftp.inc \
+ mirrors.xml.ftp.index.inc \
mirrors.xml.cvsup.inc \
- eresources.xml.www.inc
-
-CLEANFILES+= mirrors.xml.ftp.inc \
- mirrors.xml.cvsup.inc \
- eresources.xml.www.inc
+ mirrors.xml.cvsup.index.inc \
+ eresources.xml.www.inc \
+ eresources.xml.www.index.inc
.include "${DOC_PREFIX}/share/mk/doc.project.mk"
diff --git a/nl_NL.ISO8859-1/books/handbook/advanced-networking/chapter.xml b/nl_NL.ISO8859-1/books/handbook/advanced-networking/chapter.xml
index ec361dce9b..7bc93874f0 100644
--- a/nl_NL.ISO8859-1/books/handbook/advanced-networking/chapter.xml
+++ b/nl_NL.ISO8859-1/books/handbook/advanced-networking/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Dutch Documentation Project
@@ -6516,7 +6516,7 @@ ifconfig_carp1="vhid 2 advskew 100 pass testpass 192.168.1.51/24"</programlistin
Het volgende commando dient op
<hostid>provider.example.org</hostid> gegeven te worden:</para>
- <screen>&prompt.root; <userinput>ifconfig carp0 down && ifconfig carp0 up</userinput></screen>
+ <screen>&prompt.root; <userinput>ifconfig carp0 down &amp;&amp; ifconfig carp0 up</userinput></screen>
<para>Dit dient gedaan te worden op de
<devicename>carp</devicename> interface die met de juiste
diff --git a/nl_NL.ISO8859-1/books/handbook/audit/chapter.xml b/nl_NL.ISO8859-1/books/handbook/audit/chapter.xml
index f5933581f0..0b573885aa 100644
--- a/nl_NL.ISO8859-1/books/handbook/audit/chapter.xml
+++ b/nl_NL.ISO8859-1/books/handbook/audit/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Dutch Documentation Project
$FreeBSD$
diff --git a/nl_NL.ISO8859-1/books/handbook/basics/chapter.xml b/nl_NL.ISO8859-1/books/handbook/basics/chapter.xml
index d4cae35492..89fe9d0ac2 100644
--- a/nl_NL.ISO8859-1/books/handbook/basics/chapter.xml
+++ b/nl_NL.ISO8859-1/books/handbook/basics/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Dutch Documentation Project
diff --git a/nl_NL.ISO8859-1/books/handbook/bibliography/chapter.xml b/nl_NL.ISO8859-1/books/handbook/bibliography/chapter.xml
index 4af7e2d8b7..d0d5dec29c 100644
--- a/nl_NL.ISO8859-1/books/handbook/bibliography/chapter.xml
+++ b/nl_NL.ISO8859-1/books/handbook/bibliography/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Dutch Documentation Project
diff --git a/nl_NL.ISO8859-1/books/handbook/book.xml b/nl_NL.ISO8859-1/books/handbook/book.xml
index 48e18254d6..8c13ce597d 100644
--- a/nl_NL.ISO8859-1/books/handbook/book.xml
+++ b/nl_NL.ISO8859-1/books/handbook/book.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//NL" "../../share/xml/entities.ent">
-%entities;
-
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd" [
<!--
$FreeBSD$
@@ -16,47 +13,6 @@
<!ENTITY % txtfiles SYSTEM "txtfiles.ent">
%txtfiles;
-<!ENTITY % not.published "INCLUDE">
-
-<!ENTITY % chap.introduction "IGNORE">
-<!ENTITY % chap.bsdinstall "IGNORE">
-<!ENTITY % chap.install "IGNORE">
-<!ENTITY % chap.basics "IGNORE">
-<!ENTITY % chap.ports "IGNORE">
-<!ENTITY % chap.config "IGNORE">
-<!ENTITY % chap.boot "IGNORE">
-<!ENTITY % chap.users "IGNORE">
-<!ENTITY % chap.kernelconfig "IGNORE">
-<!ENTITY % chap.security "IGNORE">
-<!ENTITY % chap.jails "IGNORE">
-<!ENTITY % chap.printing "IGNORE">
-<!ENTITY % chap.disks "IGNORE">
-<!ENTITY % chap.geom "IGNORE">
-<!ENTITY % chap.vinum "IGNORE">
-<!ENTITY % chap.x11 "IGNORE">
-<!ENTITY % chap.l10n "IGNORE">
-<!ENTITY % chap.multimedia "IGNORE">
-<!ENTITY % chap.desktop "IGNORE">
-<!ENTITY % chap.serialcomms "IGNORE">
-<!ENTITY % chap.ppp-and-slip "IGNORE">
-<!ENTITY % chap.advanced-networking "IGNORE">
-<!ENTITY % chap.firewalls "IGNORE">
-<!ENTITY % chap.network-servers "IGNORE">
-<!ENTITY % chap.mail "IGNORE">
-<!ENTITY % chap.cutting-edge "IGNORE">
-<!ENTITY % chap.linuxemu "IGNORE">
-<!ENTITY % chap.mirrors "IGNORE">
-<!ENTITY % chap.bibliography "IGNORE">
-<!ENTITY % chap.eresources "IGNORE">
-<!ENTITY % chap.pgpkeys "IGNORE">
-<!ENTITY % chap.index "IGNORE">
-<!ENTITY % chap.freebsd-glossary "IGNORE">
-<!ENTITY % chap.mac "IGNORE">
-<!ENTITY % chap.audit "IGNORE">
-<!ENTITY % chap.virtualization "IGNORE">
-<!ENTITY % chap.filesystems "IGNORE">
-<!ENTITY % chap.dtrace "IGNORE">
-
<!ENTITY % pgpkeys SYSTEM "../../../share/pgpkeys/pgpkeys.ent"> %pgpkeys;
]>
@@ -204,12 +160,12 @@
gelezen kan worden zonder bladeren.</para>
</partintro>
- <![ %chap.introduction; [ &chap.introduction; ]]>
- <![ %chap.install; [ &chap.install; ]]>
- <![ %chap.bsdinstall; [ &chap.bsdinstall; ]]>
- <![ %chap.basics; [ &chap.basics; ]]>
- <![ %chap.ports; [ &chap.ports; ]]>
- <![ %chap.x11; [ &chap.x11; ]]>
+ &chap.introduction;
+ &chap.install;
+ &chap.bsdinstall;
+ &chap.basics;
+ &chap.ports;
+ &chap.x11;
</part>
<part id="common-tasks">
diff --git a/nl_NL.ISO8859-1/books/handbook/boot/chapter.xml b/nl_NL.ISO8859-1/books/handbook/boot/chapter.xml
index 0081ef90a1..dd5e8d2d80 100644
--- a/nl_NL.ISO8859-1/books/handbook/boot/chapter.xml
+++ b/nl_NL.ISO8859-1/books/handbook/boot/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Dutch Documentation Project
diff --git a/nl_NL.ISO8859-1/books/handbook/chapters.ent b/nl_NL.ISO8859-1/books/handbook/chapters.ent
index 9fecb8afd0..74164a7748 100644
--- a/nl_NL.ISO8859-1/books/handbook/chapters.ent
+++ b/nl_NL.ISO8859-1/books/handbook/chapters.ent
@@ -14,235 +14,62 @@
%SRCID% 39631
-->
-<!ENTITY % not.published "INCLUDE">
-
-<!ENTITY % chap.introduction "IGNORE">
-<!ENTITY % chap.install "IGNORE">
-<!ENTITY % chap.bsdinstall "IGNORE">
-<!ENTITY % chap.basics "IGNORE">
-<!ENTITY % chap.ports "IGNORE">
-<!ENTITY % chap.config "IGNORE">
-<!ENTITY % chap.boot "IGNORE">
-<!ENTITY % chap.users "IGNORE">
-<!ENTITY % chap.kernelconfig "IGNORE">
-<!ENTITY % chap.security "IGNORE">
-<!ENTITY % chap.jails "IGNORE">
-<!ENTITY % chap.printing "IGNORE">
-<!ENTITY % chap.disks "IGNORE">
-<!ENTITY % chap.geom "IGNORE">
-<!ENTITY % chap.vinum "IGNORE">
-<!ENTITY % chap.x11 "IGNORE">
-<!ENTITY % chap.l10n "IGNORE">
-<!ENTITY % chap.multimedia "IGNORE">
-<!ENTITY % chap.desktop "IGNORE">
-<!ENTITY % chap.serialcomms "IGNORE">
-<!ENTITY % chap.ppp-and-slip "IGNORE">
-<!ENTITY % chap.advanced-networking "IGNORE">
-<!ENTITY % chap.firewalls "IGNORE">
-<!ENTITY % chap.network-servers "IGNORE">
-<!ENTITY % chap.mail "IGNORE">
-<!ENTITY % chap.cutting-edge "IGNORE">
-<!ENTITY % chap.linuxemu "IGNORE">
-<!ENTITY % chap.mirrors "IGNORE">
-<!ENTITY % chap.mirrors.ftp.inc "INCLUDE">
-<!ENTITY % chap.mirrors.cvsup.inc "INCLUDE">
-<!ENTITY % chap.bibliography "IGNORE">
-<!ENTITY % chap.eresources "IGNORE">
-<!ENTITY % chap.eresources.www.inc "INCLUDE">
-<!ENTITY % chap.pgpkeys "IGNORE">
-<!ENTITY % chap.index "IGNORE">
-<!ENTITY % chap.freebsd-glossary "IGNORE">
-<!ENTITY % chap.mac "IGNORE">
-<!ENTITY % chap.audit "IGNORE">
-<!ENTITY % chap.filesystems "IGNORE">
-<!ENTITY % chap.dtrace "IGNORE">
-
<!ENTITY chap.preface SYSTEM "preface/preface.xml">
<!ENTITY % pgpkeys SYSTEM "../../../share/pgpkeys/pgpkeys.ent"> %pgpkeys;
<!-- Deel een -->
-<![%chap.introduction;[
<!ENTITY chap.introduction SYSTEM "introduction/chapter.xml">
-]]>
-<![%chap.install;[
<!ENTITY chap.install SYSTEM "install/chapter.xml">
-]]>
-<![%chap.bsdinstall;[
<!ENTITY chap.bsdinstall SYSTEM "bsdinstall/chapter.xml">
-]]>
-<![%chap.basics;[
<!ENTITY chap.basics SYSTEM "basics/chapter.xml">
-]]>
-<![%chap.ports;[
<!ENTITY chap.ports SYSTEM "ports/chapter.xml">
-]]>
-<![%chap.x11;[
<!ENTITY chap.x11 SYSTEM "x11/chapter.xml">
-]]>
<!-- Deel twee -->
-<![%chap.desktop;[
<!ENTITY chap.desktop SYSTEM "desktop/chapter.xml">
-]]>
-<![%chap.multimedia;[
<!ENTITY chap.multimedia SYSTEM "multimedia/chapter.xml">
-]]>
-<![%chap.kernelconfig;[
<!ENTITY chap.kernelconfig SYSTEM "kernelconfig/chapter.xml">
-]]>
-<![%chap.printing;[
<!ENTITY chap.printing SYSTEM "printing/chapter.xml">
-]]>
-<![%chap.linuxemu;[
<!ENTITY chap.linuxemu SYSTEM "linuxemu/chapter.xml">
-]]>
<!-- Deel drie -->
-<![%chap.config;[
<!ENTITY chap.config SYSTEM "config/chapter.xml">
-]]>
-<![%chap.boot;[
<!ENTITY chap.boot SYSTEM "boot/chapter.xml">
-]]>
-<![%chap.users;[
<!ENTITY chap.users SYSTEM "users/chapter.xml">
-]]>
-<![%chap.security;[
<!ENTITY chap.security SYSTEM "security/chapter.xml">
-]]>
-<![%chap.jails;[
<!ENTITY chap.jails SYSTEM "jails/chapter.xml">
-]]>
-<![%chap.mac;[
<!ENTITY chap.mac SYSTEM "mac/chapter.xml">
-]]>
-<![%chap.audit;[
<!ENTITY chap.audit SYSTEM "audit/chapter.xml">
-]]>
-<![%chap.disks;[
<!ENTITY chap.disks SYSTEM "disks/chapter.xml">
-]]>
-<![%chap.geom;[
<!ENTITY chap.geom SYSTEM "geom/chapter.xml">
-]]>
-<![%chap.filesystems;[
<!ENTITY chap.filesystems SYSTEM "filesystems/chapter.xml">
-]]>
-<![%chap.vinum;[
<!ENTITY chap.vinum SYSTEM "vinum/chapter.xml">
-]]>
-<![%chap.virtualization;[
<!ENTITY chap.virtualization SYSTEM "virtualization/chapter.xml">
-]]>
-<![%chap.l10n;[
<!ENTITY chap.l10n SYSTEM "l10n/chapter.xml">
-]]>
-<![%chap.cutting-edge;[
<!ENTITY chap.cutting-edge SYSTEM "cutting-edge/chapter.xml">
-]]>
-<![%chap.dtrace;[
<!ENTITY chap.dtrace SYSTEM "dtrace/chapter.xml">
-]]>
<!-- Deel vier -->
-<![%chap.serialcomms;[
<!ENTITY chap.serialcomms SYSTEM "serialcomms/chapter.xml">
-]]>
-<![%chap.ppp-and-slip;[
<!ENTITY chap.ppp-and-slip SYSTEM "ppp-and-slip/chapter.xml">
-]]>
-<![%chap.mail;[
<!ENTITY chap.mail SYSTEM "mail/chapter.xml">
-]]>
-<![%chap.network-servers;[
<!ENTITY chap.network-servers SYSTEM "network-servers/chapter.xml">
-]]>
-<![%chap.firewalls;[
<!ENTITY chap.firewalls SYSTEM "firewalls/chapter.xml">
-]]>
-<![%chap.advanced-networking;[
<!ENTITY chap.advanced-networking SYSTEM "advanced-networking/chapter.xml">
-]]>
<!-- Deel vijf (appendices) -->
-<![%chap.mirrors;[
<!ENTITY chap.mirrors SYSTEM "mirrors/chapter.xml">
-]]>
-<![%chap.mirrors.ftp.inc;[
+ <!ENTITY chap.mirrors.lastmod.inc SYSTEM "mirrors.lastmod.inc">
+ <!ENTITY chap.mirrors.ftp.index.inc SYSTEM "mirrors.xml.ftp.index.inc">
<!ENTITY chap.mirrors.ftp.inc SYSTEM "mirrors.xml.ftp.inc">
-]]>
-<![%chap.mirrors.cvsup.inc;[
+ <!ENTITY chap.mirrors.cvsup.index.inc SYSTEM "mirrors.xml.cvsup.index.inc">
<!ENTITY chap.mirrors.cvsup.inc SYSTEM "mirrors.xml.cvsup.inc">
-]]>
-<![%chap.bibliography;[
<!ENTITY chap.bibliography SYSTEM "bibliography/chapter.xml">
-]]>
-<![%chap.eresources;[
<!ENTITY chap.eresources SYSTEM "eresources/chapter.xml">
-]]>
-<![%chap.eresources.www.inc;[
+ <!ENTITY chap.eresources.www.index.inc SYSTEM "eresources.xml.www.index.inc">
<!ENTITY chap.eresources.www.inc SYSTEM "eresources.xml.www.inc">
-]]>
-<![%chap.pgpkeys;[
<!ENTITY chap.pgpkeys SYSTEM "pgpkeys/chapter.xml">
-]]>
-<![%chap.freebsd-glossary;[
<!ENTITY chap.freebsd-glossary "&freebsd-glossary;">
-]]>
-<![%chap.index;[
- <!ENTITY chap.index SYSTEM "index.xml">
-]]>
+ <!ENTITY chap.index "">
<!ENTITY chap.colophon SYSTEM "colophon.xml">
-
-<!-- IGNORE cases -->
-
-<!-- Deel een-->
-<!ENTITY chap.introduction "">
-<!ENTITY chap.install "">
-<!ENTITY chap.basics "">
-<!ENTITY chap.ports "">
-<!ENTITY chap.x11 "">
-
-<!-- Deel twee -->
-<!ENTITY chap.desktop "">
-<!ENTITY chap.multimedia "">
-<!ENTITY chap.kernelconfig "">
-<!ENTITY chap.printing "">
-<!ENTITY chap.linuxemu "">
-
-<!-- Deel drie -->
-<!ENTITY chap.config "">
-<!ENTITY chap.boot "">
-<!ENTITY chap.users "">
-<!ENTITY chap.security "">
-<!ENTITY chap.jails "">
-<!ENTITY chap.mac "">
-<!ENTITY chap.audit "">
-<!ENTITY chap.disks "">
-<!ENTITY chap.geom "">
-<!ENTITY chap.filesystems "">
-<!ENTITY chap.vinum "">
-<!ENTITY chap.virtualization "">
-<!ENTITY chap.l10n "">
-<!ENTITY chap.cutting-edge "">
-<!ENTITY chap.dtrace "">
-
-<!-- Deel vier -->
-<!ENTITY chap.serialcomms "">
-<!ENTITY chap.ppp-and-slip "">
-<!ENTITY chap.mail "">
-<!ENTITY chap.network-servers "">
-<!ENTITY chap.firewalls "">
-<!ENTITY chap.advanced-networking "">
-
-<!-- Deel vijf (appendices) -->
-<!ENTITY chap.mirrors "">
-<!ENTITY chap.mirrors.ftp.inc "">
-<!ENTITY chap.mirrors.cvsup.inc "">
-<!ENTITY chap.bibliography "">
-<!ENTITY chap.eresources "">
-<!ENTITY chap.eresources.www.inc "">
-<!ENTITY chap.pgpkeys "">
-<!ENTITY chap.freebsd-glossary "">
-<!ENTITY chap.index "">
diff --git a/nl_NL.ISO8859-1/books/handbook/colophon.xml b/nl_NL.ISO8859-1/books/handbook/colophon.xml
index 19035e82d4..e6e30896d5 100644
--- a/nl_NL.ISO8859-1/books/handbook/colophon.xml
+++ b/nl_NL.ISO8859-1/books/handbook/colophon.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Dutch Documentation Project
diff --git a/nl_NL.ISO8859-1/books/handbook/config/chapter.xml b/nl_NL.ISO8859-1/books/handbook/config/chapter.xml
index 0561f38579..14194e68ab 100644
--- a/nl_NL.ISO8859-1/books/handbook/config/chapter.xml
+++ b/nl_NL.ISO8859-1/books/handbook/config/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Dutch Documentation Project
@@ -825,7 +825,7 @@ sshd is running as pid 433.</screen>
staat in &man.rc.8; en &man.rc.subr.8;. Als u ge鮦teresseerd
bent in het schrijven van uw eigen
<filename>rc.d</filename>-script of om de huidige scripts te
- verbeteren is wellicht <ulink url="&url.articles.rc-scripting">dit
+ verbeteren is wellicht <ulink url="&url.articles.rc-scripting;">dit
artikel</ulink> interessant.</para>
</sect1>
diff --git a/nl_NL.ISO8859-1/books/handbook/cutting-edge/chapter.xml b/nl_NL.ISO8859-1/books/handbook/cutting-edge/chapter.xml
index 603daea3c3..f297267cee 100644
--- a/nl_NL.ISO8859-1/books/handbook/cutting-edge/chapter.xml
+++ b/nl_NL.ISO8859-1/books/handbook/cutting-edge/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Dutch Documentation Project
@@ -1233,83 +1233,6 @@ Fetching 133 new ports or files... done.</screen>
<screen>&prompt.root; <userinput>portupgrade -PP hu-freebsd-doc</userinput></screen>
</sect3>
</sect2>
-
-<!--FIXME: Waiting for a working docsnap server...-->
-<![ IGNORE [
- <sect2 id="docsnap">
- <sect2info>
- <authorgroup>
- <author>
- <firstname>Pav</firstname>
- <surname>Lucistnik</surname>
- <contrib>Gebaseerd op informatie geleverd door </contrib>
- </author>
- </authorgroup>
- </sect2info>
-
- <title>Docsnap gebruiken</title>
-
- <indexterm><primary>updaten en upgraden</primary></indexterm>
-
- <indexterm>
- <primary>Docsnap</primary>
-
- <see>updaten en upgraden</see>
- </indexterm>
-
- <para><application>Docscnap</application> is een
- &man.rsync.1;-reservoir voor het bijwerken van
- ge鮦stalleerde &os;-documentatie op een relatief
- gemakkelijke en snelle manier. Een
- <quote><application>Docsnap</application> server</quote> volgt
- de documentatiebroncode en bouwt ze elk uur in HTML-formaat. De
- port <filename role="package">textproc/docproj</filename> is
- niet nodig met <application>Docsnap</application> aangezien er
- alleen patches voor de gebouwde documentatie bestaan.</para>
-
- <para>De enige benodigdheid om deze techniek te gebruiken is de
- port of het pakket <filename
- role="package">net/rsync</filename>. Gebruik het volgende
- commando om het toe te voegen:</para>
-
- <screen>&prompt.root; <userinput>pkg_add -r rsync</userinput></screen>
-
- <note>
- <para><application>Docsnap</application> is eigenlijk ontwikkeld
- om de documentatie die in <filename
- class="directory">/usr/share/doc</filename> is
- ge鮦stalleerd bij te werken, maar de volgende voorbeelden
- kunnen ook voor andere mappen worden gebruikt. Voor
- gebruikersmappen heeft het geen
- <username>root</username>-rechten nodig.</para>
- </note>
-
- <para>Geef het volgende commando om de documentatie bij te werken:</para>
-
- <screen>&prompt.root; <userinput>rsync -rltvz <replaceable>docsnap.sk.FreeBSD.org</replaceable>::docsnap <replaceable>/usr/share/doc</replaceable></userinput></screen>
-
- <note>
- <para>Er is momenteel slechts 澭n
- <application>Docsnap</application>-server; de bovengenoemde
- host <hostid>docsnap.sk.FreeBSD.org</hostid>.</para>
- </note>
-
- <para>Gebruik hier niet de vlag <option>--delete</option> omdat er
- tijdens <command>make installworld</command> wat dingen in
- <filename class="directory">/usr/share/doc</filename> worden
- ge鮦stalleerd, die dan per ongeluk verwijderd zouden
- worden. Gebruik in plaats daarvan dit commando om op te
- ruimen:</para>
-
- <screen>&prompt.root; <userinput>rsync -rltvz --delete <replaceable>docsnap.sk.FreeBSD.org</replaceable>::docsnap/??_??\.\* <replaceable>/usr/share/doc</replaceable></userinput></screen>
-
- <para>Het volgende commando dient gebruikt te worden als er een
- deelverzameling van de documentatie, bijvoorbeeld
- alleen de Engelse documentatie, bijgewerkt moet worden:</para>
-
- <screen>&prompt.root; <userinput>rsync -rltvz <replaceable>docsnap.sk.FreeBSD.org</replaceable>::docsnap/en_US.ISO8859-1 <replaceable>/usr/share/doc</replaceable></userinput></screen>
- </sect2>
-]]>
</sect1>
<sect1 id="current-stable">
diff --git a/nl_NL.ISO8859-1/books/handbook/desktop/chapter.xml b/nl_NL.ISO8859-1/books/handbook/desktop/chapter.xml
index 86c41331bf..b88e8c9dc2 100644
--- a/nl_NL.ISO8859-1/books/handbook/desktop/chapter.xml
+++ b/nl_NL.ISO8859-1/books/handbook/desktop/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Dutch Documentation Project
diff --git a/nl_NL.ISO8859-1/books/handbook/disks/chapter.xml b/nl_NL.ISO8859-1/books/handbook/disks/chapter.xml
index aa276d51c4..4b2bffedd6 100644
--- a/nl_NL.ISO8859-1/books/handbook/disks/chapter.xml
+++ b/nl_NL.ISO8859-1/books/handbook/disks/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Dutch Documentation Project
@@ -2969,16 +2969,6 @@ cd0: Attempt to query device size failed: NOT READY, Medium not present - tray c
Nu een extra uur investeren, kan later grote zorgen
besparen.</para>
</sect3>
-
- <![ %not.published; [
-
- <sect3>
- <title>* Er zijn geen voorbereidingen voor de ramp getroffen,
- wat nu?</title>
-
- <para></para>
- </sect3>
-]]>
</sect2>
</sect1>
@@ -3817,7 +3807,7 @@ sector_size = 2048
<step>
<title>Koppel de versleutelde partitie aan de kernel</title>
- <screen>&prompt.root <userinput>gbde attach /dev/ad4s1c -l /etc/gbde/ad4s1c.lock</userinput></screen>
+ <screen>&prompt.root; <userinput>gbde attach /dev/ad4s1c -l /etc/gbde/ad4s1c.lock</userinput></screen>
<para>Er wordt om de wachtwoordzin gevraagd die gekozen is
tijdens de initialisatie van de versleutelde partitie. Het
@@ -3901,7 +3891,7 @@ Filesystem Size Used Avail Capacity Mounted on
<step>
<title>Koppel de gbde-partitie aan de kernel</title>
- <screen>&prompt.root <userinput>gbde attach /dev/ad4s1c -l /etc/gbde/ad4s1c.lock</userinput></screen>
+ <screen>&prompt.root; <userinput>gbde attach /dev/ad4s1c -l /etc/gbde/ad4s1c.lock</userinput></screen>
<para>Er wordt om de wachtwoordzin gevraagd die gekozen is
tijdens de initialisatie van de versleutelde
@@ -4862,7 +4852,7 @@ case "$1" in
# Wacht totdat de "hastd secondary" processen zijn gestopt
for disk in ${resources}; do
- while $( pgrep -lf "hastd: ${disk} \(secondary\)" > /dev/null 2>&1 ); do
+ while $( pgrep -lf "hastd: ${disk} \(secondary\)" > /dev/null 2&gt;&amp;1 ); do
sleep 1
done
@@ -4877,7 +4867,7 @@ case "$1" in
# Wacht totdat de apparaten /dev/hast/* verschijnen
for disk in ${resources}; do
for I in $( jot 60 ); do
- [ -c "/dev/hast/${disk}" ] && break
+ [ -c "/dev/hast/${disk}" ] &amp;&amp; break
sleep 0.5
done
@@ -4910,7 +4900,7 @@ case "$1" in
umount -f /hast/${disk}
fi
sleep $delay
- hastctl role secondary ${disk} 2>&1
+ hastctl role secondary ${disk} 2&gt;&amp;1
if [ $? -ne 0 ]; then
logger -p $log -t $name "Omschakelen van rol naar secundair voor hulpbron ${disk} mislukt."
exit 1
diff --git a/nl_NL.ISO8859-1/books/handbook/dtrace/chapter.xml b/nl_NL.ISO8859-1/books/handbook/dtrace/chapter.xml
index 8b60b6526a..a58b0e1e39 100644
--- a/nl_NL.ISO8859-1/books/handbook/dtrace/chapter.xml
+++ b/nl_NL.ISO8859-1/books/handbook/dtrace/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
Recently I suggested to myself that this should become a profiling
and debugging chapter, which covers things like ktrace(1) and
diff --git a/nl_NL.ISO8859-1/books/handbook/eresources/chapter.xml b/nl_NL.ISO8859-1/books/handbook/eresources/chapter.xml
index 8c8bd7b2a3..65b58244a9 100644
--- a/nl_NL.ISO8859-1/books/handbook/eresources/chapter.xml
+++ b/nl_NL.ISO8859-1/books/handbook/eresources/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Dutch Documentation Project
@@ -2386,6 +2386,10 @@
<sect2 id="eresources-web-mirrors">
<title>Offici螔e spiegels</title>
+ &chap.eresources.www.index.inc;
+
+ &chap.mirrors.lastmod.inc;
+
&chap.eresources.www.inc;
</sect2>
</sect1>
diff --git a/nl_NL.ISO8859-1/books/handbook/filesystems/chapter.xml b/nl_NL.ISO8859-1/books/handbook/filesystems/chapter.xml
index 08712cd9f2..707b037145 100644
--- a/nl_NL.ISO8859-1/books/handbook/filesystems/chapter.xml
+++ b/nl_NL.ISO8859-1/books/handbook/filesystems/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Dutch Documentation Project
$FreeBSD$
@@ -257,7 +257,7 @@ example 17547136 0 17547136 0% /example</screen>
bestanden op worden aangemaakt en gebruikers kunnen er op
rondkijken zoals in het volgende voorbeeld:</para>
- <screen>&prompt.root <userinput>cd /example</userinput>
+ <screen>&prompt.root; <userinput>cd /example</userinput>
&prompt.root; <userinput>ls</userinput>
&prompt.root; <userinput>touch testfile</userinput>
&prompt.root; <userinput>ls -al</userinput>
diff --git a/nl_NL.ISO8859-1/books/handbook/firewalls/chapter.xml b/nl_NL.ISO8859-1/books/handbook/firewalls/chapter.xml
index 007682754f..5e395afca7 100644
--- a/nl_NL.ISO8859-1/books/handbook/firewalls/chapter.xml
+++ b/nl_NL.ISO8859-1/books/handbook/firewalls/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Dutch Documentation Project
@@ -1176,7 +1176,7 @@ sh /etc/ipf.rules.script</programlisting>
<para>De regelsyntaxis die hier wordt besproken is versimpeld
door alleen de moderne stateful regels en de <quote>eerste
van toepassing zijnde regel wint</quote> te belichten. De
- complete regelsyntaxis is na te lezen in &man.ipf.8</para>
+ complete regelsyntaxis is na te lezen in &man.ipf.8;.</para>
<para>Het karakter <literal>#</literal> wordt gebruikt om het
begin van een opmerking te markeren en zowel op een eigen
diff --git a/nl_NL.ISO8859-1/books/handbook/geom/chapter.xml b/nl_NL.ISO8859-1/books/handbook/geom/chapter.xml
index 27514d5912..6a402409d4 100644
--- a/nl_NL.ISO8859-1/books/handbook/geom/chapter.xml
+++ b/nl_NL.ISO8859-1/books/handbook/geom/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Dutch Documentation Project
@@ -397,13 +397,13 @@ Done.</screen>
&man.restore.8; naar de spiegel gekopieerd worden:</para>
<screen>&prompt.root; <userinput>mount /dev/mirror/gm0s1a /mnt</userinput>
-&prompt.root; <userinput>dump -C16 -b64 -0aL -f - / | (cd /mnt && restore -rf -)</userinput>
+&prompt.root; <userinput>dump -C16 -b64 -0aL -f - / | (cd /mnt &amp;&amp; restore -rf -)</userinput>
&prompt.root; <userinput>mount /dev/mirror/gm0s1d /mnt/var</userinput>
&prompt.root; <userinput>mount /dev/mirror/gm0s1e /mnt/tmp</userinput>
&prompt.root; <userinput>mount /dev/mirror/gm0s1f /mnt/usr</userinput>
-&prompt.root; <userinput>dump -C16 -b64 -0aL -f - /var | (cd /mnt/var && restore -rf -)</userinput>
-&prompt.root; <userinput>dump -C16 -b64 -0aL -f - /tmp | (cd /mnt/tmp && restore -rf -)</userinput>
-&prompt.root; <userinput>dump -C16 -b64 -0aL -f - /usr | (cd /mnt/usr && restore -rf -)</userinput></screen>
+&prompt.root; <userinput>dump -C16 -b64 -0aL -f - /var | (cd /mnt/var &amp;&amp; restore -rf -)</userinput>
+&prompt.root; <userinput>dump -C16 -b64 -0aL -f - /tmp | (cd /mnt/tmp &amp;&amp; restore -rf -)</userinput>
+&prompt.root; <userinput>dump -C16 -b64 -0aL -f - /usr | (cd /mnt/usr &amp;&amp; restore -rf -)</userinput></screen>
<para><filename>/mnt/etc/fstab</filename> moet bewerkt worden om naar de
nieuwe bestandssystemen op de spiegel te wijzen:</para>
@@ -633,15 +633,15 @@ BSD 8
-L</command> gedumpt is even kan duren.</para>
<screen>&prompt.root; <userinput>mount /dev/mirror/gm0s1a /mnt</userinput>
-&prompt.root; <userinput>dump -C16 -b64 -0aL -f - / | (cd /mnt && restore -rf -)</userinput>
+&prompt.root; <userinput>dump -C16 -b64 -0aL -f - / | (cd /mnt &amp;&amp; restore -rf -)</userinput>
&prompt.root; <userinput>mount /dev/mirror/gm0s1d /mnt/var</userinput>
&prompt.root; <userinput>mount /dev/mirror/gm0s1e /mnt/usr</userinput>
&prompt.root; <userinput>mount /dev/mirror/gm0s1f /mnt/data1</userinput>
&prompt.root; <userinput>mount /dev/mirror/gm0s1g /mnt/data2</userinput>
-&prompt.root; <userinput>dump -C16 -b64 -0aL -f - /usr | (cd /mnt/usr && restore -rf -)</userinput>
-&prompt.root; <userinput>dump -C16 -b64 -0aL -f - /var | (cd /mnt/var && restore -rf -)</userinput>
-&prompt.root; <userinput>dump -C16 -b64 -0aL -f - /data1 | (cd /mnt/data1 && restore -rf -)</userinput>
-&prompt.root; <userinput>dump -C16 -b64 -0aL -f - /data2 | (cd /mnt/data2 && restore -rf -)</userinput></screen>
+&prompt.root; <userinput>dump -C16 -b64 -0aL -f - /usr | (cd /mnt/usr &amp;&amp; restore -rf -)</userinput>
+&prompt.root; <userinput>dump -C16 -b64 -0aL -f - /var | (cd /mnt/var &amp;&amp; restore -rf -)</userinput>
+&prompt.root; <userinput>dump -C16 -b64 -0aL -f - /data1 | (cd /mnt/data1 &amp;&amp; restore -rf -)</userinput>
+&prompt.root; <userinput>dump -C16 -b64 -0aL -f - /data2 | (cd /mnt/data2 &amp;&amp; restore -rf -)</userinput></screen>
<para>Start het systeem opnieuw op vanaf <devicename>ada1</devicename>.
Als alles werkt, zal het systeem opstarten vanaf
diff --git a/nl_NL.ISO8859-1/books/handbook/install/chapter.xml b/nl_NL.ISO8859-1/books/handbook/install/chapter.xml
index a66c9fc3f9..29b3fc295a 100644
--- a/nl_NL.ISO8859-1/books/handbook/install/chapter.xml
+++ b/nl_NL.ISO8859-1/books/handbook/install/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Dutch Documentation Project
@@ -3993,7 +3993,7 @@ Retype new password :</screen>
<title>&os; opstarten</title>
<sect3 id="freebsdboot-i386">
- <title>&os/&arch.i386; opstarten</title>
+ <title>&os;/&arch.i386; opstarten</title>
<para>Als alles goed is gegaan komen er berichten over het scherm
rollen en komt dit uit bij de aanmeldprompt. De inhoud van de
diff --git a/nl_NL.ISO8859-1/books/handbook/introduction/chapter.xml b/nl_NL.ISO8859-1/books/handbook/introduction/chapter.xml
index 1d7db00581..bb1698b662 100644
--- a/nl_NL.ISO8859-1/books/handbook/introduction/chapter.xml
+++ b/nl_NL.ISO8859-1/books/handbook/introduction/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
diff --git a/nl_NL.ISO8859-1/books/handbook/jails/chapter.xml b/nl_NL.ISO8859-1/books/handbook/jails/chapter.xml
index 760486beb2..e85532e586 100644
--- a/nl_NL.ISO8859-1/books/handbook/jails/chapter.xml
+++ b/nl_NL.ISO8859-1/books/handbook/jails/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Dutch Documentation Project
diff --git a/nl_NL.ISO8859-1/books/handbook/kernelconfig/chapter.xml b/nl_NL.ISO8859-1/books/handbook/kernelconfig/chapter.xml
index 73cdcb431c..994aee8702 100644
--- a/nl_NL.ISO8859-1/books/handbook/kernelconfig/chapter.xml
+++ b/nl_NL.ISO8859-1/books/handbook/kernelconfig/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Dutch Documentation Project
diff --git a/nl_NL.ISO8859-1/books/handbook/l10n/chapter.xml b/nl_NL.ISO8859-1/books/handbook/l10n/chapter.xml
index ca9dbd51fa..bbede1b3e5 100644
--- a/nl_NL.ISO8859-1/books/handbook/l10n/chapter.xml
+++ b/nl_NL.ISO8859-1/books/handbook/l10n/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Dutch Documentation Project
diff --git a/nl_NL.ISO8859-1/books/handbook/linuxemu/chapter.xml b/nl_NL.ISO8859-1/books/handbook/linuxemu/chapter.xml
index 29cfce3432..71fcf1c226 100644
--- a/nl_NL.ISO8859-1/books/handbook/linuxemu/chapter.xml
+++ b/nl_NL.ISO8859-1/books/handbook/linuxemu/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Dutch Documentation Project
@@ -251,7 +251,7 @@ Id Refs Address Size Name
<para>Als er toegang is tot een &linux; systeem kan gekeken
worden welke gedeelde bibliotheken de applicatie nodig heeft
- en kunnen ze gekopieerd worden naar het &os systeem. Dit
+ en kunnen ze gekopieerd worden naar het &os; systeem. Dit
wordt toegelicht in het volgende voorbeeld:</para>
<informalexample>
@@ -506,7 +506,7 @@ done</programlisting>
programma <command>mathinfo</command> in de installatiemap om uw
<quote>machine-ID</quote> te verkrijgen. Dit machine-ID is
alleen op het MAC-adres van uw eerste Ethernetkaart gebaseerd,
- zodat u uw kopie van <application>&mathematica</application>
+ zodat u uw kopie van <application>&mathematica;</application>
niet op andere machines kunt draaien.</para>
<para>Bij een registratie bij Wolfram, per email, telefoon of
@@ -699,14 +699,14 @@ LOG=/var/log/lmgrd.log
case "$1" in
start)
- lmgrd -c ${LICENSE_FILE} 2>> ${LOG} 1&gt;&2
+ lmgrd -c ${LICENSE_FILE} 2>> ${LOG} 1&gt;&amp;2
echo -n " lmgrd"
;;
stop)
- lmgrd -c ${LICENSE_FILE} -x lmdown 2>> ${LOG} 1&gt;&2
+ lmgrd -c ${LICENSE_FILE} -x lmdown 2>> ${LOG} 1&gt;&amp;2
;;
*)
- echo "Usage: `basename $0` {start|stop}" 1&gt;&2
+ echo "Usage: `basename $0` {start|stop}" 1&gt;&amp;2
exit 64
;;
esac
@@ -1005,7 +1005,7 @@ exit 0</programlisting>
volgende bevat:</para>
<programlisting>#!/compat/linux/bin/sh
-(sleep 5; killall -1 matlab_helper) &
+(sleep 5; killall -1 matlab_helper) &amp;
exit 0</programlisting>
</step>
diff --git a/nl_NL.ISO8859-1/books/handbook/mac/chapter.xml b/nl_NL.ISO8859-1/books/handbook/mac/chapter.xml
index 5bb5f2511c..03c15cd617 100644
--- a/nl_NL.ISO8859-1/books/handbook/mac/chapter.xml
+++ b/nl_NL.ISO8859-1/books/handbook/mac/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Dutch Documentation Project
diff --git a/nl_NL.ISO8859-1/books/handbook/mail/chapter.xml b/nl_NL.ISO8859-1/books/handbook/mail/chapter.xml
index 9eed229321..a3771b10d2 100644
--- a/nl_NL.ISO8859-1/books/handbook/mail/chapter.xml
+++ b/nl_NL.ISO8859-1/books/handbook/mail/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Dutch Documentation Project
@@ -1680,11 +1680,11 @@ SENDMAIL_LDADD=-lsasl2</programlisting>
volgende opdrachten uit te voeren:</para>
<screen>&prompt.root; <userinput>cd /usr/src/lib/libsmutil</userinput>
-&prompt.root; <userinput>make cleandir && make obj && make</userinput>
+&prompt.root; <userinput>make cleandir &amp;&amp; make obj &amp;&amp; make</userinput>
&prompt.root; <userinput>cd /usr/src/lib/libsm</userinput>
-&prompt.root; <userinput>make cleandir && make obj && make</userinput>
+&prompt.root; <userinput>make cleandir &amp;&amp; make obj &amp;&amp; make</userinput>
&prompt.root; <userinput>cd /usr/src/usr.sbin/sendmail</userinput>
-&prompt.root; <userinput>make cleandir && make obj && make && make install</userinput></screen>
+&prompt.root; <userinput>make cleandir &amp;&amp; make obj &amp;&amp; make &amp;&amp; make install</userinput></screen>
<para>Het compileren van <application>sendmail</application> zou
geen problemen moeten geven indien <filename>/usr/src
diff --git a/nl_NL.ISO8859-1/books/handbook/mirrors/chapter.xml b/nl_NL.ISO8859-1/books/handbook/mirrors/chapter.xml
index 039e80a11d..029b8419a9 100644
--- a/nl_NL.ISO8859-1/books/handbook/mirrors/chapter.xml
+++ b/nl_NL.ISO8859-1/books/handbook/mirrors/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Dutch Documentation Project
@@ -219,6 +219,10 @@
toegangsmogelijkheden. De toegangsmogelijkheden voor iedere site
staan tussen haakjes achter de hostnaam.</para>
+ &chap.mirrors.ftp.index.inc;
+
+ &chap.mirrors.lastmod.inc;
+
&chap.mirrors.ftp.inc;
</sect1>
@@ -2501,6 +2505,10 @@ doc/zh_*</programlisting>
<para><link linkend="cvsup">CVSup</link> servers voor &os; draaien
op de onderstaande sites.</para>
+ &chap.mirrors.cvsup.index.inc;
+
+ &chap.mirrors.lastmod.inc;
+
&chap.mirrors.cvsup.inc;
</sect2>
</sect1>
diff --git a/nl_NL.ISO8859-1/books/handbook/multimedia/chapter.xml b/nl_NL.ISO8859-1/books/handbook/multimedia/chapter.xml
index 0ca35dca51..2cd19d87df 100644
--- a/nl_NL.ISO8859-1/books/handbook/multimedia/chapter.xml
+++ b/nl_NL.ISO8859-1/books/handbook/multimedia/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Dutch Documentation Project
diff --git a/nl_NL.ISO8859-1/books/handbook/network-servers/chapter.xml b/nl_NL.ISO8859-1/books/handbook/network-servers/chapter.xml
index 69a8ed480a..694ac608bf 100644
--- a/nl_NL.ISO8859-1/books/handbook/network-servers/chapter.xml
+++ b/nl_NL.ISO8859-1/books/handbook/network-servers/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Dutch Documentation Project
diff --git a/nl_NL.ISO8859-1/books/handbook/pgpkeys/chapter.xml b/nl_NL.ISO8859-1/books/handbook/pgpkeys/chapter.xml
index 2faeed798b..1e9f173c25 100644
--- a/nl_NL.ISO8859-1/books/handbook/pgpkeys/chapter.xml
+++ b/nl_NL.ISO8859-1/books/handbook/pgpkeys/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Dutch Documentation Project
diff --git a/nl_NL.ISO8859-1/books/handbook/ports/chapter.xml b/nl_NL.ISO8859-1/books/handbook/ports/chapter.xml
index 38ce1942c6..4daa0847fe 100644
--- a/nl_NL.ISO8859-1/books/handbook/ports/chapter.xml
+++ b/nl_NL.ISO8859-1/books/handbook/ports/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The Dutch FreeBSD Documentation Project
diff --git a/nl_NL.ISO8859-1/books/handbook/ppp-and-slip/chapter.xml b/nl_NL.ISO8859-1/books/handbook/ppp-and-slip/chapter.xml
index 0c4fa54779..b287aac06f 100644
--- a/nl_NL.ISO8859-1/books/handbook/ppp-and-slip/chapter.xml
+++ b/nl_NL.ISO8859-1/books/handbook/ppp-and-slip/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Dutch Documentation Project
diff --git a/nl_NL.ISO8859-1/books/handbook/preface/preface.xml b/nl_NL.ISO8859-1/books/handbook/preface/preface.xml
index 0fded72e25..73f2767dc4 100644
--- a/nl_NL.ISO8859-1/books/handbook/preface/preface.xml
+++ b/nl_NL.ISO8859-1/books/handbook/preface/preface.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Dutch Documentation Project
diff --git a/nl_NL.ISO8859-1/books/handbook/printing/chapter.xml b/nl_NL.ISO8859-1/books/handbook/printing/chapter.xml
index 8fff06eb01..96e699b633 100644
--- a/nl_NL.ISO8859-1/books/handbook/printing/chapter.xml
+++ b/nl_NL.ISO8859-1/books/handbook/printing/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
diff --git a/nl_NL.ISO8859-1/books/handbook/security/chapter.xml b/nl_NL.ISO8859-1/books/handbook/security/chapter.xml
index d7f8384886..6241123d1a 100644
--- a/nl_NL.ISO8859-1/books/handbook/security/chapter.xml
+++ b/nl_NL.ISO8859-1/books/handbook/security/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Dutch Documentation Project
diff --git a/nl_NL.ISO8859-1/books/handbook/serialcomms/chapter.xml b/nl_NL.ISO8859-1/books/handbook/serialcomms/chapter.xml
index f5ec3d194a..9d53ed0e9e 100644
--- a/nl_NL.ISO8859-1/books/handbook/serialcomms/chapter.xml
+++ b/nl_NL.ISO8859-1/books/handbook/serialcomms/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Dutch Documentation Project
diff --git a/nl_NL.ISO8859-1/books/handbook/users/chapter.xml b/nl_NL.ISO8859-1/books/handbook/users/chapter.xml
index 308a5293af..afa449c677 100644
--- a/nl_NL.ISO8859-1/books/handbook/users/chapter.xml
+++ b/nl_NL.ISO8859-1/books/handbook/users/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Dutch Documentation Project
diff --git a/nl_NL.ISO8859-1/books/handbook/vinum/chapter.xml b/nl_NL.ISO8859-1/books/handbook/vinum/chapter.xml
index 52108874b2..c5bb64c310 100644
--- a/nl_NL.ISO8859-1/books/handbook/vinum/chapter.xml
+++ b/nl_NL.ISO8859-1/books/handbook/vinum/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
De Vinum Volume Manager
Door Greg Lehey (grog at lemis dot com)
diff --git a/nl_NL.ISO8859-1/books/handbook/virtualization/chapter.xml b/nl_NL.ISO8859-1/books/handbook/virtualization/chapter.xml
index 11344d08ff..d8b21bc6b4 100644
--- a/nl_NL.ISO8859-1/books/handbook/virtualization/chapter.xml
+++ b/nl_NL.ISO8859-1/books/handbook/virtualization/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
@@ -1033,7 +1033,7 @@ xenbr1 8000.feffffffffff no vif0.1
role="package">emulators/virtualbox-ose-additions</filename> in de
&os;-gast.</para>
- <screen>&prompt.root; <userinput>cd /usr/ports/emulators/virtualbox-ose-additions && make install clean</userinput></screen>
+ <screen>&prompt.root; <userinput>cd /usr/ports/emulators/virtualbox-ose-additions &amp;&amp; make install clean</userinput></screen>
<para>Voeg deze regels toe aan <filename>/etc/rc.conf</filename>:</para>
diff --git a/nl_NL.ISO8859-1/books/handbook/x11/chapter.xml b/nl_NL.ISO8859-1/books/handbook/x11/chapter.xml
index f05ad93fc2..12fa953e2e 100644
--- a/nl_NL.ISO8859-1/books/handbook/x11/chapter.xml
+++ b/nl_NL.ISO8859-1/books/handbook/x11/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Dutch Documentation Project
@@ -334,7 +334,7 @@
de X11 server van de open source implementatie die is uitgebracht
door de X.Org Foundation. <application>&xorg;</application> is
gebaseerd op de code van
- <application>&xfree86&nbsp;4.4RC2</application> en X11R6.6.
+ <application>&xfree86;&nbsp;4.4RC2</application> en X11R6.6.
De versie van <application>&xorg;</application> die momenteel
beschikbaar is in de &os; Portscollectie is &xorg.version;.</para>
diff --git a/nl_NL.ISO8859-1/share/xml/bibliography.xml b/nl_NL.ISO8859-1/share/xml/bibliography.xml
index 9b36d497a9..3c9729bfa5 100644
--- a/nl_NL.ISO8859-1/share/xml/bibliography.xml
+++ b/nl_NL.ISO8859-1/share/xml/bibliography.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Dutch Documentation Project
diff --git a/nl_NL.ISO8859-1/share/xml/catalog b/nl_NL.ISO8859-1/share/xml/catalog
deleted file mode 100644
index a178f14c85..0000000000
--- a/nl_NL.ISO8859-1/share/xml/catalog
+++ /dev/null
@@ -1,52 +0,0 @@
- -- ...................................................................... --
- -- FreeBSD SGML Public Identifiers ...................................... --
-
- -- $FreeBSD$ --
-
- -- %SOURCE% en_US.ISO8859-1/share/xml/catalog --
- -- %SRCID% 39534 --
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//NL"
- "entities.ent"
-
-PUBLIC "-//FreeBSD//DOCUMENT DocBook Stylesheet//EN"
- "freebsd.dsl"
-
-PUBLIC "-//FreeBSD//DOCUMENT DocBook Stylesheet//NL"
- "freebsd.dsl"
-
-PUBLIC "-//FreeBSD//DOCUMENT DocBook Language Neutral Stylesheet//NL"
- "freebsd.dsl"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//NL"
- "mailing-lists.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook Language Specific Entities//EN"
- "l10n.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//NL"
- "trademarks.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook Team Entities//NL"
- "teams.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook Newsgroup Entities//NL"
- "newsgroups.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook Glossary Entities//NL"
- "glossary.ent"
-
- -- ...................................................................... --
- -- HTML docs ............................................................ --
-
-PUBLIC "-//FreeBSD//ENTITIES FreeBSD L10N Entities//EN"
- "l10n.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES FreeBSD Release L10N Entities//EN"
- "release.l10n.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES HTML FreeBSD Header L10N Entities//EN"
- "header.l10n.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES HTML FreeBSD Navigation Bar L10N Entities//EN"
- "navibar.l10n.ent"
diff --git a/nl_NL.ISO8859-1/share/xml/catalog.xml b/nl_NL.ISO8859-1/share/xml/catalog.xml
index e131737433..97309b72b9 100644
--- a/nl_NL.ISO8859-1/share/xml/catalog.xml
+++ b/nl_NL.ISO8859-1/share/xml/catalog.xml
@@ -11,6 +11,9 @@
<rewriteURI uriStartString="http://www.FreeBSD.org/XML/www/lang/"
rewritePrefix="../../"/>
+ <public
+ publicId="-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN"
+ uri="entities.ent" />
<public publicId="-//FreeBSD//ENTITIES FreeBSD L10N Entities//EN"
uri="l10n.ent" />
<public
diff --git a/nl_NL.ISO8859-1/share/xml/entities.ent b/nl_NL.ISO8859-1/share/xml/entities.ent
index c71505e04a..d411d34cb3 100644
--- a/nl_NL.ISO8859-1/share/xml/entities.ent
+++ b/nl_NL.ISO8859-1/share/xml/entities.ent
@@ -6,27 +6,30 @@
%SRCID% 39534
-->
-<!ENTITY % man PUBLIC "-//FreeBSD//ENTITIES DocBook Manual Page Entities//EN">
-%man;
-<!ENTITY % freebsd PUBLIC "-//FreeBSD//ENTITIES DocBook Miscellaneous FreeBSD Entities//EN">
+<!ENTITY % freebsd PUBLIC "-//FreeBSD//ENTITIES DocBook Miscellaneous FreeBSD Entities//EN"
+ "nonexistent">
%freebsd;
-<!ENTITY % authors PUBLIC "-//FreeBSD//ENTITIES DocBook Author Entities//EN">
-%authors;
-<!ENTITY % teams PUBLIC "-//FreeBSD//ENTITIES DocBook Team Entities//NL">
+<!ENTITY % teams PUBLIC "-//FreeBSD//ENTITIES DocBook Team Entities//NL"
+ "teams.ent">
%teams;
-<!ENTITY % mailing-lists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//NL">
+<!ENTITY % mailing-lists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//NL"
+ "mailing-lists.ent">
%mailing-lists;
-<!ENTITY % newsgroups PUBLIC "-//FreeBSD//ENTITIES DocBook Newsgroup Entities//NL">
+<!ENTITY % newsgroups PUBLIC "-//FreeBSD//ENTITIES DocBook Newsgroup Entities//NL"
+ "newsgroups.ent">
%newsgroups;
-<!ENTITY % trademarks PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//NL">
+<!ENTITY % trademarks PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//NL"
+ "trademarks.ent">
%trademarks;
-<!ENTITY % trademarks-en PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//EN">
+<!ENTITY % trademarks-en PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//EN"
+ "nonexistent">
%trademarks-en;
-<!ENTITY % urls PUBLIC "-//FreeBSD//ENTITIES DocBook URL Entities//EN">
+<!ENTITY % urls PUBLIC "-//FreeBSD//ENTITIES DocBook URL Entities//EN"
+ "nonexistent">
%urls;
-<!ENTITY % l10n PUBLIC "-//FreeBSD//ENTITIES DocBook Language Specific Entities//EN">
+<!ENTITY % l10n PUBLIC "-//FreeBSD//ENTITIES DocBook Language Specific Entities//EN"
+ "l10n.ent">
%l10n;
-<!ENTITY % l10n-common PUBLIC "-//FreeBSD//ENTITIES DocBook Language Neutral Entities//EN">
-%l10n-common;
-<!ENTITY % glossary PUBLIC "-//FreeBSD//ENTITIES DocBook Glossary Entities//NL">
+<!ENTITY % glossary PUBLIC "-//FreeBSD//ENTITIES DocBook Glossary Entities//NL"
+ "glossary.ent">
%glossary;
diff --git a/nl_NL.ISO8859-1/share/xml/glossary.ent b/nl_NL.ISO8859-1/share/xml/glossary.ent
index 7f0b1edfc9..ba94e26b02 100644
--- a/nl_NL.ISO8859-1/share/xml/glossary.ent
+++ b/nl_NL.ISO8859-1/share/xml/glossary.ent
@@ -1111,7 +1111,7 @@
</glossterm>
<acronym>MFS</acronym>
<glossdef subject="FreeBSD">
- <para>In het &os ontwikkelproces wordt een wijziging gecommit
+ <para>In het &os; ontwikkelproces wordt een wijziging gecommit
in de -CURRENT tak om deze te testen voordat deze wordt
samengevoegd naar -STABLE. In bijzondere gevallen gaat een
wijziging eerst naar -STABLE en wordt dan pas samengevoegd
diff --git a/nl_NL.ISO8859-1/share/xml/l10n.ent b/nl_NL.ISO8859-1/share/xml/l10n.ent
index 6db02c97cd..961f04f440 100644
--- a/nl_NL.ISO8859-1/share/xml/l10n.ent
+++ b/nl_NL.ISO8859-1/share/xml/l10n.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
<!-- -*- sgml -*-
DocBook Language Specific Entities for Localization (nl).
diff --git a/nl_NL.ISO8859-1/share/xml/mailing-lists.ent b/nl_NL.ISO8859-1/share/xml/mailing-lists.ent
index 8c923f00ae..ad01e2a9c7 100644
--- a/nl_NL.ISO8859-1/share/xml/mailing-lists.ent
+++ b/nl_NL.ISO8859-1/share/xml/mailing-lists.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
Namen van FreeBSD mailinglijsten en gerelateerde software.
diff --git a/nl_NL.ISO8859-1/share/xml/mirrors-local.xsl b/nl_NL.ISO8859-1/share/xml/mirrors-local.xsl
index f28a650665..2f1c293038 100644
--- a/nl_NL.ISO8859-1/share/xml/mirrors-local.xsl
+++ b/nl_NL.ISO8859-1/share/xml/mirrors-local.xsl
@@ -11,7 +11,6 @@
<xsl:import href="../../../share/xml/mirrors-master.xsl" />
<xsl:output type="xml" encoding="iso-8859-1"
- omit-xml-declaration="yes"
indent="yes"/>
<!-- these params should be externally bound. The values
diff --git a/nl_NL.ISO8859-1/share/xml/newsgroups.ent b/nl_NL.ISO8859-1/share/xml/newsgroups.ent
index e18e8d626c..a7006af3ea 100644
--- a/nl_NL.ISO8859-1/share/xml/newsgroups.ent
+++ b/nl_NL.ISO8859-1/share/xml/newsgroups.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Dutch Documentation Project
Namen van FreeBSD newsgroepen
diff --git a/nl_NL.ISO8859-1/share/xml/teams.ent b/nl_NL.ISO8859-1/share/xml/teams.ent
index 8df6d4f4eb..1b762236f8 100644
--- a/nl_NL.ISO8859-1/share/xml/teams.ent
+++ b/nl_NL.ISO8859-1/share/xml/teams.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Dutch Documentation Project
diff --git a/nl_NL.ISO8859-1/share/xml/trademarks.ent b/nl_NL.ISO8859-1/share/xml/trademarks.ent
index a2979f6d53..45842d500e 100644
--- a/nl_NL.ISO8859-1/share/xml/trademarks.ent
+++ b/nl_NL.ISO8859-1/share/xml/trademarks.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
Legenda van handelsmerken, zoals vereist door The Open Group, Sun,
enzovoorts.
diff --git a/nl_NL.ISO8859-1/share/xml/translators.ent b/nl_NL.ISO8859-1/share/xml/translators.ent
index 99c1c391e0..b250b910c6 100644
--- a/nl_NL.ISO8859-1/share/xml/translators.ent
+++ b/nl_NL.ISO8859-1/share/xml/translators.ent
@@ -1,5 +1,5 @@
-<!--
- The FreeBSD Documentation Project
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!-- The FreeBSD Documentation Project
Nederlandse vertalers
$FreeBSD$
diff --git a/no_NO.ISO8859-1/books/handbook/basics/chapter.xml b/no_NO.ISO8859-1/books/handbook/basics/chapter.xml
index 5a1592b351..1aa2e9a6f3 100644
--- a/no_NO.ISO8859-1/books/handbook/basics/chapter.xml
+++ b/no_NO.ISO8859-1/books/handbook/basics/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
diff --git a/no_NO.ISO8859-1/books/handbook/bibliography/chapter.xml b/no_NO.ISO8859-1/books/handbook/bibliography/chapter.xml
index 4dbe929258..f9cc93e36d 100644
--- a/no_NO.ISO8859-1/books/handbook/bibliography/chapter.xml
+++ b/no_NO.ISO8859-1/books/handbook/bibliography/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The Norwegian FreeBSD Documentation Project
diff --git a/no_NO.ISO8859-1/books/handbook/install/chapter.xml b/no_NO.ISO8859-1/books/handbook/install/chapter.xml
index 46c468a67d..2e759a3ef0 100644
--- a/no_NO.ISO8859-1/books/handbook/install/chapter.xml
+++ b/no_NO.ISO8859-1/books/handbook/install/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The Norwegian FreeBSD Documentation Project
diff --git a/pl_PL.ISO8859-2/articles/filtering-bridges/article.xml b/pl_PL.ISO8859-2/articles/filtering-bridges/article.xml
index c4659893b7..2e7e0509ec 100644
--- a/pl_PL.ISO8859-2/articles/filtering-bridges/article.xml
+++ b/pl_PL.ISO8859-2/articles/filtering-bridges/article.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-2" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//PL" "../../share/xml/entities.ent">
-%entities;
-]>
+<?xml version="1.0" encoding="iso-8859-2"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<!--
The FreeBSD Polish Documentation Project
diff --git a/pl_PL.ISO8859-2/articles/new-users/article.xml b/pl_PL.ISO8859-2/articles/new-users/article.xml
index baa0b148b9..a74c6568af 100644
--- a/pl_PL.ISO8859-2/articles/new-users/article.xml
+++ b/pl_PL.ISO8859-2/articles/new-users/article.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-2" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//PL" "../../share/xml/entities.ent">
-%entities;
-]>
+<?xml version="1.0" encoding="iso-8859-2"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<!--
The FreeBSD Polish Documentation Project
diff --git a/pl_PL.ISO8859-2/books/handbook/Makefile b/pl_PL.ISO8859-2/books/handbook/Makefile
index 8dab766f92..5d124e69b0 100644
--- a/pl_PL.ISO8859-2/books/handbook/Makefile
+++ b/pl_PL.ISO8859-2/books/handbook/Makefile
@@ -216,30 +216,43 @@ DOC_PREFIX?= ${.CURDIR}/../../..
#
# rules generating lists of mirror site from XML database.
#
-XMLDOCS= mirrors-ftp:::mirrors.xml.ftp.inc \
+XMLDOCS= lastmod:::mirrors.lastmod.inc \
+ mirrors-ftp-index:::mirrors.xml.ftp.index.inc \
+ mirrors-ftp:::mirrors.xml.ftp.inc \
+ mirrors-cvsup-index:::mirrors.xml.cvsup.index.inc \
mirrors-cvsup:::mirrors.xml.cvsup.inc \
+ eresources-index:::eresources.xml.www.index.inc \
eresources:::eresources.xml.www.inc
DEPENDSET.DEFAULT= transtable mirror
XSLT.DEFAULT= ${XSL_MIRRORS}
XML.DEFAULT= ${XML_MIRRORS}
-NO_TIDY.DEFAULT= yes
+PARAMS.lastmod+= --param 'target' "'lastmod'"
+PARAMS.mirrors-ftp-index+= --param 'type' "'ftp'" \
+ --param 'proto' "'ftp'" \
+ --param 'target' "'index'"
PARAMS.mirrors-ftp+= --param 'type' "'ftp'" \
--param 'proto' "'ftp'" \
--param 'target' "'handbook/mirrors/chapter.xml'"
+PARAMS.mirrors-cvsup-index+= --param 'type' "'cvsup'" \
+ --param 'proto' "'cvsup'" \
+ --param 'target' "'index'"
PARAMS.mirrors-cvsup+= --param 'type' "'cvsup'" \
--param 'proto' "'cvsup'" \
--param 'target' "'handbook/mirrors/chapter.xml'"
+PARAMS.eresources-index+= --param 'type' "'www'" \
+ --param 'proto' "'http'" \
+ --param 'target' "'index'"
PARAMS.eresources+= --param 'type' "'www'" \
--param 'proto' "'http'" \
--param 'target' "'handbook/eresources/chapter.xml'"
-SRCS+= mirrors.xml.ftp.inc \
+SRCS+= mirrors.lastmod.inc \
+ mirrors.xml.ftp.inc \
+ mirrors.xml.ftp.index.inc \
mirrors.xml.cvsup.inc \
- eresources.xml.www.inc
-
-CLEANFILES+= mirrors.xml.ftp.inc \
- mirrors.xml.cvsup.inc \
- eresources.xml.www.inc
+ mirrors.xml.cvsup.index.inc \
+ eresources.xml.www.inc \
+ eresources.xml.www.index.inc
.include "${DOC_PREFIX}/share/mk/doc.project.mk"
diff --git a/pl_PL.ISO8859-2/books/handbook/advanced-networking/chapter.xml b/pl_PL.ISO8859-2/books/handbook/advanced-networking/chapter.xml
index bbced0dcd9..c23d4afc19 100644
--- a/pl_PL.ISO8859-2/books/handbook/advanced-networking/chapter.xml
+++ b/pl_PL.ISO8859-2/books/handbook/advanced-networking/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-2" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-2"?>
<!--
The FreeBSD Documentation Project
diff --git a/pl_PL.ISO8859-2/books/handbook/audit/chapter.xml b/pl_PL.ISO8859-2/books/handbook/audit/chapter.xml
index 8cfdba4c90..13aa55147a 100644
--- a/pl_PL.ISO8859-2/books/handbook/audit/chapter.xml
+++ b/pl_PL.ISO8859-2/books/handbook/audit/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-2" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-2"?>
<!--
The FreeBSD Documentation Project
$FreeBSD$
diff --git a/pl_PL.ISO8859-2/books/handbook/basics/chapter.xml b/pl_PL.ISO8859-2/books/handbook/basics/chapter.xml
index 8176f59732..e78b35b459 100644
--- a/pl_PL.ISO8859-2/books/handbook/basics/chapter.xml
+++ b/pl_PL.ISO8859-2/books/handbook/basics/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-2" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-2"?>
<!--
The FreeBSD Polish Documentation Project
diff --git a/pl_PL.ISO8859-2/books/handbook/bibliography/chapter.xml b/pl_PL.ISO8859-2/books/handbook/bibliography/chapter.xml
index dbb1322f7b..bc55531844 100644
--- a/pl_PL.ISO8859-2/books/handbook/bibliography/chapter.xml
+++ b/pl_PL.ISO8859-2/books/handbook/bibliography/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-2" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-2"?>
<!--
The FreeBSD Polish Documentation Project
diff --git a/pl_PL.ISO8859-2/books/handbook/book.xml b/pl_PL.ISO8859-2/books/handbook/book.xml
index ca90ff2ae6..292606aca6 100644
--- a/pl_PL.ISO8859-2/books/handbook/book.xml
+++ b/pl_PL.ISO8859-2/books/handbook/book.xml
@@ -1,8 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-2" standalone="no"?>
-<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//PL" "../../share/xml/entities.ent">
-%entities;
+<?xml version="1.0" encoding="iso-8859-2"?>
+<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd" [
<!ENTITY % chapters SYSTEM "chapters.ent">
%chapters;
<!ENTITY % txtfiles SYSTEM "txtfiles.ent">
diff --git a/pl_PL.ISO8859-2/books/handbook/boot/chapter.xml b/pl_PL.ISO8859-2/books/handbook/boot/chapter.xml
index 039c55b245..96f10dce02 100644
--- a/pl_PL.ISO8859-2/books/handbook/boot/chapter.xml
+++ b/pl_PL.ISO8859-2/books/handbook/boot/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-2" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-2"?>
<!--
The FreeBSD Documentation Project
diff --git a/pl_PL.ISO8859-2/books/handbook/chapters.ent b/pl_PL.ISO8859-2/books/handbook/chapters.ent
index 9740b42942..ce6215bb29 100644
--- a/pl_PL.ISO8859-2/books/handbook/chapters.ent
+++ b/pl_PL.ISO8859-2/books/handbook/chapters.ent
@@ -11,228 +11,60 @@
Original revision: 1.35
-->
-<!ENTITY % not.published "INCLUDE">
-
-<!ENTITY % chap.introduction "IGNORE">
-<!ENTITY % chap.install "IGNORE">
-<!ENTITY % chap.basics "IGNORE">
-<!ENTITY % chap.ports "IGNORE">
-<!ENTITY % chap.config "IGNORE">
-<!ENTITY % chap.boot "IGNORE">
-<!ENTITY % chap.users "IGNORE">
-<!ENTITY % chap.kernelconfig "IGNORE">
-<!ENTITY % chap.security "IGNORE">
-<!ENTITY % chap.jails "IGNORE">
-<!ENTITY % chap.printing "IGNORE">
-<!ENTITY % chap.disks "IGNORE">
-<!ENTITY % chap.geom "IGNORE">
-<!ENTITY % chap.vinum "IGNORE">
-<!ENTITY % chap.x11 "IGNORE">
-<!ENTITY % chap.l10n "IGNORE">
-<!ENTITY % chap.multimedia "IGNORE">
-<!ENTITY % chap.desktop "IGNORE">
-<!ENTITY % chap.serialcomms "IGNORE">
-<!ENTITY % chap.ppp-and-slip "IGNORE">
-<!ENTITY % chap.advanced-networking "IGNORE">
-<!ENTITY % chap.firewalls "IGNORE">
-<!ENTITY % chap.network-servers "IGNORE">
-<!ENTITY % chap.mail "IGNORE">
-<!ENTITY % chap.cutting-edge "IGNORE">
-<!ENTITY % chap.linuxemu "IGNORE">
-<!ENTITY % chap.mirrors "IGNORE">
-<!ENTITY % chap.mirrors.ftp.inc "INCLUDE">
-<!ENTITY % chap.mirrors.cvsup.inc "INCLUDE">
-<!ENTITY % chap.bibliography "IGNORE">
-<!ENTITY % chap.eresources "IGNORE">
-<!ENTITY % chap.eresources.www.inc "INCLUDE">
-<!ENTITY % chap.pgpkeys "IGNORE">
-<!ENTITY % chap.index "IGNORE">
-<!ENTITY % chap.freebsd-glossary "IGNORE">
-<!ENTITY % chap.mac "IGNORE">
-<!ENTITY % chap.audit "IGNORE">
-<!ENTITY % chap.filesystems "IGNORE">
-<!ENTITY % chap.dtrace "IGNORE">
-
<!ENTITY chap.preface SYSTEM "preface/preface.xml">
<!ENTITY % pgpkeys SYSTEM "../../../share/pgpkeys/pgpkeys.ent"> %pgpkeys;
<!-- Part One -->
-<![%chap.introduction;[
<!ENTITY chap.introduction SYSTEM "introduction/chapter.xml">
-]]>
-<![%chap.install;[
<!ENTITY chap.install SYSTEM "install/chapter.xml">
-]]>
-<![%chap.basics;[
<!ENTITY chap.basics SYSTEM "basics/chapter.xml">
-]]>
-<![%chap.ports;[
<!ENTITY chap.ports SYSTEM "ports/chapter.xml">
-]]>
-<![%chap.x11;[
<!ENTITY chap.x11 SYSTEM "x11/chapter.xml">
-]]>
<!-- Part Two -->
-<![%chap.desktop;[
<!ENTITY chap.desktop SYSTEM "desktop/chapter.xml">
-]]>
-<![%chap.multimedia;[
<!ENTITY chap.multimedia SYSTEM "multimedia/chapter.xml">
-]]>
-<![%chap.kernelconfig;[
<!ENTITY chap.kernelconfig SYSTEM "kernelconfig/chapter.xml">
-]]>
-<![%chap.printing;[
<!ENTITY chap.printing SYSTEM "printing/chapter.xml">
-]]>
-<![%chap.linuxemu;[
<!ENTITY chap.linuxemu SYSTEM "linuxemu/chapter.xml">
-]]>
<!-- Part Three -->
-<![%chap.config;[
<!ENTITY chap.config SYSTEM "config/chapter.xml">
-]]>
-<![%chap.boot;[
<!ENTITY chap.boot SYSTEM "boot/chapter.xml">
-]]>
-<![%chap.users;[
<!ENTITY chap.users SYSTEM "users/chapter.xml">
-]]>
-<![%chap.security;[
<!ENTITY chap.security SYSTEM "security/chapter.xml">
-]]>
-<![%chap.jails;[
<!ENTITY chap.jails SYSTEM "jails/chapter.xml">
-]]>
-<![%chap.mac;[
<!ENTITY chap.mac SYSTEM "mac/chapter.xml">
-]]>
-<![%chap.audit;[
<!ENTITY chap.audit SYSTEM "audit/chapter.xml">
-]]>
-<![%chap.disks;[
<!ENTITY chap.disks SYSTEM "disks/chapter.xml">
-]]>
-<![%chap.geom;[
<!ENTITY chap.geom SYSTEM "geom/chapter.xml">
-]]>
-<![%chap.filesystems;[
<!ENTITY chap.filesystems SYSTEM "filesystems/chapter.xml">
-]]>
-<![%chap.vinum;[
<!ENTITY chap.vinum SYSTEM "vinum/chapter.xml">
-]]>
-<![%chap.l10n;[
<!ENTITY chap.l10n SYSTEM "l10n/chapter.xml">
-]]>
-<![%chap.cutting-edge;[
<!ENTITY chap.cutting-edge SYSTEM "cutting-edge/chapter.xml">
-]]>
-<![%chap.dtrace;[
<!ENTITY chap.dtrace SYSTEM "dtrace/chapter.xml">
-]]>
<!-- Part Four -->
-<![%chap.serialcomms;[
<!ENTITY chap.serialcomms SYSTEM "serialcomms/chapter.xml">
-]]>
-<![%chap.ppp-and-slip;[
<!ENTITY chap.ppp-and-slip SYSTEM "ppp-and-slip/chapter.xml">
-]]>
-<![%chap.mail;[
<!ENTITY chap.mail SYSTEM "mail/chapter.xml">
-]]>
-<![%chap.network-servers;[
<!ENTITY chap.network-servers SYSTEM "network-servers/chapter.xml">
-]]>
-<![%chap.firewalls;[
<!ENTITY chap.firewalls SYSTEM "firewalls/chapter.xml">
-]]>
-<![%chap.advanced-networking;[
<!ENTITY chap.advanced-networking SYSTEM "advanced-networking/chapter.xml">
-]]>
<!-- Part Five (appendices) -->
-<![%chap.mirrors;[
<!ENTITY chap.mirrors SYSTEM "mirrors/chapter.xml">
-]]>
-<![%chap.mirrors.ftp.inc;[
+ <!ENTITY chap.mirrors.lastmod.inc SYSTEM "mirrors.lastmod.inc">
+ <!ENTITY chap.mirrors.ftp.index.inc SYSTEM "mirrors.xml.ftp.index.inc">
<!ENTITY chap.mirrors.ftp.inc SYSTEM "mirrors.xml.ftp.inc">
-]]>
-<![%chap.mirrors.cvsup.inc;[
+ <!ENTITY chap.mirrors.cvsup.index.inc SYSTEM "mirrors.xml.cvsup.index.inc">
<!ENTITY chap.mirrors.cvsup.inc SYSTEM "mirrors.xml.cvsup.inc">
-]]>
-<![%chap.bibliography;[
<!ENTITY chap.bibliography SYSTEM "bibliography/chapter.xml">
-]]>
-<![%chap.eresources;[
<!ENTITY chap.eresources SYSTEM "eresources/chapter.xml">
-]]>
-<![%chap.eresources.www.inc;[
+ <!ENTITY chap.eresources.www.index.inc SYSTEM "eresources.xml.www.index.inc">
<!ENTITY chap.eresources.www.inc SYSTEM "eresources.xml.www.inc">
-]]>
-<![%chap.pgpkeys;[
<!ENTITY chap.pgpkeys SYSTEM "pgpkeys/chapter.xml">
-]]>
-<![%chap.freebsd-glossary;[
<!ENTITY chap.freebsd-glossary "&freebsd-glossary;">
-]]>
-<![%chap.index;[
- <!ENTITY chap.index SYSTEM "index.xml">
-]]>
+ <!ENTITY chap.index "">
<!ENTITY chap.colophon SYSTEM "colophon.xml">
-
-<!-- IGNORE cases -->
-
-<!-- Part One -->
-<!ENTITY chap.introduction "">
-<!ENTITY chap.install "">
-<!ENTITY chap.basics "">
-<!ENTITY chap.ports "">
-<!ENTITY chap.x11 "">
-
-<!-- Part Two -->
-<!ENTITY chap.desktop "">
-<!ENTITY chap.multimedia "">
-<!ENTITY chap.kernelconfig "">
-<!ENTITY chap.printing "">
-<!ENTITY chap.linuxemu "">
-
-<!-- Part Three -->
-<!ENTITY chap.config "">
-<!ENTITY chap.boot "">
-<!ENTITY chap.users "">
-<!ENTITY chap.security "">
-<!ENTITY chap.jails "">
-<!ENTITY chap.mac "">
-<!ENTITY chap.audit "">
-<!ENTITY chap.disks "">
-<!ENTITY chap.geom "">
-<!ENTITY chap.filesystems "">
-<!ENTITY chap.vinum "">
-<!ENTITY chap.virtualization "">
-<!ENTITY chap.l10n "">
-<!ENTITY chap.cutting-edge "">
-<!ENTITY chap.dtrace "">
-
-<!-- Part Four -->
-<!ENTITY chap.serialcomms "">
-<!ENTITY chap.ppp-and-slip "">
-<!ENTITY chap.mail "">
-<!ENTITY chap.network-servers "">
-<!ENTITY chap.firewalls "">
-<!ENTITY chap.advanced-networking "">
-
-<!-- Part Five (appendices) -->
-<!ENTITY chap.mirrors "">
-<!ENTITY chap.mirrors.ftp.inc "">
-<!ENTITY chap.mirrors.cvsup.inc "">
-<!ENTITY chap.bibliography "">
-<!ENTITY chap.eresources "">
-<!ENTITY chap.eresources.www.inc "">
-<!ENTITY chap.pgpkeys "">
-<!ENTITY chap.freebsd-glossary "">
-<!ENTITY chap.index "">
diff --git a/pl_PL.ISO8859-2/books/handbook/colophon.xml b/pl_PL.ISO8859-2/books/handbook/colophon.xml
index 23748e9c2c..b929981a7f 100644
--- a/pl_PL.ISO8859-2/books/handbook/colophon.xml
+++ b/pl_PL.ISO8859-2/books/handbook/colophon.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-2" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-2"?>
<!--
The FreeBSD Polish Documentation Project
diff --git a/pl_PL.ISO8859-2/books/handbook/config/chapter.xml b/pl_PL.ISO8859-2/books/handbook/config/chapter.xml
index 282b0899c3..4825f473e0 100644
--- a/pl_PL.ISO8859-2/books/handbook/config/chapter.xml
+++ b/pl_PL.ISO8859-2/books/handbook/config/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-2" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-2"?>
<!--
The FreeBSD Documentation Project
@@ -390,7 +390,7 @@ stop)
kill -9 `cat /var/run/utility.pid`
;;
*)
- echo "Usage: `basename $0` {start|stop}" &gt;&2
+ echo "Usage: `basename $0` {start|stop}" &gt;&amp;2
exit 64
;;
esac
diff --git a/pl_PL.ISO8859-2/books/handbook/cutting-edge/chapter.xml b/pl_PL.ISO8859-2/books/handbook/cutting-edge/chapter.xml
index ae57257815..4e6c02ba0f 100644
--- a/pl_PL.ISO8859-2/books/handbook/cutting-edge/chapter.xml
+++ b/pl_PL.ISO8859-2/books/handbook/cutting-edge/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-2" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-2"?>
<!--
The FreeBSD Documentation Project
diff --git a/pl_PL.ISO8859-2/books/handbook/desktop/chapter.xml b/pl_PL.ISO8859-2/books/handbook/desktop/chapter.xml
index 800bb11499..a46516e736 100644
--- a/pl_PL.ISO8859-2/books/handbook/desktop/chapter.xml
+++ b/pl_PL.ISO8859-2/books/handbook/desktop/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-2" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-2"?>
<!--
The FreeBSD Polish Documentation Project
@@ -327,12 +327,12 @@
<screen>&prompt.root; <userinput>cd /usr/src</userinput>
&prompt.root; <userinput>fetch http://people.FreeBSD.org/~nork/rtld_dlsym_hack.diff</userinput>
-&prompt.root; <userinput>patch < rtld_dlsym_hack.diff</userinput>
+&prompt.root; <userinput>patch &lt; rtld_dlsym_hack.diff</userinput>
&prompt.root; <userinput>cd libexec/rtld-elf/</userinput>
&prompt.root; <userinput>make clean</userinput>
&prompt.root; <userinput>make obj</userinput>
&prompt.root; <userinput>make depend</userinput>
-&prompt.root; <userinput>make && make install</userinput></screen>
+&prompt.root; <userinput>make &amp;&amp; make install</userinput></screen>
<para>Po czym musimy ponownie uruchomi komputer.</para>
diff --git a/pl_PL.ISO8859-2/books/handbook/disks/chapter.xml b/pl_PL.ISO8859-2/books/handbook/disks/chapter.xml
index 5726735f6a..041ae3ebb2 100644
--- a/pl_PL.ISO8859-2/books/handbook/disks/chapter.xml
+++ b/pl_PL.ISO8859-2/books/handbook/disks/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-2" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-2"?>
<!--
The FreeBSD Documentation Project
@@ -2601,7 +2601,7 @@ sa0(ncr1:4:0): Logical unit is in process of becoming ready</screen>
<example>
<title>A Script for Creating a Bootable Floppy</title>
- <programlisting><![ CDATA [#!/bin/sh
+ <programlisting><![CDATA[#!/bin/sh
#
# create a restore floppy
#
@@ -2813,16 +2813,6 @@ echo "The floppy has been unmounted and is now ready."]]></programlisting>
Whatever caused the crash or data loss may strike again. Another
hour spent now may save you from further distress later.</para>
</sect3>
-
-<![ %not.published; [
-
- <sect3>
- <title>* I Did Not Prepare for the Disaster, What Now?</title>
-
- <para></para>
- </sect3>
-]]>
-
</sect2>
</sect1>
diff --git a/pl_PL.ISO8859-2/books/handbook/eresources/chapter.xml b/pl_PL.ISO8859-2/books/handbook/eresources/chapter.xml
index 0133045012..2997cbc32f 100644
--- a/pl_PL.ISO8859-2/books/handbook/eresources/chapter.xml
+++ b/pl_PL.ISO8859-2/books/handbook/eresources/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-2" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-2"?>
<!--
The FreeBSD Documentation Project
@@ -1703,6 +1703,10 @@
<sect1 id="eresources-web">
<title>World Wide Web Servers</title>
+ &chap.eresources.www.index.inc;
+
+ &chap.mirrors.lastmod.inc;
+
&chap.eresources.www.inc;
</sect1>
diff --git a/pl_PL.ISO8859-2/books/handbook/firewalls/chapter.xml b/pl_PL.ISO8859-2/books/handbook/firewalls/chapter.xml
index ee46955977..29bf44fccc 100644
--- a/pl_PL.ISO8859-2/books/handbook/firewalls/chapter.xml
+++ b/pl_PL.ISO8859-2/books/handbook/firewalls/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-2" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-2"?>
<!--
The FreeBSD Documentation Project
diff --git a/pl_PL.ISO8859-2/books/handbook/geom/chapter.xml b/pl_PL.ISO8859-2/books/handbook/geom/chapter.xml
index 6d4721e2e4..2026d043cc 100644
--- a/pl_PL.ISO8859-2/books/handbook/geom/chapter.xml
+++ b/pl_PL.ISO8859-2/books/handbook/geom/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-2" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-2"?>
<!--
The FreeBSD Documentation Project
$FreeBSD$
diff --git a/pl_PL.ISO8859-2/books/handbook/install/chapter.xml b/pl_PL.ISO8859-2/books/handbook/install/chapter.xml
index 3dada36626..c1d716fc30 100644
--- a/pl_PL.ISO8859-2/books/handbook/install/chapter.xml
+++ b/pl_PL.ISO8859-2/books/handbook/install/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-2" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-2"?>
<!--
The FreeBSD Polish Documentation Project
diff --git a/pl_PL.ISO8859-2/books/handbook/introduction/chapter.xml b/pl_PL.ISO8859-2/books/handbook/introduction/chapter.xml
index 69aa7e1cb6..d9be249892 100644
--- a/pl_PL.ISO8859-2/books/handbook/introduction/chapter.xml
+++ b/pl_PL.ISO8859-2/books/handbook/introduction/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-2" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-2"?>
<!--
The FreeBSD Polish Documentation Project
diff --git a/pl_PL.ISO8859-2/books/handbook/kernelconfig/chapter.xml b/pl_PL.ISO8859-2/books/handbook/kernelconfig/chapter.xml
index 6c768df12f..913853c9d6 100644
--- a/pl_PL.ISO8859-2/books/handbook/kernelconfig/chapter.xml
+++ b/pl_PL.ISO8859-2/books/handbook/kernelconfig/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-2" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-2"?>
<!--
The FreeBSD Polish Documentation Project
diff --git a/pl_PL.ISO8859-2/books/handbook/l10n/chapter.xml b/pl_PL.ISO8859-2/books/handbook/l10n/chapter.xml
index ff6c476814..6236701373 100644
--- a/pl_PL.ISO8859-2/books/handbook/l10n/chapter.xml
+++ b/pl_PL.ISO8859-2/books/handbook/l10n/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-2" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-2"?>
<!--
The FreeBSD Documentation Project
diff --git a/pl_PL.ISO8859-2/books/handbook/linuxemu/chapter.xml b/pl_PL.ISO8859-2/books/handbook/linuxemu/chapter.xml
index ca61fabcea..9dd6a53a67 100644
--- a/pl_PL.ISO8859-2/books/handbook/linuxemu/chapter.xml
+++ b/pl_PL.ISO8859-2/books/handbook/linuxemu/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-2" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-2"?>
<!--
The FreeBSD Documentation Project
@@ -615,14 +615,14 @@ LOG=/var/log/lmgrd.log
case "$1" in
start)
- lmgrd -c ${LICENSE_FILE} 2&gt;&gt; ${LOG} 1&gt;&2
+ lmgrd -c ${LICENSE_FILE} 2&gt;&gt; ${LOG} 1&gt;&amp;2
echo -n " lmgrd"
;;
stop)
- lmgrd -c ${LICENSE_FILE} -x lmdown 2&gt;&gt; ${LOG} 1&gt;&2
+ lmgrd -c ${LICENSE_FILE} -x lmdown 2&gt;&gt; ${LOG} 1&gt;&amp;2
;;
*)
- echo "Usage: `basename $0` {start|stop}" 1&gt;&2
+ echo "Usage: `basename $0` {start|stop}" 1&gt;&amp;2
exit 64
;;
esac
@@ -901,7 +901,7 @@ exit 0</programlisting>
contain the following:</para>
<programlisting>#!/usr/compat/linux/bin/sh
-(sleep 5; killall -1 matlab_helper) &
+(sleep 5; killall -1 matlab_helper) &amp;
exit 0</programlisting>
</step>
diff --git a/pl_PL.ISO8859-2/books/handbook/mac/chapter.xml b/pl_PL.ISO8859-2/books/handbook/mac/chapter.xml
index bdda4845cb..d3f4e3c17c 100644
--- a/pl_PL.ISO8859-2/books/handbook/mac/chapter.xml
+++ b/pl_PL.ISO8859-2/books/handbook/mac/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-2" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-2"?>
<!--
The FreeBSD Documentation Project
$FreeBSD$
diff --git a/pl_PL.ISO8859-2/books/handbook/mail/chapter.xml b/pl_PL.ISO8859-2/books/handbook/mail/chapter.xml
index 9822ff76a6..e051dc67aa 100644
--- a/pl_PL.ISO8859-2/books/handbook/mail/chapter.xml
+++ b/pl_PL.ISO8859-2/books/handbook/mail/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-2" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-2"?>
<!--
The FreeBSD Documentation Project
diff --git a/pl_PL.ISO8859-2/books/handbook/mirrors/chapter.xml b/pl_PL.ISO8859-2/books/handbook/mirrors/chapter.xml
index 91da938cf3..6bdc9ae856 100644
--- a/pl_PL.ISO8859-2/books/handbook/mirrors/chapter.xml
+++ b/pl_PL.ISO8859-2/books/handbook/mirrors/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-2" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-2"?>
<!--
The FreeBSD Documentation Project
@@ -273,6 +273,10 @@
methods available for each site are provided in parentheses
after the hostname.</para>
+ &chap.mirrors.ftp.index.inc;
+
+ &chap.mirrors.lastmod.inc;
+
&chap.mirrors.ftp.inc;
</sect1>
@@ -2326,6 +2330,10 @@ doc/zh_*</screen>
<para><link linkend="cvsup">CVSup</link> servers for FreeBSD are running
at the following sites:</para>
+ &chap.mirrors.cvsup.index.inc;
+
+ &chap.mirrors.lastmod.inc;
+
&chap.mirrors.cvsup.inc;
</sect2>
</sect1>
diff --git a/pl_PL.ISO8859-2/books/handbook/multimedia/chapter.xml b/pl_PL.ISO8859-2/books/handbook/multimedia/chapter.xml
index 93d2cb6ee2..de21e19deb 100644
--- a/pl_PL.ISO8859-2/books/handbook/multimedia/chapter.xml
+++ b/pl_PL.ISO8859-2/books/handbook/multimedia/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-2" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-2"?>
<!--
The FreeBSD Documentation Project
diff --git a/pl_PL.ISO8859-2/books/handbook/network-servers/chapter.xml b/pl_PL.ISO8859-2/books/handbook/network-servers/chapter.xml
index 89e7013096..c73e199a9b 100644
--- a/pl_PL.ISO8859-2/books/handbook/network-servers/chapter.xml
+++ b/pl_PL.ISO8859-2/books/handbook/network-servers/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-2" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-2"?>
<!--
The FreeBSD Documentation Project
diff --git a/pl_PL.ISO8859-2/books/handbook/pgpkeys/chapter.xml b/pl_PL.ISO8859-2/books/handbook/pgpkeys/chapter.xml
index 35b33145a9..56fa76c07f 100644
--- a/pl_PL.ISO8859-2/books/handbook/pgpkeys/chapter.xml
+++ b/pl_PL.ISO8859-2/books/handbook/pgpkeys/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-2" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-2"?>
<!--
The FreeBSD Documentation Project
diff --git a/pl_PL.ISO8859-2/books/handbook/ports/chapter.xml b/pl_PL.ISO8859-2/books/handbook/ports/chapter.xml
index a541195139..89624bf757 100644
--- a/pl_PL.ISO8859-2/books/handbook/ports/chapter.xml
+++ b/pl_PL.ISO8859-2/books/handbook/ports/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-2" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-2"?>
<!--
The FreeBSD Polish Documentation Project
diff --git a/pl_PL.ISO8859-2/books/handbook/ppp-and-slip/chapter.xml b/pl_PL.ISO8859-2/books/handbook/ppp-and-slip/chapter.xml
index 39d4f88bf2..fe62c1eda2 100644
--- a/pl_PL.ISO8859-2/books/handbook/ppp-and-slip/chapter.xml
+++ b/pl_PL.ISO8859-2/books/handbook/ppp-and-slip/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-2" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-2"?>
<!--
The FreeBSD Documentation Project
diff --git a/pl_PL.ISO8859-2/books/handbook/preface/preface.xml b/pl_PL.ISO8859-2/books/handbook/preface/preface.xml
index a565e7fd2f..20ef5fd36f 100644
--- a/pl_PL.ISO8859-2/books/handbook/preface/preface.xml
+++ b/pl_PL.ISO8859-2/books/handbook/preface/preface.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-2" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-2"?>
<!--
The FreeBSD Polish Documentation Project
diff --git a/pl_PL.ISO8859-2/books/handbook/printing/chapter.xml b/pl_PL.ISO8859-2/books/handbook/printing/chapter.xml
index 6c50560d6c..5e1736a3ac 100644
--- a/pl_PL.ISO8859-2/books/handbook/printing/chapter.xml
+++ b/pl_PL.ISO8859-2/books/handbook/printing/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-2" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-2"?>
<!--
The FreeBSD Documentation Project
diff --git a/pl_PL.ISO8859-2/books/handbook/security/chapter.xml b/pl_PL.ISO8859-2/books/handbook/security/chapter.xml
index 34d9592e35..3da3d06fc4 100644
--- a/pl_PL.ISO8859-2/books/handbook/security/chapter.xml
+++ b/pl_PL.ISO8859-2/books/handbook/security/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-2" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-2"?>
<!--
The FreeBSD Documentation Project
diff --git a/pl_PL.ISO8859-2/books/handbook/serialcomms/chapter.xml b/pl_PL.ISO8859-2/books/handbook/serialcomms/chapter.xml
index ff89ce1eb0..b2337fbcf7 100644
--- a/pl_PL.ISO8859-2/books/handbook/serialcomms/chapter.xml
+++ b/pl_PL.ISO8859-2/books/handbook/serialcomms/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-2" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-2"?>
<!--
The FreeBSD Documentation Project
diff --git a/pl_PL.ISO8859-2/books/handbook/users/chapter.xml b/pl_PL.ISO8859-2/books/handbook/users/chapter.xml
index 2820678aa1..fdca469842 100644
--- a/pl_PL.ISO8859-2/books/handbook/users/chapter.xml
+++ b/pl_PL.ISO8859-2/books/handbook/users/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-2" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-2"?>
<!--
The FreeBSD Polish Documentation Project
diff --git a/pl_PL.ISO8859-2/books/handbook/vinum/chapter.xml b/pl_PL.ISO8859-2/books/handbook/vinum/chapter.xml
index 3b3ade50a2..f25d496c46 100644
--- a/pl_PL.ISO8859-2/books/handbook/vinum/chapter.xml
+++ b/pl_PL.ISO8859-2/books/handbook/vinum/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-2" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-2"?>
<!--
The Vinum Volume Manager
By Greg Lehey (grog at lemis dot com)
diff --git a/pl_PL.ISO8859-2/books/handbook/x11/chapter.xml b/pl_PL.ISO8859-2/books/handbook/x11/chapter.xml
index f65bf0ca0c..37c3ddb00e 100644
--- a/pl_PL.ISO8859-2/books/handbook/x11/chapter.xml
+++ b/pl_PL.ISO8859-2/books/handbook/x11/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-2" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-2"?>
<!--
The FreeBSD Polish Documentation Project
diff --git a/pl_PL.ISO8859-2/share/xml/catalog b/pl_PL.ISO8859-2/share/xml/catalog
deleted file mode 100644
index 61f86d1fe8..0000000000
--- a/pl_PL.ISO8859-2/share/xml/catalog
+++ /dev/null
@@ -1,27 +0,0 @@
- -- ...................................................................... --
- -- FreeBSD SGML Public Identifiers ...................................... --
-
- -- $FreeBSD$
- Original revision: 1.5
- --
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//PL"
- "entities.ent"
-
-PUBLIC "-//FreeBSD//DOCUMENT DocBook Stylesheet//EN"
- "freebsd.dsl"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook Language Specific Entities//EN"
- "l10n.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//PL"
- "mailing-lists.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook Newsgroup Entities//PL"
- "newsgroups.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook Team Entities//PL"
- "teams.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//PL"
- "trademarks.ent"
diff --git a/pl_PL.ISO8859-2/share/xml/catalog.xml b/pl_PL.ISO8859-2/share/xml/catalog.xml
new file mode 100644
index 0000000000..d43f73af53
--- /dev/null
+++ b/pl_PL.ISO8859-2/share/xml/catalog.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0"?>
+<!DOCTYPE catalog PUBLIC "-//OASIS//DTD Entity Resolution XML Catalog V1.0//EN"
+ "http://www.oasis-open.org/committees/entity/release/1.0/catalog.dtd">
+
+<!-- $FreeBSD$ -->
+
+<catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog">
+ <rewriteSystem systemIdStartString="http://www.FreeBSD.org/XML/www/lang/"
+ rewritePrefix="../../"/>
+ <rewriteURI uriStartString="http://www.FreeBSD.org/XML/www/lang/"
+ rewritePrefix="../../"/>
+
+ <public
+ publicId="-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN"
+ uri="entities.ent" />
+ <public
+ publicId="-//FreeBSD//ENTITIES FreeBSD L10N Entities//EN"
+ uri="l10n.ent" />
+</catalog>
diff --git a/pl_PL.ISO8859-2/share/xml/entities.ent b/pl_PL.ISO8859-2/share/xml/entities.ent
index 06a3061827..8c3ea6368a 100644
--- a/pl_PL.ISO8859-2/share/xml/entities.ent
+++ b/pl_PL.ISO8859-2/share/xml/entities.ent
@@ -5,27 +5,30 @@
Original revision: 1.2
-->
-<!ENTITY % l10n PUBLIC "-//FreeBSD//ENTITIES DocBook Language Specific Entities//EN">
+<!ENTITY % l10n PUBLIC "-//FreeBSD//ENTITIES DocBook Language Specific Entities//EN"
+ "l10n.ent">
%l10n;
-<!ENTITY % l10n-common PUBLIC "-//FreeBSD//ENTITIES DocBook Language Neutral Entities//EN">
-%l10n-common;
-<!ENTITY % man PUBLIC "-//FreeBSD//ENTITIES DocBook Manual Page Entities//EN">
-%man;
-<!ENTITY % freebsd PUBLIC "-//FreeBSD//ENTITIES DocBook Miscellaneous FreeBSD Entities//EN">
+<!ENTITY % freebsd PUBLIC "-//FreeBSD//ENTITIES DocBook Miscellaneous FreeBSD Entities//EN"
+ "nonexistent">
%freebsd;
-<!ENTITY % authors PUBLIC "-//FreeBSD//ENTITIES DocBook Author Entities//EN">
-%authors;
-<!ENTITY % teams PUBLIC "-//FreeBSD//ENTITIES DocBook Team Entities//PL">
+<!ENTITY % teams PUBLIC "-//FreeBSD//ENTITIES DocBook Team Entities//PL"
+ "teams.ent">
%teams;
-<!ENTITY % mailing-lists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//PL">
+<!ENTITY % mailing-lists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//PL"
+ "mailing-lists.ent">
%mailing-lists;
-<!ENTITY % newsgroups PUBLIC "-//FreeBSD//ENTITIES DocBook Newsgroup Entities//PL">
+<!ENTITY % newsgroups PUBLIC "-//FreeBSD//ENTITIES DocBook Newsgroup Entities//PL"
+ "newsgroups.ent">
%newsgroups;
-<!ENTITY % trademarks PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//PL">
+<!ENTITY % trademarks PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//PL"
+ "trademarks.ent">
%trademarks;
-<!ENTITY % trademarks-en PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//EN">
+<!ENTITY % trademarks-en PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//EN"
+ "nonexistent">
%trademarks-en;
-<!ENTITY % urls PUBLIC "-//FreeBSD//ENTITIES DocBook URL Entities//EN">
+<!ENTITY % urls PUBLIC "-//FreeBSD//ENTITIES DocBook URL Entities//EN"
+ "nonexistent">
%urls;
-<!ENTITY % glossary PUBLIC "-//FreeBSD//ENTITIES DocBook Glossary Entities//EN">
+<!ENTITY % glossary PUBLIC "-//FreeBSD//ENTITIES DocBook Glossary Entities//EN"
+ "nonexistent">
%glossary;
diff --git a/pl_PL.ISO8859-2/share/xml/l10n.ent b/pl_PL.ISO8859-2/share/xml/l10n.ent
index 7747ee9a49..de4a4227a7 100644
--- a/pl_PL.ISO8859-2/share/xml/l10n.ent
+++ b/pl_PL.ISO8859-2/share/xml/l10n.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="iso-8859-2"?>
<!-- -*- sgml -*-
DocBook Language Specific Entities for Localization (pl).
diff --git a/pl_PL.ISO8859-2/share/xml/mailing-lists.ent b/pl_PL.ISO8859-2/share/xml/mailing-lists.ent
index 5225fccdda..fb51733752 100644
--- a/pl_PL.ISO8859-2/share/xml/mailing-lists.ent
+++ b/pl_PL.ISO8859-2/share/xml/mailing-lists.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="iso-8859-2"?>
<!--
Names of FreeBSD mailing lists and related software.
diff --git a/pl_PL.ISO8859-2/share/xml/newsgroups.ent b/pl_PL.ISO8859-2/share/xml/newsgroups.ent
index e47d2189a1..97f1cc297b 100644
--- a/pl_PL.ISO8859-2/share/xml/newsgroups.ent
+++ b/pl_PL.ISO8859-2/share/xml/newsgroups.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="iso-8859-2"?>
<!--
The FreeBSD Polish Documentation Project
diff --git a/pl_PL.ISO8859-2/share/xml/teams.ent b/pl_PL.ISO8859-2/share/xml/teams.ent
index a02f7d3e24..22a7b92716 100644
--- a/pl_PL.ISO8859-2/share/xml/teams.ent
+++ b/pl_PL.ISO8859-2/share/xml/teams.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="iso-8859-2"?>
<!--
The FreeBSD Polish Documentation Project
diff --git a/pt_BR.ISO8859-1/articles/building-products/article.xml b/pt_BR.ISO8859-1/articles/building-products/article.xml
index 65ab34d5bc..fb5499b525 100644
--- a/pt_BR.ISO8859-1/articles/building-products/article.xml
+++ b/pt_BR.ISO8859-1/articles/building-products/article.xml
@@ -1,10 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//PT"
- "../../share/xml/entities.ent">
-%entities;
-]>
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<!--
The FreeBSD Documentation Project
diff --git a/pt_BR.ISO8859-1/articles/contributing-ports/article.xml b/pt_BR.ISO8859-1/articles/contributing-ports/article.xml
index 4326701a7b..8bfdb6dbee 100644
--- a/pt_BR.ISO8859-1/articles/contributing-ports/article.xml
+++ b/pt_BR.ISO8859-1/articles/contributing-ports/article.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//PT" "../../share/xml/entities.ent">
-%entities;
-]>
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<!--
The FreeBSD Documentation Project
@@ -1011,7 +1008,7 @@
Banco de Dados de Relat鏎ios de Problemas</ulink>.</para>
<para>O <ulink url="http://pointyhat.FreeBSD.org/">Pointyhat</ulink>
- &eacute o cluster de compila誽o do sistema de
+ o cluster de compila誽o do sistema de
<literal>ports</literal>. Voc pode utilizar o Pointyhat
para verificar os logs de compila誽o de um
<literal>port</literal> em todas as arquiteturas e releases
diff --git a/pt_BR.ISO8859-1/articles/contributing/article.xml b/pt_BR.ISO8859-1/articles/contributing/article.xml
index 1be0165a20..d8fadee65e 100644
--- a/pt_BR.ISO8859-1/articles/contributing/article.xml
+++ b/pt_BR.ISO8859-1/articles/contributing/article.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//PT" "../../share/xml/entities.ent">
-%entities;
-]>
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<!--
The FreeBSD Documentation Project
diff --git a/pt_BR.ISO8859-1/articles/explaining-bsd/article.xml b/pt_BR.ISO8859-1/articles/explaining-bsd/article.xml
index b5e8887f96..54dde6cc38 100644
--- a/pt_BR.ISO8859-1/articles/explaining-bsd/article.xml
+++ b/pt_BR.ISO8859-1/articles/explaining-bsd/article.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//PT" "../../share/xml/entities.ent">
-%entities;
-]>
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<!--
The FreeBSD Documentation Project
diff --git a/pt_BR.ISO8859-1/articles/freebsd-questions/article.xml b/pt_BR.ISO8859-1/articles/freebsd-questions/article.xml
index b8edaafb0f..56a9dad85c 100644
--- a/pt_BR.ISO8859-1/articles/freebsd-questions/article.xml
+++ b/pt_BR.ISO8859-1/articles/freebsd-questions/article.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//PT" "../../share/xml/entities.ent">
-%entities;
-]>
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<!--
The FreeBSD Documentation Project
diff --git a/pt_BR.ISO8859-1/articles/freebsd-update-server/article.xml b/pt_BR.ISO8859-1/articles/freebsd-update-server/article.xml
index 2b4a5880f7..3874dfd920 100644
--- a/pt_BR.ISO8859-1/articles/freebsd-update-server/article.xml
+++ b/pt_BR.ISO8859-1/articles/freebsd-update-server/article.xml
@@ -1,8 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//PT" "../../share/xml/entities.ent">
-%entities;
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd" [
<!ENTITY fbus.ap "<application>Servidor de Atualiza誽o do FreeBSD</application>">
]>
@@ -786,14 +784,14 @@ addextradocs () {
<screen>#Build the world
log "Building world"
-cd /usr/src &&
-make -j 2 ${COMPATFLAGS} buildworld 2>&1
+cd /usr/src &amp;&amp;
+make -j 2 ${COMPATFLAGS} buildworld 2>&amp;1
# Distribute the world
log "Distributing world"
-cd /usr/src/release &&
-make -j 2 obj &&
- make ${COMPATFLAGS} release.1 release.2 2>&1</screen>
+cd /usr/src/release &amp;&amp;
+make -j 2 obj &amp;&amp;
+ make ${COMPATFLAGS} release.1 release.2 2>&amp;1</screen>
</listitem>
<listitem>
diff --git a/pt_BR.ISO8859-1/articles/hubs/article.xml b/pt_BR.ISO8859-1/articles/hubs/article.xml
index 3070963f8f..d6ae971fbb 100644
--- a/pt_BR.ISO8859-1/articles/hubs/article.xml
+++ b/pt_BR.ISO8859-1/articles/hubs/article.xml
@@ -1,10 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
- <!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//PT"
- "../../share/xml/entities.ent">
- %entities;
-]>
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<!--
The FreeBSD Documentation Project
diff --git a/pt_BR.ISO8859-1/articles/linux-users/article.xml b/pt_BR.ISO8859-1/articles/linux-users/article.xml
index 6d3192a5bc..79434631de 100644
--- a/pt_BR.ISO8859-1/articles/linux-users/article.xml
+++ b/pt_BR.ISO8859-1/articles/linux-users/article.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//PT" "../../share/xml/entities.ent">
-%entities;
-]>
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<!--
The FreeBSD Documentation Project
diff --git a/pt_BR.ISO8859-1/articles/new-users/article.xml b/pt_BR.ISO8859-1/articles/new-users/article.xml
index fd3c929b95..2034619675 100644
--- a/pt_BR.ISO8859-1/articles/new-users/article.xml
+++ b/pt_BR.ISO8859-1/articles/new-users/article.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//PT" "../../share/xml/entities.ent">
-%entities;
-]>
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<!--
The FreeBSD Documentation Project
diff --git a/pt_BR.ISO8859-1/articles/portbuild/article.xml b/pt_BR.ISO8859-1/articles/portbuild/article.xml
index 00d09fb9c9..be0a7c0905 100644
--- a/pt_BR.ISO8859-1/articles/portbuild/article.xml
+++ b/pt_BR.ISO8859-1/articles/portbuild/article.xml
@@ -1,10 +1,6 @@
<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//PT"
- "../../share/xml/entities.ent">
-%entities;
-]>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<!--
The FreeBSD Documentation Project
@@ -66,7 +62,7 @@
<note>
<para>Muitos dos detalhes deste artigo ser緌 do interesse apenas
dos membros da equipe que faz o <ulink
- url="&url.base/portmgr">Gerenciamento da Cole誽o de
+ url="&url.base;/portmgr">Gerenciamento da Cole誽o de
<literal>Ports</literal></ulink></para>
</note>
@@ -2841,7 +2837,7 @@ cd /var/portbuild/<replaceable>arch</replaceable></screen>
</listitem>
<listitem>
- <para><screen>cd .ssh && ssh-keygen</screen></para>
+ <para><screen>cd .ssh &amp;&amp; ssh-keygen</screen></para>
</listitem>
<listitem>
diff --git a/pt_BR.ISO8859-1/articles/problem-reports/article.xml b/pt_BR.ISO8859-1/articles/problem-reports/article.xml
index 89fa4e748d..ec1f919881 100644
--- a/pt_BR.ISO8859-1/articles/problem-reports/article.xml
+++ b/pt_BR.ISO8859-1/articles/problem-reports/article.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//PT" "../../share/xml/entities.ent">
-%entities;
-]>
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<!--
The FreeBSD Documentation Project
@@ -561,7 +558,7 @@
<para>O fato de que voc leu o
<filename>src/UPDATING</filename> e que o seu
problema n緌 est listado ali
- (&eacute certeza que algu幦 vai
+ ( certeza que algu幦 vai
perguntar)</para>
</listitem>
<listitem>
@@ -599,7 +596,7 @@
<para>O fato de que voc leu o
<filename>ports/UPDATING</filename> e que o seu
problema n緌 est listado ali
- (&eacute certeza que algu幦 vai
+ ( certeza que algu幦 vai
perguntar)</para>
</listitem>
</itemizedlist>
@@ -661,7 +658,7 @@
voc deve estar preparado para n緌 somente
disponibilizar um <literal>patch</literal>, como
tamb幦 para defender porque o seu
- <literal>patch</literal> &eacute <quote>a coisa certa a
+ <literal>patch</literal> <quote>a coisa certa a
se fazer</quote>. Como mencionado acima, realizar uma
busca cuidadosa no hist鏎ico das <ulink
url="http://www.FreeBSD.org/search/search.html#mailinglists">listas
@@ -1453,7 +1450,7 @@
<para>Antes de pressionar o bot緌
<literal>submit</literal> para enviar o seu relat鏎io,
- voc ter&aacute que preencher um campo com o texto
+ voc ter que preencher um campo com o texto
exibido na imagem de captcha exibida no final do
formul嫫io. Infelizmente esta medida teve de ser
adotada devido ao mau uso do mesmo por sistemas automatizados
diff --git a/pt_BR.ISO8859-1/books/faq/book.xml b/pt_BR.ISO8859-1/books/faq/book.xml
index 7c194ccd9f..449d044c4b 100644
--- a/pt_BR.ISO8859-1/books/faq/book.xml
+++ b/pt_BR.ISO8859-1/books/faq/book.xml
@@ -1,8 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//PT" "../../share/xml/entities.ent">
-%entities;
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd" [
<!ENTITY bibliography SYSTEM "../../share/xml/bibliography.xml">
]>
@@ -2381,7 +2379,7 @@ sectors/track: 63</screen>
voc ter que instalar a
distribui誽o <quote>crypto</quote> via
sysinstall ou apartir do c鏚igo fonte). Instalando
- as bibliotecas crypto ser&aacute possivel utilizar outros
+ as bibliotecas crypto ser possivel utilizar outros
tipos de criptografia, como o formato Blowfish, que
ainda mais seguro do que o MD5. A
defini誽o de qual codifica誽o
@@ -2957,7 +2955,7 @@ disk wd2 at wdc1 drive 1 # change from wd3 to wd2</programlisting
<para>O FreeBSD suporta ZIP Drives do tipo SCSI,
claro. Essa unidade deve ser configurada apenas nos SCSI
ID nmeros 5 ou 6, mas se a sua BIOS tem suporte
- &agrave inicializ蜭o(boot) pela unidade
+ inicializ蜭o(boot) pela unidade
SCSI, essa caracter疄tica pode ser usada sem
problemas. N緌 est claro exatamente quais
adaptadores SCSI suportam a caracter疄tica de
@@ -3505,11 +3503,11 @@ diff -u -r1.60.2.1 -r1.60.2.2
if (verbose >= 2)
printf("psm%d: SET_DEFAULTS return code:%04x\n", unit, i);
+#endif
- if (sc->config & PSM_CONFIG_RESOLUTION) {
+ if (sc->config &amp; PSM_CONFIG_RESOLUTION) {
sc->mode.resolution
= set_mouse_resolution(sc->kbdc,
-- (sc->config & PSM_CONFIG_RESOLUTION) - 1);
-+ (sc->config & PSM_CONFIG_RESOLUTION) - 1);
+- (sc->config &amp; PSM_CONFIG_RESOLUTION) - 1);
++ (sc->config &amp; PSM_CONFIG_RESOLUTION) - 1);
+ } else if (sc->mode.resolution >= 0) {
+ sc->mode.resolution
+ = set_mouse_resolution(sc->kbdc, sc->dflt_mode.resolution);
@@ -3520,7 +3518,7 @@ diff -u -r1.60.2.1 -r1.60.2.2
+ set_mouse_scaling(sc->kbdc, 1);
/* request a data packet and extract sync. bits */
- if (get_mouse_status(sc->kbdc, stat, 1, 3) < 3) {</programlisting>
+ if (get_mouse_status(sc->kbdc, stat, 1, 3) &lt; 3) {</programlisting>
<para>Em vers髊s posteriores 3.2, o suporte
deve funcionar.</para>
@@ -5026,7 +5024,7 @@ Checking for Plug-n-Play devices...
Card assigned CSN #1
Vendor ID PMC2430 (0x3024a341), Serial Number 0xffffffff
PnP Version 1.0, Vendor Version 0
-Device Description: Pace 56 Voice Internal Plug & Play Modem
+Device Description: Pace 56 Voice Internal Plug &amp; Play Modem
Logical Device ID: PMC2430 0x3024a341 #0
Device supports I/O Range Check
@@ -6052,7 +6050,7 @@ kern.timecounter.hardware: TSC -&gt; i8254</screen>
<programlisting>options GPL_MATH_EMULATE</programlisting>
<note>
- <para>Quando voc&ecirc fizer isto, ser
+ <para>Quando voc fizer isto, ser
necess嫫io remover a op誽o
<literal>MATH_EMULATE</literal></para>
</note>
@@ -6120,7 +6118,7 @@ crw-rw-rw- 1 root wheel 41, 1 Oct 15 22:14 spx</screen>
<ulink
url="http://www.cis.ohio-state.edu/~barr/INN.html">Dave
Barr's INN Page</ulink> onde vo蔒
- encontrar&aacute o <literal>FAQ</literal> do INN.
+ encontrar o <literal>FAQ</literal> do INN.
</para>
</answer>
</qandaentry>
@@ -6643,7 +6641,7 @@ device sio5 at isa? port 0x2b8 tty flags 0x501 vector siointr</programlisting>
<procedure>
<step>
<para>Crie um novo sistema de arquivos com o
- &man.newfs.8 na nova parti誽o.</para>
+ &man.newfs.8; na nova parti誽o.</para>
</step>
<step>
@@ -6676,7 +6674,7 @@ device sio5 at isa? port 0x2b8 tty flags 0x501 vector siointr</programlisting>
&prompt.root; <userinput>dump 0af - / | restore xf -</userinput></screen>
<para>Redefinir a estrutura das parti踥es com
- o &man.dump.8 um processo um pouco mais
+ o &man.dump.8; um processo um pouco mais
trabalhoso. Caso voc queira, por exemplo, unir o
contedo da parti誽o
<filename>/var</filename> com as parti踥es
@@ -7044,7 +7042,7 @@ use "disklabel -r" to install initial label</screen>
<screen>&prompt.root; <userinput>disklabel ccd0 &gt; /tmp/disklabel.tmp</userinput>
&prompt.root; <userinput>disklabel -Rr ccd0 /tmp/disklabel.tmp</userinput>
&prompt.root; <userinput>disklabel -e ccd0</userinput>
-(agora ir&aacute funcionar)</screen>
+(agora ir funcionar)</screen>
</answer>
</qandaentry>
@@ -11526,7 +11524,7 @@ default 10.0.0.2 UGSc 0 0 tun0
<para>Assume-se o uso do endere蔞 recomendado pelo
&a.ptbr.p.handbook;, p墔inas de manual ou no
arquivo ppp.conf.sample. Se a rota padr緌
- n緌 foi definida, &eacute poss癉el que a
+ n緌 foi definida, poss癉el que a
vers緌 do &man.ppp.8; seja antiga, uma vez que
n緌 entendem a palavra <literal>HISADDR</literal>
no arquivo ppp.conf. Se a vers緌 do seu FreeBSD
@@ -11768,7 +11766,7 @@ deny pred1 deflate deflate24 protocomp acfcomp shortseq vj</programlisting>
ent緌 quando a proxima queda de link ocorrer, eles
podem ser capazes de dizer porque o seu lado esta tendo
problemas. Sinta-se livre para enviar os detalhes para
- &a.brian ou pe蓷 para seu provedor
+ &a.brian; ou pe蓷 para seu provedor
contact-lo diretamente.</para>
</answer>
</qandaentry>
@@ -11920,7 +11918,7 @@ deny pred1 deflate deflate24 protocomp acfcomp shortseq vj</programlisting>
, CCP &amp; IPCP com suas requisi踥es
originais. Como consequ瘽cia, se uma
implementa誽o ppp 6 segundos mais
- lenta do que o outro lado, esse lado emitir&aacute duas
+ lenta do que o outro lado, esse lado emitir duas
requis髊s adicionais de configura誽o
LCP. Isto fatal.</para>
@@ -13289,7 +13287,7 @@ device sio7 at isa? port 0x2b8 tty flags 0x781 irq 7 vector siointr</programlist
tip57600|Disque para qualquer nmero em 57600 bps:\
:dv=/dev/cuaa0:br#57600:at=hayes:pa=none:du:</programlisting>
- <para>Depois voc&ecirc pode fazer algo como <command>tip
+ <para>Depois voc pode fazer algo como <command>tip
-115200 5551234</command>. Se preferir o &man.cu.1; ao
inv廥 do &man.tip.1;, utilize uma entrada
gen廨ica:</para>
@@ -13675,7 +13673,7 @@ raisechar=^^</programlisting>
<para>O FreeBSD vem de tradi誽o
<quote>cl嫳sica</quote> e por isso sempre usou o
- formado &man.a.out.5 que uma tecnologia que foi
+ formado &man.a.out.5; que uma tecnologia que foi
experimentada e aprovada por v嫫ias
gera踥es de sistemas BSD. Apesar de,
h algum tempo tamb幦 ser poss癉el
diff --git a/pt_BR.ISO8859-1/books/fdp-primer/book.xml b/pt_BR.ISO8859-1/books/fdp-primer/book.xml
index 2d4b53664e..b96fbef5c1 100644
--- a/pt_BR.ISO8859-1/books/fdp-primer/book.xml
+++ b/pt_BR.ISO8859-1/books/fdp-primer/book.xml
@@ -1,10 +1,7 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//PT" "../../share/xml/entities.ent">
-%entities;
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd" [
<!ENTITY % chapters SYSTEM "chapters.ent"> %chapters;
-<!ENTITY % not.published "INCLUDE">
]>
<!-- Copyright (c) 1998, 1999 Nik Clayton, All rights reserved.
diff --git a/pt_BR.ISO8859-1/books/fdp-primer/doc-build/chapter.xml b/pt_BR.ISO8859-1/books/fdp-primer/doc-build/chapter.xml
index cd66467abc..5218a3581b 100644
--- a/pt_BR.ISO8859-1/books/fdp-primer/doc-build/chapter.xml
+++ b/pt_BR.ISO8859-1/books/fdp-primer/doc-build/chapter.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
<!-- Copyright (c) 1999 Neil Blakey-Milner, All rights reserved.
Redistribution and use in source (SGML DocBook) and 'compiled' forms
diff --git a/pt_BR.ISO8859-1/books/fdp-primer/examples/appendix.xml b/pt_BR.ISO8859-1/books/fdp-primer/examples/appendix.xml
index 2e5d6fa786..2b534cba53 100644
--- a/pt_BR.ISO8859-1/books/fdp-primer/examples/appendix.xml
+++ b/pt_BR.ISO8859-1/books/fdp-primer/examples/appendix.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
<!-- Copyright (c) 2000 Nik Clayton, All rights reserved.
Redistribution and use in source (SGML DocBook) and 'compiled' forms
@@ -74,7 +75,7 @@
<example>
<title>DocBook <sgmltag>book</sgmltag></title>
- <programlisting><![ RCDATA [<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook V4.1//EN">
+ <programlisting><![CDATA[<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook V4.1//EN">
<book>
<bookinfo>
@@ -126,7 +127,7 @@
<example>
<title>DocBook <sgmltag>article</sgmltag></title>
- <programlisting><![ RCDATA [<!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook V4.1//EN">
+ <programlisting><![CDATA[<!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook V4.1//EN">
<article>
<articleinfo>
diff --git a/pt_BR.ISO8859-1/books/fdp-primer/overview/chapter.xml b/pt_BR.ISO8859-1/books/fdp-primer/overview/chapter.xml
index b97ed64711..d907e68ba0 100644
--- a/pt_BR.ISO8859-1/books/fdp-primer/overview/chapter.xml
+++ b/pt_BR.ISO8859-1/books/fdp-primer/overview/chapter.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
<!-- Copyright (c) 1998, 1999 Nik Clayton, All rights reserved.
Redistribution and use in source (SGML DocBook) and 'compiled' forms
diff --git a/pt_BR.ISO8859-1/books/fdp-primer/psgml-mode/chapter.xml b/pt_BR.ISO8859-1/books/fdp-primer/psgml-mode/chapter.xml
index 1e830891ba..624ec3e8ff 100644
--- a/pt_BR.ISO8859-1/books/fdp-primer/psgml-mode/chapter.xml
+++ b/pt_BR.ISO8859-1/books/fdp-primer/psgml-mode/chapter.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
<!-- Copyright (c) 1998, 1999 Nik Clayton, All rights reserved.
Redistribution and use in source (SGML DocBook) and 'compiled' forms
diff --git a/pt_BR.ISO8859-1/books/fdp-primer/see-also/chapter.xml b/pt_BR.ISO8859-1/books/fdp-primer/see-also/chapter.xml
index c681654aa5..d79f096954 100644
--- a/pt_BR.ISO8859-1/books/fdp-primer/see-also/chapter.xml
+++ b/pt_BR.ISO8859-1/books/fdp-primer/see-also/chapter.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
<!-- Copyright (c) 1998, 1999 Nik Clayton, All rights reserved.
Redistribution and use in source (SGML DocBook) and 'compiled' forms
diff --git a/pt_BR.ISO8859-1/books/fdp-primer/sgml-markup/chapter.xml b/pt_BR.ISO8859-1/books/fdp-primer/sgml-markup/chapter.xml
index ec8bb39d10..2cc9f6046c 100644
--- a/pt_BR.ISO8859-1/books/fdp-primer/sgml-markup/chapter.xml
+++ b/pt_BR.ISO8859-1/books/fdp-primer/sgml-markup/chapter.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
<!-- Copyright (c) 1998, 1999 Nik Clayton, All rights reserved.
Redistribution and use in source (SGML DocBook) and 'compiled' forms
@@ -176,7 +177,7 @@
<para>Uso:</para>
- <programlisting><![ RCDATA [<h1>Primeira se誽o</h1>
+ <programlisting><![CDATA[<h1>Primeira se誽o</h1>
<!-- a introdu誽o do documento entra aqui -->
@@ -210,7 +211,7 @@
<para>Uso:</para>
- <programlisting><![ RCDATA [<h1>Primeira se誽o</h1>
+ <programlisting><![CDATA[<h1>Primeira se誽o</h1>
<!-- Introdu誽o do documento -->
@@ -231,7 +232,7 @@
<para>Uso:</para>
- <programlisting><![ RCDATA [<p>Isto um par墔rafo. Pode conter qualquer outro elemento</p>]]></programlisting>
+ <programlisting><![CDATA[<p>Isto um par墔rafo. Pode conter qualquer outro elemento</p>]]></programlisting>
</example>
</sect3>
@@ -248,7 +249,7 @@
<para>Uso:</para>
- <programlisting><![ RCDATA [<p>Um pequeno trecho da constitui誽o dos Estados Unidos:</p>
+ <programlisting><![CDATA[<p>Um pequeno trecho da constitui誽o dos Estados Unidos:</p>
<blockquote>
N鏀, povo dos Estados Unidos, com o objetivo de fazer uma
@@ -300,7 +301,7 @@ essa constitui誽o para os estados Unidos da Am廨ica.
<para>Uso:</para>
- <programlisting><![ RCDATA [<p>Uma lista n緌 ordenada. Os itens ser緌 provavelmente
+ <programlisting><![CDATA[<p>Uma lista n緌 ordenada. Os itens ser緌 provavelmente
precedidos por uma esfera s鏊ida.</p>
<ul>
@@ -332,7 +333,7 @@ ser numerado.</p>
<para>Uso:</para>
- <programlisting><![ RCDATA [<dl>
+ <programlisting><![CDATA[<dl>
<dt>Termo 1</dt>
<dd><p>Par墔rafo 1 da defini誽o 1.</p>
@@ -369,7 +370,7 @@ ser numerado.</p>
<para>Voc pode usar <sgmltag>pre</sgmltag> para
marcar uma mensagem de email;</para>
- <programlisting><![ RCDATA [<pre>
+ <programlisting><![CDATA[<pre>
From: nik@FreeBSD.org
To: freebsd-doc@FreeBSD.org
Subject: New documentation available
@@ -387,7 +388,7 @@ ser numerado.</p>
<para>Tenha em mente que o <literal>&lt;</literal> e o
<literal>&amp;</literal> continuam sendo reconhecidos como
caracteres especiais em um texto pr-formatado.
- &Eacute por isto que nos exemplos tivemos que utilizar
+ por isto que nos exemplos tivemos que utilizar
<literal>&amp;lt;</literal> ao inv廥 de
<literal>&lt;</literal>. Para manter a consist瘽cia,
o <literal>&amp;gt;</literal> tamb幦 foi utilizado
@@ -428,7 +429,7 @@ ser numerado.</p>
<para>Uso:</para>
- <programlisting><![ RCDATA [<p>Esta uma simples tabela 2x2.</p>
+ <programlisting><![CDATA[<p>Esta uma simples tabela 2x2.</p>
<table>
<tr>
@@ -455,7 +456,7 @@ ser numerado.</p>
<para>Uso:</para>
- <programlisting><![ RCDATA [<p>Uma c幨ula comprida e estreita na esquerda e duas
+ <programlisting><![CDATA[<p>Uma c幨ula comprida e estreita na esquerda e duas
c幨ulas pequenas direita.</p>
<table>
@@ -476,7 +477,7 @@ c幨ulas pequenas direita.</p>
<para>Uso:</para>
- <programlisting><![ RCDATA [<p>Uma c幨ula longa em cima, duas c幨ulas abaixo.</p>
+ <programlisting><![CDATA[<p>Uma c幨ula longa em cima, duas c幨ulas abaixo.</p>
<table>
<tr>
@@ -497,7 +498,7 @@ c幨ulas pequenas direita.</p>
<para>Uso:</para>
- <programlisting><![ RCDATA [<p>Numa tabela 3x3, o bloco superior esquerdo um conjunto
+ <programlisting><![CDATA[<p>Numa tabela 3x3, o bloco superior esquerdo um conjunto
2x2 fundidos em um. As outras c幨ulas s緌 normais.</p>
<table>
@@ -548,7 +549,7 @@ c幨ulas pequenas direita.</p>
<para>Uso:</para>
- <programlisting><![ RCDATA [<p><em>Este</em> foi enfatizado
+ <programlisting><![CDATA[<p><em>Este</em> foi enfatizado
enquanto <strong>este</strong> foi fortemente enfatizado.</p>]]>
</programlisting>
</example>
@@ -567,7 +568,7 @@ enquanto <strong>este</strong> foi fortemente enfatizado.</p>]]>
<example>
<title><sgmltag>b</sgmltag> e <sgmltag>i</sgmltag></title>
- <programlisting><![ RCDATA [<p><b>Este</b> esta em negrito,
+ <programlisting><![CDATA[<p><b>Este</b> esta em negrito,
enquanto <i>este</i> est em it嫮ico.</p>]]>
</programlisting>
</example>
@@ -585,7 +586,7 @@ enquanto <i>este</i> est em it嫮ico.</p>]]>
<para>Uso:</para>
- <programlisting><![ RCDATA [<p> Este documento foi originalmente por
+ <programlisting><![CDATA[<p> Este documento foi originalmente por
Nik Clayton, que pode ser encontrado por email em
<tt>nik@FreeBSD.org</tt>.</p>]]></programlisting>
</example>
@@ -634,7 +635,7 @@ Nik Clayton, que pode ser encontrado por email em
<para>Todos os fragmentos fazem a mesma coisa.</para>
- <programlisting><![ RCDATA [<p>Este texto <small>ligeiramente menor</small>.
+ <programlisting><![CDATA[<p>Este texto <small>ligeiramente menor</small>.
Mas este texto <big>ligeiramente maior</big>.</p>
<p>Este texto <font size="-1">ligeiramente menor</font>.
@@ -674,7 +675,7 @@ Mas este texto <font size="4">ligeiramente maior</font>.</p>]]></programlistin
<para>Uso:</para>
- <programlisting><![ RCDATA [<p>Maiores informa踥es est緌 dispon癉eis no
+ <programlisting><![CDATA[<p>Maiores informa踥es est緌 dispon癉eis no
<a href="http://www.FreeBSD.org/">web site do FreeBSD</a>.</p>]]></programlisting>
</example>
@@ -700,7 +701,7 @@ Mas este texto <font size="4">ligeiramente maior</font>.</p>]]></programlistin
<para>Uso:</para>
- <programlisting><![ RCDATA [<p><a name="para1">Este</a> par墔rafo pode ser referenciado
+ <programlisting><![CDATA[<p><a name="para1">Este</a> par墔rafo pode ser referenciado
em outros links com o nome<tt>para1</tt>.</p>]]></programlisting>
</example>
@@ -717,7 +718,7 @@ em outros links com o nome<tt>para1</tt>.</p>]]></programlisting>
em um documento chamado <filename>foo.html</filename>.
</para>
- <programlisting><![ RCDATA [<p>Mais informa誽o no <a href="foo.html#para1">primeiro
+ <programlisting><![CDATA[<p>Mais informa誽o no <a href="foo.html#para1">primeiro
par墔rafo</a> de <tt>foo.html</tt>.</p>]]>
</programlisting>
</example>
@@ -733,7 +734,7 @@ par墔rafo</a> de <tt>foo.html</tt>.</p>]]>
<para>Suponha que o exemplo <literal>para1</literal> esteja neste documento</para>
- <programlisting><![ RCDATA [<p>Mais informa誽o no <a href="#para1">primeiro
+ <programlisting><![CDATA[<p>Mais informa誽o no <a href="#para1">primeiro
par墔rafo</a> deste documento.</p>]]></programlisting>
</example>
</sect3>
@@ -744,7 +745,7 @@ par墔rafo</a> deste documento.</p>]]></programlisting>
<title>DocBook</title>
<para>O DocBook foi originalmente desenvolvido por HaL Computer
- Systems e O'Reilly & Associates como um DTD para escrever
+ Systems e O'Reilly &amp; Associates como um DTD para escrever
documenta誽o t嶰nica
<footnote><para>Uma pequena hist鏎ia sobre este assunto
pode ser encontrada em
@@ -992,7 +993,7 @@ par墔rafo</a> deste documento.</p>]]></programlisting>
<example>
<title>Um cap癃ulo simples</title>
- <programlisting><![ RCDATA [<chapter>
+ <programlisting><![CDATA[<chapter>
<title>T癃ulo do cap癃ulo</title>
...
@@ -1008,7 +1009,7 @@ par墔rafo</a> deste documento.</p>]]></programlisting>
<example>
<title>Cap癃ulos Vazios</title>
- <programlisting><![ RCDATA [<chapter>
+ <programlisting><![CDATA[<chapter>
<title>Isto um cap癃ulo vazio</title>
<para></para>
@@ -1040,7 +1041,7 @@ par墔rafo</a> deste documento.</p>]]></programlisting>
<example>
<title>Se踥es em Cap癃ulos</title>
- <programlisting><![ RCDATA [<chapter>
+ <programlisting><![CDATA[<chapter>
<title>Um exemplo de cap癃ulo</title>
<para>Algum texto dentro do cap癃ulo</para>
@@ -1095,7 +1096,7 @@ par墔rafo</a> deste documento.</p>]]></programlisting>
<sgmltag>part</sgmltag>s. Isto n緌 pode ser
feito em um <sgmltag>article</sgmltag>.</para>
- <programlisting><![ RCDATA [<part>
+ <programlisting><![CDATA[<part>
<title>Introdu誽o</title>
<chapter>
@@ -1142,7 +1143,7 @@ par墔rafo</a> deste documento.</p>]]></programlisting>
<para>Uso:</para>
- <programlisting><![ RCDATA [<para>Isso um par墔rafo. E pode conter quase
+ <programlisting><![CDATA[<para>Isso um par墔rafo. E pode conter quase
qualquer outro elemento.</para> ]]></programlisting>
<para>Apar瘽cia:</para>
@@ -1171,7 +1172,7 @@ par墔rafo</a> deste documento.</p>]]></programlisting>
<para>Uso:</para>
- <programlisting><![ RCDATA [<para>Um pequeno peda蔞 da Constitui誽o dos Estados Unidos:</para>
+ <programlisting><![CDATA[<para>Um pequeno peda蔞 da Constitui誽o dos Estados Unidos:</para>
<blockquote>
<title>Pre滵bulo da constitui誽o dos Estados Unidos.</title>
@@ -1263,7 +1264,7 @@ par墔rafo</a> deste documento.</p>]]></programlisting>
<para>Uso:</para>
- <programlisting><![ RCDATA [<warning>
+ <programlisting><![CDATA[<warning>
<para>Instalar o FreeBSD talvez fa蓷 com que voc queira
desinstalar o Windows do seu Hard disk.</para>
</warning>]]></programlisting>
@@ -1321,7 +1322,7 @@ desinstalar o Windows do seu Hard disk.</para>
<para>Uso:</para>
- <programlisting><![ RCDATA [<itemizedlist>
+ <programlisting><![CDATA[<itemizedlist>
<listitem>
<para>Esse o primeiro item enumerado.</para>
</listitem>
@@ -1416,7 +1417,7 @@ desinstalar o Windows do seu Hard disk.</para>
<para>Uso:</para>
- <programlisting><![ RCDATA[<para>Quando voc tiver terminado, seu programa deve estar assim:</para>
+ <programlisting><![CDATA[<para>Quando voc tiver terminado, seu programa deve estar assim:</para>
<programlisting>#include &lt;stdio.h&gt;
@@ -1467,7 +1468,7 @@ main(void)
<title><sgmltag>co</sgmltag> e
<sgmltag>calloutlist</sgmltag></title>
- <programlisting><![ RCDATA[<para>Quando voc tivert terminado, seu prograva deve estar assim;</para>
+ <programlisting><![CDATA[<para>Quando voc tivert terminado, seu prograva deve estar assim;</para>
<programlisting>#include &lt;stdio.h&gt; <co id="co-ex-include"/>
@@ -1556,7 +1557,7 @@ main(void)
<para>Uso:</para>
- <programlisting><![ RCDATA [<informaltable pgwide="1">
+ <programlisting><![CDATA[<informaltable pgwide="1">
<tgroup cols="2">
<thead>
<row>
@@ -1736,7 +1737,7 @@ main(void)
<para>Uso:</para>
- <programlisting><![ RCDATA [<screen>&prompt.user; <userinput>ls -1</userinput>
+ <programlisting><![CDATA[<screen>&prompt.user; <userinput>ls -1</userinput>
foo1
foo2
foo3
@@ -1798,7 +1799,7 @@ This is the file called 'foo2'</screen>
<para>Uso:</para>
- <programlisting><![ RCDATA [<para>O FreeBSD sem dvida <emphasis>o</emphasis> melhor sistema operacional tipo Unix
+ <programlisting><![CDATA[<para>O FreeBSD sem dvida <emphasis>o</emphasis> melhor sistema operacional tipo Unix
para a arquitetura Intel.</para>]]></programlisting>
<para>Apar瘽cia:</para>
@@ -1823,7 +1824,7 @@ para a arquitetura Intel.</para>]]></programlisting>
<para>Uso:</para>
- <programlisting><![ RCDATA [<para>Entretanto, certifique-se que a busca n緌 v al幦 do <quote>limite entre
+ <programlisting><![CDATA[<para>Entretanto, certifique-se que a busca n緌 v al幦 do <quote>limite entre
a administra誽o local e pblica</quote> como diz o RFC 1535.</para>]]></programlisting>
<para>Apar瘽cia:</para>
@@ -1865,7 +1866,7 @@ para a arquitetura Intel.</para>]]></programlisting>
<para>Uso:</para>
- <programlisting><![ RCDATA [<para>Para mudar para o segundo terminal virtual, digite
+ <programlisting><![CDATA[<para>Para mudar para o segundo terminal virtual, digite
<keycombo action="simul"><keycap>Alt</keycap>
<keycap>F1</keycap></keycombo>.</para>
@@ -1991,7 +1992,7 @@ para a arquitetura Intel.</para>]]></programlisting>
<para>Uso:</para>
- <programlisting><![ CDATA [<para>O <application>Sendmail</application> a aplica誽o
+ <programlisting><![CDATA[<para>O <application>Sendmail</application> a aplica誽o
de email mais utilizada em Unix.</para>
<para>O <application>Sendmail</application> inclui os programas
@@ -2046,7 +2047,7 @@ para a arquitetura Intel.</para>]]></programlisting>
<para>Uso:</para>
- <programlisting><![ RCDATA [<para>O fonte SGML do Handbook em Ingl瘰 pode ser encotrado em
+ <programlisting><![CDATA[<para>O fonte SGML do Handbook em Ingl瘰 pode ser encotrado em
<filename class="directory">/usr/doc/en_US.ISO8859-1/books/handbook/</filename>.
O primeiro arquivo neste diret鏎io chamado <filename>book.xml</filename>.
Voc tamb幦 deve ver o <filename>Makefile</filename>
@@ -2092,7 +2093,7 @@ para a arquitetura Intel.</para>]]></programlisting>
<para>Use:</para>
- <programlisting><![ RCDATA [<para>Instale o port <filename role="package">net/ethereal</filename>
+ <programlisting><![CDATA[<para>Instale o port <filename role="package">net/ethereal</filename>
para ver o tr塻ego na rede.</para>]]></programlisting>
<para>Apar瘽cia:</para>
@@ -2131,7 +2132,7 @@ para ver o tr塻ego na rede.</para>]]></programlisting>
<para>Uso:</para>
- <programlisting><![ RCDATA [
+ <programlisting><![CDATA[
<para><devicename>sio</devicename> usado para comunica誽o
serial no FreeBSD. <devicename>sio</devicename> se manifesta
atrav廥 de entradas em <filename>/dev</filename>, incluindo
@@ -2269,7 +2270,7 @@ para ver o tr塻ego na rede.</para>]]></programlisting>
<para>Use:</para>
- <programlisting><![ RCDATA [
+ <programlisting><![CDATA[
<para>A m嫭uina local sempre pode ser referida pelo nome
<hostid>localhost</hostid>, que ter o endere蔞 IP
<hostid role="ipaddr">127.0.0.1</hostid>.</para>
@@ -2339,7 +2340,7 @@ role="mac">08:00:20:87:ef:d0</hostid>).</para>
<para>Uso:</para>
- <programlisting><![ RCDATA [<para>Para executar a maioria das fun踥es administrativas voc precisar
+ <programlisting><![CDATA[<para>Para executar a maioria das fun踥es administrativas voc precisar
ser <username>root</username>.</para>]]></programlisting>
<para>Apar瘽cia:</para>
@@ -2382,7 +2383,7 @@ role="mac">08:00:20:87:ef:d0</hostid>).</para>
<para>Uso:</para>
- <programlisting><![ RCDATA [
+ <programlisting><![CDATA[
<para>Dois alvos comuns em um <filename>Makefile</filename> s緌
<maketarget>all</maketarget> e <maketarget>clean</maketarget>.</para>
@@ -2441,7 +2442,7 @@ muitas vari嫛eis, incluindo <makevar>CLOBBER</makevar> e
<para>Uso:</para>
- <programlisting><![ RCDATA [ <para>A linha <literal>maxusers 10</literal> no arquivo de
+ <programlisting><![CDATA[ <para>A linha <literal>maxusers 10</literal> no arquivo de
configura誽o do kernel determina o tamanho de muitas tabelas
do sistema, e diz aproximadamente quantos logins simult滱eos
o sistema ir suportar.</para>
@@ -2479,7 +2480,7 @@ o sistema ir suportar.</para>
<para>Uso:</para>
- <programlisting><![ CDATA [<screen>&prompt.user; <userinput>man <replaceable>command</replaceable></userinput></screen>]]></programlisting>
+ <programlisting><![CDATA[<screen>&prompt.user; <userinput>man <replaceable>command</replaceable></userinput></screen>]]></programlisting>
<para>Apar瘽cia:</para>
@@ -2497,7 +2498,7 @@ o sistema ir suportar.</para>
<para>Uso:</para>
- <programlisting><![ RCDATA [
+ <programlisting><![CDATA[
<para>A linha <literal>maxusers <replaceable>n</replaceable></literal>
no arquivo de configura誽o do kernel determina o tamanho de muitas
tabelas do sistema, e diz aproximadamente quantos logins simult滱eos
@@ -2533,7 +2534,7 @@ bom valor para <replaceable>n</replaceable>.</para>
<para>Uso:</para>
- <programlisting><![ RCDATA [
+ <programlisting><![CDATA[
<screen><errorname>Panic: cannot mount root</errorname></screen> ]]>
</programlisting>
@@ -2849,7 +2850,7 @@ IMAGES= chapter1/fig1.png
<title>O atributo <literal>id</literal> em cap癃ulos
ou se踥es</title>
- <programlisting><![ RCDATA [<chapter id="chapter1">
+ <programlisting><![CDATA[<chapter id="chapter1">
<title>Introdu誽o</title>
<para>Esta a introdu誽o. Cont幦 uma
@@ -2881,7 +2882,7 @@ IMAGES= chapter1/fig1.png
<example>
<title><sgmltag>anchor</sgmltag></title>
- <programlisting><![ RCDATA [<para>
+ <programlisting><![CDATA[<para>
Este par墔rafo tem um <anchor id="para1">alvo dentro dele.
O qual n緌 ir aparecer no documento
</para>]]></programlisting>
@@ -2912,7 +2913,7 @@ O qual n緌 ir aparecer no documento
lugar de um documento que inclua o <literal>id</literal>
do exemplo.</para>
- <programlisting><![ RCDATA [
+ <programlisting><![CDATA[
<para>Maiores informa踥es podem ser encontradas
em <xref linkend="chapter1"/></para>
@@ -2961,7 +2962,7 @@ O qual n緌 ir aparecer no documento
um documento que inclui o <literal>id</literal> do
exemplo.</para>
- <programlisting><![ RCDATA [
+ <programlisting><![CDATA[
<para>Maiores informa踥es podem ser encontradas
<link linkend="chapter1">no primeiro cap癃ulo</link>.
</para>
@@ -3021,7 +3022,7 @@ O qual n緌 ir aparecer no documento
<para>Uso:</para>
- <programlisting><![ RCDATA [
+ <programlisting><![CDATA[
<para> claro que voc pode parar de ler este documento e ir para a
<ulink url="&url.base;/index.html">P墔ina principal do FreeBSD</ulink>
</para>
diff --git a/pt_BR.ISO8859-1/books/fdp-primer/sgml-primer/chapter.xml b/pt_BR.ISO8859-1/books/fdp-primer/sgml-primer/chapter.xml
index 0e47df9f10..8d056ae206 100644
--- a/pt_BR.ISO8859-1/books/fdp-primer/sgml-primer/chapter.xml
+++ b/pt_BR.ISO8859-1/books/fdp-primer/sgml-primer/chapter.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
<!-- Copyright (c) 1998, 1999 Nik Clayton, All rights reserved.
Redistribution and use in source (SGML DocBook) and 'compiled' forms
@@ -128,7 +129,7 @@
<para>O exemplo acima foi na verdade escrito neste documento
como se segue:</para>
- <programlisting><![ CDATA [
+ <programlisting><![CDATA[
<para>Para remover <filename>/tmp/foo</filename> utilize &man.rm.1;.</para>
<screen>&prompt.user; <userinput>rm /tmp/foo</userinput></screen>]]></programlisting>
@@ -291,7 +292,7 @@
elemento possui ambas as tags de in獳io e de fim.
</para>
- <programlisting><![ RCDATA [<p>Este um par墔rafo. Ele inicia com a tag de inicio do
+ <programlisting><![CDATA[<p>Este um par墔rafo. Ele inicia com a tag de inicio do
elemento 'p', e ir terminar com a tag de fim para o
elemento 'p'.</p>
@@ -315,7 +316,7 @@
n緌 cont幦 nenhum contedo, assim ele
possui apenas uma tag de inicio.</para>
- <programlisting><![ RCDATA [<p>Este um par墔rafo.</p>
+ <programlisting><![CDATA[<p>Este um par墔rafo.</p>
<hr>
@@ -333,7 +334,7 @@
<title>Elementos contendo elementos; <sgmltag>em</sgmltag>
</title>
- <programlisting><![ RCDATA [<p>Este um <em>par墔rafo</em> simples no qual
+ <programlisting><![CDATA[<p>Este um <em>par墔rafo</em> simples no qual
algumas das <em>palavras</em> foram <em>enfatizadas</em>.</p>]]></programlisting>
</example>
@@ -395,7 +396,7 @@
<example>
<title>Utilizando um elemento com um atributo</title>
- <programlisting><![ RCDATA [<p align="left">A inclus緌 de um atributo de alinhamento neste
+ <programlisting><![CDATA[<p align="left">A inclus緌 de um atributo de alinhamento neste
par墔rafo foi sup廨fluo, uma vez que o alinhamento
padr緌 left (esquerda).</p>
@@ -413,7 +414,7 @@
<example>
<title>Aspas simples envolta de atributos</title>
- <programlisting><![ RCDATA [<p align='right'>Eu estou a direita!</p>]]></programlisting>
+ <programlisting><![CDATA[<p align='right'>Eu estou a direita!</p>]]></programlisting>
</example>
<para>Algumas vezes voc n緌 precisa utilizar aspas
@@ -504,7 +505,7 @@ setenv SGML_CATALOG_FILES /usr/doc/en_US.ISO8859-1/share/xml/catalog:$SGML_CATAL
<para>Crie o arquivo <filename>example.xml</filename>, e
entre com o seguinte texto:</para>
- <programlisting><![ RCDATA [<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+ <programlisting><![CDATA[<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
<html>
<head>
@@ -677,7 +678,7 @@ onsgmls:example.xml:6:8:E: end tag for "HEAD" which is not finished</screen>
documento escrito para conformar-se com a vers緌 4.0
do DTD HTML se parece com esta:</para>
- <programlisting><![ RCDATA [<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0//EN">]]></programlisting>
+ <programlisting><![CDATA[<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0//EN">]]></programlisting>
<para>Esta linha cont幦 diferentes componentes.</para>
@@ -941,7 +942,7 @@ onsgmls:example.xml:6:8:E: end tag for "HEAD" which is not finished</screen>
<para>A sintaxe para isto ligeiramente diferente:
</para>
- <programlisting><![ RCDATA [<!DOCTYPE html SYSTEM "/path/to/file.dtd">]]></programlisting>
+ <programlisting><![CDATA[<!DOCTYPE html SYSTEM "/path/to/file.dtd">]]></programlisting>
<para>A palavra chave <literal>SYSTEM</literal> indica que o
processador SGML deve encontrar o DTD em um local
@@ -1007,7 +1008,7 @@ onsgmls:example.xml:6:8:E: end tag for "HEAD" which is not finished</screen>
<programlisting>&lt;!-- Teste de coment嫫io --></programlisting>
- <programlisting><![ RCDATA [
+ <programlisting><![CDATA[
<!-- Este o interior do coment嫫io -->
<!-- Este outro coment嫫io -->
@@ -1019,29 +1020,6 @@ onsgmls:example.xml:6:8:E: end tag for "HEAD" which is not finished</screen>
-- de fazer coment嫫ios de v嫫ias linhas -->]]></programlisting>
</example>
- <![ %output.print; [
- <important>
- <title>Utilize 2 tra蔞s</title>
-
- <para>Existe um problema com a produ誽o de
- vers髊s Postscript e PDF deste documento. O exemplo
- acima provavelmente mostra apenas um s璥bolo de
- h璗en, <literal>-</literal> depois do
- <literal>&lt;!</literal> e antes do <literal>&gt;</literal>.
- </para>
-
- <para>Voc <emphasis>deve</emphasis> utilizar dois
- <literal>-</literal> e <emphasis>n緌</emphasis> um.
- As vers髊s Postscript e PDF traduzem os dois
- <literal>-</literal> do original para um mais longo, e mais
- profissional <emphasis>em-dash</emphasis>, e quebra este
- exemplo no processo.</para>
-
- <para>As vers髊s HTML, texto plano, e RTF deste
- documento n緌 s緌 afetadas.</para>
- </important>
- ]]>
-
<para>Se voc j utilizou HTML antes, voc pode ter
sido exposto a regras diferentes para coment嫫ios. Em
particular, voc pode pensar que o conjunto de caracteres
@@ -1059,7 +1037,7 @@ onsgmls:example.xml:6:8:E: end tag for "HEAD" which is not finished</screen>
<example>
<title>Coment嫫ios SGML errados</title>
- <programlisting><![ RCDATA [
+ <programlisting><![CDATA[
<!-- Este o coment嫫io --
Isto est fora do coment嫫io!
@@ -1074,12 +1052,12 @@ onsgmls:example.xml:6:8:E: end tag for "HEAD" which is not finished</screen>
<para>Isto n緌 um SGML v嫮ido, e pode
dar mensagens de erro confusas.</para>
- <programlisting><![ RCDATA [<!--------------- Isto uma id嶯a muito ruim --------------->]]></programlisting>
+ <programlisting><![CDATA[<!--------------- Isto uma id嶯a muito ruim --------------->]]></programlisting>
<para>E como o exemplo sugere, <emphasis>n緌 escreva
</emphasis> coment嫫ios como esse.</para>
- <programlisting><![ RCDATA [<!--===================================================-->]]></programlisting>
+ <programlisting><![CDATA[<!--===================================================-->]]></programlisting>
<para>Esta uma abordagem (ligeiramente) melhor, mas
ele ainda potencialmente confuso para as pessoas
@@ -1147,7 +1125,7 @@ onsgmls:example.xml:6:8:E: end tag for "HEAD" which is not finished</screen>
expande para a vers緌 atual do seu produto.
Voc pode escrever:</para>
- <programlisting><![ RCDATA [<para>A vers緌 atual do nosso produto &amp;current.version;.</para>]]></programlisting>
+ <programlisting><![CDATA[<para>A vers緌 atual do nosso produto &amp;current.version;.</para>]]></programlisting>
<para>Quando o nmero de vers緌 mudar,
voc pode simplesmente alterar a defini誽o
@@ -1180,7 +1158,7 @@ onsgmls:example.xml:6:8:E: end tag for "HEAD" which is not finished</screen>
<example>
<title>Definindo uma entidade geral</title>
- <programlisting><![ RCDATA [<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0//EN" [
+ <programlisting><![CDATA[<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0//EN" [
<!ENTITY current.version "3.0-RELEASE">
<!ENTITY last.version "2.2.7-RELEASE">
]>]]></programlisting>
@@ -1227,7 +1205,7 @@ onsgmls:example.xml:6:8:E: end tag for "HEAD" which is not finished</screen>
<example>
<title>Definindo entidades de par滵etros</title>
- <programlisting><![ RCDATA [<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0//EN" [
+ <programlisting><![CDATA[<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0//EN" [
<!ENTITY % param.some "some">
<!ENTITY % param.text "text">
<!ENTITY % param.new "%param.some more %param.text">
@@ -1249,7 +1227,7 @@ onsgmls:example.xml:6:8:E: end tag for "HEAD" which is not finished</screen>
<para>Adicione uma entidade geral ao
<filename>example.xml</filename>.</para>
- <programlisting><![ RCDATA [<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" [
+ <programlisting><![CDATA[<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" [
<!ENTITY version "1.1">
]>
@@ -1362,7 +1340,7 @@ onsgmls:example.xml:6:8:E: end tag for "HEAD" which is not finished</screen>
<title>Utilizando entidades gerais para incluir
arquivos</title>
- <programlisting><![ CDATA [<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0//EN" [
+ <programlisting><![CDATA[<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0//EN" [
<!ENTITY chapter.1 SYSTEM "chapter1.xml">
<!ENTITY chapter.2 SYSTEM "chapter2.xml">
<!ENTITY chapter.3 SYSTEM "chapter3.xml">
@@ -1424,7 +1402,7 @@ onsgmls:example.xml:6:8:E: end tag for "HEAD" which is not finished</screen>
<filename>chapters.ent</filename>. Este arquivo
cont幦 o seguinte:</para>
- <programlisting><![ RCDATA [<!ENTITY chapter.1 SYSTEM "chapter1.xml">
+ <programlisting><![CDATA[<!ENTITY chapter.1 SYSTEM "chapter1.xml">
<!ENTITY chapter.2 SYSTEM "chapter2.xml">
<!ENTITY chapter.3 SYSTEM "chapter3.xml">]]></programlisting>
@@ -1435,7 +1413,7 @@ onsgmls:example.xml:6:8:E: end tag for "HEAD" which is not finished</screen>
dispon癉eis para uso. Feito isso, utilize as
entidades gerais como antes;</para>
- <programlisting><![ RCDATA [<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0//EN" [
+ <programlisting><![CDATA[<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0//EN" [
<!-- Define uma entidade de par滵etro para carregar as entidades gerais de capitulo -->
<!ENTITY % chapters SYSTEM "chapters.ent">
@@ -1468,14 +1446,14 @@ onsgmls:example.xml:6:8:E: end tag for "HEAD" which is not finished</screen>
<para>Coloque um contedo similar ao seguinte em
cada arquivo:</para>
- <programlisting><![ RCDATA [<p>Este o primeiro par墔rafo.</p>]]></programlisting>
+ <programlisting><![CDATA[<p>Este o primeiro par墔rafo.</p>]]></programlisting>
</step>
<step>
<para>Edite o arquivo <filename>example.xml</filename>
para que ele se pare蓷 com este:</para>
- <programlisting><![ RCDATA [<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0//EN" [
+ <programlisting><![CDATA[<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0//EN" [
<!ENTITY version "1.1">
<!ENTITY para1 SYSTEM "para1.xml">
<!ENTITY para2 SYSTEM "para2.xml">
@@ -1532,7 +1510,7 @@ onsgmls:example.xml:6:8:E: end tag for "HEAD" which is not finished</screen>
<filename>example.xml</filename> para que ele se
pare蓷 com este:</para>
- <programlisting><![ RCDATA [<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0//EN" [
+ <programlisting><![CDATA[<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0//EN" [
<!ENTITY % entities SYSTEM "entities.xml"> %entities;
]>
@@ -1556,7 +1534,7 @@ onsgmls:example.xml:6:8:E: end tag for "HEAD" which is not finished</screen>
<filename>entities.xml</filename>, com este
contedo:</para>
- <programlisting><![ RCDATA [<!ENTITY version "1.1">
+ <programlisting><![CDATA[<!ENTITY version "1.1">
<!ENTITY para1 SYSTEM "para1.xml">
<!ENTITY para2 SYSTEM "para2.xml">
<!ENTITY para3 SYSTEM "para3.xml">]]></programlisting>
@@ -1601,7 +1579,7 @@ onsgmls:example.xml:6:8:E: end tag for "HEAD" which is not finished</screen>
<para>Como voc esperaria, sendo uma
constru誽o SGML, uma sess緌
- marcada inicia com um <literal>&lt!</literal>.</para>
+ marcada inicia com um <literal>&lt;!</literal>.</para>
<para>O primeiro colchete come蓷 a limitar a sess緌
marcada.</para>
@@ -1697,29 +1675,29 @@ onsgmls:example.xml:6:8:E: end tag for "HEAD" which is not finished</screen>
<title>Utilizando uma sess緌 marcada como
CDATA</title>
- <programlisting>&lt;para>Aqui est um exemplo de como voc incluiria algum texto que contenha muitos
- s璥bolos &lt;literal>&amp;lt;&lt;/literal> e &lt;literal>&amp;amp;&lt;/literal>.
+ <programlisting>&lt;para&gt;Aqui est um exemplo de como voc incluiria algum texto que contenha muitos
+ s璥bolos &lt;literal&gt;&lt;&lt;/literal&gt; e &lt;literal&gt;&gt;&lt;/literal&gt;.
O texto de exemplo um fragmento de HTML.
- O texto circunvizinho (&lt;para> e &lt;programlisting>) do
- DocBook.&lt;/para>
+ O texto circunvizinho (&lt;para&gt; e &lt;programlisting&gt;) do
+ DocBook.&lt;/para&gt;
-&lt;programlisting>
- &lt;![ CDATA [ <![ RCDATA [
- <p>Esta uma amostra que apresenta alguns elementos de HTML.
- Uma vez que os s璥bolos de < e > s緌 utilizados muitas vezes,
+&lt;programlisting&gt;
+ &lt;![CDATA[&gt;![RCDATA[
+ &lt;p&gt;Esta uma amostra que apresenta alguns elementos de HTML.
+ Uma vez que os s璥bolos de &lt; e &gt; s緌 utilizados muitas vezes,
mais f塶il dizer que o exemplo todo uma sess緌 marcada do
tipo CDATA, do que utilizar nomes de entidades para representar
- estes s璥bolos ao longo de todo o texto.</p>
+ estes s璥bolos ao longo de todo o texto.&lt;/p&gt;
- <ul>
- <li>Este um item de lista</li>
- <li>Este um segundo item de lista</li>
- <li>Este um terceiro item de lista</li>
- </ul>
+ &lt;ul&gt;
+ &lt;li&gt;Este um item de lista&lt;/li&gt;
+ &lt;li&gt;Este um segundo item de lista&lt;/li&gt;
+ &lt;li&gt;Este um terceiro item de lista&lt;/li&gt;
+ &lt;/ul&gt;
- <p>Este o final do exemplo.</p>]]>
+ &lt;p&gt;Este o final do exemplo.&lt;/p&gt;]]&gt;
]]&gt;
-&lt;/programlisting></programlisting>
+&lt;/programlisting&gt;</programlisting>
<para>Se voc examinar o fonte deste documento
voc ir ver que esta t嶰nica foi
@@ -1833,7 +1811,7 @@ onsgmls:example.xml:6:8:E: end tag for "HEAD" which is not finished</screen>
&lt;/head>
&lt;body>
- &lt;p>Este par墔rafo &lt;![ CDATA [cont瘱 muitos caracteres &lt;
+ &lt;p>Este par墔rafo &lt;![CDATA[cont瘱 muitos caracteres &lt;
(&lt; &lt; &lt; &lt; &lt;) de forma que mais simples utilizar
uma sess緌 marcada do tipo CDATA.]]&gt;&lt;/p>
@@ -1842,7 +1820,7 @@ onsgmls:example.xml:6:8:E: end tag for "HEAD" which is not finished</screen>
no output.&lt;/p>
]]&gt;
- &lt;![ <![ CDATA [%text.output]]> [
+ &lt;![ <![CDATA[%text.output]]> [
&lt;p>Este par墔rafo pode ou n緌 aparecer no output.&lt;/p>
&lt;p>A sua ocorr瘽cia controlada pela entidade de par滵etro <![CDATA[%text.output]]>
diff --git a/pt_BR.ISO8859-1/books/fdp-primer/structure/chapter.xml b/pt_BR.ISO8859-1/books/fdp-primer/structure/chapter.xml
index 8ea88855db..3fa3afbfc5 100644
--- a/pt_BR.ISO8859-1/books/fdp-primer/structure/chapter.xml
+++ b/pt_BR.ISO8859-1/books/fdp-primer/structure/chapter.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
<!-- Copyright (c) 1998, 1999 Nik Clayton, All rights reserved.
Redistribution and use in source (SGML DocBook) and 'compiled' forms
@@ -273,7 +274,7 @@
<para>Por exemplo, se um dos arquivos de cap癃ulos
contiver:</para>
- <programlisting><![ CDATA [
+ <programlisting><![CDATA[
<chapter id="kernelconfig">
...
</chapter>]]></programlisting>
diff --git a/pt_BR.ISO8859-1/books/fdp-primer/stylesheets/chapter.xml b/pt_BR.ISO8859-1/books/fdp-primer/stylesheets/chapter.xml
index d95a8c4e5a..b7c995dcbb 100644
--- a/pt_BR.ISO8859-1/books/fdp-primer/stylesheets/chapter.xml
+++ b/pt_BR.ISO8859-1/books/fdp-primer/stylesheets/chapter.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
<!-- Copyright (c) 1998, 1999 Nik Clayton, All rights reserved.
Redistribution and use in source (SGML DocBook) and 'compiled' forms
diff --git a/pt_BR.ISO8859-1/books/fdp-primer/the-website/chapter.xml b/pt_BR.ISO8859-1/books/fdp-primer/the-website/chapter.xml
index a394aca615..bb06f9f16e 100755
--- a/pt_BR.ISO8859-1/books/fdp-primer/the-website/chapter.xml
+++ b/pt_BR.ISO8859-1/books/fdp-primer/the-website/chapter.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
<!-- Copyright (c) 1998, 1999 Nik Clayton, All rights reserved.
Redistribution and use in source (SGML DocBook) and 'compiled' forms
diff --git a/pt_BR.ISO8859-1/books/fdp-primer/tools/chapter.xml b/pt_BR.ISO8859-1/books/fdp-primer/tools/chapter.xml
index 6443e1f55a..b52d29dfcd 100644
--- a/pt_BR.ISO8859-1/books/fdp-primer/tools/chapter.xml
+++ b/pt_BR.ISO8859-1/books/fdp-primer/tools/chapter.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
<!-- Copyright (c) 1998, 1999 Nik Clayton, All rights reserved.
Redistribution and use in source (SGML DocBook) and 'compiled' forms
diff --git a/pt_BR.ISO8859-1/books/fdp-primer/translations/chapter.xml b/pt_BR.ISO8859-1/books/fdp-primer/translations/chapter.xml
index 37a505063e..43ab1fe556 100644
--- a/pt_BR.ISO8859-1/books/fdp-primer/translations/chapter.xml
+++ b/pt_BR.ISO8859-1/books/fdp-primer/translations/chapter.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
<!-- Copyright (c) 1999 Nik Clayton, All rights reserved.
Redistribution and use in source (SGML DocBook) and 'compiled' forms
diff --git a/pt_BR.ISO8859-1/books/fdp-primer/writing-style/chapter.xml b/pt_BR.ISO8859-1/books/fdp-primer/writing-style/chapter.xml
index b921a9c2b4..824e5e6284 100755
--- a/pt_BR.ISO8859-1/books/fdp-primer/writing-style/chapter.xml
+++ b/pt_BR.ISO8859-1/books/fdp-primer/writing-style/chapter.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
<!-- Copyright (c) 1998 Nik Clayton, All rights reserved.
Redistribution and use in source (SGML DocBook) and 'compiled' forms
@@ -212,7 +213,7 @@
<para>O texto que aparece em contextos do SGML
escrito geralmente em caixa alta,
- <literal>&lt!ENTITY&hellip;&gt;</literal>, e
+ <literal>&lt;!ENTITY&hellip;&gt;</literal>, e
<literal>&lt;!DOCTYPE&hellip;&gt;</literal>,
<emphasis>n緌</emphasis>
<literal>&lt;!entity&hellip;&gt;</literal> e
@@ -266,7 +267,7 @@
<para>Por exemplo, o c鏚igo para esta
se誽o seria algo como:</para>
- <programlisting><![ CDATA [+--- This is column 0
+ <programlisting><![CDATA[+--- This is column 0
V
<chapter>
<title>...</title>
@@ -319,7 +320,7 @@ augroup END</programlisting>
que um Tag precedente n緌, observe:</para>
<informalexample>
- <programlisting><![ CDATA [<article>
+ <programlisting><![CDATA[<article>
<articleinfo>
<title>NIS</title>
@@ -431,13 +432,13 @@ augroup END</programlisting>
<listitem>
<para>Entre nmeros e suas unidades:</para>
- <programlisting><![ CDATA [57600&nbsp;bps]]></programlisting>
+ <programlisting><![CDATA[57600&nbsp;bps]]></programlisting>
</listitem>
<listitem>
<para>Entre os nomes dos programas e os seus
nmeros de vers緌:</para>
- <programlisting><![ CDATA [FreeBSD&nbsp;4.7]]></programlisting>
+ <programlisting><![CDATA[FreeBSD&nbsp;4.7]]></programlisting>
</listitem>
<listitem>
@@ -445,7 +446,7 @@ augroup END</programlisting>
estiver lidando com nomes com mais de 3 ou 4 palavras,
como por exemplo, <quote>The FreeBSD Brazilian
Portuguese Documentation Project</quote>):</para>
- <programlisting><![ CDATA [Sun&nbsp;Microsystems]]></programlisting>
+ <programlisting><![CDATA[Sun&nbsp;Microsystems]]></programlisting>
</listitem>
</itemizedlist>
</sect2>
diff --git a/pt_BR.ISO8859-1/books/handbook/advanced-networking/chapter.xml b/pt_BR.ISO8859-1/books/handbook/advanced-networking/chapter.xml
index e2a07b58fe..c27c77d75a 100644
--- a/pt_BR.ISO8859-1/books/handbook/advanced-networking/chapter.xml
+++ b/pt_BR.ISO8859-1/books/handbook/advanced-networking/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
The FreeBSD Brazilian Portuguese Documentation Project
diff --git a/pt_BR.ISO8859-1/books/handbook/basics/chapter.xml b/pt_BR.ISO8859-1/books/handbook/basics/chapter.xml
index c502727cf0..f20e86067b 100644
--- a/pt_BR.ISO8859-1/books/handbook/basics/chapter.xml
+++ b/pt_BR.ISO8859-1/books/handbook/basics/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
The FreeBSD Brazilian Portuguese Documentation Project
diff --git a/pt_BR.ISO8859-1/books/handbook/bibliography/chapter.xml b/pt_BR.ISO8859-1/books/handbook/bibliography/chapter.xml
index b6b7c23f60..2d69c1fca6 100644
--- a/pt_BR.ISO8859-1/books/handbook/bibliography/chapter.xml
+++ b/pt_BR.ISO8859-1/books/handbook/bibliography/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
The FreeBSD Brazilian Portuguese Documentation Project
diff --git a/pt_BR.ISO8859-1/books/handbook/book.xml b/pt_BR.ISO8859-1/books/handbook/book.xml
index 5aac2b2eed..1ed47e2d5e 100644
--- a/pt_BR.ISO8859-1/books/handbook/book.xml
+++ b/pt_BR.ISO8859-1/books/handbook/book.xml
@@ -1,8 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//PT" "../../share/xml/entities.ent">
-%entities;
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd" [
<!ENTITY % chapters SYSTEM "chapters.ent"> %chapters;
]>
diff --git a/pt_BR.ISO8859-1/books/handbook/boot/chapter.xml b/pt_BR.ISO8859-1/books/handbook/boot/chapter.xml
index 5d4e863cda..51a9654664 100644
--- a/pt_BR.ISO8859-1/books/handbook/boot/chapter.xml
+++ b/pt_BR.ISO8859-1/books/handbook/boot/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
The FreeBSD Brazilian Portuguese Documentation Project
diff --git a/pt_BR.ISO8859-1/books/handbook/chapters.ent b/pt_BR.ISO8859-1/books/handbook/chapters.ent
index 75fef0877f..e493b62744 100644
--- a/pt_BR.ISO8859-1/books/handbook/chapters.ent
+++ b/pt_BR.ISO8859-1/books/handbook/chapters.ent
@@ -13,228 +13,57 @@
Chapters should be listed in the order in which they are referenced.
-->
-<!ENTITY % not.published "INCLUDE">
-
-<!ENTITY % chap.introduction "IGNORE">
-<!ENTITY % chap.install "IGNORE">
-<!ENTITY % chap.basics "IGNORE">
-<!ENTITY % chap.ports "IGNORE">
-<!ENTITY % chap.config "IGNORE">
-<!ENTITY % chap.boot "IGNORE">
-<!ENTITY % chap.users "IGNORE">
-<!ENTITY % chap.kernelconfig "IGNORE">
-<!ENTITY % chap.security "IGNORE">
-<!ENTITY % chap.jails "IGNORE">
-<!ENTITY % chap.printing "IGNORE">
-<!ENTITY % chap.disks "IGNORE">
-<!ENTITY % chap.geom "IGNORE">
-<!ENTITY % chap.vinum "IGNORE">
-<!ENTITY % chap.x11 "IGNORE">
-<!ENTITY % chap.l10n "IGNORE">
-<!ENTITY % chap.multimedia "IGNORE">
-<!ENTITY % chap.desktop "IGNORE">
-<!ENTITY % chap.serialcomms "IGNORE">
-<!ENTITY % chap.ppp-and-slip "IGNORE">
-<!ENTITY % chap.advanced-networking "IGNORE">
-<!ENTITY % chap.firewalls "IGNORE">
-<!ENTITY % chap.network-servers "IGNORE">
-<!ENTITY % chap.mail "IGNORE">
-<!ENTITY % chap.cutting-edge "IGNORE">
-<!ENTITY % chap.linuxemu "IGNORE">
-<!ENTITY % chap.mirrors "IGNORE">
-<!ENTITY % chap.mirrors.ftp.inc "INCLUDE">
-<!ENTITY % chap.mirrors.cvsup.inc "INCLUDE">
-<!ENTITY % chap.bibliography "IGNORE">
-<!ENTITY % chap.eresources "IGNORE">
-<!ENTITY % chap.eresources.www.inc "INCLUDE">
-<!ENTITY % chap.pgpkeys "IGNORE">
-<!ENTITY % chap.index "IGNORE">
-<!ENTITY % chap.freebsd-glossary "IGNORE">
-<!ENTITY % chap.mac "IGNORE">
-<!ENTITY % chap.audit "IGNORE">
-<!ENTITY % chap.filesystems "IGNORE">
-<!ENTITY % chap.dtrace "IGNORE">
<!ENTITY chap.preface SYSTEM "preface/preface.xml">
<!ENTITY % pgpkeys SYSTEM "../../../share/pgpkeys/pgpkeys.ent"> %pgpkeys;
<!-- Part One -->
-<![%chap.introduction;[
<!ENTITY chap.introduction SYSTEM "introduction/chapter.xml">
-]]>
-<![%chap.install;[
<!ENTITY chap.install SYSTEM "install/chapter.xml">
-]]>
-<![%chap.basics;[
<!ENTITY chap.basics SYSTEM "basics/chapter.xml">
-]]>
-<![%chap.ports;[
<!ENTITY chap.ports SYSTEM "ports/chapter.xml">
-]]>
-<![%chap.x11;[
<!ENTITY chap.x11 SYSTEM "x11/chapter.xml">
-]]>
<!-- Part Two -->
-<![%chap.desktop;[
<!ENTITY chap.desktop SYSTEM "desktop/chapter.xml">
-]]>
-<![%chap.multimedia;[
<!ENTITY chap.multimedia SYSTEM "multimedia/chapter.xml">
-]]>
-<![%chap.kernelconfig;[
<!ENTITY chap.kernelconfig SYSTEM "kernelconfig/chapter.xml">
-]]>
-<![%chap.printing;[
<!ENTITY chap.printing SYSTEM "printing/chapter.xml">
-]]>
-<![%chap.linuxemu;[
<!ENTITY chap.linuxemu SYSTEM "linuxemu/chapter.xml">
-]]>
<!-- Part Three -->
-<![%chap.config;[
<!ENTITY chap.config SYSTEM "config/chapter.xml">
-]]>
-<![%chap.boot;[
<!ENTITY chap.boot SYSTEM "boot/chapter.xml">
-]]>
-<![%chap.users;[
<!ENTITY chap.users SYSTEM "users/chapter.xml">
-]]>
-<![%chap.security;[
<!ENTITY chap.security SYSTEM "security/chapter.xml">
-]]>
-<![%chap.jails;[
<!ENTITY chap.jails SYSTEM "jails/chapter.xml">
-]]>
-<![%chap.mac;[
<!ENTITY chap.mac SYSTEM "mac/chapter.xml">
-]]>
-<![%chap.audit;[
<!ENTITY chap.audit SYSTEM "audit/chapter.xml">
-]]>
-<![%chap.disks;[
<!ENTITY chap.disks SYSTEM "disks/chapter.xml">
-]]>
-<![%chap.geom;[
<!ENTITY chap.geom SYSTEM "geom/chapter.xml">
-]]>
-<![%chap.filesystems;[
<!ENTITY chap.filesystems SYSTEM "filesystems/chapter.xml">
-]]>
-<![%chap.vinum;[
<!ENTITY chap.vinum SYSTEM "vinum/chapter.xml">
-]]>
-<![%chap.l10n;[
<!ENTITY chap.l10n SYSTEM "l10n/chapter.xml">
-]]>
-<![%chap.cutting-edge;[
<!ENTITY chap.cutting-edge SYSTEM "cutting-edge/chapter.xml">
-]]>
-<![%chap.dtrace;[
<!ENTITY chap.dtrace SYSTEM "dtrace/chapter.xml">
-]]>
<!-- Part Four -->
-<![%chap.serialcomms;[
<!ENTITY chap.serialcomms SYSTEM "serialcomms/chapter.xml">
-]]>
-<![%chap.ppp-and-slip;[
<!ENTITY chap.ppp-and-slip SYSTEM "ppp-and-slip/chapter.xml">
-]]>
-<![%chap.mail;[
<!ENTITY chap.mail SYSTEM "mail/chapter.xml">
-]]>
-<![%chap.network-servers;[
<!ENTITY chap.network-servers SYSTEM "network-servers/chapter.xml">
-]]>
-<![%chap.firewalls;[
<!ENTITY chap.firewalls SYSTEM "firewalls/chapter.xml">
-]]>
-<![%chap.advanced-networking;[
<!ENTITY chap.advanced-networking SYSTEM "advanced-networking/chapter.xml">
-]]>
<!-- Part Five (appendices) -->
-<![%chap.mirrors;[
<!ENTITY chap.mirrors SYSTEM "mirrors/chapter.xml">
-]]>
-<![%chap.mirrors.ftp.inc;[
<!ENTITY chap.mirrors.ftp.inc SYSTEM "mirrors.xml.ftp.inc">
-]]>
-<![%chap.mirrors.cvsup.inc;[
<!ENTITY chap.mirrors.cvsup.inc SYSTEM "mirrors.xml.cvsup.inc">
-]]>
-<![%chap.bibliography;[
<!ENTITY chap.bibliography SYSTEM "bibliography/chapter.xml">
-]]>
-<![%chap.eresources;[
<!ENTITY chap.eresources SYSTEM "eresources/chapter.xml">
-]]>
-<![%chap.eresources.www.inc;[
<!ENTITY chap.eresources.www.inc SYSTEM "eresources.xml.www.inc">
-]]>
-<![%chap.pgpkeys;[
<!ENTITY chap.pgpkeys SYSTEM "pgpkeys/chapter.xml">
-]]>
-<![%chap.freebsd-glossary;[
<!ENTITY chap.freebsd-glossary "&freebsd-glossary;">
-]]>
-<![%chap.index;[
- <!ENTITY chap.index SYSTEM "index.xml">
-]]>
+ <!ENTITY chap.index "">
<!ENTITY chap.colophon SYSTEM "colophon.xml">
-
-<!-- IGNORE cases -->
-
-<!-- Part One -->
-<!ENTITY chap.introduction "">
-<!ENTITY chap.install "">
-<!ENTITY chap.basics "">
-<!ENTITY chap.ports "">
-<!ENTITY chap.x11 "">
-
-<!-- Part Two -->
-<!ENTITY chap.desktop "">
-<!ENTITY chap.multimedia "">
-<!ENTITY chap.kernelconfig "">
-<!ENTITY chap.printing "">
-<!ENTITY chap.linuxemu "">
-
-<!-- Part Three -->
-<!ENTITY chap.config "">
-<!ENTITY chap.boot "">
-<!ENTITY chap.users "">
-<!ENTITY chap.security "">
-<!ENTITY chap.jails "">
-<!ENTITY chap.mac "">
-<!ENTITY chap.audit "">
-<!ENTITY chap.disks "">
-<!ENTITY chap.geom "">
-<!ENTITY chap.filesystems "">
-<!ENTITY chap.vinum "">
-<!ENTITY chap.virtualization "">
-<!ENTITY chap.l10n "">
-<!ENTITY chap.cutting-edge "">
-<!ENTITY chap.dtrace "">
-
-<!-- Part Four -->
-<!ENTITY chap.serialcomms "">
-<!ENTITY chap.ppp-and-slip "">
-<!ENTITY chap.mail "">
-<!ENTITY chap.network-servers "">
-<!ENTITY chap.firewalls "">
-<!ENTITY chap.advanced-networking "">
-
-<!-- Part Five (appendices) -->
-<!ENTITY chap.mirrors "">
-<!ENTITY chap.mirrors.ftp.inc "">
-<!ENTITY chap.mirrors.cvsup.inc "">
-<!ENTITY chap.bibliography "">
-<!ENTITY chap.eresources "">
-<!ENTITY chap.eresources.www.inc "">
-<!ENTITY chap.pgpkeys "">
-<!ENTITY chap.freebsd-glossary "">
-<!ENTITY chap.index "">
diff --git a/pt_BR.ISO8859-1/books/handbook/colophon.xml b/pt_BR.ISO8859-1/books/handbook/colophon.xml
index 237398942b..5848f8b4dc 100644
--- a/pt_BR.ISO8859-1/books/handbook/colophon.xml
+++ b/pt_BR.ISO8859-1/books/handbook/colophon.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
The FreeBSD Brazilian Portuguese Documentation Project
diff --git a/pt_BR.ISO8859-1/books/handbook/config/chapter.xml b/pt_BR.ISO8859-1/books/handbook/config/chapter.xml
index 466ea783af..a8bf46fe2e 100644
--- a/pt_BR.ISO8859-1/books/handbook/config/chapter.xml
+++ b/pt_BR.ISO8859-1/books/handbook/config/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
The FreeBSD Brazilian Portuguese Documentation Project
diff --git a/pt_BR.ISO8859-1/books/handbook/cutting-edge/chapter.xml b/pt_BR.ISO8859-1/books/handbook/cutting-edge/chapter.xml
index 2bbff9c222..355f38dee3 100644
--- a/pt_BR.ISO8859-1/books/handbook/cutting-edge/chapter.xml
+++ b/pt_BR.ISO8859-1/books/handbook/cutting-edge/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
The FreeBSD Brazilian Portuguese Documentation Project
diff --git a/pt_BR.ISO8859-1/books/handbook/disks/chapter.xml b/pt_BR.ISO8859-1/books/handbook/disks/chapter.xml
index 7f1c552a56..47695efceb 100644
--- a/pt_BR.ISO8859-1/books/handbook/disks/chapter.xml
+++ b/pt_BR.ISO8859-1/books/handbook/disks/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
The FreeBSD Brazilian Portuguese Documentation Project
diff --git a/pt_BR.ISO8859-1/books/handbook/eresources/chapter.xml b/pt_BR.ISO8859-1/books/handbook/eresources/chapter.xml
index f9a62d0d66..6621d83deb 100644
--- a/pt_BR.ISO8859-1/books/handbook/eresources/chapter.xml
+++ b/pt_BR.ISO8859-1/books/handbook/eresources/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
The FreeBSD Brazilian Portuguese Documentation Project
diff --git a/pt_BR.ISO8859-1/books/handbook/install/chapter.xml b/pt_BR.ISO8859-1/books/handbook/install/chapter.xml
index aead82cce5..ded98913c9 100644
--- a/pt_BR.ISO8859-1/books/handbook/install/chapter.xml
+++ b/pt_BR.ISO8859-1/books/handbook/install/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
The FreeBSD Brazilian Portuguese Documentation Project
diff --git a/pt_BR.ISO8859-1/books/handbook/introduction/chapter.xml b/pt_BR.ISO8859-1/books/handbook/introduction/chapter.xml
index a693f70137..5b9f6d6b8c 100644
--- a/pt_BR.ISO8859-1/books/handbook/introduction/chapter.xml
+++ b/pt_BR.ISO8859-1/books/handbook/introduction/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
The FreeBSD Brazilian Portuguese Documentation Project
diff --git a/pt_BR.ISO8859-1/books/handbook/kernelconfig/chapter.xml b/pt_BR.ISO8859-1/books/handbook/kernelconfig/chapter.xml
index bd2170fc06..9f8e3046b0 100644
--- a/pt_BR.ISO8859-1/books/handbook/kernelconfig/chapter.xml
+++ b/pt_BR.ISO8859-1/books/handbook/kernelconfig/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
The FreeBSD Brazilian Portuguese Documentation Project
diff --git a/pt_BR.ISO8859-1/books/handbook/l10n/chapter.xml b/pt_BR.ISO8859-1/books/handbook/l10n/chapter.xml
index 91aabd9820..fde853e358 100644
--- a/pt_BR.ISO8859-1/books/handbook/l10n/chapter.xml
+++ b/pt_BR.ISO8859-1/books/handbook/l10n/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
The FreeBSD Brazilian Portuguese Documentation Project
diff --git a/pt_BR.ISO8859-1/books/handbook/linuxemu/chapter.xml b/pt_BR.ISO8859-1/books/handbook/linuxemu/chapter.xml
index a5f6a17610..938b7d83cd 100644
--- a/pt_BR.ISO8859-1/books/handbook/linuxemu/chapter.xml
+++ b/pt_BR.ISO8859-1/books/handbook/linuxemu/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
The FreeBSD Brazilian Portuguese Documentation Project
diff --git a/pt_BR.ISO8859-1/books/handbook/mail/chapter.xml b/pt_BR.ISO8859-1/books/handbook/mail/chapter.xml
index 4c43d1d5bf..f03ad119ad 100644
--- a/pt_BR.ISO8859-1/books/handbook/mail/chapter.xml
+++ b/pt_BR.ISO8859-1/books/handbook/mail/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
The FreeBSD Brazilian Portuguese Documentation Project
diff --git a/pt_BR.ISO8859-1/books/handbook/mirrors/chapter.xml b/pt_BR.ISO8859-1/books/handbook/mirrors/chapter.xml
index 2b6e83cddc..158fb5953c 100644
--- a/pt_BR.ISO8859-1/books/handbook/mirrors/chapter.xml
+++ b/pt_BR.ISO8859-1/books/handbook/mirrors/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
The FreeBSD Brazilian Portuguese Documentation Project
@@ -1168,7 +1168,7 @@
<para>Configurar o &man.cvs.1; para utilizar um
reposit鏎io CVS an獼imo requer, simplesmente,
uma atribui誽o vari嫛el de ambiente
- <envar>CVSROOT</envar> da localiza&ccedil緌 de um dos
+ <envar>CVSROOT</envar> da localiza誽o de um dos
servidores <emphasis>anoncvs</emphasis> do projeto FreeBSD.
No momento da prepara誽o deste documento, os
seguintes servidores est緌 dispon癉eis:</para>
@@ -1590,7 +1590,7 @@
<para>Voc ir precisar de duas coisas: O programa
<application>CTM</application>, e os deltas iniciais para
aliment-lo (para alcan蓷r os n癉eis
- &ldquo;correntes&rdquo).</para>
+ &ldquo;correntes&rdquo;).</para>
<para>O programa <application>CTM</application> faz parte do
FreeBSD desde a vers緌 2.0 <literal>release</literal>,
@@ -1632,11 +1632,11 @@
saiba como se inscrever usando
<application>majordomo</application>, envie uma mensagem
primeiro contendo a palavra <literal>help</literal> &mdash;
- ele enviar-lhe- de volta instru&ccedil髊s
+ ele enviar-lhe- de volta instru踥es
sobre o uso.)</para>
<para>Quando come蓷r a receber suas
- atualiza&ccedil髊s <application>CTM</application>
+ atualiza踥es <application>CTM</application>
por e-mail, voc pode utilizar o programa
<command>ctm_rmail</command> para desempacot-las e
aplic-las. Na verdade, voc pode usar o
@@ -1724,7 +1724,7 @@
<para>A menos que <application>CTM</application> sinta-se
muito seguro a respeito de todo o processo, ele n緌
tocar sua 嫫vore. Pode-se usar a
- op&ccedil緌 <option>-c</option> e
+ op誽o <option>-c</option> e
<application>CTM</application> n緌 tocar sua
嫫vore; meramente verificar a integridade
do delta e verificar se ele aplicar-se-ia sem erros
@@ -1752,7 +1752,7 @@
<para>Um desenvolvedor gostaria de experimentar e mudar arquivos
na 嫫vore de c鏚igo fonte.
<application>CTM</application> suporta
- modifica&ccedil髊s locais de maneira limitada: antes de
+ modifica踥es locais de maneira limitada: antes de
checar a exist瘽cia de um arquivo
<filename>foo</filename>, ele primeiro procura por
<filename>foo.ctm</filename>. Se este arquivo existir, CTM
@@ -1984,7 +1984,7 @@
puxar, cada cliente requisita atualiza踥es ao
servidor, se e quando desejam. Ou seja, todas as
atualiza踥es s緌 iniciadas pelo cliente.
- O servidor jamais envia atualiza&ccedil髊s n緌
+ O servidor jamais envia atualiza踥es n緌
solicitadas. Usu嫫ios devem ou executar o cliente
<application>CVSup</application> manualmente para obter uma
atualiza誽o, ou criar um <literal>job</literal>
@@ -1999,7 +1999,7 @@
e o servidor <command>cvsupd</command> o qual executa em
cada s癃io espelho FreeBSD.</para>
- <para>Ao ler a documenta&ccedil緌 do FreeBSD e listas
+ <para>Ao ler a documenta誽o do FreeBSD e listas
de discuss緌, voc pode ver refer瘽cias
a <application>sup</application>. <application>Sup</application>
foi o predecessor de <application>CVSup</application>, e
@@ -2718,7 +2718,7 @@ src-all</programlisting>
<para>onde
<filename><replaceable>supfile</replaceable></filename>
- &eacute, na verdade, o nome do supfile que voc acaba
+ , na verdade, o nome do supfile que voc acaba
de criar. Assumindo que voc est executando
sob o X11, <command>cvsup</command> ir exibir uma
janela GUI com bot髊s para fazer as coisas usuais.
diff --git a/pt_BR.ISO8859-1/books/handbook/pgpkeys/chapter.xml b/pt_BR.ISO8859-1/books/handbook/pgpkeys/chapter.xml
index 5d121705c0..92badc49fb 100644
--- a/pt_BR.ISO8859-1/books/handbook/pgpkeys/chapter.xml
+++ b/pt_BR.ISO8859-1/books/handbook/pgpkeys/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
The FreeBSD Brazilian Portuguese Documentation Project
diff --git a/pt_BR.ISO8859-1/books/handbook/ports/chapter.xml b/pt_BR.ISO8859-1/books/handbook/ports/chapter.xml
index ee95e01f76..304c387f23 100644
--- a/pt_BR.ISO8859-1/books/handbook/ports/chapter.xml
+++ b/pt_BR.ISO8859-1/books/handbook/ports/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
The FreeBSD Brazilian Portuguese Documentation Project
diff --git a/pt_BR.ISO8859-1/books/handbook/ppp-and-slip/chapter.xml b/pt_BR.ISO8859-1/books/handbook/ppp-and-slip/chapter.xml
index 2e227fe9bd..591bbc08d1 100644
--- a/pt_BR.ISO8859-1/books/handbook/ppp-and-slip/chapter.xml
+++ b/pt_BR.ISO8859-1/books/handbook/ppp-and-slip/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
The FreeBSD Brazilian Portuguese Documentation Project
diff --git a/pt_BR.ISO8859-1/books/handbook/preface/preface.xml b/pt_BR.ISO8859-1/books/handbook/preface/preface.xml
index 28cee8a263..6c3454eea8 100644
--- a/pt_BR.ISO8859-1/books/handbook/preface/preface.xml
+++ b/pt_BR.ISO8859-1/books/handbook/preface/preface.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
The FreeBSD Brazilian Portuguese Documentation Project
diff --git a/pt_BR.ISO8859-1/books/handbook/printing/chapter.xml b/pt_BR.ISO8859-1/books/handbook/printing/chapter.xml
index 74ff5d5a35..4e4d9137d0 100644
--- a/pt_BR.ISO8859-1/books/handbook/printing/chapter.xml
+++ b/pt_BR.ISO8859-1/books/handbook/printing/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
The FreeBSD Brazilian Portuguese Documentation Project
diff --git a/pt_BR.ISO8859-1/books/handbook/security/chapter.xml b/pt_BR.ISO8859-1/books/handbook/security/chapter.xml
index a958066dea..e2f55bbaf9 100644
--- a/pt_BR.ISO8859-1/books/handbook/security/chapter.xml
+++ b/pt_BR.ISO8859-1/books/handbook/security/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
The FreeBSD Brazilian Portuguese Documentation Project
diff --git a/pt_BR.ISO8859-1/books/handbook/serialcomms/chapter.xml b/pt_BR.ISO8859-1/books/handbook/serialcomms/chapter.xml
index 4d1574a6c1..14728dc6ad 100644
--- a/pt_BR.ISO8859-1/books/handbook/serialcomms/chapter.xml
+++ b/pt_BR.ISO8859-1/books/handbook/serialcomms/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
The FreeBSD Brazilian Portuguese Documentation Project
diff --git a/pt_BR.ISO8859-1/books/handbook/users/chapter.xml b/pt_BR.ISO8859-1/books/handbook/users/chapter.xml
index f99f50ea59..21e6e0e0a5 100644
--- a/pt_BR.ISO8859-1/books/handbook/users/chapter.xml
+++ b/pt_BR.ISO8859-1/books/handbook/users/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
The FreeBSD Brazilian Portuguese Documentation Project
diff --git a/pt_BR.ISO8859-1/books/handbook/x11/chapter.xml b/pt_BR.ISO8859-1/books/handbook/x11/chapter.xml
index 100769dd2a..2e9df7af9d 100644
--- a/pt_BR.ISO8859-1/books/handbook/x11/chapter.xml
+++ b/pt_BR.ISO8859-1/books/handbook/x11/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
The FreeBSD Brazilian Portuguese Documentation Project
diff --git a/pt_BR.ISO8859-1/share/xml/catalog b/pt_BR.ISO8859-1/share/xml/catalog
deleted file mode 100644
index 81fb8e8799..0000000000
--- a/pt_BR.ISO8859-1/share/xml/catalog
+++ /dev/null
@@ -1,48 +0,0 @@
- -- ...................................................................... --
- -- FreeBSD SGML Public Identifiers ...................................... --
-
- -- ...................................................................... --
- -- Portuguese Brazilian specific ........................................ --
-
- -- The FreeBSD Documentation Project
- -- The FreeBSD Brazilian Portuguese Documentation Project
-
- -- Original revision: r38826
-
- --
- -- $FreeBSD$
- --
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//PT"
- "entities.ent"
-
-PUBLIC "-//FreeBSD//DOCUMENT DocBook Stylesheet//EN"
- "freebsd.dsl"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//PT"
- "mailing-lists.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook Language Specific Entities//PT"
- "l10n.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook Newsgroup Entities//PT"
- "newsgroups.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook Team Entities//PT"
- "teams.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook Translators Entities//PT"
- "translators.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//PT"
- "trademarks.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook Specific Word Translations Entities//PT"
- "words.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Books Entity Set//PT"
- "books.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Articles Entity Set//PT"
- "articles.ent"
-
diff --git a/pt_BR.ISO8859-1/share/xml/catalog.xml b/pt_BR.ISO8859-1/share/xml/catalog.xml
new file mode 100644
index 0000000000..d44a80dbca
--- /dev/null
+++ b/pt_BR.ISO8859-1/share/xml/catalog.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0"?>
+<!DOCTYPE catalog PUBLIC "-//OASIS//DTD Entity Resolution XML Catalog V1.0//EN"
+ "http://www.oasis-open.org/committees/entity/release/1.0/catalog.dtd">
+
+<!-- $FreeBSD$ -->
+
+<catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog">
+ <rewriteSystem systemIdStartString="http://www.FreeBSD.org/XML/www/lang/"
+ rewritePrefix="../../"/>
+ <rewriteURI uriStartString="http://www.FreeBSD.org/XML/www/lang/"
+ rewritePrefix="../../"/>
+
+ <public
+ publicId="-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN"
+ uri="entities.ent" />
+ <public
+ publicId="-//FreeBSD//ENTITIES DocBook Translator Entities//PT"
+ uri="translators.ent" />
+ <public
+ publicId="-//FreeBSD//ENTITIES FreeBSD L10N Entities//EN"
+ uri="l10n.ent" />
+</catalog>
diff --git a/pt_BR.ISO8859-1/share/xml/entities.ent b/pt_BR.ISO8859-1/share/xml/entities.ent
index 87648dace0..6776d9dcae 100644
--- a/pt_BR.ISO8859-1/share/xml/entities.ent
+++ b/pt_BR.ISO8859-1/share/xml/entities.ent
@@ -1,27 +1,33 @@
<?xml version="1.0" encoding="iso-8859-1"?>
<!-- $FreeBSD$ -->
-<!ENTITY % authors PUBLIC "-//FreeBSD//ENTITIES DocBook Author Entities//EN">
-%authors;
-<!ENTITY % man PUBLIC "-//FreeBSD//ENTITIES DocBook Manual Page Entities//EN">
-%man;
-<!ENTITY % freebsd PUBLIC "-//FreeBSD//ENTITIES DocBook Miscellaneous FreeBSD Entities//EN">
+<!ENTITY % freebsd PUBLIC "-//FreeBSD//ENTITIES DocBook Miscellaneous FreeBSD Entities//EN"
+ "nonexistent">
%freebsd;
-<!ENTITY % translators PUBLIC "-//FreeBSD//ENTITIES DocBook Team Entities//PT">
+<!ENTITY % translators PUBLIC "-//FreeBSD//ENTITIES DocBook Team Entities//PT"
+ "translators.ent">
%translators;
-<!ENTITY % words PUBLIC "-//FreeBSD//ENTITIES DocBook Specific Word Translations Entities//PT">
+<!ENTITY % words PUBLIC "-//FreeBSD//ENTITIES DocBook Specific Word Translations Entities//PT"
+ "words.ent">
%words;
-<!ENTITY % l10n PUBLIC "-//FreeBSD//ENTITIES DocBook Language Specific Entities//PT">
+<!ENTITY % l10n PUBLIC "-//FreeBSD//ENTITIES DocBook Language Specific Entities//PT"
+ "l10n.ent">
%l10n;
-<!ENTITY % mailing-lists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//PT">
+<!ENTITY % mailing-lists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//PT"
+ "mailing-lists.ent">
%mailing-lists;
-<!ENTITY % newsgroups PUBLIC "-//FreeBSD//ENTITIES DocBook Newsgroup Entities//PT">
+<!ENTITY % newsgroups PUBLIC "-//FreeBSD//ENTITIES DocBook Newsgroup Entities//PT"
+ "newsgroups.ent">
%newsgroups;
-<!ENTITY % teams PUBLIC "-//FreeBSD//ENTITIES DocBook Team Entities//PT">
+<!ENTITY % teams PUBLIC "-//FreeBSD//ENTITIES DocBook Team Entities//PT"
+ "teams.ent">
%teams;
-<!ENTITY % trademarks PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//PT">
+<!ENTITY % trademarks PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//PT"
+ "trademarks.ent">
%trademarks;
-<!ENTITY % trademarks-en PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//EN">
+<!ENTITY % trademarks-en PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//EN"
+ "nonexistent">
%trademarks-en;
-<!ENTITY % urls PUBLIC "-//FreeBSD//ENTITIES DocBook URL Entities//EN">
+<!ENTITY % urls PUBLIC "-//FreeBSD//ENTITIES DocBook URL Entities//EN"
+ "nonexistent">
%urls;
diff --git a/pt_BR.ISO8859-1/share/xml/l10n.ent b/pt_BR.ISO8859-1/share/xml/l10n.ent
index d82aec6554..6d7f8aa948 100644
--- a/pt_BR.ISO8859-1/share/xml/l10n.ent
+++ b/pt_BR.ISO8859-1/share/xml/l10n.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
<!-- -*- sgml -*-
DocBook Language Specific Entities for Localization (pt_BR).
diff --git a/pt_BR.ISO8859-1/share/xml/mailing-lists.ent b/pt_BR.ISO8859-1/share/xml/mailing-lists.ent
index 321eb0194b..77039cc53b 100644
--- a/pt_BR.ISO8859-1/share/xml/mailing-lists.ent
+++ b/pt_BR.ISO8859-1/share/xml/mailing-lists.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
Nomes das listas de discuss緌 do FreeBSD e dos softwares
relacionados
diff --git a/pt_BR.ISO8859-1/share/xml/newsgroups.ent b/pt_BR.ISO8859-1/share/xml/newsgroups.ent
index 2c06789b80..e55b43329b 100644
--- a/pt_BR.ISO8859-1/share/xml/newsgroups.ent
+++ b/pt_BR.ISO8859-1/share/xml/newsgroups.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
Names of FreeBSD newsgroups
diff --git a/pt_BR.ISO8859-1/share/xml/teams.ent b/pt_BR.ISO8859-1/share/xml/teams.ent
index 7476584e03..e1a4644091 100644
--- a/pt_BR.ISO8859-1/share/xml/teams.ent
+++ b/pt_BR.ISO8859-1/share/xml/teams.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
Names and email address of teams of people working on specified
tasks. Usually they're just mail aliases set up at hub.FreeBSD.org
diff --git a/pt_BR.ISO8859-1/share/xml/trademarks.ent b/pt_BR.ISO8859-1/share/xml/trademarks.ent
index 66359ab3b6..ff0b2a03cf 100644
--- a/pt_BR.ISO8859-1/share/xml/trademarks.ent
+++ b/pt_BR.ISO8859-1/share/xml/trademarks.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
<!-- $FreeBSD -->
<!ENTITY legalnotice '
diff --git a/pt_BR.ISO8859-1/share/xml/translators.ent b/pt_BR.ISO8859-1/share/xml/translators.ent
index 99a9f543e7..d6ff0d4fb8 100644
--- a/pt_BR.ISO8859-1/share/xml/translators.ent
+++ b/pt_BR.ISO8859-1/share/xml/translators.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
The FreeBSD Documentation Project
The FreeBSD Brazilian Portuguese Documentation Project
diff --git a/pt_BR.ISO8859-1/share/xml/words.ent b/pt_BR.ISO8859-1/share/xml/words.ent
index 659d4513cb..e77f89d3f8 100644
--- a/pt_BR.ISO8859-1/share/xml/words.ent
+++ b/pt_BR.ISO8859-1/share/xml/words.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
Words that were deemed too controversial. Which, therefore,
would require several futher revisions. Moreover, the use of
diff --git a/ru_RU.KOI8-R/articles/committers-guide/article.xml b/ru_RU.KOI8-R/articles/committers-guide/article.xml
index 7152ea6a39..f0f83afa3e 100644
--- a/ru_RU.KOI8-R/articles/committers-guide/article.xml
+++ b/ru_RU.KOI8-R/articles/committers-guide/article.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="koi8-r" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//RU" "../../share/xml/entities.ent">
-%entities;
-]>
+<?xml version="1.0" encoding="koi8-r"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<!--
The FreeBSD Russian Documentation Project
diff --git a/ru_RU.KOI8-R/articles/console-server/article.xml b/ru_RU.KOI8-R/articles/console-server/article.xml
index 50e3756418..3a8b8bb845 100644
--- a/ru_RU.KOI8-R/articles/console-server/article.xml
+++ b/ru_RU.KOI8-R/articles/console-server/article.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="koi8-r" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//RU" "../../share/xml/entities.ent">
-%entities;
-]>
+<?xml version="1.0" encoding="koi8-r"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<!--
The FreeBSD Russian Documentation Project
diff --git a/ru_RU.KOI8-R/articles/contributing/article.xml b/ru_RU.KOI8-R/articles/contributing/article.xml
index b841938c79..d08553b27a 100644
--- a/ru_RU.KOI8-R/articles/contributing/article.xml
+++ b/ru_RU.KOI8-R/articles/contributing/article.xml
@@ -1,10 +1,6 @@
-<?xml version="1.0" encoding="koi8-r" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//RU" "../../share/xml/entities.ent">
-%entities;
-<!ENTITY % not.published "IGNORE">
-]>
+<?xml version="1.0" encoding="koi8-r"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<!--
The FreeBSD Russian Documentation Project
@@ -192,7 +188,7 @@
<para>轀岉尕 冾倅 玅卍匢杻挃 衲蹉鐘眕瓬, 恔倷奼籤, &posix;. 戁
迍秸埧 恔彸 恓蚎玶媌 衶椗玹 恔 恌 恔 衲畛恌藷 Web-蚆彸 <ulink
url="&url.base;/projects/c99/index.html">襓狣刱 衃珆覂娸婟奷
- FreeBSD 衲蹉鐘眕趨 C99 & POSIX</ulink>. 鯜避恌埧 俵覂霰恌 FreeBSD
+ FreeBSD 衲蹉鐘眕趨 C99 &amp; POSIX</ulink>. 鯜避恌埧 俵覂霰恌 FreeBSD
埧, 痽 玿疻霰旼恘 衲蹉鐘眕玵. 槿旻 疻賸蟹 珆旻瓾籥衭,
珃狟曬恘 恓硩醣尕攫媓棼 妀 恓俵恮婠棼 畛矬攫賺 衄鷗囡夼謄圪,
恔倷避寑 狟 嗩玵 PR. 槿旻 迍秸埧, 恔岉尕, 佹 孖倷避尕 嗩
diff --git a/ru_RU.KOI8-R/articles/cups/article.xml b/ru_RU.KOI8-R/articles/cups/article.xml
index 01d402aff1..42c67da577 100644
--- a/ru_RU.KOI8-R/articles/cups/article.xml
+++ b/ru_RU.KOI8-R/articles/cups/article.xml
@@ -1,10 +1,6 @@
-<?xml version="1.0" encoding="koi8-r" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//RU" "../../share/xml/entities.ent">
-%entities;
-<!ENTITY % not.published "IGNORE">
-]>
+<?xml version="1.0" encoding="koi8-r"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<!--
The FreeBSD Russian Documentation Project
@@ -85,7 +81,7 @@ Translation: Taras Korenko,
倷屺妀龔奷虭 俵杻硨袬埧曶 <username>root</username> 蚝鼴梏楙
冾芩恅:</para>
- <screen>&prompt.root; <userinput>cd /usr/ports/print/cups && make install clean</userinput></screen>
+ <screen>&prompt.root; <userinput>cd /usr/ports/print/cups &amp;&amp; make install clean</userinput></screen>
<para>颭 梌埡恘訬 <application>CUPS</application> 孖俵杻祰 釓侜,
睋俷衲尕 恔 趿俵旽曬吇 埡劼 冾芩恅:</para>
diff --git a/ru_RU.KOI8-R/articles/custom-gcc/article.xml b/ru_RU.KOI8-R/articles/custom-gcc/article.xml
index ee6969823d..cd4ed25ab6 100644
--- a/ru_RU.KOI8-R/articles/custom-gcc/article.xml
+++ b/ru_RU.KOI8-R/articles/custom-gcc/article.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="koi8-r" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//RU" "../../share/xml/entities.ent">
-%entities;
-]>
+<?xml version="1.0" encoding="koi8-r"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<!--
The FreeBSD Russian Documentation Project
@@ -83,7 +80,7 @@
<application>binutils</application> 孖俵杻祰 冾昍攣蟹 俵眕瓬
&os;, 趿俵旽尕 蚝鼴梏楙 冾芩恅:</para>
- <screen>&prompt.root; <userinput>cd /usr/ports/devel/binutils && make install</userinput></screen>
+ <screen>&prompt.root; <userinput>cd /usr/ports/devel/binutils &amp;&amp; make install</userinput></screen>
</sect2>
<sect2 id="installing-gcc">
@@ -100,7 +97,7 @@
<para>颭 梌埡恘訬 狦恘ж 巟 趿袹桸玵敆梊棼 俵眕瓬
<application>GCC</application>, 恔藍疶埧 蚝鼴梏楙 冾芩恅:</para>
- <screen>&prompt.root; <userinput>cd /usr/ports/lang/<replaceable>gcc44</replaceable> && make install</userinput></screen>
+ <screen>&prompt.root; <userinput>cd /usr/ports/lang/<replaceable>gcc44</replaceable> &amp;&amp; make install</userinput></screen>
</sect2>
</sect1>
@@ -109,7 +106,7 @@
覂眑圪 <application>GCC</application></title>
<para>颭 孖俵杻硨袬恌 婞鷓桲迍 覂眑圪 <application>GCC</application>,
- 梌埡恘訞曬恘 巟 冾昍攣蟹 俵眕瓬 &os, 婞鷓桲娸 鰍俵旽尕攫媓蹊
+ 梌埡恘訞曬恘 巟 冾昍攣蟹 俵眕瓬 &os;, 婞鷓桲娸 鰍俵旽尕攫媓蹊
冾恇囟梑謄奷 蚕衲攪.</para>
<sect2 id="adjusting-make.conf">
@@ -118,7 +115,7 @@
<para>餀臏趹埧 蚝鼴梏楦 衲眐侂 <filename>/etc/make.conf</filename>
(妀 孖倷避寑 袀暙衲赹濫吇):</para>
- <programlisting>.if !empty(.CURDIR:M/usr/ports/*) && exists(/usr/local/bin/gcc44)
+ <programlisting>.if !empty(.CURDIR:M/usr/ports/*) &amp;&amp; exists(/usr/local/bin/gcc44)
CC=gcc44
CXX=g++44
CPP=cpp44
@@ -179,7 +176,7 @@ libstdc++.so.6 gcc44/libstdc++.so.6</programlisting>
<literal>CFLAGS</literal>, 孖倷避寑
<filename>/etc/make.conf</filename> 衃д輾恘 蚝鼴梏暙邯 倷奼籤:</para>
- <programlisting>.if !empty(.CURDIR:M/usr/ports/*) && exists(/usr/local/bin/gcc44)
+ <programlisting>.if !empty(.CURDIR:M/usr/ports/*) &amp;&amp; exists(/usr/local/bin/gcc44)
CC=gcc44
CXX=g++44
CPP=cpp44
@@ -201,7 +198,7 @@ CFLAGS+=-mssse3
<filename>/etc/make.conf</filename> 衃д輾恘 蚝鼴梏暙邯
倷奼籤:</para>
- <programlisting>.if !empty(.CURDIR:M/usr/ports/*) && exists(/usr/local/bin/gcc44)
+ <programlisting>.if !empty(.CURDIR:M/usr/ports/*) &amp;&amp; exists(/usr/local/bin/gcc44)
.if empty(.CURDIR:M/usr/ports/net/openldap*)
CC=gcc44
CXX=g++44
@@ -214,7 +211,7 @@ CPP=cpp44
<filename role="package">net/openldap</filename>*. 蘅匊
豜硰珋恘 梖邁轂 蟠杻袹 俵眕瓬 狦恘 衲眐侜:</para>
- <programlisting>.if empty(.CURDIR:M/usr/ports/net/openldap*) && empty(.CURDIR:M/usr/ports/xxx/yyy) && ...</programlisting>
+ <programlisting>.if empty(.CURDIR:M/usr/ports/net/openldap*) &amp;&amp; empty(.CURDIR:M/usr/ports/xxx/yyy) &amp;&amp; ...</programlisting>
</sect2>
</sect1>
diff --git a/ru_RU.KOI8-R/articles/cvs-freebsd/article.xml b/ru_RU.KOI8-R/articles/cvs-freebsd/article.xml
index 395c235b66..fe1b3d814f 100644
--- a/ru_RU.KOI8-R/articles/cvs-freebsd/article.xml
+++ b/ru_RU.KOI8-R/articles/cvs-freebsd/article.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="koi8-r" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//RU" "../../share/xml/entities.ent">
-%entities;
-]>
+<?xml version="1.0" encoding="koi8-r"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<!--
The FreeBSD Russian Documentation Project
diff --git a/ru_RU.KOI8-R/articles/cvsup-advanced/article.xml b/ru_RU.KOI8-R/articles/cvsup-advanced/article.xml
index 7abfb45b78..9a6f2e7ffb 100644
--- a/ru_RU.KOI8-R/articles/cvsup-advanced/article.xml
+++ b/ru_RU.KOI8-R/articles/cvsup-advanced/article.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="koi8-r" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//RU" "../../share/xml/entities.ent">
-%entities;
-]>
+<?xml version="1.0" encoding="koi8-r"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<!--
The FreeBSD Russian Documentation Project
diff --git a/ru_RU.KOI8-R/articles/explaining-bsd/article.xml b/ru_RU.KOI8-R/articles/explaining-bsd/article.xml
index 08b343013d..0887d8da0a 100644
--- a/ru_RU.KOI8-R/articles/explaining-bsd/article.xml
+++ b/ru_RU.KOI8-R/articles/explaining-bsd/article.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="koi8-r" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//RU" "../../share/xml/entities.ent">
-%entities;
-]>
+<?xml version="1.0" encoding="koi8-r"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<!--
The FreeBSD Russian Documentation Project
diff --git a/ru_RU.KOI8-R/articles/fbsd-from-scratch/article.xml b/ru_RU.KOI8-R/articles/fbsd-from-scratch/article.xml
index f7f032d681..6f801e5da8 100644
--- a/ru_RU.KOI8-R/articles/fbsd-from-scratch/article.xml
+++ b/ru_RU.KOI8-R/articles/fbsd-from-scratch/article.xml
@@ -1,8 +1,6 @@
-<?xml version="1.0" encoding="koi8-r" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//RU" "../../share/xml/entities.ent">
-%entities;
+<?xml version="1.0" encoding="koi8-r"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd" [
<!ENTITY scratch.ap "<application>FreeBSD From Scratch</application>">
]>
@@ -14,7 +12,7 @@
Original revision: r33355
-->
-<article lang="ru">
+<article xmlns:xi="http://www.w3.org/2001/XInclude" lang="ru">
<articleinfo>
<title>FreeBSD " 挍曶"</title>
@@ -409,7 +407,9 @@ Do you wish to delete what is left of /var/tmp/temproot.stage1? [no] <userinput>
俵婘 袀暙衲覂恄 迍馨づ蟹眐袬婥. 冾迋曬埡疶捑 鐘娸 鰍衲轂癹恘 妅に眝謄圪 婘,
痽 恓狟狦奼 巟芶恌婥.</para>
- <programlisting><inlinegraphic fileref="stage_1.conf.default" format="linespecific"/></programlisting>
+ <programlisting>
+<xi:include href="../../../en_US.ISO8859-1/articles/fbsd-from-scratch/stage_1.conf.default" parse="text"/>
+ </programlisting>
<para>鯤醣購埧 <ulink url="stage_1.conf.default">
<filename>stage_1.conf.default</filename></ulink>.</para>
@@ -485,9 +485,9 @@ Do you wish to delete what is left of /var/tmp/temproot.stage1? [no] <userinput>
<para>轀 蚆迍 霰旼 趿 迍秸埧 梖邁轂 恓冾婘砣 冾芩恅 狟玶癹侂 恓 蹙婥
珌畛恌畷恄棎 倷珃婬虭 趿硨袬虭 <command>make</command>:</para>
- <programlisting>java jdk16 echo true > files/license.sh; make install BATCH=yes < /dev/null
+ <programlisting>java jdk16 echo true &gt; files/license.sh; make install BATCH=yes &lt; /dev/null
print acroread8 yes accept | make install PAGER=ls
-x11-fonts gnu-unifont make install && mkfontdir /usr/local/lib/X11/fonts/local
+x11-fonts gnu-unifont make install &amp;&amp; mkfontdir /usr/local/lib/X11/fonts/local
news inn-stable CONFIGURE_ARGS="--enable-uucp-rnews --enable-setgid-inews" make install</programlisting>
<para> 陓眢棼 儷桱 衲眐痾賺 倷珈昍歜婞奿瓬蹉, 佹 畛蟠埡婥 俵眕趨,
@@ -517,7 +517,9 @@ news inn-stable CONFIGURE_ARGS="--enable-uucp-rnews --enable-setgid-inews"
佹秺珌 梌埡恘訞曬恘ж 奼 俵眕 衃矬薜娸 そ帎 倷珆玹玶
<filename>LOGDIR/category+port</filename>.</para>
- <programlisting><inlinegraphic fileref="stage_2.conf.default" format="linespecific"/></programlisting>
+ <programlisting>
+<xi:include href="../../../en_US.ISO8859-1/articles/fbsd-from-scratch/stage_1.conf.default" parse="text"/>
+ </programlisting>
<para>鯤醣購埧 <ulink url="stage_2.conf.default">
<filename>stage_2.conf.default</filename></ulink>.</para>
@@ -619,7 +621,9 @@ fi
<filename>stage_1.sh</filename></ulink>, 冾婘砣 趿 恓 鰍枒挃
迍馨づ蟹眐袬婥.</para>
- <programlisting><inlinegraphic fileref="stage_1.sh" format="linespecific"/></programlisting>
+ <programlisting>
+<xi:include href="../../../en_US.ISO8859-1/articles/fbsd-from-scratch/stage_1.conf.default" parse="text"/>
+ </programlisting>
<para>鯤醣購埧 <ulink
url="stage_1.sh"><filename>stage_1.sh</filename></ulink>.</para>
@@ -628,7 +632,9 @@ fi
url="stage_2.sh"><filename>stage_2.sh</filename></ulink>. 鷙 迍秸
俵恔鰍薺婥衭 巟芶恌婥 陓疻芶恄棸 蚆迍 恔瓾旼 そ帎.</para>
- <programlisting><inlinegraphic fileref="stage_2.sh" format="linespecific"/></programlisting>
+ <programlisting>
+<xi:include href="../../../en_US.ISO8859-1/articles/fbsd-from-scratch/stage_1.sh" parse="text"/>
+ </programlisting>
<para>鯤醣購埧 <ulink
url="stage_2.sh"><filename>stage_2.sh</filename></ulink>.</para>
@@ -637,7 +643,9 @@ fi
url="stage_3.mk"><filename>stage_3.mk</filename></ulink>, 冾婘砣 鐘衲
袬 厊鰾 婘, 佹 避婘芩埩硭眐袬婥 赽 俵赻玾挍 冾恇囟梑謄劦.</para>
- <programlisting><inlinegraphic fileref="stage_3.mk" format="linespecific"/></programlisting>
+ <programlisting>
+<xi:include href="../../../en_US.ISO8859-1/articles/fbsd-from-scratch/stage_1.conf.default" parse="text"/>
+ </programlisting>
<para>鯤醣購埧 <ulink
url="stage_3.mk"><filename>stage_3.mk</filename></ulink>.</para>
diff --git a/ru_RU.KOI8-R/articles/fonts/article.xml b/ru_RU.KOI8-R/articles/fonts/article.xml
index e728588202..f4d4a6dc71 100644
--- a/ru_RU.KOI8-R/articles/fonts/article.xml
+++ b/ru_RU.KOI8-R/articles/fonts/article.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="koi8-r" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//RU" "../../share/xml/entities.ent">
-%entities;
-]>
+<?xml version="1.0" encoding="koi8-r"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<!--
The FreeBSD Russian Documentation Project
diff --git a/ru_RU.KOI8-R/articles/freebsd-questions/article.xml b/ru_RU.KOI8-R/articles/freebsd-questions/article.xml
index 8a20118c4c..b8203b7448 100644
--- a/ru_RU.KOI8-R/articles/freebsd-questions/article.xml
+++ b/ru_RU.KOI8-R/articles/freebsd-questions/article.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="koi8-r" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//RU" "../../share/xml/entities.ent">
-%entities;
-]>
+<?xml version="1.0" encoding="koi8-r"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<!--
The FreeBSD Russian Documentation Project
diff --git a/ru_RU.KOI8-R/articles/geom-class/article.xml b/ru_RU.KOI8-R/articles/geom-class/article.xml
index 74a2608182..0e49f23870 100644
--- a/ru_RU.KOI8-R/articles/geom-class/article.xml
+++ b/ru_RU.KOI8-R/articles/geom-class/article.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="koi8-r" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//RU" "../../share/xml/entities.ent">
-%entities;
-]>
+<?xml version="1.0" encoding="koi8-r"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<!--
The FreeBSD Russian Documentation Project
diff --git a/ru_RU.KOI8-R/articles/gjournal-desktop/article.xml b/ru_RU.KOI8-R/articles/gjournal-desktop/article.xml
index 601b103c36..12cc7934dd 100644
--- a/ru_RU.KOI8-R/articles/gjournal-desktop/article.xml
+++ b/ru_RU.KOI8-R/articles/gjournal-desktop/article.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="koi8-r" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//RU" "../../share/xml/entities.ent">
-%entities;
-]>
+<?xml version="1.0" encoding="koi8-r"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<!--
The FreeBSD Russian Documentation Project
diff --git a/ru_RU.KOI8-R/articles/hubs/article.xml b/ru_RU.KOI8-R/articles/hubs/article.xml
index 0ec71a7c38..bc1c80c660 100644
--- a/ru_RU.KOI8-R/articles/hubs/article.xml
+++ b/ru_RU.KOI8-R/articles/hubs/article.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="koi8-r" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//RU" "../../share/xml/entities.ent">
-%entities;
-]>
+<?xml version="1.0" encoding="koi8-r"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<!--
The FreeBSD Russian Documentation Project
diff --git a/ru_RU.KOI8-R/articles/ipsec-must/article.xml b/ru_RU.KOI8-R/articles/ipsec-must/article.xml
index 8aa916e4ae..7c90168c87 100644
--- a/ru_RU.KOI8-R/articles/ipsec-must/article.xml
+++ b/ru_RU.KOI8-R/articles/ipsec-must/article.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="koi8-r" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//RU" "../../share/xml/entities.ent">
-%entities;
-]>
+<?xml version="1.0" encoding="koi8-r"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<!--
The FreeBSD Russian Documentation Project
diff --git a/ru_RU.KOI8-R/articles/laptop/article.xml b/ru_RU.KOI8-R/articles/laptop/article.xml
index 575fd605b1..88cfb7ba0d 100644
--- a/ru_RU.KOI8-R/articles/laptop/article.xml
+++ b/ru_RU.KOI8-R/articles/laptop/article.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="koi8-r" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//RU" "../../share/xml/entities.ent">
-%entities;
-]>
+<?xml version="1.0" encoding="koi8-r"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<!--
The FreeBSD Russian Documentation Project
diff --git a/ru_RU.KOI8-R/articles/linux-comparison/article.xml b/ru_RU.KOI8-R/articles/linux-comparison/article.xml
index ee1f1b5267..0eb6309b2d 100644
--- a/ru_RU.KOI8-R/articles/linux-comparison/article.xml
+++ b/ru_RU.KOI8-R/articles/linux-comparison/article.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="koi8-r" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//RU" "../../share/xml/entities.ent">
-%entities;
-]>
+<?xml version="1.0" encoding="koi8-r"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<!--
Copyright (c) 2005 Dru Lavigne
diff --git a/ru_RU.KOI8-R/articles/mailing-list-faq/article.xml b/ru_RU.KOI8-R/articles/mailing-list-faq/article.xml
index c782e00c39..a174c5e432 100644
--- a/ru_RU.KOI8-R/articles/mailing-list-faq/article.xml
+++ b/ru_RU.KOI8-R/articles/mailing-list-faq/article.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="koi8-r" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//RU" "../../share/xml/entities.ent">
-%entities;
-]>
+<?xml version="1.0" encoding="koi8-r"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<!--
The FreeBSD Russian Documentation Project
diff --git a/ru_RU.KOI8-R/articles/mh/article.xml b/ru_RU.KOI8-R/articles/mh/article.xml
index eb51be4d32..99b52c2911 100644
--- a/ru_RU.KOI8-R/articles/mh/article.xml
+++ b/ru_RU.KOI8-R/articles/mh/article.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="koi8-r" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//RU" "../../share/xml/entities.ent">
-%entities;
-]>
+<?xml version="1.0" encoding="koi8-r"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<!--
The FreeBSD Russian Documentation Project
diff --git a/ru_RU.KOI8-R/articles/new-users/article.xml b/ru_RU.KOI8-R/articles/new-users/article.xml
index 90a81257ac..401b6d78be 100644
--- a/ru_RU.KOI8-R/articles/new-users/article.xml
+++ b/ru_RU.KOI8-R/articles/new-users/article.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="koi8-r" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//RU" "../../share/xml/entities.ent">
-%entities;
-]>
+<?xml version="1.0" encoding="koi8-r"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<!--
The FreeBSD Russian Documentation Project
diff --git a/ru_RU.KOI8-R/articles/pam/article.xml b/ru_RU.KOI8-R/articles/pam/article.xml
index 47520aadac..d10d4b116b 100644
--- a/ru_RU.KOI8-R/articles/pam/article.xml
+++ b/ru_RU.KOI8-R/articles/pam/article.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="koi8-r" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//RU" "../../share/xml/entities.ent">
-%entities;
-]>
+<?xml version="1.0" encoding="koi8-r"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<!--
The FreeBSD Russian Documentation Project
@@ -1275,8 +1272,9 @@ sshd password required pam_permit.so</programlisting>
endterm="pam-sample-conv.title"></link>, 玾畈 佹畷衲覂 珆倷避恘
婘痾, 恘 疻賻媓棼 倷妀珋曬奷 孖俵杻硨袬婥衭 恓 迍秸.</para>
- <programlisting><inlinegraphic fileref="pam_app.c"
- format="linespecific"/></programlisting>
+ <programlisting>
+<xi:include href="../../../en_US.ISO8859-1/articles/pam/su.c" parse="text"/>
+ </programlisting>
</appendix>
<appendix id="pam-sample-module">
@@ -1289,8 +1287,9 @@ sshd password required pam_permit.so</programlisting>
ぱ恂蟹 &man.pam.get.authtok.3;, 冾婘畛 佹痁妅賻媓 桸眐暕籥
玾Щ恌睋蟹 跂狦 釓眐曶 俵杻硨袬埧旼.</para>
- <programlisting><inlinegraphic fileref="pam_module.c"
- format="linespecific"/></programlisting>
+ <programlisting>
+<xi:include href="../../../en_US.ISO8859-1/articles/pam/pam_unix.c" parse="text"/>
+ </programlisting>
</appendix>
<appendix id="pam-sample-conv">
@@ -1306,8 +1305,9 @@ sshd password required pam_permit.so</programlisting>
藷曶; 阽 恔霰攪衭, 痽 玴 鰍衲轂癹恘 恔耀笥 佹畷衲覂 ぱ恂蟹
騷 跁賽迍霰弝婟奷 埧眝妅賻媓棎 梌婞珅衲袬虭.</para>
- <programlisting><inlinegraphic fileref="pam_conv.c"
- format="linespecific"/></programlisting>
+ <programlisting>
+<xi:include href="../../../en_US.ISO8859-1/articles/pam/converse.c" parse="text"/>
+ </programlisting>
</appendix>
<bibliography id="pam-further">
diff --git a/ru_RU.KOI8-R/articles/portbuild/article.xml b/ru_RU.KOI8-R/articles/portbuild/article.xml
index 8122fef44a..25b6fd6c01 100644
--- a/ru_RU.KOI8-R/articles/portbuild/article.xml
+++ b/ru_RU.KOI8-R/articles/portbuild/article.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="koi8-r" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//RU" "../../share/xml/entities.ent">
-%entities;
-]>
+<?xml version="1.0" encoding="koi8-r"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<!--
The FreeBSD Russian Documentation Project
diff --git a/ru_RU.KOI8-R/articles/pr-guidelines/article.xml b/ru_RU.KOI8-R/articles/pr-guidelines/article.xml
index fea3476632..0fa6878fb8 100644
--- a/ru_RU.KOI8-R/articles/pr-guidelines/article.xml
+++ b/ru_RU.KOI8-R/articles/pr-guidelines/article.xml
@@ -1,8 +1,6 @@
-<?xml version="1.0" encoding="koi8-r" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//RU" "../../share/xml/entities.ent">
-%entities;
+<?xml version="1.0" encoding="koi8-r"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd" [
<!ENTITY man.edit-pr.1 "<citerefentry><refentrytitle>edit-pr</refentrytitle><manvolnum>1</manvolnum></citerefentry>">
<!ENTITY man.query-pr.1 "<citerefentry><refentrytitle>query-pr</refentrytitle><manvolnum>1</manvolnum></citerefentry>">
]>
diff --git a/ru_RU.KOI8-R/articles/problem-reports/article.xml b/ru_RU.KOI8-R/articles/problem-reports/article.xml
index 5678e9fac3..1cfaa31a72 100644
--- a/ru_RU.KOI8-R/articles/problem-reports/article.xml
+++ b/ru_RU.KOI8-R/articles/problem-reports/article.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="koi8-r" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//RU" "../../share/xml/entities.ent">
-%entities;
-]>
+<?xml version="1.0" encoding="koi8-r"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<!--
The FreeBSD Russian Documentation Project
diff --git a/ru_RU.KOI8-R/articles/relaydelay/article.xml b/ru_RU.KOI8-R/articles/relaydelay/article.xml
index 56ca8dc830..13351a86e6 100644
--- a/ru_RU.KOI8-R/articles/relaydelay/article.xml
+++ b/ru_RU.KOI8-R/articles/relaydelay/article.xml
@@ -1,10 +1,6 @@
-<?xml version="1.0" encoding="koi8-r" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//RU" "../../share/xml/entities.ent">
-%entities;
-<!ENTITY % not.published "IGNORE">
-]>
+<?xml version="1.0" encoding="koi8-r"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<!--
The FreeBSD Russian Documentation Project
diff --git a/ru_RU.KOI8-R/articles/releng-packages/article.xml b/ru_RU.KOI8-R/articles/releng-packages/article.xml
index d39885c76e..65ac41be9a 100644
--- a/ru_RU.KOI8-R/articles/releng-packages/article.xml
+++ b/ru_RU.KOI8-R/articles/releng-packages/article.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="koi8-r" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//RU" "../../share/xml/entities.ent">
-%entities;
-]>
+<?xml version="1.0" encoding="koi8-r"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<!--
The FreeBSD Russian Documentation Project
diff --git a/ru_RU.KOI8-R/articles/releng/article.xml b/ru_RU.KOI8-R/articles/releng/article.xml
index 4803edde20..d7b388de0b 100644
--- a/ru_RU.KOI8-R/articles/releng/article.xml
+++ b/ru_RU.KOI8-R/articles/releng/article.xml
@@ -1,8 +1,6 @@
-<?xml version="1.0" encoding="koi8-r" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//RU" "../../share/xml/entities.ent">
-%entities;
+<?xml version="1.0" encoding="koi8-r"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd" [
<!ENTITY art.re.pkgs '<ulink url="&url.articles.releng-packages;/article.html">The Release Engineering of Third Party Packages</ulink>'>
]>
diff --git a/ru_RU.KOI8-R/articles/solid-state/article.xml b/ru_RU.KOI8-R/articles/solid-state/article.xml
index 3befe7268b..230f0d2dba 100644
--- a/ru_RU.KOI8-R/articles/solid-state/article.xml
+++ b/ru_RU.KOI8-R/articles/solid-state/article.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="koi8-r" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//RU" "../../share/xml/entities.ent">
-%entities;
-]>
+<?xml version="1.0" encoding="koi8-r"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<!--
Copyright (c) 2001 The FreeBSD Documentation Project
diff --git a/ru_RU.KOI8-R/articles/vm-design/article.xml b/ru_RU.KOI8-R/articles/vm-design/article.xml
index bd9d6b0610..eb317fb160 100644
--- a/ru_RU.KOI8-R/articles/vm-design/article.xml
+++ b/ru_RU.KOI8-R/articles/vm-design/article.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="koi8-r" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//RU" "../../share/xml/entities.ent">
-%entities;
-]>
+<?xml version="1.0" encoding="koi8-r"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<!--
The FreeBSD Russian Documentation Project
diff --git a/ru_RU.KOI8-R/books/arch-handbook/driverbasics/chapter.xml b/ru_RU.KOI8-R/books/arch-handbook/driverbasics/chapter.xml
index 531ac00b72..5d67f59bca 100644
--- a/ru_RU.KOI8-R/books/arch-handbook/driverbasics/chapter.xml
+++ b/ru_RU.KOI8-R/books/arch-handbook/driverbasics/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="koi8-r" standalone="no"?>
+<?xml version="1.0" encoding="koi8-r"?>
<!--
The FreeBSD Russian Documentation Project
diff --git a/ru_RU.KOI8-R/books/arch-handbook/locking/chapter.xml b/ru_RU.KOI8-R/books/arch-handbook/locking/chapter.xml
index 2cd5a80a7b..74aebf6f30 100644
--- a/ru_RU.KOI8-R/books/arch-handbook/locking/chapter.xml
+++ b/ru_RU.KOI8-R/books/arch-handbook/locking/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="koi8-r" standalone="no"?>
+<?xml version="1.0" encoding="koi8-r"?>
<!--
The FreeBSD Russian Documentation Project
diff --git a/ru_RU.KOI8-R/books/arch-handbook/sound/chapter.xml b/ru_RU.KOI8-R/books/arch-handbook/sound/chapter.xml
index 0343bbcef3..5df63748fd 100644
--- a/ru_RU.KOI8-R/books/arch-handbook/sound/chapter.xml
+++ b/ru_RU.KOI8-R/books/arch-handbook/sound/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="koi8-r" standalone="no"?>
+<?xml version="1.0" encoding="koi8-r"?>
<!--
The FreeBSD Russian Documentation Project
diff --git a/ru_RU.KOI8-R/books/design-44bsd/book.xml b/ru_RU.KOI8-R/books/design-44bsd/book.xml
index 6cc5534fb7..cc599874c4 100644
--- a/ru_RU.KOI8-R/books/design-44bsd/book.xml
+++ b/ru_RU.KOI8-R/books/design-44bsd/book.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="koi8-r" standalone="no"?>
-<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//RU" "../../share/xml/entities.ent">
-%entities;
-]>
+<?xml version="1.0" encoding="koi8-r"?>
+<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<!--
The FreeBSD Russian Documentation Project
diff --git a/ru_RU.KOI8-R/books/developers-handbook/book.xml b/ru_RU.KOI8-R/books/developers-handbook/book.xml
index f799f92b43..3abd465dd8 100644
--- a/ru_RU.KOI8-R/books/developers-handbook/book.xml
+++ b/ru_RU.KOI8-R/books/developers-handbook/book.xml
@@ -1,8 +1,6 @@
-<?xml version="1.0" encoding="koi8-r" standalone="no"?>
-<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//RU" "../../share/xml/entities.ent">
-%entities;
+<?xml version="1.0" encoding="koi8-r"?>
+<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd" [
<!ENTITY % chapters SYSTEM "chapters.ent"> %chapters;
]>
diff --git a/ru_RU.KOI8-R/books/developers-handbook/introduction/chapter.xml b/ru_RU.KOI8-R/books/developers-handbook/introduction/chapter.xml
index a0859acebb..bdbf249a60 100644
--- a/ru_RU.KOI8-R/books/developers-handbook/introduction/chapter.xml
+++ b/ru_RU.KOI8-R/books/developers-handbook/introduction/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="koi8-r" standalone="no"?>
+<?xml version="1.0" encoding="koi8-r"?>
<!--
The FreeBSD Russian Documentation Project
diff --git a/ru_RU.KOI8-R/books/developers-handbook/kerneldebug/chapter.xml b/ru_RU.KOI8-R/books/developers-handbook/kerneldebug/chapter.xml
index 643c2ac33a..ac5541c3e7 100644
--- a/ru_RU.KOI8-R/books/developers-handbook/kerneldebug/chapter.xml
+++ b/ru_RU.KOI8-R/books/developers-handbook/kerneldebug/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="koi8-r" standalone="no"?>
+<?xml version="1.0" encoding="koi8-r"?>
<!--
The FreeBSD Russian Documentation Project
diff --git a/ru_RU.KOI8-R/books/developers-handbook/policies/chapter.xml b/ru_RU.KOI8-R/books/developers-handbook/policies/chapter.xml
index 8637dc82a1..3f4eee098b 100644
--- a/ru_RU.KOI8-R/books/developers-handbook/policies/chapter.xml
+++ b/ru_RU.KOI8-R/books/developers-handbook/policies/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="koi8-r" standalone="no"?>
+<?xml version="1.0" encoding="koi8-r"?>
<!--
The FreeBSD Russian Documentation Project
diff --git a/ru_RU.KOI8-R/books/developers-handbook/secure/chapter.xml b/ru_RU.KOI8-R/books/developers-handbook/secure/chapter.xml
index 26a1714ec0..1d5f380228 100644
--- a/ru_RU.KOI8-R/books/developers-handbook/secure/chapter.xml
+++ b/ru_RU.KOI8-R/books/developers-handbook/secure/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="koi8-r" standalone="no"?>
+<?xml version="1.0" encoding="koi8-r"?>
<!--
The FreeBSD Russian Documentation Project
diff --git a/ru_RU.KOI8-R/books/faq/book.xml b/ru_RU.KOI8-R/books/faq/book.xml
index e3028b6acc..ddf4d45c90 100644
--- a/ru_RU.KOI8-R/books/faq/book.xml
+++ b/ru_RU.KOI8-R/books/faq/book.xml
@@ -1,8 +1,6 @@
-<?xml version="1.0" encoding="koi8-r" standalone="no"?>
-<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//RU" "../../share/xml/entities.ent">
-%entities;
+<?xml version="1.0" encoding="koi8-r"?>
+<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd" [
<!ENTITY bibliography SYSTEM "../../../share/xml/bibliography.xml">
<!ENTITY rel.head "<emphasis>10-CURRENT</emphasis>">
<!ENTITY rel.head.relx "10.<replaceable>X</replaceable>">
@@ -2839,7 +2837,7 @@ bindkey ^[[3~ delete-char # 騷 xterm</programlisting>
<qandaentry>
<question id="pae">
<para>蟴畷邯 &os; 玿疻霰曶籥 恓倷避妀媓狣 冾旻畷衲豜 釓迕埩
- 恔 蹈釓畛婭疻 &i386?</para>
+ 恔 蹈釓畛婭疻 &i386;?</para>
</question>
<answer>
@@ -3524,7 +3522,7 @@ Checking for Plug-n-Play devices...
Card assigned CSN #1
Vendor ID PMC2430 (0x3024a341), Serial Number 0xffffffff
PnP Version 1.0, Vendor Version 0
-Device Description: Pace 56 Voice Internal Plug & Play Modem
+Device Description: Pace 56 Voice Internal Plug &amp; Play Modem
Logical Device ID: PMC2430 0x3024a341 #0
Device supports I/O Range Check
@@ -8689,7 +8687,7 @@ add 0 0 HISADDR</programlisting>
<para> 蟠杻袶扃婟 迍霰迍 籣婥 釓畛芶婞, 玿疻霰曶濫圴
皙赽婟尕攫媓珃婥 貥攪曬恘 俵埧疻 恓袀暙. 轀倷奼籤,
- 迍霰芶 &usrobotics;&nbsp;&sportster 嗩 玿疻霰曶籥衭 硩醣曬吇
+ 迍霰芶 &usrobotics;&nbsp;&sportster; 嗩 玿疻霰曶籥衭 硩醣曬吇
疻б衲畛 <literal>S10</literal> 霰衭婬 鰍曶 蚥劼恅.
婘蹙 蚅攫轂 衿栚 蟠旼 梌婘忤屺珅, 鰍臏趹埧 蚝鼴梏楙
俵蚝鼴瓬轂攫媓珃婥 俵袃昑-珋厊蹉圴 衲眐劼 恔蟠畛:</para>
@@ -9588,7 +9586,7 @@ ATDT1234567</programlisting>
url="http://support.microsoft.com/support/kb/articles/Q158/4/74.asp">
Q158474 - Windows TCPIP Registry Entries</ulink> <ulink
url="http://support.microsoft.com/support/kb/articles/Q120/6/42.asp">
- Q120642 - TCPIP & NBT Configuration Parameters for
+ Q120642 - TCPIP &amp; NBT Configuration Parameters for
&windowsnt;</ulink> 騷 俵枎畷恌 蟠旼 俵旽珅 妅に眝謄圪 俵
巟芶恓恌 MTU &windows; 騷 畛蟠婬 NAT-芩砢眙埩睋婘眐.</para>
@@ -9658,9 +9656,9 @@ ATDT1234567</programlisting>
<para>龢 倷奼籤 趿豜鐘 趿袹梖邁蹉恘 冾芩恅:</para>
- <programlisting>sio0: <16550A-compatible COM port> port 0x3f8-0x3ff irq 4 flags 0x10 on acpi0
+ <programlisting>sio0: &lt;16550A-compatible COM port&gt; port 0x3f8-0x3ff irq 4 flags 0x10 on acpi0
sio0: type 16550A
-sio1: <16550A-compatible COM port> port 0x2f8-0x2ff irq 3 on acpi0
+sio1: &lt;16550A-compatible COM port&gt; port 0x2f8-0x2ff irq 3 on acpi0
sio1: type 16550A</programlisting>
<para>霰衯 倷孖梊衲赹殮 儷 俵蚝鼴瓬轂攫媓棼 俵眕. 蟔眢椋
@@ -9793,7 +9791,7 @@ hint.sio.7.irq="12"</programlisting>
</question>
<answer>
- <para>鯢珆疶埧 畛矬攫 藑冾豜鼯婟 &os, 俵衿栳恄椋 <ulink
+ <para>鯢珆疶埧 畛矬攫 藑冾豜鼯婟 &os;, 俵衿栳恄椋 <ulink
url="&url.books.handbook;/serial.html#SERIAL-HW-CONFIG">俵蚝鼴瓬轂攫媓棎
衃鼴妅曬奷</ulink>.</para>
</answer>
diff --git a/ru_RU.KOI8-R/books/fdp-primer/book.xml b/ru_RU.KOI8-R/books/fdp-primer/book.xml
index 52248aff97..ec7c536532 100644
--- a/ru_RU.KOI8-R/books/fdp-primer/book.xml
+++ b/ru_RU.KOI8-R/books/fdp-primer/book.xml
@@ -1,8 +1,6 @@
-<?xml version="1.0" encoding="koi8-r" standalone="no"?>
-<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//RU" "../../share/xml/entities.ent">
-%entities;
+<?xml version="1.0" encoding="koi8-r"?>
+<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd" [
<!ENTITY % chapters SYSTEM "chapters.ent"> %chapters;
]>
diff --git a/ru_RU.KOI8-R/books/fdp-primer/doc-build/chapter.xml b/ru_RU.KOI8-R/books/fdp-primer/doc-build/chapter.xml
index 4e2f5cb036..b8d5ba90a0 100644
--- a/ru_RU.KOI8-R/books/fdp-primer/doc-build/chapter.xml
+++ b/ru_RU.KOI8-R/books/fdp-primer/doc-build/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="koi8-r" standalone="no"?>
+<?xml version="1.0" encoding="koi8-r"?>
<!--
The FreeBSD Russian Documentation Project
diff --git a/ru_RU.KOI8-R/books/fdp-primer/overview/chapter.xml b/ru_RU.KOI8-R/books/fdp-primer/overview/chapter.xml
index e760bbbf19..4569e530ab 100644
--- a/ru_RU.KOI8-R/books/fdp-primer/overview/chapter.xml
+++ b/ru_RU.KOI8-R/books/fdp-primer/overview/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="koi8-r" standalone="no"?>
+<?xml version="1.0" encoding="koi8-r"?>
<!--
The FreeBSD Russian Documentation Project
diff --git a/ru_RU.KOI8-R/books/fdp-primer/see-also/chapter.xml b/ru_RU.KOI8-R/books/fdp-primer/see-also/chapter.xml
index a4fbceb0ff..3237b4cf79 100644
--- a/ru_RU.KOI8-R/books/fdp-primer/see-also/chapter.xml
+++ b/ru_RU.KOI8-R/books/fdp-primer/see-also/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="koi8-r" standalone="no"?>
+<?xml version="1.0" encoding="koi8-r"?>
<!--
The FreeBSD Russian Documentation Project
diff --git a/ru_RU.KOI8-R/books/fdp-primer/sgml-markup/chapter.xml b/ru_RU.KOI8-R/books/fdp-primer/sgml-markup/chapter.xml
index 1b0b87dcae..d98faffea9 100644
--- a/ru_RU.KOI8-R/books/fdp-primer/sgml-markup/chapter.xml
+++ b/ru_RU.KOI8-R/books/fdp-primer/sgml-markup/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="koi8-r" standalone="no"?>
+<?xml version="1.0" encoding="koi8-r"?>
<!--
The FreeBSD Russian Documentation Project
diff --git a/ru_RU.KOI8-R/books/fdp-primer/the-website/chapter.xml b/ru_RU.KOI8-R/books/fdp-primer/the-website/chapter.xml
index d7a4302d4d..683549158b 100644
--- a/ru_RU.KOI8-R/books/fdp-primer/the-website/chapter.xml
+++ b/ru_RU.KOI8-R/books/fdp-primer/the-website/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="koi8-r" standalone="no"?>
+<?xml version="1.0" encoding="koi8-r"?>
<!--
The FreeBSD Russian Documentation Project
diff --git a/ru_RU.KOI8-R/books/fdp-primer/tools/chapter.xml b/ru_RU.KOI8-R/books/fdp-primer/tools/chapter.xml
index 4780afe4e3..b54aa51456 100644
--- a/ru_RU.KOI8-R/books/fdp-primer/tools/chapter.xml
+++ b/ru_RU.KOI8-R/books/fdp-primer/tools/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="koi8-r" standalone="no"?>
+<?xml version="1.0" encoding="koi8-r"?>
<!--
The FreeBSD Russian Documentation Project
diff --git a/ru_RU.KOI8-R/books/fdp-primer/writing-style/chapter.xml b/ru_RU.KOI8-R/books/fdp-primer/writing-style/chapter.xml
index dbc3071da2..691bc1d834 100644
--- a/ru_RU.KOI8-R/books/fdp-primer/writing-style/chapter.xml
+++ b/ru_RU.KOI8-R/books/fdp-primer/writing-style/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="koi8-r" standalone="no"?>
+<?xml version="1.0" encoding="koi8-r"?>
<!--
The FreeBSD Russian Documentation Project
diff --git a/ru_RU.KOI8-R/books/handbook/Makefile b/ru_RU.KOI8-R/books/handbook/Makefile
index 9ca76469cb..2d3e729f56 100644
--- a/ru_RU.KOI8-R/books/handbook/Makefile
+++ b/ru_RU.KOI8-R/books/handbook/Makefile
@@ -269,30 +269,43 @@ DOC_PREFIX?= ${.CURDIR}/../../..
#
# rules generating lists of mirror site from XML database.
#
-XMLDOCS= mirrors-ftp:::mirrors.xml.ftp.inc \
+XMLDOCS= lastmod:::mirrors.lastmod.inc \
+ mirrors-ftp-index:::mirrors.xml.ftp.index.inc \
+ mirrors-ftp:::mirrors.xml.ftp.inc \
+ mirrors-cvsup-index:::mirrors.xml.cvsup.index.inc \
mirrors-cvsup:::mirrors.xml.cvsup.inc \
+ eresources-index:::eresources.xml.www.index.inc \
eresources:::eresources.xml.www.inc
DEPENDSET.DEFAULT= transtable mirror
XSLT.DEFAULT= ${XSL_MIRRORS}
XML.DEFAULT= ${XML_MIRRORS}
-NO_TIDY.DEFAULT= yes
+PARAMS.lastmod+= --param 'target' "'lastmod'"
+PARAMS.mirrors-ftp-index+= --param 'type' "'ftp'" \
+ --param 'proto' "'ftp'" \
+ --param 'target' "'index'"
PARAMS.mirrors-ftp+= --param 'type' "'ftp'" \
--param 'proto' "'ftp'" \
--param 'target' "'handbook/mirrors/chapter.xml'"
+PARAMS.mirrors-cvsup-index+= --param 'type' "'cvsup'" \
+ --param 'proto' "'cvsup'" \
+ --param 'target' "'index'"
PARAMS.mirrors-cvsup+= --param 'type' "'cvsup'" \
--param 'proto' "'cvsup'" \
--param 'target' "'handbook/mirrors/chapter.xml'"
+PARAMS.eresources-index+= --param 'type' "'www'" \
+ --param 'proto' "'http'" \
+ --param 'target' "'index'"
PARAMS.eresources+= --param 'type' "'www'" \
--param 'proto' "'http'" \
--param 'target' "'handbook/eresources/chapter.xml'"
-SRCS+= mirrors.xml.ftp.inc \
+SRCS+= mirrors.lastmod.inc \
+ mirrors.xml.ftp.inc \
+ mirrors.xml.ftp.index.inc \
mirrors.xml.cvsup.inc \
- eresources.xml.www.inc
-
-CLEANFILES+= mirrors.xml.ftp.inc \
- mirrors.xml.cvsup.inc \
- eresources.xml.www.inc
+ mirrors.xml.cvsup.index.inc \
+ eresources.xml.www.inc \
+ eresources.xml.www.index.inc
.include "${DOC_PREFIX}/share/mk/doc.project.mk"
diff --git a/ru_RU.KOI8-R/books/handbook/advanced-networking/chapter.xml b/ru_RU.KOI8-R/books/handbook/advanced-networking/chapter.xml
index 8bcd0ad06a..8daf304fa4 100644
--- a/ru_RU.KOI8-R/books/handbook/advanced-networking/chapter.xml
+++ b/ru_RU.KOI8-R/books/handbook/advanced-networking/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="koi8-r" standalone="no"?>
+<?xml version="1.0" encoding="koi8-r"?>
<!--
The FreeBSD Russian Documentation Project
@@ -1269,7 +1269,7 @@ wi0: flags=8843&lt;UP,BROADCAST,RUNNING,SIMPLEX,MULTICAST&gt; mtu 1500
<para>轀冾恓, 衃藍疶埧 梌埡恘訰埧 迍齣杻 黨購覂畛:</para>
- <screen>&prompt.root; <userinput>make && make install</userinput></screen>
+ <screen>&prompt.root; <userinput>make &amp;&amp; make install</userinput></screen>
<para>颭 孖俵杻硨袬恌 黨購覂畛 恓狟狦奼 睋й殑尕 衃珆覂娸婟梏楦
迍齣旻:</para>
diff --git a/ru_RU.KOI8-R/books/handbook/audit/chapter.xml b/ru_RU.KOI8-R/books/handbook/audit/chapter.xml
index 59a33b64d5..96a138068f 100644
--- a/ru_RU.KOI8-R/books/handbook/audit/chapter.xml
+++ b/ru_RU.KOI8-R/books/handbook/audit/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="koi8-r" standalone="no"?>
+<?xml version="1.0" encoding="koi8-r"?>
<!--
The FreeBSD Russian Documentation Project
diff --git a/ru_RU.KOI8-R/books/handbook/basics/chapter.xml b/ru_RU.KOI8-R/books/handbook/basics/chapter.xml
index 9662774759..4a1c1c9b6b 100644
--- a/ru_RU.KOI8-R/books/handbook/basics/chapter.xml
+++ b/ru_RU.KOI8-R/books/handbook/basics/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="koi8-r" standalone="no"?>
+<?xml version="1.0" encoding="koi8-r"?>
<!--
The FreeBSD Russian Documentation Project
diff --git a/ru_RU.KOI8-R/books/handbook/bibliography/chapter.xml b/ru_RU.KOI8-R/books/handbook/bibliography/chapter.xml
index e8d1353b98..d234a87de2 100644
--- a/ru_RU.KOI8-R/books/handbook/bibliography/chapter.xml
+++ b/ru_RU.KOI8-R/books/handbook/bibliography/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="koi8-r" standalone="no"?>
+<?xml version="1.0" encoding="koi8-r"?>
<!--
The FreeBSD Russian Documentation Project
diff --git a/ru_RU.KOI8-R/books/handbook/book.xml b/ru_RU.KOI8-R/books/handbook/book.xml
index 5a05a91871..eaddecedc3 100644
--- a/ru_RU.KOI8-R/books/handbook/book.xml
+++ b/ru_RU.KOI8-R/books/handbook/book.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="koi8-r" standalone="no"?>
-<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//RU" "../../share/xml/entities.ent">
-%entities;
-
+<?xml version="1.0" encoding="koi8-r"?>
+<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd" [
<!ENTITY % chapters SYSTEM "chapters.ent">
%chapters;
<!ENTITY % txtfiles SYSTEM "txtfiles.ent">
diff --git a/ru_RU.KOI8-R/books/handbook/boot/chapter.xml b/ru_RU.KOI8-R/books/handbook/boot/chapter.xml
index 2f0d46912b..8346cc6885 100644
--- a/ru_RU.KOI8-R/books/handbook/boot/chapter.xml
+++ b/ru_RU.KOI8-R/books/handbook/boot/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="koi8-r" standalone="no"?>
+<?xml version="1.0" encoding="koi8-r"?>
<!--
The FreeBSD Russian Documentation Project
diff --git a/ru_RU.KOI8-R/books/handbook/bsdinstall/chapter.xml b/ru_RU.KOI8-R/books/handbook/bsdinstall/chapter.xml
index 0168a9e5ad..cacc11b825 100644
--- a/ru_RU.KOI8-R/books/handbook/bsdinstall/chapter.xml
+++ b/ru_RU.KOI8-R/books/handbook/bsdinstall/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="koi8-r" standalone="no"?>
+<?xml version="1.0" encoding="koi8-r"?>
<!--
The FreeBSD Russian Documentation Project
diff --git a/ru_RU.KOI8-R/books/handbook/chapters.ent b/ru_RU.KOI8-R/books/handbook/chapters.ent
index 0196cfce06..213cd1c9a9 100644
--- a/ru_RU.KOI8-R/books/handbook/chapters.ent
+++ b/ru_RU.KOI8-R/books/handbook/chapters.ent
@@ -16,232 +16,61 @@
臗矬攫 鰍枒挃 蹙婥 珆衃眕奿瓬蹉 俵眒騰 冾婘眐 玴 孖俵杻祰殮衭.
-->
-<!ENTITY % not.published "INCLUDE">
-
-<!ENTITY % chap.introduction "IGNORE">
-<!ENTITY % chap.install "IGNORE">
-<!ENTITY % chap.bsdinstall "IGNORE">
-<!ENTITY % chap.basics "IGNORE">
-<!ENTITY % chap.ports "IGNORE">
-<!ENTITY % chap.config "IGNORE">
-<!ENTITY % chap.boot "IGNORE">
-<!ENTITY % chap.users "IGNORE">
-<!ENTITY % chap.kernelconfig "IGNORE">
-<!ENTITY % chap.security "IGNORE">
-<!ENTITY % chap.jails "IGNORE">
-<!ENTITY % chap.printing "IGNORE">
-<!ENTITY % chap.disks "IGNORE">
-<!ENTITY % chap.geom "IGNORE">
-<!ENTITY % chap.vinum "IGNORE">
-<!ENTITY % chap.x11 "IGNORE">
-<!ENTITY % chap.l10n "IGNORE">
-<!ENTITY % chap.multimedia "IGNORE">
-<!ENTITY % chap.desktop "IGNORE">
-<!ENTITY % chap.serialcomms "IGNORE">
-<!ENTITY % chap.ppp-and-slip "IGNORE">
-<!ENTITY % chap.advanced-networking "IGNORE">
-<!ENTITY % chap.firewalls "IGNORE">
-<!ENTITY % chap.network-servers "IGNORE">
-<!ENTITY % chap.mail "IGNORE">
-<!ENTITY % chap.cutting-edge "IGNORE">
-<!ENTITY % chap.linuxemu "IGNORE">
-<!ENTITY % chap.mirrors "IGNORE">
-<!ENTITY % chap.mirrors.ftp.inc "INCLUDE">
-<!ENTITY % chap.mirrors.cvsup.inc "INCLUDE">
-<!ENTITY % chap.bibliography "IGNORE">
-<!ENTITY % chap.eresources "IGNORE">
-<!ENTITY % chap.eresources.www.inc "INCLUDE">
-<!ENTITY % chap.pgpkeys "IGNORE">
-<!ENTITY % chap.index "IGNORE">
-<!ENTITY % chap.freebsd-glossary "IGNORE">
-<!ENTITY % chap.mac "IGNORE">
-<!ENTITY % chap.audit "IGNORE">
-<!ENTITY % chap.filesystems "IGNORE">
-<!ENTITY % chap.dtrace "IGNORE">
-
<!ENTITY chap.preface SYSTEM "preface/preface.xml">
<!ENTITY % pgpkeys SYSTEM "../../../share/pgpkeys/pgpkeys.ent"> %pgpkeys;
<!-- Part One -->
-<![%chap.introduction;[
<!ENTITY chap.introduction SYSTEM "introduction/chapter.xml">
-]]>
-<![%chap.install;[
<!ENTITY chap.install SYSTEM "install/chapter.xml">
-]]>
-<![%chap.bsdinstall;[
<!ENTITY chap.bsdinstall SYSTEM "bsdinstall/chapter.xml">
-]]>
-<![%chap.basics;[
<!ENTITY chap.basics SYSTEM "basics/chapter.xml">
-]]>
-<![%chap.ports;[
<!ENTITY chap.ports SYSTEM "ports/chapter.xml">
-]]>
-<![%chap.x11;[
<!ENTITY chap.x11 SYSTEM "x11/chapter.xml">
-]]>
<!-- Part Two -->
-<![%chap.desktop;[
<!ENTITY chap.desktop SYSTEM "desktop/chapter.xml">
-]]>
-<![%chap.multimedia;[
<!ENTITY chap.multimedia SYSTEM "multimedia/chapter.xml">
-]]>
-<![%chap.kernelconfig;[
<!ENTITY chap.kernelconfig SYSTEM "kernelconfig/chapter.xml">
-]]>
-<![%chap.printing;[
<!ENTITY chap.printing SYSTEM "printing/chapter.xml">
-]]>
-<![%chap.linuxemu;[
<!ENTITY chap.linuxemu SYSTEM "linuxemu/chapter.xml">
-]]>
<!-- Part Three -->
-<![%chap.config;[
<!ENTITY chap.config SYSTEM "config/chapter.xml">
-]]>
-<![%chap.boot;[
<!ENTITY chap.boot SYSTEM "boot/chapter.xml">
-]]>
-<![%chap.users;[
<!ENTITY chap.users SYSTEM "users/chapter.xml">
-]]>
-<![%chap.security;[
<!ENTITY chap.security SYSTEM "security/chapter.xml">
-]]>
-<![%chap.jails;[
<!ENTITY chap.jails SYSTEM "jails/chapter.xml">
-]]>
-<![%chap.mac;[
<!ENTITY chap.mac SYSTEM "mac/chapter.xml">
-]]>
-<![%chap.audit;[
<!ENTITY chap.audit SYSTEM "audit/chapter.xml">
-]]>
-<![%chap.disks;[
<!ENTITY chap.disks SYSTEM "disks/chapter.xml">
-]]>
-<![%chap.geom;[
<!ENTITY chap.geom SYSTEM "geom/chapter.xml">
-]]>
-<![%chap.filesystems;[
<!ENTITY chap.filesystems SYSTEM "filesystems/chapter.xml">
-]]>
-<![%chap.vinum;[
<!ENTITY chap.vinum SYSTEM "vinum/chapter.xml">
-]]>
-<![%chap.l10n;[
<!ENTITY chap.l10n SYSTEM "l10n/chapter.xml">
-]]>
-<![%chap.cutting-edge;[
<!ENTITY chap.cutting-edge SYSTEM "cutting-edge/chapter.xml">
-]]>
-<![%chap.dtrace;[
<!ENTITY chap.dtrace SYSTEM "dtrace/chapter.xml">
-]]>
<!-- Part Four -->
-<![%chap.serialcomms;[
<!ENTITY chap.serialcomms SYSTEM "serialcomms/chapter.xml">
-]]>
-<![%chap.ppp-and-slip;[
<!ENTITY chap.ppp-and-slip SYSTEM "ppp-and-slip/chapter.xml">
-]]>
-<![%chap.mail;[
<!ENTITY chap.mail SYSTEM "mail/chapter.xml">
-]]>
-<![%chap.network-servers;[
<!ENTITY chap.network-servers SYSTEM "network-servers/chapter.xml">
-]]>
-<![%chap.firewalls;[
<!ENTITY chap.firewalls SYSTEM "firewalls/chapter.xml">
-]]>
-<![%chap.advanced-networking;[
<!ENTITY chap.advanced-networking SYSTEM "advanced-networking/chapter.xml">
-]]>
<!-- Part Five (appendices) -->
-<![%chap.mirrors;[
<!ENTITY chap.mirrors SYSTEM "mirrors/chapter.xml">
-]]>
-<![%chap.mirrors.ftp.inc;[
+ <!ENTITY chap.mirrors.lastmod.inc SYSTEM "mirrors.lastmod.inc">
+ <!ENTITY chap.mirrors.ftp.index.inc SYSTEM "mirrors.xml.ftp.index.inc">
<!ENTITY chap.mirrors.ftp.inc SYSTEM "mirrors.xml.ftp.inc">
-]]>
-<![%chap.mirrors.cvsup.inc;[
+ <!ENTITY chap.mirrors.cvsup.index.inc SYSTEM "mirrors.xml.cvsup.index.inc">
<!ENTITY chap.mirrors.cvsup.inc SYSTEM "mirrors.xml.cvsup.inc">
-]]>
-<![%chap.bibliography;[
<!ENTITY chap.bibliography SYSTEM "bibliography/chapter.xml">
-]]>
-<![%chap.eresources;[
<!ENTITY chap.eresources SYSTEM "eresources/chapter.xml">
-]]>
-<![%chap.eresources.www.inc;[
+ <!ENTITY chap.eresources.www.index.inc SYSTEM "eresources.xml.www.index.inc">
<!ENTITY chap.eresources.www.inc SYSTEM "eresources.xml.www.inc">
-]]>
-<![%chap.pgpkeys;[
<!ENTITY chap.pgpkeys SYSTEM "pgpkeys/chapter.xml">
-]]>
-<![%chap.freebsd-glossary;[
<!ENTITY chap.freebsd-glossary "&freebsd-glossary;">
-]]>
-<![%chap.index;[
- <!ENTITY chap.index SYSTEM "index.xml">
-]]>
+ <!ENTITY chap.index "">
<!ENTITY chap.colophon SYSTEM "colophon.xml">
-
-<!-- IGNORE cases -->
-
-<!-- Part One -->
-<!ENTITY chap.introduction "">
-<!ENTITY chap.install "">
-<!ENTITY chap.basics "">
-<!ENTITY chap.ports "">
-<!ENTITY chap.x11 "">
-
-<!-- Part Two -->
-<!ENTITY chap.desktop "">
-<!ENTITY chap.multimedia "">
-<!ENTITY chap.kernelconfig "">
-<!ENTITY chap.printing "">
-<!ENTITY chap.linuxemu "">
-
-<!-- Part Three -->
-<!ENTITY chap.config "">
-<!ENTITY chap.boot "">
-<!ENTITY chap.users "">
-<!ENTITY chap.security "">
-<!ENTITY chap.jails "">
-<!ENTITY chap.mac "">
-<!ENTITY chap.audit "">
-<!ENTITY chap.disks "">
-<!ENTITY chap.geom "">
-<!ENTITY chap.filesystems "">
-<!ENTITY chap.vinum "">
-<!ENTITY chap.virtualization "">
-<!ENTITY chap.l10n "">
-<!ENTITY chap.cutting-edge "">
-<!ENTITY chap.dtrace "">
-
-<!-- Part Four -->
-<!ENTITY chap.serialcomms "">
-<!ENTITY chap.ppp-and-slip "">
-<!ENTITY chap.mail "">
-<!ENTITY chap.network-servers "">
-<!ENTITY chap.firewalls "">
-<!ENTITY chap.advanced-networking "">
-
-<!-- Part Five (appendices) -->
-<!ENTITY chap.mirrors "">
-<!ENTITY chap.mirrors.ftp.inc "">
-<!ENTITY chap.mirrors.cvsup.inc "">
-<!ENTITY chap.bibliography "">
-<!ENTITY chap.eresources "">
-<!ENTITY chap.eresources.www.inc "">
-<!ENTITY chap.pgpkeys "">
-<!ENTITY chap.freebsd-glossary "">
-<!ENTITY chap.index "">
diff --git a/ru_RU.KOI8-R/books/handbook/colophon.xml b/ru_RU.KOI8-R/books/handbook/colophon.xml
index fddc7f54dc..228c443b2f 100644
--- a/ru_RU.KOI8-R/books/handbook/colophon.xml
+++ b/ru_RU.KOI8-R/books/handbook/colophon.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="koi8-r" standalone="no"?>
+<?xml version="1.0" encoding="koi8-r"?>
<!--
The Russian FreeBSD Documentation Project
diff --git a/ru_RU.KOI8-R/books/handbook/config/chapter.xml b/ru_RU.KOI8-R/books/handbook/config/chapter.xml
index a99290ba37..0853766366 100644
--- a/ru_RU.KOI8-R/books/handbook/config/chapter.xml
+++ b/ru_RU.KOI8-R/books/handbook/config/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="koi8-r" standalone="no"?>
+<?xml version="1.0" encoding="koi8-r"?>
<!--
The FreeBSD Documentation Project
@@ -397,7 +397,7 @@ stop)
kill -9 `cat /var/run/utility.pid`
;;
*)
- echo "Usage: `basename $0` {start|stop}" &gt;&2
+ echo "Usage: `basename $0` {start|stop}" &gt;&amp;2
exit 64
;;
esac
diff --git a/ru_RU.KOI8-R/books/handbook/cutting-edge/chapter.xml b/ru_RU.KOI8-R/books/handbook/cutting-edge/chapter.xml
index bbdf1b25d2..06f16c3d71 100644
--- a/ru_RU.KOI8-R/books/handbook/cutting-edge/chapter.xml
+++ b/ru_RU.KOI8-R/books/handbook/cutting-edge/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="koi8-r" standalone="no"?>
+<?xml version="1.0" encoding="koi8-r"?>
<!--
The FreeBSD Russian Documentation Project
diff --git a/ru_RU.KOI8-R/books/handbook/desktop/chapter.xml b/ru_RU.KOI8-R/books/handbook/desktop/chapter.xml
index cd457312d8..443e5b9f3d 100644
--- a/ru_RU.KOI8-R/books/handbook/desktop/chapter.xml
+++ b/ru_RU.KOI8-R/books/handbook/desktop/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="koi8-r" standalone="no"?>
+<?xml version="1.0" encoding="koi8-r"?>
<!--
The FreeBSD Russian Documentation Project
diff --git a/ru_RU.KOI8-R/books/handbook/disks/chapter.xml b/ru_RU.KOI8-R/books/handbook/disks/chapter.xml
index 21b0bd72c5..5e2ef323cd 100644
--- a/ru_RU.KOI8-R/books/handbook/disks/chapter.xml
+++ b/ru_RU.KOI8-R/books/handbook/disks/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="koi8-r" standalone="no"?>
+<?xml version="1.0" encoding="koi8-r"?>
<!--
The FreeBSD Russian Documentation Project
@@ -2949,16 +2949,6 @@ targetuser@targetmachine.example.com dd of=/mybigfiles/dump-usr-l0.gz</userinput
蚝殌尕寔 蚔瓬. 槷 狦妅 瓾, 俵婞醣曬挃 嗩珆 迍芶拏, 迍秸
衄輾埩 袬 珆 恓倷奷婠珃埧 謬齣暙.</para>
</sect3>
-
-<![ %not.published; [
-
- <sect3>
- <title>* 恓 蹙 ж婘 佹埡衲眐ち, 痽 埧陓眧?</title>
-
- <para></para>
- </sect3>
-]]>
-
</sect2>
</sect1>
diff --git a/ru_RU.KOI8-R/books/handbook/eresources/chapter.xml b/ru_RU.KOI8-R/books/handbook/eresources/chapter.xml
index 2b8cc70f0a..ab75145080 100644
--- a/ru_RU.KOI8-R/books/handbook/eresources/chapter.xml
+++ b/ru_RU.KOI8-R/books/handbook/eresources/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="koi8-r" standalone="no"?>
+<?xml version="1.0" encoding="koi8-r"?>
<!--
The FreeBSD Russian Documentation Project
diff --git a/ru_RU.KOI8-R/books/handbook/filesystems/chapter.xml b/ru_RU.KOI8-R/books/handbook/filesystems/chapter.xml
index 4b6d2ec664..a44606af50 100644
--- a/ru_RU.KOI8-R/books/handbook/filesystems/chapter.xml
+++ b/ru_RU.KOI8-R/books/handbook/filesystems/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="koi8-r" standalone="no"?>
+<?xml version="1.0" encoding="koi8-r"?>
<!--
The FreeBSD Russian Documentation Project
$FreeBSD$
@@ -227,7 +227,7 @@ example 17547136 0 17547136 0% /example</screen>
衃矬避轂 そ帎, 俵杻硨袬埧旻 迍м 倷珃芩婞屺轂 龔 衃霰眚奼狣,
恔倷奼籤:</para>
- <screen>&prompt.root <userinput>cd /example</userinput>
+ <screen>&prompt.root; <userinput>cd /example</userinput>
&prompt.root; <userinput>ls</userinput>
&prompt.root; <userinput>touch testfile</userinput>
&prompt.root; <userinput>ls -al</userinput>
diff --git a/ru_RU.KOI8-R/books/handbook/firewalls/chapter.xml b/ru_RU.KOI8-R/books/handbook/firewalls/chapter.xml
index 1b3e8556b1..82b504bfb4 100644
--- a/ru_RU.KOI8-R/books/handbook/firewalls/chapter.xml
+++ b/ru_RU.KOI8-R/books/handbook/firewalls/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="koi8-r" standalone="no"?>
+<?xml version="1.0" encoding="koi8-r"?>
<!--
The FreeBSD Documentation Project
diff --git a/ru_RU.KOI8-R/books/handbook/geom/chapter.xml b/ru_RU.KOI8-R/books/handbook/geom/chapter.xml
index d804ad63f0..7e6939a30b 100644
--- a/ru_RU.KOI8-R/books/handbook/geom/chapter.xml
+++ b/ru_RU.KOI8-R/books/handbook/geom/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="koi8-r" standalone="no"?>
+<?xml version="1.0" encoding="koi8-r"?>
<!--
The FreeBSD Russian Documentation Project
$FreeBSD$
diff --git a/ru_RU.KOI8-R/books/handbook/install/chapter.xml b/ru_RU.KOI8-R/books/handbook/install/chapter.xml
index 89f60c32b7..5a9042ab18 100644
--- a/ru_RU.KOI8-R/books/handbook/install/chapter.xml
+++ b/ru_RU.KOI8-R/books/handbook/install/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="koi8-r" standalone="no"?>
+<?xml version="1.0" encoding="koi8-r"?>
<!--
The FreeBSD Russian Documentation Project
diff --git a/ru_RU.KOI8-R/books/handbook/introduction/chapter.xml b/ru_RU.KOI8-R/books/handbook/introduction/chapter.xml
index 4949c64566..148f51a85d 100644
--- a/ru_RU.KOI8-R/books/handbook/introduction/chapter.xml
+++ b/ru_RU.KOI8-R/books/handbook/introduction/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="koi8-r" standalone="no"?>
+<?xml version="1.0" encoding="koi8-r"?>
<!--
The FreeBSD Russian Documentation Project
diff --git a/ru_RU.KOI8-R/books/handbook/kernelconfig/chapter.xml b/ru_RU.KOI8-R/books/handbook/kernelconfig/chapter.xml
index 8d9a06945a..6d06cc5f1b 100644
--- a/ru_RU.KOI8-R/books/handbook/kernelconfig/chapter.xml
+++ b/ru_RU.KOI8-R/books/handbook/kernelconfig/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="koi8-r" standalone="no"?>
+<?xml version="1.0" encoding="koi8-r"?>
<!--
The FreeBSD Russian Documentation Project
diff --git a/ru_RU.KOI8-R/books/handbook/l10n/chapter.xml b/ru_RU.KOI8-R/books/handbook/l10n/chapter.xml
index 287c0bc9d4..5a7963065d 100644
--- a/ru_RU.KOI8-R/books/handbook/l10n/chapter.xml
+++ b/ru_RU.KOI8-R/books/handbook/l10n/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="koi8-r" standalone="no"?>
+<?xml version="1.0" encoding="koi8-r"?>
<!--
The FreeBSD Russian Documentation Project
diff --git a/ru_RU.KOI8-R/books/handbook/linuxemu/chapter.xml b/ru_RU.KOI8-R/books/handbook/linuxemu/chapter.xml
index 2746707174..f7aab0ecb2 100644
--- a/ru_RU.KOI8-R/books/handbook/linuxemu/chapter.xml
+++ b/ru_RU.KOI8-R/books/handbook/linuxemu/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="koi8-r" standalone="no"?>
+<?xml version="1.0" encoding="koi8-r"?>
<!--
The FreeBSD Russian Documentation Project
@@ -648,14 +648,14 @@ LOG=/var/log/lmgrd.log
case "$1" in
start)
- lmgrd -c ${LICENSE_FILE} 2&gt;&gt; ${LOG} 1&gt;&2
+ lmgrd -c ${LICENSE_FILE} 2&gt;&gt; ${LOG} 1&gt;&amp;2
echo -n " lmgrd"
;;
stop)
- lmgrd -c ${LICENSE_FILE} -x lmdown 2&gt;&gt; ${LOG} 1&gt;&2
+ lmgrd -c ${LICENSE_FILE} -x lmdown 2&gt;&gt; ${LOG} 1&gt;&amp;2
;;
*)
- echo "Usage: `basename $0` {start|stop}" 1&gt;&2
+ echo "Usage: `basename $0` {start|stop}" 1&gt;&amp;2
exit 64
;;
esac
@@ -922,7 +922,7 @@ exit 0</programlisting>
衃霰眚轂 蚝鼴梏楦 蚎疶俶:</para>
<programlisting>#!/usr/compat/linux/bin/sh
-(sleep 5; killall -1 matlab_helper) &
+(sleep 5; killall -1 matlab_helper) &amp;
exit 0</programlisting>
</step>
diff --git a/ru_RU.KOI8-R/books/handbook/mac/chapter.xml b/ru_RU.KOI8-R/books/handbook/mac/chapter.xml
index eeb197962e..5b034e17b1 100644
--- a/ru_RU.KOI8-R/books/handbook/mac/chapter.xml
+++ b/ru_RU.KOI8-R/books/handbook/mac/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="koi8-r" standalone="no"?>
+<?xml version="1.0" encoding="koi8-r"?>
<!--
The FreeBSD Russian Documentation Project
@@ -1681,7 +1681,7 @@ mac_partition_load="YES"</programlisting>
&man.vi.1;. 鯦鼴梏楦 蚎疶俶 <command>sh</command>
蚅攫豁 赽 恓狟狦奼狣:</para>
- <screen>&prompt.root; <userinput>for x in `awk -F: '($3 >= 1001) && ($3 != 65534) { print $1 }' \</userinput>
+ <screen>&prompt.root; <userinput>for x in `awk -F: '($3 >= 1001) &amp;&amp; ($3 != 65534) { print $1 }' \</userinput>
<userinput>/etc/passwd`; do pw usermod $x -L insecure; done;</userinput></screen>
<para>蟴蚝 嗩珌 巟芶恓恌 恓狟狦奼 睋俷衲尕 冾芩恅
@@ -1863,7 +1863,7 @@ round-trip min/avg/max/stddev = 204.455/204.455/204.455/0.000 ms</screen>
test1: biba/equal,mls/equal
&prompt.root; <userinput>setfmac biba/low test1 test2; setfmac biba/high test4 test5; \
setfmac mls/low test1 test3; setfmac mls/high test2 test4</userinput>
-&prompt.root; <userinput>setfmac mls/equal,biba/equal test3 && getfmac test?</userinput>
+&prompt.root; <userinput>setfmac mls/equal,biba/equal test3 &amp;&amp; getfmac test?</userinput>
test1: biba/low,mls/low
test2: biba/low,mls/high
test3: biba/equal,mls/equal
@@ -1948,7 +1948,7 @@ cat: test4: Permission denied</screen>
<para>蹅秺珌 俵杻硨袬埧曶 恓狟狦奼 俵芶衲尕 佮輾 俵
梠玶瓾恌; 埡佹 冾芩恅:</para>
- <screen>&prompt.root; <userinput>for x in `awk -F: '($3 >= 1001) && ($3 != 65534) { print $1 }' \</userinput>
+ <screen>&prompt.root; <userinput>for x in `awk -F: '($3 >= 1001) &amp;&amp; ($3 != 65534) { print $1 }' \</userinput>
<userinput>/etc/passwd`; do pw usermod $x -L default; done;</userinput></screen>
<para>蹙衲眐 疻袶 嗩 睋鐘皙.</para>
diff --git a/ru_RU.KOI8-R/books/handbook/mail/chapter.xml b/ru_RU.KOI8-R/books/handbook/mail/chapter.xml
index 478e951850..96414f30ab 100644
--- a/ru_RU.KOI8-R/books/handbook/mail/chapter.xml
+++ b/ru_RU.KOI8-R/books/handbook/mail/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="koi8-r" standalone="no"?>
+<?xml version="1.0" encoding="koi8-r"?>
<!--
The FreeBSD Documentation Project
diff --git a/ru_RU.KOI8-R/books/handbook/mirrors/chapter.xml b/ru_RU.KOI8-R/books/handbook/mirrors/chapter.xml
index 8473d65ce3..dba5c4a9fe 100644
--- a/ru_RU.KOI8-R/books/handbook/mirrors/chapter.xml
+++ b/ru_RU.KOI8-R/books/handbook/mirrors/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="koi8-r" standalone="no"?>
+<?xml version="1.0" encoding="koi8-r"?>
<!--
The FreeBSD Russian Documentation Project
@@ -2473,7 +2473,7 @@ doc/zh_*</screen>
珆畷埡 俵痽珅 狟 梌埡疻軘圮 梌埡恘訞曬挃 釓侜埡 鰍臏趹埧
袬 そ帎 <filename>/etc/crontab</filename> 衲眐劼</para>
- <programlisting>0 3 * * * root portsnap -I cron update && pkg_version -vIL=</programlisting>
+ <programlisting>0 3 * * * root portsnap -I cron update &amp;&amp; pkg_version -vIL=</programlisting>
<note>
<para>槿旻 蚕衲攪挃 瓾袃 恓 梌埡恘訞曬 昑佹杻恘 貥攪,
diff --git a/ru_RU.KOI8-R/books/handbook/multimedia/chapter.xml b/ru_RU.KOI8-R/books/handbook/multimedia/chapter.xml
index d2d867a31c..573cff7252 100644
--- a/ru_RU.KOI8-R/books/handbook/multimedia/chapter.xml
+++ b/ru_RU.KOI8-R/books/handbook/multimedia/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="koi8-r" standalone="no"?>
+<?xml version="1.0" encoding="koi8-r"?>
<!--
The FreeBSD Russian Documentation Project
diff --git a/ru_RU.KOI8-R/books/handbook/network-servers/chapter.xml b/ru_RU.KOI8-R/books/handbook/network-servers/chapter.xml
index 84ec47cf31..21375238ea 100644
--- a/ru_RU.KOI8-R/books/handbook/network-servers/chapter.xml
+++ b/ru_RU.KOI8-R/books/handbook/network-servers/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="koi8-r" standalone="no"?>
+<?xml version="1.0" encoding="koi8-r"?>
<!--
The FreeBSD Russian Documentation Project
diff --git a/ru_RU.KOI8-R/books/handbook/pgpkeys/chapter.xml b/ru_RU.KOI8-R/books/handbook/pgpkeys/chapter.xml
index 3a3dbacd6f..ddd532f271 100644
--- a/ru_RU.KOI8-R/books/handbook/pgpkeys/chapter.xml
+++ b/ru_RU.KOI8-R/books/handbook/pgpkeys/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="koi8-r" standalone="no"?>
+<?xml version="1.0" encoding="koi8-r"?>
<!--
The FreeBSD Documentation Project
diff --git a/ru_RU.KOI8-R/books/handbook/ports/chapter.xml b/ru_RU.KOI8-R/books/handbook/ports/chapter.xml
index eb51231a68..89edadd440 100644
--- a/ru_RU.KOI8-R/books/handbook/ports/chapter.xml
+++ b/ru_RU.KOI8-R/books/handbook/ports/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="koi8-r" standalone="no"?>
+<?xml version="1.0" encoding="koi8-r"?>
<!--
The FreeBSD Russian Documentation Project
diff --git a/ru_RU.KOI8-R/books/handbook/ppp-and-slip/chapter.xml b/ru_RU.KOI8-R/books/handbook/ppp-and-slip/chapter.xml
index e4ee10c1d2..c9df9b7196 100644
--- a/ru_RU.KOI8-R/books/handbook/ppp-and-slip/chapter.xml
+++ b/ru_RU.KOI8-R/books/handbook/ppp-and-slip/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="koi8-r" standalone="no"?>
+<?xml version="1.0" encoding="koi8-r"?>
<!--
The FreeBSD Russian Documentation Project
@@ -1724,7 +1724,7 @@ reinput 1 {\255}
if success goto slhup
reinput 1 {\127}
if success goto slhup
-if < \%x 60 goto look
+if &lt; \%x 60 goto look
else goto slhup
:sllogin ; login
@@ -1745,7 +1745,7 @@ reinput 1 {\255}
if success goto slhup
reinput 1 {\127}
if success goto slhup
-if < \%x 10 goto slloop ; try 10 times to get a login prompt
+if &lt; \%x 10 goto slloop ; try 10 times to get a login prompt
else goto slhup ; hang up and start again if 10 failures
:sluid
diff --git a/ru_RU.KOI8-R/books/handbook/preface/preface.xml b/ru_RU.KOI8-R/books/handbook/preface/preface.xml
index ef6286e299..6ecbeee24f 100644
--- a/ru_RU.KOI8-R/books/handbook/preface/preface.xml
+++ b/ru_RU.KOI8-R/books/handbook/preface/preface.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="koi8-r" standalone="no"?>
+<?xml version="1.0" encoding="koi8-r"?>
<!--
The FreeBSD Russian Documentation Project
diff --git a/ru_RU.KOI8-R/books/handbook/printing/chapter.xml b/ru_RU.KOI8-R/books/handbook/printing/chapter.xml
index eb0e773b6f..00317e157c 100644
--- a/ru_RU.KOI8-R/books/handbook/printing/chapter.xml
+++ b/ru_RU.KOI8-R/books/handbook/printing/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="koi8-r" standalone="no"?>
+<?xml version="1.0" encoding="koi8-r"?>
<!--
The FreeBSD Russian Documentation Project
diff --git a/ru_RU.KOI8-R/books/handbook/security/chapter.xml b/ru_RU.KOI8-R/books/handbook/security/chapter.xml
index 8168ae79f6..59d47db0f4 100644
--- a/ru_RU.KOI8-R/books/handbook/security/chapter.xml
+++ b/ru_RU.KOI8-R/books/handbook/security/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="koi8-r" standalone="no"?>
+<?xml version="1.0" encoding="koi8-r"?>
<!--
The FreeBSD Documentation Project
diff --git a/ru_RU.KOI8-R/books/handbook/serialcomms/chapter.xml b/ru_RU.KOI8-R/books/handbook/serialcomms/chapter.xml
index c2b8c0ce87..8cd834ae8e 100644
--- a/ru_RU.KOI8-R/books/handbook/serialcomms/chapter.xml
+++ b/ru_RU.KOI8-R/books/handbook/serialcomms/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="koi8-r" standalone="no"?>
+<?xml version="1.0" encoding="koi8-r"?>
<!--
The FreeBSD Russian Documentation Project
diff --git a/ru_RU.KOI8-R/books/handbook/users/chapter.xml b/ru_RU.KOI8-R/books/handbook/users/chapter.xml
index f0762b869b..bdf5fb318c 100644
--- a/ru_RU.KOI8-R/books/handbook/users/chapter.xml
+++ b/ru_RU.KOI8-R/books/handbook/users/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="koi8-r" standalone="no"?>
+<?xml version="1.0" encoding="koi8-r"?>
<!--
The FreeBSD Russian Documentation Project
diff --git a/ru_RU.KOI8-R/books/handbook/vinum/chapter.xml b/ru_RU.KOI8-R/books/handbook/vinum/chapter.xml
index d942e95974..a15938582d 100644
--- a/ru_RU.KOI8-R/books/handbook/vinum/chapter.xml
+++ b/ru_RU.KOI8-R/books/handbook/vinum/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="koi8-r" standalone="no"?>
+<?xml version="1.0" encoding="koi8-r"?>
<!--
The FreeBSD Russian Documentation Project
diff --git a/ru_RU.KOI8-R/books/handbook/x11/chapter.xml b/ru_RU.KOI8-R/books/handbook/x11/chapter.xml
index 8e742aa887..d3c91f2730 100644
--- a/ru_RU.KOI8-R/books/handbook/x11/chapter.xml
+++ b/ru_RU.KOI8-R/books/handbook/x11/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="koi8-r" standalone="no"?>
+<?xml version="1.0" encoding="koi8-r"?>
<!--
The FreeBSD Russian Documentation Project
@@ -331,7 +331,7 @@
<application>&xorg;</application>. <application>&xorg;</application>
嗩 蚥眢籤 X 馨衲疶謬埩袬 珆刳椆珅 疻賻巟謄圪 X Window System,
趿俷暙恄珅 X.Org Foundation. <application>&xorg;</application> 珃恘袬 恔 冾霰
- <application>&xfree86&nbsp;4.4RC2</application> X11R6.6.
+ <application>&xfree86;&nbsp;4.4RC2</application> X11R6.6.
鷕眑奷 <application>&xorg;</application>, 鰍衲桸恔 恔 鐘恄椋 迍芶拏
巟 冾昍攣蟹 俵眕瓬 &os;: &xorg.version;.</para>
diff --git a/ru_RU.KOI8-R/books/porters-handbook/book.xml b/ru_RU.KOI8-R/books/porters-handbook/book.xml
index 0b6aa7bc4c..6537f7538f 100644
--- a/ru_RU.KOI8-R/books/porters-handbook/book.xml
+++ b/ru_RU.KOI8-R/books/porters-handbook/book.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="koi8-r" standalone="no"?>
-<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//RU" "../../share/xml/entities.ent">
-%entities;
-]>
+<?xml version="1.0" encoding="koi8-r"?>
+<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<!--
The FreeBSD Russian Documentation Project
@@ -3484,7 +3481,7 @@ ALWAYS_KEEP_DISTFILES= yes
<para>蠐 恓 芶恓, 俵鰍蟲棸 倷孖豜曬奷 迍м 睋й栚恮婥 睋訰蚕迍衲
貥攪曬 孖俵旽曬奷 衃霰眚奼棎, 恓 睋鐘恄棎
<makevar>BUILD_DEPENDS</makevar> 孖狦恘ж 俵眕.
- 蘅冾 蚝殌豁娸 巟-睋 旼恌豜ж 趿瘃蚝曬奷 &man.make.1
+ 蘅冾 蚝殌豁娸 巟-睋 旼恌豜ж 趿瘃蚝曬奷 &man.make.1;
倷孖袬屺豁阽 陓疻芶恄棼. 襓鼴衲避寑 <filename>Makefile</filename>
陓疻芶恄棎 <makevar>USE_<replaceable>*</replaceable></makevar>,
冾婘砣 狟畛臏婬袬殮衭 <filename>ports/Mk/bsd.*.mk</filename>
@@ -3899,8 +3896,8 @@ PKGNAMESUFFIX= ${RESOLUTION}
:
# default
RESOLUTION?= 300
-.if ${RESOLUTION} != 118 && ${RESOLUTION} != 240 && \
- ${RESOLUTION} != 300 && ${RESOLUTION} != 400
+.if ${RESOLUTION} != 118 &amp;&amp; ${RESOLUTION} != 240 &amp;&amp; \
+ ${RESOLUTION} != 300 &amp;&amp; ${RESOLUTION} != 400
@${ECHO_MSG} "Error: invalid value for RESOLUTION: \"${RESOLUTION}\""
@${ECHO_MSG} "Possible values are: 118, 240, 300 (default) and 400."
@${FALSE}
@@ -4645,7 +4642,7 @@ PORTVERSION= 1.0</programlisting>
<programlisting>post-install:
${MKDIR} ${EXAMPLESDIR}
- (cd ${WRKSRC}/examples/ && ${COPYTREE_SHARE} \* ${EXAMPLESDIR})</programlisting>
+ (cd ${WRKSRC}/examples/ &amp;&amp; ${COPYTREE_SHARE} \* ${EXAMPLESDIR})</programlisting>
<para> 嗩玵 倷奼籤 梌埡恔訞屺豁娸 衃霰眚奼狣 佹埡昑Щ
<filename>examples</filename> 巟 梌埡恘豜痸棼 そ帎瓬 倷珈稊狦尕攫
@@ -4653,7 +4650,7 @@ PORTVERSION= 1.0</programlisting>
<programlisting>post-install:
${MKDIR} ${DATADIR}/summer
- (cd ${WRKSRC}/temperatures/ && ${COPYTREE_SHARE} "June July August" ${DATADIR}/summer/)</programlisting>
+ (cd ${WRKSRC}/temperatures/ &amp;&amp; ${COPYTREE_SHARE} "June July August" ${DATADIR}/summer/)</programlisting>
<para> 嗩玵 倷奼籤 謬齣 梌埡恘訞曬 鐘恄棸 旼婠圮 芶衭藷
俵騰轂賻珌 <filename>summer</filename> 佹埡昑Щ
@@ -4667,7 +4664,7 @@ PORTVERSION= 1.0</programlisting>
<programlisting>post-install:
${MKDIR} ${EXAMPLESDIR}
- (cd ${WRKSRC}/examples/ && \
+ (cd ${WRKSRC}/examples/ &amp;&amp; \
${COPYTREE_SHARE} \* ${EXAMPLESDIR} "! -name Makefile")</programlisting>
<para>屩畛埩埧 谻奼蹉吇, 痽 嗩 芩刳珃 恓 倷珈稊狦晟 鰍臏訞曬吇
@@ -6355,7 +6352,7 @@ QT_COMPONENTS= gui moc_build qmake_build rcc_build uic_build</programlisting>
<programlisting>HAS_CONFIGURE= yes
do-configure:
- @cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} \
+ @cd ${WRKSRC} &amp;&amp; ${SETENV} ${CONFIGURE_ENV} \
${QMAKE} PREFIX=${PREFIX} texmaker.pro</programlisting>
<para>屩畛埩埧 谻奼蹉吇 恔 蚧狦衲豜 衃 衲眐冾 <command>qmake</command>
@@ -9152,7 +9149,7 @@ CFLAGS+= -DLUA_VERSION_STRING="${VER_STR}"
url="&url.books.handbook;/configtuning-rcd.html">д避 rc.d
藑冾豜鼯婟</ulink>. 蟴黨狟恘 狟葌蚔曬吇 鰍衲桸挃 冾芩恅
恔狦尕衭 &man.rc.8; &man.rc.subr.8;. 轀冾恓, 籣婥 <ulink
- url="&url.articles.rc-scripting">衲轂寍</ulink> 倷賸埩畷蚎圮
+ url="&url.articles.rc-scripting;">衲轂寍</ulink> 倷賸埩畷蚎圮
輾陓刱賺 恔倅蚆恌 蚚曬轄吇 <filename>rc.d</filename>.</para>
<para>灃埡恘訰婥 迍笥 狦妅 妀 蟠旼 蚚曬轄吇
@@ -9736,7 +9733,7 @@ etc/orbit.conf.sample
<para>鯔畛恌埧 衲眙刱梑 佹埡昑ж 恘豜 そ帎.</para>
- <screen>&prompt.root; <userinput>(cd /var/tmp/`make -V PORTNAME` && find -d * -type d) | sort &gt; OLD-DIRS</userinput></screen>
+ <screen>&prompt.root; <userinput>(cd /var/tmp/`make -V PORTNAME` &amp;&amp; find -d * -type d) | sort &gt; OLD-DIRS</userinput></screen>
<para>鯔矬購埧 俷衲珅 そ帎 <filename>pkg-plist</filename>:</para>
@@ -9747,12 +9744,12 @@ etc/orbit.conf.sample
桸賸瓬侂.</para>
<screen>&prompt.root; <userinput>make install PREFIX=/var/tmp/`make -V PORTNAME`</userinput>
-&prompt.root; <userinput>(cd /var/tmp/`make -V PORTNAME` && find -d * \! -type d) | sort &gt; pkg-plist</userinput></screen>
+&prompt.root; <userinput>(cd /var/tmp/`make -V PORTNAME` &amp;&amp; find -d * \! -type d) | sort &gt; pkg-plist</userinput></screen>
<para>遻玵 婘ж, 衄孖玹 桸賸瓬侂 趿 鰍枒挃 鰍臏訰婥 赽 谻瓬
衃矬蹉挃 佹埡昑б.</para>
- <screen>&prompt.root; <userinput>(cd /var/tmp/`make -V PORTNAME` && find -d * -type d) | sort | comm -13 OLD-DIRS - | sort -r | sed -e 's#^#@dirrm #' &gt;&gt; pkg-plist</userinput></screen>
+ <screen>&prompt.root; <userinput>(cd /var/tmp/`make -V PORTNAME` &amp;&amp; find -d * -type d) | sort | comm -13 OLD-DIRS - | sort -r | sed -e 's#^#@dirrm #' &gt;&gt; pkg-plist</userinput></screen>
<para> 恔冾恓, 袬 挍笥 貥殌挍 珆袽囡瓬轂 衄孖玹 桸賸瓬侂; 龔
衃矬蹉吇 避婘芩埩硭眐袬恘 <emphasis>恓 俵旽珃婥</emphasis>. 鯥畛恌贊
@@ -13373,7 +13370,7 @@ Reference: &lt;http://www.freebsd.org/ports/portaudit/74a9541d-5d6c-11d8-80e3-00
<row>
<entry>700016</entry>
<entry>22 蹈疻曶 2006</entry>
- <entry>7.0-CURRENT 俵蚝 鰍臏訞曬奷 &man.fcloseall.3
+ <entry>7.0-CURRENT 俵蚝 鰍臏訞曬奷 &man.fcloseall.3;
libc.</entry>
</row>
@@ -15483,7 +15480,7 @@ CFLAGS= -Wall -Werror
<sect1 id="dads-pthread">
<title>犓蟯奻埧侂 俵婘冾</title>
- <para>龢 &os 薺蟯奻埧佹 俵婘冾 狟栚蹉 蹙婥 蚎玵俵恘袬恔
+ <para>龢 &os; 薺蟯奻埧佹 俵婘冾 狟栚蹉 蹙婥 蚎玵俵恘袬恔
孖俵旽捇阽虭 そ帎趨 孖俵杻硨袬恌攪 衄鷗匢杻恘ж と豳
冾迖玴瓬楦佹 <literal>-pthread</literal>. 槿旻 俵眕 恔衲賽袬籥
恔 倷敊珅 冾迖玴瓬侜 <literal>-lpthread</literal> 妀
diff --git a/ru_RU.KOI8-R/share/xml/catalog b/ru_RU.KOI8-R/share/xml/catalog
deleted file mode 100644
index 70dd5a8d35..0000000000
--- a/ru_RU.KOI8-R/share/xml/catalog
+++ /dev/null
@@ -1,59 +0,0 @@
- -- ...................................................................... --
- -- FreeBSD SGML Public Identifiers ...................................... --
-
- -- ...................................................................... --
- -- Russian specific ..................................................... --
-
- -- ...................................................................... --
- -- The FreeBSD Russian Documentation Project
- -- ...................................................................... --
- -- $FreeBSD$
- -- $FreeBSDru: frdp/doc/ru_RU.KOI8-R/share/xml/catalog,v 1.13 2004/08/13 07:07:53 den Exp $
- -- ...................................................................... --
- -- Original revision: r17819
- -- ...................................................................... --
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//RU"
- "entities.ent"
-
-PUBLIC "-//FreeBSD//DOCUMENT DocBook Stylesheet//EN"
- "freebsd.dsl"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//RU"
- "mailing-lists.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook Language Specific Entities//EN"
- "l10n.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook Newsgroup Entities//RU"
- "newsgroups.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook Team Entities//RU"
- "teams.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//RU"
- "trademarks.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook Russian Translators Entities//RU"
- "translators.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook URL Entities//RU"
- "urls.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook Glossary Entities//RU"
- "glossary.ent"
-
- -- ...................................................................... --
- -- HTML docs ............................................................ --
-
-PUBLIC "-//FreeBSD//ENTITIES FreeBSD L10N Entities//EN"
- "l10n.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES FreeBSD Release L10N Entities//EN"
- "release.l10n.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES HTML FreeBSD Header L10N Entities//EN"
- "header.l10n.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES HTML FreeBSD Navigation Bar L10N Entities//EN"
- "navibar.l10n.ent"
diff --git a/ru_RU.KOI8-R/share/xml/catalog.xml b/ru_RU.KOI8-R/share/xml/catalog.xml
index 3553c62fbc..0b06d43c89 100644
--- a/ru_RU.KOI8-R/share/xml/catalog.xml
+++ b/ru_RU.KOI8-R/share/xml/catalog.xml
@@ -10,6 +10,9 @@
<rewriteURI uriStartString="http://www.FreeBSD.org/XML/www/lang/"
rewritePrefix="../../"/>
+ <public
+ publicId="-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN"
+ uri="entities.ent" />
<public publicId="-//FreeBSD//ENTITIES FreeBSD L10N Entities//EN"
uri="l10n.ent" />
<public
diff --git a/ru_RU.KOI8-R/share/xml/entities.ent b/ru_RU.KOI8-R/share/xml/entities.ent
index f52abd7694..ee50a6be6e 100644
--- a/ru_RU.KOI8-R/share/xml/entities.ent
+++ b/ru_RU.KOI8-R/share/xml/entities.ent
@@ -7,27 +7,30 @@
Original revision: 1.1 (doc/share/xml)
-->
-<!ENTITY % man PUBLIC "-//FreeBSD//ENTITIES DocBook Manual Page Entities//EN">
-%man;
-<!ENTITY % freebsd PUBLIC "-//FreeBSD//ENTITIES DocBook Miscellaneous FreeBSD Entities//EN">
+<!ENTITY % freebsd PUBLIC "-//FreeBSD//ENTITIES DocBook Miscellaneous FreeBSD Entities//EN"
+ "nonexistent">
%freebsd;
-<!ENTITY % authors PUBLIC "-//FreeBSD//ENTITIES DocBook Author Entities//EN">
-%authors;
-<!ENTITY % teams PUBLIC "-//FreeBSD//ENTITIES DocBook Team Entities//RU">
+<!ENTITY % teams PUBLIC "-//FreeBSD//ENTITIES DocBook Team Entities//RU"
+ "teams.ent">
%teams;
-<!ENTITY % mailing-lists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//RU">
+<!ENTITY % mailing-lists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//RU"
+ "mailing-lists.ent">
%mailing-lists;
-<!ENTITY % newsgroups PUBLIC "-//FreeBSD//ENTITIES DocBook Newsgroup Entities//RU">
+<!ENTITY % newsgroups PUBLIC "-//FreeBSD//ENTITIES DocBook Newsgroup Entities//RU"
+ "newsgroups.ent">
%newsgroups;
-<!ENTITY % trademarks PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//RU">
+<!ENTITY % trademarks PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//RU"
+ "trademarks.ent">
%trademarks;
-<!ENTITY % l10n PUBLIC "-//FreeBSD//ENTITIES DocBook Language Specific Entities//EN">
+<!ENTITY % l10n PUBLIC "-//FreeBSD//ENTITIES DocBook Language Specific Entities//EN"
+ "l10n.ent">
%l10n;
-<!ENTITY % l10n-common PUBLIC "-//FreeBSD//ENTITIES DocBook Language Neutral Entities//EN">
-%l10n-common;
-<!ENTITY % urls-ru PUBLIC "-//FreeBSD//ENTITIES DocBook URL Entities//RU">
+<!ENTITY % urls-ru PUBLIC "-//FreeBSD//ENTITIES DocBook URL Entities//RU"
+ "urls.ent">
%urls-ru;
-<!ENTITY % urls PUBLIC "-//FreeBSD//ENTITIES DocBook URL Entities//EN">
+<!ENTITY % urls PUBLIC "-//FreeBSD//ENTITIES DocBook URL Entities//EN"
+ "nonexistent">
%urls;
-<!ENTITY % glossary PUBLIC "-//FreeBSD//ENTITIES DocBook Glossary Entities//RU">
+<!ENTITY % glossary PUBLIC "-//FreeBSD//ENTITIES DocBook Glossary Entities//RU"
+ "glossary.ent">
%glossary;
diff --git a/ru_RU.KOI8-R/share/xml/mailing-lists.ent b/ru_RU.KOI8-R/share/xml/mailing-lists.ent
index d70d70647b..0876938c78 100644
--- a/ru_RU.KOI8-R/share/xml/mailing-lists.ent
+++ b/ru_RU.KOI8-R/share/xml/mailing-lists.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="koi8-r"?>
<!--
The FreeBSD Russian Documentation Project
diff --git a/ru_RU.KOI8-R/share/xml/mirrors-local.xsl b/ru_RU.KOI8-R/share/xml/mirrors-local.xsl
index 2ce9eb4828..862d15076d 100644
--- a/ru_RU.KOI8-R/share/xml/mirrors-local.xsl
+++ b/ru_RU.KOI8-R/share/xml/mirrors-local.xsl
@@ -14,7 +14,6 @@
<xsl:import href="../../../share/xml/mirrors-master.xsl" />
<xsl:output type="xml" encoding="koi8-r"
- omit-xml-declaration="yes"
indent="yes"/>
<!-- template: "mirrors-docbook-contact" -->
diff --git a/ru_RU.KOI8-R/share/xml/newsgroups.ent b/ru_RU.KOI8-R/share/xml/newsgroups.ent
index 5bd404da20..20ab5d4032 100644
--- a/ru_RU.KOI8-R/share/xml/newsgroups.ent
+++ b/ru_RU.KOI8-R/share/xml/newsgroups.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="koi8-r"?>
<!--
The FreeBSD Russian Documentation Project
diff --git a/ru_RU.KOI8-R/share/xml/teams.ent b/ru_RU.KOI8-R/share/xml/teams.ent
index 9347d7aaa8..c5ad0159dc 100644
--- a/ru_RU.KOI8-R/share/xml/teams.ent
+++ b/ru_RU.KOI8-R/share/xml/teams.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="koi8-r"?>
<!--
The FreeBSD Russian Documentation Project
diff --git a/ru_RU.KOI8-R/share/xml/trademarks.ent b/ru_RU.KOI8-R/share/xml/trademarks.ent
index 83bbfc794e..c9dae8b297 100644
--- a/ru_RU.KOI8-R/share/xml/trademarks.ent
+++ b/ru_RU.KOI8-R/share/xml/trademarks.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="koi8-r"?>
<!--
The FreeBSD Russian Documentation Project
diff --git a/ru_RU.KOI8-R/share/xml/translators.ent b/ru_RU.KOI8-R/share/xml/translators.ent
index a20272f125..718b2f7e58 100644
--- a/ru_RU.KOI8-R/share/xml/translators.ent
+++ b/ru_RU.KOI8-R/share/xml/translators.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="koi8-r"?>
<!--
The FreeBSD Russian Documentation Project
diff --git a/ru_RU.KOI8-R/share/xml/urls.ent b/ru_RU.KOI8-R/share/xml/urls.ent
index 644605a719..d7112a8543 100644
--- a/ru_RU.KOI8-R/share/xml/urls.ent
+++ b/ru_RU.KOI8-R/share/xml/urls.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="koi8-r"?>
<!--
The FreeBSD Russian Documentation Project
diff --git a/share/misc/svn_props.txt b/share/misc/svn_props.txt
new file mode 100644
index 0000000000..a0293097ff
--- /dev/null
+++ b/share/misc/svn_props.txt
@@ -0,0 +1,72 @@
+# Make sure you have a ~/.subversion/config. Simply using it (svn --help)
+# will cause a default one to be created if you don't already have one.
+# Add the following changes to ~/.subversion/config:
+#
+#
+# Set:
+# enable-auto-props = yes
+#
+#
+# Append/edit auto-props section:
+#
+
+[auto-props]
+*.c = svn:eol-style=native; svn:keywords=FreeBSD=%H; svn:mime-type=text/plain
+*.h = svn:eol-style=native; svn:keywords=FreeBSD=%H; svn:mime-type=text/plain
+*.s = svn:eol-style=native; svn:keywords=FreeBSD=%H; svn:mime-type=text/plain
+*.S = svn:eol-style=native; svn:keywords=FreeBSD=%H; svn:mime-type=text/plain
+*.cc = svn:eol-style=native; svn:keywords=FreeBSD=%H; svn:mime-type=text/plain
+*.cpp = svn:eol-style=native; svn:keywords=FreeBSD=%H; svn:mime-type=text/plain
+*.cxx = svn:eol-style=native; svn:keywords=FreeBSD=%H; svn:mime-type=text/plain
+*.in = svn:eol-style=native; svn:keywords=FreeBSD=%H; svn:mime-type=text/plain
+*.sh = svn:eol-style=native; svn:keywords=FreeBSD=%H; svn:mime-type=text/plain; svn:executable
+*.pl = svn:eol-style=native; svn:keywords=FreeBSD=%H; svn:mime-type=text/plain; svn:executable
+*.pm = svn:eol-style=native; svn:keywords=FreeBSD=%H; svn:mime-type=text/plain
+*.py = svn:eol-style=native; svn:keywords=FreeBSD=%H; svn:mime-type=text/plain
+*.rb = svn:eol-style=native; svn:keywords=FreeBSD=%H; svn:mime-type=text/plain
+*.awk = svn:eol-style=native; svn:keywords=FreeBSD=%H; svn:mime-type=text/plain
+*.sed = svn:eol-style=native; svn:keywords=FreeBSD=%H; svn:mime-type=text/plain
+*.txt = svn:eol-style=native; svn:keywords=FreeBSD=%H; svn:mime-type=text/plain
+*.log = svn:eol-style=native; svn:keywords=FreeBSD=%H; svn:mime-type=text/plain
+*.conf = svn:eol-style=native; svn:keywords=FreeBSD=%H; svn:mime-type=text/plain
+Makefile* = svn:eol-style=native; svn:keywords=FreeBSD=%H; svn:mime-type=text/plain
+*.1 = svn:eol-style=native; svn:keywords=FreeBSD=%H; svn:mime-type=text/plain
+*.2 = svn:eol-style=native; svn:keywords=FreeBSD=%H; svn:mime-type=text/plain
+*.3 = svn:eol-style=native; svn:keywords=FreeBSD=%H; svn:mime-type=text/plain
+*.4 = svn:eol-style=native; svn:keywords=FreeBSD=%H; svn:mime-type=text/plain
+*.5 = svn:eol-style=native; svn:keywords=FreeBSD=%H; svn:mime-type=text/plain
+*.6 = svn:eol-style=native; svn:keywords=FreeBSD=%H; svn:mime-type=text/plain
+*.7 = svn:eol-style=native; svn:keywords=FreeBSD=%H; svn:mime-type=text/plain
+*.8 = svn:eol-style=native; svn:keywords=FreeBSD=%H; svn:mime-type=text/plain
+*.9 = svn:eol-style=native; svn:keywords=FreeBSD=%H; svn:mime-type=text/plain
+
+*.css = svn:eol-style=native; svn:keywords=FreeBSD=%H; svn:mime-type=text/css
+*.docbook = svn:eol-style=native; svn:keywords=FreeBSD=%H; svn:mime-type=text/sgml
+*.dtd = svn:eol-style=native; svn:keywords=FreeBSD=%H; svn:mime-type=application/xml-dtd
+*.ent = svn:eol-style=native; svn:keywords=FreeBSD=%H; svn:mime-type=application/xml-dtd
+*.html = svn:eol-style=native; svn:keywords=FreeBSD=%H; svn:mime-type=text/html
+*.mml = svn:eol-style=native; svn:keywords=FreeBSD=%H; svn:mime-type=application/mathml+xml
+*.js = svn:eol-style=native; svn:keywords=FreeBSD=%H; svn:mime-type=application/javascript
+*.rss = svn:eol-style=native; svn:keywords=FreeBSD=%H; svn:mime-type=application/rss+xml
+*.sgml = svn:eol-style=native; svn:keywords=FreeBSD=%H; svn:mime-type=text/sgml
+*.xhtml = svn:eol-style=native; svn:keywords=FreeBSD=%H; svn:mime-type=text/html+xml
+*.xml = svn:eol-style=native; svn:keywords=FreeBSD=%H; svn:mime-type=text/xml
+*.xsd = svn:eol-style=native; svn:keywords=FreeBSD=%H; svn:mime-type=text/xml
+*.xsl = svn:eol-style=native; svn:keywords=FreeBSD=%H; svn:mime-type=application/xslt+xml
+*.xslt = svn:eol-style=native; svn:keywords=FreeBSD=%H; svn:mime-type=application/xslt+xml
+*.xul = svn:eol-style=native; svn:keywords=FreeBSD=%H; svn:mime-type=text/xul
+
+*.bin = svn:mime-type=application/octet-stream
+*.eps = svn:mime-type=application/postscript
+*.exe = svn:mime-type=application/octet-stream
+*.gz = svn:mime-type=application/gzip
+*.pdf = svn:mime-type=application/pdf
+*.ps = svn:mime-type=application/postscript
+
+*.gif = svn:mime-type=image/gif
+*.ico = svn:mime-type=image/vnd.microsoft.icon
+*.jpeg = svn:mime-type=image/jpeg
+*.jpg = svn:mime-type=image/jpeg
+*.png = svn:mime-type=image/png
+*.svg = svn:mime-type=image/svg+xml
+*.tiff = svn:mime-type=image/tiff
diff --git a/share/mk/doc.commands.mk b/share/mk/doc.commands.mk
new file mode 100644
index 0000000000..a099437f37
--- /dev/null
+++ b/share/mk/doc.commands.mk
@@ -0,0 +1,171 @@
+#
+# $FreeBSD$
+#
+
+#
+# General commands
+#
+
+AWK?= /usr/bin/awk
+CP?= /bin/cp
+CAT?= /bin/cat
+ECHO_CMD?= echo
+FETCH?= /usr/bin/fetch
+FIND?= /usr/bin/find
+GREP?= /usr/bin/grep
+LN?= /bin/ln
+MKDIR?= /bin/mkdir
+MV?= /bin/mv
+RM?= /bin/rm
+ISPELL?= ispell
+ISPELLOPTS?= -l -p /usr/share/dict/freebsd ${ISPELLFLAGS}
+.if exists(/usr/bin/perl)
+PERL?= /usr/bin/perl
+.elif exists(/usr/local/bin/perl)
+PERL?= /usr/local/bin/perl
+.else
+PERL?= perl
+.endif
+PKG_CREATE?= /usr/sbin/pkg_create
+REALPATH?= /bin/realpath
+SED?= /usr/bin/sed
+SETENV?= /usr/bin/env
+SH?= /bin/sh
+SORT?= /usr/bin/sort
+TOUCH?= /usr/bin/touch
+TRUE?= /usr/bin/true
+XARGS?= /usr/bin/xargs
+
+#
+# Compession and decompression
+#
+
+BUNZIP2?= /usr/bin/bunzip2
+BZIP2?= bzip2
+BZIPOPTS?= -qf9
+GZIP?= gzip
+GZIPOPTS?= -qf9
+TAR?= /usr/bin/tar
+ZIP?= ${PREFIX}/bin/zip
+ZIPOPTS?= -j9
+
+#
+# Rendering and format conversion
+#
+
+DVIPS?= ${PREFIX}/bin/dvips
+.if defined(PAPERSIZE)
+DVIPSOPTS?= -t ${PAPERSIZE:L}
+.endif
+DVIPSOPTS+= ${DVIPSFLAGS}
+
+FOP?= ${PREFIX}/bin/fop
+FOPOPTS?=
+
+GROFF?= groff
+
+HTML2PDB?= ${PREFIX}/bin/iSiloBSD
+HTML2PDBOPTS?= -y -d0 -Idef ${HTML2PDBFLAGS}
+HTML2TXT?= ${PREFIX}/bin/w3m
+HTML2TXTOPTS?= -dump ${HTML2TXTFLAGS}
+
+.if exists(${PREFIX}/bin/jade) && !defined(OPENJADE)
+JADE?= ${PREFIX}/bin/jade
+.else
+JADE?= ${PREFIX}/bin/openjade
+JADEFLAGS+= -V openjade
+.endif
+
+XMLLINT?= ${PREFIX}/bin/xmllint
+XSLTPROC?= ${PREFIX}/bin/xsltproc
+
+#
+# In teTeX 3.0 and later, pdfetex(1) is used as the default TeX
+# engine for JadeTeX and tex(1) cannot be used as ${TEX_CMD} anymore
+# due to incompatibility of the format file. Since the teTeX 3.0
+# distribution has "${PREFIX}/share/texmf-dist/LICENSE.texmf,"
+# it is checked here to determine which TeX engine should be used.
+.if exists(${PREFIX}/share/texmf-dist/LICENSE.texmf)
+TEX_CMD?= ${PREFIX}/bin/etex
+PDFTEX_CMD?= ${PREFIX}/bin/pdfetex
+.else
+TEX_CMD?= ${PREFIX}/bin/tex
+PDFTEX_CMD?= ${PREFIX}/bin/pdftex
+.endif
+LATEX_CMD?= ${PREFIX}/bin/latex
+JADETEX_CMD?= ${TEX_CMD} "&jadetex"
+JADETEX_PREPROCESS?= /bin/cat
+PDFJADETEX_CMD?=${PDFTEX_CMD} "&pdfjadetex"
+PDFJADETEX_PREPROCESS?= /bin/cat
+PS2PDF?= ${PREFIX}/bin/ps2pdf
+FOP_CMD?= ${PREFIX}/share/fop/fop.sh
+XEP_CMD?= sh ${HOME}/XEP/xep.sh
+JAVA_CMD?= ${PREFIX}/bin/javavm
+SAXON_CMD?= ${JAVA_CMD} -jar ${PREFIX}/share/java/classes/saxon.jar
+
+#
+# Currently, we have to use the FixRTF utility available as textproc/fixrtf
+# to apply several RTF fixups:
+#
+# 1. Embed PNGs into RTF. (Option: -p)
+# 2. Embed FreeBSD-specific information into RTF, such as organization name,
+# building time. But unfortunately, so far only Microsoft Word can read
+# them. In contrast, Microsoft Word Viewer and OpenOffice even cannot read
+# this kind of information from RTF created by Microsoft Word and
+# OpenOffice. (Option: -i)
+# 3. Do some locale-specific fixing. (Option: -e <encoding>)
+#
+# This is a transitional solution before Jade/OpenJade provides these features.
+#
+FIXRTF?= ${PREFIX}/bin/fixrtf
+FIXRTFOPTS?= -i -p
+.if defined(SP_ENCODING)
+FIXRTFOPTS+= -e ${SP_ENCODING}
+.endif
+
+#
+# Image processing
+#
+
+SCR2PNG?= ${PREFIX}/bin/scr2png
+SCR2PNGOPTS?= ${SCR2PNGFLAGS}
+SCR2TXT?= ${PREFIX}/bin/scr2txt
+SCR2TXTOPTS?= -l ${SCR2TXTFLAGS}
+EPS2PNM?= ${PREFIX}/bin/gs
+EPS2PNMOPTS?= -q -dBATCH -dGraphicsAlphaBits=4 -dTextAlphaBits=4 \
+ -dEPSCrop -r${EPS2PNM_RES}x${EPS2PNM_RES} \
+ -dNOPAUSE -dSAFER -sDEVICE=pnm -sOutputFile=-
+#
+# epsgeom is a perl script for 1) extracting geometry information
+# from a .eps file and 2) arrange it for ghostscript's pnm driver.
+#
+EPSGEOM?= ${PERL} ${DOC_PREFIX}/share/misc/epsgeom
+EPSGEOMOPTS?= ${EPS2PNM_RES} ${EPS2PNM_RES}
+PNMTOPNG?= ${PREFIX}/bin/pnmtopng
+PNMTOPNGOPTS?= ${PNGTOPNGFLAGS}
+PNGTOPNM?= ${PREFIX}/bin/pngtopnm
+PNGTOPNMOPTS?= ${PNGTOPNMFLAGS}
+PPMTOPGM?= ${PREFIX}/bin/ppmtopgm
+PPMTOPGMOPTS?= ${PPMTOPGMFLAGS}
+PNMTOPS?= ${PREFIX}/bin/pnmtops
+PNMTOPSOPTS?= -noturn ${PNMTOPSFLAGS}
+EPSTOPDF?= ${PREFIX}/bin/epstopdf
+EPSTOPDFOPTS?= ${EPSTOPDFFLAGS}
+#
+PIC2PS?= ${GROFF} -p -S -Wall -mtty-char -man
+#
+PS2EPS?= ${PREFIX}/bin/gs
+PS2EPSOPTS?= -q -dNOPAUSE -dSAFER -dDELAYSAFER \
+ -sPAPERSIZE=letter -r72 -sDEVICE=bit \
+ -sOutputFile=/dev/null ${PS2EPSFLAGS} ps2epsi.ps
+PS2BBOX?= ${PREFIX}/bin/gs
+PS2BBOXOPTS?= -q -dNOPAUSE -dBATCH -dSAFER -dDELAYSAFER \
+ -sPAPERSIZE=letter -r72 -sDEVICE=bbox \
+ -sOutputFile=/dev/null ${PS2BBOXFLAGS}
+
+#
+# Spell checking
+#
+
+ISPELL?= ispell
+ISPELLOPTS?= -l -p /usr/share/dict/freebsd ${ISPELLFLAGS}
diff --git a/share/mk/doc.common.mk b/share/mk/doc.common.mk
index 6985f9e796..5785078b24 100644
--- a/share/mk/doc.common.mk
+++ b/share/mk/doc.common.mk
@@ -5,14 +5,6 @@
# documents commonly used in doc/ and www/ tree.
#
-AWK?= /usr/bin/awk
-GREP?= /usr/bin/grep
-REALPATH?= /bin/realpath
-SED?= /usr/bin/sed
-# a hack to keep tidy from converting tabs to spaces
-# replace them with &#09; before calling tidy
-REINPLACE_TABS_CMD?= ${SED} -i "" -e 's/ /\&\#09;/g'
-
# ------------------------------------------------------------------------
#
# Work out the language and encoding used for this document.
diff --git a/share/mk/doc.docbook.mk b/share/mk/doc.docbook.mk
index b36258c9e5..876bec596f 100644
--- a/share/mk/doc.docbook.mk
+++ b/share/mk/doc.docbook.mk
@@ -40,14 +40,9 @@
# used to set additional variables, such as
# "%generate-article-toc%".
#
-# TIDYFLAGS Additional flags to pass to Tidy. Typically
-# used to set "-raw" flag to handle 8bit characters.
-#
# EXTRA_CATALOGS Additional catalog files that should be used by
# any XML processing applications.
#
-# NO_TIDY If you do not want to use tidy, set this to "YES".
-#
# GEN_INDEX If this document has an index (HAS_INDEX) and this
# variable is defined, then index.xml will be added
# to the list of dependencies for source files, and
@@ -62,45 +57,6 @@
# spellchecker. For example, PGP keys and filenames
# will be omitted from this output.
#
-# Print-output options :
-#
-# NICE_HEADERS If defined, customized chapter headers will be created
-# that you may find more aesthetically pleasing. Note
-# that this option only effects print output formats for
-# English language books.
-#
-# MIN_SECT_LABELS If defined, do not display the section number for 4th
-# and 5th level section titles. This would change
-# "N.N.N.N Section title" into "Section Title" while
-# higher level sections are still printed with numbers.
-#
-# TRACE={1,2} Trace TeX's memory usage. Set this to 1 for minimal
-# tracing or 2 for maximum tracing. TeX memory
-# statistics will be written out to <filename>.log.
-# For more information see the TeXbook, p301.
-#
-# TWO_SIDE If defined, two sided output will be created. This
-# means that new chapters will only start on odd
-# numbered (aka right side, aka recto) pages and the
-# headers and footers will be aligned appropriately
-# for double sided paper. Blank pages may be added as
-# needed.
-#
-# JUSTIFY If defined, text will be right justified so that the
-# right edge is smooth. Words may be hyphenated using
-# the default TeX hyphenation rules for this purpose.
-#
-# BOOK_OUTPUT A collection of options are set suitable for printing
-# a book. This option may be an order of magnitude more
-# CPU intensive than the default build.
-#
-# RLE Use Run-Length Encoding for EPS files, this will
-# result in significantly smaller PostScript files,
-# but may take longer for a printer to process.
-#
-# GREYSCALE_IMAGES Convert the screenshots to greyscale before
-# embedding them into the PostScript output.
-#
# Package building options:
#
# BZIP2_PACKAGE Use bzip2(1) utility to compress package tarball
@@ -118,112 +74,40 @@ MASTERDOC?= ${.CURDIR}/${DOC}.xml
# List of supported SP_ENCODINGs
SP_ENCODING_LIST?= ISO-8859-2 KOI8-R
-# Which stylesheet type to use. 'dsssl' or 'xsl'
-STYLESHEET_TYPE?= dsssl
+# Either jade or fop
+RENDERENGINE?= jade
.if defined(SPELLCHECK)
DSLHTML?= ${DOC_PREFIX}/share/xml/spellcheck.dsl
.endif
-XMLLINT?= /usr/local/bin/xmllint
XMLDECL?= /usr/local/share/sgml/docbook/dsssl/modular/dtds/decls/xml.dcl
-.if exists(${PREFIX}/bin/jade) && !defined(OPENJADE)
-JADE?= ${PREFIX}/bin/jade
-JADECATALOG?= ${PREFIX}/share/sgml/jade/catalog
-SX?= ${PREFIX}/bin/sx
-.else
-JADE?= ${PREFIX}/bin/openjade
-JADECATALOG?= ${PREFIX}/share/sgml/openjade/catalog
-JADEFLAGS+= -V openjade
-SX?= ${PREFIX}/bin/osx
-.endif
-
-.if defined(SP_ENCODING)
-JADE_ENV+= SP_ENCODING=${SP_ENCODING}
-.endif
-JADE_CMD= ${SETENV} ${JADE_ENV} ${JADE}
-
DSLHTML?= ${DOC_PREFIX}/share/xml/default.dsl
DSLPRINT?= ${DOC_PREFIX}/share/xml/default.dsl
DSLPGP?= ${DOC_PREFIX}/share/xml/pgp.dsl
-FREEBSDCATALOG= ${DOC_PREFIX}/share/xml/catalog
-LANGUAGECATALOG=${DOC_PREFIX}/${LANGCODE}/share/xml/catalog
-
-ISO8879CATALOG= ${PREFIX}/share/sgml/iso8879/catalog
-
-.if ${STYLESHEET_TYPE} == "dsssl"
-DOCBOOKCATALOG= ${PREFIX}/share/sgml/docbook/catalog
-.elif ${STYLESHEET_TYPE} == "xsl"
-DOCBOOKCATALOG= ${PREFIX}/share/xml/docbook/catalog
-.endif
-
-CATALOG_PORTS_SGML= ${PREFIX}/share/sgml/catalog.ports
-
-DSSSLCATALOG= ${PREFIX}/share/sgml/docbook/dsssl/modular/catalog
-COLLATEINDEX= ${PREFIX}/share/sgml/docbook/dsssl/modular/bin/collateindex.pl
-XSLTPROCFLAGS?= --nonet
-XSLHTML?= ${DOC_PREFIX}/share/xsl/freebsd-html.xsl
-XSLHTMLCHUNK?= ${DOC_PREFIX}/share/xsl/freebsd-html-chunk.xsl
+XSLXHTML?= ${DOC_PREFIX}/share/xsl/freebsd-xhtml.xsl
+XSLXHTMLCHUNK?= ${DOC_PREFIX}/share/xsl/freebsd-xhtml-chunk.xsl
+XSLEPUB?= ${DOC_PREFIX}/share/xsl/freebsd-epub.xsl
XSLFO?= ${DOC_PREFIX}/share/xsl/freebsd-fo.xsl
-INDEXREPORTSCRIPT= ${DOC_PREFIX}/share/misc/indexreport.pl
IMAGES_LIB?=
-.for c in ${LANGUAGECATALOG} ${FREEBSDCATALOG} ${DSSSLCATALOG} ${ISO8879CATALOG} ${DOCBOOKCATALOG} ${JADECATALOG} ${EXTRA_CATALOGS} ${CATALOG_PORTS_SGML}
-.if exists(${c})
-CATALOGS+= -c ${c}
-.endif
-.endfor
-XMLFLAGS+= -D ${IMAGES_EN_DIR}/${DOC}s/${.CURDIR:T} -D ${CANONICALOBJDIR}
-JADEOPTS= ${JADEFLAGS} ${XMLFLAGS} ${CATALOGS}
-XSLTPROCOPTS= ${XSLTPROCFLAGS}
+JADEOPTS?= -w no-valid ${JADEFLAGS} -D ${IMAGES_EN_DIR}/${DOC}s/${.CURDIR:T} -D ${CANONICALOBJDIR}
+XSLTPROCOPTS?= --nonet
KNOWN_FORMATS= html html.tar html-split html-split.tar \
- txt rtf ps pdf tex dvi tar pdb
+ epub txt rtf ps pdf tex dvi tar pdb
CSS_SHEET?= ${DOC_PREFIX}/share/misc/docbook.css
PDFTEX_DEF?= ${DOC_PREFIX}/share/web2c/pdftex.def
-HTMLOPTS?= -ioutput.html -d ${DSLHTML} ${HTMLFLAGS}
-
-HTMLTXTOPTS?= -ioutput.html -d ${DSLHTML} ${HTMLTXTFLAGS}
-
PRINTOPTS?= -ioutput.print -d ${DSLPRINT} ${PRINTFLAGS}
-.if defined(BOOK_OUTPUT)
-NICE_HEADERS=1
-MIN_SECT_LABELS=1
-TWO_SIDE=1
-JUSTIFY=1
-#WITH_FOOTNOTES=1
-#GEN_INDEX=1
-.endif
-.if defined(JUSTIFY)
-TEX_CMDSEQ+= \RequirePackage{url}
-PRINTOPTS+= -ioutput.print.justify
-.endif
-.if defined(TWO_SIDE)
-PRINTOPTS+= -V %two-side% -ioutput.print.twoside
-TEX_CMDSEQ+= \def\PageTwoSide{1}
-.endif
-.if defined(NICE_HEADERS)
-PRINTOPTS+= -ioutput.print.niceheaders
-.endif
-.if defined(MIN_SECT_LABELS)
-PRINTOPTS+= -V minimal-section-labels
-.endif
-.if defined(TRACE)
-TEX_CMDSEQ+= \tracingstats=${TRACE}
-.endif
-.if defined(RLE)
-PNMTOPSFLAGS+= -rle
-.endif
.if defined(WWWFREEBSDORG)
HTMLFLAGS+= -V %html-header-script%
.endif
-
.if !defined(WITH_INLINE_LEGALNOTICE) || empty(WITH_INLINE_LEGALNOTICE)
HTMLFLAGS+= -V %generate-legalnotice-link%
.endif
@@ -245,63 +129,19 @@ HTMLFLAGS+= -V %show-all-trademark-symbols%
PRINTFLAGS+= -V %show-all-trademark-symbols%
.endif
-PERL?= /usr/bin/perl
-PKG_CREATE?= /usr/sbin/pkg_create
-SORT?= /usr/bin/sort
-TAR?= /usr/bin/tar
-TOUCH?= /usr/bin/touch
-XARGS?= /usr/bin/xargs
-
-GROFF?= groff
-TIDY_VER!= ${TIDY} -v 2>&1
-.if ${TIDY_VER} == "HTML Tidy for FreeBSD released on 7 December 2008"
-TIDYOPTS?= -wrap 90 -m -raw --preserve-entities yes -f /dev/null -asxml ${TIDYFLAGS}
-.else
-TIDYOPTS?= -wrap 90 -m -raw -preserve -f /dev/null -asxml ${TIDYFLAGS}
-.endif
-HTML2TXT?= ${PREFIX}/bin/links
-HTML2TXTOPTS?= -dump -width 72 ${HTML2TXTFLAGS}
-HTML2PDB?= ${PREFIX}/bin/iSiloBSD
-HTML2PDBOPTS?= -y -d0 -Idef ${HTML2PDBFLAGS}
-DVIPS?= ${PREFIX}/bin/dvips
-.if defined(PAPERSIZE)
-DVIPSOPTS?= -t ${PAPERSIZE:L}
-.endif
-DVIPSOPTS+= ${DVIPSFLAGS}
-
-#
-# Currently, we have to use the FixRTF utility available as textproc/fixrtf
-# to apply several RTF fixups:
-#
-# 1. Embed PNGs into RTF. (Option: -p)
-# 2. Embed FreeBSD-specific information into RTF, such as organization name,
-# building time. But unfortunately, so far only Microsoft Word can read
-# them. In contrast, Microsoft Word Viewer and OpenOffice even cannot read
-# this kind of information from RTF created by Microsoft Word and
-# OpenOffice. (Option: -i)
-# 3. Do some locale-specific fixing. (Option: -e <encoding>)
-#
-# This is a transitional solution before Jade/OpenJade provides these features.
-#
-FIXRTF?= ${PREFIX}/bin/fixrtf
-FIXRTFOPTS?= -i -p
-.if defined(SP_ENCODING)
-FIXRTFOPTS+= -e ${SP_ENCODING}
-.endif
-
-GZIP?= -9
-GZIP_CMD?= gzip -qf ${GZIP}
-BZIP2?= -9
-BZIP2_CMD?= bzip2 -qf ${BZIP2}
-ZIP?= -9
-ZIP_CMD?= ${PREFIX}/bin/zip -j ${ZIP}
-
#
# Instruction for bsd.subdir.mk to not to process SUBDIR directive.
# It is not necessary since doc.docbook.mk do it too.
#
NO_SUBDIR= YES
+#
+# Index generation
+#
+
+.if defined(GEN_INDEX)
+XSLTPROCOPTS+= --param generate.index "1"
+.endif
# ------------------------------------------------------------------------
#
@@ -351,6 +191,8 @@ LOCAL_CSS_SHEET= ${.OBJDIR}/${CSS_SHEET:T}
LOCAL_CSS_SHEET= ${CSS_SHEET:T}
.endif
+CLEANFILES+= ${DOC}.parsed.xml
+
.for _curformat in ${FORMATS}
_cf=${_curformat}
@@ -369,6 +211,10 @@ CLEANFILES+= PLIST.${_curformat}
CLEANFILES+= $$([ -f HTML.manifest ] && ${XARGS} < HTML.manifest) \
HTML.manifest ln*.html
+.elif ${_cf} == "epub"
+CLEANFILES+= ${DOC}.epub mimetype
+CLEANDIRS+= META-INF OEBPS
+
.elif ${_cf} == "html.tar"
CLEANFILES+= ${DOC}.html
@@ -385,14 +231,15 @@ CLEANFILES+= ${DOC}.rtf-nopng
CLEANFILES+= ${DOC}.aux ${DOC}.log
.elif ${_cf} == "ps"
-CLEANFILES+= ${DOC}.aux ${DOC}.dvi ${DOC}.log ${DOC}.out ${DOC}.tex-ps ${DOC}.tex ${DOC}.tex-tmp
+CLEANFILES+= ${DOC}.aux ${DOC}.dvi ${DOC}.log ${DOC}.out ${DOC}.tex-ps \
+ ${DOC}.tex ${DOC}.tex-tmp ${DOC}.fo
.for _curimage in ${LOCAL_IMAGES_EPS:M*share*}
CLEANFILES+= ${_curimage:T} ${_curimage:H:T}/${_curimage:T}
.endfor
.elif ${_cf} == "pdf"
CLEANFILES+= ${DOC}.aux ${DOC}.dvi ${DOC}.log ${DOC}.out ${DOC}.tex-pdf ${DOC}.tex-pdf-tmp \
- ${DOC}.tex
+ ${DOC}.tex ${DOC}.fo
.for _curimage in ${IMAGES_PDF:M*share*}
CLEANFILES+= ${_curimage:T} ${_curimage:H:T}/${_curimage:T}
.endfor
@@ -407,10 +254,6 @@ CLEANFILES+= ${.CURDIR:T}.pdb
.endif
.endif
-.if (${STYLESHEET_TYPE} == "xsl")
-CLEANFILES+= ${DOC}.xml .sxerr
-.endif
-
.if (${LOCAL_CSS_SHEET} != ${CSS_SHEET}) && \
(${_cf} == "html-split" || ${_cf} == "html-split.tar" || \
${_cf} == "html" || ${_cf} == "html.tar" || ${_cf} == "txt")
@@ -420,7 +263,6 @@ CLEANFILES+= ${LOCAL_CSS_SHEET}
.if !defined(WITH_INLINE_LEGALNOTICE) || empty(WITH_INLINE_LEGALNOTICE) && \
(${_cf} == "html-split" || ${_cf} == "html-split.tar" || \
${_cf} == "html" || ${_cf} == "html.tar" || ${_cf} == "txt")
-CLEANFILES+= LEGALNOTICE.html trademarks.html
.endif
.endfor # _curformat in ${FORMATS} #
@@ -438,7 +280,7 @@ CLEANFILES+= LEGALNOTICE.html trademarks.html
_cf=${_curformat}
.for _curcomp in ${INSTALL_COMPRESSED}
-.if ${_cf} != "html-split" && ${_cf} != "html"
+.if ${_cf} != "html-split" && ${_cf} != "html" && ${_cf} != "epub"
_curinst+= install-${_curformat}.${_curcomp}
_docs+= ${DOC}.${_curformat}.${_curcomp}
CLEANFILES+= ${DOC}.${_curformat}.${_curcomp}
@@ -453,28 +295,9 @@ CLEANFILES+= ${.CURDIR:T}.${_curformat}.${_curcomp}
.endfor
.endif
-#
-# Index generation
-#
-
-.if defined(GEN_INDEX) && defined(HAS_INDEX)
-JADEFLAGS+= -i chap.index
-HTML_SPLIT_INDEX?= html-split.index
-HTML_INDEX?= html.index
-PRINT_INDEX?= print.index
-INDEX_SGML?= index.xml
-
-CLEANFILES+= ${INDEX_SGML} ${HTML_SPLIT_INDEX} ${HTML_INDEX} ${PRINT_INDEX}
-
-INIT_INDEX_SGML_CMD?= ${PERL} ${COLLATEINDEX} -i doc-index -N -o ${INDEX_SGML}
-GEN_INDEX_SGML_CMD?= ${PERL} ${COLLATEINDEX} -i doc-index -g -o ${INDEX_SGML} ${.ALLSRC:M*.index}
-.else
-GEN_INDEX_SGML_CMD?= @${ECHO} "Index is disabled or no index to generate."
-.endif
-
.MAIN: all
-all: ${_docs}
+all: ${SRCS} ${_docs}
# put languages which have a problem on rendering printable formats
# by using TeX to NO_TEX_LANG.
@@ -500,62 +323,20 @@ NO_RTF= yes
.endif
.endfor
-# HTML-SPLIT -------------------------------------------------------------
+# Parsed XML -------------------------------------------------------
-.if ${STYLESHEET_TYPE} == "dsssl"
-index.html HTML.manifest: ${SRCS} ${LOCAL_IMAGES_LIB} ${LOCAL_IMAGES_PNG} \
- ${LOCAL_IMAGES_TXT} ${HTML_SPLIT_INDEX} ${LOCAL_CSS_SHEET}
- ${GEN_INDEX_SGML_CMD}
- ${JADE_CMD} -V html-manifest ${HTMLOPTS} -ioutput.html.images \
- ${JADEOPTS} -t sgml ${XMLDECL} ${MASTERDOC}
-.elif ${STYLESHEET_TYPE} == "xsl"
-index.html: ${DOC}.xml ${LOCAL_IMAGES_LIB} ${LOCAL_IMAGES_PNG} \
+${DOC}.parsed.xml: ${SRCS}
+ ${XMLLINT} --nonet --noent --valid --xinclude --dropdtd ${MASTERDOC} > ${.TARGET}
+
+# XHTML -------------------------------------------------------------
+
+index.html: ${DOC}.parsed.xml ${LOCAL_IMAGES_LIB} ${LOCAL_IMAGES_PNG} \
${HTML_SPLIT_INDEX} ${LOCAL_CSS_SHEET}
- ${GEN_INDEX_SGML_CMD}
- ${XSLTPROC} ${XSLTPROCOPTS} --param freebsd.output.html.images "'1'" ${XSLHTMLCHUNK} \
- ${DOC}.xml
-.endif
-.if !defined(NO_TIDY)
- ${REINPLACE_TABS_CMD} $$(${XARGS} < HTML.manifest)
- -${TIDY} ${TIDYOPTS} $$(${XARGS} < HTML.manifest)
-.endif
+ ${XSLTPROC} ${XSLTPROCOPTS} ${XSLXHTMLCHUNK} ${DOC}.parsed.xml
-# HTML -------------------------------------------------------------------
-
-.if ${STYLESHEET_TYPE} == "dsssl"
-${DOC}.html: ${SRCS} ${LOCAL_IMAGES_LIB} ${LOCAL_IMAGES_PNG} \
- ${LOCAL_IMAGES_TXT} ${HTML_INDEX} ${LOCAL_CSS_SHEET}
- ${GEN_INDEX_SGML_CMD}
- ${JADE_CMD} -V nochunks ${HTMLOPTS} -ioutput.html.images \
- ${JADEOPTS} -t sgml ${XMLDECL} ${MASTERDOC} > ${.TARGET} || \
- (${RM} -f ${.TARGET} && false)
-.elif ${STYLESHEET_TYPE} == "xsl"
-${DOC}.html: ${DOC}.xml ${LOCAL_IMAGES_LIB} ${LOCAL_IMAGES_PNG} \
+${DOC}.html: ${DOC}.parsed.xml ${LOCAL_IMAGES_LIB} ${LOCAL_IMAGES_PNG} \
${LOCAL_CSS_SHEET}
- ${GEN_INDEX_SGML_CMD}
- ${XSLTPROC} ${XSLTPROCOPTS} --param freebsd.output.html.images "'1'" ${XSLHTML} \
- ${DOC}.xml > ${.TARGET}
-.endif
-.if !defined(NO_TIDY)
- ${REINPLACE_TABS_CMD} ${.TARGET}
- -${TIDY} ${TIDYOPTS} ${.TARGET}
-.endif
-
-# HTML-TEXT --------------------------------------------------------------
-
-# Special target to produce HTML with no images in it.
-.if ${STYLESHEET_TYPE} == "dsssl"
-${DOC}.html-text: ${SRCS} ${HTML_INDEX} ${LOCAL_IMAGES_TXT}
- ${GEN_INDEX_SGML_CMD}
- ${JADE_CMD} -V nochunks ${HTMLTXTOPTS} \
- ${JADEOPTS} -t sgml ${XMLDECL} ${MASTERDOC} > ${.TARGET} || \
- (${RM} -f ${.TARGET} && false)
-.elif ${STYLESHEET_TYPE} == "xsl"
-${DOC}.html-text: ${DOC}.xml ${HTML_INDEX}
- ${GEN_INDEX_SGML_CMD}
- ${XSLTPROC} ${XSLTPROCOPTS} --param freebsd.output.html.images "'0'" ${XSLHTML} \
- ${DOC}.xml > ${.TARGET}
-.endif
+ ${XSLTPROC} ${XSLTPROCOPTS} ${XSLXHTML} ${DOC}.parsed.xml > ${.TARGET}
${DOC}.html-split.tar: HTML.manifest ${LOCAL_IMAGES_LIB} \
${LOCAL_IMAGES_PNG} ${LOCAL_CSS_SHEET}
@@ -573,11 +354,22 @@ ${DOC}.html.tar: ${DOC}.html ${LOCAL_IMAGES_LIB} \
${TAR} rf ${.TARGET} -C ${IMAGES_EN_DIR}/${DOC}s/${.CURDIR:T} ${_curimage:S|${IMAGES_EN_DIR}/${DOC}s/${.CURDIR:T}/||}
.endfor
+# EPUB -------------------------------------------------------------
+
+${DOC}.epub: ${DOC}.parsed.xml ${LOCAL_IMAGES_LIB} ${LOCAL_IMAGES_PNG} \
+ ${CSS_SHEET}
+ ${XSLTPROC} ${XSLTPROCOPTS} ${XSLEPUB} ${DOC}.parsed.xml
+ ${ECHO} "application/epub+zip" > mimetype
+ ${CP} ${CSS_SHEET} OEBPS/
+ zip -0Xq ${DOC}.epub mimetype
+ zip -Xr9D ${DOC}.epub OEBPS META-INF
+
+
# TXT --------------------------------------------------------------------
.if !target(${DOC}.txt)
.if !defined(NO_PLAINTEXT)
-${DOC}.txt: ${DOC}.html-text
+${DOC}.txt: ${DOC}.html
${HTML2TXT} ${HTML2TXTOPTS} ${.ALLSRC} > ${.TARGET}
.else
${DOC}.txt:
@@ -604,11 +396,11 @@ ${.CURDIR:T}.pdb.${_curcomp}: ${DOC}.pdb.${_curcomp}
.if !target(${DOC}.rtf)
.if !defined(NO_RTF)
-${DOC}.rtf: ${SRCS} ${LOCAL_IMAGES_EPS} ${PRINT_INDEX} \
+${DOC}.rtf: ${DOC}.parsed.xml ${LOCAL_IMAGES_EPS} ${PRINT_INDEX} \
${LOCAL_IMAGES_TXT} ${LOCAL_IMAGES_PNG}
- ${GEN_INDEX_SGML_CMD}
- ${JADE_CMD} -V rtf-backend ${PRINTOPTS} -ioutput.rtf.images \
- ${JADEOPTS} -t rtf -o ${.TARGET}-nopng ${XMLDECL} ${MASTERDOC}
+ ${JADE} -V rtf-backend ${PRINTOPTS} -ioutput.rtf.images \
+ ${JADEOPTS} -t rtf -o ${.TARGET}-nopng ${XMLDECL} \
+ ${DOC}.parsed.xml
${FIXRTF} ${FIXRTFOPTS} < ${.TARGET}-nopng > ${.TARGET}
.else
${DOC}.rtf:
@@ -618,6 +410,7 @@ ${DOC}.rtf:
# PS/PDF -----------------------------------------------------------------
+.if ${RENDERENGINE} == "jade"
.if !defined(NO_TEX)
#
# This sucks, but there's no way round it. The PS and PDF formats need
@@ -627,22 +420,21 @@ ${DOC}.rtf:
#
${DOC}.tex: ${SRCS} ${LOCAL_IMAGES_EPS} ${PRINT_INDEX} \
- ${LOCAL_IMAGES_TXT} ${LOCAL_IMAGES_EN}
- ${GEN_INDEX_SGML_CMD}
- ${JADE_CMD} -V tex-backend ${PRINTOPTS} \
- ${JADEOPTS} -t tex -o ${.TARGET} ${XMLDECL} ${MASTERDOC}
+ ${LOCAL_IMAGES_TXT} ${LOCAL_IMAGES_EN} \
+ ${DOC}.parsed.xml
+ ${JADE} -V tex-backend ${PRINTOPTS} \
+ ${JADEOPTS} -t tex -o ${.TARGET} ${XMLDECL} ${DOC}.parsed.xml
${DOC}.tex-ps: ${DOC}.tex
${LN} -f ${.ALLSRC} ${.TARGET}
.if !target(${DOC}.tex-pdf)
${DOC}.tex-pdf: ${SRCS} ${IMAGES_PDF} ${PRINT_INDEX} \
- ${LOCAL_IMAGES_TXT}
- ${GEN_INDEX_SGML_CMD}
+ ${LOCAL_IMAGES_TXT} ${DOC}.parsed.xml
${RM} -f ${.TARGET}
${CAT} ${PDFTEX_DEF} > ${.TARGET}
- ${JADE_CMD} -V tex-backend ${PRINTOPTS} -ioutput.print.pdf \
- ${JADEOPTS} -t tex -o /dev/stdout ${XMLDECL} ${MASTERDOC} >> ${.TARGET}
+ ${JADE} -V tex-backend ${PRINTOPTS} -ioutput.print.pdf \
+ ${JADEOPTS} -t tex -o /dev/stdout ${XMLDECL} ${DOC}.parsed.xml >> ${.TARGET}
.endif
.if !target(${DOC}.dvi)
@@ -697,6 +489,21 @@ ${DOC}.tex-pdf:
.endif
.endif
+.elif ${RENDERENGINE} == "fop"
+${DOC}.fo: ${DOC}.xml ${LOCAL_IMAGES_LIB} ${LOCAL_IMAGES_PNG}
+ ${XSLTPROC} ${XSLTPROCOPTS} ${XSLFO} ${DOC}.parsed.xml > ${.TARGET}
+
+${DOC}.pdf: ${DOC}.fo ${LOCAL_IMAGES_LIB} ${LOCAL_IMAGES_PNG}
+ ${FOP} ${FOPOPTS} ${DOC}.fo ${.TARGET}
+
+${DOC}.ps: ${DOC}.fo ${LOCAL_IMAGES_LIB} ${LOCAL_IMAGES_PNG}
+ ${FOP} ${FOPOPTS} ${DOC}.fo ${.TARGET}
+
+${DOC}.rtf: ${DOC}.fo ${LOCAL_IMAGES_LIB} ${LOCAL_IMAGES_PNG}
+ ${FOP} ${FOPOPTS} ${DOC}.fo ${.TARGET}
+
+.endif
+
${DOC}.tar: ${SRCS} ${LOCAL_IMAGES} ${LOCAL_CSS_SHEET}
${TAR} cf ${.TARGET} -C ${.CURDIR} ${SRCS} \
-C ${.OBJDIR} ${IMAGES} ${CSS_SHEET:T}
@@ -722,37 +529,9 @@ ${DOC}.${_curformat}:
# having to convert it to any other formats
#
-lint validate:
- @${XMLLINT} --nonet --noout --noent --valid ${MASTERDOC}
-
-# ------------------------------------------------------------------------
-#
-# Index targets
-#
-
-#
-# Generate a different .index file based on the format name
-#
-# If we're not generating an index (the default) then we need to create
-# an empty index.xml file so that we can reference index.xml in book.sgml
-#
-
-
-${HTML_INDEX}: ${SRCS} ${LOCAL_IMAGES_TXT}
- ${INIT_INDEX_SGML_CMD}
- ${JADE_CMD} -V html-index -V nochunks ${HTMLOPTS} -ioutput.html.images \
- ${JADEOPTS} -t sgml ${XMLDECL} ${MASTERDOC} > /dev/null
-
-${HTML_SPLIT_INDEX}: ${SRCS} ${LOCAL_IMAGES_TXT}
- ${INIT_INDEX_SGML_CMD}
- ${JADE_CMD} -V html-index ${HTMLOPTS} -ioutput.html.images \
- ${JADEOPTS} -t sgml ${XMLDECL} ${MASTERDOC} > /dev/null
-
-.if !target(${PRINT_INDEX})
-${PRINT_INDEX}: ${HTML_INDEX}
- ${CP} -p ${HTML_INDEX} ${.TARGET}
-.endif
-
+lint validate: ${SRCS}
+ ${XMLLINT} --nonet --noout --noent --valid ${MASTERDOC}
+ @${RM} -rf ${CLEANFILES} ${CLEANDIRS}
# ------------------------------------------------------------------------
#
@@ -775,13 +554,13 @@ KNOWN_COMPRESS= gz bz2 zip
#
_PROG_COMPRESS_gz: .USE
- ${GZIP_CMD} < ${.ALLSRC} > ${.TARGET}
+ ${GZIP} ${GZIPOPTS} < ${.ALLSRC} > ${.TARGET}
_PROG_COMPRESS_bz2: .USE
- ${BZIP2_CMD} < ${.ALLSRC} > ${.TARGET}
+ ${BZIP2} ${BZIP2OPTS} < ${.ALLSRC} > ${.TARGET}
_PROG_COMPRESS_zip: .USE
- ${ZIP_CMD} ${.TARGET} ${.ALLSRC}
+ ${ZIP} ${ZIPOPTS} ${.TARGET} ${.ALLSRC}
#
# Build a list of targets for each compression scheme and output format.
@@ -862,12 +641,6 @@ spellcheck-${_curformat}:
spellcheck: ${FORMATS:C/^/spellcheck-/}
-indexreport:
-.for _entry in ${SRCS:M*.xml}
- @echo "indexreport ${_entry}"
- @${PERL} ${INDEXREPORTSCRIPT} ${.CURDIR}/${_entry}
-.endfor
-
#
# Build a list of install-format targets to be installed. These will be
# dependencies for the "realinstall" target.
diff --git a/share/mk/doc.html.mk b/share/mk/doc.html.mk
deleted file mode 100644
index d7559fd1f7..0000000000
--- a/share/mk/doc.html.mk
+++ /dev/null
@@ -1,372 +0,0 @@
-#
-# $FreeBSD$
-#
-# This include file <doc.html.mk> handles building and installing of
-# HTML documentation in the FreeBSD Documentation Project.
-#
-# Documentation using DOCFORMAT=html is expected to be marked up
-# according to the HTML DTD
-#
-
-# ------------------------------------------------------------------------
-#
-# Document-specific variables
-#
-# DOC This should be set to the name of the HTML
-# marked-up file, without the .sgml suffix.
-#
-# It also determins the name of the output files -
-# ${DOC}.html.
-#
-# DOCBOOKSUFFIX The suffix of your document, defaulting to .sgml
-#
-# SRCS The names of all the files that are needed to
-# build this document - This is useful if any of
-# them need to be generated. Changing any file in
-# SRCS causes the documents to be rebuilt.
-#
-
-# ------------------------------------------------------------------------
-#
-# Variables used by both users and documents:
-#
-# EXTRA_CATALOGS Additional catalog files that should be used by
-# any SGML processing applications.
-#
-# Documents should use the += format to access these.
-#
-
-MASTERDOC?= ${.CURDIR}/${DOC}.sgml
-
-KNOWN_FORMATS= html txt tar pdb
-
-CSS_SHEET?=
-
-HTMLCATALOG= ${PREFIX}/share/xml/html/catalog
-
-IMAGES_LIB?=
-
-if exists(${PREFIX}/bin/sgmlnorm) && !defined(OPENJADE)
-NSGMLS?= ${PREFIX}/bin/nsgmls
-SGMLNORM?= ${PREFIX}/bin/sgmlnorm
-.else
-NSGMLS?= ${PREFIX}/bin/onsgmls
-SGMLNORM?= ${PREFIX}/bin/osgmlnorm
-.endif
-
-PKG_CREATE?= /usr/sbin/pkg_create
-TAR?= /usr/bin/tar
-XARGS?= /usr/bin/xargs
-
-HTML2PDB?= ${PREFIX}/bin/iSiloBSD
-HTML2PDBOPTS?= -y -d0 -Idef ${HTML2PDBFLAGS}
-
-GZIP?= -9
-GZIP_CMD?= gzip -qf ${GZIP}
-BZIP2?= -9
-BZIP2_CMD?= bzip2 -qf ${BZIP2}
-ZIP?= -9
-ZIP_CMD?= ${PREFIX}/bin/zip -j ${ZIP}
-
-
-# ------------------------------------------------------------------------
-#
-
-.if ${.OBJDIR} != ${.CURDIR}
-LOCAL_CSS_SHEET= ${.OBJDIR}/${CSS_SHEET:T}
-CLEANFILES+= ${LOCAL_CSS_SHEET}
-.else
-LOCAL_CSS_SHEET= ${CSS_SHEET:T}
-.endif
-
-.for _curformat in ${FORMATS}
-_cf=${_curformat}
-
-# Create a 'bogus' doc for any format we support or not. This is so
-# that we can fake up a target for it later on, and this target can print
-# the warning message about the unsupported format.
-_docs+= ${DOC}.${_curformat}
-CLEANFILES+= ${DOC}.${_curformat}
-CLEANFILES+= PLIST.${_curformat}
-
-.if ${_cf} == "txt"
-.if ${LOCAL_CSS_SHEET} != ${CSS_SHEET}
-CLEANFILES+= ${LOCAL_CSS_SHEET}
-.endif
-
-.elif ${_cf} == "txt"
-CLEANFILES+= ${DOC}.html
-
-.elif ${_cf} == "pdb"
-_docs+= ${.CURDIR:T}.pdb
-CLEANFILES+= ${.CURDIR:T}.pdb
-
-.endif
-.endfor
-
-#
-# Build a list of install-${format}.${compress_format} targets to be
-# by "make install". Also, add ${DOC}.${format}.${compress_format} to
-# ${_docs} and ${CLEANFILES} so they get built/cleaned by "all" and
-# "clean".
-#
-
-.if defined(INSTALL_COMPRESSED) && !empty(INSTALL_COMPRESSED)
-.for _curformat in ${FORMATS}
-_cf=${_curformat}
-.for _curcomp in ${INSTALL_COMPRESSED}
-
-.if ${_cf} != "html-split"
-_curinst+= install-${_curformat}.${_curcomp}
-_docs+= ${DOC}.${_curformat}.${_curcomp}
-CLEANFILES+= ${DOC}.${_curformat}.${_curcomp}
-
-.if ${_cf} == "pdb"
-_docs+= ${.CURDIR:T}.${_curformat}.${_curcomp}
-CLEANFILES+= ${.CURDIR:T}.${_curformat}.${_curcomp}
-
-.endif
-.endif
-.endfor
-.endfor
-.endif
-
-.MAIN: all
-
-all: ${_docs}
-
-${DOC}.html: ${SRCS} ${LOCAL_IMAGES_LIB} ${LOCAL_IMAGES_PNG} ${LOCAL_CSS_SHEET}
- ${SGMLNORM} -c ${HTMLCATALOG} ${SRCS:S|^|${.CURDIR}/|} > ${.TARGET}
-
-${DOC}.txt: ${DOC}.html
- ${HTML2TXT} ${HTML2TXTOPTS} ${.ALLSRC} > ${.TARGET}
-
-${DOC}.pdb: ${DOC}.html ${LOCAL_IMAGES_LIB} ${LOCAL_IMAGES_PNG}
- ${HTML2PDB} ${HTML2PDBOPTS} ${DOC}.html ${.TARGET}
-
-${.CURDIR:T}.pdb: ${DOC}.pdb
- ${LN} -f ${.ALLSRC} ${.TARGET}
-
-.if defined(INSTALL_COMPRESSED) && !empty(INSTALL_COMPRESSED)
-.for _curcomp in ${INSTALL_COMPRESSED}
-${.CURDIR:T}.pdb.${_curcomp}: ${DOC}.pdb.${_curcomp}
- ${LN} -f ${.ALLSRC} ${.TARGET}
-.endfor
-.endif
-
-${DOC}.tar: ${SRCS} ${LOCAL_IMAGES} ${LOCAL_CSS_SHEET}
- ${TAR} cf ${.TARGET} -C ${.CURDIR} ${SRCS} \
- -C ${.OBJDIR} ${IMAGES} ${CSS_SHEET:T}
-
-#
-# Build targets for any formats we've missed that we don't handle.
-#
-.for _curformat in ${ALL_FORMATS}
-.if !target(${DOC}.${_curformat})
-${DOC}.${_curformat}:
- @${ECHO_CMD} \"${_curformat}\" is not a valid output format for this document.
-.endif
-.endfor
-
-
-# ------------------------------------------------------------------------
-#
-# Validation targets
-#
-
-#
-# Lets you quickly check that the document conforms to the DTD without
-# having to convert it to any other formats
-#
-
-lint validate:
- ${NSGMLS} -s -c ${HTMLCATALOG} ${MASTERDOC}
-
-
-# ------------------------------------------------------------------------
-#
-# Compress targets
-#
-
-#
-# The list of compression extensions this Makefile knows about. If you
-# add new compression schemes, add to this list (which is a list of
-# extensions, hence bz2, *not* bzip2) and extend the _PROG_COMPRESS_*
-# targets.
-#
-
-KNOWN_COMPRESS= gz bz2 zip
-
-#
-# You can't build suffix rules to do compression, since you can't
-# wildcard the source suffix. So these are defined .USE, to be tacked on
-# as dependencies of the compress-* targets.
-#
-
-_PROG_COMPRESS_gz: .USE
- ${GZIP_CMD} < ${.ALLSRC} > ${.TARGET}
-
-_PROG_COMPRESS_bz2: .USE
- ${BZIP2_CMD} < ${.ALLSRC} > ${.TARGET}
-
-_PROG_COMPRESS_zip: .USE
- ${ZIP_CMD} ${.TARGET} ${.ALLSRC}
-
-#
-# Build a list of targets for each compression scheme and output format.
-# Don't compress the html-split output format.
-#
-.for _curformat in ${KNOWN_FORMATS}
-_cf=${_curformat}
-.for _curcompress in ${KNOWN_COMPRESS}
-${DOC}.${_cf}.${_curcompress}: ${DOC}.${_cf} _PROG_COMPRESS_${_curcompress}
-.endfor
-.endfor
-
-#
-# Build targets for any formats we've missed that we don't handle.
-#
-.for _curformat in ${ALL_FORMATS}
-.for _curcompress in ${KNOWN_COMPRESS}
-.if !target(${DOC}.${_curformat}.${_curcompress})
-${DOC}.${_curformat}.${_curcompress}:
- @${ECHO_CMD} \"${_curformat}.${_curcompress}\" is not a valid output format for this document.
-.endif
-.endfor
-.endfor
-
-
-# ------------------------------------------------------------------------
-#
-# Install targets
-#
-# Build install-* targets, one per allowed value in FORMATS.
-#
-# "beforeinstall" and "afterinstall" are hooks in to this process.
-# Redefine them to do things before and after the files are installed,
-# respectively.
-
-#
-# Build a list of install-format targets to be installed. These will be
-# dependencies for the "realinstall" target.
-#
-
-.if !defined(INSTALL_ONLY_COMPRESSED) || empty(INSTALL_ONLY_COMPRESSED)
-_curinst+= ${FORMATS:S/^/install-/g}
-.endif
-
-realinstall: ${_curinst}
-
-.for _curformat in ${KNOWN_FORMATS}
-_cf=${_curformat}
-.if !target(install-${_cf})
-install-${_curformat}: ${DOC}.${_curformat}
- @[ -d ${DESTDIR} ] || ${MKDIR} -p ${DESTDIR}
- ${INSTALL_DOCS} ${.ALLSRC} ${DESTDIR}
-.if !empty(CSS_SHEET)
- ${INSTALL_DOCS} ${CSS_SHEET} ${DESTDIR}
-.endif
-.for _curimage in ${IMAGES_LIB}
- @[ -d ${DESTDIR}/${LOCAL_IMAGES_LIB_DIR}/${_curimage:H} ] || \
- ${MKDIR} -p ${DESTDIR}/${LOCAL_IMAGES_LIB_DIR}/${_curimage:H}
- ${INSTALL_DOCS} ${LOCAL_IMAGES_LIB_DIR}/${_curimage} \
- ${DESTDIR}/${LOCAL_IMAGES_LIB_DIR}/${_curimage:H}
-.endfor
-# Install the images. First, loop over all the image names that contain a
-# directory separator, make the subdirectories, and install. Then loop over
-# the ones that don't contain a directory separator, and install them in the
-# top level.
-.for _curimage in ${IMAGES_PNG:M*/*:M*share*}
- ${MKDIR} -p ${DESTDIR:H:H}/${_curimage:H:S|${IMAGES_EN_DIR}/||:S|${.CURDIR}||}
- ${INSTALL_DOCS} ${_curimage} ${DESTDIR:H:H}/${_curimage:H:S|${IMAGES_EN_DIR}/||:S|${.CURDIR}||}
-.endfor
-.for _curimage in ${IMAGES_PNG:N*/*}
- ${INSTALL_DOCS} ${.CURDIR}/${_curimage} ${DESTDIR}
-.endfor
-.if ${_cf} == "pdb"
- ${LN} -f ${DESTDIR}/${.ALLSRC} ${DESTDIR}/${.CURDIR:T}.${_curformat}
-.endif
-
-.for _compressext in ${KNOWN_COMPRESS}
-install-${_cf}.${_compressext}: ${DOC}.${_cf}.${_compressext}
- @[ -d ${DESTDIR} ] || ${MKDIR} -p ${DESTDIR}
- ${INSTALL_DOCS} ${.ALLSRC} ${DESTDIR}
-.endfor
-.endif
-.endfor
-
-#
-# Build install- targets for any formats we've missed that we don't handle.
-#
-
-.for _curformat in ${ALL_FORMATS}
-.if !target(install-${_curformat})
-install-${_curformat}:
- @${ECHO_CMD} \"${_curformat}\" is not a valid output format for this document.
-
-.for _compressext in ${KNOWN_COMPRESS}
-install-${_curformat}.${_compressext}:
- @${ECHO_CMD} \"${_curformat}.${_compressext}\" is not a valid output format for this document.
-.endfor
-.endif
-.endfor
-
-
-# ------------------------------------------------------------------------
-#
-# Package building
-#
-
-#
-# realpackage is what is called in each subdirectory when a package
-# target is called, or, rather, package calls realpackage in each
-# subdirectory as it goes.
-#
-# packagelist returns the list of targets that would be called during
-# package building.
-#
-
-realpackage: ${FORMATS:S/^/package-/}
-packagelist:
- @${ECHO_CMD} ${FORMATS:S/^/package-/}
-
-#
-# Build a list of package targets for each output target. Each package
-# target depends on the corresponding install target running.
-#
-
-.for _curformat in ${KNOWN_FORMATS}
-_cf=${_curformat}
-PLIST.${_curformat}: ${DOC}.${_curformat}
- @${ECHO_CMD} ${DOC}.${_curformat} > PLIST.${_curformat}
-.if ${_cf} == "html" && \
- (!empty(LOCAL_IMAGES_LIB) || !empty(IMAGES_PNG) || !empty(CSS_SHEET))
- @${ECHO_CMD} ${LOCAL_IMAGES_LIB} ${IMAGES_PNG} ${CSS_SHEET} | \
- ${XARGS} -n1 >> PLIST.${_curformat}
-.elif ${_cf} == "pdb"
- @${ECHO_CMD} ${.CURDIR:T}.${_curformat} >> PLIST.${_curformat}
-.endif
-
-${PACKAGES}/${.CURDIR:T}.${LANGCODE}.${_curformat}.tgz: PLIST.${_curformat}
- @${PKG_CREATE} -v -f PLIST.${_curformat} -p ${DESTDIR} -s ${.OBJDIR} \
- -c -"FDP ${.CURDIR:T} ${_curformat} package" \
- -d -"FDP ${.CURDIR:T} ${_curformat} package" ${.TARGET}
-
-package-${_curformat}: ${PACKAGES}/${.CURDIR:T}.${LANGCODE}.${_curformat}.tgz
-.endfor
-
-#
-# Build install- targets for any formats we've missed that we don't handle.
-#
-
-.for _curformat in ${ALL_FORMATS}
-.if !target(package-${_curformat})
-package-${_curformat}:
- @${ECHO_CMD} \"${_curformat}\" is not a valid output format for this document.
-.endif
-.endfor
-
-.if ${LOCAL_CSS_SHEET} != ${CSS_SHEET}
-${LOCAL_CSS_SHEET}: ${CSS_SHEET}
- ${CP} -p ${.ALLSRC} ${.TARGET}
-.endif
diff --git a/share/mk/doc.images.mk b/share/mk/doc.images.mk
index 7c3386dfa1..0ea71b2fd3 100644
--- a/share/mk/doc.images.mk
+++ b/share/mk/doc.images.mk
@@ -109,42 +109,6 @@ EPS2PNM_RES?= 100
# shared image directory.
IMAGES_PDF= ${IMAGES_GEN_PDF} ${_IMAGES_PNG}
-SCR2PNG?= ${PREFIX}/bin/scr2png
-SCR2PNGOPTS?= ${SCR2PNGFLAGS}
-SCR2TXT?= ${PREFIX}/bin/scr2txt
-SCR2TXTOPTS?= -l ${SCR2TXTFLAGS}
-SED?= /usr/bin/sed
-EPS2PNM?= ${PREFIX}/bin/gs
-EPS2PNMOPTS?= -q -dBATCH -dGraphicsAlphaBits=4 -dTextAlphaBits=4 \
- -dEPSCrop -r${EPS2PNM_RES}x${EPS2PNM_RES} \
- -dNOPAUSE -dSAFER -sDEVICE=pnm -sOutputFile=-
-#
-# epsgeom is a perl script for 1) extracting geometry information
-# from a .eps file and 2) arrange it for ghostscript's pnm driver.
-#
-EPSGEOM?= ${PERL} ${DOC_PREFIX}/share/misc/epsgeom
-EPSGEOMOPTS?= ${EPS2PNM_RES} ${EPS2PNM_RES}
-PNMTOPNG?= ${PREFIX}/bin/pnmtopng
-PNMTOPNGOPTS?= ${PNGTOPNGFLAGS}
-PNGTOPNM?= ${PREFIX}/bin/pngtopnm
-PNGTOPNMOPTS?= ${PNGTOPNMFLAGS}
-PPMTOPGM?= ${PREFIX}/bin/ppmtopgm
-PPMTOPGMOPTS?= ${PPMTOPGMFLAGS}
-PNMTOPS?= ${PREFIX}/bin/pnmtops
-PNMTOPSOPTS?= -noturn ${PNMTOPSFLAGS}
-EPSTOPDF?= ${PREFIX}/bin/epstopdf
-EPSTOPDFOPTS?= ${EPSTOPDFFLAGS}
-#
-PIC2PS?= ${GROFF} -p -S -Wall -mtty-char -man
-#
-PS2EPS?= ${PREFIX}/bin/gs
-PS2EPSOPTS?= -q -dNOPAUSE -dSAFER -dDELAYSAFER \
- -sPAPERSIZE=letter -r72 -sDEVICE=bit \
- -sOutputFile=/dev/null ${PS2EPSFLAGS} ps2epsi.ps
-PS2BBOX?= ${PREFIX}/bin/gs
-PS2BBOXOPTS?= -q -dNOPAUSE -dBATCH -dSAFER -dDELAYSAFER \
- -sPAPERSIZE=letter -r72 -sDEVICE=bbox \
- -sOutputFile=/dev/null ${PS2BBOXFLAGS}
#
# Use suffix rules to convert .scr files to other formats
.SUFFIXES: .scr .pic .png .ps .eps .txt
diff --git a/share/mk/doc.project.mk b/share/mk/doc.project.mk
index fac6b42cff..244195bcbc 100644
--- a/share/mk/doc.project.mk
+++ b/share/mk/doc.project.mk
@@ -66,58 +66,13 @@ MAINTAINER?= doc@FreeBSD.org
# formats
ALL_FORMATS= html html.tar html-split html-split.tar txt rtf ps pdf tex dvi tar pdb
+.include "doc.commands.mk"
+
# User-modifiable
LOCALBASE?= /usr/local
PREFIX?= ${LOCALBASE}
PRI_LANG?= en_US.ISO8859-1
-CP?= /bin/cp
-CAT?= /bin/cat
-ECHO_CMD?= echo
-LN?= /bin/ln
-MKDIR?= /bin/mkdir
-RM?= /bin/rm
-MV?= /bin/mv
-HTML2TXT?= ${PREFIX}/bin/links
-HTML2TXTOPTS?= -dump -width 72 ${HTML2TXTFLAGS}
-ISPELL?= ispell
-ISPELLOPTS?= -l -p /usr/share/dict/freebsd ${ISPELLFLAGS}
-.if exists(/usr/bin/perl)
-PERL?= /usr/bin/perl
-.elif exists(/usr/local/bin/perl)
-PERL?= /usr/local/bin/perl
-.else
-PERL?= perl
-.endif
-REALPATH?= /bin/realpath
-SETENV?= /usr/bin/env
-XSLTPROC?= ${PREFIX}/bin/xsltproc
-TIDY?= ${PREFIX}/bin/tidy
-XMLLINT?= ${PREFIX}/bin/xmllint
-#
-# In teTeX 3.0 and later, pdfetex(1) is used as the default TeX
-# engine for JadeTeX and tex(1) cannot be used as ${TEX_CMD} anymore
-# due to incompatibility of the format file. Since the teTeX 3.0
-# distribution has "${PREFIX}/share/texmf-dist/LICENSE.texmf,"
-# it is checked here to determine which TeX engine should be used.
-.if exists(${PREFIX}/share/texmf-dist/LICENSE.texmf)
-TEX_CMD?= ${PREFIX}/bin/etex
-PDFTEX_CMD?= ${PREFIX}/bin/pdfetex
-.else
-TEX_CMD?= ${PREFIX}/bin/tex
-PDFTEX_CMD?= ${PREFIX}/bin/pdftex
-.endif
-LATEX_CMD?= ${PREFIX}/bin/latex
-JADETEX_CMD?= ${TEX_CMD} "&jadetex"
-JADETEX_PREPROCESS?= /bin/cat
-PDFJADETEX_CMD?=${PDFTEX_CMD} "&pdfjadetex"
-PDFJADETEX_PREPROCESS?= /bin/cat
-PS2PDF?= ${PREFIX}/bin/ps2pdf
-FOP_CMD?= ${PREFIX}/share/fop/fop.sh
-XEP_CMD?= sh ${HOME}/XEP/xep.sh
-JAVA_CMD?= ${PREFIX}/bin/javavm
-SAXON_CMD?= ${JAVA_CMD} -jar ${PREFIX}/share/java/classes/saxon.jar
-
# Image processing (contains code used by the doc.<format>.mk files, so must
# be listed first).
.include "doc.images.mk"
@@ -145,9 +100,6 @@ DOC_LOCAL_MK= ${DOC_PREFIX}/${LANGCODE}/share/mk/doc.local.mk
.if ${DOCFORMAT} == "slides"
.include "doc.slides.mk"
.endif
-.if ${DOCFORMAT} == "html"
-.include "doc.html.mk"
-.endif
.endif
# Subdirectory glue.
diff --git a/share/mk/doc.xml.mk b/share/mk/doc.xml.mk
index a749ae9b93..14b2c8dd8c 100644
--- a/share/mk/doc.xml.mk
+++ b/share/mk/doc.xml.mk
@@ -273,26 +273,17 @@ XML_NOTICES= ${DOC_PREFIX}/share/xml/notices.xml
# The ${TARGET.<id>} file will not be listed in $DATA if defined.
# NO_DATA.DEFAULT is the setting for all <id>s.
#
-XSLTPROC_ENV+= SGML_CATALOG_FILES=
XSLTPROC_ENV+= XML_CATALOG_FILES="${XML_CATALOG_FILES}"
XSLTPROCOPTS= ${XSLTPROCFLAGS}
-XSLTPROCOPTS+= --xinclude
-XSLTPROCOPTS+= --stringparam LOCALBASE ${LOCALBASE}
-XSLTPROCOPTS+= --stringparam DOC_PREFIX ${DOC_PREFIX}
-.if defined(XML_CATALOG_FILES) && !empty(XML_CATALOG_FILES)
-XSLTPROCOPTS+= --nonet --catalogs
-.endif
+XSLTPROCOPTS+= --xinclude --nonet
.if defined(WWWFREEBSDORG)
XSLTPROCOPTS+= --param "html.header.script.google" "'INCLUDE'"
.endif
XSLTPROC= env ${XSLTPROC_ENV} ${LOCALBASE}/bin/xsltproc
XMLLINTOPTS= ${XMLLINTFLAGS}
-XMLLINTOPTS+= --xinclude --valid --noout
-.if defined(XML_CATALOG_FILES) && !empty(XML_CATALOG_FILES)
-XMLLINTOPTS+= --nonet --catalogs
-.endif
+XMLLINTOPTS+= --xinclude --valid --noout --nonet
XMLLINT= env ${XSLTPROC_ENV} ${PREFIX}/bin/xmllint
.for D in ${XMLDOCS}
diff --git a/share/mk/web.site.mk b/share/mk/web.site.mk
index bb4cde735d..2f6e5eff9f 100644
--- a/share/mk/web.site.mk
+++ b/share/mk/web.site.mk
@@ -11,6 +11,8 @@
# clean -- remove anything generated by processing
#
+.include "doc.commands.mk"
+
.if exists(${.CURDIR}/../Makefile.inc)
.include "${.CURDIR}/../Makefile.inc"
.endif
@@ -38,52 +40,12 @@ CGIGRP?= www
.endif
CGIMODE?= 775
-BUNZIP2?= /usr/bin/bunzip2
-CP?= /bin/cp
-CVS?= /usr/bin/cvs
-ECHO_CMD?= echo
-FETCH?= /usr/bin/fetch
-FIND?= /usr/bin/find
-SETENV?= /usr/bin/env
-LN?= /bin/ln
-MKDIR?= /bin/mkdir
-MV?= /bin/mv
-PERL?= /usr/bin/perl5
-.if !exists(${PERL}) && exists(/usr/local/bin/perl5)
-PERL= /usr/local/bin/perl5
-.endif
-RM?= /bin/rm
-SED?= /usr/bin/sed
-SH?= /bin/sh
-SORT?= /usr/bin/sort
-TOUCH?= /usr/bin/touch
-TRUE?= /usr/bin/true
-
LOCALBASE?= /usr/local
PREFIX?= ${LOCALBASE}
-.if exists(${PREFIX}/bin/sgmlnorm) && !defined(OPENJADE)
-SGMLNORM?= ${PREFIX}/bin/sgmlnorm
-.else
-SGMLNORM?= ${PREFIX}/bin/osgmlnorm
-.endif
-SGMLNORMOPTS?= -d ${SGMLNORMFLAGS} ${CATALOG:S,^,-c ,} -D ${.CURDIR}
-
-XSLTPROC?= ${PREFIX}/bin/xsltproc
XSLTPROCOPTS?= ${XSLTPROCFLAGS}
-
-XMLLINT?= ${PREFIX}/bin/xmllint
XMLLINTOPTS?= ${XMLLINTFLAGS}
-HTML2TXT?= ${PREFIX}/bin/w3m
-HTML2TXTOPTS?= -dump ${HTML2TXTFLAGS}
-ISPELL?= ispell
-ISPELLOPTS?= -l -p /usr/share/dict/freebsd ${ISPELLFLAGS}
-
-.if defined(WWWFREEBSDORG)
-SGMLNORMOPTS+= -i html.header.script.google
-.endif
-
WEBCHECK?= ${PREFIX}/bin/webcheck
WEBCHECKOPTS?= -ab ${WEBCHECKFLAGS}
WEBCHECKDIR?= /webcheck
@@ -134,32 +96,6 @@ NO_SUBDIR= YES
.include "${DOC_PREFIX}/share/mk/doc.common.mk"
.include "${DOC_PREFIX}/share/mk/doc.xml.mk"
-_INCLIST= navibar.ent \
- navibar.l10n.ent \
- common.ent \
- header.ent \
- header.l10n.ent \
- iso8879.ent \
- l10n.ent \
- release.ent
-_SGML_INCLUDES= ${SGML_INCLUDES}
-
-.for F in ${_INCLIST}
-.if exists(${DOC_PREFIX}/${LANGCODE}/share/xml/${F})
-_SGML_INCLUDES+=${DOC_PREFIX}/${LANGCODE}/share/xml/${F}
-.endif
-.if exists(${DOC_PREFIX}/share/xml/${F})
-_SGML_INCLUDES+=${DOC_PREFIX}/share/xml/${F}
-.endif
-.endfor
-
-CATALOG?= ${PREFIX}/share/xml/html/catalog \
- ${PREFIX}/share/xml/catalog
-.if exists(${DOC_PREFIX}/${LANGCODE}/share/xml/catalog)
-CATALOG+= ${DOC_PREFIX}/${LANGCODE}/share/xml/catalog
-.endif
-CATALOG+= ${DOC_PREFIX}/share/xml/catalog
-
##################################################################
# Transformation rules
diff --git a/share/pgpkeys/decke.key b/share/pgpkeys/decke.key
index 298ce6adb8..d47cdde113 100644
--- a/share/pgpkeys/decke.key
+++ b/share/pgpkeys/decke.key
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
<!-- $FreeBSD$ -->
<!--
sh addkey.sh decke CF5840D4;
diff --git a/share/pgpkeys/pgj.key b/share/pgpkeys/pgj.key
index 02f88b19b7..bdda6e7006 100644
--- a/share/pgpkeys/pgj.key
+++ b/share/pgpkeys/pgj.key
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
<!-- $FreeBSD$ -->
<!--
sh ./addkey.sh pgj 9E3F9BE6;
diff --git a/share/pgpkeys/rene.key b/share/pgpkeys/rene.key
index e5fb80f20b..3ef8f5f691 100644
--- a/share/pgpkeys/rene.key
+++ b/share/pgpkeys/rene.key
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
<!-- $FreeBSD$ -->
<!--
sh ./addkey.sh rene 0A3789B7;
diff --git a/share/pgpkeys/scop.key b/share/pgpkeys/scop.key
index d50d58850a..11d170aa5f 100644
--- a/share/pgpkeys/scop.key
+++ b/share/pgpkeys/scop.key
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
<!-- $FreeBSD$ -->
<!--
sh addkey.sh scop BCD241CB;
diff --git a/share/pgpkeys/thomas.key b/share/pgpkeys/thomas.key
index 80b9aa9ebb..ca80563a51 100644
--- a/share/pgpkeys/thomas.key
+++ b/share/pgpkeys/thomas.key
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
<!-- $FreeBSD$ -->
<!--
sh addkey.sh thomas 393D2469;
diff --git a/share/xml/bibliography.xml b/share/xml/bibliography.xml
index d8d9e6c45f..140202702a 100644
--- a/share/xml/bibliography.xml
+++ b/share/xml/bibliography.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
$FreeBSD$
-->
diff --git a/share/xml/catalog b/share/xml/catalog
index a88f2bd23e..e5f8f771c1 100644
--- a/share/xml/catalog
+++ b/share/xml/catalog
@@ -11,8 +11,8 @@
documentation, even though the listed language is "EN"
--
-PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "freebsd42.dtd"
+PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "freebsd45.dtd"
PUBLIC "-//FreeBSD//DOCUMENT DocBook Stylesheet//EN"
"freebsd.dsl"
@@ -38,9 +38,6 @@ PUBLIC "-//FreeBSD//DOCUMENT DocBook Common Stylesheet//EN"
PUBLIC "-//FreeBSD//DOCUMENT DocBook Common Lanugage Neutral Stylesheet//EN"
"freebsd-common.dsl"
-PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN"
- "entities.ent"
-
PUBLIC "-//FreeBSD//ENTITIES DocBook Author Entities//EN"
"authors.ent"
diff --git a/share/xml/catalog.xml b/share/xml/catalog.xml
index 7dd342c033..7b14607ae2 100644
--- a/share/xml/catalog.xml
+++ b/share/xml/catalog.xml
@@ -15,8 +15,8 @@
rewritePrefix="../../"/>
<public
- publicId="-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- uri="freebsd42.dtd"/>
+ publicId="-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ uri="freebsd45.dtd"/>
<!--
<public
@@ -37,7 +37,7 @@
uri="common.ent" />
<public
publicId="-//FreeBSD//ENTITIES FreeBSD L10N Common Entities//EN"
- uri="l10n.ent" />
+ uri="l10n-common.ent" />
<public
publicId="-//FreeBSD//ENTITIES FreeBSD L10N Entities//EN"
uri="l10n.ent" />
@@ -66,6 +66,9 @@
publicId="-//FreeBSD//DTD FreeBSD XML Database for Multimedia//EN"
uri="multimedia.dtd"/>
<public
+ publicId="-//FreeBSD//DTD FreeBSD XML Database for Mirrors//EN"
+ uri="mirrors.dtd" />
+ <public
publicId="-//FreeBSD//DTD FreeBSD XML Database for Events//EN"
uri="events.dtd" />
<public
@@ -77,4 +80,32 @@
<public
publicId="-//FreeBSD//DTD XHTML 1.0 Transitional-Based Extension//EN"
uri="xhtml10-freebsd.dtd" />
+ <public
+ publicId="-//FreeBSD//ENTITIES DocBook Manual Page Entities//EN"
+ uri="man-refs.ent" />
+ <public
+ publicId="-//FreeBSD//ENTITIES DocBook Miscellaneous FreeBSD Entities//EN"
+ uri="freebsd.ent" />
+ <public
+ publicId="-//FreeBSD//ENTITIES DocBook Trademark Entities//EN"
+ uri="trademarks.ent" />
+ <public
+ publicId="-//FreeBSD//ENTITIES DocBook URL Entities//EN"
+ uri="urls.ent" />
+ <public
+ publicId="-//FreeBSD//ENTITIES DocBook Author Entities//EN"
+ uri="authors.ent"/>
+ <public
+ publicId="-//FreeBSD//ENTITIES DocBook Team Entities//EN"
+ uri="../../en_US.ISO8859-1/share/xml/teams.ent"/>
+
+ <public
+ publicId="-//FreeBSD//ENTITIES DocBook Newsgroup Entities//EN"
+ uri="../../en_US.ISO8859-1/share/xml/newsgroups.ent"/>
+ <public
+ publicId="-//FreeBSD//ENTITIES DocBook Glossary Entities//EN"
+ uri="../../en_US.ISO8859-1/share/xml/glossary.ent"/>
+ <public
+ publicId="-//FreeBSD//ENTITIES DocBook Mailing List Entities//EN"
+ uri="../../en_US.ISO8859-1/share/xml/mailing-lists.ent"/>
</catalog>
diff --git a/share/xml/entities.ent b/share/xml/entities.ent
deleted file mode 100644
index e02fd438f9..0000000000
--- a/share/xml/entities.ent
+++ /dev/null
@@ -1,22 +0,0 @@
-<!-- $FreeBSD$ -->
-
-<!ENTITY % l10n PUBLIC "-//FreeBSD//ENTITIES DocBook Language Specific Entities//EN">
-%l10n;
-<!ENTITY % l10n-common PUBLIC "-//FreeBSD//ENTITIES DocBook Language Neutral Entities//EN">
-%l10n-common;
-<!ENTITY % man PUBLIC "-//FreeBSD//ENTITIES DocBook Manual Page Entities//EN">
-%man;
-<!ENTITY % freebsd PUBLIC "-//FreeBSD//ENTITIES DocBook Miscellaneous FreeBSD Entities//EN">
-%freebsd;
-<!ENTITY % authors PUBLIC "-//FreeBSD//ENTITIES DocBook Author Entities//EN">
-%authors;
-<!ENTITY % teams PUBLIC "-//FreeBSD//ENTITIES DocBook Team Entities//EN">
-%teams;
-<!ENTITY % mailing-lists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//EN">
-%mailing-lists;
-<!ENTITY % newsgroups PUBLIC "-//FreeBSD//ENTITIES DocBook Newsgroup Entities//EN">
-%newsgroups;
-<!ENTITY % trademarks PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//EN">
-%trademarks;
-<!ENTITY % urls PUBLIC "-//FreeBSD//ENTITIES DocBook URL Entities//EN">
-%urls;
diff --git a/share/xml/freebsd42.dtd b/share/xml/freebsd45.dtd
index e86f9cc16b..8514207a21 100644
--- a/share/xml/freebsd42.dtd
+++ b/share/xml/freebsd45.dtd
@@ -3,14 +3,56 @@
<!ENTITY % output.print "IGNORE"> <!-- Print output is being generated -->
<!ENTITY % output.print.pdf "IGNORE"> <!-- PDF output -->
-<!ENTITY % local.tech.char.class "|hostid|username|groupname|devicename|maketarget|makevar|svnref">
+<!ENTITY % jade.compat "IGNORE">
+
+<!ENTITY % local.tech.char.class "|hostid|username|groupname|devicename|maketarget|makevar|svnref|xi:include">
<!ENTITY % filename.element "IGNORE">
-<!ENTITY % orig-docbook PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
- "/usr/local/share/xml/docbook/4.2/docbookx.dtd">
+<!ENTITY % ISOgrk4.module "IGNORE">
+
+<!ENTITY % xmlns.attrib
+ "xmlns CDATA #IMPLIED">
+
+<!ENTITY % xmlns.xi.attrib
+ "xmlns:xi CDATA #IMPLIED">
+
+<!ENTITY % local.common.attrib "%xmlns.attrib;
+ %xmlns.xi.attrib;">
+
+<!ELEMENT xi:include (xi:fallback?)>
+
+<!ATTLIST xi:include
+ xmlns:xi CDATA #FIXED "http://www.w3.org/2001/XInclude"
+ href CDATA #IMPLIED
+ parse (xml|text) "xml"
+ xpointer CDATA #IMPLIED
+ encoding CDATA #IMPLIED
+ accept CDATA #IMPLIED
+ accept-language CDATA #IMPLIED
+>
+
+<!ELEMENT xi:fallback ANY>
+<!ATTLIST xi:fallback
+ xmlns:xi CDATA #FIXED "http://www.w3.org/2001/XInclude"
+>
+
+<!ENTITY % orig-docbook PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+ "/usr/local/share/xml/docbook/4.5/docbookx.dtd">
%orig-docbook;
+<!ENTITY % authors PUBLIC "-//FreeBSD//ENTITIES DocBook Author Entities//EN"
+ "authors.ent">
+%authors;
+
+<!ENTITY % man PUBLIC "-//FreeBSD//ENTITIES DocBook Manual Page Entities//EN"
+ "man-refs.ent">
+%man;
+
+<!ENTITY % orig-entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN"
+ "entities.ent">
+%orig-entities;
+
<!ELEMENT hostid (%cptr.char.mix;)*>
<!ATTLIST hostid
role (hostname
diff --git a/share/xml/mirrors-local.xsl b/share/xml/mirrors-local.xsl
index bc2b37d047..f21a45de01 100644
--- a/share/xml/mirrors-local.xsl
+++ b/share/xml/mirrors-local.xsl
@@ -7,7 +7,6 @@
<xsl:import href="./mirrors-master.xsl" />
<xsl:output type="xml" encoding="iso-8859-1"
- omit-xml-declaration="yes"
indent="yes"/>
</xsl:stylesheet>
diff --git a/share/xml/mirrors-master.xsl b/share/xml/mirrors-master.xsl
index 4eed64c5a1..ec2c73b6a2 100644
--- a/share/xml/mirrors-master.xsl
+++ b/share/xml/mirrors-master.xsl
@@ -4,7 +4,6 @@
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
<xsl:output type="xml" encoding="iso-8859-1"
- omit-xml-declaration="yes"
indent="yes"/>
<!-- these params should be externally bound. The values
@@ -13,8 +12,6 @@
<xsl:param name="proto" select="''" />
<xsl:param name="target" select="''" />
- <xsl:param name="mirrors-docbook-country-anchor-id" select="translate($target, '/.', '--')" />
-
<xsl:variable name="date">
<xsl:value-of xmlns:cvs="http://www.FreeBSD.org/XML/CVS"
select="normalize-space(//cvs:keyword[@name='freebsd'])"/>
@@ -32,16 +29,22 @@
<xsl:template match="/">
<xsl:choose>
- <xsl:when test="$target = 'handbook/mirrors/chapter.xml'">
- <xsl:call-template name="mirrors-docbook-country-index-all" />
+ <xsl:when test="$target = 'lastmod'">
<para>(<xsl:call-template name="mirrors-lastmodified" />)</para>
+ </xsl:when>
+
+ <xsl:when test="$target = 'index'">
+ <xsl:call-template name="mirrors-docbook-country-index-all" />
+ </xsl:when>
+
+ <xsl:when test="$target = 'handbook/mirrors/chapter.xml'">
<xsl:call-template name="mirrors-docbook-variablelist" />
</xsl:when>
+
<xsl:when test="$target = 'handbook/eresources/chapter.xml'">
- <xsl:call-template name="mirrors-docbook-country-index-all" />
- <para>(<xsl:call-template name="mirrors-lastmodified" />)</para>
<xsl:call-template name="mirrors-docbook-itemizedlist" />
</xsl:when>
+
<xsl:otherwise>
<xsl:value-of select="'*** processing error ***'" />
</xsl:otherwise>
@@ -91,7 +94,7 @@
<xsl:param name="mirrors-docbook-country-index-without-period" />
<link>
<xsl:attribute name="linkend">
- <xsl:value-of select="concat($mirrors-docbook-country-anchor-id, '-', @id, '-', $type)" />
+ <xsl:value-of select="concat(@id, '-', $type)" />
</xsl:attribute>
<xsl:value-of select="country" />
</link>
@@ -126,7 +129,7 @@
<term>
<anchor>
<xsl:attribute name="id">
- <xsl:value-of select="concat($mirrors-docbook-country-anchor-id, '-', @id, '-', $type)" />
+ <xsl:value-of select="concat(@id, '-', $type)" />
</xsl:attribute>
</anchor>
<xsl:value-of select="country" />
@@ -211,7 +214,7 @@
<listitem>
<anchor>
<xsl:attribute name="id">
- <xsl:value-of select="concat($mirrors-docbook-country-anchor-id, '-', @id, '-', $type)" />
+ <xsl:value-of select="concat(@id, '-', $type)" />
</xsl:attribute>
</anchor>
diff --git a/share/xml/mirrors.dtd b/share/xml/mirrors.dtd
new file mode 100644
index 0000000000..e40058511b
--- /dev/null
+++ b/share/xml/mirrors.dtd
@@ -0,0 +1,26 @@
+<!-- $FreeBSD$ -->
+
+<!ENTITY % cvs PUBLIC "-//FreeBSD//DTD FreeBSD CVS Keywords//EN"
+"http://www.FreeBSD.org/XML/doc/share/xml/cvs.dtd">
+%cvs;
+
+<!ELEMENT mirrors (cvs:keyword, entry+)>
+
+<!ELEMENT entry (country, host+, email?)>
+<!ELEMENT country (#PCDATA)>
+<!ELEMENT host (name, url*)>
+<!ELEMENT name (#PCDATA)>
+<!ELEMENT url (#PCDATA)>
+<!ELEMENT email (#PCDATA)>
+
+<!ATTLIST entry id ID #REQUIRED>
+<!ATTLIST host type (cvsup|ftp|rsync|www) #REQUIRED>
+<!ATTLIST url proto (ftp|ftpv6|http|httpv6|rsync|rsyncv6) #REQUIRED>
+<!ATTLIST country
+ sortkey CDATA #REQUIRED
+ role CDATA #IMPLIED>
+
+<!ENTITY % iso8879.ent
+ PUBLIC "-//FreeBSD//ENTITIES ISO 8879:1986 Entity Set//EN//XML"
+ "http://www.FreeBSD.org/XML/www/share/xml/iso8879.ent">
+%iso8879.ent;
diff --git a/share/xml/mirrors.xml b/share/xml/mirrors.xml
index 738f91a9a6..123aa03f85 100644
--- a/share/xml/mirrors.xml
+++ b/share/xml/mirrors.xml
@@ -1,4 +1,6 @@
<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE mirrors PUBLIC "-//FreeBSD//DTD FreeBSD XML Database for Mirrors//EN"
+ "http://www.FreeBSD.org/XML/www/share/xml/mirrors.dtd">
<mirrors>
<cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">
$FreeBSD$
diff --git a/share/xml/urls.ent b/share/xml/urls.ent
index 0e309e2890..c92568bde9 100644
--- a/share/xml/urls.ent
+++ b/share/xml/urls.ent
@@ -1,41 +1,10 @@
<!-- $FreeBSD$ -->
<!ENTITY % freebsd.urls.absolute "IGNORE">
-<!ENTITY % freebsd.urls.relprefix.1 "IGNORE">
-<!ENTITY % freebsd.urls.relprefix.2 "IGNORE">
-<!ENTITY % freebsd.urls.relprefix.3 "IGNORE">
-<!ENTITY % freebsd.urls.relprefix.4 "IGNORE">
-<!ENTITY % freebsd.urls.relprefix.5 "IGNORE">
-<!ENTITY % freebsd.urls.relprefix.6 "IGNORE">
-<!ENTITY % freebsd.urls.relprefix.7 "IGNORE">
-<!ENTITY % freebsd.urls.relprefix.8 "IGNORE">
<!-- Do not edit: start here -->
-<![%freebsd.urls.relprefix.1;[
- <!ENTITY url.relprefix "..">
-]]>
-<![%freebsd.urls.relprefix.2;[
- <!ENTITY url.relprefix "../..">
-]]>
-<![%freebsd.urls.relprefix.3;[
- <!ENTITY url.relprefix "../../..">
-]]>
-<![%freebsd.urls.relprefix.4;[
- <!ENTITY url.relprefix "../../../..">
-]]>
-<![%freebsd.urls.relprefix.5;[
- <!ENTITY url.relprefix "../../../../..">
-]]>
-<![%freebsd.urls.relprefix.6;[
- <!ENTITY url.relprefix "../../../../../..">
-]]>
-<![%freebsd.urls.relprefix.7;[
- <!ENTITY url.relprefix "../../../../../../..">
-]]>
-<![%freebsd.urls.relprefix.8;[
- <!ENTITY url.relprefix "../../../../../../../..">
-]]>
+<!ENTITY url.relprefix "../../../..">
<![ %freebsd.urls.absolute; [
<!ENTITY url.base "http://www.FreeBSD.org">
diff --git a/share/xsl/freebsd-common.xsl b/share/xsl/freebsd-common.xsl
index d4f067e2ec..541e3e2881 100644
--- a/share/xsl/freebsd-common.xsl
+++ b/share/xsl/freebsd-common.xsl
@@ -3,9 +3,7 @@
<!-- $FreeBSD$ -->
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
- version='1.0'
- xmlns="http://www.w3.org/TR/xhtml1/transitional"
- exclude-result-prefixes="#default">
+ version='1.0'>
<!-- Global customisation -->
@@ -14,8 +12,11 @@
<xsl:call-template name="inline.monoseq"/>
</xsl:template>
+ <xsl:template match="pubdate"/>
+
<xsl:param name="toc.section.depth" select="1"/>
<xsl:param name="section.autolabel" select="1"/>
<xsl:param name="section.label.includes.component.label" select="1"/>
+ <xsl:param name="generate.index" select="0"/>
</xsl:stylesheet>
diff --git a/share/xsl/freebsd-html-chunk.xsl b/share/xsl/freebsd-epub.xsl
index b274add9d5..1a48cb7164 100644
--- a/share/xsl/freebsd-html-chunk.xsl
+++ b/share/xsl/freebsd-epub.xsl
@@ -8,10 +8,11 @@
exclude-result-prefixes="#default">
<!-- Pull in the base stylesheets -->
- <xsl:import href="/usr/local/share/xsl/docbook/html/chunk.xsl"/>
+ <xsl:import href="/usr/local/share/xsl/docbook/epub/docbook.xsl"/>
- <!-- Redefine variables, and replace templates as necessary here -->
+ <!-- Pull in common XHTML customizations -->
+ <xsl:include href="freebsd-xhtml-common.xsl"/>
- <xsl:include href="freebsd-common.xsl"/>
+ <xsl:param name="generate.legalnotice.link" select="'1'"/>
</xsl:stylesheet>
diff --git a/share/xsl/freebsd-fo.xsl b/share/xsl/freebsd-fo.xsl
index 4b3ced1abb..be0987069b 100644
--- a/share/xsl/freebsd-fo.xsl
+++ b/share/xsl/freebsd-fo.xsl
@@ -3,13 +3,17 @@
<!-- $FreeBSD$ -->
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+ xmlns:fo="http://www.w3.org/1999/XSL/Format"
+ xmlns="http://www.w3.org/TR/xhtml1/transitional"
version='1.0'
- xmlns="http://www.w3.org/TR/xhtml1/transitional"
exclude-result-prefixes="#default">
<!-- Pull in the base stylesheets -->
<xsl:import href="/usr/local/share/xsl/docbook/fo/docbook.xsl"/>
+ <!-- Include the common customizations -->
+ <xsl:include href="freebsd-common.xsl"/>
+
<!-- Redefine variables, and replace templates as necessary here -->
<xsl:param name="freebsd.output.print"
@@ -21,11 +25,62 @@
<xsl:param name="freebsd.output.print.twoside"
select="'0'"/>
- <!-- Include the common stylesheets -->
+ <!-- FO specific customisation goes here -->
+
+ <xsl:param name="use.extensions" select="1"/>
+ <xsl:param name="fop1.extensions" select="1"/>
- <xsl:include href="freebsd-common.xsl"/>
+<!--
+ <xsl:param name="hyphenate.verbatim" select="1"/>
+-->
+ <xsl:param name="header.column.widths">1 5 1</xsl:param>
- <!-- FO specific customisation goes here -->
+
+<xsl:template match="pubdate" mode="article.titlepage.recto.auto.mode"/>
+
+<xsl:attribute-set name="abstract.title.properties">
+ <xsl:attribute name="font-size">
+ <xsl:value-of select="$body.font.master * 2.0736"></xsl:value-of>
+ <xsl:text>pt</xsl:text>
+ </xsl:attribute>
+ <xsl:attribute name="text-align">left</xsl:attribute>
+</xsl:attribute-set>
+
+<xsl:attribute-set name="abstract.properties">
+ <xsl:attribute name="margin-left">0</xsl:attribute>
+ <xsl:attribute name="margin-right">0</xsl:attribute>
+ <xsl:attribute name="padding-left">0</xsl:attribute>
+ <xsl:attribute name="padding-right">0</xsl:attribute>
+</xsl:attribute-set>
+
+<xsl:attribute-set name="toc.margin.properties">
+ <xsl:attribute name="margin-left">
+ <xsl:value-of select="'0'"/>
+ </xsl:attribute>
+ <xsl:attribute name="margin-right">
+ <xsl:value-of select="'0'"/>
+ </xsl:attribute>
+ <xsl:attribute name="padding-left">
+ <xsl:value-of select="'0'"/>
+ </xsl:attribute>
+ <xsl:attribute name="padding-right">
+ <xsl:value-of select="'0'"/>
+ </xsl:attribute>
+</xsl:attribute-set>
+
+<!--
+<xsl:template match="legalnotice" mode="article.titlepage.recto.auto.mode">
+ <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="article.titlepage.recto.style" text-align="start" font-family="{$body.fontset}">
+ <xsl:apply-templates select="." mode="article.titlepage.recto.mode"/>
+ </fo:block>
+</xsl:template>
+-->
+
+<xsl:template match="abstract" mode="article.titlepage.recto.auto.mode">
+<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="article.titlepage.recto.style" space-before="0.5em" text-align="start" margin-left="0.5in" margin-right="0.5in" font-family="{$body.fontset}">
+<xsl:apply-templates select="." mode="article.titlepage.recto.mode"/>
+</fo:block>
+</xsl:template>
</xsl:stylesheet>
diff --git a/share/xsl/freebsd-xhtml-chunk.xsl b/share/xsl/freebsd-xhtml-chunk.xsl
new file mode 100644
index 0000000000..b3485ffb11
--- /dev/null
+++ b/share/xsl/freebsd-xhtml-chunk.xsl
@@ -0,0 +1,19 @@
+<?xml version='1.0'?>
+
+<!-- $FreeBSD$ -->
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+ version='1.0'
+ xmlns="http://www.w3.org/TR/xhtml1/transitional"
+ exclude-result-prefixes="#default">
+
+ <!-- Pull in the base stylesheets -->
+ <xsl:import href="/usr/local/share/xsl/docbook/xhtml/chunk.xsl"/>
+
+ <!-- Pull in common XHTML customizations -->
+ <xsl:include href="freebsd-xhtml-common.xsl"/>
+
+ <xsl:param name="generate.manifest" select="'1'"/>
+ <xsl:param name="generate.legalnotice.link" select="'1'"/>
+</xsl:stylesheet>
+
diff --git a/share/xsl/freebsd-html.xsl b/share/xsl/freebsd-xhtml-common.xsl
index f493e29fb4..7ddbdeb6d4 100644
--- a/share/xsl/freebsd-html.xsl
+++ b/share/xsl/freebsd-xhtml-common.xsl
@@ -7,8 +7,8 @@
xmlns="http://www.w3.org/TR/xhtml1/transitional"
exclude-result-prefixes="#default">
- <!-- Pull in the base stylesheets -->
- <xsl:import href="/usr/local/share/xsl/docbook/html/docbook.xsl"/>
+ <!-- Include the common customizations -->
+ <xsl:include href="freebsd-common.xsl"/>
<!-- Redefine variables, and replace templates as necessary here -->
<xsl:param name="freebsd.output.html" select="'0'"/>
@@ -18,7 +18,6 @@
<xsl:param name="html.stylesheet" select="'docbook.css'"/>
<xsl:param name="user.id.as.filename" select="'1'"/>
- <xsl:param name="generate.legalnotice.link" select="'1'"/>
<xsl:param name="link.mailto.url" select="'doc@FreeBSD.org'"/>
<xsl:param name="callout.graphics.path" select="'./imagelib/callouts/'"/>
@@ -31,5 +30,8 @@
contacting &lt;<a href="mailto:questions@FreeBSD.org">questions@FreeBSD.org</a>&gt;.<br/>
For questions about this documentation, e-mail &lt;<a href="mailto:doc@FreeBSD.org">doc@FreeBSD.org</a>&gt;.</small></p>
</xsl:template>
-</xsl:stylesheet>
+ <xsl:template match="hostid|username|groupname|devicename|maketarget|makevar">
+ <xsl:call-template name="inline.monoseq"/>
+ </xsl:template>
+</xsl:stylesheet>
diff --git a/share/xsl/default.xsl b/share/xsl/freebsd-xhtml.xsl
index 29122aadc4..9b5a37fe8e 100644
--- a/share/xsl/default.xsl
+++ b/share/xsl/freebsd-xhtml.xsl
@@ -8,9 +8,8 @@
exclude-result-prefixes="#default">
<!-- Pull in the base stylesheets -->
- <xsl:import href="freebsd.xsl"/>
-
- <!-- Redefine variables, and replace templates as necessary here -->
+ <xsl:import href="/usr/local/share/xsl/docbook/xhtml/docbook.xsl"/>
+ <!-- Pull in common XHTML customizations -->
+ <xsl:include href="freebsd-xhtml-common.xsl"/>
</xsl:stylesheet>
-
diff --git a/share/xsl/freebsd.xsl b/share/xsl/freebsd.xsl
deleted file mode 100644
index 0d0e09fa1c..0000000000
--- a/share/xsl/freebsd.xsl
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version='1.0'?>
-
-<!-- $FreeBSD$ -->
-
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
- version='1.0'
- xmlns="http://www.w3.org/TR/xhtml1/transitional"
- exclude-result-prefixes="#default">
-
- <!-- Pull in the base stylesheets -->
- <!-- XXX hardcoded path. Very bad. Should be turned in to a paramater -->
- <xsl:import href="/usr/local/share/xml/docbook/xsl/modular/html/docbook.xsl"/>
-
- <!-- Redefine variables, and replace templates as necessary here -->
- <xsl:template match="hostid|username|groupname|devicename|maketarget|makevar">
- <xsl:call-template name="inline.monoseq"/>
- </xsl:template>
-
-</xsl:stylesheet>
diff --git a/sr_YU.ISO8859-2/share/xml/catalog b/sr_YU.ISO8859-2/share/xml/catalog
deleted file mode 100644
index 161058647e..0000000000
--- a/sr_YU.ISO8859-2/share/xml/catalog
+++ /dev/null
@@ -1,11 +0,0 @@
- -- ...................................................................... --
- -- FreeBSD SGML Public Identifiers ...................................... --
-
- -- $FreeBSD$
- --
-
-PUBLIC "-//FreeBSD//DOCUMENT DocBook Stylesheet//EN"
- "freebsd.dsl"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook Language Specific Entities//EN"
- "l10n.ent"
diff --git a/sr_YU.ISO8859-2/share/xml/entities.ent b/sr_YU.ISO8859-2/share/xml/entities.ent
index 1e953d7362..04c582d0f3 100644
--- a/sr_YU.ISO8859-2/share/xml/entities.ent
+++ b/sr_YU.ISO8859-2/share/xml/entities.ent
@@ -1,19 +1,21 @@
<?xml version="1.0" encoding="iso-8859-1"?>
<!-- $FreeBSD$ -->
-<!ENTITY % authors PUBLIC "-//FreeBSD//ENTITIES DocBook Author Entities//EN">
-%authors;
-<!ENTITY % man PUBLIC "-//FreeBSD//ENTITIES DocBook Manual Page Entities//EN">
-%man;
-<!ENTITY % freebsd PUBLIC "-//FreeBSD//ENTITIES DocBook Miscellaneous FreeBSD Entities//EN">
+<!ENTITY % freebsd PUBLIC "-//FreeBSD//ENTITIES DocBook Miscellaneous FreeBSD Entities//EN"
+ "nonexistent">
%freebsd;
-<!ENTITY % l10n PUBLIC "-//FreeBSD//ENTITIES DocBook Language Specific Entities//EN">
+<!ENTITY % l10n PUBLIC "-//FreeBSD//ENTITIES DocBook Language Specific Entities//EN"
+ "l10n.ent">
%l10n;
-<!ENTITY % mailing-lists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//EN">
+<!ENTITY % mailing-lists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//EN"
+ "nonexistent">
%mailing-lists;
-<!ENTITY % newsgroups PUBLIC "-//FreeBSD//ENTITIES DocBook Newsgroup Entities//EN">
+<!ENTITY % newsgroups PUBLIC "-//FreeBSD//ENTITIES DocBook Newsgroup Entities//EN"
+ "nonexistent">
%newsgroups;
-<!ENTITY % teams PUBLIC "-//FreeBSD//ENTITIES DocBook Team Entities//EN">
+<!ENTITY % teams PUBLIC "-//FreeBSD//ENTITIES DocBook Team Entities//EN"
+ "nonexistent">
%teams;
-<!ENTITY % trademarks PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//EN">
+<!ENTITY % trademarks PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//EN"
+ "nonexistent">
%trademarks;
diff --git a/tr_TR.ISO8859-9/articles/explaining-bsd/article.xml b/tr_TR.ISO8859-9/articles/explaining-bsd/article.xml
index abb4171564..1540da870f 100644
--- a/tr_TR.ISO8859-9/articles/explaining-bsd/article.xml
+++ b/tr_TR.ISO8859-9/articles/explaining-bsd/article.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-9" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//TR" "../../share/xml/entities.ent">
-%entities;
-]>
+<?xml version="1.0" encoding="iso-8859-9"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<!--
The FreeBSD Turkish Documentation Project
diff --git a/tr_TR.ISO8859-9/share/xml/catalog b/tr_TR.ISO8859-9/share/xml/catalog
deleted file mode 100644
index bae3bb06c0..0000000000
--- a/tr_TR.ISO8859-9/share/xml/catalog
+++ /dev/null
@@ -1,12 +0,0 @@
---
- $FreeBSD$
---
-
-PUBLIC "-//FreeBSD//ENTITIES FreeBSD L10N Entities//EN"
- "l10n.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES HTML FreeBSD Header L10N Entities//EN"
- "header.l10n.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES HTML FreeBSD Navigation Bar L10N Entities//EN"
- "navibar.l10n.ent"
diff --git a/tr_TR.ISO8859-9/share/xml/catalog.xml b/tr_TR.ISO8859-9/share/xml/catalog.xml
index 12c0f02504..a3feec86ca 100644
--- a/tr_TR.ISO8859-9/share/xml/catalog.xml
+++ b/tr_TR.ISO8859-9/share/xml/catalog.xml
@@ -9,4 +9,8 @@
rewritePrefix="../../"/>
<rewriteURI uriStartString="http://www.FreeBSD.org/XML/www/lang/"
rewritePrefix="../../"/>
+
+ <public
+ publicId="-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN"
+ uri="entities.ent" />
</catalog>
diff --git a/tr_TR.ISO8859-9/share/xml/entities.ent b/tr_TR.ISO8859-9/share/xml/entities.ent
index 1e953d7362..04c582d0f3 100644
--- a/tr_TR.ISO8859-9/share/xml/entities.ent
+++ b/tr_TR.ISO8859-9/share/xml/entities.ent
@@ -1,19 +1,21 @@
<?xml version="1.0" encoding="iso-8859-1"?>
<!-- $FreeBSD$ -->
-<!ENTITY % authors PUBLIC "-//FreeBSD//ENTITIES DocBook Author Entities//EN">
-%authors;
-<!ENTITY % man PUBLIC "-//FreeBSD//ENTITIES DocBook Manual Page Entities//EN">
-%man;
-<!ENTITY % freebsd PUBLIC "-//FreeBSD//ENTITIES DocBook Miscellaneous FreeBSD Entities//EN">
+<!ENTITY % freebsd PUBLIC "-//FreeBSD//ENTITIES DocBook Miscellaneous FreeBSD Entities//EN"
+ "nonexistent">
%freebsd;
-<!ENTITY % l10n PUBLIC "-//FreeBSD//ENTITIES DocBook Language Specific Entities//EN">
+<!ENTITY % l10n PUBLIC "-//FreeBSD//ENTITIES DocBook Language Specific Entities//EN"
+ "l10n.ent">
%l10n;
-<!ENTITY % mailing-lists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//EN">
+<!ENTITY % mailing-lists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//EN"
+ "nonexistent">
%mailing-lists;
-<!ENTITY % newsgroups PUBLIC "-//FreeBSD//ENTITIES DocBook Newsgroup Entities//EN">
+<!ENTITY % newsgroups PUBLIC "-//FreeBSD//ENTITIES DocBook Newsgroup Entities//EN"
+ "nonexistent">
%newsgroups;
-<!ENTITY % teams PUBLIC "-//FreeBSD//ENTITIES DocBook Team Entities//EN">
+<!ENTITY % teams PUBLIC "-//FreeBSD//ENTITIES DocBook Team Entities//EN"
+ "nonexistent">
%teams;
-<!ENTITY % trademarks PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//EN">
+<!ENTITY % trademarks PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//EN"
+ "nonexistent">
%trademarks;
diff --git a/zh_CN.GB2312/articles/contributing/article.xml b/zh_CN.GB2312/articles/contributing/article.xml
index 214091369e..4309e0c9bc 100644
--- a/zh_CN.GB2312/articles/contributing/article.xml
+++ b/zh_CN.GB2312/articles/contributing/article.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="gb2312" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//ZH" "../../share/xml/entities.ent">
-%entities;
-]>
+<?xml version="1.0" encoding="gb2312"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<!--
The FreeBSD Documentation Project
diff --git a/zh_CN.GB2312/articles/cvs-freebsd/article.xml b/zh_CN.GB2312/articles/cvs-freebsd/article.xml
index 92929ac908..406c9c9c26 100644
--- a/zh_CN.GB2312/articles/cvs-freebsd/article.xml
+++ b/zh_CN.GB2312/articles/cvs-freebsd/article.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="gb2312" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//ZH" "../../share/xml/entities.ent">
-%entities;
-]>
+<?xml version="1.0" encoding="gb2312"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<!--
The FreeBSD Documentation Project
diff --git a/zh_CN.GB2312/articles/linux-users/article.xml b/zh_CN.GB2312/articles/linux-users/article.xml
index 8bbaa904cb..4d0cf09a68 100644
--- a/zh_CN.GB2312/articles/linux-users/article.xml
+++ b/zh_CN.GB2312/articles/linux-users/article.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="gb2312" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//ZH" "../../share/xml/entities.ent">
-%entities;
-]>
+<?xml version="1.0" encoding="gb2312"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<!--
The FreeBSD Documentation Project
@@ -149,7 +146,7 @@ in your /etc/rc.conf. Extra options can be found in startup script.</screen>
<title>Ports</title>
<para>&os; 腔菴媼笱假蚾茼蚚最唗腔源楊憩岆妏蚚 Ports 杶璃賸﹝
- Ports 杶璃岆 &os 奻腔珨跺瞳蚚 <filename>Makefile</filename>
+ Ports 杶璃岆 &os; 奻腔珨跺瞳蚚 <filename>Makefile</filename>
睿珨虳硃間恅璃懂杻隅植埭鎢隅秶假蚾跪笱篲最唗腔遺殤﹝
絞假蚾珨跺 port 奀炵苀頗鳳○昐藜朝諴
茼蚚庥恂灩骳玥觸僎﹝炳隓郺朝諴
diff --git a/zh_CN.GB2312/articles/nanobsd/article.xml b/zh_CN.GB2312/articles/nanobsd/article.xml
index aea6323d71..6ad4ed1002 100644
--- a/zh_CN.GB2312/articles/nanobsd/article.xml
+++ b/zh_CN.GB2312/articles/nanobsd/article.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="gb2312" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//ZH" "../../share/xml/entities.ent">
-%entities;
-]>
+<?xml version="1.0" encoding="gb2312"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<!--
The FreeBSD Documentation Project
diff --git a/zh_CN.GB2312/articles/rc-scripting/article.xml b/zh_CN.GB2312/articles/rc-scripting/article.xml
index b5c73861b9..9a3e890f9d 100644
--- a/zh_CN.GB2312/articles/rc-scripting/article.xml
+++ b/zh_CN.GB2312/articles/rc-scripting/article.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="gb2312" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//ZH" "../../share/xml/entities.ent">
-%entities;
-]>
+<?xml version="1.0" encoding="gb2312"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<!--
The FreeBSD Documentation Project
@@ -911,8 +908,8 @@ start_precmd="${name}_prestart"
mumbled_prestart()
{
- if ! checkyesno frotz_enable && \
- ! /etc/rc.d/frotz forcestatus 1>/dev/null 2>&1; then
+ if ! checkyesno frotz_enable &amp;&amp; \
+ ! /etc/rc.d/frotz forcestatus 1>/dev/null 2>&amp;1; then
force_depend frotz || return 1<co id="rcng-hookup-force"/>
fi
return 0
diff --git a/zh_CN.GB2312/articles/remote-install/article.xml b/zh_CN.GB2312/articles/remote-install/article.xml
index 7045b94dfa..0df5aecb0e 100644
--- a/zh_CN.GB2312/articles/remote-install/article.xml
+++ b/zh_CN.GB2312/articles/remote-install/article.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="gb2312" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//ZH" "../../share/xml/entities.ent">
-%entities;
-]>
+<?xml version="1.0" encoding="gb2312"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<!--
The FreeBSD Documentation Project
diff --git a/zh_CN.GB2312/books/arch-handbook/book.xml b/zh_CN.GB2312/books/arch-handbook/book.xml
index ad0d0fac92..5300306982 100644
--- a/zh_CN.GB2312/books/arch-handbook/book.xml
+++ b/zh_CN.GB2312/books/arch-handbook/book.xml
@@ -1,8 +1,6 @@
-<?xml version="1.0" encoding="gb2312" standalone="no"?>
-<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//ZH" "../../share/xml/entities.ent">
-%entities;
+<?xml version="1.0" encoding="gb2312"?>
+<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd" [
<!ENTITY % chapters SYSTEM "chapters.ent">
%chapters;
<!ENTITY % mac-entities SYSTEM "mac.ent">
diff --git a/zh_CN.GB2312/books/arch-handbook/boot/chapter.xml b/zh_CN.GB2312/books/arch-handbook/boot/chapter.xml
index 99d683bef0..162da2b684 100644
--- a/zh_CN.GB2312/books/arch-handbook/boot/chapter.xml
+++ b/zh_CN.GB2312/books/arch-handbook/boot/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="gb2312" standalone="no"?>
+<?xml version="1.0" encoding="gb2312"?>
<!--
The FreeBSD Documentation Project
The FreeBSD Simplified Chinese Project
diff --git a/zh_CN.GB2312/books/arch-handbook/chapters.ent b/zh_CN.GB2312/books/arch-handbook/chapters.ent
index 03de4f95ce..2a1dc3bdeb 100644
--- a/zh_CN.GB2312/books/arch-handbook/chapters.ent
+++ b/zh_CN.GB2312/books/arch-handbook/chapters.ent
@@ -34,7 +34,7 @@
<!ENTITY chap.pccard SYSTEM "pccard/chapter.xml">
<!-- Part three - Appendices -->
-<![%chap.index[
+<![%chap.index;[
<!ENTITY chap.index SYSTEM "index.xml">
]]>
<!ENTITY chap.index "">
diff --git a/zh_CN.GB2312/books/arch-handbook/driverbasics/chapter.xml b/zh_CN.GB2312/books/arch-handbook/driverbasics/chapter.xml
index c7e1491049..5b5e8a7817 100644
--- a/zh_CN.GB2312/books/arch-handbook/driverbasics/chapter.xml
+++ b/zh_CN.GB2312/books/arch-handbook/driverbasics/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="gb2312" standalone="no"?>
+<?xml version="1.0" encoding="gb2312"?>
<!--
The FreeBSD Documentation Project
The FreeBSD Simplified Chinese Project
diff --git a/zh_CN.GB2312/books/arch-handbook/isa/chapter.xml b/zh_CN.GB2312/books/arch-handbook/isa/chapter.xml
index 70c31231cc..b24b960685 100644
--- a/zh_CN.GB2312/books/arch-handbook/isa/chapter.xml
+++ b/zh_CN.GB2312/books/arch-handbook/isa/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="gb2312" standalone="no"?>
+<?xml version="1.0" encoding="gb2312"?>
<!--
The FreeBSD Documentation Project
diff --git a/zh_CN.GB2312/books/arch-handbook/jail/chapter.xml b/zh_CN.GB2312/books/arch-handbook/jail/chapter.xml
index a6a5fc85f4..c06f9badd2 100644
--- a/zh_CN.GB2312/books/arch-handbook/jail/chapter.xml
+++ b/zh_CN.GB2312/books/arch-handbook/jail/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="gb2312" standalone="no"?>
+<?xml version="1.0" encoding="gb2312"?>
<!--
The FreeBSD Documentation Project
The FreeBSD Simplified Chinese Project
diff --git a/zh_CN.GB2312/books/arch-handbook/kobj/chapter.xml b/zh_CN.GB2312/books/arch-handbook/kobj/chapter.xml
index 5416e829d1..50484936bf 100644
--- a/zh_CN.GB2312/books/arch-handbook/kobj/chapter.xml
+++ b/zh_CN.GB2312/books/arch-handbook/kobj/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="gb2312" standalone="no"?>
+<?xml version="1.0" encoding="gb2312"?>
<!--
The FreeBSD Documentation Project
The FreeBSD Simplified Chinese Project
diff --git a/zh_CN.GB2312/books/arch-handbook/locking/chapter.xml b/zh_CN.GB2312/books/arch-handbook/locking/chapter.xml
index 4103839c43..4bd187862e 100644
--- a/zh_CN.GB2312/books/arch-handbook/locking/chapter.xml
+++ b/zh_CN.GB2312/books/arch-handbook/locking/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="gb2312" standalone="no"?>
+<?xml version="1.0" encoding="gb2312"?>
<!--
The FreeBSD Documentation Project
The FreeBSD SMP Next Generation Project
diff --git a/zh_CN.GB2312/books/arch-handbook/mac/chapter.xml b/zh_CN.GB2312/books/arch-handbook/mac/chapter.xml
index 9202891559..e9ec8cf8e2 100644
--- a/zh_CN.GB2312/books/arch-handbook/mac/chapter.xml
+++ b/zh_CN.GB2312/books/arch-handbook/mac/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="gb2312" standalone="no"?>
+<?xml version="1.0" encoding="gb2312"?>
<!--
Copyright (c) 2002-2005 Networks Associates Technology, Inc.
All rights reserved.
@@ -2770,8 +2770,8 @@
</tgroup>
</informaltable>
- <para>跦擂 &man.listen.2 杶諉趼 <parameter>oldsocket</parameter>ㄛ
- 峈陔膘 &man.accept.2 腔杶諉趼 <parameter>newsocket</parameter>ㄛ扢离梓暮﹝</para>
+ <para>跦擂 &man.listen.2; 杶諉趼 <parameter>oldsocket</parameter>ㄛ
+ 峈陔膘 &man.accept.2; 腔杶諉趼 <parameter>newsocket</parameter>ㄛ扢离梓暮﹝</para>
</sect4>
<sect4 id="mac-mpo-relabel-pipe">
diff --git a/zh_CN.GB2312/books/arch-handbook/newbus/chapter.xml b/zh_CN.GB2312/books/arch-handbook/newbus/chapter.xml
index 7a0e466ead..f25293bf72 100644
--- a/zh_CN.GB2312/books/arch-handbook/newbus/chapter.xml
+++ b/zh_CN.GB2312/books/arch-handbook/newbus/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="gb2312" standalone="no"?>
+<?xml version="1.0" encoding="gb2312"?>
<!--
The FreeBSD Documentation Project
The FreeBSD Simplified Chinese Project
diff --git a/zh_CN.GB2312/books/arch-handbook/pccard/chapter.xml b/zh_CN.GB2312/books/arch-handbook/pccard/chapter.xml
index 5df8822a87..c27a32e244 100644
--- a/zh_CN.GB2312/books/arch-handbook/pccard/chapter.xml
+++ b/zh_CN.GB2312/books/arch-handbook/pccard/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="gb2312" standalone="no"?>
+<?xml version="1.0" encoding="gb2312"?>
<!--
The FreeBSD Documentation Project
The FreeBSD Simplified Chinese Project
diff --git a/zh_CN.GB2312/books/arch-handbook/pci/chapter.xml b/zh_CN.GB2312/books/arch-handbook/pci/chapter.xml
index 750529c06e..c3aa94e1c3 100644
--- a/zh_CN.GB2312/books/arch-handbook/pci/chapter.xml
+++ b/zh_CN.GB2312/books/arch-handbook/pci/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="gb2312" standalone="no"?>
+<?xml version="1.0" encoding="gb2312"?>
<!--
The FreeBSD Documentation Project
The FreeBSD Simplified Chinese Project
diff --git a/zh_CN.GB2312/books/arch-handbook/scsi/chapter.xml b/zh_CN.GB2312/books/arch-handbook/scsi/chapter.xml
index f5d43263b2..be793ee339 100644
--- a/zh_CN.GB2312/books/arch-handbook/scsi/chapter.xml
+++ b/zh_CN.GB2312/books/arch-handbook/scsi/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="gb2312" standalone="no"?>
+<?xml version="1.0" encoding="gb2312"?>
<!--
The FreeBSD Documentation Project
The FreeBSD Simplified Chinese Project
diff --git a/zh_CN.GB2312/books/arch-handbook/smp/chapter.xml b/zh_CN.GB2312/books/arch-handbook/smp/chapter.xml
index 373e8b166f..c2369c60a9 100644
--- a/zh_CN.GB2312/books/arch-handbook/smp/chapter.xml
+++ b/zh_CN.GB2312/books/arch-handbook/smp/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="gb2312" standalone="no"?>
+<?xml version="1.0" encoding="gb2312"?>
<!--
The FreeBSD Documentation Project
The FreeBSD SMP Next Generation Project
diff --git a/zh_CN.GB2312/books/arch-handbook/sound/chapter.xml b/zh_CN.GB2312/books/arch-handbook/sound/chapter.xml
index 2390a70454..c2c97f1803 100644
--- a/zh_CN.GB2312/books/arch-handbook/sound/chapter.xml
+++ b/zh_CN.GB2312/books/arch-handbook/sound/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="gb2312" standalone="no"?>
+<?xml version="1.0" encoding="gb2312"?>
<!--
The FreeBSD Documentation Project
The FreeBSD Simplified Chinese Project
diff --git a/zh_CN.GB2312/books/arch-handbook/sysinit/chapter.xml b/zh_CN.GB2312/books/arch-handbook/sysinit/chapter.xml
index e38fe038ed..f62316c6e4 100644
--- a/zh_CN.GB2312/books/arch-handbook/sysinit/chapter.xml
+++ b/zh_CN.GB2312/books/arch-handbook/sysinit/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="gb2312" standalone="no"?>
+<?xml version="1.0" encoding="gb2312"?>
<!--
The FreeBSD Documentation Project
The FreeBSD Simplified Chinese Project
diff --git a/zh_CN.GB2312/books/arch-handbook/usb/chapter.xml b/zh_CN.GB2312/books/arch-handbook/usb/chapter.xml
index 93653e6404..eaa9e5a813 100644
--- a/zh_CN.GB2312/books/arch-handbook/usb/chapter.xml
+++ b/zh_CN.GB2312/books/arch-handbook/usb/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="gb2312" standalone="no"?>
+<?xml version="1.0" encoding="gb2312"?>
<!--
The FreeBSD Documentation Project
The FreeBSD Simplified Chinese Project
diff --git a/zh_CN.GB2312/books/arch-handbook/vm/chapter.xml b/zh_CN.GB2312/books/arch-handbook/vm/chapter.xml
index 7a0d44d10f..89ce63e11b 100644
--- a/zh_CN.GB2312/books/arch-handbook/vm/chapter.xml
+++ b/zh_CN.GB2312/books/arch-handbook/vm/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="gb2312" standalone="no"?>
+<?xml version="1.0" encoding="gb2312"?>
<!--
The FreeBSD Documentation Project
The FreeBSD Simplified Chinese Project
diff --git a/zh_CN.GB2312/books/handbook/Makefile b/zh_CN.GB2312/books/handbook/Makefile
index 631ed2bfca..5ab9d25bab 100644
--- a/zh_CN.GB2312/books/handbook/Makefile
+++ b/zh_CN.GB2312/books/handbook/Makefile
@@ -317,30 +317,43 @@ DOC_PREFIX?= ${.CURDIR}/../../..
#
# rules generating lists of mirror site from XML database.
#
-XMLDOCS= mirrors-ftp:::mirrors.xml.ftp.inc \
+XMLDOCS= lastmod:::mirrors.lastmod.inc \
+ mirrors-ftp-index:::mirrors.xml.ftp.index.inc \
+ mirrors-ftp:::mirrors.xml.ftp.inc \
+ mirrors-cvsup-index:::mirrors.xml.cvsup.index.inc \
mirrors-cvsup:::mirrors.xml.cvsup.inc \
+ eresources-index:::eresources.xml.www.index.inc \
eresources:::eresources.xml.www.inc
DEPENDSET.DEFAULT= transtable mirror
XSLT.DEFAULT= ${XSL_MIRRORS}
XML.DEFAULT= ${XML_MIRRORS}
-NO_TIDY.DEFAULT= yes
+PARAMS.lastmod+= --param 'target' "'lastmod'"
+PARAMS.mirrors-ftp-index+= --param 'type' "'ftp'" \
+ --param 'proto' "'ftp'" \
+ --param 'target' "'index'"
PARAMS.mirrors-ftp+= --param 'type' "'ftp'" \
--param 'proto' "'ftp'" \
--param 'target' "'handbook/mirrors/chapter.xml'"
+PARAMS.mirrors-cvsup-index+= --param 'type' "'cvsup'" \
+ --param 'proto' "'cvsup'" \
+ --param 'target' "'index'"
PARAMS.mirrors-cvsup+= --param 'type' "'cvsup'" \
--param 'proto' "'cvsup'" \
--param 'target' "'handbook/mirrors/chapter.xml'"
+PARAMS.eresources-index+= --param 'type' "'www'" \
+ --param 'proto' "'http'" \
+ --param 'target' "'index'"
PARAMS.eresources+= --param 'type' "'www'" \
--param 'proto' "'http'" \
--param 'target' "'handbook/eresources/chapter.xml'"
-SRCS+= mirrors.xml.ftp.inc \
+SRCS+= mirrors.lastmod.inc \
+ mirrors.xml.ftp.inc \
+ mirrors.xml.ftp.index.inc \
mirrors.xml.cvsup.inc \
- eresources.xml.www.inc
-
-CLEANFILES+= mirrors.xml.ftp.inc \
- mirrors.xml.cvsup.inc \
- eresources.xml.www.inc
+ mirrors.xml.cvsup.index.inc \
+ eresources.xml.www.inc \
+ eresources.xml.www.index.inc
.include "${DOC_PREFIX}/share/mk/doc.project.mk"
diff --git a/zh_CN.GB2312/books/handbook/advanced-networking/chapter.xml b/zh_CN.GB2312/books/handbook/advanced-networking/chapter.xml
index c228ec0036..c4b8385eb2 100644
--- a/zh_CN.GB2312/books/handbook/advanced-networking/chapter.xml
+++ b/zh_CN.GB2312/books/handbook/advanced-networking/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="gb2312" standalone="no"?>
+<?xml version="1.0" encoding="gb2312"?>
<!--
The FreeBSD Documentation Project
The FreeBSD Chinese Documentation Project
@@ -640,7 +640,7 @@ route_net2="-net 192.168.1.0/24 192.168.1.1"</programlisting>
<acronym>DVMRP</acronym> 嗣畦繚蚕衪祜ㄛ
婓勍嗣粒蚚嗣畦腔部磁ㄛ
坳眒掩 &man.pim.4; ●﹝ &man.mrouted.8; 眕摯眈壽腔
- &man.map-mbone.8; 睿 &man.mrinfo.8 馱撿褫眕婓 &os; 腔 Ports&nbsp;Collection
+ &man.map-mbone.8; 睿 &man.mrinfo.8; 馱撿褫眕婓 &os; 腔 Ports&nbsp;Collection
<filename role="package">net/mrouted</filename> 笢梑善﹝</para>
</note>
</sect2>
@@ -1874,7 +1874,7 @@ wpa_pairwise=CCMP TKIP <co id="co-ap-wpapsk-pwise"/></programlisting>
<para>諉狟懂腔珨祭憩岆堍俴
<application>hostapd</application>ㄩ</para>
- <screen>&prompt.root <userinput>/etc/rc.d/hostapd forcestart</userinput></screen>
+ <screen>&prompt.root; <userinput>/etc/rc.d/hostapd forcestart</userinput></screen>
<screen>&prompt.root; <userinput>ifconfig <replaceable>wlan0</replaceable></userinput>
wlan0: flags=8843&lt;UP,BROADCAST,RUNNING,SIMPLEX,MULTICAST&gt; mtu 2290
@@ -5670,7 +5670,7 @@ ifconfig_carp1="vhid 2 advskew 100 pass testpass 192.168.1.51/24"</programlistin
隙善埻懂囀揧昢ん﹝ 撿极酕楊岆婓
<hostid>provider.example.org</hostid> 奻妏蚚狟醱腔韜鍔ㄩ</para>
- <screen>&prompt.root; <userinput>ifconfig carp0 down && ifconfig carp0 up</userinput></screen>
+ <screen>&prompt.root; <userinput>ifconfig carp0 down &amp;&amp; ifconfig carp0 up</userinput></screen>
<para>涴跺紱釬剒猁婓迵堤珋恀枙腔翋儂勤茼腔饒跺 <devicename>carp</devicename>
諉諳奻輛俴﹝</para>
diff --git a/zh_CN.GB2312/books/handbook/audit/chapter.xml b/zh_CN.GB2312/books/handbook/audit/chapter.xml
index ee06a423a2..750d0fd77b 100644
--- a/zh_CN.GB2312/books/handbook/audit/chapter.xml
+++ b/zh_CN.GB2312/books/handbook/audit/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="gb2312" standalone="no"?>
+<?xml version="1.0" encoding="gb2312"?>
<!--
The FreeBSD Documentation Project
The FreeBSD Simplified Chinese Project
@@ -463,7 +463,7 @@ www:fc,+ex:no</programlisting>
<para>机數暮梛岆眕 BSM 媼輛秶跡宒悵湔腔ㄛ 秪森斛剕妏蚚馱撿懂勤む輛俴党蜊ㄛ
麼蔚む蛌遙峈恅掛﹝ &man.praudit.1;
韜鍔夔劂蔚暮梛恅璃蛌遙峈潠等腔恅掛跡宒˙ 奧
- &man.auditreduce.1 韜鍔寀褫眕峈煦昴﹜ 湔紫麼湖荂醴腔懂襯坫机數欶憊躁﹝
+ &man.auditreduce.1; 韜鍔寀褫眕峈煦昴﹜ 湔紫麼湖荂醴腔懂襯坫机數欶憊躁﹝
<command>auditreduce</command> 盓厥珨炵蹈伓恁統杅ㄛ 婦嬤岈璃濬倰﹜ 岈璃濬﹜
蚚誧﹜ 岈璃腔梪睆虮掉銫 眕摯恅璃繚噤麼紱釬勤砓﹝</para>
diff --git a/zh_CN.GB2312/books/handbook/basics/chapter.xml b/zh_CN.GB2312/books/handbook/basics/chapter.xml
index ec6461b153..cdc139f443 100644
--- a/zh_CN.GB2312/books/handbook/basics/chapter.xml
+++ b/zh_CN.GB2312/books/handbook/basics/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="gb2312" standalone="no"?>
+<?xml version="1.0" encoding="gb2312"?>
<!--
The FreeBSD Documentation Project
The FreeBSD Simplified Chinese Project
diff --git a/zh_CN.GB2312/books/handbook/bibliography/chapter.xml b/zh_CN.GB2312/books/handbook/bibliography/chapter.xml
index 641b6cd24a..03140328a5 100644
--- a/zh_CN.GB2312/books/handbook/bibliography/chapter.xml
+++ b/zh_CN.GB2312/books/handbook/bibliography/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="gb2312" standalone="no"?>
+<?xml version="1.0" encoding="gb2312"?>
<!--
The FreeBSD Chinese Documentation Project
@@ -58,7 +58,7 @@
</listitem>
<listitem>
- <para>FreeBSD & Windows 摩傖郪厙妗昢 ㄗ潠极笢恅ㄘㄛ
+ <para>FreeBSD &amp; Windows 摩傖郪厙妗昢 ㄗ潠极笢恅ㄘㄛ
<ulink url="http://www.tdpress.com/">笢弊沺耋堤唳扦</ulink>﹝
ISBN 7-113-03845-X﹝</para>
</listitem>
diff --git a/zh_CN.GB2312/books/handbook/book.xml b/zh_CN.GB2312/books/handbook/book.xml
index fefd875a69..0840e315f9 100644
--- a/zh_CN.GB2312/books/handbook/book.xml
+++ b/zh_CN.GB2312/books/handbook/book.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="gb2312" standalone="no"?>
-<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//ZH" "../../share/xml/entities.ent">
-%entities;
-
+<?xml version="1.0" encoding="gb2312"?>
+<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd" [
<!ENTITY % chapters SYSTEM "chapters.ent">
%chapters;
<!ENTITY % txtfiles SYSTEM "txtfiles.ent">
diff --git a/zh_CN.GB2312/books/handbook/boot/chapter.xml b/zh_CN.GB2312/books/handbook/boot/chapter.xml
index 27c2838788..67e51f1240 100644
--- a/zh_CN.GB2312/books/handbook/boot/chapter.xml
+++ b/zh_CN.GB2312/books/handbook/boot/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="gb2312" standalone="no"?>
+<?xml version="1.0" encoding="gb2312"?>
<!--
The FreeBSD Documentation Project
The FreeBSD Chinese (Simplified) Project
diff --git a/zh_CN.GB2312/books/handbook/bsdinstall/chapter.xml b/zh_CN.GB2312/books/handbook/bsdinstall/chapter.xml
index b407640a85..89a5e0ed97 100644
--- a/zh_CN.GB2312/books/handbook/bsdinstall/chapter.xml
+++ b/zh_CN.GB2312/books/handbook/bsdinstall/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="gb2312" standalone="no"?>
+<?xml version="1.0" encoding="gb2312"?>
<!--
The FreeBSD Documentation Project
The FreeBSD Simplified Chinese Project
diff --git a/zh_CN.GB2312/books/handbook/chapters.ent b/zh_CN.GB2312/books/handbook/chapters.ent
index 0743b39db8..f2ec296043 100644
--- a/zh_CN.GB2312/books/handbook/chapters.ent
+++ b/zh_CN.GB2312/books/handbook/chapters.ent
@@ -11,235 +11,62 @@
$FreeBSD$
-->
-<!ENTITY % not.published "INCLUDE">
-
-<!ENTITY % chap.introduction "IGNORE">
-<!ENTITY % chap.install "IGNORE">
-<!ENTITY % chap.bsdinstall "IGNORE">
-<!ENTITY % chap.basics "IGNORE">
-<!ENTITY % chap.ports "IGNORE">
-<!ENTITY % chap.config "IGNORE">
-<!ENTITY % chap.boot "IGNORE">
-<!ENTITY % chap.users "IGNORE">
-<!ENTITY % chap.kernelconfig "IGNORE">
-<!ENTITY % chap.security "IGNORE">
-<!ENTITY % chap.jails "IGNORE">
-<!ENTITY % chap.printing "IGNORE">
-<!ENTITY % chap.disks "IGNORE">
-<!ENTITY % chap.geom "IGNORE">
-<!ENTITY % chap.vinum "IGNORE">
-<!ENTITY % chap.x11 "IGNORE">
-<!ENTITY % chap.l10n "IGNORE">
-<!ENTITY % chap.multimedia "IGNORE">
-<!ENTITY % chap.desktop "IGNORE">
-<!ENTITY % chap.serialcomms "IGNORE">
-<!ENTITY % chap.ppp-and-slip "IGNORE">
-<!ENTITY % chap.advanced-networking "IGNORE">
-<!ENTITY % chap.firewalls "IGNORE">
-<!ENTITY % chap.network-servers "IGNORE">
-<!ENTITY % chap.mail "IGNORE">
-<!ENTITY % chap.cutting-edge "IGNORE">
-<!ENTITY % chap.linuxemu "IGNORE">
-<!ENTITY % chap.mirrors "IGNORE">
-<!ENTITY % chap.mirrors.ftp.inc "INCLUDE">
-<!ENTITY % chap.mirrors.cvsup.inc "INCLUDE">
-<!ENTITY % chap.bibliography "IGNORE">
-<!ENTITY % chap.eresources "IGNORE">
-<!ENTITY % chap.eresources.www.inc "INCLUDE">
-<!ENTITY % chap.pgpkeys "IGNORE">
-<!ENTITY % chap.index "IGNORE">
-<!ENTITY % chap.freebsd-glossary "IGNORE">
-<!ENTITY % chap.mac "IGNORE">
-<!ENTITY % chap.audit "IGNORE">
-<!ENTITY % chap.filesystems "IGNORE">
-<!ENTITY % chap.dtrace "IGNORE">
-
<!ENTITY chap.preface SYSTEM "preface/preface.xml">
<!ENTITY % pgpkeys SYSTEM "../../../share/pgpkeys/pgpkeys.ent"> %pgpkeys;
<!-- Part One -->
-<![%chap.introduction;[
<!ENTITY chap.introduction SYSTEM "introduction/chapter.xml">
-]]>
-<![%chap.install;[
<!ENTITY chap.install SYSTEM "install/chapter.xml">
-]]>
-<![%chap.install;[
<!ENTITY chap.bsdinstall SYSTEM "bsdinstall/chapter.xml">
-]]>
-<![%chap.basics;[
<!ENTITY chap.basics SYSTEM "basics/chapter.xml">
-]]>
-<![%chap.ports;[
<!ENTITY chap.ports SYSTEM "ports/chapter.xml">
-]]>
-<![%chap.x11;[
<!ENTITY chap.x11 SYSTEM "x11/chapter.xml">
-]]>
<!-- Part Two -->
-<![%chap.desktop;[
<!ENTITY chap.desktop SYSTEM "desktop/chapter.xml">
-]]>
-<![%chap.multimedia;[
<!ENTITY chap.multimedia SYSTEM "multimedia/chapter.xml">
-]]>
-<![%chap.kernelconfig;[
<!ENTITY chap.kernelconfig SYSTEM "kernelconfig/chapter.xml">
-]]>
-<![%chap.printing;[
<!ENTITY chap.printing SYSTEM "printing/chapter.xml">
-]]>
-<![%chap.linuxemu;[
<!ENTITY chap.linuxemu SYSTEM "linuxemu/chapter.xml">
-]]>
<!-- Part Three -->
-<![%chap.config;[
<!ENTITY chap.config SYSTEM "config/chapter.xml">
-]]>
-<![%chap.boot;[
<!ENTITY chap.boot SYSTEM "boot/chapter.xml">
-]]>
-<![%chap.users;[
<!ENTITY chap.users SYSTEM "users/chapter.xml">
-]]>
-<![%chap.security;[
<!ENTITY chap.security SYSTEM "security/chapter.xml">
-]]>
-<![%chap.jails;[
<!ENTITY chap.jails SYSTEM "jails/chapter.xml">
-]]>
-<![%chap.mac;[
<!ENTITY chap.mac SYSTEM "mac/chapter.xml">
-]]>
-<![%chap.audit;[
<!ENTITY chap.audit SYSTEM "audit/chapter.xml">
-]]>
-<![%chap.disks;[
<!ENTITY chap.disks SYSTEM "disks/chapter.xml">
-]]>
-<![%chap.geom;[
<!ENTITY chap.geom SYSTEM "geom/chapter.xml">
-]]>
-<![%chap.filesystems;[
<!ENTITY chap.filesystems SYSTEM "filesystems/chapter.xml">
-]]>
-<![%chap.vinum;[
<!ENTITY chap.vinum SYSTEM "vinum/chapter.xml">
-]]>
-<![%chap.virtualization;[
<!ENTITY chap.virtualization SYSTEM "virtualization/chapter.xml">
-]]>
-<![%chap.l10n;[
<!ENTITY chap.l10n SYSTEM "l10n/chapter.xml">
-]]>
-<![%chap.cutting-edge;[
<!ENTITY chap.cutting-edge SYSTEM "cutting-edge/chapter.xml">
-]]>
-<![%chap.dtrace;[
<!ENTITY chap.dtrace SYSTEM "dtrace/chapter.xml">
-]]>
<!-- Part Four -->
-<![%chap.serialcomms;[
<!ENTITY chap.serialcomms SYSTEM "serialcomms/chapter.xml">
-]]>
-<![%chap.ppp-and-slip;[
<!ENTITY chap.ppp-and-slip SYSTEM "ppp-and-slip/chapter.xml">
-]]>
-<![%chap.mail;[
<!ENTITY chap.mail SYSTEM "mail/chapter.xml">
-]]>
-<![%chap.network-servers;[
<!ENTITY chap.network-servers SYSTEM "network-servers/chapter.xml">
-]]>
-<![%chap.firewalls;[
<!ENTITY chap.firewalls SYSTEM "firewalls/chapter.xml">
-]]>
-<![%chap.advanced-networking;[
<!ENTITY chap.advanced-networking SYSTEM "advanced-networking/chapter.xml">
-]]>
<!-- Part Five (appendices) -->
-<![%chap.mirrors;[
<!ENTITY chap.mirrors SYSTEM "mirrors/chapter.xml">
-]]>
-<![%chap.mirrors.ftp.inc;[
+ <!ENTITY chap.mirrors.lastmod.inc SYSTEM "mirrors.lastmod.inc">
+ <!ENTITY chap.mirrors.ftp.index.inc SYSTEM "mirrors.xml.ftp.index.inc">
<!ENTITY chap.mirrors.ftp.inc SYSTEM "mirrors.xml.ftp.inc">
-]]>
-<![%chap.mirrors.cvsup.inc;[
+ <!ENTITY chap.mirrors.cvsup.index.inc SYSTEM "mirrors.xml.cvsup.index.inc">
<!ENTITY chap.mirrors.cvsup.inc SYSTEM "mirrors.xml.cvsup.inc">
-]]>
-<![%chap.bibliography;[
<!ENTITY chap.bibliography SYSTEM "bibliography/chapter.xml">
-]]>
-<![%chap.eresources;[
<!ENTITY chap.eresources SYSTEM "eresources/chapter.xml">
-]]>
-<![%chap.eresources.www.inc;[
+ <!ENTITY chap.eresources.www.index.inc SYSTEM "eresources.xml.www.index.inc">
<!ENTITY chap.eresources.www.inc SYSTEM "eresources.xml.www.inc">
-]]>
-<![%chap.pgpkeys;[
<!ENTITY chap.pgpkeys SYSTEM "pgpkeys/chapter.xml">
-]]>
-<![%chap.freebsd-glossary;[
<!ENTITY chap.freebsd-glossary "&freebsd-glossary;">
-]]>
-<![%chap.index;[
- <!ENTITY chap.index SYSTEM "index.xml">
-]]>
+ <!ENTITY chap.index "">
<!ENTITY chap.colophon SYSTEM "colophon.xml">
-
-<!-- IGNORE cases -->
-
-<!-- Part One -->
-<!ENTITY chap.introduction "">
-<!ENTITY chap.install "">
-<!ENTITY chap.basics "">
-<!ENTITY chap.ports "">
-<!ENTITY chap.x11 "">
-
-<!-- Part Two -->
-<!ENTITY chap.desktop "">
-<!ENTITY chap.multimedia "">
-<!ENTITY chap.kernelconfig "">
-<!ENTITY chap.printing "">
-<!ENTITY chap.linuxemu "">
-
-<!-- Part Three -->
-<!ENTITY chap.config "">
-<!ENTITY chap.boot "">
-<!ENTITY chap.users "">
-<!ENTITY chap.security "">
-<!ENTITY chap.jails "">
-<!ENTITY chap.mac "">
-<!ENTITY chap.audit "">
-<!ENTITY chap.disks "">
-<!ENTITY chap.geom "">
-<!ENTITY chap.filesystems "">
-<!ENTITY chap.vinum "">
-<!ENTITY chap.virtualization "">
-<!ENTITY chap.l10n "">
-<!ENTITY chap.cutting-edge "">
-<!ENTITY chap.dtrace "">
-
-<!-- Part Four -->
-<!ENTITY chap.serialcomms "">
-<!ENTITY chap.ppp-and-slip "">
-<!ENTITY chap.mail "">
-<!ENTITY chap.network-servers "">
-<!ENTITY chap.firewalls "">
-<!ENTITY chap.advanced-networking "">
-
-<!-- Part Five (appendices) -->
-<!ENTITY chap.mirrors "">
-<!ENTITY chap.mirrors.ftp.inc "">
-<!ENTITY chap.mirrors.cvsup.inc "">
-<!ENTITY chap.bibliography "">
-<!ENTITY chap.eresources "">
-<!ENTITY chap.eresources.www.inc "">
-<!ENTITY chap.pgpkeys "">
-<!ENTITY chap.freebsd-glossary "">
-<!ENTITY chap.index "">
diff --git a/zh_CN.GB2312/books/handbook/colophon.xml b/zh_CN.GB2312/books/handbook/colophon.xml
index 6dbf3c543c..913048bb21 100644
--- a/zh_CN.GB2312/books/handbook/colophon.xml
+++ b/zh_CN.GB2312/books/handbook/colophon.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="gb2312" standalone="no"?>
+<?xml version="1.0" encoding="gb2312"?>
<!--
The FreeBSD Documentation Project
The FreeBSD Simplified Chinese Project
diff --git a/zh_CN.GB2312/books/handbook/config/chapter.xml b/zh_CN.GB2312/books/handbook/config/chapter.xml
index 0e9f07d5c2..dcb84dd2bd 100644
--- a/zh_CN.GB2312/books/handbook/config/chapter.xml
+++ b/zh_CN.GB2312/books/handbook/config/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="gb2312" standalone="no"?>
+<?xml version="1.0" encoding="gb2312"?>
<!--
The FreeBSD Documentation Project
The FreeBSD Chinese Documentation Project
@@ -674,7 +674,7 @@ sshd is running as pid 433.</screen>
&man.rc.8; 睿 &man.rc.subr.8; 薊儂忒聊笢梑善﹝
蝜蠟衄砩蚴迡赻撩腔 <filename>rc.d</filename> 褐掛ㄛ
麼勤珋衄腔褐掛輛俴珨虳蜊輛ㄛ 珩褫眕統蕉
- <ulink url="&url.articles.rc-scripting">涴う恅梒</ulink>﹝</para>
+ <ulink url="&url.articles.rc-scripting;">涴う恅梒</ulink>﹝</para>
</sect1>
<sect1 id="config-network-setup">
diff --git a/zh_CN.GB2312/books/handbook/cutting-edge/chapter.xml b/zh_CN.GB2312/books/handbook/cutting-edge/chapter.xml
index f055a6f82a..111054dd17 100644
--- a/zh_CN.GB2312/books/handbook/cutting-edge/chapter.xml
+++ b/zh_CN.GB2312/books/handbook/cutting-edge/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="gb2312" standalone="no"?>
+<?xml version="1.0" encoding="gb2312"?>
<!--
The FreeBSD Documentation Project
The FreeBSD Simplified Chinese Project
@@ -1064,72 +1064,6 @@ DOCSUPFILE?= /usr/share/examples/cvsup/doc-supfile</programlisting>
<screen>&prompt.root; <userinput>portupgrade -PP hu-freebsd-doc</userinput></screen>
</sect3>
</sect2>
-
-<!-- FIXME: Waiting for a working docsnap server... -->
-<![ IGNORE [
- <sect2 id="docsnap">
- <sect2info>
- <authorgroup>
- <author>
- <firstname>Pav</firstname>
- <surname>Lucistnik</surname>
- <contrib>埻釬ㄩ </contrib>
- </author>
- </authorgroup>
- </sect2info>
-
- <title>Using Docsnap</title>
-
- <indexterm><primary>Updating and Upgrading</primary></indexterm>
-
- <indexterm>
- <primary>Docsnap</primary>
- <see>Updating and Upgrading</see>
- </indexterm>
-
- <para><application>Docsnap</application> 岆珨跺籵徹 &man.rsync.1;
- 累踱載陔眒假蚾腔 &os; 恅紫潠等辦厒腔源楊﹝
- 珨怢 <quote><application>Docsnap</application> 督昢ん</quote>
- 躲趿恅紫埻測鎢ㄛ 甜藩跺苤奀晤祒赻雄傖 HTML 跡宒﹝ 妏蚚
- <application>Docsnap</application> 甜祥剒猁
- <filename role="package">textproc/docproj</filename>ㄛ
- 衄腔硐岆勤眒晤祒恅紫汜傖腔硃間﹝</para>
-
- <para>妏蚚涴砐撮扲峔珨剒猁腔憩岆
- <filename role="package">net/rsync</filename> port
- 麼氪勤茼腔媼輛秶婦﹝ 褫妏蚚覤繕鏽鍔假蚾ㄩ</para>
-
- <screen>&prompt.root; <userinput>pkg_add -r rsync</userinput></screen>
-
- <note>
- <para><application>Docsnap</application> 埻掛岆掩蚚懂載陔假蚾善
- <filename class="directory">/usr/share/doc</filename>
- 腔恅紫ㄛ 筍岆眕狟腔瞰赽肮欴巠蚚衾む坻腔醴翹﹝ 勤衾蚚誧腔醴翹ㄛ
- 涴欴憩祥剒猁 <username>root</username> 使瓾芊</para>
- </note>
-
- <para>載陔恅紫ㄛ 堍俴覤繕鏽鍔ㄩ</para>
-
- <screen>&prompt.root; <userinput>rsync -rltvz <replaceable>docsnap.sk.FreeBSD.org</replaceable>::docsnap <replaceable>/usr/share/doc</replaceable></userinput></screen>
-
- <note>
- <para>醴ヶ遜硐衄奻醱垀珆尨腔 <hostid>docsnap.sk.FreeBSD.org</hostid>
- 涴珨怢 <application>Docsnap</application> 督昢ん﹝</para>
- </note>
-
- <para>森揭祥猁妏蚚 <option>--delete</option> 梓祩ㄛ
- 秪峈遜衄虳 <command>make installworld</command> 奀假蚾善
- <filename class="directory">/usr/share/doc</filename>
- 狟腔恅璃褫夔頗掩砩俋腔痄壺﹝ ③妏蚚覤繕鏽鍔ь壺拸蚚腔恅璃ㄩ</para>
-
- <screen>&prompt.root; <userinput>rsync -rltvz --delete <replaceable>docsnap.sk.FreeBSD.org</replaceable>::docsnap/??_??\.\* <replaceable>/usr/share/doc</replaceable></userinput></screen>
-
- <para>蝜硐剒汔撰恅紫腔議珨赽摩ㄛ 掀蝤
- 褫眕妏蚚覤繕鏽鍔汔撰恅紫腔荎恅窒煦ㄩ</para>
-
- <screen>&prompt.root; <userinput>rsync -rltvz <replaceable>docsnap.sk.FreeBSD.org</replaceable>::docsnap/en_US.ISO8859-1 <replaceable>/usr/share/doc</replaceable></userinput></screen>
- </sect2>
-]]>
</sect1>
<sect1 id="current-stable">
@@ -1201,7 +1135,7 @@ DOCSUPFILE?= /usr/share/examples/cvsup/doc-supfile</programlisting>
</listitem>
<listitem>
- <para>党葩渣穢腔辦豎源宒﹝庥 &os.current
+ <para>党葩渣穢腔辦豎源宒﹝庥 &os.current;
腔暫隅唳掛婓党葩眒眭渣穢腔肮奀衱褫夔頗莉汜陔腔渣穢﹝</para>
</listitem>
diff --git a/zh_CN.GB2312/books/handbook/desktop/chapter.xml b/zh_CN.GB2312/books/handbook/desktop/chapter.xml
index ba0f4f8f52..b06e480b45 100644
--- a/zh_CN.GB2312/books/handbook/desktop/chapter.xml
+++ b/zh_CN.GB2312/books/handbook/desktop/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="gb2312" standalone="no"?>
+<?xml version="1.0" encoding="gb2312"?>
<!--
The FreeBSD Documentation Project
The FreeBSD Simplified Chinese Project
diff --git a/zh_CN.GB2312/books/handbook/disks/chapter.xml b/zh_CN.GB2312/books/handbook/disks/chapter.xml
index 4184075bc5..2038e9b711 100644
--- a/zh_CN.GB2312/books/handbook/disks/chapter.xml
+++ b/zh_CN.GB2312/books/handbook/disks/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="gb2312" standalone="no"?>
+<?xml version="1.0" encoding="gb2312"?>
<!--
The FreeBSD Documentation Project
The FreeBSD Simplified Chinese Project
@@ -293,7 +293,7 @@
<para>蝜蠟甜羶衄假蚾む坳腔紱釬炵苀ㄛ褫眕妏蚚 <literal>dedicated</literal>
耀宒﹝暮蛂涴笱耀宒褫夔頗讀觴 Microsoft 腔紱釬炵苀ㄛ筍祥頗勤坳輛俴ぢ輓﹝
- 坳祥妎梗梑善腔 IBM &os2 腔 <quote>appropriate</quote> 煦⑹﹝</para>
+ 坳祥妎梗梑善腔 IBM &os2; 腔 <quote>appropriate</quote> 煦⑹﹝</para>
<screen>&prompt.root; <userinput>dd if=/dev/zero of=/dev/da1 bs=1k count=1</userinput>
&prompt.root; <userinput>bsdlabel -Bw da1 auto</userinput>
@@ -2431,16 +2431,6 @@ sa0(ncr1:4:0): Logical unit is in process of becoming ready</screen>
庥拏麭圴擂隍囮腔腔婐麵飲褫夔婬棒楷汜﹝ 珋婓豪珨虳奀潔ㄛ
珩勍褫眕婓狟棒楷汜婐麵奀寰蠟珨參﹝</para>
</sect3>
-
-<![ %not.published; [
-
- <sect3>
- <title>* I Did Not Prepare for the Disaster, What Now?</title>
-
- <para></para>
- </sect3>
-]]>
-
</sect2>
</sect1>
@@ -3993,7 +3983,7 @@ case "$1" in
# Wait for any "hastd secondary" processes to stop
for disk in ${resources}; do
- while $( pgrep -lf "hastd: ${disk} \(secondary\)" > /dev/null 2>&1 ); do
+ while $( pgrep -lf "hastd: ${disk} \(secondary\)" > /dev/null 2>&amp;1 ); do
sleep 1
done
@@ -4008,7 +3998,7 @@ case "$1" in
# Wait for the /dev/hast/* devices to appear
for disk in ${resources}; do
for I in $( jot 60 ); do
- [ -c "/dev/hast/${disk}" ] && break
+ [ -c "/dev/hast/${disk}" ] &amp;&amp; break
sleep 0.5
done
@@ -4041,7 +4031,7 @@ case "$1" in
umount -f /hast/${disk}
fi
sleep $delay
- hastctl role secondary ${disk} 2>&1
+ hastctl role secondary ${disk} 2>&amp;1
if [ $? -ne 0 ]; then
logger -p $log -t $name "Unable to switch role to secondary for resource ${disk}."
exit 1
diff --git a/zh_CN.GB2312/books/handbook/dtrace/chapter.xml b/zh_CN.GB2312/books/handbook/dtrace/chapter.xml
index feb7b222ae..d240e98bf5 100644
--- a/zh_CN.GB2312/books/handbook/dtrace/chapter.xml
+++ b/zh_CN.GB2312/books/handbook/dtrace/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="gb2312" standalone="no"?>
+<?xml version="1.0" encoding="gb2312"?>
<!--
Recently I suggested to myself that this should become a profiling
and debugging chapter, which covers things like ktrace(1) and
diff --git a/zh_CN.GB2312/books/handbook/eresources/chapter.xml b/zh_CN.GB2312/books/handbook/eresources/chapter.xml
index e96e47e3c3..dad45a4574 100644
--- a/zh_CN.GB2312/books/handbook/eresources/chapter.xml
+++ b/zh_CN.GB2312/books/handbook/eresources/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="gb2312" standalone="no"?>
+<?xml version="1.0" encoding="gb2312"?>
<!--
The FreeBSD Documentation Project
The FreeBSD Simplified Chinese Project
@@ -1831,6 +1831,11 @@
<sect2 id="eresources-web-mirrors">
<title>Official Mirrors</title>
+
+ &chap.eresources.www.index.inc;
+
+ &chap.mirrors.lastmod.inc;
+
&chap.eresources.www.inc;
</sect2>
</sect1>
diff --git a/zh_CN.GB2312/books/handbook/filesystems/chapter.xml b/zh_CN.GB2312/books/handbook/filesystems/chapter.xml
index d9c4d8d7bc..d33b6c1c6f 100644
--- a/zh_CN.GB2312/books/handbook/filesystems/chapter.xml
+++ b/zh_CN.GB2312/books/handbook/filesystems/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="gb2312" standalone="no"?>
+<?xml version="1.0" encoding="gb2312"?>
<!--
The FreeBSD Documentation Project
Original Revision: r37255
@@ -200,7 +200,7 @@ example 17547136 0 17547136 0% /example</screen>
扂蠅夔砉溼恀ぱ籵腔恅璃炵苀饒欴溼恀坳ㄛ
憩砉眕狟瞰赽笢栳尨腔饒欴ㄛ蚚誧夔劂婓奻醱斐膘恅璃甜銡擬ㄩ</para>
- <screen>&prompt.root <userinput>cd /example</userinput>
+ <screen>&prompt.root; <userinput>cd /example</userinput>
&prompt.root; <userinput>ls</userinput>
&prompt.root; <userinput>touch testfile</userinput>
&prompt.root; <userinput>ls -al</userinput>
diff --git a/zh_CN.GB2312/books/handbook/firewalls/chapter.xml b/zh_CN.GB2312/books/handbook/firewalls/chapter.xml
index 6fa8b5e64e..2e0c3be2be 100644
--- a/zh_CN.GB2312/books/handbook/firewalls/chapter.xml
+++ b/zh_CN.GB2312/books/handbook/firewalls/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="gb2312" standalone="no"?>
+<?xml version="1.0" encoding="gb2312"?>
<!--
The FreeBSD Documentation Project
The FreeBSD Simplified Chinese Project
diff --git a/zh_CN.GB2312/books/handbook/geom/chapter.xml b/zh_CN.GB2312/books/handbook/geom/chapter.xml
index 0f97ecf17d..cbf6ca6033 100644
--- a/zh_CN.GB2312/books/handbook/geom/chapter.xml
+++ b/zh_CN.GB2312/books/handbook/geom/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="gb2312" standalone="no"?>
+<?xml version="1.0" encoding="gb2312"?>
<!--
The FreeBSD Documentation Project
The FreeBSD Simplified Chinese Project
diff --git a/zh_CN.GB2312/books/handbook/install/chapter.xml b/zh_CN.GB2312/books/handbook/install/chapter.xml
index 063d6e65d2..c4c71e7c34 100644
--- a/zh_CN.GB2312/books/handbook/install/chapter.xml
+++ b/zh_CN.GB2312/books/handbook/install/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="gb2312" standalone="no"?>
+<?xml version="1.0" encoding="gb2312"?>
<!--
The FreeBSD Documentation Project
The FreeBSD Simplified Chinese Project
diff --git a/zh_CN.GB2312/books/handbook/introduction/chapter.xml b/zh_CN.GB2312/books/handbook/introduction/chapter.xml
index 81d81c0351..6e9731cac5 100644
--- a/zh_CN.GB2312/books/handbook/introduction/chapter.xml
+++ b/zh_CN.GB2312/books/handbook/introduction/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="gb2312" standalone="no"?>
+<?xml version="1.0" encoding="gb2312"?>
<!--
The FreeBSD Documentation Project
The FreeBSD Simplified Chinese Project
diff --git a/zh_CN.GB2312/books/handbook/jails/chapter.xml b/zh_CN.GB2312/books/handbook/jails/chapter.xml
index 4294b556be..3ad9849513 100644
--- a/zh_CN.GB2312/books/handbook/jails/chapter.xml
+++ b/zh_CN.GB2312/books/handbook/jails/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="gb2312" standalone="no"?>
+<?xml version="1.0" encoding="gb2312"?>
<!--
The FreeBSD Documentation Project
The FreeBSD Simplified Chinese Project
diff --git a/zh_CN.GB2312/books/handbook/kernelconfig/chapter.xml b/zh_CN.GB2312/books/handbook/kernelconfig/chapter.xml
index 93a2be60e3..6d0832e9df 100644
--- a/zh_CN.GB2312/books/handbook/kernelconfig/chapter.xml
+++ b/zh_CN.GB2312/books/handbook/kernelconfig/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="gb2312" standalone="no"?>
+<?xml version="1.0" encoding="gb2312"?>
<!--
The FreeBSD Documentation Project
The FreeBSD Chinese Documentation Project
diff --git a/zh_CN.GB2312/books/handbook/l10n/chapter.xml b/zh_CN.GB2312/books/handbook/l10n/chapter.xml
index ef80573db9..2975100ce9 100644
--- a/zh_CN.GB2312/books/handbook/l10n/chapter.xml
+++ b/zh_CN.GB2312/books/handbook/l10n/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="gb2312" standalone="no"?>
+<?xml version="1.0" encoding="gb2312"?>
<!--
The FreeBSD Documentation Project
The FreeBSD Chinese Documentation Project
diff --git a/zh_CN.GB2312/books/handbook/linuxemu/chapter.xml b/zh_CN.GB2312/books/handbook/linuxemu/chapter.xml
index b6635ede8e..01e9ee260f 100644
--- a/zh_CN.GB2312/books/handbook/linuxemu/chapter.xml
+++ b/zh_CN.GB2312/books/handbook/linuxemu/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="gb2312" standalone="no"?>
+<?xml version="1.0" encoding="gb2312"?>
<!--
The FreeBSD Documentation Project
@@ -542,14 +542,14 @@ LOG=/var/log/lmgrd.log
case "$1" in
start)
- lmgrd -c ${LICENSE_FILE} 2&gt;&gt; ${LOG} 1&gt;&2
+ lmgrd -c ${LICENSE_FILE} 2&gt;&gt; ${LOG} 1&gt;&amp;2
echo -n " lmgrd"
;;
stop)
- lmgrd -c ${LICENSE_FILE} -x lmdown 2&gt;&gt; ${LOG} 1&gt;&2
+ lmgrd -c ${LICENSE_FILE} -x lmdown 2&gt;&gt; ${LOG} 1&gt;&amp;2
;;
*)
- echo "Usage: `basename $0` {start|stop}" 1&gt;&2
+ echo "Usage: `basename $0` {start|stop}" 1&gt;&amp;2
exit 64
;;
esac
@@ -797,7 +797,7 @@ exit 0</programlisting>
contain the following:</para>
<programlisting>#!/usr/compat/linux/bin/sh
-(sleep 5; killall -1 matlab_helper) &
+(sleep 5; killall -1 matlab_helper) &amp;
exit 0</programlisting>
</step>
diff --git a/zh_CN.GB2312/books/handbook/mac/chapter.xml b/zh_CN.GB2312/books/handbook/mac/chapter.xml
index e66c3e3408..e1ee68c5b7 100644
--- a/zh_CN.GB2312/books/handbook/mac/chapter.xml
+++ b/zh_CN.GB2312/books/handbook/mac/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="gb2312" standalone="no"?>
+<?xml version="1.0" encoding="gb2312"?>
<!--
The FreeBSD Documentation Project
The FreeBSD Simplified Chinese Project
@@ -505,7 +505,7 @@ test: biba/high</screen>
蛁砩善涴萸岆湮衄鵋祔腔﹝ 旮蹀森翔虮з骳羌蟠酕疑數赫ㄛ
秪峈奪燴れ懂褫夔坋煦嬪麵﹝</para>
- <para>婓 &os 眕綴腔唳掛笢ㄛ 蔚婦漪珨笱蔚蚚誧茬扞善梓ワ腔陔源宒ㄛ
+ <para>婓 &os; 眕綴腔唳掛笢ㄛ 蔚婦漪珨笱蔚蚚誧茬扞善梓ワ腔陔源宒ㄛ
鴃奪蝝芄 涴珩猁善 &os;&nbsp;5.3 眳綴腔議跺奀潔符夔妗珋﹝</para>
</sect3>
@@ -1610,7 +1610,7 @@ setpmac biba/10\(10-10\) /usr/local/etc/rc.d/nagios.sh forcestart</userinput></s
壺準蠟眒冪党蜊賸杻隅腔 <command>sysctl</command> 懂郯砦閉撰蚚誧腔溼恀﹝</para>
<note>
- <para>婓氝樓陔蚚誧奀ㄛ 坻蠅腔 &man.mac.bsdextended.4
+ <para>婓氝樓陔蚚誧奀ㄛ 坻蠅腔 &man.mac.bsdextended.4;
寞寀祥頗赻雄堤珋婓寞寀摩桶笢﹝ 猁捃厒載陔寞寀摩ㄛ
硐剒潠等華妏蚚 &man.kldunload.8; 睿 &man.kldload.8;
馱撿懂迠婥甜笭陔樓婥假垓葺堐ˋ憿</para>
diff --git a/zh_CN.GB2312/books/handbook/mail/chapter.xml b/zh_CN.GB2312/books/handbook/mail/chapter.xml
index ad6ab161de..4916e361fd 100644
--- a/zh_CN.GB2312/books/handbook/mail/chapter.xml
+++ b/zh_CN.GB2312/books/handbook/mail/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="gb2312" standalone="no"?>
+<?xml version="1.0" encoding="gb2312"?>
<!--
The FreeBSD Documentation Project
The FreeBSD Chinese Documentation Project
@@ -1470,11 +1470,11 @@ SENDMAIL_LDADD=-lsasl2</programlisting>
<para>笭陔晤祒 <application>sendmail</application> 堍俴覤藏鍔ㄩ</para>
<screen>&prompt.root; <userinput>cd /usr/src/lib/libsmutil</userinput>
-&prompt.root; <userinput>make cleandir && make obj && make</userinput>
+&prompt.root; <userinput>make cleandir &amp;&amp; make obj &amp;&amp; make</userinput>
&prompt.root; <userinput>cd /usr/src/lib/libsm</userinput>
-&prompt.root; <userinput>make cleandir && make obj && make</userinput>
+&prompt.root; <userinput>make cleandir &amp;&amp; make obj &amp;&amp; make</userinput>
&prompt.root; <userinput>cd /usr/src/usr.sbin/sendmail</userinput>
-&prompt.root; <userinput>make cleandir && make obj && make && make install</userinput></screen>
+&prompt.root; <userinput>make cleandir &amp;&amp; make obj &amp;&amp; make &amp;&amp; make install</userinput></screen>
<para>蝜 <filename>/usr/src</filename>
睿僕砅踱羶衄湮腔曹趙甜й坳蠅飲斛剕褫蚚ㄛ<application>sendmail</application>
diff --git a/zh_CN.GB2312/books/handbook/mirrors/chapter.xml b/zh_CN.GB2312/books/handbook/mirrors/chapter.xml
index 364a4f6046..a018bdcba5 100644
--- a/zh_CN.GB2312/books/handbook/mirrors/chapter.xml
+++ b/zh_CN.GB2312/books/handbook/mirrors/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="gb2312" standalone="no"?>
+<?xml version="1.0" encoding="gb2312"?>
<!--
The FreeBSD Documentation Project
The FreeBSD Chinese Documentation Project
@@ -243,6 +243,10 @@
溼恀奧衄虳桴萸珩枑鼎む坻腔溼恀源宒﹝勤藩跺桴萸褫蚚腔溼恀源宒
婓む翋儂靡綴衄垀佽隴﹝</para>
+ &chap.mirrors.ftp.index.inc;
+
+ &chap.mirrors.lastmod.inc;
+
&chap.mirrors.ftp.inc;
</sect1>
@@ -2233,6 +2237,11 @@ doc/zh_*</screen>
<para>&os; 腔 <link linkend="cvsup">CVSup</link> 督昢ん堍俴衾
狟蹈桴萸ㄩ</para>
+
+ &chap.mirrors.cvsup.index.inc;
+
+ &chap.mirrors.lastmod.inc;
+
&chap.mirrors.cvsup.inc;
</sect2>
</sect1>
diff --git a/zh_CN.GB2312/books/handbook/multimedia/chapter.xml b/zh_CN.GB2312/books/handbook/multimedia/chapter.xml
index fab90aaa9e..2d8f3a1340 100644
--- a/zh_CN.GB2312/books/handbook/multimedia/chapter.xml
+++ b/zh_CN.GB2312/books/handbook/multimedia/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="gb2312" standalone="no"?>
+<?xml version="1.0" encoding="gb2312"?>
<!--
The FreeBSD Documentation Project
The FreeBSD Simplified Chinese Documentation Project
diff --git a/zh_CN.GB2312/books/handbook/network-servers/chapter.xml b/zh_CN.GB2312/books/handbook/network-servers/chapter.xml
index 8f479e4d00..ab71f2b27e 100644
--- a/zh_CN.GB2312/books/handbook/network-servers/chapter.xml
+++ b/zh_CN.GB2312/books/handbook/network-servers/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="gb2312" standalone="no"?>
+<?xml version="1.0" encoding="gb2312"?>
<!--
The FreeBSD Documentation Project
The FreeBSD Simplified Chinese Project
diff --git a/zh_CN.GB2312/books/handbook/pgpkeys/chapter.xml b/zh_CN.GB2312/books/handbook/pgpkeys/chapter.xml
index 6035219136..2bd9483642 100644
--- a/zh_CN.GB2312/books/handbook/pgpkeys/chapter.xml
+++ b/zh_CN.GB2312/books/handbook/pgpkeys/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="gb2312" standalone="no"?>
+<?xml version="1.0" encoding="gb2312"?>
<!--
The FreeBSD Documentation Project
The FreeBSD Simplified Chinese Project
diff --git a/zh_CN.GB2312/books/handbook/ports/chapter.xml b/zh_CN.GB2312/books/handbook/ports/chapter.xml
index 004c3e6aca..47d72ede5b 100644
--- a/zh_CN.GB2312/books/handbook/ports/chapter.xml
+++ b/zh_CN.GB2312/books/handbook/ports/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="gb2312" standalone="no"?>
+<?xml version="1.0" encoding="gb2312"?>
<!--
The FreeBSD Documentation Project
The FreeBSD Simplified Chinese Documentation Project
diff --git a/zh_CN.GB2312/books/handbook/ppp-and-slip/chapter.xml b/zh_CN.GB2312/books/handbook/ppp-and-slip/chapter.xml
index 9e779afdf7..55bf7c23b6 100644
--- a/zh_CN.GB2312/books/handbook/ppp-and-slip/chapter.xml
+++ b/zh_CN.GB2312/books/handbook/ppp-and-slip/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="gb2312" standalone="no"?>
+<?xml version="1.0" encoding="gb2312"?>
<!--
The FreeBSD Documentation Project
The FreeBSD Simplified Chinese Project
diff --git a/zh_CN.GB2312/books/handbook/preface/preface.xml b/zh_CN.GB2312/books/handbook/preface/preface.xml
index b0750be60a..ccb1345260 100644
--- a/zh_CN.GB2312/books/handbook/preface/preface.xml
+++ b/zh_CN.GB2312/books/handbook/preface/preface.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="gb2312" standalone="no"?>
+<?xml version="1.0" encoding="gb2312"?>
<!--
The FreeBSD Chinese Documentation Project
diff --git a/zh_CN.GB2312/books/handbook/printing/chapter.xml b/zh_CN.GB2312/books/handbook/printing/chapter.xml
index e1823646a7..d4688e72fc 100644
--- a/zh_CN.GB2312/books/handbook/printing/chapter.xml
+++ b/zh_CN.GB2312/books/handbook/printing/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="gb2312" standalone="no"?>
+<?xml version="1.0" encoding="gb2312"?>
<!--
The FreeBSD Documentation Project
The FreeBSD Simplified Chinese Project
diff --git a/zh_CN.GB2312/books/handbook/security/chapter.xml b/zh_CN.GB2312/books/handbook/security/chapter.xml
index 15cbc64a70..2775406861 100644
--- a/zh_CN.GB2312/books/handbook/security/chapter.xml
+++ b/zh_CN.GB2312/books/handbook/security/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="gb2312" standalone="no"?>
+<?xml version="1.0" encoding="gb2312"?>
<!--
The FreeBSD Documentation Project
The FreeBSD Simplified Chinese Project
diff --git a/zh_CN.GB2312/books/handbook/serialcomms/chapter.xml b/zh_CN.GB2312/books/handbook/serialcomms/chapter.xml
index fec296d2a7..ba51638920 100644
--- a/zh_CN.GB2312/books/handbook/serialcomms/chapter.xml
+++ b/zh_CN.GB2312/books/handbook/serialcomms/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="gb2312" standalone="no"?>
+<?xml version="1.0" encoding="gb2312"?>
<!--
The FreeBSD Documentation Project
The FreeBSD Simplified Chinese Project
diff --git a/zh_CN.GB2312/books/handbook/users/chapter.xml b/zh_CN.GB2312/books/handbook/users/chapter.xml
index 9225139d4e..efc457cf32 100644
--- a/zh_CN.GB2312/books/handbook/users/chapter.xml
+++ b/zh_CN.GB2312/books/handbook/users/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="gb2312" standalone="no"?>
+<?xml version="1.0" encoding="gb2312"?>
<!--
The FreeBSD Chinese Documentation Project
diff --git a/zh_CN.GB2312/books/handbook/vinum/chapter.xml b/zh_CN.GB2312/books/handbook/vinum/chapter.xml
index 958ca661aa..9accce3d03 100644
--- a/zh_CN.GB2312/books/handbook/vinum/chapter.xml
+++ b/zh_CN.GB2312/books/handbook/vinum/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="gb2312" standalone="no"?>
+<?xml version="1.0" encoding="gb2312"?>
<!--
The Vinum Volume Manager
By Greg Lehey (grog at lemis dot com)
diff --git a/zh_CN.GB2312/books/handbook/virtualization/chapter.xml b/zh_CN.GB2312/books/handbook/virtualization/chapter.xml
index ebff811ba3..8565f6db12 100644
--- a/zh_CN.GB2312/books/handbook/virtualization/chapter.xml
+++ b/zh_CN.GB2312/books/handbook/virtualization/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="gb2312" standalone="no"?>
+<?xml version="1.0" encoding="gb2312"?>
<!--
The FreeBSD Documentation Project
The FreeBSD Simplified Chinese Project
@@ -732,8 +732,8 @@ xenbr1 8000.feffffffffff no vif0.1
<sect2 id="virtualization-guest-vmware">
<title>堍俴衾 MacOS 腔 VMware</title>
- <para>&mac 唳掛腔 <application>VMware Fusion</application>
- 岆珨跺妀珛篲ㄛ堍俴婓價衾 &intel 腔 &apple; &mac 數呾儂腔
+ <para>&mac; 唳掛腔 <application>VMware Fusion</application>
+ 岆珨跺妀珛篲ㄛ堍俴婓價衾 &intel; 腔 &apple; &mac; 數呾儂腔
&macos; 10.4.9 麼載唳掛腔紱釬炵苀奻﹝ &os;
岆珨跺俇垮閥妊硉醴芼妓椕龢腴部 婓 &macos; X 奻假蚾賸
<application>VMware Fusion</application> 眳綴ㄛ
@@ -909,7 +909,7 @@ xenbr1 8000.feffffffffff no vif0.1
<title>釬峈咑翋 OS 腔 &os;</title>
<para>婓徹扔躁蜊縚 &os; 甜羶衄庥怷孖繭觸2遜棶誰妊硉鹹樾熐紗熅鷊蔑腹
- 珨虳蚚誧崠奀妏蚚徹瞳蚚 &linux 媼輛秶潭搚虡刵迮
+ 珨虳蚚誧崠奀妏蚚徹瞳蚚 &linux; 媼輛秶潭搚虡刵迮
<application>VMware</application> 麻導甜嗣圉眒徹奀腔唳掛 (掀
<filename role="package">emulators/vmware3</filename>)﹝
婓 &os;&nbsp;7.2 楷票祥壅ㄛ Sun 羲埭唳掛 (Open Source Edition
diff --git a/zh_CN.GB2312/books/handbook/x11/chapter.xml b/zh_CN.GB2312/books/handbook/x11/chapter.xml
index 0b4c08bfea..3fbf2e3b72 100644
--- a/zh_CN.GB2312/books/handbook/x11/chapter.xml
+++ b/zh_CN.GB2312/books/handbook/x11/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="gb2312" standalone="no"?>
+<?xml version="1.0" encoding="gb2312"?>
<!--
The FreeBSD Documentation Project
The FreeBSD Simplified Chinese Project
@@ -268,7 +268,7 @@
奻腔蘇 X11 妗珋﹝ <application>&xorg;</application>
岆蚕 X.Org 價踢頗楷俴腔羲溫埭測鎢 X Window 炵苀妗珋笢腔 X 督昢﹝
<application>&xorg;</application> 價衾
- <application>&xfree86&nbsp;4.4RC2</application> 睿 X11R6.6 腔測鎢﹝
+ <application>&xfree86;&nbsp;4.4RC2</application> 睿 X11R6.6 腔測鎢﹝
植 &os; Ports 杶璃褫眕假蚾 <application>&xorg;</application>
腔 &xorg.version; 唳掛﹝</para>
@@ -1002,7 +1002,7 @@ EndSection</programlisting>
硐猁瑩躽蝯Ъ樓羶岔睿躇鎢涴欴腔桄痐陓洘﹝</para>
<para>蠟珩褫眕參 <application>XDM</application> 砑砓傖迵
- &man.getty.8 馱撿珨欴(see <xref linkend="term-config"/> for
+ &man.getty.8; 馱撿珨欴(see <xref linkend="term-config"/> for
details)﹝峈蚚誧枑鼎賸肮欴髡夔﹝坳褫眕俇傖炵苀腔腎翹恄韗
遣鯰肩羶忍刵倷遘鷃廙偎傱簃
(籵都岆珨跺 X 弝敦奪燴ん)﹝諉狟懂 <application>XDM</application>
@@ -1272,7 +1272,7 @@ DisplayManager.requestPort: 0</screen>
<programlisting>proc /proc procfs rw 0 0</programlisting>
<para>善 <filename>/etc/fstab</filename> 眕晞婓炵苀ゐ雄奀赻雄境婥
- &man.procfs.5﹝</para>
+ &man.procfs.5;﹝</para>
<para>珨筒蚾疑賸 <application>GNOME</application>ㄛ
憩斛剕豢咂 X server ゐ雄
diff --git a/zh_CN.GB2312/books/porters-handbook/book.xml b/zh_CN.GB2312/books/porters-handbook/book.xml
index 7c2f4d8026..e4c533738f 100644
--- a/zh_CN.GB2312/books/porters-handbook/book.xml
+++ b/zh_CN.GB2312/books/porters-handbook/book.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="gb2312" standalone="no"?>
-<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Books Set//ZH" "../../share/xml/entities.ent">
-%entities;
-]>
+<?xml version="1.0" encoding="gb2312"?>
+<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<!--
The FreeBSD Documentation Project
@@ -105,7 +102,7 @@
蛁砩涴虳恅璃妏蚚賸準梓袧腔秶桶睫ㄩ
<application>Emacs</application> 睿
<application>Vim</application> 茼蜆夔婓湖羲恅璃腔奀緊赻雄妎梗坳ㄛ
- 奧 &man.vi.1; 睿 &man.ex.1 寀剒猁婓湖羲恅璃腔奀緊籵徹
+ 奧 &man.vi.1; 睿 &man.ex.1; 寀剒猁婓湖羲恅璃腔奀緊籵徹
<command>:set tabstop=4</command> 懂党淏蘇炵馨髲獺</para>
</note>
@@ -3567,8 +3564,8 @@ PKGNAMESUFFIX= ${RESOLUTION}
:
# default
RESOLUTION?= 300
-.if ${RESOLUTION} != 118 && ${RESOLUTION} != 240 && \
- ${RESOLUTION} != 300 && ${RESOLUTION} != 400
+.if ${RESOLUTION} != 118 &amp;&amp; ${RESOLUTION} != 240 &amp;&amp; \
+ ${RESOLUTION} != 300 &amp;&amp; ${RESOLUTION} != 400
@${ECHO_MSG} "Error: invalid value for RESOLUTION: \"${RESOLUTION}\""
@${ECHO_MSG} "Possible values are: 118, 240, 300 (default) and 400."
@${FALSE}
@@ -4120,14 +4117,14 @@ PORTVERSION= 1.0</programlisting>
<programlisting>post-install:
${MKDIR} ${EXAMPLESDIR}
- (cd ${WRKSRC}/examples/ && ${COPYTREE_SHARE} \* ${EXAMPLESDIR})</programlisting>
+ (cd ${WRKSRC}/examples/ &amp;&amp; ${COPYTREE_SHARE} \* ${EXAMPLESDIR})</programlisting>
<para>涴跺瞰赽蔚埻釬氪枑鼎腔淕跺
<filename>examples</filename> 醴翹葩秶善蠟 port 硌隅腔假蚾尨毓恅璃腔弇离﹝</para>
<programlisting>post-install:
${MKDIR} ${DATADIR}/summer
- (cd ${WRKSRC}/temperatures/ && ${COPYTREE_SHARE} "June July August" ${DATADIR}/summer/)</programlisting>
+ (cd ${WRKSRC}/temperatures/ &amp;&amp; ${COPYTREE_SHARE} "June July August" ${DATADIR}/summer/)</programlisting>
<para>涴跺瞰赽蔚參狦撫腔跺堎腔杅擂ㄛ 葩秶善
<filename><makevar>DATADIR</makevar></filename> 笢腔
@@ -4140,7 +4137,7 @@ PORTVERSION= 1.0</programlisting>
<programlisting>post-install:
${MKDIR} ${EXAMPLESDIR}
- (cd ${WRKSRC}/examples/ && \
+ (cd ${WRKSRC}/examples/ &amp;&amp; \
${COPYTREE_SHARE} \* ${EXAMPLESDIR} "! -name Makefile")</programlisting>
<para>剒猁蛁砩腔岆ㄛ 涴虳粽甜祥夔赻雄蔚垀假蚾腔恅璃樓善
@@ -5659,7 +5656,7 @@ QT_COMPONENTS= gui moc_build qmake_build rcc_build uic_build</programlisting>
<programlisting>HAS_CONFIGURE= yes
do-configure:
- @cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} \
+ @cd ${WRKSRC} &amp;&amp; ${SETENV} ${CONFIGURE_ENV} \
${QMAKE} -unix PREFIX=${PREFIX} texmaker.pro</programlisting>
<para>③蛁砩ㄛ 涴迵炵苀枑鼎腔 <filename>BUILD.sh</filename>
@@ -8288,7 +8285,7 @@ CFLAGS+= -DLUA_VERSION_STRING="${VER_STR}"
<ulink url="&url.books.handbook;/configtuning-rcd.html">妏蚚忒聊腔 rc.d
梒誹</ulink> 梑善﹝ 壽衾褫蚚韜鍔腔砆牉賤庋ㄛ 寀褫眕婓
&man.rc.8; 睿 &man.rc.subr.8; 梑善﹝ 郔綴ㄛ 蠟褫眕統堐
- <ulink url="&url.articles.rc-scripting">涴う恅梒</ulink>
+ <ulink url="&url.articles.rc-scripting;">涴う恅梒</ulink>
賸賤蚴迡 <filename>rc.d</filename> 褐掛腔郔槽妗犛﹝</para>
<para>褫眕假蚾珨麼嗣跺 <filename>rc.d</filename> 褐掛ㄩ</para>
@@ -8645,7 +8642,7 @@ etc/orbit.conf.sample
<para>蔚醴翹賦凳悵湔善珨陔恅璃笢﹝</para>
- <screen>&prompt.root; <userinput>(cd /var/tmp/`make -V PORTNAME` && find -d * -type d) | sort &gt; OLD-DIRS</userinput></screen>
+ <screen>&prompt.root; <userinput>(cd /var/tmp/`make -V PORTNAME` &amp;&amp; find -d * -type d) | sort &gt; OLD-DIRS</userinput></screen>
<para>膘蕾珨諾啞 <filename>pkg-plist</filename> 恅璃ㄩ</para>
@@ -8655,11 +8652,11 @@ etc/orbit.conf.sample
寀諉狟懂茼假蚾蜆 port 甜斐膘蚾眊等﹝</para>
<screen>&prompt.root; <userinput>make install PREFIX=/var/tmp/`make -V PORTNAME`</userinput>
-&prompt.root; <userinput>(cd /var/tmp/`make -V PORTNAME` && find -d * \! -type d) | sort &gt; pkg-plist</userinput></screen>
+&prompt.root; <userinput>(cd /var/tmp/`make -V PORTNAME` &amp;&amp; find -d * \! -type d) | sort &gt; pkg-plist</userinput></screen>
<para>森俋遜茼參陔膘蕾腔醴翹樓鄶區鉾央</para>
- <screen>&prompt.root; <userinput>(cd /var/tmp/`make -V PORTNAME` && find -d * -type d) | sort | comm -13 OLD-DIRS - | sort -r | sed -e 's#^#@dirrm #' &gt;&gt; pkg-plist</userinput></screen>
+ <screen>&prompt.root; <userinput>(cd /var/tmp/`make -V PORTNAME` &amp;&amp; find -d * -type d) | sort | comm -13 OLD-DIRS - | sort -r | sed -e 's#^#@dirrm #' &gt;&gt; pkg-plist</userinput></screen>
<para>郔綴剒猁忒馱淕燴 packing list˙ 涴珨徹最祥岆
<emphasis>俇</emphasis> 赻雄腔﹝ 薊儂忒聊茼蹈 port
@@ -9702,7 +9699,7 @@ as .putsy.conf and edit it.</programlisting>
遣騣孩腔陔暮翹樓賮 VuXML 杅擂踱笢﹝ 諉狟懂ㄛ
蚚狟醱腔韜鍔懂潰脤坳岆瘁睫磁逄楊ㄩ</para>
- <screen>&prompt.user; <userinput>cd ${PORTSDIR}/security/vuxml && make validate</userinput></screen>
+ <screen>&prompt.user; <userinput>cd ${PORTSDIR}/security/vuxml &amp;&amp; make validate</userinput></screen>
<note>
<para>蠟剒猁假蚾狟蹈 package 笢腔祫屾珨跺ㄩ
diff --git a/zh_CN.GB2312/share/xml/authors-in-author-tag.ent b/zh_CN.GB2312/share/xml/authors-in-author-tag.ent
index 793b9a0bdf..ddd53cb661 100644
--- a/zh_CN.GB2312/share/xml/authors-in-author-tag.ent
+++ b/zh_CN.GB2312/share/xml/authors-in-author-tag.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="gb2312"?>
<!--
The FreeBSD Simplified Chinese Documentation Project
diff --git a/zh_CN.GB2312/share/xml/authors.ent b/zh_CN.GB2312/share/xml/authors.ent
index cdfd441f37..efd44a5ebf 100644
--- a/zh_CN.GB2312/share/xml/authors.ent
+++ b/zh_CN.GB2312/share/xml/authors.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="gb2312"?>
<!--
The FreeBSD Documentation Project
The FreeBSD Simplified Chinese Documentation Project
diff --git a/zh_CN.GB2312/share/xml/catalog b/zh_CN.GB2312/share/xml/catalog
deleted file mode 100644
index fe5be38b29..0000000000
--- a/zh_CN.GB2312/share/xml/catalog
+++ /dev/null
@@ -1,48 +0,0 @@
- -- ...................................................................... --
- -- FreeBSD SGML Public Identifiers ...................................... --
-
- -- Original Revision: 1.5 --
- -- $FreeBSD$
- --
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//ZH"
- "entities.ent"
-
-PUBLIC "-//FreeBSD//DOCUMENT DocBook Stylesheet//EN"
- "freebsd.dsl"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//ZH"
- "mailing-lists.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook Language Specific Entities//EN"
- "l10n.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook Author Entities//ZH"
- "authors.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook Author In Author Tag Entities//ZH"
- "authors-in-author-tag.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook Team Entities//ZH"
- "teams.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//ZH"
- "trademarks.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook Glossary Entities//ZH"
- "glossary.ent"
-
- -- ...................................................................... --
- -- HTML docs ............................................................ --
-
-PUBLIC "-//FreeBSD//ENTITIES FreeBSD L10N Entities//EN"
- "l10n.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES FreeBSD Release L10N Entities//EN"
- "release.l10n.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES HTML FreeBSD Header L10N Entities//EN"
- "header.l10n.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES HTML FreeBSD Navigation Bar L10N Entities//EN"
- "navibar.l10n.ent"
diff --git a/zh_CN.GB2312/share/xml/catalog.xml b/zh_CN.GB2312/share/xml/catalog.xml
index 3553c62fbc..0b06d43c89 100644
--- a/zh_CN.GB2312/share/xml/catalog.xml
+++ b/zh_CN.GB2312/share/xml/catalog.xml
@@ -10,6 +10,9 @@
<rewriteURI uriStartString="http://www.FreeBSD.org/XML/www/lang/"
rewritePrefix="../../"/>
+ <public
+ publicId="-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN"
+ uri="entities.ent" />
<public publicId="-//FreeBSD//ENTITIES FreeBSD L10N Entities//EN"
uri="l10n.ent" />
<public
diff --git a/zh_CN.GB2312/share/xml/entities.ent b/zh_CN.GB2312/share/xml/entities.ent
index b025010020..ac85e86b8c 100644
--- a/zh_CN.GB2312/share/xml/entities.ent
+++ b/zh_CN.GB2312/share/xml/entities.ent
@@ -1,28 +1,32 @@
<!-- $FreeBSD$ -->
-<!ENTITY % l10n PUBLIC "-//FreeBSD//ENTITIES DocBook Language Specific Entities//EN">
+<!ENTITY % l10n PUBLIC "-//FreeBSD//ENTITIES DocBook Language Specific Entities//EN"
+ "l10n.ent">
%l10n;
-<!ENTITY % l10n-common PUBLIC "-//FreeBSD//ENTITIES DocBook Language Neutral Entities//EN">
-%l10n-common;
-<!ENTITY % man PUBLIC "-//FreeBSD//ENTITIES DocBook Manual Page Entities//EN">
-%man;
-<!ENTITY % freebsd PUBLIC "-//FreeBSD//ENTITIES DocBook Miscellaneous FreeBSD Entities//EN">
+<!ENTITY % freebsd PUBLIC "-//FreeBSD//ENTITIES DocBook Miscellaneous FreeBSD Entities//EN"
+ "nonexistent">
%freebsd;
-<!ENTITY % authors.cn PUBLIC "-//FreeBSD//ENTITIES DocBook Author Entities//ZH">
+<!ENTITY % authors.cn PUBLIC "-//FreeBSD//ENTITIES DocBook Author Entities//ZH"
+ "authors.ent">
%authors.cn;
-<!ENTITY % authors.in.author.tag.cn PUBLIC "-//FreeBSD//ENTITIES DocBook Author In Author Tag Entities//ZH">
+<!ENTITY % authors.in.author.tag.cn PUBLIC "-//FreeBSD//ENTITIES DocBook Author In Author Tag Entities//ZH"
+ "authors-in-author-tag.ent">
%authors.in.author.tag.cn;
-<!ENTITY % authors PUBLIC "-//FreeBSD//ENTITIES DocBook Author Entities//EN">
-%authors;
-<!ENTITY % teams PUBLIC "-//FreeBSD//ENTITIES DocBook Team Entities//ZH">
+<!ENTITY % teams PUBLIC "-//FreeBSD//ENTITIES DocBook Team Entities//ZH"
+ "teams.ent">
%teams;
-<!ENTITY % mailing-lists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//ZH">
+<!ENTITY % mailing-lists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//ZH"
+ "mailing-lists.ent">
%mailing-lists;
-<!ENTITY % newsgroups PUBLIC "-//FreeBSD//ENTITIES DocBook Newsgroup Entities//EN">
+<!ENTITY % newsgroups PUBLIC "-//FreeBSD//ENTITIES DocBook Newsgroup Entities//EN"
+ "nonexistent">
%newsgroups;
-<!ENTITY % trademarks PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//ZH">
+<!ENTITY % trademarks PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//ZH"
+ "trademarks.ent">
%trademarks;
-<!ENTITY % urls PUBLIC "-//FreeBSD//ENTITIES DocBook URL Entities//EN">
+<!ENTITY % urls PUBLIC "-//FreeBSD//ENTITIES DocBook URL Entities//EN"
+ "nonexistent">
%urls;
-<!ENTITY % glossary PUBLIC "-//FreeBSD//ENTITIES DocBook Glossary Entities//ZH">
+<!ENTITY % glossary PUBLIC "-//FreeBSD//ENTITIES DocBook Glossary Entities//ZH"
+ "glossary.ent">
%glossary;
diff --git a/zh_CN.GB2312/share/xml/mailing-lists.ent b/zh_CN.GB2312/share/xml/mailing-lists.ent
index fd8b8b177c..b19148ecd8 100644
--- a/zh_CN.GB2312/share/xml/mailing-lists.ent
+++ b/zh_CN.GB2312/share/xml/mailing-lists.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="gb2312"?>
<!--
Names of FreeBSD mailing lists and related software.
The FreeBSD Chinese Documentation Project
diff --git a/zh_CN.GB2312/share/xml/mirrors-local.xsl b/zh_CN.GB2312/share/xml/mirrors-local.xsl
index 0da5fc058a..c6cdef50f3 100644
--- a/zh_CN.GB2312/share/xml/mirrors-local.xsl
+++ b/zh_CN.GB2312/share/xml/mirrors-local.xsl
@@ -8,7 +8,6 @@
<xsl:import href="../../../share/xml/mirrors-master.xsl" />
<xsl:output type="xml" encoding="gb2312"
- omit-xml-declaration="yes"
indent="yes"/>
<!-- template: "mirrors-docbook-contact" -->
diff --git a/zh_CN.GB2312/share/xml/teams.ent b/zh_CN.GB2312/share/xml/teams.ent
index 0b4ef1c3d8..3fd0be0c2a 100644
--- a/zh_CN.GB2312/share/xml/teams.ent
+++ b/zh_CN.GB2312/share/xml/teams.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="gb2312"?>
<!--
Names and email address of teams of people working on specified
tasks. Usally they're just mail aliases set up at hub.FreeBSD.org
diff --git a/zh_CN.GB2312/share/xml/trademarks.ent b/zh_CN.GB2312/share/xml/trademarks.ent
index 3b43bdbacd..89fa13f59c 100644
--- a/zh_CN.GB2312/share/xml/trademarks.ent
+++ b/zh_CN.GB2312/share/xml/trademarks.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="gb2312"?>
<!--
Trademark Legend, as required by The Open Group, Sun, etc..
@@ -446,13 +447,10 @@ Coverity Extendㄛ Coverity Prevent 睿 Coverity Prevent SQS 岆 Coverity 鼠侗腔蛁
DAMAGE.</para>
</important>
-<![%output.for.print;[
-
<important><para><emphasis>植 FreeBSD 睿 FreeBSD 笢恅趙砐醴夥源厙桴鳳△覺憊警
PostScript&reg; 睿 PDF 跡宒恅璃笢囀И腔笢恅趼极ㄛ蚕恅隋褪撮羲楷嘖爺衄癹鼠侗偌
▲恅隋鼠笲忨京憿滔硜依廜屆</emphasis></para></important>
-<!-- Start of ARPHIC PUBLIC LICENSE -->
<para>恅隋鼠笲忨京</para>
<para></para>
<para>唳佯齾(C) 1999 恅隋褪撮羲楷嘖爺衄癹鼠侗</para>
@@ -558,8 +556,6 @@ Coverity Extendㄛ Coverity Prevent 睿 Coverity Prevent SQS 岆 Coverity 鼠侗腔蛁
歙祥勤蠟秪妏蚚麼祥夔妏蚚掛趼倰ㄗ婦嬤筍祥癹衾杸測妀こ麼督昢腔粒劃˙
妏蚚﹜ 杅擂麼瞳祔眳囷囮˙ 麼氪茠珛溥鬼ㄘ 垀竘祡腔庥挋掃荂 潔諉﹜ 斛說
髒說 杻忷麼凱楠俶囷囮蛹孮ㄛ 撈妏唳亞侄藫頖刳晑疙襠蟣孝醴厊嗝埰啟鉦鄙俋﹝</para>
-<!-- End of ARPHIC PUBLIC LICENSE -->
-]]>
</legalnotice>
'>
diff --git a/zh_TW.Big5/articles/contributing/article.xml b/zh_TW.Big5/articles/contributing/article.xml
index fccd4e2de2..d372acf288 100644
--- a/zh_TW.Big5/articles/contributing/article.xml
+++ b/zh_TW.Big5/articles/contributing/article.xml
@@ -1,10 +1,6 @@
-<?xml version="1.0" encoding="big5" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//TW" "../../share/xml/entities.ent">
-%entities;
-<!ENTITY % not.published "IGNORE">
-]>
+<?xml version="1.0" encoding="big5"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<!--
The FreeBSD Documentation Project
diff --git a/zh_TW.Big5/articles/cvs-freebsd/article.xml b/zh_TW.Big5/articles/cvs-freebsd/article.xml
index dd5faf36de..487122f35b 100644
--- a/zh_TW.Big5/articles/cvs-freebsd/article.xml
+++ b/zh_TW.Big5/articles/cvs-freebsd/article.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="big5" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//TW" "../../share/xml/entities.ent">
-%entities;
-]>
+<?xml version="1.0" encoding="big5"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<!-- $FreeBSD$ -->
<!-- The FreeBSD Documentation Project -->
diff --git a/zh_TW.Big5/articles/freebsd-questions/article.xml b/zh_TW.Big5/articles/freebsd-questions/article.xml
index 62870543c4..b1af0d52c7 100644
--- a/zh_TW.Big5/articles/freebsd-questions/article.xml
+++ b/zh_TW.Big5/articles/freebsd-questions/article.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="big5" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//TW" "../../share/xml/entities.ent">
-%entities;
-]>
+<?xml version="1.0" encoding="big5"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<!--
Original revision: 1.24
diff --git a/zh_TW.Big5/articles/hubs/article.xml b/zh_TW.Big5/articles/hubs/article.xml
index f684c31476..871b281dca 100644
--- a/zh_TW.Big5/articles/hubs/article.xml
+++ b/zh_TW.Big5/articles/hubs/article.xml
@@ -1,10 +1,6 @@
-<?xml version="1.0" encoding="big5" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//TW" "../../share/xml/entities.ent">
-%entities;
-<!ENTITY % not.published "IGNORE">
-]>
+<?xml version="1.0" encoding="big5"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<!-- $FreeBSD$ -->
<!-- The FreeBSD Documentation Project -->
diff --git a/zh_TW.Big5/articles/mailing-list-faq/article.xml b/zh_TW.Big5/articles/mailing-list-faq/article.xml
index ba7647983e..8daac69625 100644
--- a/zh_TW.Big5/articles/mailing-list-faq/article.xml
+++ b/zh_TW.Big5/articles/mailing-list-faq/article.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="big5" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//TW" "../../share/xml/entities.ent">
-%entities;
-]>
+<?xml version="1.0" encoding="big5"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<!-- $FreeBSD$ -->
diff --git a/zh_TW.Big5/articles/nanobsd/article.xml b/zh_TW.Big5/articles/nanobsd/article.xml
index d6b819eeee..0223df0a6e 100644
--- a/zh_TW.Big5/articles/nanobsd/article.xml
+++ b/zh_TW.Big5/articles/nanobsd/article.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="big5" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//TW" "../../share/xml/entities.ent">
-%entities;
-]>
+<?xml version="1.0" encoding="big5"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<!--
The FreeBSD Documentation Project
diff --git a/zh_TW.Big5/articles/pr-guidelines/article.xml b/zh_TW.Big5/articles/pr-guidelines/article.xml
index 5e6a5dccff..9018f4bfa9 100644
--- a/zh_TW.Big5/articles/pr-guidelines/article.xml
+++ b/zh_TW.Big5/articles/pr-guidelines/article.xml
@@ -1,8 +1,6 @@
-<?xml version="1.0" encoding="big5" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//TW" "../../share/xml/entities.ent">
-%entities;
+<?xml version="1.0" encoding="big5"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd" [
<!ENTITY man.edit-pr.1 "<citerefentry><refentrytitle>edit-pr</refentrytitle><manvolnum>1</manvolnum></citerefentry>">
<!ENTITY man.query-pr.1 "<citerefentry><refentrytitle>query-pr</refentrytitle><manvolnum>1</manvolnum></citerefentry>">
]>
diff --git a/zh_TW.Big5/articles/problem-reports/article.xml b/zh_TW.Big5/articles/problem-reports/article.xml
index 0eca52284e..bdb7d37812 100644
--- a/zh_TW.Big5/articles/problem-reports/article.xml
+++ b/zh_TW.Big5/articles/problem-reports/article.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="big5" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//TW" "../../share/xml/entities.ent">
-%entities;
-]>
+<?xml version="1.0" encoding="big5"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<article lang='zh_tw'>
<articleinfo>
diff --git a/zh_TW.Big5/articles/remote-install/article.xml b/zh_TW.Big5/articles/remote-install/article.xml
index dacfbf8da3..cc163f7771 100644
--- a/zh_TW.Big5/articles/remote-install/article.xml
+++ b/zh_TW.Big5/articles/remote-install/article.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="big5" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//TW" "../../share/xml/entities.ent">
-%entities;
-]>
+<?xml version="1.0" encoding="big5"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<!--
The FreeBSD Documentation Project
diff --git a/zh_TW.Big5/books/developers-handbook/book.xml b/zh_TW.Big5/books/developers-handbook/book.xml
index 7ed723cb4b..2253090f85 100644
--- a/zh_TW.Big5/books/developers-handbook/book.xml
+++ b/zh_TW.Big5/books/developers-handbook/book.xml
@@ -1,8 +1,6 @@
-<?xml version="1.0" encoding="big5" standalone="no"?>
-<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//TW" "../../share/xml/entities.ent">
-%entities;
+<?xml version="1.0" encoding="big5"?>
+<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd" [
<!ENTITY % chapters SYSTEM "chapters.ent"> %chapters;
]>
diff --git a/zh_TW.Big5/books/developers-handbook/introduction/chapter.xml b/zh_TW.Big5/books/developers-handbook/introduction/chapter.xml
index ce285c8329..342a47c2dc 100644
--- a/zh_TW.Big5/books/developers-handbook/introduction/chapter.xml
+++ b/zh_TW.Big5/books/developers-handbook/introduction/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="big5" standalone="no"?>
+<?xml version="1.0" encoding="big5"?>
<!--
The FreeBSD Documentation Project
@@ -67,7 +67,7 @@
</itemizedlist>
- <para>以上摘自 Scheifler & Gettys 的 "X Window System" 論文</para>
+ <para>以上摘自 Scheifler &amp; Gettys 的 "X Window System" 論文</para>
</sect1>
diff --git a/zh_TW.Big5/books/developers-handbook/ipv6/chapter.xml b/zh_TW.Big5/books/developers-handbook/ipv6/chapter.xml
index 10baf4285a..ac166db725 100644
--- a/zh_TW.Big5/books/developers-handbook/ipv6/chapter.xml
+++ b/zh_TW.Big5/books/developers-handbook/ipv6/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="big5" standalone="no"?>
+<?xml version="1.0" encoding="big5"?>
<!--
The FreeBSD Documentation Project
diff --git a/zh_TW.Big5/books/developers-handbook/kerneldebug/chapter.xml b/zh_TW.Big5/books/developers-handbook/kerneldebug/chapter.xml
index 6d5f27874f..2062206e1c 100644
--- a/zh_TW.Big5/books/developers-handbook/kerneldebug/chapter.xml
+++ b/zh_TW.Big5/books/developers-handbook/kerneldebug/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="big5" standalone="no"?>
+<?xml version="1.0" encoding="big5"?>
<!--
The FreeBSD Documentation Project
diff --git a/zh_TW.Big5/books/developers-handbook/l10n/chapter.xml b/zh_TW.Big5/books/developers-handbook/l10n/chapter.xml
index 29ab547c4b..a75577a8c7 100644
--- a/zh_TW.Big5/books/developers-handbook/l10n/chapter.xml
+++ b/zh_TW.Big5/books/developers-handbook/l10n/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="big5" standalone="no"?>
+<?xml version="1.0" encoding="big5"?>
<!--
The FreeBSD Documentation Project
diff --git a/zh_TW.Big5/books/developers-handbook/policies/chapter.xml b/zh_TW.Big5/books/developers-handbook/policies/chapter.xml
index 73582f13b1..16d63c7663 100644
--- a/zh_TW.Big5/books/developers-handbook/policies/chapter.xml
+++ b/zh_TW.Big5/books/developers-handbook/policies/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="big5" standalone="no"?>
+<?xml version="1.0" encoding="big5"?>
<!--
The FreeBSD Documentation Project
diff --git a/zh_TW.Big5/books/developers-handbook/secure/chapter.xml b/zh_TW.Big5/books/developers-handbook/secure/chapter.xml
index ec1904c301..928f05da21 100644
--- a/zh_TW.Big5/books/developers-handbook/secure/chapter.xml
+++ b/zh_TW.Big5/books/developers-handbook/secure/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="big5" standalone="no"?>
+<?xml version="1.0" encoding="big5"?>
<!--
The FreeBSD Documentation Project
diff --git a/zh_TW.Big5/books/developers-handbook/sockets/chapter.xml b/zh_TW.Big5/books/developers-handbook/sockets/chapter.xml
index 3b118fabe4..aa2eed2c9f 100644
--- a/zh_TW.Big5/books/developers-handbook/sockets/chapter.xml
+++ b/zh_TW.Big5/books/developers-handbook/sockets/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="big5" standalone="no"?>
+<?xml version="1.0" encoding="big5"?>
<!--
The FreeBSD Documentation Project
diff --git a/zh_TW.Big5/books/developers-handbook/testing/chapter.xml b/zh_TW.Big5/books/developers-handbook/testing/chapter.xml
index 256702d217..e187e8d0be 100644
--- a/zh_TW.Big5/books/developers-handbook/testing/chapter.xml
+++ b/zh_TW.Big5/books/developers-handbook/testing/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="big5" standalone="no"?>
+<?xml version="1.0" encoding="big5"?>
<!--
The FreeBSD Documentation Project
diff --git a/zh_TW.Big5/books/developers-handbook/tools/chapter.xml b/zh_TW.Big5/books/developers-handbook/tools/chapter.xml
index 48313dbfe5..486176ac32 100644
--- a/zh_TW.Big5/books/developers-handbook/tools/chapter.xml
+++ b/zh_TW.Big5/books/developers-handbook/tools/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="big5" standalone="no"?>
+<?xml version="1.0" encoding="big5"?>
<!--
The FreeBSD Documentation Project
diff --git a/zh_TW.Big5/books/developers-handbook/x86/chapter.xml b/zh_TW.Big5/books/developers-handbook/x86/chapter.xml
index 181c94dbf0..cb8c6cbd96 100644
--- a/zh_TW.Big5/books/developers-handbook/x86/chapter.xml
+++ b/zh_TW.Big5/books/developers-handbook/x86/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="big5" standalone="no"?>
+<?xml version="1.0" encoding="big5"?>
<!--
The FreeBSD Documentation Project
diff --git a/zh_TW.Big5/books/faq/book.xml b/zh_TW.Big5/books/faq/book.xml
index b68defa3a0..774de27d1c 100644
--- a/zh_TW.Big5/books/faq/book.xml
+++ b/zh_TW.Big5/books/faq/book.xml
@@ -1,8 +1,6 @@
-<?xml version="1.0" encoding="big5" standalone="no"?>
-<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//TW" "../../share/xml/entities.ent">
-%entities;
+<?xml version="1.0" encoding="big5"?>
+<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd" [
<!ENTITY bibliography SYSTEM "../../../share/xml/bibliography.xml">
]>
@@ -1945,7 +1943,7 @@ File: +DESC (ignored)</screen>
<para>有關這點,在 FreeBSD 討論區上時常有人討論。雖然硬體汰換速度很快,
可能隨時有新規格、新產品出現,然而這些都在我們意料之中,
我們 <emphasis>仍然</emphasis> 強烈建議:在詢問有關最新規格硬體的支援問題之前,
- 請先參閱 &os
+ 請先參閱 &os;
<ulink url="&rel.current.hardware;">&rel.current;</ulink>
<ulink url="&rel2.current.hardware;">&rel2.current;</ulink>的支援硬體列表,
@@ -2667,11 +2665,11 @@ device card 1</programlisting>
# When a USB keyboard arrives, attach it as the console keyboard.
#attach 100 {
# device-name "ukbd0";
-# action "kbdcontrol -k /dev/ukbd0 < /dev/console && /etc/rc.d/syscons restart";
+# action "kbdcontrol -k /dev/ukbd0 &lt; /dev/console &amp;&amp; /etc/rc.d/syscons restart";
#};
#detach 100 {
# device-name "ukbd0";
-# action "kbdcontrol -k /dev/kbd0 < /dev/console";
+# action "kbdcontrol -k /dev/kbd0 &lt; /dev/console";
#};
</programlisting>
</listitem>
diff --git a/zh_TW.Big5/books/fdp-primer/book.xml b/zh_TW.Big5/books/fdp-primer/book.xml
index 51d3920a02..6f40f1e56a 100644
--- a/zh_TW.Big5/books/fdp-primer/book.xml
+++ b/zh_TW.Big5/books/fdp-primer/book.xml
@@ -1,8 +1,6 @@
-<?xml version="1.0" encoding="big5" standalone="no"?>
-<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//TW" "../../share/xml/entities.ent">
-%entities;
+<?xml version="1.0" encoding="big5"?>
+<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd" [
<!ENTITY % chapters SYSTEM "chapters.ent"> %chapters;
]>
diff --git a/zh_TW.Big5/books/fdp-primer/doc-build/chapter.xml b/zh_TW.Big5/books/fdp-primer/doc-build/chapter.xml
index c6eac0880e..de649ee875 100644
--- a/zh_TW.Big5/books/fdp-primer/doc-build/chapter.xml
+++ b/zh_TW.Big5/books/fdp-primer/doc-build/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="big5" standalone="no"?>
+<?xml version="1.0" encoding="big5"?>
<!-- Copyright (c) 1999 Neil Blakey-Milner, All rights reserved.
Redistribution and use in source (SGML DocBook) and 'compiled' forms
diff --git a/zh_TW.Big5/books/fdp-primer/examples/appendix.xml b/zh_TW.Big5/books/fdp-primer/examples/appendix.xml
index 729da18ccc..afdd162607 100644
--- a/zh_TW.Big5/books/fdp-primer/examples/appendix.xml
+++ b/zh_TW.Big5/books/fdp-primer/examples/appendix.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="big5" standalone="no"?>
+<?xml version="1.0" encoding="big5"?>
<!-- Copyright (c) 2000 Nik Clayton, All rights reserved.
Redistribution and use in source (SGML DocBook) and 'compiled' forms
@@ -55,7 +55,7 @@
<example>
<title>DocBook <sgmltag>book</sgmltag></title>
- <programlisting><![ CDATA [<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook V4.1//EN">
+ <programlisting><![CDATA[<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook V4.1//EN">
<book lang='zh_tw'>
<bookinfo>
@@ -106,7 +106,7 @@
<example>
<title>DocBook <sgmltag>article</sgmltag></title>
- <programlisting><![ CDATA [<!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook V4.1//EN">
+ <programlisting><![CDATA[<!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook V4.1//EN">
<article lang='zh_tw'>
<articleinfo>
diff --git a/zh_TW.Big5/books/fdp-primer/overview/chapter.xml b/zh_TW.Big5/books/fdp-primer/overview/chapter.xml
index cc24a302dd..62c34a11ec 100644
--- a/zh_TW.Big5/books/fdp-primer/overview/chapter.xml
+++ b/zh_TW.Big5/books/fdp-primer/overview/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="big5" standalone="no"?>
+<?xml version="1.0" encoding="big5"?>
<!-- Copyright (c) 1998, 1999 Nik Clayton, All rights reserved.
Redistribution and use in source (SGML DocBook) and 'compiled' forms
diff --git a/zh_TW.Big5/books/fdp-primer/psgml-mode/chapter.xml b/zh_TW.Big5/books/fdp-primer/psgml-mode/chapter.xml
index e3de3809db..1b2f97992c 100644
--- a/zh_TW.Big5/books/fdp-primer/psgml-mode/chapter.xml
+++ b/zh_TW.Big5/books/fdp-primer/psgml-mode/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="big5" standalone="no"?>
+<?xml version="1.0" encoding="big5"?>
<!-- Copyright (c) 1998, 1999 Nik Clayton, All rights reserved.
Redistribution and use in source (SGML DocBook) and 'compiled' forms
diff --git a/zh_TW.Big5/books/fdp-primer/see-also/chapter.xml b/zh_TW.Big5/books/fdp-primer/see-also/chapter.xml
index 09133c3d9a..d6fc136474 100644
--- a/zh_TW.Big5/books/fdp-primer/see-also/chapter.xml
+++ b/zh_TW.Big5/books/fdp-primer/see-also/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="big5" standalone="no"?>
+<?xml version="1.0" encoding="big5"?>
<!-- Copyright (c) 1998, 1999 Nik Clayton, All rights reserved.
Redistribution and use in source (SGML DocBook) and 'compiled' forms
diff --git a/zh_TW.Big5/books/fdp-primer/sgml-markup/chapter.xml b/zh_TW.Big5/books/fdp-primer/sgml-markup/chapter.xml
index be49ae8445..90a6c91b93 100644
--- a/zh_TW.Big5/books/fdp-primer/sgml-markup/chapter.xml
+++ b/zh_TW.Big5/books/fdp-primer/sgml-markup/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="big5" standalone="no"?>
+<?xml version="1.0" encoding="big5"?>
<!-- Copyright (c) 1998, 1999 Nik Clayton, All rights reserved.
Redistribution and use in source (SGML DocBook) and 'compiled' forms
@@ -148,7 +148,7 @@
<para>Use:</para>
- <programlisting><![ CDATA [<h1>First section</h1>
+ <programlisting><![CDATA[<h1>First section</h1>
<!-- Document introduction goes here -->
@@ -179,7 +179,7 @@
<para>Use:</para>
- <programlisting><![ CDATA [<h1>First section</h1>
+ <programlisting><![CDATA[<h1>First section</h1>
<!-- Document introduction -->
@@ -200,7 +200,7 @@
<para>Use:</para>
- <programlisting><![ CDATA [<p>This is a paragraph. It can contain just about any
+ <programlisting><![CDATA[<p>This is a paragraph. It can contain just about any
other element.</p>]]></programlisting>
</example>
</sect3>
@@ -216,7 +216,7 @@
<para>Use:</para>
- <programlisting><![ CDATA [<p>A small excerpt from the US Constitution:</p>
+ <programlisting><![CDATA[<p>A small excerpt from the US Constitution:</p>
<blockquote>We the People of the United States, in Order to form
a more perfect Union, establish Justice, insure domestic
@@ -259,7 +259,7 @@
<para>Use:</para>
- <programlisting><![ CDATA [<p>An unordered list. Listitems will probably be
+ <programlisting><![CDATA[<p>An unordered list. Listitems will probably be
preceded by bullets.</p>
<ul>
@@ -291,7 +291,7 @@
<para>Use:</para>
- <programlisting><![ CDATA [<dl>
+ <programlisting><![CDATA[<dl>
<dt>Term 1</dt>
<dd><p>Paragraph 1 of definition 1.</p>
@@ -326,7 +326,7 @@
<para>You could use <sgmltag>pre</sgmltag> to mark up an email
message:</para>
- <programlisting><![ CDATA [<pre> From: nik@FreeBSD.org
+ <programlisting><![CDATA[<pre> From: nik@FreeBSD.org
To: freebsd-doc@FreeBSD.org
Subject: New documentation available
@@ -376,7 +376,7 @@
<para>Use:</para>
- <programlisting><![ CDATA [<p>This is a simple 2x2 table.</p>
+ <programlisting><![CDATA[<p>This is a simple 2x2 table.</p>
<table>
<tr>
@@ -402,7 +402,7 @@
<para>Use:</para>
- <programlisting><![ CDATA [<p>One tall thin cell on the left, two short cells next to
+ <programlisting><![CDATA[<p>One tall thin cell on the left, two short cells next to
it on the right.</p>
<table>
@@ -423,7 +423,7 @@
<para>Use:</para>
- <programlisting><![ CDATA [<p>One long cell on top, two short cells below it.</p>
+ <programlisting><![CDATA[<p>One long cell on top, two short cells below it.</p>
<table>
<tr>
@@ -444,7 +444,7 @@
<para>Use:</para>
- <programlisting><![ CDATA [<p>On a 3x3 grid, the top left block is a 2x2 set of
+ <programlisting><![CDATA[<p>On a 3x3 grid, the top left block is a 2x2 set of
cells merged into one. The other cells are normal.</p>
<table>
@@ -494,7 +494,7 @@
<para>Use:</para>
- <programlisting><![ CDATA [<p><em>This</em> has been emphasized, while
+ <programlisting><![CDATA[<p><em>This</em> has been emphasized, while
<strong>this</strong> has been strongly emphasized.</p>]]></programlisting>
</example>
</sect3>
@@ -510,7 +510,7 @@
<example>
<title><sgmltag>b</sgmltag> and <sgmltag>i</sgmltag></title>
- <programlisting><![ CDATA [<p><b>This</b> is in bold, while <i>this</i> is
+ <programlisting><![CDATA[<p><b>This</b> is in bold, while <i>this</i> is
in italics.</p>]]></programlisting>
</example>
</sect3>
@@ -527,7 +527,7 @@
<para>Use:</para>
- <programlisting><![ CDATA [<p>This document was originally written by
+ <programlisting><![CDATA[<p>This document was originally written by
Nik Clayton, who can be reached by email as
<tt>nik@FreeBSD.org</tt>.</p>]]></programlisting>
</example>
@@ -568,7 +568,7 @@
<para>The following fragments all do the same thing.</para>
- <programlisting><![ CDATA [<p>This text is <small>slightly smaller</small>. But
+ <programlisting><![CDATA[<p>This text is <small>slightly smaller</small>. But
this text is <big>slightly bigger</big>.</p>
<p>This text is <font size="-1">slightly smaller</font>. But
@@ -605,7 +605,7 @@
<para>Use:</para>
- <programlisting><![ CDATA [<p>More information is available at the
+ <programlisting><![CDATA[<p>More information is available at the
<a href="http://www.FreeBSD.org/">FreeBSD web site</a>.</p>]]></programlisting>
</example>
@@ -629,7 +629,7 @@
<para>Use:</para>
- <programlisting><![ CDATA [<p><a name="para1">This</a> paragraph can be referenced
+ <programlisting><![CDATA[<p><a name="para1">This</a> paragraph can be referenced
in other links with the name <tt>para1</tt>.</p>]]></programlisting>
</example>
@@ -643,7 +643,7 @@
<para>Assume that the <literal>para1</literal> example resides in a
document called <filename>foo.html</filename>.</para>
- <programlisting><![ CDATA [<p>More information can be found in the
+ <programlisting><![CDATA[<p>More information can be found in the
<a href="foo.html#para1">first paragraph</a> of
<tt>foo.html</tt>.</p>]]></programlisting>
</example>
@@ -658,7 +658,7 @@
<para>Assume that the <literal>para1</literal> example resides in
this document:</para>
- <programlisting><![ CDATA [<p>More information can be found in the
+ <programlisting><![CDATA[<p>More information can be found in the
<a href="#para1">first paragraph</a> of this
document.</p>]]></programlisting>
</example>
@@ -881,7 +881,7 @@
<example>
<title>A simple chapter</title>
- <programlisting><![ CDATA [<chapter>
+ <programlisting><![CDATA[<chapter>
<title>The chapter's title</title>
...
@@ -895,7 +895,7 @@
<example>
<title>Empty chapters</title>
- <programlisting><![ CDATA [<chapter>
+ <programlisting><![CDATA[<chapter>
<title>This is an empty chapter</title>
<para></para>
@@ -922,7 +922,7 @@
<example>
<title>Sections in chapters</title>
- <programlisting><![ RCDATA [<chapter>
+ <programlisting><![CDATA[<chapter>
<title>A sample chapter</title>
<para>Some text in the chapter.</para>
@@ -971,7 +971,7 @@
more <sgmltag>part</sgmltag>s. This cannot be done in an
<sgmltag>article</sgmltag>.</para>
- <programlisting><![ CDATA [<part>
+ <programlisting><![CDATA[<part>
<title>Introduction</title>
<chapter>
@@ -1016,7 +1016,7 @@
<para>Use:</para>
- <programlisting><![ CDATA [<para>This is a paragraph. It can contain just about any
+ <programlisting><![CDATA[<para>This is a paragraph. It can contain just about any
other element.</para> ]]></programlisting>
<para>Appearance:</para>
@@ -1041,7 +1041,7 @@
<para>Use:</para>
- <programlisting><![ CDATA [<para>A small excerpt from the US Constitution:</para>
+ <programlisting><![CDATA[<para>A small excerpt from the US Constitution:</para>
<blockquote>
<title>Preamble to the Constitution of the United States</title>
@@ -1116,7 +1116,7 @@
<para>Use:</para>
- <programlisting><![ CDATA [<warning>
+ <programlisting><![CDATA[<warning>
<para>Installing FreeBSD may make you want to delete Windows from your
hard disk.</para>
</warning>]]></programlisting>
@@ -1165,7 +1165,7 @@
<para>Use:</para>
- <programlisting><![ CDATA [<itemizedlist>
+ <programlisting><![CDATA[<itemizedlist>
<listitem>
<para>This is the first itemized item.</para>
</listitem>
@@ -1258,7 +1258,7 @@
<para>Use:</para>
- <programlisting><![ CDATA[<para>When you have finished, your program should look like
+ <programlisting><![CDATA[<para>When you have finished, your program should look like
this:</para>
<programlisting>#include &lt;stdio.h&gt;
@@ -1307,7 +1307,7 @@ main(void)
<title><sgmltag>co</sgmltag> and
<sgmltag>calloutlist</sgmltag></title>
- <programlisting><![ CDATA[<para>When you have finished, your program should look like
+ <programlisting><![CDATA[<para>When you have finished, your program should look like
this:</para>
<programlisting>#include &lt;stdio.h&gt; <co id="co-ex-include"/>
@@ -1392,7 +1392,7 @@ main(void)
<para>Use:</para>
- <programlisting><![ CDATA [<informaltable frame="none" pgwide="1">
+ <programlisting><![CDATA[<informaltable frame="none" pgwide="1">
<tgroup cols="2">
<thead>
<row>
@@ -1552,7 +1552,7 @@ main(void)
<para>Use:</para>
- <programlisting><![ CDATA [<screen>&prompt.user; <userinput>ls -1</userinput>
+ <programlisting><![CDATA[<screen>&prompt.user; <userinput>ls -1</userinput>
foo1
foo2
foo3
@@ -1610,7 +1610,7 @@ This is the file called 'foo2'</screen>
<para>Use:</para>
- <programlisting><![ CDATA [<para>FreeBSD is without doubt <emphasis>the</emphasis>
+ <programlisting><![CDATA[<para>FreeBSD is without doubt <emphasis>the</emphasis>
premiere Unix like operating system for the Intel architecture.</para>]]></programlisting>
<para>Appearance:</para>
@@ -1633,7 +1633,7 @@ This is the file called 'foo2'</screen>
<para>Use:</para>
- <programlisting><![ CDATA [<para>However, make sure that the search does not go beyond the
+ <programlisting><![CDATA[<para>However, make sure that the search does not go beyond the
<quote>boundary between local and public administration</quote>,
as RFC 1535 calls it.</para>]]></programlisting>
@@ -1671,7 +1671,7 @@ This is the file called 'foo2'</screen>
<para>Use:</para>
- <programlisting><![ CDATA [<para>To switch to the second virtual terminal, press
+ <programlisting><![CDATA[<para>To switch to the second virtual terminal, press
<keycombo action="simul"><keycap>Alt</keycap>
<keycap>F1</keycap></keycombo>.</para>
@@ -1775,7 +1775,7 @@ This is the file called 'foo2'</screen>
<para>Use:</para>
- <programlisting><![ CDATA [<para><application>Sendmail</application> is the most
+ <programlisting><![CDATA[<para><application>Sendmail</application> is the most
widely used Unix mail application.</para>
<para><application>Sendmail</application> includes the
@@ -1834,7 +1834,7 @@ This is the file called 'foo2'</screen>
<para>Use:</para>
- <programlisting><![ CDATA [<para>The SGML source for the Handbook in English can be
+ <programlisting><![CDATA[<para>The SGML source for the Handbook in English can be
found in <filename>/usr/doc/en/handbook/</filename>. The first
file is called <filename>handbook.xml</filename> in that
directory. You should also see a <filename>Makefile</filename>
@@ -1876,7 +1876,7 @@ This is the file called 'foo2'</screen>
<para>Use:</para>
- <programlisting><![ CDATA [<para>Install the <filename role="package">net/ethereal</filename> port to view network traffic.</para>]]></programlisting>
+ <programlisting><![CDATA[<para>Install the <filename role="package">net/ethereal</filename> port to view network traffic.</para>]]></programlisting>
<para>Appearance:</para>
@@ -1909,7 +1909,7 @@ This is the file called 'foo2'</screen>
<para>Use:</para>
- <programlisting><![ CDATA [<para><devicename>sio</devicename> is used for serial
+ <programlisting><![CDATA[<para><devicename>sio</devicename> is used for serial
communication in FreeBSD. <devicename>sio</devicename> manifests
through a number of entries in <filename>/dev</filename>, including
<filename>/dev/ttyd0</filename> and <filename>/dev/cuaa0</filename>.</para>
@@ -2032,7 +2032,7 @@ This is the file called 'foo2'</screen>
<para>Use:</para>
- <programlisting><![ CDATA [<para>The local machine can always be referred to by the
+ <programlisting><![CDATA[<para>The local machine can always be referred to by the
name <hostid>localhost</hostid>, which will have the IP address
<hostid role="ipaddr">127.0.0.1</hostid>.</para>
@@ -2093,7 +2093,7 @@ This is the file called 'foo2'</screen>
<para>Use:</para>
- <programlisting><![ CDATA [<para>To carry out most system administration functions you
+ <programlisting><![CDATA[<para>To carry out most system administration functions you
will need to be <username>root</username>.</para>]]></programlisting>
<para>Appearance:</para>
@@ -2130,7 +2130,7 @@ This is the file called 'foo2'</screen>
<para>Use:</para>
- <programlisting><![ CDATA [<para>Two common targets in a <filename>Makefile</filename>
+ <programlisting><![CDATA[<para>Two common targets in a <filename>Makefile</filename>
are <maketarget>all</maketarget> and <maketarget>clean</maketarget>.</para>
<para>Typically, invoking <maketarget>all</maketarget> will rebuild the
@@ -2180,7 +2180,7 @@ This is the file called 'foo2'</screen>
<para>Use:</para>
- <programlisting><![ CDATA [<para>The <literal>maxusers 10</literal> line in the kernel
+ <programlisting><![CDATA[<para>The <literal>maxusers 10</literal> line in the kernel
configuration file determines the size of many system tables, and is
a rough guide to how many simultaneous logins the system will
support.</para>]]></programlisting>
@@ -2212,7 +2212,7 @@ This is the file called 'foo2'</screen>
<para>Use:</para>
- <programlisting><![ CDATA [<informalexample>
+ <programlisting><![CDATA[<informalexample>
<screen>&prompt.user; <userinput>man <replaceable>command</replaceable></userinput></screen>
</informalexample>]]></programlisting>
@@ -2230,7 +2230,7 @@ This is the file called 'foo2'</screen>
<para>Use:</para>
- <programlisting><![ CDATA [<para>The <literal>maxusers <replaceable>n</replaceable></literal>
+ <programlisting><![CDATA[<para>The <literal>maxusers <replaceable>n</replaceable></literal>
line in the kernel configuration file determines the size of many system
tables, and is a rough guide to how many simultaneous logins the system will
support.</para>
@@ -2262,7 +2262,7 @@ This is the file called 'foo2'</screen>
<para>Use:</para>
- <programlisting><![ CDATA [
+ <programlisting><![CDATA[
<screen><errorname>Panic: cannot mount root</errorname></screen> ]]>
</programlisting>
@@ -2536,7 +2536,7 @@ IMAGES= chapter1/fig1.png
<example>
<title><literal>id on chapters and sections</literal></title>
- <programlisting><![ CDATA [<chapter id="chapter1">
+ <programlisting><![CDATA[<chapter id="chapter1">
<title>Introduction</title>
<para>This is the introduction. It contains a subsection,
@@ -2565,7 +2565,7 @@ IMAGES= chapter1/fig1.png
<example>
<title><sgmltag>anchor</sgmltag></title>
- <programlisting><![ CDATA [<para>This paragraph has an embedded
+ <programlisting><![CDATA[<para>This paragraph has an embedded
<anchor id="para1">link target in it. It will not show up in
the document.</para>]]></programlisting>
</example>
@@ -2590,7 +2590,7 @@ IMAGES= chapter1/fig1.png
<para>Assume that this fragment appears somewhere in a document that
includes the <literal>id</literal> example:</para>
- <programlisting><![ CDATA [<para>More information can be found
+ <programlisting><![CDATA[<para>More information can be found
in <xref linkend="chapter1">.</para>
<para>More specific information can be found
@@ -2631,7 +2631,7 @@ IMAGES= chapter1/fig1.png
<para>Assume that this fragment appears somewhere in a document that
includes the <literal>id</literal> example.</para>
- <programlisting><![ CDATA [<para>More information can be found in
+ <programlisting><![CDATA[<para>More information can be found in
<link linkend="chapter1">the first chapter</link>.</para>
<para>More specific information can be found in
@@ -2681,7 +2681,7 @@ IMAGES= chapter1/fig1.png
<para>Use:</para>
- <programlisting><![ CDATA [<para>Of course, you could stop reading this document and
+ <programlisting><![CDATA[<para>Of course, you could stop reading this document and
go to the <ulink url="&url.base;/index.html">FreeBSD
home page</ulink> instead.</para>]]></programlisting>
diff --git a/zh_TW.Big5/books/fdp-primer/sgml-primer/chapter.xml b/zh_TW.Big5/books/fdp-primer/sgml-primer/chapter.xml
index a6d2030e97..238c3a4d66 100644
--- a/zh_TW.Big5/books/fdp-primer/sgml-primer/chapter.xml
+++ b/zh_TW.Big5/books/fdp-primer/sgml-primer/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="big5" standalone="no"?>
+<?xml version="1.0" encoding="big5"?>
<!-- Copyright (c) 1998, 1999 Nik Clayton, All rights reserved.
Redistribution and use in source (SGML DocBook) and 'compiled' forms
@@ -98,7 +98,7 @@
<para>The previous example is actually represented in this document like
this:</para>
- <programlisting><![ CDATA [
+ <programlisting><![CDATA[
<para>To remove <filename>/tmp/foo</filename> use &man.rm.1;.</para>
<screen>&prompt.user; <userinput>rm /tmp/foo</userinput></screen>]]></programlisting>
@@ -215,7 +215,7 @@
the element is a paragraph, called <literal>p</literal>. This
element has both start and end tags.</para>
- <programlisting><![ CDATA [<p>This is a paragraph. It starts with the start tag for
+ <programlisting><![CDATA[<p>This is a paragraph. It starts with the start tag for
the 'p' element, and it will end with the end tag for the 'p'
element.</p>
@@ -234,7 +234,7 @@
<literal>hr</literal>. This element does not wrap content, so only
has a start tag.</para>
- <programlisting><![ CDATA [<p>This is a paragraph.</p>
+ <programlisting><![CDATA[<p>This is a paragraph.</p>
<hr>
@@ -250,7 +250,7 @@
<example>
<title>Elements within elements; <sgmltag>em</sgmltag></title>
- <programlisting><![ CDATA [<p>This is a simple <em>paragraph</em> where some
+ <programlisting><![CDATA[<p>This is a simple <em>paragraph</em> where some
of the <em>words</em> have been <em>emphasized</em>.</p>]]></programlisting>
</example>
@@ -300,7 +300,7 @@
<example>
<title>Using an element with an attribute</title>
- <programlisting><![ CDATA [<p align="left">The inclusion of the align attribute
+ <programlisting><![CDATA[<p align="left">The inclusion of the align attribute
on this paragraph was superfluous, since the default is left.</p>
<p align="center">This may appear in the center.</p>]]></programlisting>
@@ -315,7 +315,7 @@
<example>
<title>Single quotes around attributes</title>
- <programlisting><![ CDATA [<p align='right'>I am on the right!</p>]]></programlisting>
+ <programlisting><![CDATA[<p align='right'>I am on the right!</p>]]></programlisting>
</example>
<para>Sometimes you do not need to use quotes around attribute values at
@@ -391,7 +391,7 @@ setenv SGML_CATALOG_FILES /usr/doc/en_US.ISO8859-1/share/xml/catalog:$SGML_CATAL
<para>Create <filename>example.xml</filename>, and enter the
following text:</para>
- <programlisting><![ CDATA [<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+ <programlisting><![CDATA[<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
<html>
<head>
@@ -539,7 +539,7 @@ nsgmls:example.xml:6:8:E: end tag for "HEAD" which is not finished</screen>
<para>A typical declaration for a document written to conform with version
4.0 of the HTML DTD looks like this:</para>
- <programlisting><![ CDATA [<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0//EN">]]></programlisting>
+ <programlisting><![CDATA[<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0//EN">]]></programlisting>
<para>That line contains a number of different components.</para>
@@ -764,7 +764,7 @@ nsgmls:example.xml:6:8:E: end tag for "HEAD" which is not finished</screen>
<para>The syntax for this is slightly different:</para>
- <programlisting><![ CDATA [<!DOCTYPE html SYSTEM "/path/to/file.dtd">]]></programlisting>
+ <programlisting><![CDATA[<!DOCTYPE html SYSTEM "/path/to/file.dtd">]]></programlisting>
<para>The <literal>SYSTEM</literal> keyword indicates that the SGML
processor should locate the DTD in a system specific fashion. This
@@ -818,7 +818,7 @@ nsgmls:example.xml:6:8:E: end tag for "HEAD" which is not finished</screen>
<programlisting>&lt;!-- 測試註解 --></programlisting>
- <programlisting><![ CDATA [
+ <programlisting><![CDATA[
<!-- 這是註解 -->
<!-- 這也是註解 -->
@@ -830,7 +830,8 @@ nsgmls:example.xml:6:8:E: end tag for "HEAD" which is not finished</screen>
-- 也可以這樣子用 -->]]></programlisting>
</example>
- <![ %output.print; [
+<!--
+ <![%output.print;[
<important>
<title>Use 2 dashes</title>
@@ -849,6 +850,7 @@ nsgmls:example.xml:6:8:E: end tag for "HEAD" which is not finished</screen>
affected.</para>
</important>
]]>
+-->
<para>If you have used HTML before you may have been shown different rules
for comments. In particular, you may think that the string
@@ -863,7 +865,7 @@ nsgmls:example.xml:6:8:E: end tag for "HEAD" which is not finished</screen>
<example>
<title>Erroneous SGML comments</title>
- <programlisting><![ CDATA [
+ <programlisting><![CDATA[
<!-- This is in the comment --
THIS IS OUTSIDE THE COMMENT!
@@ -877,12 +879,12 @@ nsgmls:example.xml:6:8:E: end tag for "HEAD" which is not finished</screen>
<para>This is not valid SGML, and may give confusing error
messages.</para>
- <programlisting><![ CDATA [<!--------------- This is a very bad idea --------------->]]></programlisting>
+ <programlisting><![CDATA[<!--------------- This is a very bad idea --------------->]]></programlisting>
<para>As the example suggests, <emphasis>do not</emphasis> write
comments like that.</para>
- <programlisting><![ CDATA [<!--===================================================-->]]></programlisting>
+ <programlisting><![CDATA[<!--===================================================-->]]></programlisting>
<para>That is a (slightly) better approach, but it still potentially
confusing to people new to SGML.</para>
@@ -938,7 +940,7 @@ nsgmls:example.xml:6:8:E: end tag for "HEAD" which is not finished</screen>
<literal>current.version</literal> which expanded to the current
version number of your product. You could write:</para>
- <programlisting><![ CDATA [<para>The current version of our product is
+ <programlisting><![CDATA[<para>The current version of our product is
&current.version;.</para>]]></programlisting>
<para>When the version number changes you can simply change the
@@ -966,7 +968,7 @@ nsgmls:example.xml:6:8:E: end tag for "HEAD" which is not finished</screen>
<example>
<title>Defining general entities</title>
- <programlisting><![ CDATA [<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0//EN" [
+ <programlisting><![CDATA[<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0//EN" [
<!ENTITY current.version "3.0-RELEASE">
<!ENTITY last.version "2.2.7-RELEASE">
]>]]></programlisting>
@@ -1005,7 +1007,7 @@ nsgmls:example.xml:6:8:E: end tag for "HEAD" which is not finished</screen>
<example>
<title>Defining parameter entities</title>
- <programlisting><![ CDATA [<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0//EN" [
+ <programlisting><![CDATA[<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0//EN" [
<!ENTITY % param.some "some">
<!ENTITY % param.text "text">
<!ENTITY % param.new "%param.some more %param.text">
@@ -1025,7 +1027,7 @@ nsgmls:example.xml:6:8:E: end tag for "HEAD" which is not finished</screen>
<para>Add a general entity to
<filename>example.xml</filename>.</para>
- <programlisting><![ CDATA [<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" [
+ <programlisting><![CDATA[<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" [
<!ENTITY version "1.1">
]>
@@ -1123,7 +1125,7 @@ nsgmls:example.xml:6:8:E: end tag for "HEAD" which is not finished</screen>
<example>
<title>Using general entities to include files</title>
- <programlisting><![ CDATA [<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0//EN" [
+ <programlisting><![CDATA[<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0//EN" [
<!ENTITY chapter.1 SYSTEM "chapter1.xml">
<!ENTITY chapter.2 SYSTEM "chapter2.xml">
<!ENTITY chapter.3 SYSTEM "chapter3.xml">
@@ -1177,7 +1179,7 @@ nsgmls:example.xml:6:8:E: end tag for "HEAD" which is not finished</screen>
<filename>chapters.ent</filename>. This file contains the
following:</para>
- <programlisting><![ CDATA [<!ENTITY chapter.1 SYSTEM "chapter1.xml">
+ <programlisting><![CDATA[<!ENTITY chapter.1 SYSTEM "chapter1.xml">
<!ENTITY chapter.2 SYSTEM "chapter2.xml">
<!ENTITY chapter.3 SYSTEM "chapter3.xml">]]></programlisting>
@@ -1186,7 +1188,7 @@ nsgmls:example.xml:6:8:E: end tag for "HEAD" which is not finished</screen>
document, which will then make all the general entities available
for use. Then use the general entities as before:</para>
- <programlisting><![ CDATA [<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0//EN" [
+ <programlisting><![CDATA[<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0//EN" [
<!-- Define a parameter entity to load in the chapter general entities -->
<!ENTITY % chapters SYSTEM "chapters.ent">
@@ -1216,14 +1218,14 @@ nsgmls:example.xml:6:8:E: end tag for "HEAD" which is not finished</screen>
<para>Put content similar to the following in each file:</para>
- <programlisting><![ CDATA [<p>This is the first paragraph.</p>]]></programlisting>
+ <programlisting><![CDATA[<p>This is the first paragraph.</p>]]></programlisting>
</step>
<step>
<para>Edit <filename>example.xml</filename> so that it looks like
this:</para>
- <programlisting><![ CDATA [<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0//EN" [
+ <programlisting><![CDATA[<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0//EN" [
<!ENTITY version "1.1">
<!ENTITY para1 SYSTEM "para1.xml">
<!ENTITY para2 SYSTEM "para2.xml">
@@ -1273,7 +1275,7 @@ nsgmls:example.xml:6:8:E: end tag for "HEAD" which is not finished</screen>
<para>Edit <filename>example.xml</filename> so that it looks like
this:</para>
- <programlisting><![ CDATA [<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0//EN" [
+ <programlisting><![CDATA[<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0//EN" [
<!ENTITY % entities SYSTEM "entities.xml"> %entities;
]>
@@ -1296,7 +1298,7 @@ nsgmls:example.xml:6:8:E: end tag for "HEAD" which is not finished</screen>
<para>Create a new file, <filename>entities.xml</filename>, with
this content:</para>
- <programlisting><![ CDATA [<!ENTITY version "1.1">
+ <programlisting><![CDATA[<!ENTITY version "1.1">
<!ENTITY para1 SYSTEM "para1.xml">
<!ENTITY para2 SYSTEM "para2.xml">
<!ENTITY para3 SYSTEM "para3.xml">]]></programlisting>
@@ -1336,7 +1338,7 @@ nsgmls:example.xml:6:8:E: end tag for "HEAD" which is not finished</screen>
</example>
<para>As you would expect, being an SGML construct, a marked section
- starts with <literal>&lt!</literal>.</para>
+ starts with <literal>&lt;!</literal>.</para>
<para>The first square bracket begins to delimit the marked
section.</para>
@@ -1418,7 +1420,7 @@ nsgmls:example.xml:6:8:E: end tag for "HEAD" which is not finished</screen>
&lt;programlisting>) are from DocBook.&lt;/para>
&lt;programlisting>
- &lt;![ CDATA [ <![ CDATA [
+ &lt;![CDATA[<![CDATA[
<p>This is a sample that shows you some of the elements within
HTML. Since the angle brackets are used so many times, it is
simpler to say the whole example is a CDATA marked section
@@ -1532,16 +1534,16 @@ nsgmls:example.xml:6:8:E: end tag for "HEAD" which is not finished</screen>
&lt;/head>
&lt;body>
- &lt;p>This paragraph &lt;![ CDATA [contains many &lt;
+ &lt;p>This paragraph &lt;![CDATA[contains many &lt;
characters (&lt; &lt; &lt; &lt; &lt;) so it is easier
to wrap it in a CDATA marked section ]]&gt;&lt;/p>
- &lt;![ IGNORE [
+ &lt;![IGNORE[
&lt;p>This paragraph will definitely not be included in the
output.&lt;/p>
]]&gt;
- &lt;![ <![ CDATA [%text.output]]> [
+ &lt;![<![CDATA[%text.output]]> [
&lt;p>This paragraph might appear in the output, or it
might not.&lt;/p>
diff --git a/zh_TW.Big5/books/fdp-primer/structure/chapter.xml b/zh_TW.Big5/books/fdp-primer/structure/chapter.xml
index 658a93ec39..8c22d28519 100644
--- a/zh_TW.Big5/books/fdp-primer/structure/chapter.xml
+++ b/zh_TW.Big5/books/fdp-primer/structure/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="big5" standalone="no"?>
+<?xml version="1.0" encoding="big5"?>
<!-- Copyright (c) 1998, 1999 Nik Clayton, All rights reserved.
Redistribution and use in source (SGML DocBook) and 'compiled' forms
@@ -222,7 +222,7 @@
<para>For example, if one of the chapter files contains:</para>
- <programlisting><![ CDATA [
+ <programlisting><![CDATA[
<chapter id="kernelconfiguration">
...
</chapter>]]></programlisting>
diff --git a/zh_TW.Big5/books/fdp-primer/stylesheets/chapter.xml b/zh_TW.Big5/books/fdp-primer/stylesheets/chapter.xml
index 2ed9a117bb..785f566f4b 100644
--- a/zh_TW.Big5/books/fdp-primer/stylesheets/chapter.xml
+++ b/zh_TW.Big5/books/fdp-primer/stylesheets/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="big5" standalone="no"?>
+<?xml version="1.0" encoding="big5"?>
<!-- Copyright (c) 1998, 1999 Nik Clayton, All rights reserved.
Redistribution and use in source (SGML DocBook) and 'compiled' forms
diff --git a/zh_TW.Big5/books/fdp-primer/the-website/chapter.xml b/zh_TW.Big5/books/fdp-primer/the-website/chapter.xml
index 9a55bd17d3..85801201ec 100644
--- a/zh_TW.Big5/books/fdp-primer/the-website/chapter.xml
+++ b/zh_TW.Big5/books/fdp-primer/the-website/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="big5" standalone="no"?>
+<?xml version="1.0" encoding="big5"?>
<!-- Copyright (c) 1998, 1999 Nik Clayton, All rights reserved.
Redistribution and use in source (SGML DocBook) and 'compiled' forms
diff --git a/zh_TW.Big5/books/fdp-primer/tools/chapter.xml b/zh_TW.Big5/books/fdp-primer/tools/chapter.xml
index a15d80b543..eb7cfe411f 100644
--- a/zh_TW.Big5/books/fdp-primer/tools/chapter.xml
+++ b/zh_TW.Big5/books/fdp-primer/tools/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="big5" standalone="no"?>
+<?xml version="1.0" encoding="big5"?>
<!-- Copyright (c) 1998, 1999 Nik Clayton, All rights reserved.
Redistribution and use in source (SGML DocBook) and 'compiled' forms
diff --git a/zh_TW.Big5/books/fdp-primer/translations/chapter.xml b/zh_TW.Big5/books/fdp-primer/translations/chapter.xml
index 8eab03e45c..2a19c41ee7 100644
--- a/zh_TW.Big5/books/fdp-primer/translations/chapter.xml
+++ b/zh_TW.Big5/books/fdp-primer/translations/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="big5" standalone="no"?>
+<?xml version="1.0" encoding="big5"?>
<!-- Copyright (c) 1999 Nik Clayton, All rights reserved.
Redistribution and use in source (SGML DocBook) and 'compiled' forms
diff --git a/zh_TW.Big5/books/fdp-primer/writing-style/chapter.xml b/zh_TW.Big5/books/fdp-primer/writing-style/chapter.xml
index a936251da5..ffb5b6a2c0 100644
--- a/zh_TW.Big5/books/fdp-primer/writing-style/chapter.xml
+++ b/zh_TW.Big5/books/fdp-primer/writing-style/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="big5" standalone="no"?>
+<?xml version="1.0" encoding="big5"?>
<!-- Copyright (c) 1998 Nik Clayton, All rights reserved.
Redistribution and use in source (SGML DocBook) and 'compiled' forms
@@ -172,7 +172,7 @@
,<emphasis>而非</emphasis> <literal>&lt;PARA&gt;</literal>。</para>
<para>而 SGML 內文則是用大寫字母表示,像是:
- <literal>&lt!ENTITY&hellip;&gt;</literal> 及
+ <literal>&lt;!ENTITY&hellip;&gt;</literal> 及
<literal>&lt;!DOCTYPE&hellip;&gt;</literal>,
<emphasis>而不是</emphasis>
<literal>&lt;!entity&hellip;&gt;</literal> 及
@@ -209,7 +209,7 @@
<para>舉個例子,這節所用的寫法大致是下面這樣:</para>
- <programlisting><![ CDATA [+--- 這是 0 縱列
+ <programlisting><![CDATA[+--- 這是 0 縱列
V
<chapter>
<title>...</title>
@@ -256,7 +256,7 @@ augroup END</programlisting>
比如:</para>
<informalexample>
- <programlisting><![ CDATA [<article lang='zh_tw'>
+ <programlisting><![CDATA[<article lang='zh_tw'>
<articleinfo>
<title>NIS</title>
@@ -340,19 +340,19 @@ GB. Hardware compression &hellip;</literallayout>
<itemizedlist>
<listitem>
<para>在數字與單位之間:</para>
- <programlisting><![ CDATA [57600&nbsp;bps]]></programlisting>
+ <programlisting><![CDATA[57600&nbsp;bps]]></programlisting>
</listitem>
<listitem>
<para>在程式名稱與版號之間:</para>
- <programlisting><![ CDATA [FreeBSD&nbsp;4.7]]></programlisting>
+ <programlisting><![CDATA[FreeBSD&nbsp;4.7]]></programlisting>
</listitem>
<listitem>
<para>multiword 之間 (使用時請小心,像是 <quote>The FreeBSD Brazilian
Portuguese Documentation Project</quote> 這類由三到四個字所組成的,
則不用加。):</para>
- <programlisting><![ CDATA [Sun&nbsp;Microsystems]]></programlisting>
+ <programlisting><![CDATA[Sun&nbsp;Microsystems]]></programlisting>
</listitem>
</itemizedlist>
</sect2>
diff --git a/zh_TW.Big5/books/handbook/Makefile b/zh_TW.Big5/books/handbook/Makefile
index c7a3585dc2..5c92346891 100644
--- a/zh_TW.Big5/books/handbook/Makefile
+++ b/zh_TW.Big5/books/handbook/Makefile
@@ -260,30 +260,43 @@ DOC_PREFIX?= ${.CURDIR}/../../..
#
# rules generating lists of mirror site from XML database.
#
-XMLDOCS= mirrors-ftp:::mirrors.xml.ftp.inc \
+XMLDOCS= lastmod:::mirrors.lastmod.inc \
+ mirrors-ftp-index:::mirrors.xml.ftp.index.inc \
+ mirrors-ftp:::mirrors.xml.ftp.inc \
+ mirrors-cvsup-index:::mirrors.xml.cvsup.index.inc \
mirrors-cvsup:::mirrors.xml.cvsup.inc \
+ eresources-index:::eresources.xml.www.index.inc \
eresources:::eresources.xml.www.inc
DEPENDSET.DEFAULT= transtable mirror
XSLT.DEFAULT= ${XSL_MIRRORS}
XML.DEFAULT= ${XML_MIRRORS}
-NO_TIDY.DEFAULT= yes
+PARAMS.lastmod+= --param 'target' "'lastmod'"
+PARAMS.mirrors-ftp-index+= --param 'type' "'ftp'" \
+ --param 'proto' "'ftp'" \
+ --param 'target' "'index'"
PARAMS.mirrors-ftp+= --param 'type' "'ftp'" \
--param 'proto' "'ftp'" \
--param 'target' "'handbook/mirrors/chapter.xml'"
+PARAMS.mirrors-cvsup-index+= --param 'type' "'cvsup'" \
+ --param 'proto' "'cvsup'" \
+ --param 'target' "'index'"
PARAMS.mirrors-cvsup+= --param 'type' "'cvsup'" \
--param 'proto' "'cvsup'" \
--param 'target' "'handbook/mirrors/chapter.xml'"
+PARAMS.eresources-index+= --param 'type' "'www'" \
+ --param 'proto' "'http'" \
+ --param 'target' "'index'"
PARAMS.eresources+= --param 'type' "'www'" \
--param 'proto' "'http'" \
--param 'target' "'handbook/eresources/chapter.xml'"
-SRCS+= mirrors.xml.ftp.inc \
+SRCS+= mirrors.lastmod.inc \
+ mirrors.xml.ftp.inc \
+ mirrors.xml.ftp.index.inc \
mirrors.xml.cvsup.inc \
- eresources.xml.www.inc
-
-CLEANFILES+= mirrors.xml.ftp.inc \
- mirrors.xml.cvsup.inc \
- eresources.xml.www.inc
+ mirrors.xml.cvsup.index.inc \
+ eresources.xml.www.inc \
+ eresources.xml.www.index.inc
.include "${DOC_PREFIX}/share/mk/doc.project.mk"
diff --git a/zh_TW.Big5/books/handbook/advanced-networking/chapter.xml b/zh_TW.Big5/books/handbook/advanced-networking/chapter.xml
index 1ad1706ea8..ad4e269ce1 100644
--- a/zh_TW.Big5/books/handbook/advanced-networking/chapter.xml
+++ b/zh_TW.Big5/books/handbook/advanced-networking/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="big5" standalone="no"?>
+<?xml version="1.0" encoding="big5"?>
<!--
The FreeBSD Documentation Project
@@ -1954,7 +1954,7 @@ wpa_pairwise=CCMP TKIP <co id="co-ap-wpapsk-pwise"/></programlisting>
<para>The next step is to start
<application>hostapd</application>:</para>
- <screen>&prompt.root <userinput>/etc/rc.d/hostapd forcestart</userinput></screen>
+ <screen>&prompt.root; <userinput>/etc/rc.d/hostapd forcestart</userinput></screen>
<screen>&prompt.root; <userinput>ifconfig <replaceable>ath0</replaceable></userinput>
ath0: flags=8843&lt;UP,BROADCAST,RUNNING,SIMPLEX,MULTICAST&gt; mtu 2290
@@ -5533,7 +5533,7 @@ ifconfig_carp1="vhid 2 advskew 100 pass testpass 192.168.1.51/24"</programlistin
should be issued on
<hostid>provider.example.org</hostid>:</para>
- <screen>&prompt.root; <userinput>ifconfig carp0 down && ifconfig carp0 up</userinput></screen>
+ <screen>&prompt.root; <userinput>ifconfig carp0 down &amp;&amp; ifconfig carp0 up</userinput></screen>
<para>This should be done on the <devicename>carp</devicename>
interface which corresponds to the correct host.</para>
diff --git a/zh_TW.Big5/books/handbook/audit/chapter.xml b/zh_TW.Big5/books/handbook/audit/chapter.xml
index 79179f96ac..3a431cfb20 100644
--- a/zh_TW.Big5/books/handbook/audit/chapter.xml
+++ b/zh_TW.Big5/books/handbook/audit/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="big5" standalone="no"?>
+<?xml version="1.0" encoding="big5"?>
<!--
The FreeBSD Documentation Project
$FreeBSD$
diff --git a/zh_TW.Big5/books/handbook/basics/chapter.xml b/zh_TW.Big5/books/handbook/basics/chapter.xml
index 520d95adbd..e4e1e89f85 100644
--- a/zh_TW.Big5/books/handbook/basics/chapter.xml
+++ b/zh_TW.Big5/books/handbook/basics/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="big5" standalone="no"?>
+<?xml version="1.0" encoding="big5"?>
<!--
The FreeBSD Documentation Project
@@ -808,7 +808,7 @@ total 530
<entry>存放各種用途的 log 檔、臨時或暫時存放、列印或郵件的
spool 檔案。有時候,memory-based 檔案系統也會掛載在
<filename class="directory">/var</filename>。
- 這些瑣事可透過 varmfs 相關的 &man.rc.conf.5
+ 這些瑣事可透過 varmfs 相關的 &man.rc.conf.5;
環境變數來自動完成。(或是在
<filename>/etc/fstab</filename> 內做設定,相關細節請參閱
&man.mdmfs.8;。)</entry>
@@ -1083,7 +1083,7 @@ total 530
</itemizedlist>
<para>檔案系統包含在分割區裡面。
- 因為 &os; 承襲 &unix 架構,這邊講的分割區和一般提到的分割區
+ 因為 &os; 承襲 &unix; 架構,這邊講的分割區和一般提到的分割區
(例如 &ms-dos; 分割區) 不同。 每一個分割區由一個代號(字母)表示,從
<literal>a</literal> 到 <literal>h</literal>。
每個分割區只能包含一個檔案系統。
diff --git a/zh_TW.Big5/books/handbook/bibliography/chapter.xml b/zh_TW.Big5/books/handbook/bibliography/chapter.xml
index 367ed55a18..5f8fd5d824 100644
--- a/zh_TW.Big5/books/handbook/bibliography/chapter.xml
+++ b/zh_TW.Big5/books/handbook/bibliography/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="big5" standalone="no"?>
+<?xml version="1.0" encoding="big5"?>
<!--
The FreeBSD Documentation Project
diff --git a/zh_TW.Big5/books/handbook/book.xml b/zh_TW.Big5/books/handbook/book.xml
index 272f315b40..f41b68b982 100644
--- a/zh_TW.Big5/books/handbook/book.xml
+++ b/zh_TW.Big5/books/handbook/book.xml
@@ -1,8 +1,6 @@
-<?xml version="1.0" encoding="big5" standalone="no"?>
-<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//TW" "../../share/xml/entities.ent">
-%entities;
+<?xml version="1.0" encoding="big5"?>
+<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd" [
<!ENTITY % chapters SYSTEM "chapters.ent">
%chapters;
<!ENTITY % txtfiles SYSTEM "txtfiles.ent">
diff --git a/zh_TW.Big5/books/handbook/boot/chapter.xml b/zh_TW.Big5/books/handbook/boot/chapter.xml
index 9147e51406..5400fc8b2c 100644
--- a/zh_TW.Big5/books/handbook/boot/chapter.xml
+++ b/zh_TW.Big5/books/handbook/boot/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="big5" standalone="no"?>
+<?xml version="1.0" encoding="big5"?>
<!--
The FreeBSD Documentation Project
diff --git a/zh_TW.Big5/books/handbook/chapters.ent b/zh_TW.Big5/books/handbook/chapters.ent
index 8868fe9a40..177bf80f5b 100644
--- a/zh_TW.Big5/books/handbook/chapters.ent
+++ b/zh_TW.Big5/books/handbook/chapters.ent
@@ -11,231 +11,61 @@
Original revision: 1.33
-->
-<!ENTITY % not.published "INCLUDE">
-
-<!ENTITY % chap.introduction "IGNORE">
-<!ENTITY % chap.install "IGNORE">
-<!ENTITY % chap.basics "IGNORE">
-<!ENTITY % chap.ports "IGNORE">
-<!ENTITY % chap.config "IGNORE">
-<!ENTITY % chap.boot "IGNORE">
-<!ENTITY % chap.users "IGNORE">
-<!ENTITY % chap.kernelconfig "IGNORE">
-<!ENTITY % chap.security "IGNORE">
-<!ENTITY % chap.jails "IGNORE">
-<!ENTITY % chap.printing "IGNORE">
-<!ENTITY % chap.disks "IGNORE">
-<!ENTITY % chap.geom "IGNORE">
-<!ENTITY % chap.vinum "IGNORE">
-<!ENTITY % chap.x11 "IGNORE">
-<!ENTITY % chap.l10n "IGNORE">
-<!ENTITY % chap.multimedia "IGNORE">
-<!ENTITY % chap.desktop "IGNORE">
-<!ENTITY % chap.serialcomms "IGNORE">
-<!ENTITY % chap.ppp-and-slip "IGNORE">
-<!ENTITY % chap.advanced-networking "IGNORE">
-<!ENTITY % chap.firewalls "IGNORE">
-<!ENTITY % chap.network-servers "IGNORE">
-<!ENTITY % chap.mail "IGNORE">
-<!ENTITY % chap.cutting-edge "IGNORE">
-<!ENTITY % chap.linuxemu "IGNORE">
-<!ENTITY % chap.mirrors "IGNORE">
-<!ENTITY % chap.mirrors.ftp.inc "INCLUDE">
-<!ENTITY % chap.mirrors.cvsup.inc "INCLUDE">
-<!ENTITY % chap.bibliography "IGNORE">
-<!ENTITY % chap.eresources "IGNORE">
-<!ENTITY % chap.eresources.www.inc "INCLUDE">
-<!ENTITY % chap.pgpkeys "IGNORE">
-<!ENTITY % chap.index "IGNORE">
-<!ENTITY % chap.freebsd-glossary "IGNORE">
-<!ENTITY % chap.mac "IGNORE">
-<!ENTITY % chap.audit "IGNORE">
-<!ENTITY % chap.filesystems "IGNORE">
-<!ENTITY % chap.dtrace "IGNORE">
-
<!ENTITY chap.preface SYSTEM "preface/preface.xml">
<!ENTITY % pgpkeys SYSTEM "../../../share/pgpkeys/pgpkeys.ent"> %pgpkeys;
<!-- Part One -->
-<![%chap.introduction;[
<!ENTITY chap.introduction SYSTEM "introduction/chapter.xml">
-]]>
-<![%chap.install;[
<!ENTITY chap.install SYSTEM "install/chapter.xml">
-]]>
-<![%chap.basics;[
<!ENTITY chap.basics SYSTEM "basics/chapter.xml">
-]]>
-<![%chap.ports;[
<!ENTITY chap.ports SYSTEM "ports/chapter.xml">
-]]>
-<![%chap.x11;[
<!ENTITY chap.x11 SYSTEM "x11/chapter.xml">
-]]>
<!-- Part Two -->
-<![%chap.desktop;[
<!ENTITY chap.desktop SYSTEM "desktop/chapter.xml">
-]]>
-<![%chap.multimedia;[
<!ENTITY chap.multimedia SYSTEM "multimedia/chapter.xml">
-]]>
-<![%chap.kernelconfig;[
<!ENTITY chap.kernelconfig SYSTEM "kernelconfig/chapter.xml">
-]]>
-<![%chap.printing;[
<!ENTITY chap.printing SYSTEM "printing/chapter.xml">
-]]>
-<![%chap.linuxemu;[
<!ENTITY chap.linuxemu SYSTEM "linuxemu/chapter.xml">
-]]>
<!-- Part Three -->
-<![%chap.config;[
<!ENTITY chap.config SYSTEM "config/chapter.xml">
-]]>
-<![%chap.boot;[
<!ENTITY chap.boot SYSTEM "boot/chapter.xml">
-]]>
-<![%chap.users;[
<!ENTITY chap.users SYSTEM "users/chapter.xml">
-]]>
-<![%chap.security;[
<!ENTITY chap.security SYSTEM "security/chapter.xml">
-]]>
-<![%chap.jails;[
<!ENTITY chap.jails SYSTEM "jails/chapter.xml">
-]]>
-<![%chap.mac;[
<!ENTITY chap.mac SYSTEM "mac/chapter.xml">
-]]>
-<![%chap.audit;[
<!ENTITY chap.audit SYSTEM "audit/chapter.xml">
-]]>
-<![%chap.disks;[
<!ENTITY chap.disks SYSTEM "disks/chapter.xml">
-]]>
-<![%chap.geom;[
<!ENTITY chap.geom SYSTEM "geom/chapter.xml">
-]]>
-<![%chap.filesystems;[
<!ENTITY chap.filesystems SYSTEM "filesystems/chapter.xml">
-]]>
-<![%chap.vinum;[
<!ENTITY chap.vinum SYSTEM "vinum/chapter.xml">
-]]>
-<![%chap.virtualization;[
<!ENTITY chap.virtualization SYSTEM "virtualization/chapter.xml">
-]]>
-<![%chap.l10n;[
<!ENTITY chap.l10n SYSTEM "l10n/chapter.xml">
-]]>
-<![%chap.cutting-edge;[
<!ENTITY chap.cutting-edge SYSTEM "cutting-edge/chapter.xml">
-]]>
-<![%chap.dtrace;[
<!ENTITY chap.dtrace SYSTEM "dtrace/chapter.xml">
-]]>
<!-- Part Four -->
-<![%chap.serialcomms;[
<!ENTITY chap.serialcomms SYSTEM "serialcomms/chapter.xml">
-]]>
-<![%chap.ppp-and-slip;[
<!ENTITY chap.ppp-and-slip SYSTEM "ppp-and-slip/chapter.xml">
-]]>
-<![%chap.mail;[
<!ENTITY chap.mail SYSTEM "mail/chapter.xml">
-]]>
-<![%chap.network-servers;[
<!ENTITY chap.network-servers SYSTEM "network-servers/chapter.xml">
-]]>
-<![%chap.firewalls;[
<!ENTITY chap.firewalls SYSTEM "firewalls/chapter.xml">
-]]>
-<![%chap.advanced-networking;[
<!ENTITY chap.advanced-networking SYSTEM "advanced-networking/chapter.xml">
-]]>
<!-- Part Five (appendices) -->
-<![%chap.mirrors;[
<!ENTITY chap.mirrors SYSTEM "mirrors/chapter.xml">
-]]>
-<![%chap.mirrors.ftp.inc;[
+ <!ENTITY chap.mirrors.lastmod.inc SYSTEM "mirrors.lastmod.inc">
+ <!ENTITY chap.mirrors.ftp.index.inc SYSTEM "mirrors.xml.ftp.index.inc">
<!ENTITY chap.mirrors.ftp.inc SYSTEM "mirrors.xml.ftp.inc">
-]]>
-<![%chap.mirrors.cvsup.inc;[
+ <!ENTITY chap.mirrors.cvsup.index.inc SYSTEM "mirrors.xml.cvsup.index.inc">
<!ENTITY chap.mirrors.cvsup.inc SYSTEM "mirrors.xml.cvsup.inc">
-]]>
-<![%chap.bibliography;[
<!ENTITY chap.bibliography SYSTEM "bibliography/chapter.xml">
-]]>
-<![%chap.eresources;[
<!ENTITY chap.eresources SYSTEM "eresources/chapter.xml">
-]]>
-<![%chap.eresources.www.inc;[
+ <!ENTITY chap.eresources.www.index.inc SYSTEM "eresources.xml.www.index.inc">
<!ENTITY chap.eresources.www.inc SYSTEM "eresources.xml.www.inc">
-]]>
-<![%chap.pgpkeys;[
<!ENTITY chap.pgpkeys SYSTEM "pgpkeys/chapter.xml">
-]]>
-<![%chap.freebsd-glossary;[
<!ENTITY chap.freebsd-glossary "&freebsd-glossary;">
-]]>
-<![%chap.index;[
- <!ENTITY chap.index SYSTEM "index.xml">
-]]>
+ <!ENTITY chap.index "">
<!ENTITY chap.colophon SYSTEM "colophon.xml">
-
-<!-- IGNORE cases -->
-
-<!-- Part One -->
-<!ENTITY chap.introduction "">
-<!ENTITY chap.install "">
-<!ENTITY chap.basics "">
-<!ENTITY chap.ports "">
-<!ENTITY chap.x11 "">
-
-<!-- Part Two -->
-<!ENTITY chap.desktop "">
-<!ENTITY chap.multimedia "">
-<!ENTITY chap.kernelconfig "">
-<!ENTITY chap.printing "">
-<!ENTITY chap.linuxemu "">
-
-<!-- Part Three -->
-<!ENTITY chap.config "">
-<!ENTITY chap.boot "">
-<!ENTITY chap.users "">
-<!ENTITY chap.security "">
-<!ENTITY chap.jails "">
-<!ENTITY chap.mac "">
-<!ENTITY chap.audit "">
-<!ENTITY chap.disks "">
-<!ENTITY chap.geom "">
-<!ENTITY chap.filesystems "">
-<!ENTITY chap.vinum "">
-<!ENTITY chap.virtualization "">
-<!ENTITY chap.l10n "">
-<!ENTITY chap.cutting-edge "">
-<!ENTITY chap.dtrace "">
-
-<!-- Part Four -->
-<!ENTITY chap.serialcomms "">
-<!ENTITY chap.ppp-and-slip "">
-<!ENTITY chap.mail "">
-<!ENTITY chap.network-servers "">
-<!ENTITY chap.firewalls "">
-<!ENTITY chap.advanced-networking "">
-
-<!-- Part Five (appendices) -->
-<!ENTITY chap.mirrors "">
-<!ENTITY chap.mirrors.ftp.inc "">
-<!ENTITY chap.mirrors.cvsup.inc "">
-<!ENTITY chap.bibliography "">
-<!ENTITY chap.eresources "">
-<!ENTITY chap.eresources.www.inc "">
-<!ENTITY chap.pgpkeys "">
-<!ENTITY chap.freebsd-glossary "">
-<!ENTITY chap.index "">
diff --git a/zh_TW.Big5/books/handbook/colophon.xml b/zh_TW.Big5/books/handbook/colophon.xml
index 3eedb9aed1..62f4bb0b8d 100644
--- a/zh_TW.Big5/books/handbook/colophon.xml
+++ b/zh_TW.Big5/books/handbook/colophon.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="big5" standalone="no"?>
+<?xml version="1.0" encoding="big5"?>
<!--
The FreeBSD Documentation Project
diff --git a/zh_TW.Big5/books/handbook/config/chapter.xml b/zh_TW.Big5/books/handbook/config/chapter.xml
index d21c12bc31..51b9f8a55e 100644
--- a/zh_TW.Big5/books/handbook/config/chapter.xml
+++ b/zh_TW.Big5/books/handbook/config/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="big5" standalone="no"?>
+<?xml version="1.0" encoding="big5"?>
<!--
The FreeBSD Documentation Project
@@ -352,7 +352,7 @@ stop)
kill -9 `cat /var/run/utility.pid`
;;
*)
- echo "Usage: `basename $0` {start|stop}" &gt;&2
+ echo "Usage: `basename $0` {start|stop}" &gt;&amp;2
exit 64
;;
esac
diff --git a/zh_TW.Big5/books/handbook/cutting-edge/chapter.xml b/zh_TW.Big5/books/handbook/cutting-edge/chapter.xml
index 4163460677..11534ff2c8 100644
--- a/zh_TW.Big5/books/handbook/cutting-edge/chapter.xml
+++ b/zh_TW.Big5/books/handbook/cutting-edge/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="big5" standalone="no"?>
+<?xml version="1.0" encoding="big5"?>
<!--
The FreeBSD Documentation Project
diff --git a/zh_TW.Big5/books/handbook/desktop/chapter.xml b/zh_TW.Big5/books/handbook/desktop/chapter.xml
index c6b809d735..25aa903c5f 100644
--- a/zh_TW.Big5/books/handbook/desktop/chapter.xml
+++ b/zh_TW.Big5/books/handbook/desktop/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="big5" standalone="no"?>
+<?xml version="1.0" encoding="big5"?>
<!--
The FreeBSD Documentation Project
$FreeBSD$
diff --git a/zh_TW.Big5/books/handbook/disks/chapter.xml b/zh_TW.Big5/books/handbook/disks/chapter.xml
index 0a3fc849fa..c5708b1ab8 100644
--- a/zh_TW.Big5/books/handbook/disks/chapter.xml
+++ b/zh_TW.Big5/books/handbook/disks/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="big5" standalone="no"?>
+<?xml version="1.0" encoding="big5"?>
<!--
The FreeBSD Documentation Project
@@ -416,7 +416,7 @@ ad3: 29333MB &lt;WDC WD307AA&gt; [59598/16/63] at ata1-slave UDMA33</programlist
。</para></note>
<para>接下來,考慮如何將它們變成檔案系統的一部份。您可以參考
- &man.vinum.8;(<xref linkend="vinum-vinum"/>) 及 &man.ccd.4。
+ &man.vinum.8;(<xref linkend="vinum-vinum"/>) 及 &man.ccd.4;。
在此我們選擇 &man.ccd.4;。</para>
</sect4>
@@ -2524,7 +2524,7 @@ sa0(ncr1:4:0): Logical unit is in process of becoming ready</screen>
<example>
<title>A Script for Creating a Bootable Floppy</title>
- <programlisting><![ CDATA [#!/bin/sh
+ <programlisting><![CDATA[#!/bin/sh
#
# create a restore floppy
#
@@ -2736,16 +2736,6 @@ echo "The floppy has been unmounted and is now ready."]]></programlisting>
Whatever caused the crash or data loss may strike again. Another
hour spent now may save you from further distress later.</para>
</sect3>
-
-<![ %not.published; [
-
- <sect3>
- <title>* I Did Not Prepare for the Disaster, What Now?</title>
-
- <para></para>
- </sect3>
-]]>
-
</sect2>
</sect1>
diff --git a/zh_TW.Big5/books/handbook/eresources/chapter.xml b/zh_TW.Big5/books/handbook/eresources/chapter.xml
index a48da1f8fb..104be5ccc5 100644
--- a/zh_TW.Big5/books/handbook/eresources/chapter.xml
+++ b/zh_TW.Big5/books/handbook/eresources/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="big5" standalone="no"?>
+<?xml version="1.0" encoding="big5"?>
<!--
The FreeBSD Documentation Project
@@ -1633,6 +1633,10 @@
<sect1 id="eresources-web">
<title>World Wide Web Servers</title>
+ &chap.eresources.www.index.inc;
+
+ &chap.mirrors.lastmod.inc;
+
&chap.eresources.www.inc;
</sect1>
diff --git a/zh_TW.Big5/books/handbook/firewalls/chapter.xml b/zh_TW.Big5/books/handbook/firewalls/chapter.xml
index 8fa7476433..ac4dcd058f 100644
--- a/zh_TW.Big5/books/handbook/firewalls/chapter.xml
+++ b/zh_TW.Big5/books/handbook/firewalls/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="big5" standalone="no"?>
+<?xml version="1.0" encoding="big5"?>
<!--
The FreeBSD Documentation Project
diff --git a/zh_TW.Big5/books/handbook/geom/chapter.xml b/zh_TW.Big5/books/handbook/geom/chapter.xml
index 1672ae11f8..a5dcddefe2 100644
--- a/zh_TW.Big5/books/handbook/geom/chapter.xml
+++ b/zh_TW.Big5/books/handbook/geom/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="big5" standalone="no"?>
+<?xml version="1.0" encoding="big5"?>
<!--
The FreeBSD Documentation Project
$FreeBSD$
diff --git a/zh_TW.Big5/books/handbook/install/chapter.xml b/zh_TW.Big5/books/handbook/install/chapter.xml
index 287f376a5a..a3e7a65571 100644
--- a/zh_TW.Big5/books/handbook/install/chapter.xml
+++ b/zh_TW.Big5/books/handbook/install/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="big5" standalone="no"?>
+<?xml version="1.0" encoding="big5"?>
<!--
The FreeBSD Documentation Project
@@ -1989,7 +1989,7 @@ Mounting root from ufs:/dev/md0c
The Ports Collection is a very valuable resource and well worth having
on your /usr partition, so it is advisable to say Yes to this option.
- For more information on the Ports Collection & the latest ports,
+ For more information on the Ports Collection &amp; the latest ports,
visit:
http://www.FreeBSD.org/ports
diff --git a/zh_TW.Big5/books/handbook/introduction/chapter.xml b/zh_TW.Big5/books/handbook/introduction/chapter.xml
index 008865a193..4f922856af 100644
--- a/zh_TW.Big5/books/handbook/introduction/chapter.xml
+++ b/zh_TW.Big5/books/handbook/introduction/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="big5" standalone="no"?>
+<?xml version="1.0" encoding="big5"?>
<!--
The FreeBSD Documentation Project
diff --git a/zh_TW.Big5/books/handbook/jails/chapter.xml b/zh_TW.Big5/books/handbook/jails/chapter.xml
index a82c543e54..be2d18f77f 100644
--- a/zh_TW.Big5/books/handbook/jails/chapter.xml
+++ b/zh_TW.Big5/books/handbook/jails/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="big5" standalone="no"?>
+<?xml version="1.0" encoding="big5"?>
<!--
The FreeBSD Documentation Project
diff --git a/zh_TW.Big5/books/handbook/kernelconfig/chapter.xml b/zh_TW.Big5/books/handbook/kernelconfig/chapter.xml
index 565f01e21a..f0f37d3eec 100644
--- a/zh_TW.Big5/books/handbook/kernelconfig/chapter.xml
+++ b/zh_TW.Big5/books/handbook/kernelconfig/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="big5" standalone="no"?>
+<?xml version="1.0" encoding="big5"?>
<!--
The FreeBSD Documentation Project
@@ -404,7 +404,7 @@ ath_hal(4) - Atheros Hardware Access Layer (HAL)</programlisting>
<para>若為了測試,而需要一份含有所有可用設定的設定檔,那麼請以
<username>root</username> 身份下:</para>
- <screen>&prompt.root; <userinput>cd /usr/src/sys/<replaceable>i386</replaceable>/conf && make LINT</userinput></screen>
+ <screen>&prompt.root; <userinput>cd /usr/src/sys/<replaceable>i386</replaceable>/conf &amp;&amp; make LINT</userinput></screen>
</note>
<indexterm>
@@ -1036,7 +1036,7 @@ device re # RealTek 8139C+/8169/8169S/8110S
device rl # RealTek 8129/8139
device sf # Adaptec AIC-6915 (<quote>Starfire</quote>)
device sis # Silicon Integrated Systems SiS 900/SiS 7016
-device sk # SysKonnect SK-984x & SK-982x gigabit Ethernet
+device sk # SysKonnect SK-984x &amp; SK-982x gigabit Ethernet
device ste # Sundance ST201 (D-Link DFE-550TX)
device stge # Sundance/Tamarack TC9021 gigabit Ethernet
device ti # Alteon Networks Tigon I/II gigabit Ethernet
diff --git a/zh_TW.Big5/books/handbook/l10n/chapter.xml b/zh_TW.Big5/books/handbook/l10n/chapter.xml
index f6d7e448f9..4029f6e690 100644
--- a/zh_TW.Big5/books/handbook/l10n/chapter.xml
+++ b/zh_TW.Big5/books/handbook/l10n/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="big5" standalone="no"?>
+<?xml version="1.0" encoding="big5"?>
<!--
The FreeBSD Documentation Project
diff --git a/zh_TW.Big5/books/handbook/linuxemu/chapter.xml b/zh_TW.Big5/books/handbook/linuxemu/chapter.xml
index 8adac61fe3..57786fced7 100644
--- a/zh_TW.Big5/books/handbook/linuxemu/chapter.xml
+++ b/zh_TW.Big5/books/handbook/linuxemu/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="big5" standalone="no"?>
+<?xml version="1.0" encoding="big5"?>
<!--
The FreeBSD Documentation Project
@@ -600,14 +600,14 @@ LOG=/var/log/lmgrd.log
case "$1" in
start)
- lmgrd -c ${LICENSE_FILE} 2&gt;&gt; ${LOG} 1&gt;&2
+ lmgrd -c ${LICENSE_FILE} 2&gt;&gt; ${LOG} 1&gt;&amp;2
echo -n " lmgrd"
;;
stop)
- lmgrd -c ${LICENSE_FILE} -x lmdown 2&gt;&gt; ${LOG} 1&gt;&2
+ lmgrd -c ${LICENSE_FILE} -x lmdown 2&gt;&gt; ${LOG} 1&gt;&amp;2
;;
*)
- echo "Usage: `basename $0` {start|stop}" 1&gt;&2
+ echo "Usage: `basename $0` {start|stop}" 1&gt;&amp;2
exit 64
;;
esac
@@ -886,7 +886,7 @@ exit 0</programlisting>
contain the following:</para>
<programlisting>#!/usr/compat/linux/bin/sh
-(sleep 5; killall -1 matlab_helper) &
+(sleep 5; killall -1 matlab_helper) &amp;
exit 0</programlisting>
</step>
diff --git a/zh_TW.Big5/books/handbook/mac/chapter.xml b/zh_TW.Big5/books/handbook/mac/chapter.xml
index 54fb1b8cec..cfca14a62a 100644
--- a/zh_TW.Big5/books/handbook/mac/chapter.xml
+++ b/zh_TW.Big5/books/handbook/mac/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="big5" standalone="no"?>
+<?xml version="1.0" encoding="big5"?>
<!--
The FreeBSD Documentation Project
$FreeBSD$
@@ -1766,7 +1766,7 @@ mac_partition_load="YES"</programlisting>
The following <command>sh</command> script should do the
trick:</para>
- <screen>&prompt.root; <userinput>for x in `awk -F: '($3 >= 1001) && ($3 != 65534) { print $1 }' \</userinput>
+ <screen>&prompt.root; <userinput>for x in `awk -F: '($3 >= 1001) &amp;&amp; ($3 != 65534) { print $1 }' \</userinput>
<userinput>/etc/passwd`; do pw usermod $x -L insecure; done;</userinput></screen>
<para>The <command>cap_mkdb</command> command will need to be
@@ -1949,7 +1949,7 @@ round-trip min/avg/max/stddev = 204.455/204.455/204.455/0.000 ms</screen>
test1: biba/equal,mls/equal
&prompt.root; <userinput>setfmac biba/low test1 test2; setfmac biba/high test4 test5; \
setfmac mls/low test1 test3; setfmac mls/high test2 test4</userinput>
-&prompt.root; <userinput>setfmac mls/equal,biba/equal test3 && getfmac test?</userinput>
+&prompt.root; <userinput>setfmac mls/equal,biba/equal test3 &amp;&amp; getfmac test?</userinput>
test1: biba/low,mls/low
test2: biba/low,mls/high
test3: biba/equal,mls/equal
@@ -2038,7 +2038,7 @@ cat: test4: Permission denied</screen>
<para>Every user should now be placed in the default class;
a command such as:</para>
- <screen>&prompt.root; <userinput>for x in `awk -F: '($3 >= 1001) && ($3 != 65534) { print $1 }' \</userinput>
+ <screen>&prompt.root; <userinput>for x in `awk -F: '($3 >= 1001) &amp;&amp; ($3 != 65534) { print $1 }' \</userinput>
<userinput>/etc/passwd`; do pw usermod $x -L default; done;</userinput></screen>
<para>will accomplish this task in a few moments.</para>
diff --git a/zh_TW.Big5/books/handbook/mail/chapter.xml b/zh_TW.Big5/books/handbook/mail/chapter.xml
index cdbd8183db..fe4683e079 100644
--- a/zh_TW.Big5/books/handbook/mail/chapter.xml
+++ b/zh_TW.Big5/books/handbook/mail/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="big5" standalone="no"?>
+<?xml version="1.0" encoding="big5"?>
<!--
The FreeBSD Documentation Project
@@ -1699,11 +1699,11 @@ SENDMAIL_LDADD=-lsasl2</programlisting>
<para>Recompile <application>sendmail</application> by executing the following commands:</para>
<screen>&prompt.root; <userinput>cd /usr/src/lib/libsmutil</userinput>
-&prompt.root; <userinput>make cleandir && make obj && make</userinput>
+&prompt.root; <userinput>make cleandir &amp;&amp; make obj &amp;&amp; make</userinput>
&prompt.root; <userinput>cd /usr/src/lib/libsm</userinput>
-&prompt.root; <userinput>make cleandir && make obj && make</userinput>
+&prompt.root; <userinput>make cleandir &amp;&amp; make obj &amp;&amp; make</userinput>
&prompt.root; <userinput>cd /usr/src/usr.sbin/sendmail</userinput>
-&prompt.root; <userinput>make cleandir && make obj && make && make install</userinput></screen>
+&prompt.root; <userinput>make cleandir &amp;&amp; make obj &amp;&amp; make &amp;&amp; make install</userinput></screen>
<para>The compile of <application>sendmail</application> should not have any problems
if <filename>/usr/src</filename> has not been changed extensively
diff --git a/zh_TW.Big5/books/handbook/mirrors/chapter.xml b/zh_TW.Big5/books/handbook/mirrors/chapter.xml
index 8c525d3737..355ba68d8c 100644
--- a/zh_TW.Big5/books/handbook/mirrors/chapter.xml
+++ b/zh_TW.Big5/books/handbook/mirrors/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="big5" standalone="no"?>
+<?xml version="1.0" encoding="big5"?>
<!--
The FreeBSD Documentation Project
@@ -270,6 +270,10 @@
methods available for each site are provided in parentheses
after the hostname.</para>
+ &chap.mirrors.ftp.index.inc;
+
+ &chap.mirrors.lastmod.inc;
+
&chap.mirrors.ftp.inc;
</sect1>
@@ -2323,6 +2327,10 @@ doc/zh_*</screen>
<para><link linkend="cvsup">CVSup</link> servers for FreeBSD are running
at the following sites:</para>
+ &chap.mirrors.cvsup.index.inc;
+
+ &chap.mirrors.lastmod.inc;
+
&chap.mirrors.cvsup.inc;
</sect2>
</sect1>
diff --git a/zh_TW.Big5/books/handbook/multimedia/chapter.xml b/zh_TW.Big5/books/handbook/multimedia/chapter.xml
index 5f4e5ff04f..1d0756d4d9 100644
--- a/zh_TW.Big5/books/handbook/multimedia/chapter.xml
+++ b/zh_TW.Big5/books/handbook/multimedia/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="big5" standalone="no"?>
+<?xml version="1.0" encoding="big5"?>
<!--
The FreeBSD Documentation Project
diff --git a/zh_TW.Big5/books/handbook/network-servers/chapter.xml b/zh_TW.Big5/books/handbook/network-servers/chapter.xml
index db5c8a9d23..92a98f24de 100644
--- a/zh_TW.Big5/books/handbook/network-servers/chapter.xml
+++ b/zh_TW.Big5/books/handbook/network-servers/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="big5" standalone="no"?>
+<?xml version="1.0" encoding="big5"?>
<!--
The FreeBSD Documentation Project
diff --git a/zh_TW.Big5/books/handbook/pgpkeys/chapter.xml b/zh_TW.Big5/books/handbook/pgpkeys/chapter.xml
index 76a9b52ab0..048980e0fc 100644
--- a/zh_TW.Big5/books/handbook/pgpkeys/chapter.xml
+++ b/zh_TW.Big5/books/handbook/pgpkeys/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="big5" standalone="no"?>
+<?xml version="1.0" encoding="big5"?>
<!--
The FreeBSD Documentation Project
diff --git a/zh_TW.Big5/books/handbook/ports/chapter.xml b/zh_TW.Big5/books/handbook/ports/chapter.xml
index 2f02e8dc4f..fa6bb9e6be 100644
--- a/zh_TW.Big5/books/handbook/ports/chapter.xml
+++ b/zh_TW.Big5/books/handbook/ports/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="big5" standalone="no"?>
+<?xml version="1.0" encoding="big5"?>
<!--
The FreeBSD Documentation Project
diff --git a/zh_TW.Big5/books/handbook/ppp-and-slip/chapter.xml b/zh_TW.Big5/books/handbook/ppp-and-slip/chapter.xml
index 63f249fff9..234cd31fd2 100644
--- a/zh_TW.Big5/books/handbook/ppp-and-slip/chapter.xml
+++ b/zh_TW.Big5/books/handbook/ppp-and-slip/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="big5" standalone="no"?>
+<?xml version="1.0" encoding="big5"?>
<!--
The FreeBSD Documentation Project
@@ -394,7 +394,7 @@
</varlistentry>
<varlistentry>
- <term>Line 6 & 7:</term>
+ <term>Line 6 &amp; 7:</term>
<listitem>
<indexterm><primary>PPP</primary><secondary>user PPP</secondary></indexterm>
@@ -474,7 +474,7 @@
</varlistentry>
<varlistentry>
- <term>Line 13 & 14:</term>
+ <term>Line 13 &amp; 14:</term>
<listitem>
<para>Identifies the user name and password. When
@@ -1705,7 +1705,7 @@ reinput 1 {\255}
if success goto slhup
reinput 1 {\127}
if success goto slhup
-if < \%x 60 goto look
+if &lt; \%x 60 goto look
else goto slhup
:sllogin ; login
@@ -1726,7 +1726,7 @@ reinput 1 {\255}
if success goto slhup
reinput 1 {\127}
if success goto slhup
-if < \%x 10 goto slloop ; try 10 times to get a login prompt
+if &lt; \%x 10 goto slloop ; try 10 times to get a login prompt
else goto slhup ; hang up and start again if 10 failures
:sluid
diff --git a/zh_TW.Big5/books/handbook/preface/preface.xml b/zh_TW.Big5/books/handbook/preface/preface.xml
index d0e0df49fb..5c0bfca6e1 100644
--- a/zh_TW.Big5/books/handbook/preface/preface.xml
+++ b/zh_TW.Big5/books/handbook/preface/preface.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="big5" standalone="no"?>
+<?xml version="1.0" encoding="big5"?>
<!--
$FreeBSD$
Original revision: 1.30
diff --git a/zh_TW.Big5/books/handbook/printing/chapter.xml b/zh_TW.Big5/books/handbook/printing/chapter.xml
index 70a39ed58a..acec03c739 100644
--- a/zh_TW.Big5/books/handbook/printing/chapter.xml
+++ b/zh_TW.Big5/books/handbook/printing/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="big5" standalone="no"?>
+<?xml version="1.0" encoding="big5"?>
<!--
The FreeBSD Traditional Chinese Documentation Project
diff --git a/zh_TW.Big5/books/handbook/security/chapter.xml b/zh_TW.Big5/books/handbook/security/chapter.xml
index 46de8b93d5..bc48598f6d 100644
--- a/zh_TW.Big5/books/handbook/security/chapter.xml
+++ b/zh_TW.Big5/books/handbook/security/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="big5" standalone="no"?>
+<?xml version="1.0" encoding="big5"?>
<!--
The FreeBSD Documentation Project
@@ -4771,7 +4771,7 @@ drwxr-xr-x 2 robert robert 512 Nov 10 11:54 public_html</programlisting>
<para>To begin using <application>Portaudit</application>, one
must install it from the Ports Collection:</para>
- <screen>&prompt.root; <userinput>cd /usr/ports/security/portaudit && make install clean</userinput></screen>
+ <screen>&prompt.root; <userinput>cd /usr/ports/security/portaudit &amp;&amp; make install clean</userinput></screen>
<para>During the install process, the configuration files for
&man.periodic.8; will be updated, permitting
diff --git a/zh_TW.Big5/books/handbook/serialcomms/chapter.xml b/zh_TW.Big5/books/handbook/serialcomms/chapter.xml
index 69baac15f3..5725f9b081 100644
--- a/zh_TW.Big5/books/handbook/serialcomms/chapter.xml
+++ b/zh_TW.Big5/books/handbook/serialcomms/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="big5" standalone="no"?>
+<?xml version="1.0" encoding="big5"?>
<!--
The FreeBSD Documentation Project
diff --git a/zh_TW.Big5/books/handbook/users/chapter.xml b/zh_TW.Big5/books/handbook/users/chapter.xml
index 602de85923..39c1f2b237 100644
--- a/zh_TW.Big5/books/handbook/users/chapter.xml
+++ b/zh_TW.Big5/books/handbook/users/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="big5" standalone="no"?>
+<?xml version="1.0" encoding="big5"?>
<!--
The FreeBSD Documentation Project
diff --git a/zh_TW.Big5/books/handbook/vinum/chapter.xml b/zh_TW.Big5/books/handbook/vinum/chapter.xml
index ced70471b0..1e8a1cc888 100644
--- a/zh_TW.Big5/books/handbook/vinum/chapter.xml
+++ b/zh_TW.Big5/books/handbook/vinum/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="big5" standalone="no"?>
+<?xml version="1.0" encoding="big5"?>
<!--
The Vinum Volume Manager
By Greg Lehey (grog at lemis dot com)
diff --git a/zh_TW.Big5/books/handbook/virtualization/chapter.xml b/zh_TW.Big5/books/handbook/virtualization/chapter.xml
index 953e60f87c..5601b4b410 100644
--- a/zh_TW.Big5/books/handbook/virtualization/chapter.xml
+++ b/zh_TW.Big5/books/handbook/virtualization/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="big5" standalone="no"?>
+<?xml version="1.0" encoding="big5"?>
<!--
The FreeBSD Documentation Project
The FreeBSD Traditional Chinese Documentation Project
diff --git a/zh_TW.Big5/books/handbook/x11/chapter.xml b/zh_TW.Big5/books/handbook/x11/chapter.xml
index dde7754e40..1e50725cc1 100644
--- a/zh_TW.Big5/books/handbook/x11/chapter.xml
+++ b/zh_TW.Big5/books/handbook/x11/chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="big5" standalone="no"?>
+<?xml version="1.0" encoding="big5"?>
<!--
The FreeBSD Documentation Project
@@ -276,7 +276,7 @@
<para><application>&xorg;</application> 是 &os; 預設的 X11 實作。
<application>&xorg;</application> 是由 X.Org 基金會所發行之開放源碼軟體
X Window 系統實作的 X server。 <application>&xorg;</application>
- 乃是以 <application>&xfree86&nbsp;4.4RC2</application> 以及 X11R6.6
+ 乃是以 <application>&xfree86;&nbsp;4.4RC2</application> 以及 X11R6.6
為基礎所產生的。 目前 &os; Ports Collection 內的
<application>&xorg;</application> 版本為 &xorg.version;。</para>
diff --git a/zh_TW.Big5/books/porters-handbook/book.xml b/zh_TW.Big5/books/porters-handbook/book.xml
index e77cf24e87..5906438a2b 100644
--- a/zh_TW.Big5/books/porters-handbook/book.xml
+++ b/zh_TW.Big5/books/porters-handbook/book.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="big5" standalone="no"?>
-<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
- "../../../share/xml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//TW" "../../share/xml/entities.ent">
-%entities;
-]>
+<?xml version="1.0" encoding="big5"?>
+<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<!--
The FreeBSD Documentation Project
@@ -3512,8 +3509,8 @@ PKGNAMESUFFIX= ${RESOLUTION}
:
# default
RESOLUTION?= 300
-.if ${RESOLUTION} != 118 && ${RESOLUTION} != 240 && \
- ${RESOLUTION} != 300 && ${RESOLUTION} != 400
+.if ${RESOLUTION} != 118 &amp;&amp; ${RESOLUTION} != 240 &amp;&amp; \
+ ${RESOLUTION} != 300 &amp;&amp; ${RESOLUTION} != 400
@${ECHO_MSG} "Error: invalid value for RESOLUTION: \"${RESOLUTION}\""
@${ECHO_MSG} "Possible values are: 118, 240, 300 (default) and 400."
@${FALSE}
@@ -4053,7 +4050,7 @@ PORTVERSION= 1.0</programlisting>
<programlisting>post-install:
${MKDIR} ${EXAMPLESDIR}
- (cd ${WRKSRC}/examples/ && ${COPYTREE_SHARE} \* ${EXAMPLESDIR})</programlisting>
+ (cd ${WRKSRC}/examples/ &amp;&amp; ${COPYTREE_SHARE} \* ${EXAMPLESDIR})</programlisting>
<para>This example will install the contents of
<filename>examples</filename> directory in the vendor distfile to the
@@ -4061,7 +4058,7 @@ PORTVERSION= 1.0</programlisting>
<programlisting>post-install:
${MKDIR} ${DATADIR}/summer
- (cd ${WRKSRC}/temperatures/ && ${COPYTREE_SHARE} "June July August" ${DATADIR}/summer/)</programlisting>
+ (cd ${WRKSRC}/temperatures/ &amp;&amp; ${COPYTREE_SHARE} "June July August" ${DATADIR}/summer/)</programlisting>
<para>And this example will install the data of summer months to the
<filename>summer</filename> subdirectory of a
@@ -4074,7 +4071,7 @@ PORTVERSION= 1.0</programlisting>
<programlisting>post-install:
${MKDIR} ${EXAMPLESDIR}
- (cd ${WRKSRC}/examples/ && \
+ (cd ${WRKSRC}/examples/ &amp;&amp; \
${COPYTREE_SHARE} \* ${EXAMPLESDIR} "! -name Makefile")</programlisting>
<para>Note that these macros does not add the installed files to
@@ -5662,7 +5659,7 @@ QT_COMPONENTS= gui moc_build qmake_build rcc_build uic_build</programlisting>
<programlisting>HAS_CONFIGURE= yes
do-configure:
- @cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} \
+ @cd ${WRKSRC} &amp;&amp; ${SETENV} ${CONFIGURE_ENV} \
${QMAKE} -unix PREFIX=${PREFIX} texmaker.pro</programlisting>
<para>Note the similarity to the <command>qmake</command> line
@@ -8092,7 +8089,7 @@ CFLAGS+= -DLUA_VERSION_STRING="${VER_STR}"
chapter</ulink>. Detailed explanation of available commands is
provided in
&man.rc.8; and &man.rc.subr.8;. Finally, there is
- <ulink url="&url.articles.rc-scripting.en">an article</ulink>
+ <ulink url="&url.articles.rc-scripting.en;">an article</ulink>
on practical aspects of <filename>rc.d</filename> scripting.</para>
<para>One or more rc scripts can be installed:</para>
@@ -8421,7 +8418,7 @@ etc/orbit.conf.sample
<para>把這目錄架構存到新檔案。</para>
- <screen>&prompt.root; <userinput>(cd /var/tmp/$(make -V PORTNAME) && find -d * -type d) | sort &gt; OLD-DIRS</userinput></screen>
+ <screen>&prompt.root; <userinput>(cd /var/tmp/$(make -V PORTNAME) &amp;&amp; find -d * -type d) | sort &gt; OLD-DIRS</userinput></screen>
<para>新增空的 <filename>pkg-plist</filename> 檔案:</para>
@@ -8431,11 +8428,11 @@ etc/orbit.conf.sample
接著就可以安裝該 port 並產生檔案清單。</para>
<screen>&prompt.root; <userinput>make install PREFIX=/var/tmp/$(make -V PORTNAME)</userinput>
-&prompt.root; <userinput>(cd /var/tmp/$(make -V PORTNAME) && find -d * \! -type d) | sort &gt; pkg-plist</userinput></screen>
+&prompt.root; <userinput>(cd /var/tmp/$(make -V PORTNAME) &amp;&amp; find -d * \! -type d) | sort &gt; pkg-plist</userinput></screen>
<para>這時要記得把新建的目錄,也加到檔案清單內。</para>
- <screen>&prompt.root; <userinput>(cd /var/tmp/$(make -V PORTNAME) && find -d * -type d) | sort | comm -13 OLD-DIRS - | sort -r | sed -e 's#^#@dirrm #' &gt;&gt; pkg-plist</userinput></screen>
+ <screen>&prompt.root; <userinput>(cd /var/tmp/$(make -V PORTNAME) &amp;&amp; find -d * -type d) | sort | comm -13 OLD-DIRS - | sort -r | sed -e 's#^#@dirrm #' &gt;&gt; pkg-plist</userinput></screen>
<para>最後,您應該手動整理檔案清單(這不是全部自動化處理的)。Man page 則應該利用 <makevar>MAN<replaceable>n</replaceable></makevar> 的方式
寫在 port 的 <filename>Makefile</filename> 而不是寫在檔案清單中。
@@ -9408,7 +9405,7 @@ as .putsy.conf and edit it.</programlisting>
add your new entry to the VuXML database. Please verify
its syntax after that as follows:</para>
- <screen>&prompt.user; <userinput>cd ${PORTSDIR}/security/vuxml && make validate</userinput></screen>
+ <screen>&prompt.user; <userinput>cd ${PORTSDIR}/security/vuxml &amp;&amp; make validate</userinput></screen>
<note>
<para>You will need at least one of the following packages
diff --git a/zh_TW.Big5/share/xml/authors.ent b/zh_TW.Big5/share/xml/authors.ent
index 6041504d22..8b8e7316f8 100644
--- a/zh_TW.Big5/share/xml/authors.ent
+++ b/zh_TW.Big5/share/xml/authors.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="big5"?>
<!--
The FreeBSD Documentation Project
The FreeBSD Traditional Chinese Documentation Project
diff --git a/zh_TW.Big5/share/xml/catalog b/zh_TW.Big5/share/xml/catalog
deleted file mode 100644
index 1fc13ef076..0000000000
--- a/zh_TW.Big5/share/xml/catalog
+++ /dev/null
@@ -1,44 +0,0 @@
- -- ...................................................................... --
- -- FreeBSD SGML Public Identifiers ...................................... --
-
- -- $FreeBSD$
- --
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//ZH"
- "entities.ent"
-
-PUBLIC "-//FreeBSD//DOCUMENT DocBook Stylesheet//EN"
- "freebsd.dsl"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//ZH"
- "mailing-lists.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook Language Specific Entities//EN"
- "l10n.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook Author Entities//ZH"
- "authors.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//ZH"
- "trademarks.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook URL Entities//ZH"
- "urls.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook Glossary Entities//ZH"
- "glossary.ent"
-
- -- ...................................................................... --
- -- HTML docs ............................................................ --
-
-PUBLIC "-//FreeBSD//ENTITIES FreeBSD L10N Entities//EN"
- "l10n.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES FreeBSD Release L10N Entities//EN"
- "release.l10n.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES HTML FreeBSD Header L10N Entities//EN"
- "header.l10n.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES HTML FreeBSD Navigation Bar L10N Entities//EN"
- "navibar.l10n.ent"
diff --git a/zh_TW.Big5/share/xml/catalog.xml b/zh_TW.Big5/share/xml/catalog.xml
index 91a24be917..dd54826205 100644
--- a/zh_TW.Big5/share/xml/catalog.xml
+++ b/zh_TW.Big5/share/xml/catalog.xml
@@ -10,6 +10,9 @@
<rewriteURI uriStartString="http://www.FreeBSD.org/XML/www/lang/"
rewritePrefix="../../"/>
+ <public
+ publicId="-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN"
+ uri="entities.ent" />
<public publicId="-//FreeBSD//ENTITIES FreeBSD L10N Entities//EN"
uri="l10n.ent" />
<public
diff --git a/zh_TW.Big5/share/xml/entities.ent b/zh_TW.Big5/share/xml/entities.ent
index f457e0dd94..3bf1002aee 100644
--- a/zh_TW.Big5/share/xml/entities.ent
+++ b/zh_TW.Big5/share/xml/entities.ent
@@ -1,28 +1,32 @@
<!-- $FreeBSD$ -->
-<!ENTITY % l10n PUBLIC "-//FreeBSD//ENTITIES DocBook Language Specific Entities//EN">
+<!ENTITY % l10n PUBLIC "-//FreeBSD//ENTITIES DocBook Language Specific Entities//EN"
+ "l10n.ent">
%l10n;
-<!ENTITY % l10n-common PUBLIC "-//FreeBSD//ENTITIES DocBook Language Neutral Entities//EN">
-%l10n-common;
-<!ENTITY % man PUBLIC "-//FreeBSD//ENTITIES DocBook Manual Page Entities//EN">
-%man;
-<!ENTITY % freebsd PUBLIC "-//FreeBSD//ENTITIES DocBook Miscellaneous FreeBSD Entities//EN">
+<!ENTITY % freebsd PUBLIC "-//FreeBSD//ENTITIES DocBook Miscellaneous FreeBSD Entities//EN"
+ "nonexistent">
%freebsd;
-<!ENTITY % authors.cn PUBLIC "-//FreeBSD//ENTITIES DocBook Author Entities//ZH">
+<!ENTITY % authors.cn PUBLIC "-//FreeBSD//ENTITIES DocBook Author Entities//ZH"
+ "authors.ent">
%authors.cn;
-<!ENTITY % authors PUBLIC "-//FreeBSD//ENTITIES DocBook Author Entities//EN">
-%authors;
-<!ENTITY % teams PUBLIC "-//FreeBSD//ENTITIES DocBook Team Entities//EN">
+<!ENTITY % teams PUBLIC "-//FreeBSD//ENTITIES DocBook Team Entities//EN"
+ "nonexistent">
%teams;
-<!ENTITY % mailing-lists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//ZH">
+<!ENTITY % mailing-lists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//ZH"
+ "mailing-lists.ent">
%mailing-lists;
-<!ENTITY % newsgroups PUBLIC "-//FreeBSD//ENTITIES DocBook Newsgroup Entities//EN">
+<!ENTITY % newsgroups PUBLIC "-//FreeBSD//ENTITIES DocBook Newsgroup Entities//EN"
+ "nonexistent">
%newsgroups;
-<!ENTITY % trademarks PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//ZH">
+<!ENTITY % trademarks PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//ZH"
+ "trademarks.ent">
%trademarks;
-<!ENTITY % trademarks-en PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//EN">
+<!ENTITY % trademarks-en PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//EN"
+ "nonexistent">
%trademarks-en;
-<!ENTITY % urls PUBLIC "-//FreeBSD//ENTITIES DocBook URL Entities//ZH">
+<!ENTITY % urls PUBLIC "-//FreeBSD//ENTITIES DocBook URL Entities//ZH"
+ "urls.ent">
%urls;
-<!ENTITY % glossary PUBLIC "-//FreeBSD//ENTITIES DocBook Glossary Entities//ZH">
+<!ENTITY % glossary PUBLIC "-//FreeBSD//ENTITIES DocBook Glossary Entities//ZH"
+ "glossary.ent">
%glossary;
diff --git a/zh_TW.Big5/share/xml/mailing-lists.ent b/zh_TW.Big5/share/xml/mailing-lists.ent
index ce5c33db0d..55ba56e118 100644
--- a/zh_TW.Big5/share/xml/mailing-lists.ent
+++ b/zh_TW.Big5/share/xml/mailing-lists.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="big5"?>
<!--
Names of FreeBSD 郵遞論壇s and related software.
The FreeBSD Traditional-Chinese Documentation Project
diff --git a/zh_TW.Big5/share/xml/trademarks.ent b/zh_TW.Big5/share/xml/trademarks.ent
index 4c8f711c85..6adf8a275f 100644
--- a/zh_TW.Big5/share/xml/trademarks.ent
+++ b/zh_TW.Big5/share/xml/trademarks.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="big5"?>
<!--
Trademark Legend, as required by The Open Group, Sun, etc..
diff --git a/zh_TW.Big5/share/xml/urls.ent b/zh_TW.Big5/share/xml/urls.ent
index 29e8b5eff2..d712a047fa 100644
--- a/zh_TW.Big5/share/xml/urls.ent
+++ b/zh_TW.Big5/share/xml/urls.ent
@@ -1,45 +1,16 @@
+<?xml version="1.0" encoding="big5"?>
<!-- $FreeBSD$ -->
<!--
The FreeBSD Traditional Chinese Project
Original revision: 1.13
-->
-<!ENTITY % freebsd.urls.absolute "IGNORE">
-<!ENTITY % freebsd.urls.relprefix.1 "IGNORE">
-<!ENTITY % freebsd.urls.relprefix.2 "IGNORE">
-<!ENTITY % freebsd.urls.relprefix.3 "IGNORE">
-<!ENTITY % freebsd.urls.relprefix.4 "IGNORE">
-<!ENTITY % freebsd.urls.relprefix.5 "IGNORE">
-<!ENTITY % freebsd.urls.relprefix.6 "IGNORE">
-<!ENTITY % freebsd.urls.relprefix.7 "IGNORE">
-<!ENTITY % freebsd.urls.relprefix.8 "IGNORE">
<!-- Do not edit: start here -->
-<![%freebsd.urls.relprefix.1;[
- <!ENTITY url.relprefix "..">
-]]>
-<![%freebsd.urls.relprefix.2;[
- <!ENTITY url.relprefix "../..">
-]]>
-<![%freebsd.urls.relprefix.3;[
- <!ENTITY url.relprefix "../../..">
-]]>
-<![%freebsd.urls.relprefix.4;[
- <!ENTITY url.relprefix "../../../..">
-]]>
-<![%freebsd.urls.relprefix.5;[
- <!ENTITY url.relprefix "../../../../..">
-]]>
-<![%freebsd.urls.relprefix.6;[
- <!ENTITY url.relprefix "../../../../../..">
-]]>
-<![%freebsd.urls.relprefix.7;[
- <!ENTITY url.relprefix "../../../../../../..">
-]]>
-<![%freebsd.urls.relprefix.8;[
- <!ENTITY url.relprefix "../../../../../../../..">
-]]>
+<!ENTITY % freebsd.urls.absolute "IGNORE">
+
+<!ENTITY url.relprefix "../../../..">
<![ %freebsd.urls.absolute; [
<!ENTITY url.base "http://www.FreeBSD.org">