aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGabor Kovesdan <gabor@FreeBSD.org>2013-01-30 14:00:53 +0000
committerGabor Kovesdan <gabor@FreeBSD.org>2013-01-30 14:00:53 +0000
commit36cdb51546f0d2bcfd977ea33b449f24bf71768f (patch)
treec5cc10c67b66dfd6e0b423672a811f4d409f4206
parent270c3b26d3a7f67db550e04707a5e66814a876a8 (diff)
downloaddoc-36cdb51546f0d2bcfd977ea33b449f24bf71768f.tar.gz
doc-36cdb51546f0d2bcfd977ea33b449f24bf71768f.zip
- Migrate the documentation set to DocBook 4.5
Notes
Notes: svn path=/projects/xml-tools/; revision=40818
-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--da_DK.ISO8859-1/articles/ipsec-must/article.xml7
-rw-r--r--da_DK.ISO8859-1/articles/pxe/article.xml9
-rw-r--r--da_DK.ISO8859-1/share/xml/catalog3
-rw-r--r--da_DK.ISO8859-1/share/xml/catalog.xml20
-rw-r--r--de_DE.ISO8859-1/articles/contributing-ports/article.xml8
-rw-r--r--de_DE.ISO8859-1/articles/contributing/article.xml8
-rw-r--r--de_DE.ISO8859-1/articles/explaining-bsd/article.xml7
-rw-r--r--de_DE.ISO8859-1/articles/laptop/article.xml7
-rw-r--r--de_DE.ISO8859-1/articles/linux-comparison/article.xml8
-rw-r--r--de_DE.ISO8859-1/articles/new-users/article.xml7
-rw-r--r--de_DE.ISO8859-1/articles/solid-state/article.xml7
-rw-r--r--de_DE.ISO8859-1/books/developers-handbook/book.xml6
-rw-r--r--de_DE.ISO8859-1/books/faq/book.xml6
-rw-r--r--de_DE.ISO8859-1/books/fdp-primer/book.xml6
-rw-r--r--de_DE.ISO8859-1/books/handbook/book.xml7
-rw-r--r--de_DE.ISO8859-1/books/porters-handbook/book.xml7
-rw-r--r--de_DE.ISO8859-1/share/xml/catalog2
-rw-r--r--de_DE.ISO8859-1/share/xml/catalog.xml9
-rw-r--r--el_GR.ISO8859-7/articles/bsdl-gpl/article.xml7
-rw-r--r--el_GR.ISO8859-7/articles/compiz-fusion/article.xml8
-rw-r--r--el_GR.ISO8859-7/articles/contributing/article.xml8
-rw-r--r--el_GR.ISO8859-7/articles/cvs-freebsd/article.xml8
-rw-r--r--el_GR.ISO8859-7/articles/explaining-bsd/article.xml7
-rw-r--r--el_GR.ISO8859-7/articles/freebsd-questions/article.xml7
-rw-r--r--el_GR.ISO8859-7/articles/gjournal-desktop/article.xml7
-rw-r--r--el_GR.ISO8859-7/articles/greek-language-support/article.xml6
-rw-r--r--el_GR.ISO8859-7/articles/laptop/article.xml7
-rw-r--r--el_GR.ISO8859-7/articles/linux-users/article.xml8
-rw-r--r--el_GR.ISO8859-7/articles/mailing-list-faq/article.xml7
-rw-r--r--el_GR.ISO8859-7/articles/nanobsd/article.xml7
-rw-r--r--el_GR.ISO8859-7/articles/new-users/article.xml7
-rw-r--r--el_GR.ISO8859-7/articles/problem-reports/article.xml7
-rw-r--r--el_GR.ISO8859-7/articles/releng-packages/article.xml7
-rw-r--r--el_GR.ISO8859-7/articles/releng/article.xml6
-rw-r--r--el_GR.ISO8859-7/books/faq/book.xml6
-rw-r--r--el_GR.ISO8859-7/books/handbook/book.xml7
-rw-r--r--el_GR.ISO8859-7/share/xml/catalog2
-rw-r--r--el_GR.ISO8859-7/share/xml/catalog.xml4
-rw-r--r--en_US.ISO8859-1/articles/bsdl-gpl/article.xml7
-rw-r--r--en_US.ISO8859-1/articles/building-products/article.xml7
-rw-r--r--en_US.ISO8859-1/articles/casestudy-argentina.com/article.xml7
-rw-r--r--en_US.ISO8859-1/articles/committers-guide/article.xml7
-rw-r--r--en_US.ISO8859-1/articles/compiz-fusion/article.xml7
-rw-r--r--en_US.ISO8859-1/articles/console-server/article.xml7
-rw-r--r--en_US.ISO8859-1/articles/contributing-ports/article.xml7
-rw-r--r--en_US.ISO8859-1/articles/contributing/article.xml7
-rw-r--r--en_US.ISO8859-1/articles/contributors/article.xml7
-rw-r--r--en_US.ISO8859-1/articles/cups/article.xml7
-rw-r--r--en_US.ISO8859-1/articles/custom-gcc/article.xml7
-rw-r--r--en_US.ISO8859-1/articles/cvs-freebsd/article.xml7
-rw-r--r--en_US.ISO8859-1/articles/cvsup-advanced/article.xml7
-rw-r--r--en_US.ISO8859-1/articles/explaining-bsd/article.xml7
-rw-r--r--en_US.ISO8859-1/articles/fbsd-from-scratch/article.xml6
-rw-r--r--en_US.ISO8859-1/articles/filtering-bridges/article.xml7
-rw-r--r--en_US.ISO8859-1/articles/fonts/article.xml7
-rw-r--r--en_US.ISO8859-1/articles/freebsd-questions/article.xml7
-rw-r--r--en_US.ISO8859-1/articles/freebsd-update-server/article.xml6
-rw-r--r--en_US.ISO8859-1/articles/geom-class/article.xml7
-rw-r--r--en_US.ISO8859-1/articles/gjournal-desktop/article.xml7
-rw-r--r--en_US.ISO8859-1/articles/hubs/article.xml7
-rw-r--r--en_US.ISO8859-1/articles/ipsec-must/article.xml7
-rw-r--r--en_US.ISO8859-1/articles/laptop/article.xml7
-rw-r--r--en_US.ISO8859-1/articles/ldap-auth/article.xml7
-rw-r--r--en_US.ISO8859-1/articles/linux-comparison/article.xml7
-rw-r--r--en_US.ISO8859-1/articles/linux-emulation/article.xml7
-rw-r--r--en_US.ISO8859-1/articles/linux-users/article.xml7
-rw-r--r--en_US.ISO8859-1/articles/mailing-list-faq/article.xml7
-rw-r--r--en_US.ISO8859-1/articles/mh/article.xml7
-rw-r--r--en_US.ISO8859-1/articles/nanobsd/article.xml7
-rw-r--r--en_US.ISO8859-1/articles/new-users/article.xml7
-rw-r--r--en_US.ISO8859-1/articles/p4-primer/article.xml7
-rw-r--r--en_US.ISO8859-1/articles/pam/article.xml7
-rw-r--r--en_US.ISO8859-1/articles/port-mentor-guidelines/article.xml7
-rw-r--r--en_US.ISO8859-1/articles/portbuild/article.xml7
-rw-r--r--en_US.ISO8859-1/articles/pr-guidelines/article.xml6
-rw-r--r--en_US.ISO8859-1/articles/problem-reports/article.xml7
-rw-r--r--en_US.ISO8859-1/articles/rc-scripting/article.xml7
-rw-r--r--en_US.ISO8859-1/articles/relaydelay/article.xml8
-rw-r--r--en_US.ISO8859-1/articles/releng-packages/article.xml7
-rw-r--r--en_US.ISO8859-1/articles/releng/article.xml6
-rw-r--r--en_US.ISO8859-1/articles/remote-install/article.xml7
-rw-r--r--en_US.ISO8859-1/articles/serial-uart/article.xml7
-rw-r--r--en_US.ISO8859-1/articles/solid-state/article.xml7
-rw-r--r--en_US.ISO8859-1/articles/vm-design/article.xml7
-rw-r--r--en_US.ISO8859-1/articles/wp-toolbox/article.xml6
-rw-r--r--en_US.ISO8859-1/books/arch-handbook/book.xml6
-rw-r--r--en_US.ISO8859-1/books/bibliography/book.xml6
-rw-r--r--en_US.ISO8859-1/books/corp-net-guide/book.xml7
-rw-r--r--en_US.ISO8859-1/books/design-44bsd/book.xml7
-rw-r--r--en_US.ISO8859-1/books/dev-model/book.xml6
-rw-r--r--en_US.ISO8859-1/books/developers-handbook/book.xml6
-rw-r--r--en_US.ISO8859-1/books/faq/book.xml6
-rw-r--r--en_US.ISO8859-1/books/fdp-primer/book.xml6
-rw-r--r--en_US.ISO8859-1/books/handbook/book.xml7
-rw-r--r--en_US.ISO8859-1/books/pmake/book.xml6
-rw-r--r--en_US.ISO8859-1/books/porters-handbook/book.xml7
-rw-r--r--en_US.ISO8859-1/share/xml/catalog3
-rw-r--r--en_US.ISO8859-1/share/xml/catalog.xml4
-rw-r--r--en_US.ISO8859-1/share/xml/entities.ent10
-rw-r--r--es_ES.ISO8859-1/articles/casestudy-argentina.com/article.xml7
-rw-r--r--es_ES.ISO8859-1/articles/contributing/article.xml7
-rw-r--r--es_ES.ISO8859-1/articles/cvs-freebsd/article.xml7
-rw-r--r--es_ES.ISO8859-1/articles/explaining-bsd/article.xml7
-rw-r--r--es_ES.ISO8859-1/articles/fbsd-from-scratch/article.xml6
-rw-r--r--es_ES.ISO8859-1/articles/fdp-es/article.xml7
-rw-r--r--es_ES.ISO8859-1/articles/laptop/article.xml7
-rw-r--r--es_ES.ISO8859-1/articles/linux-comparison/article.xml7
-rw-r--r--es_ES.ISO8859-1/articles/linux-users/article.xml7
-rw-r--r--es_ES.ISO8859-1/articles/mailing-list-faq/article.xml7
-rw-r--r--es_ES.ISO8859-1/articles/nanobsd/article.xml7
-rw-r--r--es_ES.ISO8859-1/articles/p4-primer/article.xml7
-rw-r--r--es_ES.ISO8859-1/articles/problem-reports/article.xml7
-rw-r--r--es_ES.ISO8859-1/articles/releng/article.xml7
-rw-r--r--es_ES.ISO8859-1/books/faq/book.xml7
-rwxr-xr-xes_ES.ISO8859-1/books/handbook/book.xml7
-rw-r--r--es_ES.ISO8859-1/share/xml/catalog2
-rw-r--r--es_ES.ISO8859-1/share/xml/catalog.xml4
-rw-r--r--fr_FR.ISO8859-1/articles/building-products/article.xml8
-rw-r--r--fr_FR.ISO8859-1/articles/committers-guide/article.xml7
-rw-r--r--fr_FR.ISO8859-1/articles/contributing-ports/article.xml7
-rw-r--r--fr_FR.ISO8859-1/articles/contributing/article.xml8
-rw-r--r--fr_FR.ISO8859-1/articles/contributors/article.xml8
-rw-r--r--fr_FR.ISO8859-1/articles/cvsup-advanced/article.xml8
-rw-r--r--fr_FR.ISO8859-1/articles/explaining-bsd/article.xml7
-rw-r--r--fr_FR.ISO8859-1/articles/filtering-bridges/article.xml8
-rwxr-xr-xfr_FR.ISO8859-1/articles/fonts/article.xml8
-rw-r--r--fr_FR.ISO8859-1/articles/ipsec-must/article.xml8
-rw-r--r--fr_FR.ISO8859-1/articles/laptop/article.xml7
-rw-r--r--fr_FR.ISO8859-1/articles/linux-users/article.xml7
-rw-r--r--fr_FR.ISO8859-1/articles/mh/article.xml7
-rw-r--r--fr_FR.ISO8859-1/articles/nanobsd/article.xml7
-rwxr-xr-xfr_FR.ISO8859-1/articles/new-users/article.xml7
-rw-r--r--fr_FR.ISO8859-1/articles/pam/article.xml7
-rw-r--r--fr_FR.ISO8859-1/articles/pr-guidelines/article.xml7
-rw-r--r--fr_FR.ISO8859-1/articles/problem-reports/article.xml7
-rw-r--r--fr_FR.ISO8859-1/articles/releng-packages/article.xml7
-rw-r--r--fr_FR.ISO8859-1/books/developers-handbook/book.xml6
-rw-r--r--fr_FR.ISO8859-1/books/faq/book.xml6
-rw-r--r--fr_FR.ISO8859-1/books/fdp-primer/book.xml6
-rw-r--r--fr_FR.ISO8859-1/books/handbook/book.xml6
-rw-r--r--fr_FR.ISO8859-1/books/porters-handbook/book.xml7
-rw-r--r--fr_FR.ISO8859-1/share/xml/catalog2
-rw-r--r--fr_FR.ISO8859-1/share/xml/catalog.xml3
-rw-r--r--hu_HU.ISO8859-2/articles/compiz-fusion/article.xml7
-rw-r--r--hu_HU.ISO8859-2/articles/cups/article.xml7
-rw-r--r--hu_HU.ISO8859-2/articles/explaining-bsd/article.xml7
-rw-r--r--hu_HU.ISO8859-2/articles/gjournal-desktop/article.xml7
-rw-r--r--hu_HU.ISO8859-2/articles/laptop/article.xml7
-rw-r--r--hu_HU.ISO8859-2/articles/linux-comparison/article.xml7
-rw-r--r--hu_HU.ISO8859-2/articles/linux-users/article.xml7
-rw-r--r--hu_HU.ISO8859-2/books/faq/book.xml6
-rw-r--r--hu_HU.ISO8859-2/books/fdp-primer/book.xml6
-rw-r--r--hu_HU.ISO8859-2/books/handbook/book.xml7
-rw-r--r--hu_HU.ISO8859-2/share/xml/catalog2
-rw-r--r--hu_HU.ISO8859-2/share/xml/catalog.xml3
-rw-r--r--it_IT.ISO8859-15/articles/committers-guide/article.xml7
-rw-r--r--it_IT.ISO8859-15/articles/explaining-bsd/article.xml7
-rw-r--r--it_IT.ISO8859-15/articles/filtering-bridges/article.xml7
-rw-r--r--it_IT.ISO8859-15/articles/new-users/article.xml7
-rw-r--r--it_IT.ISO8859-15/articles/vm-design/article.xml7
-rw-r--r--it_IT.ISO8859-15/books/handbook/book.xml6
-rw-r--r--it_IT.ISO8859-15/books/unix-introduction/book.xml6
-rw-r--r--it_IT.ISO8859-15/share/xml/catalog2
-rw-r--r--it_IT.ISO8859-15/share/xml/catalog.xml3
-rw-r--r--ja_JP.eucJP/articles/contributing/article.xml8
-rw-r--r--ja_JP.eucJP/articles/contributors/article.xml7
-rw-r--r--ja_JP.eucJP/articles/fbsd-from-scratch/article.xml6
-rw-r--r--ja_JP.eucJP/articles/fonts/article.xml7
-rw-r--r--ja_JP.eucJP/articles/ipsec-must/article.xml7
-rw-r--r--ja_JP.eucJP/articles/problem-reports/article.xml7
-rw-r--r--ja_JP.eucJP/books/design-44bsd/book.xml7
-rw-r--r--ja_JP.eucJP/books/faq/book.xml7
-rw-r--r--ja_JP.eucJP/books/fdp-primer/book.xml6
-rw-r--r--ja_JP.eucJP/books/handbook/book.xml7
-rw-r--r--ja_JP.eucJP/books/porters-handbook/book.xml7
-rw-r--r--ja_JP.eucJP/share/xml/catalog2
-rw-r--r--ja_JP.eucJP/share/xml/catalog.xml3
-rw-r--r--mn_MN.UTF-8/books/handbook/book.xml7
-rw-r--r--mn_MN.UTF-8/share/xml/catalog2
-rw-r--r--mn_MN.UTF-8/share/xml/catalog.xml25
-rw-r--r--nl_NL.ISO8859-1/articles/contributing-ports/article.xml8
-rw-r--r--nl_NL.ISO8859-1/articles/contributing/article.xml8
-rw-r--r--nl_NL.ISO8859-1/articles/explaining-bsd/article.xml7
-rw-r--r--nl_NL.ISO8859-1/articles/problem-reports/article.xml7
-rw-r--r--nl_NL.ISO8859-1/articles/solid-state/article.xml7
-rw-r--r--nl_NL.ISO8859-1/books/handbook/book.xml7
-rw-r--r--nl_NL.ISO8859-1/share/xml/catalog2
-rw-r--r--nl_NL.ISO8859-1/share/xml/catalog.xml3
-rw-r--r--pl_PL.ISO8859-2/articles/filtering-bridges/article.xml7
-rw-r--r--pl_PL.ISO8859-2/articles/new-users/article.xml7
-rw-r--r--pl_PL.ISO8859-2/books/handbook/book.xml6
-rw-r--r--pl_PL.ISO8859-2/share/xml/catalog2
-rw-r--r--pl_PL.ISO8859-2/share/xml/catalog.xml22
-rw-r--r--pt_BR.ISO8859-1/articles/building-products/article.xml8
-rw-r--r--pt_BR.ISO8859-1/articles/contributing-ports/article.xml7
-rw-r--r--pt_BR.ISO8859-1/articles/contributing/article.xml7
-rw-r--r--pt_BR.ISO8859-1/articles/explaining-bsd/article.xml7
-rw-r--r--pt_BR.ISO8859-1/articles/freebsd-questions/article.xml7
-rw-r--r--pt_BR.ISO8859-1/articles/freebsd-update-server/article.xml6
-rw-r--r--pt_BR.ISO8859-1/articles/hubs/article.xml8
-rw-r--r--pt_BR.ISO8859-1/articles/linux-users/article.xml7
-rw-r--r--pt_BR.ISO8859-1/articles/new-users/article.xml7
-rw-r--r--pt_BR.ISO8859-1/articles/problem-reports/article.xml7
-rw-r--r--pt_BR.ISO8859-1/books/faq/book.xml6
-rw-r--r--pt_BR.ISO8859-1/books/fdp-primer/book.xml7
-rw-r--r--pt_BR.ISO8859-1/books/handbook/book.xml6
-rw-r--r--pt_BR.ISO8859-1/share/xml/catalog.xml25
-rw-r--r--ru_RU.KOI8-R/articles/committers-guide/article.xml7
-rw-r--r--ru_RU.KOI8-R/articles/console-server/article.xml7
-rw-r--r--ru_RU.KOI8-R/articles/contributing/article.xml8
-rw-r--r--ru_RU.KOI8-R/articles/cups/article.xml8
-rw-r--r--ru_RU.KOI8-R/articles/custom-gcc/article.xml7
-rw-r--r--ru_RU.KOI8-R/articles/cvs-freebsd/article.xml7
-rw-r--r--ru_RU.KOI8-R/articles/cvsup-advanced/article.xml7
-rw-r--r--ru_RU.KOI8-R/articles/explaining-bsd/article.xml7
-rw-r--r--ru_RU.KOI8-R/articles/fbsd-from-scratch/article.xml6
-rw-r--r--ru_RU.KOI8-R/articles/fonts/article.xml7
-rw-r--r--ru_RU.KOI8-R/articles/freebsd-questions/article.xml7
-rw-r--r--ru_RU.KOI8-R/articles/geom-class/article.xml7
-rw-r--r--ru_RU.KOI8-R/articles/gjournal-desktop/article.xml7
-rw-r--r--ru_RU.KOI8-R/articles/hubs/article.xml7
-rw-r--r--ru_RU.KOI8-R/articles/ipsec-must/article.xml7
-rw-r--r--ru_RU.KOI8-R/articles/laptop/article.xml7
-rw-r--r--ru_RU.KOI8-R/articles/linux-comparison/article.xml7
-rw-r--r--ru_RU.KOI8-R/articles/mailing-list-faq/article.xml7
-rw-r--r--ru_RU.KOI8-R/articles/mh/article.xml7
-rw-r--r--ru_RU.KOI8-R/articles/new-users/article.xml7
-rw-r--r--ru_RU.KOI8-R/articles/pam/article.xml7
-rw-r--r--ru_RU.KOI8-R/articles/portbuild/article.xml7
-rw-r--r--ru_RU.KOI8-R/articles/pr-guidelines/article.xml6
-rw-r--r--ru_RU.KOI8-R/articles/problem-reports/article.xml7
-rw-r--r--ru_RU.KOI8-R/articles/relaydelay/article.xml8
-rw-r--r--ru_RU.KOI8-R/articles/releng-packages/article.xml7
-rw-r--r--ru_RU.KOI8-R/articles/releng/article.xml6
-rw-r--r--ru_RU.KOI8-R/articles/solid-state/article.xml7
-rw-r--r--ru_RU.KOI8-R/articles/vm-design/article.xml7
-rw-r--r--ru_RU.KOI8-R/books/design-44bsd/book.xml7
-rw-r--r--ru_RU.KOI8-R/books/developers-handbook/book.xml6
-rw-r--r--ru_RU.KOI8-R/books/faq/book.xml6
-rw-r--r--ru_RU.KOI8-R/books/fdp-primer/book.xml6
-rw-r--r--ru_RU.KOI8-R/books/handbook/book.xml7
-rw-r--r--ru_RU.KOI8-R/books/porters-handbook/book.xml7
-rw-r--r--ru_RU.KOI8-R/share/xml/catalog2
-rw-r--r--ru_RU.KOI8-R/share/xml/catalog.xml3
-rw-r--r--share/xml/freebsd45.dtd4
-rw-r--r--tr_TR.ISO8859-9/articles/explaining-bsd/article.xml7
-rw-r--r--tr_TR.ISO8859-9/share/xml/catalog.xml4
-rw-r--r--zh_CN.GB2312/articles/contributing/article.xml7
-rw-r--r--zh_CN.GB2312/articles/cvs-freebsd/article.xml7
-rw-r--r--zh_CN.GB2312/articles/linux-users/article.xml7
-rw-r--r--zh_CN.GB2312/articles/nanobsd/article.xml7
-rw-r--r--zh_CN.GB2312/articles/rc-scripting/article.xml7
-rw-r--r--zh_CN.GB2312/articles/remote-install/article.xml7
-rw-r--r--zh_CN.GB2312/books/arch-handbook/book.xml6
-rw-r--r--zh_CN.GB2312/books/handbook/book.xml7
-rw-r--r--zh_CN.GB2312/books/porters-handbook/book.xml7
-rw-r--r--zh_CN.GB2312/share/xml/catalog2
-rw-r--r--zh_CN.GB2312/share/xml/catalog.xml3
-rw-r--r--zh_TW.Big5/articles/contributing/article.xml8
-rw-r--r--zh_TW.Big5/articles/cvs-freebsd/article.xml7
-rw-r--r--zh_TW.Big5/articles/freebsd-questions/article.xml7
-rw-r--r--zh_TW.Big5/articles/hubs/article.xml8
-rw-r--r--zh_TW.Big5/articles/mailing-list-faq/article.xml7
-rw-r--r--zh_TW.Big5/articles/nanobsd/article.xml7
-rw-r--r--zh_TW.Big5/articles/pr-guidelines/article.xml6
-rw-r--r--zh_TW.Big5/articles/problem-reports/article.xml7
-rw-r--r--zh_TW.Big5/articles/remote-install/article.xml7
-rw-r--r--zh_TW.Big5/books/developers-handbook/book.xml6
-rw-r--r--zh_TW.Big5/books/faq/book.xml6
-rw-r--r--zh_TW.Big5/books/fdp-primer/book.xml6
-rw-r--r--zh_TW.Big5/books/handbook/book.xml6
-rw-r--r--zh_TW.Big5/books/porters-handbook/book.xml7
-rw-r--r--zh_TW.Big5/share/xml/catalog2
-rw-r--r--zh_TW.Big5/share/xml/catalog.xml3
276 files changed, 653 insertions, 1208 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/da_DK.ISO8859-1/articles/ipsec-must/article.xml b/da_DK.ISO8859-1/articles/ipsec-must/article.xml
index f0d54f350d..fd9d466684 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;
-]>
+<!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
index b44849dbf5..18d67e74a7 100644
--- a/da_DK.ISO8859-1/share/xml/catalog
+++ b/da_DK.ISO8859-1/share/xml/catalog
@@ -4,6 +4,9 @@
-- $FreeBSD$
--
+PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN"
+ "entities.ent"
+
PUBLIC "-//FreeBSD//DOCUMENT DocBook Stylesheet//EN"
"freebsd.dsl"
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..34b34af34d
--- /dev/null
+++ b/da_DK.ISO8859-1/share/xml/catalog.xml
@@ -0,0 +1,20 @@
+<?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$
+ $FreeBSDde: de-www/share/xml/catalog.xml,v 1.1 2006/10/19 19:26:11 jkois Exp $
+ basiert auf: 1.1
+-->
+
+<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/de_DE.ISO8859-1/articles/contributing-ports/article.xml b/de_DE.ISO8859-1/articles/contributing-ports/article.xml
index 77268b9390..2c0aa074e8 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">
-]>
+<!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 f96d25728c..99917e9bef 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">
-]>
+<!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 5fc21d6b7c..8d77222459 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;
-]>
+<!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 76c5b74390..462e54bd29 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;
-]>
+<!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 cff4ab82e0..36124e24c3 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">
-]>
+<!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 a835fbc7a0..9738c039da 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;
-]>
+<!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/solid-state/article.xml b/de_DE.ISO8859-1/articles/solid-state/article.xml
index 5cd7a0a41b..62b14ee016 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;
-]>
+<!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..b1dff89736 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;
+<!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/faq/book.xml b/de_DE.ISO8859-1/books/faq/book.xml
index 0e02a8f59b..2d88980475 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;
+<!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/de_DE.ISO8859-1/books/fdp-primer/book.xml b/de_DE.ISO8859-1/books/fdp-primer/book.xml
index 26d5f41d5f..2aa41aacf4 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;
+<!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/handbook/book.xml b/de_DE.ISO8859-1/books/handbook/book.xml
index ff0c917717..a17a451e85 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;
-
+<!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/porters-handbook/book.xml b/de_DE.ISO8859-1/books/porters-handbook/book.xml
index 73ac41b041..166346ccba 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;
-]>
+<!DOCTYPE book 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/share/xml/catalog b/de_DE.ISO8859-1/share/xml/catalog
index 44bca8a074..a48b846ada 100644
--- a/de_DE.ISO8859-1/share/xml/catalog
+++ b/de_DE.ISO8859-1/share/xml/catalog
@@ -8,7 +8,7 @@
-- $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"
+PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN"
"entities.ent"
PUBLIC "-//FreeBSD//DOCUMENT DocBook Stylesheet//EN"
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/el_GR.ISO8859-7/articles/bsdl-gpl/article.xml b/el_GR.ISO8859-7/articles/bsdl-gpl/article.xml
index 846fc85192..f508edbaa6 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;
-]>
+<!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..4dd03b4b3f 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">
-]>
+<!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 1292390c2c..bd808b0ba4 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">
-]>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<!--
diff --git a/el_GR.ISO8859-7/articles/cvs-freebsd/article.xml b/el_GR.ISO8859-7/articles/cvs-freebsd/article.xml
index fdbefd6ce8..8c176b16f9 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">
-]>
+<!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..dc77aa76b6 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;
-]>
+<!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..0db17cc5c6 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;
-]>
+<!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..30c6ff5411 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">
+<!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..cfceec5c27 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;
+<!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..93814a3643 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;
-]>
+<!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..64c5f6bec6 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">
-]>
+<!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..ac12864025 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;
-]>
+<!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..78170ec95a 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;
-]>
+<!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..06bd407edf 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;
-]>
+<!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..46f7027e59 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;
-]>
+<!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..5b23a01b31 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;
-]>
+<!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..58a8794f28 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;
+<!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..cca540df68 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;
+<!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/book.xml b/el_GR.ISO8859-7/books/handbook/book.xml
index ca8bac31b0..8ad7959e60 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;
-
+<!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/share/xml/catalog b/el_GR.ISO8859-7/share/xml/catalog
index 3effaf96b0..51a93fb332 100644
--- a/el_GR.ISO8859-7/share/xml/catalog
+++ b/el_GR.ISO8859-7/share/xml/catalog
@@ -11,7 +11,7 @@
-- 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"
+PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN"
"entities.ent"
PUBLIC "-//FreeBSD//DOCUMENT DocBook Stylesheet//EN"
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/en_US.ISO8859-1/articles/bsdl-gpl/article.xml b/en_US.ISO8859-1/articles/bsdl-gpl/article.xml
index 74ceada1fc..730169c5ed 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;
-]>
+<!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..dcca43f6a8 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;
-]>
+<!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..0e1181a50a 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;
-]>
+<!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 4ebe7151c0..5c29deda27 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;
-]>
+<!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/compiz-fusion/article.xml b/en_US.ISO8859-1/articles/compiz-fusion/article.xml
index 5ee28becd1..b3c1a7067f 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;
-]>
+<!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..43343f39a2 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;
-]>
+<!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 9005e03a03..3d3703ca5c 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;
-]>
+<!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 4581e365fa..819bf3c014 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;
-]>
+<!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..4347df2f37 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;
-
+<!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/cups/article.xml b/en_US.ISO8859-1/articles/cups/article.xml
index 35c13dfcc9..5ced963e5d 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;
-]>
+<!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 8d2bf73b6d..51b38334f7 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;
-]>
+<!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/cvs-freebsd/article.xml b/en_US.ISO8859-1/articles/cvs-freebsd/article.xml
index e19b4b3dd8..f891a55d87 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;
-]>
+<!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..8a16f0bdbb 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;
-]>
+<!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..5addee3b59 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;
-]>
+<!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..5db02aff31 100644
--- a/en_US.ISO8859-1/articles/fbsd-from-scratch/article.xml
+++ b/en_US.ISO8859-1/articles/fbsd-from-scratch/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;
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd" [
<!ENTITY scratch.ap "<application>FreeBSD From Scratch</application>">
]>
diff --git a/en_US.ISO8859-1/articles/filtering-bridges/article.xml b/en_US.ISO8859-1/articles/filtering-bridges/article.xml
index 0ff9690ad1..29ee27ba53 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;
-]>
+<!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..050b21d20d 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;
-]>
+<!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..34779524b4 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;
-]>
+<!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 ca0400d20a..7b9dc15ced 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;
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd" [
<!ENTITY fbus.ap "<application>FreeBSD Update Server</application>">
]>
diff --git a/en_US.ISO8859-1/articles/geom-class/article.xml b/en_US.ISO8859-1/articles/geom-class/article.xml
index d68af2201a..92ec3b3be0 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;
-]>
+<!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..37c5e8e597 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;
-]>
+<!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 c347e79065..d5ce8be4a4 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;
-]>
+<!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..6882cef80c 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;
-]>
+<!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..72e46ab182 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;
-]>
+<!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..c5d3bb93ec 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;
-]>
+<!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..ba841654b2 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;
-]>
+<!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..09bb526a26 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;
-]>
+<!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 3a1bc05ee2..c5f32f8c10 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;
-]>
+<!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..15c64648bd 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;
-]>
+<!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..fc34225cb6 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;
-]>
+<!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..6e0fa31216 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;
-]>
+<!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..c3a68e8e91 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;
-]>
+<!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..d7b8eac378 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;
-]>
+<!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..67643e2977 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;
-]>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<!--
- Copyright (c) 2001-2003 Networks Associates Technology, Inc.
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..4e4e1cfed8 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;
-]>
+<!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 b1cbd0bf61..674417a5c0 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;
-]>
+<!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/pr-guidelines/article.xml b/en_US.ISO8859-1/articles/pr-guidelines/article.xml
index 754bb548d5..ff7f8e61fb 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;
+<!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 ef710e0456..b106a2dac4 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;
-]>
+<!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 0238769092..c299b5895a 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;
-]>
+<!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..2d17a1bc52 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">
-]>
+<!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..9e1658fcab 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;
-]>
+<!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..b754ec7f10 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;
+<!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..95c24ea52c 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;
-]>
+<!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..fd46d4b7b8 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;
-]>
+<!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 82046ccb98..26f702b248 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;
-]>
+<!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..411047b8d7 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;
-]>
+<!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..062905f5ff 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;
+<!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..876a72774f 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;
+<!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/bibliography/book.xml b/en_US.ISO8859-1/books/bibliography/book.xml
index 7fe6b60ef3..9a414be0c6 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;
+<!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/corp-net-guide/book.xml b/en_US.ISO8859-1/books/corp-net-guide/book.xml
index 3eac694c58..0171a7044b 100644
--- a/en_US.ISO8859-1/books/corp-net-guide/book.xml
+++ b/en_US.ISO8859-1/books/corp-net-guide/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;
-]>
+<!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/design-44bsd/book.xml b/en_US.ISO8859-1/books/design-44bsd/book.xml
index 64b66a623c..6e8301597e 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;
-]>
+<!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 029bbc097f..f0082ba893 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;
+<!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..0892e8f1f5 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;
+<!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/faq/book.xml b/en_US.ISO8859-1/books/faq/book.xml
index 4ed1210014..f2090e7183 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;
+<!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..c7c6353ad9 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;
+<!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/handbook/book.xml b/en_US.ISO8859-1/books/handbook/book.xml
index 6f342ef829..4351f74d1b 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;
-
+<!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/pmake/book.xml b/en_US.ISO8859-1/books/pmake/book.xml
index c7c31487e1..b344674b1c 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;
+<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd" [
<!ENTITY % chapters.ent SYSTEM "chapters.ent">
%chapters.ent;
]>
diff --git a/en_US.ISO8859-1/books/porters-handbook/book.xml b/en_US.ISO8859-1/books/porters-handbook/book.xml
index 06d45e78ea..4ef462a9ac 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;
-]>
+<!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/share/xml/catalog b/en_US.ISO8859-1/share/xml/catalog
index a865eaa313..0079ae91b4 100644
--- a/en_US.ISO8859-1/share/xml/catalog
+++ b/en_US.ISO8859-1/share/xml/catalog
@@ -4,6 +4,9 @@
-- $FreeBSD$
--
+PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN"
+ "entities.ent"
+
PUBLIC "-//FreeBSD//DOCUMENT DocBook Stylesheet//EN"
"freebsd.dsl"
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 5a6913e47e..b84c1cdbf8 100644
--- a/en_US.ISO8859-1/share/xml/entities.ent
+++ b/en_US.ISO8859-1/share/xml/entities.ent
@@ -4,16 +4,16 @@
"l10n.ent">
%l10n;
<!ENTITY % man PUBLIC "-//FreeBSD//ENTITIES DocBook Manual Page Entities//EN"
- "man.ent">
+ "../../../share/xml/man-refs.ent">
%man;
<!ENTITY % freebsd PUBLIC "-//FreeBSD//ENTITIES DocBook Miscellaneous FreeBSD Entities//EN"
- "freebsd.ent">
+ "../../../share/xml/freebsd.ent">
%freebsd;
<!ENTITY % glossary PUBLIC "-//FreeBSD//ENTITIES DocBook Glossary Entities//EN"
"glossary.ent">
%glossary;
<!ENTITY % authors PUBLIC "-//FreeBSD//ENTITIES DocBook Author Entities//EN"
- "authors.ent">
+ "../../../share/xml/authors.ent">
%authors;
<!ENTITY % teams PUBLIC "-//FreeBSD//ENTITIES DocBook Team Entities//EN"
"teams.ent">
@@ -25,8 +25,8 @@
"newsgroups.ent">
%newsgroups;
<!ENTITY % trademarks PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//EN"
- "trademarks.ent">
+ "../../../share/xml/trademarks.ent">
%trademarks;
<!ENTITY % urls PUBLIC "-//FreeBSD//ENTITIES DocBook URL Entities//EN"
- "urls.ent">
+ "../../../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..869cc0bdb0 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;
-]>
+<!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..4a6ce7ef76 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;
-]>
+<!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..c96e99769b 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;
-]>
+<!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 14f6c5d2c1..7876ee6662 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;
-]>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<!-- $FreeBSD$ -->
<!-- The FreeBSD Spanish Documentation Project -->
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..244cd4ce1f 100644
--- a/es_ES.ISO8859-1/articles/fbsd-from-scratch/article.xml
+++ b/es_ES.ISO8859-1/articles/fbsd-from-scratch/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//ES" "../../share/xml/entities.ent">
-%entities;
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd" [
<!ENTITY scratch.ap "<application>FreeBSD From Scratch</application>">
]>
diff --git a/es_ES.ISO8859-1/articles/fdp-es/article.xml b/es_ES.ISO8859-1/articles/fdp-es/article.xml
index 6d796c031d..937beeb137 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;
-]>
+<!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..f7c79d6c8d 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;
-]>
+<!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..3b9c1757e9 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;
-]>
+<!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..c7af14a8cd 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;
-]>
+<!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..c0e814482a 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;
-]>
+<!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..7429cab82c 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;
-]>
+<!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..a680f490f3 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;
-]>
+<!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..264da4cae5 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;
-]>
+<!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..438013aac7 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;
-]>
+<!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..e0fe8e5a1c 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;
-]>
+<!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/book.xml b/es_ES.ISO8859-1/books/handbook/book.xml
index 92c20ce932..b76dceb29d 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;
-
+<!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/share/xml/catalog b/es_ES.ISO8859-1/share/xml/catalog
index 7a81027959..cbd8334622 100644
--- a/es_ES.ISO8859-1/share/xml/catalog
+++ b/es_ES.ISO8859-1/share/xml/catalog
@@ -7,7 +7,7 @@
-- $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"
+PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN"
"entities.ent"
PUBLIC "-//FreeBSD//DOCUMENT DocBook Stylesheet//EN"
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/fr_FR.ISO8859-1/articles/building-products/article.xml b/fr_FR.ISO8859-1/articles/building-products/article.xml
index 069452b076..f6021ad8c9 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">
-]>
+<!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/committers-guide/article.xml b/fr_FR.ISO8859-1/articles/committers-guide/article.xml
index c9d09132f0..0a7dd1acc0 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;
-]>
+<!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..2ab239b607 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;
-]>
+<!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..68074a9544 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">
-]>
+<!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..95faeb5aa3 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">
-]>
+<!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..1d16021293 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">
-]>
+<!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 c0793356af..4d10a7d391 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;
-]>
+<!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/filtering-bridges/article.xml b/fr_FR.ISO8859-1/articles/filtering-bridges/article.xml
index dd88d3a120..d70e463a93 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">
-]>
+<!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..0b4c8fbc5a 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">
-]>
+<!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..34db5cae45 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">
-]>
+<!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..dc009b02f9 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;
-]>
+<!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 19fb056b76..c0e4e0abcc 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;
-]>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<!--
The FreeBSD French Documentation Project
diff --git a/fr_FR.ISO8859-1/articles/mh/article.xml b/fr_FR.ISO8859-1/articles/mh/article.xml
index 5978e969e9..9a85f04080 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;
-]>
+<!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..e1ee59862d 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;
-]>
+<!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 c7bf7ab9de..3a1b587251 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;
-]>
+<!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..ee026243b9 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;
-]>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<!--
- Copyright (c) 2001-2003 Networks Associates Technology, Inc.
diff --git a/fr_FR.ISO8859-1/articles/pr-guidelines/article.xml b/fr_FR.ISO8859-1/articles/pr-guidelines/article.xml
index 57da8c89ba..dfea3e6e3c 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;
-]>
+<!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..591ff049f9 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;
-]>
+<!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..357ec4a716 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;
-]>
+<!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 32532e7075..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"?>
-<!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;
+<!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/faq/book.xml b/fr_FR.ISO8859-1/books/faq/book.xml
index dc18acdd6f..4bb10a320a 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"?>
-<!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;
+<!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'>
]>
diff --git a/fr_FR.ISO8859-1/books/fdp-primer/book.xml b/fr_FR.ISO8859-1/books/fdp-primer/book.xml
index 16d63bee43..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"?>
-<!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;
+<!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/handbook/book.xml b/fr_FR.ISO8859-1/books/handbook/book.xml
index e28afa364d..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"?>
-<!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;
+<!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/porters-handbook/book.xml b/fr_FR.ISO8859-1/books/porters-handbook/book.xml
index 6986365929..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"?>
-<!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;
-]>
+<!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/catalog b/fr_FR.ISO8859-1/share/xml/catalog
index fb22c6654c..d729e51785 100644
--- a/fr_FR.ISO8859-1/share/xml/catalog
+++ b/fr_FR.ISO8859-1/share/xml/catalog
@@ -7,7 +7,7 @@
-- $FreeBSD$
--
-PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//FR"
+PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN"
"entities.ent"
PUBLIC "-//FreeBSD//DOCUMENT DocBook Stylesheet//EN"
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/hu_HU.ISO8859-2/articles/compiz-fusion/article.xml b/hu_HU.ISO8859-2/articles/compiz-fusion/article.xml
index a090177e9e..b0903a784a 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;
-]>
+<!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/article.xml b/hu_HU.ISO8859-2/articles/cups/article.xml
index 59f349006d..9d0a7d4897 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;
-]>
+<!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/article.xml b/hu_HU.ISO8859-2/articles/explaining-bsd/article.xml
index bb27cddb99..8ffd88cf1f 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;
-]>
+<!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/article.xml b/hu_HU.ISO8859-2/articles/gjournal-desktop/article.xml
index 5407cf2524..9d3f291737 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;
-]>
+<!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/article.xml b/hu_HU.ISO8859-2/articles/laptop/article.xml
index 5b1268299e..87cf08b87f 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;
-]>
+<!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/article.xml b/hu_HU.ISO8859-2/articles/linux-comparison/article.xml
index 7af790b2ec..656c81fd72 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;
-]>
+<!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/article.xml b/hu_HU.ISO8859-2/articles/linux-users/article.xml
index 0e54a29591..b174865fce 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;
-]>
+<!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/book.xml b/hu_HU.ISO8859-2/books/faq/book.xml
index 5d8fb7e0cf..7d71c9967f 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;
+<!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/book.xml b/hu_HU.ISO8859-2/books/fdp-primer/book.xml
index 8ee2b33599..1fc09b2c15 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;
+<!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/handbook/book.xml b/hu_HU.ISO8859-2/books/handbook/book.xml
index 6528435392..ceaacae891 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;
-
+<!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/share/xml/catalog b/hu_HU.ISO8859-2/share/xml/catalog
index b7bb103082..17b8de072b 100644
--- a/hu_HU.ISO8859-2/share/xml/catalog
+++ b/hu_HU.ISO8859-2/share/xml/catalog
@@ -9,7 +9,7 @@
-- %SOURCE% share/xml/catalog
-- %SRCID% 1.32
-PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//HU"
+PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN"
"entities.ent"
PUBLIC "-//FreeBSD//DOCUMENT DocBook Stylesheet//EN"
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/it_IT.ISO8859-15/articles/committers-guide/article.xml b/it_IT.ISO8859-15/articles/committers-guide/article.xml
index 192c27e6f3..daa3e3d763 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;
-]>
+<!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..d429c1d376 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;
-]>
+<!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..f9b2c88528 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;
-]>
+<!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..16e9efdd8b 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;
-]>
+<!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..182046d44c 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;
-]>
+<!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/book.xml b/it_IT.ISO8859-15/books/handbook/book.xml
index 72efcac5f3..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"?>
-<!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;
+<!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/book.xml b/it_IT.ISO8859-15/books/unix-introduction/book.xml
index a863e2b6ec..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"?>
-<!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;
+<!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/share/xml/catalog b/it_IT.ISO8859-15/share/xml/catalog
index ad65424b71..8912f7f848 100644
--- a/it_IT.ISO8859-15/share/xml/catalog
+++ b/it_IT.ISO8859-15/share/xml/catalog
@@ -7,7 +7,7 @@
-- $FreeBSD$
--
-PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//IT"
+PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN"
"entities.ent"
PUBLIC "-//FreeBSD//DOCUMENT DocBook Stylesheet//EN"
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/ja_JP.eucJP/articles/contributing/article.xml b/ja_JP.eucJP/articles/contributing/article.xml
index 7f5b354665..840519dd05 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">
-]>
+<!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 bbbe90f1df..623b5d082b 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;
+<!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..58507f42da 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;
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd" [
<!ENTITY scratch.ap "<application>FreeBSD €ς₯Ό₯퀫€ιΐίΔκ€Ή€λ</application>">
]>
diff --git a/ja_JP.eucJP/articles/fonts/article.xml b/ja_JP.eucJP/articles/fonts/article.xml
index 1c20df9bca..f964494fbc 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;
-]>
+<!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..33ea70d858 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;
-]>
+<!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 5dddf8a747..7e67f3dc55 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;
-]>
+<!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 61045b3035..5dd4cb5191 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;
-]>
+<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<!--
The FreeBSD Documentation Project
diff --git a/ja_JP.eucJP/books/faq/book.xml b/ja_JP.eucJP/books/faq/book.xml
index b913f435ab..4436037fb4 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;
-]>
+<!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 -->
diff --git a/ja_JP.eucJP/books/fdp-primer/book.xml b/ja_JP.eucJP/books/fdp-primer/book.xml
index 2ea35255dd..f941f4a8f4 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;
+<!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/handbook/book.xml b/ja_JP.eucJP/books/handbook/book.xml
index df7ea5494b..19ebff412a 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">
diff --git a/ja_JP.eucJP/books/porters-handbook/book.xml b/ja_JP.eucJP/books/porters-handbook/book.xml
index c2fa6558d9..22dfc74a7b 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;
-]>
+<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<!--
The FreeBSD Documentation Project
diff --git a/ja_JP.eucJP/share/xml/catalog b/ja_JP.eucJP/share/xml/catalog
index 3f6c44e4ce..567c8be639 100644
--- a/ja_JP.eucJP/share/xml/catalog
+++ b/ja_JP.eucJP/share/xml/catalog
@@ -4,7 +4,7 @@
-- $FreeBSD$
--
-PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//JA"
+PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN"
"entities.ent"
PUBLIC "-//FreeBSD//DOCUMENT DocBook Stylesheet//EN"
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/mn_MN.UTF-8/books/handbook/book.xml b/mn_MN.UTF-8/books/handbook/book.xml
index 1328ce29dd..a710ce6c1a 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"?>
-<!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;
-
+<!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/share/xml/catalog b/mn_MN.UTF-8/share/xml/catalog
index 5e9a47fac0..844eae5ee2 100644
--- a/mn_MN.UTF-8/share/xml/catalog
+++ b/mn_MN.UTF-8/share/xml/catalog
@@ -14,7 +14,7 @@
-- $FreeBSD$
--
-PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//MN"
+PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN"
"entities.ent"
PUBLIC "-//FreeBSD//DOCUMENT DocBook Stylesheet//EN"
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..bc7f459caf
--- /dev/null
+++ b/mn_MN.UTF-8/share/xml/catalog.xml
@@ -0,0 +1,25 @@
+<?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$
+ $FreeBSDde: de-www/share/xml/catalog.xml,v 1.1 2006/10/19 19:26:11 jkois Exp $
+ basiert auf: 1.1
+-->
+
+<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//DE"
+ uri="translators.ent" />
+ <public
+ publicId="-//FreeBSD//ENTITIES FreeBSD L10N Entities//EN"
+ uri="l10n.ent" />
+</catalog>
diff --git a/nl_NL.ISO8859-1/articles/contributing-ports/article.xml b/nl_NL.ISO8859-1/articles/contributing-ports/article.xml
index 97a0a7cafd..f00082bcd8 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">
-]>
+<!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 67249ff3be..2450e11b16 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">
-]>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<!-- $FreeBSD$ -->
<!-- %SOURCE% en_US.ISO8859-1/articles/contributing/article.sgml -->
diff --git a/nl_NL.ISO8859-1/articles/explaining-bsd/article.xml b/nl_NL.ISO8859-1/articles/explaining-bsd/article.xml
index fbc5a1eb12..d6a15d1d63 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;
-]>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<!-- $FreeBSD$ -->
<!-- The FreeBSD Documentation Project -->
diff --git a/nl_NL.ISO8859-1/articles/problem-reports/article.xml b/nl_NL.ISO8859-1/articles/problem-reports/article.xml
index 369ae186fa..b64a2badc8 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;
-]>
+<!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 cf78f56444..3781a135ff 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;
-]>
+<!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/book.xml b/nl_NL.ISO8859-1/books/handbook/book.xml
index cd956f553e..64d3f2f0d8 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"?>
-<!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;
-
+<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd" [
<!--
$FreeBSD$
diff --git a/nl_NL.ISO8859-1/share/xml/catalog b/nl_NL.ISO8859-1/share/xml/catalog
index a178f14c85..a59b4d5587 100644
--- a/nl_NL.ISO8859-1/share/xml/catalog
+++ b/nl_NL.ISO8859-1/share/xml/catalog
@@ -6,7 +6,7 @@
-- %SOURCE% en_US.ISO8859-1/share/xml/catalog --
-- %SRCID% 39534 --
-PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//NL"
+PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN"
"entities.ent"
PUBLIC "-//FreeBSD//DOCUMENT DocBook Stylesheet//EN"
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/pl_PL.ISO8859-2/articles/filtering-bridges/article.xml b/pl_PL.ISO8859-2/articles/filtering-bridges/article.xml
index c4659893b7..e2b2819774 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;
-]>
+<!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..c487cc2a6e 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;
-]>
+<!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/book.xml b/pl_PL.ISO8859-2/books/handbook/book.xml
index e3b5797ad7..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"?>
-<!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;
+<!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/share/xml/catalog b/pl_PL.ISO8859-2/share/xml/catalog
index 61f86d1fe8..f97d4c113d 100644
--- a/pl_PL.ISO8859-2/share/xml/catalog
+++ b/pl_PL.ISO8859-2/share/xml/catalog
@@ -5,7 +5,7 @@
Original revision: 1.5
--
-PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//PL"
+PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN"
"entities.ent"
PUBLIC "-//FreeBSD//DOCUMENT DocBook Stylesheet//EN"
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..3e43b419ef
--- /dev/null
+++ b/pl_PL.ISO8859-2/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$
+ $FreeBSDde: de-www/share/xml/catalog.xml,v 1.1 2006/10/19 19:26:11 jkois Exp $
+ basiert auf: 1.1
+-->
+
+<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/pt_BR.ISO8859-1/articles/building-products/article.xml b/pt_BR.ISO8859-1/articles/building-products/article.xml
index 65ab34d5bc..4073e253c9 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;
-]>
+<!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 edcab8972f..d5024e313d 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;
-]>
+<!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/article.xml b/pt_BR.ISO8859-1/articles/contributing/article.xml
index 07bfc91030..d2cf24db38 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;
-]>
+<!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..bea1fe60fa 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;
-]>
+<!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..932592e958 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;
-]>
+<!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 ac456abd1d..0a0fd8537e 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;
+<!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>">
]>
diff --git a/pt_BR.ISO8859-1/articles/hubs/article.xml b/pt_BR.ISO8859-1/articles/hubs/article.xml
index 3070963f8f..e450adff02 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;
-]>
+<!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 f82c3719f4..1bd8dd0aa3 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;
-]>
+<!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..6b410b9eb7 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;
-]>
+<!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/problem-reports/article.xml b/pt_BR.ISO8859-1/articles/problem-reports/article.xml
index 80eb7a1bb4..f6671aff08 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;
-]>
+<!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/books/faq/book.xml b/pt_BR.ISO8859-1/books/faq/book.xml
index c452ef68e0..ea580ceb05 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;
+<!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/pt_BR.ISO8859-1/books/fdp-primer/book.xml b/pt_BR.ISO8859-1/books/fdp-primer/book.xml
index 2d4b53664e..f6172977c6 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;
+<!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/handbook/book.xml b/pt_BR.ISO8859-1/books/handbook/book.xml
index 19e3e4feb5..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"?>
-<!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;
+<!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/share/xml/catalog.xml b/pt_BR.ISO8859-1/share/xml/catalog.xml
new file mode 100644
index 0000000000..bc7f459caf
--- /dev/null
+++ b/pt_BR.ISO8859-1/share/xml/catalog.xml
@@ -0,0 +1,25 @@
+<?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$
+ $FreeBSDde: de-www/share/xml/catalog.xml,v 1.1 2006/10/19 19:26:11 jkois Exp $
+ basiert auf: 1.1
+-->
+
+<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//DE"
+ uri="translators.ent" />
+ <public
+ publicId="-//FreeBSD//ENTITIES FreeBSD L10N Entities//EN"
+ uri="l10n.ent" />
+</catalog>
diff --git a/ru_RU.KOI8-R/articles/committers-guide/article.xml b/ru_RU.KOI8-R/articles/committers-guide/article.xml
index 7152ea6a39..a1d0ab3a64 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;
-]>
+<!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..b70bd8835d 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;
-]>
+<!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 a671f2f02b..68b757b06a 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">
-]>
+<!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/cups/article.xml b/ru_RU.KOI8-R/articles/cups/article.xml
index 236c642437..1314c189de 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">
-]>
+<!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/custom-gcc/article.xml b/ru_RU.KOI8-R/articles/custom-gcc/article.xml
index e67896530a..d3a301469d 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;
-]>
+<!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/cvs-freebsd/article.xml b/ru_RU.KOI8-R/articles/cvs-freebsd/article.xml
index 395c235b66..fdd2954a60 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;
-]>
+<!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..fcacae29eb 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;
-]>
+<!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..25b9635a4b 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;
-]>
+<!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 0e1bf03761..206ff51381 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;
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd" [
<!ENTITY scratch.ap "<application>FreeBSD From Scratch</application>">
]>
diff --git a/ru_RU.KOI8-R/articles/fonts/article.xml b/ru_RU.KOI8-R/articles/fonts/article.xml
index e728588202..0f277e3577 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;
-]>
+<!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..6d6421ecec 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;
-]>
+<!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..e5942b95cc 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;
-]>
+<!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..e06dbe2680 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;
-]>
+<!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..b0bc37264b 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;
-]>
+<!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..3dc6fc25d2 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;
-]>
+<!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..54bc9b1b8e 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;
-]>
+<!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..bf35993940 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;
-]>
+<!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..c04e0983d2 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;
-]>
+<!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..c4d3cfb59a 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;
-]>
+<!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..f0a6bcaac9 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;
-]>
+<!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..39cf9a79b5 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;
-]>
+<!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/portbuild/article.xml b/ru_RU.KOI8-R/articles/portbuild/article.xml
index 8122fef44a..2c282a694d 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;
-]>
+<!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..0b16aa96c9 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;
+<!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..7af7fe3442 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;
-]>
+<!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..0d606c63ba 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">
-]>
+<!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..e94d1f5e36 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;
-]>
+<!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..dcc82dd336 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;
+<!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..36f365ccdb 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;
-]>
+<!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..eec705a54b 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;
-]>
+<!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/design-44bsd/book.xml b/ru_RU.KOI8-R/books/design-44bsd/book.xml
index 6cc5534fb7..393277a922 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;
-]>
+<!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..dfa30fa25e 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;
+<!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/faq/book.xml b/ru_RU.KOI8-R/books/faq/book.xml
index e738c0ad85..bb617dc14a 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;
+<!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/ru_RU.KOI8-R/books/fdp-primer/book.xml b/ru_RU.KOI8-R/books/fdp-primer/book.xml
index 52248aff97..1361912025 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;
+<!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/handbook/book.xml b/ru_RU.KOI8-R/books/handbook/book.xml
index de3463b36b..e0268464a8 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;
-
+<!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/porters-handbook/book.xml b/ru_RU.KOI8-R/books/porters-handbook/book.xml
index 3200f37334..5fb338745f 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;
-]>
+<!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/share/xml/catalog b/ru_RU.KOI8-R/share/xml/catalog
index 70dd5a8d35..dc8582b2a8 100644
--- a/ru_RU.KOI8-R/share/xml/catalog
+++ b/ru_RU.KOI8-R/share/xml/catalog
@@ -13,7 +13,7 @@
-- Original revision: r17819
-- ...................................................................... --
-PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//RU"
+PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN"
"entities.ent"
PUBLIC "-//FreeBSD//DOCUMENT DocBook Stylesheet//EN"
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/share/xml/freebsd45.dtd b/share/xml/freebsd45.dtd
index 055e722c83..92bd9468bc 100644
--- a/share/xml/freebsd45.dtd
+++ b/share/xml/freebsd45.dtd
@@ -13,6 +13,10 @@
"/usr/local/share/xml/docbook/4.5/docbookx.dtd">
%orig-docbook;
+<!ENTITY % orig-entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN"
+ "nonexistent">
+%orig-entities;
+
<!ELEMENT hostid (%cptr.char.mix;)*>
<!ATTLIST hostid
role (hostname
diff --git a/tr_TR.ISO8859-9/articles/explaining-bsd/article.xml b/tr_TR.ISO8859-9/articles/explaining-bsd/article.xml
index abb4171564..fadc3c85cb 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;
-]>
+<!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.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/zh_CN.GB2312/articles/contributing/article.xml b/zh_CN.GB2312/articles/contributing/article.xml
index 214091369e..8e2a0850bc 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;
-]>
+<!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..4990c3988b 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;
-]>
+<!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 3a2a157ed0..6cf7b23201 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;
-]>
+<!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/nanobsd/article.xml b/zh_CN.GB2312/articles/nanobsd/article.xml
index aea6323d71..0714dfa5e1 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;
-]>
+<!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 2b1c46ac6f..2fd0021c35 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;
-]>
+<!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/remote-install/article.xml b/zh_CN.GB2312/articles/remote-install/article.xml
index 7045b94dfa..5a868bead5 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;
-]>
+<!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..cf34a559dd 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;
+<!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/handbook/book.xml b/zh_CN.GB2312/books/handbook/book.xml
index f451bea069..c37fc7067c 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"?>
-<!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;
-
+<!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/porters-handbook/book.xml b/zh_CN.GB2312/books/porters-handbook/book.xml
index 59c0296457..be067e2546 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;
-]>
+<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<!--
The FreeBSD Documentation Project
diff --git a/zh_CN.GB2312/share/xml/catalog b/zh_CN.GB2312/share/xml/catalog
index fe5be38b29..9530d38dc5 100644
--- a/zh_CN.GB2312/share/xml/catalog
+++ b/zh_CN.GB2312/share/xml/catalog
@@ -5,7 +5,7 @@
-- $FreeBSD$
--
-PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//ZH"
+PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN"
"entities.ent"
PUBLIC "-//FreeBSD//DOCUMENT DocBook Stylesheet//EN"
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_TW.Big5/articles/contributing/article.xml b/zh_TW.Big5/articles/contributing/article.xml
index fccd4e2de2..aab4b40f43 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">
-]>
+<!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..18cc54e08a 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;
-]>
+<!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..43ccab98ce 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;
-]>
+<!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..8d0bfe14ed 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">
-]>
+<!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..4a3c7f68d4 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;
-]>
+<!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..d8d0147f8a 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;
-]>
+<!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..09b69a1a80 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;
+<!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..72042afc0f 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;
-]>
+<!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..3f35c3ded9 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;
-]>
+<!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..9ca8271336 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;
+<!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/faq/book.xml b/zh_TW.Big5/books/faq/book.xml
index be829a904b..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"?>
-<!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;
+<!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/zh_TW.Big5/books/fdp-primer/book.xml b/zh_TW.Big5/books/fdp-primer/book.xml
index 6309b5fcce..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"?>
-<!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;
+<!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/handbook/book.xml b/zh_TW.Big5/books/handbook/book.xml
index b0df515e4e..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"?>
-<!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;
+<!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/porters-handbook/book.xml b/zh_TW.Big5/books/porters-handbook/book.xml
index bdd7379336..d14b8c225d 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;
-]>
+<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+ "../../../share/xml/freebsd45.dtd">
<!--
The FreeBSD Documentation Project
diff --git a/zh_TW.Big5/share/xml/catalog b/zh_TW.Big5/share/xml/catalog
index 1fc13ef076..39bb7cb408 100644
--- a/zh_TW.Big5/share/xml/catalog
+++ b/zh_TW.Big5/share/xml/catalog
@@ -4,7 +4,7 @@
-- $FreeBSD$
--
-PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//ZH"
+PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN"
"entities.ent"
PUBLIC "-//FreeBSD//DOCUMENT DocBook Stylesheet//EN"
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