- Rename the share/sgml directories to share/xml

- Fix build errors from the next change

Approved by:	doceng (implicit)

20 files changed, 54 insertions, 54 deletions

diff --git a/en_US.ISO8859-1/books/arch-handbook/book.xml b/en_US.ISO8859-1/books/arch-handbook/book.xml
index 785de588bf..c78ced629a 100644
--- a/en_US.ISO8859-1/books/arch-handbook/book.xml
+++ b/en_US.ISO8859-1/books/arch-handbook/book.xml
@@ -1,7 +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/sgml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN" "../../share/sgml/entities.ent">
+	"../../../share/xml/freebsd42.dtd" [
+<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN" "../../share/xml/entities.ent">
 %entities;
 <!ENTITY % chapters SYSTEM "chapters.ent">
 %chapters;
diff --git a/en_US.ISO8859-1/books/bibliography/book.xml b/en_US.ISO8859-1/books/bibliography/book.xml
index 1a22f326d9..7fe6b60ef3 100644
--- a/en_US.ISO8859-1/books/bibliography/book.xml
+++ b/en_US.ISO8859-1/books/bibliography/book.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
 <!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
-	"../../../share/sgml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN" "../../share/sgml/entities.ent">
+	"../../../share/xml/freebsd42.dtd" [
+<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN" "../../share/xml/entities.ent">
 %entities;
-<!ENTITY bibliography SYSTEM "../../../share/sgml/bibliography.xml">
+<!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 2f9705b4cc..3eac694c58 100644
--- a/en_US.ISO8859-1/books/corp-net-guide/book.xml
+++ b/en_US.ISO8859-1/books/corp-net-guide/book.xml
@@ -1,7 +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/sgml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN" "../../share/sgml/entities.ent">
+	"../../../share/xml/freebsd42.dtd" [
+<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN" "../../share/xml/entities.ent">
 %entities;
 ]>
 
diff --git a/en_US.ISO8859-1/books/design-44bsd/book.xml b/en_US.ISO8859-1/books/design-44bsd/book.xml
index 3d79287bab..64b66a623c 100644
--- a/en_US.ISO8859-1/books/design-44bsd/book.xml
+++ b/en_US.ISO8859-1/books/design-44bsd/book.xml
@@ -1,7 +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/sgml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN" "../../share/sgml/entities.ent">
+	"../../../share/xml/freebsd42.dtd" [
+<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN" "../../share/xml/entities.ent">
 %entities;
 ]>
 
diff --git a/en_US.ISO8859-1/books/dev-model/book.xml b/en_US.ISO8859-1/books/dev-model/book.xml
index e3a7053138..029bbc097f 100644
--- a/en_US.ISO8859-1/books/dev-model/book.xml
+++ b/en_US.ISO8859-1/books/dev-model/book.xml
@@ -1,7 +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/sgml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN" "../../share/sgml/entities.ent">
+	"../../../share/xml/freebsd42.dtd" [
+<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN" "../../share/xml/entities.ent">
 %entities;
 <!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 841631dba8..755ee5d18c 100644
--- a/en_US.ISO8859-1/books/developers-handbook/book.xml
+++ b/en_US.ISO8859-1/books/developers-handbook/book.xml
@@ -1,7 +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/sgml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN" "../../share/sgml/entities.ent">
+	"../../../share/xml/freebsd42.dtd" [
+<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN" "../../share/xml/entities.ent">
 %entities;
 <!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 ae014aba04..411baf56e3 100644
--- a/en_US.ISO8859-1/books/faq/book.xml
+++ b/en_US.ISO8859-1/books/faq/book.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
 <!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
-	"../../../share/sgml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN" "../../share/sgml/entities.ent">
+	"../../../share/xml/freebsd42.dtd" [
+<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN" "../../share/xml/entities.ent">
 %entities;
-<!ENTITY bibliography SYSTEM "../../../share/sgml/bibliography.sgml">
+<!ENTITY bibliography SYSTEM "../../../share/xml/bibliography.xml">
 <!ENTITY rel.head "<emphasis>10-CURRENT</emphasis>">
 <!ENTITY rel.head.relx "10.<replaceable>X</replaceable>">
 <!ENTITY rel.head.releng "<symbol>HEAD</symbol>">
diff --git a/en_US.ISO8859-1/books/fdp-primer/book.xml b/en_US.ISO8859-1/books/fdp-primer/book.xml
index 8f008f87f0..b86c9439da 100644
--- a/en_US.ISO8859-1/books/fdp-primer/book.xml
+++ b/en_US.ISO8859-1/books/fdp-primer/book.xml
@@ -1,7 +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/sgml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN" "../../share/sgml/entities.ent">
+	"../../../share/xml/freebsd42.dtd" [
+<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN" "../../share/xml/entities.ent">
 %entities;
 <!ENTITY % chapters SYSTEM "chapters.ent"> %chapters;
 <!-- ENTITY index SYSTEM "index.xml" -->
diff --git a/en_US.ISO8859-1/books/fdp-primer/examples/appendix.xml b/en_US.ISO8859-1/books/fdp-primer/examples/appendix.xml
index 32c29a9996..95bd162179 100644
--- a/en_US.ISO8859-1/books/fdp-primer/examples/appendix.xml
+++ b/en_US.ISO8859-1/books/fdp-primer/examples/appendix.xml
@@ -172,10 +172,10 @@
 	<title>Converting DocBook to HTML (One Large File)</title>
 
 	<screen>&prompt.user; <userinput>jade -V nochunks \  <co id="examples-co-jade-1-nochunks"/>
-    -c /usr/local/share/sgml/docbook/dsssl/modular/catalog \ <co id="examples-co-jade-1-catalog"/>
-    -c /usr/local/share/sgml/docbook/catalog \
-    -c /usr/local/share/sgml/jade/catalog \
-    -d /usr/local/share/sgml/docbook/dsssl/modular/html/docbook.dsl \<co id="examples-co-jade-1-dsssl"/>
+    -c /usr/local/share/xml/docbook/dsssl/modular/catalog \ <co id="examples-co-jade-1-catalog"/>
+    -c /usr/local/share/xml/docbook/catalog \
+    -c /usr/local/share/xml/jade/catalog \
+    -d /usr/local/share/xml/docbook/dsssl/modular/html/docbook.dsl \<co id="examples-co-jade-1-dsssl"/>
     -t sgml <co id="examples-co-jade-1-transform"/> <replaceable>file</replaceable>.xml &gt; <replaceable>file</replaceable>.html <co id="examples-co-jade-1-filename"/></userinput></screen>
 
 	<calloutlist>
@@ -223,10 +223,10 @@
 	  Files)</title>
 
 	<screen>&prompt.user; <userinput>jade \
-    -c /usr/local/share/sgml/docbook/dsssl/modular/catalog \ <co id="examples-co-jade-2-catalog"/>
-    -c /usr/local/share/sgml/docbook/catalog \
-    -c /usr/local/share/sgml/jade/catalog \
-    -d /usr/local/share/sgml/docbook/dsssl/modular/html/docbook.dsl \<co id="examples-co-jade-2-dsssl"/>
+    -c /usr/local/share/xml/docbook/dsssl/modular/catalog \ <co id="examples-co-jade-2-catalog"/>
+    -c /usr/local/share/xml/docbook/catalog \
+    -c /usr/local/share/xml/jade/catalog \
+    -d /usr/local/share/xml/docbook/dsssl/modular/html/docbook.dsl \<co id="examples-co-jade-2-dsssl"/>
     -t sgml <co id="examples-co-jade-2-transform"/> <replaceable>file</replaceable>.xml <co id="examples-co-jade-2-filename"/></userinput></screen>
 
 	<calloutlist>
@@ -275,10 +275,10 @@
 	  file.</para>
 
 	<screen>&prompt.user; <userinput>jade -V tex-backend \ <co id="examples-co-jade-3-tex-backend"/>
-    -c /usr/local/share/sgml/docbook/dsssl/modular/catalog \ <co id="examples-co-jade-3-catalog"/>
-    -c /usr/local/share/sgml/docbook/catalog \
-    -c /usr/local/share/sgml/jade/catalog \
-    -d /usr/local/share/sgml/docbook/dsssl/modular/print/docbook.dsl \<co id="examples-co-jade-3-dsssl"/>
+    -c /usr/local/share/xml/docbook/dsssl/modular/catalog \ <co id="examples-co-jade-3-catalog"/>
+    -c /usr/local/share/xml/docbook/catalog \
+    -c /usr/local/share/xml/jade/catalog \
+    -d /usr/local/share/xml/docbook/dsssl/modular/print/docbook.dsl \<co id="examples-co-jade-3-dsssl"/>
     -t tex <co id="examples-co-jade-3-tex"/> <replaceable>file</replaceable>.xml</userinput></screen>
 
 	<calloutlist>
diff --git a/en_US.ISO8859-1/books/fdp-primer/psgml-mode/chapter.xml b/en_US.ISO8859-1/books/fdp-primer/psgml-mode/chapter.xml
index f0c4e0db9e..9901723f10 100644
--- a/en_US.ISO8859-1/books/fdp-primer/psgml-mode/chapter.xml
+++ b/en_US.ISO8859-1/books/fdp-primer/psgml-mode/chapter.xml
@@ -166,7 +166,7 @@
             standard-indent 4
             sgml-indent-data t)
       (auto-fill-mode t)
-      (setq sgml-catalog-files '("/usr/local/share/sgml/catalog")))
+      (setq sgml-catalog-files '("/usr/local/share/xml/catalog")))
     (add-hook 'psgml-mode-hook
       '(lambda () (local-psgml-mode-hook)))</programlisting>
 </chapter>
diff --git a/en_US.ISO8859-1/books/fdp-primer/sgml-markup/chapter.xml b/en_US.ISO8859-1/books/fdp-primer/sgml-markup/chapter.xml
index 5c77eea354..1a1e9d9372 100644
--- a/en_US.ISO8859-1/books/fdp-primer/sgml-markup/chapter.xml
+++ b/en_US.ISO8859-1/books/fdp-primer/sgml-markup/chapter.xml
@@ -688,7 +688,7 @@
       <para>The &os; extensions are not (currently) in the
 	Ports&nbsp;Collection.  They are stored in the &os; Subversion
 	tree, as <ulink
-	  url="http://svnweb.FreeBSD.org/doc/head/share/sgml/freebsd.dtd">head/share/sgml/freebsd.dtd</ulink>.</para>
+	  url="http://svnweb.FreeBSD.org/doc/head/share/xml/freebsd.dtd">head/share/xml/freebsd.dtd</ulink>.</para>
     </sect2>
 
     <sect2>
@@ -1748,7 +1748,7 @@ This is the file called 'foo2'</screen>
 	  <literal>&amp;man.<replaceable>manual-page</replaceable>.<replaceable>manual-section</replaceable>;</literal>.</para>
 
 	<para>The file that contains these entities is in
-	  <filename>doc/share/sgml/man-refs.ent</filename>, and can be
+	  <filename>doc/share/xml/man-refs.ent</filename>, and can be
 	  referred to using this FPI:</para>
 
 	<programlisting>PUBLIC "-//FreeBSD//ENTITIES DocBook Manual Page Entities//EN"</programlisting>
diff --git a/en_US.ISO8859-1/books/fdp-primer/sgml-primer/chapter.xml b/en_US.ISO8859-1/books/fdp-primer/sgml-primer/chapter.xml
index a9442789aa..7a9929df52 100644
--- a/en_US.ISO8859-1/books/fdp-primer/sgml-primer/chapter.xml
+++ b/en_US.ISO8859-1/books/fdp-primer/sgml-primer/chapter.xml
@@ -397,13 +397,13 @@
 	    <title><filename>.profile</filename>, for &man.sh.1; and
 	      &man.bash.1; Users</title>
 
-	    <programlisting>SGML_ROOT=/usr/local/share/sgml
+	    <programlisting>SGML_ROOT=/usr/local/share/xml
 SGML_CATALOG_FILES=${SGML_ROOT}/jade/catalog
 SGML_CATALOG_FILES=${SGML_ROOT}/docbook/4.1/catalog:$SGML_CATALOG_FILES
 SGML_CATALOG_FILES=${SGML_ROOT}/html/catalog:$SGML_CATALOG_FILES
 SGML_CATALOG_FILES=${SGML_ROOT}/iso8879/catalog:$SGML_CATALOG_FILES
-SGML_CATALOG_FILES=/usr/doc/share/sgml/catalog:$SGML_CATALOG_FILES
-SGML_CATALOG_FILES=/usr/doc/en_US.ISO8859-1/share/sgml/catalog:$SGML_CATALOG_FILES
+SGML_CATALOG_FILES=/usr/doc/share/xml/catalog:$SGML_CATALOG_FILES
+SGML_CATALOG_FILES=/usr/doc/en_US.ISO8859-1/share/xml/catalog:$SGML_CATALOG_FILES
 export SGML_CATALOG_FILES</programlisting>
 	  </example>
 
@@ -411,13 +411,13 @@ export SGML_CATALOG_FILES</programlisting>
 	    <title><filename>.cshrc</filename>, for &man.csh.1; and
 	      &man.tcsh.1; Users</title>
 
-	    <programlisting>setenv SGML_ROOT /usr/local/share/sgml
+	    <programlisting>setenv SGML_ROOT /usr/local/share/xml
 setenv SGML_CATALOG_FILES ${SGML_ROOT}/jade/catalog
 setenv SGML_CATALOG_FILES ${SGML_ROOT}/docbook/4.1/catalog:$SGML_CATALOG_FILES
 setenv SGML_CATALOG_FILES ${SGML_ROOT}/html/catalog:$SGML_CATALOG_FILES
 setenv SGML_CATALOG_FILES ${SGML_ROOT}/iso8879/catalog:$SGML_CATALOG_FILES
-setenv SGML_CATALOG_FILES /usr/doc/share/sgml/catalog:$SGML_CATALOG_FILES
-setenv SGML_CATALOG_FILES /usr/doc/en_US.ISO8859-1/share/sgml/catalog:$SGML_CATALOG_FILES</programlisting>
+setenv SGML_CATALOG_FILES /usr/doc/share/xml/catalog:$SGML_CATALOG_FILES
+setenv SGML_CATALOG_FILES /usr/doc/en_US.ISO8859-1/share/xml/catalog:$SGML_CATALOG_FILES</programlisting>
 	  </example>
 
 	  <para>Then either log out, and log back in again, or run
@@ -727,19 +727,19 @@ example.xml:5: element head: validity error : Element head content does not foll
 
 	<itemizedlist>
 	  <listitem>
-	    <para><filename>/usr/local/share/sgml/docbook/4.1/catalog</filename></para>
+	    <para><filename>/usr/local/share/xml/docbook/4.1/catalog</filename></para>
 	  </listitem>
 
 	  <listitem>
-	    <para><filename>/usr/local/share/sgml/html/catalog</filename></para>
+	    <para><filename>/usr/local/share/xml/html/catalog</filename></para>
 	  </listitem>
 
 	  <listitem>
-	    <para><filename>/usr/local/share/sgml/iso8879/catalog</filename></para>
+	    <para><filename>/usr/local/share/xml/iso8879/catalog</filename></para>
 	  </listitem>
 
 	  <listitem>
-	    <para><filename>/usr/local/share/sgml/jade/catalog</filename></para>
+	    <para><filename>/usr/local/share/xml/jade/catalog</filename></para>
 	  </listitem>
 	</itemizedlist>
 
diff --git a/en_US.ISO8859-1/books/fdp-primer/structure/chapter.xml b/en_US.ISO8859-1/books/fdp-primer/structure/chapter.xml
index deec9efd25..0111965b9e 100644
--- a/en_US.ISO8859-1/books/fdp-primer/structure/chapter.xml
+++ b/en_US.ISO8859-1/books/fdp-primer/structure/chapter.xml
@@ -85,7 +85,7 @@
 	  infrastructure are in <filename>share/mk</filename>, while
 	  the additional XML support files (such as the FreeBSD
 	  extended DocBook DTD) are in
-	  <filename>share/sgml</filename>.</seg>
+	  <filename>share/xml</filename>.</seg>
       </seglistitem>
 
       <seglistitem>
diff --git a/en_US.ISO8859-1/books/fdp-primer/stylesheets/chapter.xml b/en_US.ISO8859-1/books/fdp-primer/stylesheets/chapter.xml
index 0d4153c004..23126ed4b8 100644
--- a/en_US.ISO8859-1/books/fdp-primer/stylesheets/chapter.xml
+++ b/en_US.ISO8859-1/books/fdp-primer/stylesheets/chapter.xml
@@ -54,7 +54,7 @@
     <para>The modified stylesheets are not in the ports system.
       Instead they are part of the Documentation Project source
       repository, and can be found in
-      <filename>doc/share/sgml/freebsd.dsl</filename>.  It is well
+      <filename>doc/share/xml/freebsd.dsl</filename>.  It is well
       commented, and pending completion of this section you are
       encouraged to examine that file to see how some of the available
       options in the standard stylesheets have been configured in
diff --git a/en_US.ISO8859-1/books/fdp-primer/translations/chapter.xml b/en_US.ISO8859-1/books/fdp-primer/translations/chapter.xml
index 35a1e05b13..296142dbb9 100644
--- a/en_US.ISO8859-1/books/fdp-primer/translations/chapter.xml
+++ b/en_US.ISO8859-1/books/fdp-primer/translations/chapter.xml
@@ -413,7 +413,7 @@
 	</segmentedlist>
 
 	<para>After you have installed the iso8879 port, the files in
-	  <filename>/usr/local/share/sgml/iso8879</filename> contain
+	  <filename>/usr/local/share/xml/iso8879</filename> contain
 	  the complete list.</para>
       </answer>
     </qandaentry>
diff --git a/en_US.ISO8859-1/books/handbook/Makefile b/en_US.ISO8859-1/books/handbook/Makefile
index 2e4d6116fc..c95d4c46b8 100644
--- a/en_US.ISO8859-1/books/handbook/Makefile
+++ b/en_US.ISO8859-1/books/handbook/Makefile
@@ -31,7 +31,7 @@
 #
 # ------------------------------------------------------------------------
 
-.PATH: ${.CURDIR}/../../share/sgml/glossary
+.PATH: ${.CURDIR}/../../share/xml/glossary
 
 MAINTAINER=	doc@FreeBSD.org
 
diff --git a/en_US.ISO8859-1/books/handbook/book.xml b/en_US.ISO8859-1/books/handbook/book.xml
index b7da40cc74..6f342ef829 100644
--- a/en_US.ISO8859-1/books/handbook/book.xml
+++ b/en_US.ISO8859-1/books/handbook/book.xml
@@ -1,7 +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/sgml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN" "../../share/sgml/entities.ent">
+	"../../../share/xml/freebsd42.dtd" [
+<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN" "../../share/xml/entities.ent">
 %entities;
 
 <!--
diff --git a/en_US.ISO8859-1/books/pmake/book.xml b/en_US.ISO8859-1/books/pmake/book.xml
index ee8f643b11..c7c31487e1 100644
--- a/en_US.ISO8859-1/books/pmake/book.xml
+++ b/en_US.ISO8859-1/books/pmake/book.xml
@@ -1,7 +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/sgml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN" "../../share/sgml/entities.ent">
+	"../../../share/xml/freebsd42.dtd" [
+<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN" "../../share/xml/entities.ent">
 %entities;
 <!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 4f88188d97..4397956653 100644
--- a/en_US.ISO8859-1/books/porters-handbook/book.xml
+++ b/en_US.ISO8859-1/books/porters-handbook/book.xml
@@ -1,7 +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/sgml/freebsd42.dtd" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN" "../../share/sgml/entities.ent">
+	"../../../share/xml/freebsd42.dtd" [
+<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN" "../../share/xml/entities.ent">
 %entities;
 ]>
 
diff --git a/en_US.ISO8859-1/books/porters-handbook/freebsd.dsl b/en_US.ISO8859-1/books/porters-handbook/freebsd.dsl
index b0369c5209..f5e26338e4 100644
--- a/en_US.ISO8859-1/books/porters-handbook/freebsd.dsl
+++ b/en_US.ISO8859-1/books/porters-handbook/freebsd.dsl
@@ -5,7 +5,7 @@
      rather than the -questions mailing list. -->
 
 <!DOCTYPE style-sheet PUBLIC "-//James Clark//DTD DSSSL Style Sheet//EN" [
-<!ENTITY freebsd.dsl SYSTEM "../../share/sgml/freebsd.dsl" CDATA DSSSL>
+<!ENTITY freebsd.dsl SYSTEM "../../share/xml/freebsd.dsl" CDATA DSSSL>
 <!ENTITY % output.html  "IGNORE"> 
 ]>