- Use /usr/bin/svnlite as SVN if available.

- Replace /XML/{doc,www}/ with /XML/ in SysId. - Remove empty stylesheets in share/xsl and point share/xml/empty.xsl via XML catalog instead. - Change the L10N layer in freebsd-*.xsl not to use localized XSLT stylesheets directly. - Move share/xsl/* to share/xml and remove share/xsl. - Remove obsolete share/web2c/pdftex.def.
svn path=/head/; revision=43181
2013-11-13 06:10:37 +00:00 · 2013-11-13 06:10:37 +00:00 · 52f6d56540 · 2020-12-08 03:00:23 +00:00
commit 52f6d56540
parent fd79a9afc6
1397 changed files with 1822 additions and 2113 deletions
--- a/share/mk/doc.docbook.mk
+++ b/share/mk/doc.docbook.mk
@ -54,11 +54,11 @@ MASTERDOC?=	${.CURDIR}/${DOC}.xml
 DB5RNC?=	${DOC_PREFIX}/share/xml/freebsd50.rnc

 XSLPROF?=	http://docbook.sourceforge.net/release/xsl-ns/current/profiling/profile.xsl
-XSLXHTML?=	http://www.FreeBSD.org/XML/www/share/xsl/freebsd-xhtml.xsl
-XSLXHTMLCHUNK?=	http://www.FreeBSD.org/XML/www/share/xsl/freebsd-xhtml-chunk.xsl
-XSLEPUB?=	http://www.FreeBSD.org/XML/www/share/xsl/freebsd-epub.xsl
-XSLFO?=		http://www.FreeBSD.org/XML/www/share/xsl/freebsd-fo.xsl
-XSLPGP?=	http://www.FreeBSD.org/XML/www/share/xsl/freebsd-pgpkeyring.xsl
+XSLXHTML?=	http://www.FreeBSD.org/XML/share/xml/freebsd-xhtml.xsl
+XSLXHTMLCHUNK?=	http://www.FreeBSD.org/XML/share/xml/freebsd-xhtml-chunk.xsl
+XSLEPUB?=	http://www.FreeBSD.org/XML/share/xml/freebsd-epub.xsl
+XSLFO?=		http://www.FreeBSD.org/XML/share/xml/freebsd-fo.xsl
+XSLPGP?=	http://www.FreeBSD.org/XML/share/xml/freebsd-pgpkeyring.xsl

 XSLSCH?=	/usr/local/share/xsl/iso-schematron/xslt1/iso_schematron_skeleton_for_xslt1.xsl

@ -69,11 +69,7 @@ XSLTPROCOPTS?=	--nonet

 IMGDIR?=	${IMAGES_EN_DIR}/${DOC}s/${.CURDIR:T}
 CALLOUTDIR=	${.CURDIR}/imagelib/callouts
-.if exists(${DOC_PREFIX}/${LANGCODE}/share/xsl/freebsd-dblatex.xsl)
-XSLDBLATEX=	${DOC_PREFIX}/${LANGCODE}/share/xsl/freebsd-dblatex.xsl
-.else
-XSLDBLATEX=	${DOC_PREFIX}/share/xsl/freebsd-dblatex.xsl
-.endif
+XSLDBLATEX=	${DOC_PREFIX}/share/xml/freebsd-dblatex.xsl
 DBLATEXOPTS?=	-I ${IMGDIR} -p ${XSLDBLATEX} -T simple -b xetex -d
 FOPOPTS?=	-c ${DOC_PREFIX}/share/misc/fop.xconf

--- a/share/web2c/pdftex.def
+++ b/share/web2c/pdftex.def
@ -1 +0,0 @@
-\catcode`@=11\def\Gin@extensions{.pdf,.png,.jpg,.mps,.tif}\catcode`@=12
--- a/share/xml/catalog.xml
+++ b/share/xml/catalog.xml
@ -5,14 +5,25 @@
 <!-- $FreeBSD$ -->

 <catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog">
-  <rewriteSystem systemIdStartString="http://www.FreeBSD.org/XML/doc/"
+  <rewriteSystem systemIdStartString="http://www.FreeBSD.org/XML/"
 		 rewritePrefix="../../"/>
-  <rewriteURI uriStartString="http://www.FreeBSD.org/XML/doc/"
-	      rewritePrefix="../../"/>
-  <rewriteSystem systemIdStartString="http://www.FreeBSD.org/XML/www/"
-		 rewritePrefix="../../"/>
-  <rewriteURI uriStartString="http://www.FreeBSD.org/XML/www/"
+  <rewriteURI uriStartString="http://www.FreeBSD.org/XML/"
 	      rewritePrefix="../../"/>
+  <system
+    systemId="http://www.FreeBSD.org/XML/lang/share/xml/freebsd-fo.xsl"
+    uri="empty.xsl" />
+  <system
+    systemId="http://www.FreeBSD.org/XML/lang/share/xml/freebsd-common.xsl"
+    uri="empty.xsl" />
+  <system
+    systemId="http://www.FreeBSD.org/XML/lang/share/xml/freebsd-epub.xsl"
+    uri="empty.xsl" />
+  <system
+    systemId="http://www.FreeBSD.org/XML/lang/share/xml/freebsd-dblatex.xsl"
+    uri="empty.xsl" />
+  <system
+    systemId="http://www.FreeBSD.org/XML/lang/share/xml/freebsd-xhtml.xsl"
+    uri="empty.xsl" />

  <public
 	publicId="-//FreeBSD//DTD DocBook XML V5.0-Based Extension//EN"
--- a/share/xml/commercial.consult.xml
+++ b/share/xml/commercial.consult.xml
@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!DOCTYPE entries PUBLIC "-//FreeBSD//DTD FreeBSD XML Database for Commercial Gallery//EN"
-                         "http://www.FreeBSD.org/XML/www/share/xml/gallery.dtd">
+                         "http://www.FreeBSD.org/XML/share/xml/gallery.dtd">
 <!-- $FreeBSD$ -->

 <entries>
--- a/share/xml/commercial.hardware.xml
+++ b/share/xml/commercial.hardware.xml
@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!DOCTYPE entries PUBLIC "-//FreeBSD//DTD FreeBSD XML Database for Commercial Gallery//EN"
-                         "http://www.FreeBSD.org/XML/www/share/xml/gallery.dtd">
+                         "http://www.FreeBSD.org/XML/share/xml/gallery.dtd">
 <!-- $FreeBSD$ -->

 <entries>
--- a/share/xml/commercial.isp.xml
+++ b/share/xml/commercial.isp.xml
@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!DOCTYPE entries PUBLIC "-//FreeBSD//DTD FreeBSD XML Database for Commercial Gallery//EN"
-                            "http://www.FreeBSD.org/XML/www/share/xml/gallery.dtd">
+                            "http://www.FreeBSD.org/XML/share/xml/gallery.dtd">
 <!-- $FreeBSD$ -->

 <entries>
--- a/share/xml/commercial.misc.xml
+++ b/share/xml/commercial.misc.xml
@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!DOCTYPE entries PUBLIC "-//FreeBSD//DTD FreeBSD XML Database for Commercial Gallery//EN"
-                         "http://www.FreeBSD.org/XML/www/share/xml/gallery.dtd">
+                         "http://www.FreeBSD.org/XML/share/xml/gallery.dtd">
 <!-- $FreeBSD$ -->

 <entries>
--- a/share/xml/commercial.software.xml
+++ b/share/xml/commercial.software.xml
@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!DOCTYPE entries PUBLIC "-//FreeBSD//DTD FreeBSD XML Database for Commercial Gallery//EN"
-                         "http://www.FreeBSD.org/XML/www/share/xml/gallery.dtd">
+                         "http://www.FreeBSD.org/XML/share/xml/gallery.dtd">
 <!-- $FreeBSD$ -->

 <entries>
--- a/share/xml/empty.xsl
+++ b/share/xml/empty.xsl
@ -0,0 +1,6 @@
+<?xml version='1.0'?>
+
+<!-- $FreeBSD$ -->
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+                version='1.0' />
--- a/share/xml/events.dtd
+++ b/share/xml/events.dtd
@ -76,7 +76,7 @@

 <!ENTITY % cvs
 PUBLIC "-//FreeBSD//DTD FreeBSD CVS Keywords//EN"
-	"http://www.FreeBSD.org/XML/doc/share/xml/cvs.dtd">
+	"http://www.FreeBSD.org/XML/share/xml/cvs.dtd">
 %cvs;

 <!ENTITY % autogen.ent
@ -86,15 +86,15 @@

 <!ENTITY % iso8879.ent
 PUBLIC "-//FreeBSD//ENTITIES ISO 8879:1986 Entity Set//EN//XML"
-        "http://www.FreeBSD.org/XML/www/share/xml/iso8879.ent">
+        "http://www.FreeBSD.org/XML/share/xml/iso8879.ent">
 %iso8879.ent;

 <!ENTITY % l10n.ent
 PUBLIC "-//FreeBSD//ENTITIES FreeBSD L10N Entities//EN"
-        "http://www.FreeBSD.org/XML/www/share/xml/l10n.ent">
+        "http://www.FreeBSD.org/XML/share/xml/l10n.ent">
 %l10n.ent;

 <!ENTITY % common.ent
 PUBLIC "-//FreeBSD//ENTITIES FreeBSD Common Entities//EN"
-        "http://www.FreeBSD.org/XML/www/share/xml/common.ent">
+        "http://www.FreeBSD.org/XML/share/xml/common.ent">
 %common.ent;
--- a/share/xml/events.xml
+++ b/share/xml/events.xml
@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!DOCTYPE events PUBLIC "-//FreeBSD//DTD FreeBSD XML Database for Events//EN"
-                        "http://www.FreeBSD.org/XML/www/share/xml/events.dtd">
+                        "http://www.FreeBSD.org/XML/share/xml/events.dtd">
 <!--
     Events which might be interesting for FreeBSD users.

@ -13,50 +13,50 @@
    </cvs:keyword>

  <xi:include
-    href="http://www.FreeBSD.org/XML/www/share/xml/events2014.xml"
+    href="http://www.FreeBSD.org/XML/share/xml/events2014.xml"
    xpointer="xpointer(//event)" />

  <xi:include
-    href="http://www.FreeBSD.org/XML/www/share/xml/events2013.xml"
+    href="http://www.FreeBSD.org/XML/share/xml/events2013.xml"
    xpointer="xpointer(//event)" />

  <xi:include
-    href="http://www.FreeBSD.org/XML/www/share/xml/events2012.xml"
+    href="http://www.FreeBSD.org/XML/share/xml/events2012.xml"
    xpointer="xpointer(//event)" />

  <xi:include
-    href="http://www.FreeBSD.org/XML/www/share/xml/events2011.xml"
+    href="http://www.FreeBSD.org/XML/share/xml/events2011.xml"
    xpointer="xpointer(//event)" />

  <xi:include
-    href="http://www.FreeBSD.org/XML/www/share/xml/events2010.xml"
+    href="http://www.FreeBSD.org/XML/share/xml/events2010.xml"
    xpointer="xpointer(//event)" />

  <xi:include
-    href="http://www.FreeBSD.org/XML/www/share/xml/events2009.xml"
+    href="http://www.FreeBSD.org/XML/share/xml/events2009.xml"
    xpointer="xpointer(//event)" />

  <xi:include
-    href="http://www.FreeBSD.org/XML/www/share/xml/events2008.xml"
+    href="http://www.FreeBSD.org/XML/share/xml/events2008.xml"
    xpointer="xpointer(//event)" />

  <xi:include
-    href="http://www.FreeBSD.org/XML/www/share/xml/events2007.xml"
+    href="http://www.FreeBSD.org/XML/share/xml/events2007.xml"
    xpointer="xpointer(//event)" />

  <xi:include
-    href="http://www.FreeBSD.org/XML/www/share/xml/events2006.xml"
+    href="http://www.FreeBSD.org/XML/share/xml/events2006.xml"
    xpointer="xpointer(//event)" />

  <xi:include
-    href="http://www.FreeBSD.org/XML/www/share/xml/events2005.xml"
+    href="http://www.FreeBSD.org/XML/share/xml/events2005.xml"
    xpointer="xpointer(//event)" />

  <xi:include
-    href="http://www.FreeBSD.org/XML/www/share/xml/events2004.xml"
+    href="http://www.FreeBSD.org/XML/share/xml/events2004.xml"
    xpointer="xpointer(//event)" />

  <xi:include
-    href="http://www.FreeBSD.org/XML/www/share/xml/events2003.xml"
+    href="http://www.FreeBSD.org/XML/share/xml/events2003.xml"
    xpointer="xpointer(//event)" />
 </events>
--- a/share/xml/events2003.xml
+++ b/share/xml/events2003.xml
@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!DOCTYPE events PUBLIC "-//FreeBSD//DTD FreeBSD XML Database for Events//EN"
-                        "http://www.FreeBSD.org/XML/www/share/xml/events.dtd">
+                        "http://www.FreeBSD.org/XML/share/xml/events.dtd">
 <!--
     Events which might be interesting for FreeBSD users.

--- a/share/xml/events2004.xml
+++ b/share/xml/events2004.xml
@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!DOCTYPE events PUBLIC "-//FreeBSD//DTD FreeBSD XML Database for Events//EN"
-                        "http://www.FreeBSD.org/XML/www/share/xml/events.dtd">
+                        "http://www.FreeBSD.org/XML/share/xml/events.dtd">
 <!--
     Events which might be interesting for FreeBSD users.

--- a/share/xml/events2005.xml
+++ b/share/xml/events2005.xml
@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!DOCTYPE events PUBLIC "-//FreeBSD//DTD FreeBSD XML Database for Events//EN"
-                        "http://www.FreeBSD.org/XML/www/share/xml/events.dtd">
+                        "http://www.FreeBSD.org/XML/share/xml/events.dtd">
 <!--
     Events which might be interesting for FreeBSD users.

--- a/share/xml/events2006.xml
+++ b/share/xml/events2006.xml
@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!DOCTYPE events PUBLIC "-//FreeBSD//DTD FreeBSD XML Database for Events//EN"
-                        "http://www.FreeBSD.org/XML/www/share/xml/events.dtd">
+                        "http://www.FreeBSD.org/XML/share/xml/events.dtd">
 <!--
     Events which might be interesting for FreeBSD users.

--- a/share/xml/events2007.xml
+++ b/share/xml/events2007.xml
@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!DOCTYPE events PUBLIC "-//FreeBSD//DTD FreeBSD XML Database for Events//EN"
-                        "http://www.FreeBSD.org/XML/www/share/xml/events.dtd">
+                        "http://www.FreeBSD.org/XML/share/xml/events.dtd">
 <!--
     Events which might be interesting for FreeBSD users.

--- a/share/xml/events2008.xml
+++ b/share/xml/events2008.xml
@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!DOCTYPE events PUBLIC "-//FreeBSD//DTD FreeBSD XML Database for Events//EN"
-                        "http://www.FreeBSD.org/XML/www/share/xml/events.dtd">
+                        "http://www.FreeBSD.org/XML/share/xml/events.dtd">
 <!--
     Events which might be interesting for FreeBSD users.

--- a/share/xml/events2009.xml
+++ b/share/xml/events2009.xml
@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!DOCTYPE events PUBLIC "-//FreeBSD//DTD FreeBSD XML Database for Events//EN"
-                        "http://www.FreeBSD.org/XML/www/share/xml/events.dtd">
+                        "http://www.FreeBSD.org/XML/share/xml/events.dtd">
 <!--
     Events which might be interesting for FreeBSD users.

--- a/share/xml/events2010.xml
+++ b/share/xml/events2010.xml
@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!DOCTYPE events PUBLIC "-//FreeBSD//DTD FreeBSD XML Database for Events//EN"
-                        "http://www.FreeBSD.org/XML/www/share/xml/events.dtd">
+                        "http://www.FreeBSD.org/XML/share/xml/events.dtd">
 <!--
     Events which might be interesting for FreeBSD users.

--- a/share/xml/events2011.xml
+++ b/share/xml/events2011.xml
@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!DOCTYPE events PUBLIC "-//FreeBSD//DTD FreeBSD XML Database for Events//EN"
-                        "http://www.FreeBSD.org/XML/www/share/xml/events.dtd">
+                        "http://www.FreeBSD.org/XML/share/xml/events.dtd">
 <!--
     Events which might be interesting for FreeBSD users.

--- a/share/xml/events2012.xml
+++ b/share/xml/events2012.xml
@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!DOCTYPE events PUBLIC "-//FreeBSD//DTD FreeBSD XML Database for Events//EN"
-                        "http://www.FreeBSD.org/XML/www/share/xml/events.dtd">
+                        "http://www.FreeBSD.org/XML/share/xml/events.dtd">
 <!--
     Events which might be interesting for FreeBSD users.

--- a/share/xml/events2013.xml
+++ b/share/xml/events2013.xml
@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!DOCTYPE events PUBLIC "-//FreeBSD//DTD FreeBSD XML Database for Events//EN"
-                        "http://www.FreeBSD.org/XML/www/share/xml/events.dtd">
+                        "http://www.FreeBSD.org/XML/share/xml/events.dtd">
 <!--
     Events which might be interesting for FreeBSD users.

--- a/share/xml/events2014.xml
+++ b/share/xml/events2014.xml
@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!DOCTYPE events PUBLIC "-//FreeBSD//DTD FreeBSD XML Database for Events//EN"
-			"http://www.FreeBSD.org/XML/www/share/xml/events.dtd">
+			"http://www.FreeBSD.org/XML/share/xml/events.dtd">
 <!--
     Events which might be interesting for FreeBSD users.

--- a/share/xml/fo.titlepage.xml
+++ b/share/xml/fo.titlepage.xml
--- a/share/xml/freebsd-common.xsl
+++ b/share/xml/freebsd-common.xsl
--- a/share/xml/freebsd-dblatex.xsl
+++ b/share/xml/freebsd-dblatex.xsl
@ -6,6 +6,9 @@

  <!-- $FreeBSD$ -->

+  <!-- The localization layer is the same preference level of this file -->
+  <xsl:include href="http://www.FreeBSD.org/XML/lang/share/xml/freebsd-dblatex.xsl"/>
+
  <xsl:param name="latex.encoding">utf8</xsl:param>
  <xsl:param name="latex.hyperparam">linktocpage,colorlinks,linkcolor=blue,citecolor=blue,urlcolor=blue</xsl:param>

--- a/share/xml/freebsd-epub.xsl
+++ b/share/xml/freebsd-epub.xsl
@ -17,7 +17,7 @@
  <xsl:import href="freebsd-xhtml-common.xsl"/>

  <!-- The localization layer is the same preference level of this file -->
-  <xsl:include href="http://www.FreeBSD.org/XML/www/lang/share/xsl/freebsd-epub.xsl"/>
+  <xsl:include href="http://www.FreeBSD.org/XML/lang/share/xml/freebsd-epub.xsl"/>

  <xsl:param name="generate.legalnotice.link" select="'1'"/>

--- a/share/xml/freebsd-fo-cjk.xsl
+++ b/share/xml/freebsd-fo-cjk.xsl
--- a/share/xml/freebsd-fo-titlepage.xsl
+++ b/share/xml/freebsd-fo-titlepage.xsl
--- a/share/xml/freebsd-fo.xsl
+++ b/share/xml/freebsd-fo.xsl
@ -11,13 +11,14 @@
  <!-- Pull in the base stylesheets -->
  <xsl:import href="http://docbook.sourceforge.net/release/xsl-ns/current/fo/docbook.xsl"/>

-  <xsl:import href="http://www.FreeBSD.org/XML/www/share/xsl/freebsd-common.xsl"/>
-  <xsl:import href="http://www.FreeBSD.org/XML/www/lang/share/xsl/freebsd-common.xsl"/>
+  <xsl:import href="http://www.FreeBSD.org/XML/share/xml/freebsd-common.xsl"/>
+
+  <xsl:import href="http://www.FreeBSD.org/XML/lang/share/xml/freebsd-common.xsl"/>
  <!-- Include customized FO titlepage -->
  <xsl:import href="freebsd-fo-titlepage.xsl"/>

  <!-- The localization layer is the same preference level of this file -->
-  <xsl:include href="http://www.FreeBSD.org/XML/www/lang/share/xsl/freebsd-fo.xsl"/>
+  <xsl:include href="http://www.FreeBSD.org/XML/lang/share/xml/freebsd-fo.xsl"/>

  <xsl:param name="print">0</xsl:param>

--- a/share/xml/freebsd-pgpkeyring.xsl
+++ b/share/xml/freebsd-pgpkeyring.xsl
--- a/share/xml/freebsd-xhtml-chunk.xsl
+++ b/share/xml/freebsd-xhtml-chunk.xsl
@ -12,9 +12,9 @@
  <xsl:import href="http://docbook.sourceforge.net/release/xsl-ns/current/xhtml/chunk.xsl"/>

  <!-- Pull in common XHTML customizations -->
-  <xsl:import href="http://www.FreeBSD.org/XML/www/share/xsl/freebsd-xhtml-common.xsl"/>
+  <xsl:import href="http://www.FreeBSD.org/XML/share/xml/freebsd-xhtml-common.xsl"/>

-  <xsl:import href="http://www.FreeBSD.org/XML/www/lang/share/xsl/freebsd-xhtml.xsl"/>
+  <xsl:import href="http://www.FreeBSD.org/XML/lang/share/xml/freebsd-xhtml.xsl"/>

  <xsl:param name="generate.legalnotice.link" select="'1'"/>
 </xsl:stylesheet>
--- a/share/xml/freebsd-xhtml-common.xsl
+++ b/share/xml/freebsd-xhtml-common.xsl
--- a/share/xml/freebsd-xhtml-titlepage.xsl
+++ b/share/xml/freebsd-xhtml-titlepage.xsl
--- a/share/xml/freebsd-xhtml.xsl
+++ b/share/xml/freebsd-xhtml.xsl
@ -9,7 +9,7 @@
  <xsl:import href="http://docbook.sourceforge.net/release/xsl-ns/current/xhtml/docbook.xsl"/>

  <!-- Pull in common XHTML customizations -->
-  <xsl:import href="http://www.FreeBSD.org/XML/www/share/xsl/freebsd-xhtml-common.xsl"/>
+  <xsl:import href="http://www.FreeBSD.org/XML/share/xml/freebsd-xhtml-common.xsl"/>

-  <xsl:import href="http://www.FreeBSD.org/XML/www/lang/share/xsl/freebsd-xhtml.xsl"/>
+  <xsl:import href="http://www.FreeBSD.org/XML/lang/share/xml/freebsd-xhtml.xsl"/>
 </xsl:stylesheet>
--- a/share/xml/freebsd50.dtd
+++ b/share/xml/freebsd50.dtd
@ -1,14 +1,14 @@
 <!-- $FreeBSD$ -->
 <!ENTITY % l10n PUBLIC "-//FreeBSD//ENTITIES FreeBSD Language Specific Entities//EN"
-        "http://www.FreeBSD.org/XML/www/lang/share/xml/l10n.ent">
+        "http://www.FreeBSD.org/XML/lang/share/xml/l10n.ent">
 %l10n;

 <!ENTITY % l10n.common PUBLIC "-//FreeBSD//ENTITIES FreeBSD Language Specific Common Entities//EN"
-        "http://www.FreeBSD.org/XML/www/lang/share/xml/l10n-common.ent">
+        "http://www.FreeBSD.org/XML/lang/share/xml/l10n-common.ent">
 %l10n.common;

 <!ENTITY % iso8879.ent PUBLIC "-//FreeBSD//ENTITIES ISO 8879:1986 Entity Set//EN//XML"
-	"http://www.FreeBSD.org/XML/www/share/xml/iso8879.ent">
+	"http://www.FreeBSD.org/XML/share/xml/iso8879.ent">
 %iso8879.ent;

 <!ENTITY % orig-docbook PUBLIC "-//OASIS//DTD DocBook XML V5.0//EN"
--- a/share/xml/gallery.dtd
+++ b/share/xml/gallery.dtd
@ -33,7 +33,7 @@

 <!ENTITY % cvs
 PUBLIC "-//FreeBSD//DTD FreeBSD CVS Keywords//EN"
-	"http://www.FreeBSD.org/XML/doc/share/xml/cvs.dtd">
+	"http://www.FreeBSD.org/XML/share/xml/cvs.dtd">
 %cvs;

 <!ENTITY % autogen.ent
@ -43,15 +43,15 @@

 <!ENTITY % iso8879.ent
 PUBLIC "-//FreeBSD//ENTITIES ISO 8879:1986 Entity Set//EN//XML"
-        "http://www.FreeBSD.org/XML/www/share/xml/iso8879.ent">
+        "http://www.FreeBSD.org/XML/share/xml/iso8879.ent">
 %iso8879.ent;

 <!ENTITY % l10n.ent
 PUBLIC "-//FreeBSD//ENTITIES FreeBSD L10N Entities//EN"
-        "http://www.FreeBSD.org/XML/www/share/xml/l10n.ent">
+        "http://www.FreeBSD.org/XML/share/xml/l10n.ent">
 %l10n.ent;

 <!ENTITY % common.ent
 PUBLIC "-//FreeBSD//ENTITIES FreeBSD Common Entities//EN"
-        "http://www.FreeBSD.org/XML/www/share/xml/common.ent">
+        "http://www.FreeBSD.org/XML/share/xml/common.ent">
 %common.ent;
--- a/share/xml/ideas.dtd
+++ b/share/xml/ideas.dtd
@ -24,7 +24,7 @@

 <!ENTITY % cvs
 PUBLIC "-//FreeBSD//DTD FreeBSD CVS Keywords//EN"
-	"http://www.FreeBSD.org/XML/doc/share/xml/cvs.dtd">
+	"http://www.FreeBSD.org/XML/share/xml/cvs.dtd">
 %cvs;

 <!ENTITY % autogen.ent
@ -34,17 +34,17 @@

 <!ENTITY % iso8879.ent
 PUBLIC "-//FreeBSD//ENTITIES ISO 8879:1986 Entity Set//EN//XML"
-        "http://www.FreeBSD.org/XML/www/share/xml/iso8879.ent">
+        "http://www.FreeBSD.org/XML/share/xml/iso8879.ent">
 %iso8879.ent;

 <!ENTITY % l10n.ent
 PUBLIC "-//FreeBSD//ENTITIES FreeBSD L10N Entities//EN"
-        "http://www.FreeBSD.org/XML/www/lang/share/xml/l10n.ent">
+        "http://www.FreeBSD.org/XML/lang/share/xml/l10n.ent">
 %l10n.ent;

 <!ENTITY % l10n-common.ent
 PUBLIC "-//FreeBSD//ENTITIES FreeBSD L10N Common Entities//EN"
-        "http://www.FreeBSD.org/XML/www/share/xml/l10n.ent">
+        "http://www.FreeBSD.org/XML/share/xml/l10n.ent">
 %l10n-common.ent;

 <!ENTITY % common.ent
--- a/share/xml/libcommon.xsl
+++ b/share/xml/libcommon.xsl
@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1" ?>
 <!DOCTYPE xsl:stylesheet PUBLIC "-//FreeBSD//DTD FreeBSD XSLT 1.0 DTD//EN"
-				"http://www.FreeBSD.org/XML/www/share/xml/xslt10-freebsd.dtd">
+				"http://www.FreeBSD.org/XML/share/xml/xslt10-freebsd.dtd">
 <!-- $FreeBSD$ -->

 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
--- a/share/xml/mirrors.dtd
+++ b/share/xml/mirrors.dtd
@ -1,7 +1,7 @@
 <!-- $FreeBSD$ -->

 <!ENTITY % cvs PUBLIC "-//FreeBSD//DTD FreeBSD CVS Keywords//EN"
-"http://www.FreeBSD.org/XML/doc/share/xml/cvs.dtd">
+"http://www.FreeBSD.org/XML/share/xml/cvs.dtd">
 %cvs;

 <!ELEMENT mirrors (cvs:keyword, entry+)>
@ -22,5 +22,5 @@

 <!ENTITY % iso8879.ent
 PUBLIC "-//FreeBSD//ENTITIES ISO 8879:1986 Entity Set//EN//XML"
-        "http://www.FreeBSD.org/XML/www/share/xml/iso8879.ent">
+        "http://www.FreeBSD.org/XML/share/xml/iso8879.ent">
 %iso8879.ent;
--- a/share/xml/mirrors.xml
+++ b/share/xml/mirrors.xml
@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
 <!DOCTYPE mirrors PUBLIC "-//FreeBSD//DTD FreeBSD XML Database for Mirrors//EN"
-	"http://www.FreeBSD.org/XML/www/share/xml/mirrors.dtd">
+	"http://www.FreeBSD.org/XML/share/xml/mirrors.dtd">
 <mirrors>
    <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">
      $FreeBSD$
--- a/share/xml/multimedia.dtd
+++ b/share/xml/multimedia.dtd
@ -33,22 +33,22 @@

 <!ENTITY % iso8879.ent
 PUBLIC "-//FreeBSD//ENTITIES ISO 8879:1986 Entity Set//EN//XML"
-        "http://www.FreeBSD.org/XML/www/share/xml/iso8879.ent">
+        "http://www.FreeBSD.org/XML/share/xml/iso8879.ent">
 %iso8879.ent;

 <!ENTITY % l10n.ent
 PUBLIC "-//FreeBSD//ENTITIES FreeBSD L10N Entities//EN"
-        "http://www.FreeBSD.org/XML/www/lang/share/xml/l10n.ent">
+        "http://www.FreeBSD.org/XML/lang/share/xml/l10n.ent">
 %l10n.ent;

 <!ENTITY % l10n-common.ent
 PUBLIC "-//FreeBSD//ENTITIES FreeBSD L10N Common Entities//EN"
-        "http://www.FreeBSD.org/XML/www/share/xml/l10n.ent">
+        "http://www.FreeBSD.org/XML/share/xml/l10n.ent">
 %l10n-common.ent;

 <!ENTITY % release.ent
 PUBLIC "-//FreeBSD//ENTITIES FreeBSD Release Entities//EN"
-        "http://www.FreeBSD.org/XML/www/share/xml/release.ent">
+        "http://www.FreeBSD.org/XML/share/xml/release.ent">
 %release.ent;

 <!ENTITY % common.ent
--- a/share/xml/news.dtd
+++ b/share/xml/news.dtd
@ -57,7 +57,7 @@

 <!ENTITY % cvs
 PUBLIC "-//FreeBSD//DTD FreeBSD CVS Keywords//EN"
-	"http://www.FreeBSD.org/XML/doc/share/xml/cvs.dtd">
+	"http://www.FreeBSD.org/XML/share/xml/cvs.dtd">
 %cvs;

 <!ENTITY % autogen.ent
@ -67,17 +67,17 @@

 <!ENTITY % iso8879.ent
 PUBLIC "-//FreeBSD//ENTITIES ISO 8879:1986 Entity Set//EN//XML"
-        "http://www.FreeBSD.org/XML/www/share/xml/iso8879.ent">
+        "http://www.FreeBSD.org/XML/share/xml/iso8879.ent">
 %iso8879.ent;

 <!ENTITY % l10n.ent
 PUBLIC "-//FreeBSD//ENTITIES FreeBSD L10N Entities//EN"
-        "http://www.FreeBSD.org/XML/www/lang/share/xml/l10n.ent">
+        "http://www.FreeBSD.org/XML/lang/share/xml/l10n.ent">
 %l10n.ent;

 <!ENTITY % l10n-common.ent
 PUBLIC "-//FreeBSD//ENTITIES FreeBSD L10N Common Entities//EN"
-        "http://www.FreeBSD.org/XML/www/share/xml/l10n.ent">
+        "http://www.FreeBSD.org/XML/share/xml/l10n.ent">
 %l10n-common.ent;

 <!ENTITY % common.ent
--- a/share/xml/news.xml
+++ b/share/xml/news.xml
@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1" ?>
 <!DOCTYPE news PUBLIC "-//FreeBSD//DTD FreeBSD XML Database for News//EN"
-                      "http://www.FreeBSD.org/XML/www/share/xml/news.dtd">
+                      "http://www.FreeBSD.org/XML/share/xml/news.dtd">

 <!-- Simple schema for FreeBSD Project news.

--- a/share/xml/press.dtd
+++ b/share/xml/press.dtd
@ -48,7 +48,7 @@

 <!ENTITY % cvs
 PUBLIC "-//FreeBSD//DTD FreeBSD CVS Keywords//EN"
-	"http://www.FreeBSD.org/XML/doc/share/xml/cvs.dtd">
+	"http://www.FreeBSD.org/XML/share/xml/cvs.dtd">
 %cvs;

 <!ENTITY % autogen.ent
@ -58,17 +58,17 @@

 <!ENTITY % iso8879.ent
 PUBLIC "-//FreeBSD//ENTITIES ISO 8879:1986 Entity Set//EN//XML"
-        "http://www.FreeBSD.org/XML/www/share/xml/iso8879.ent">
+        "http://www.FreeBSD.org/XML/share/xml/iso8879.ent">
 %iso8879.ent;

 <!ENTITY % l10n.ent
 PUBLIC "-//FreeBSD//ENTITIES FreeBSD L10N Entities//EN"
-        "http://www.FreeBSD.org/XML/www/lang/share/xml/l10n.ent">
+        "http://www.FreeBSD.org/XML/lang/share/xml/l10n.ent">
 %l10n.ent;

 <!ENTITY % l10n-common.ent
 PUBLIC "-//FreeBSD//ENTITIES FreeBSD L10N Common Entities//EN"
-        "http://www.FreeBSD.org/XML/www/share/xml/l10n.ent">
+        "http://www.FreeBSD.org/XML/share/xml/l10n.ent">
 %l10n-common.ent;

 <!ENTITY % common.ent
--- a/share/xml/press.xml
+++ b/share/xml/press.xml
@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!DOCTYPE press PUBLIC "-//FreeBSD//DTD FreeBSD XML Database for Press//EN"
-                      "http://www.FreeBSD.org/XML/www/share/xml/press.dtd">
+                      "http://www.FreeBSD.org/XML/share/xml/press.dtd">
 <!--
 COMMITTERS PLEASE NOTE:
    News articles referenced in this file are also to be archived under
--- a/share/xml/sitemap.dtd
+++ b/share/xml/sitemap.dtd
@ -13,7 +13,7 @@

 <!ENTITY % cvs
 PUBLIC "-//FreeBSD//DTD FreeBSD CVS Keywords//EN"
-	"http://www.FreeBSD.org/XML/doc/share/xml/cvs.dtd">
+	"http://www.FreeBSD.org/XML/share/xml/cvs.dtd">
 %cvs;

 <!ENTITY % autogen.ent
@ -23,22 +23,22 @@

 <!ENTITY % iso8879.ent
 PUBLIC "-//FreeBSD//ENTITIES ISO 8879:1986 Entity Set//EN//XML"
-        "http://www.FreeBSD.org/XML/www/share/xml/iso8879.ent">
+        "http://www.FreeBSD.org/XML/share/xml/iso8879.ent">
 %iso8879.ent;

 <!ENTITY % l10n.ent
 PUBLIC "-//FreeBSD//ENTITIES FreeBSD L10N Entities//EN"
-        "http://www.FreeBSD.org/XML/www/lang/share/xml/l10n.ent">
+        "http://www.FreeBSD.org/XML/lang/share/xml/l10n.ent">
 %l10n.ent;

 <!ENTITY % l10n-common.ent
 PUBLIC "-//FreeBSD//ENTITIES FreeBSD L10N Common Entities//EN"
-        "http://www.FreeBSD.org/XML/www/share/xml/l10n.ent">
+        "http://www.FreeBSD.org/XML/share/xml/l10n.ent">
 %l10n-common.ent;

 <!ENTITY % release.ent
 PUBLIC "-//FreeBSD//ENTITIES FreeBSD Release Entities//EN"
-        "http://www.FreeBSD.org/XML/www/share/xml/release.ent">
+        "http://www.FreeBSD.org/XML/share/xml/release.ent">
 %release.ent;

 <!ENTITY % common.ent
--- a/share/xml/statusreport.dtd
+++ b/share/xml/statusreport.dtd
@ -103,15 +103,15 @@

 <!ENTITY % iso8879.ent
 PUBLIC "-//FreeBSD//ENTITIES ISO 8879:1986 Entity Set//EN//XML"
-        "http://www.FreeBSD.org/XML/www/share/xml/iso8879.ent">
+        "http://www.FreeBSD.org/XML/share/xml/iso8879.ent">
 %iso8879.ent;

 <!ENTITY % l10n.ent
 PUBLIC "-//FreeBSD//ENTITIES FreeBSD L10N Entities//EN"
-        "http://www.FreeBSD.org/XML/www/share/xml/l10n.ent">
+        "http://www.FreeBSD.org/XML/share/xml/l10n.ent">
 %l10n.ent;

 <!ENTITY % common.ent
 PUBLIC "-//FreeBSD//ENTITIES FreeBSD Common Entities//EN"
-        "http://www.FreeBSD.org/XML/www/share/xml/common.ent">
+        "http://www.FreeBSD.org/XML/share/xml/common.ent">
 %common.ent;
--- a/share/xml/templates.entries.xsl
+++ b/share/xml/templates.entries.xsl
@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1" ?>
 <!DOCTYPE xsl:stylesheet PUBLIC "-//FreeBSD//DTD FreeBSD XSLT 1.0 DTD//EN"
-				"http://www.FreeBSD.org/XML/www/share/xml/xslt10-freebsd.dtd" [
+				"http://www.FreeBSD.org/XML/share/xml/xslt10-freebsd.dtd" [
 <!ENTITY title "Commercial Vendors">
 ]>

@ -10,8 +10,8 @@
  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
  xmlns="http://www.w3.org/1999/xhtml">

-  <xsl:import href="http://www.FreeBSD.org/XML/www/share/xml/libcommon.xsl"/>
-  <xsl:import href="http://www.FreeBSD.org/XML/www/share/xml/xhtml.xsl"/>
+  <xsl:import href="http://www.FreeBSD.org/XML/share/xml/libcommon.xsl"/>
+  <xsl:import href="http://www.FreeBSD.org/XML/share/xml/xhtml.xsl"/>

  <xsl:param name="basename" select="'none'" />
  <xsl:param name="sort" select="'none'" />
--- a/share/xml/templates.events.xsl
+++ b/share/xml/templates.events.xsl
@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1" ?>
 <!DOCTYPE xsl:stylesheet PUBLIC "-//FreeBSD//DTD FreeBSD XSLT 1.0 DTD Fragment//EN"
-				"http://www.FreeBSD.org/XML/www/share/xml/xslt10-freebsd.dtd" [
+				"http://www.FreeBSD.org/XML/share/xml/xslt10-freebsd.dtd" [
 <!ENTITY title "FreeBSD Events">
 <!ENTITY rsslink "&base;/events/rss.xml">
 <!ENTITY rsstitle "Upcoming FreeBSD Events">
@ -39,8 +39,8 @@
  xmlns="http://www.w3.org/1999/xhtml"
  extension-element-prefixes="date">

-  <xsl:import href="http://www.FreeBSD.org/XML/www/lang/share/xml/libcommon.xsl"/>
-  <xsl:import href="http://www.FreeBSD.org/XML/www/share/xml/xhtml.xsl"/>
+  <xsl:import href="http://www.FreeBSD.org/XML/lang/share/xml/libcommon.xsl"/>
+  <xsl:import href="http://www.FreeBSD.org/XML/share/xml/xhtml.xsl"/>

  <xsl:param name="startyear">2007</xsl:param>
  <xsl:param name="pastyears">2003 2004 2005 2006</xsl:param>
--- a/share/xml/templates.events2ics.xsl
+++ b/share/xml/templates.events2ics.xsl
@ -1,5 +1,5 @@
 <!DOCTYPE xsl:stylesheet PUBLIC "-//FreeBSD//DTD FreeBSD XSLT 1.0 DTD Fragment//EN"
-				"http://www.FreeBSD.org/XML/www/share/xml/xslt10-freebsd.dtd" [
+				"http://www.FreeBSD.org/XML/share/xml/xslt10-freebsd.dtd" [
 ]>

 <!-- $FreeBSD$ -->
@ -35,7 +35,7 @@
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0"
  xmlns:cvs="http://www.FreeBSD.org/XML/CVS"
  exclude-result-prefixes="cvs">
-  <xsl:import href="http://www.FreeBSD.org/XML/www/lang/share/xml/libcommon.xsl"/>
+  <xsl:import href="http://www.FreeBSD.org/XML/lang/share/xml/libcommon.xsl"/>

  <xsl:variable name="freebsd-web-base" select="'http://www.FreeBSD.org'"/>

--- a/share/xml/templates.news-rdf.xsl
+++ b/share/xml/templates.news-rdf.xsl
@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="iso-8859-1" ?>
 <!DOCTYPE xsl:stylesheet PUBLIC "-//FreeBSD//DTD FreeBSD XSLT 1.0 DTD//EN"
-				"http://www.FreeBSD.org/XML/www/share/xml/xslt10-freebsd.dtd">
+				"http://www.FreeBSD.org/XML/share/xml/xslt10-freebsd.dtd">

 <!-- $FreeBSD$ -->

 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0"
  xmlns:cvs="http://www.FreeBSD.org/XML/CVS">

-  <xsl:import href="http://www.FreeBSD.org/XML/www/lang/share/xml/libcommon.xsl"/>
+  <xsl:import href="http://www.FreeBSD.org/XML/lang/share/xml/libcommon.xsl"/>

  <xsl:output method="xml" indent="yes" encoding="&xml.encoding;"/>

--- a/share/xml/templates.news-rss.xsl
+++ b/share/xml/templates.news-rss.xsl
@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1" ?>
 <!DOCTYPE xsl:stylesheet PUBLIC "-//FreeBSD//DTD FreeBSD XSLT 1.0 DTD//EN"
-				"http://www.FreeBSD.org/XML/www/share/xml/xslt10-freebsd.dtd" [
+				"http://www.FreeBSD.org/XML/share/xml/xslt10-freebsd.dtd" [
 <!ENTITY title "FreeBSD News Flash">
 <!ENTITY link "http://www.FreeBSD.org/news/">
 <!ENTITY email "freebsd-www">
@ -13,7 +13,7 @@
  xmlns:cvs="http://www.FreeBSD.org/XML/CVS"
  exclude-result-prefixes="cvs">

-  <xsl:import href="http://www.FreeBSD.org/XML/www/lang/share/xml/libcommon.xsl"/>
+  <xsl:import href="http://www.FreeBSD.org/XML/lang/share/xml/libcommon.xsl"/>

  <xsl:output method="xml" indent="yes" encoding="&xml.encoding;"/>

--- a/share/xml/templates.newsflash.xsl
+++ b/share/xml/templates.newsflash.xsl
@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1" ?>
 <!DOCTYPE xsl:stylesheet PUBLIC "-//FreeBSD//DTD FreeBSD XSLT 1.0 DTD//EN"
-				"http://www.FreeBSD.org/XML/www/share/xml/xslt10-freebsd.dtd" [
+				"http://www.FreeBSD.org/XML/share/xml/xslt10-freebsd.dtd" [
 <!ENTITY title "FreeBSD News Flash">
 <!ENTITY rsslink "rss.xml">
 <!ENTITY rsstitle "&title;">
@ -12,8 +12,8 @@
  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
  xmlns="http://www.w3.org/1999/xhtml">

-  <xsl:import href="http://www.FreeBSD.org/XML/www/lang/share/xml/libcommon.xsl"/>
-  <xsl:import href="http://www.FreeBSD.org/XML/www/share/xml/xhtml.xsl"/>
+  <xsl:import href="http://www.FreeBSD.org/XML/lang/share/xml/libcommon.xsl"/>
+  <xsl:import href="http://www.FreeBSD.org/XML/share/xml/xhtml.xsl"/>

  <xsl:param name="news.project.xml-master" select="'none'" />
  <xsl:param name="news.project.xml" select="'none'" />
--- a/share/xml/templates.oldnewsflash.xsl
+++ b/share/xml/templates.oldnewsflash.xsl
@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1" ?>
 <!DOCTYPE xsl:stylesheet PUBLIC "-//FreeBSD//DTD FreeBSD XSLT 1.0 DTD//EN"
-				"http://www.FreeBSD.org/XML/www/share/xml/xslt10-freebsd.dtd" [
+				"http://www.FreeBSD.org/XML/share/xml/xslt10-freebsd.dtd" [
 <!ENTITY title "FreeBSD News Flash">
 ]>

@ -10,8 +10,8 @@
  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
  xmlns="http://www.w3.org/1999/xhtml">

-  <xsl:import href="http://www.FreeBSD.org/XML/www/lang/share/xml/libcommon.xsl"/>
-  <xsl:import href="http://www.FreeBSD.org/XML/www/share/xml/xhtml.xsl"/>
+  <xsl:import href="http://www.FreeBSD.org/XML/lang/share/xml/libcommon.xsl"/>
+  <xsl:import href="http://www.FreeBSD.org/XML/share/xml/xhtml.xsl"/>

  <!-- Do not add last modified date for old news/press -->
  <xsl:variable name="date"/>
--- a/share/xml/templates.oldpress.xsl
+++ b/share/xml/templates.oldpress.xsl
@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1" ?>
 <!DOCTYPE xsl:stylesheet PUBLIC "-//FreeBSD//DTD FreeBSD XSLT 1.0 DTD//EN"
-				"http://www.FreeBSD.org/XML/www/share/xml/xslt10-freebsd.dtd" [
+				"http://www.FreeBSD.org/XML/share/xml/xslt10-freebsd.dtd" [
 <!ENTITY title "FreeBSD in the Press">
 ]>

@ -10,8 +10,8 @@
  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
  xmlns="http://www.w3.org/1999/xhtml">

-  <xsl:import href="http://www.FreeBSD.org/XML/www/lang/share/xml/libcommon.xsl"/>
-  <xsl:import href="http://www.FreeBSD.org/XML/www/share/xml/xhtml.xsl"/>
+  <xsl:import href="http://www.FreeBSD.org/XML/lang/share/xml/libcommon.xsl"/>
+  <xsl:import href="http://www.FreeBSD.org/XML/share/xml/xhtml.xsl"/>

  <!-- Do not add last modified date for old news/press -->
  <xsl:variable name="date"/>
--- a/share/xml/templates.pastevents.xsl
+++ b/share/xml/templates.pastevents.xsl
@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1" ?>
 <!DOCTYPE xsl:stylesheet PUBLIC "-//FreeBSD//DTD FreeBSD XSLT 1.0 DTD Fragment//EN"
-				"http://www.FreeBSD.org/XML/www/share/xml/xslt10-freebsd.dtd" [
+				"http://www.FreeBSD.org/XML/share/xml/xslt10-freebsd.dtd" [
 <!ENTITY title "FreeBSD Past Events">
 <!ENTITY rsslink "&base;/events/rss.xml">
 <!ENTITY rsstitle "Upcoming FreeBSD Events">
@ -39,8 +39,8 @@
  xmlns="http://www.w3.org/1999/xhtml"
  extension-element-prefixes="date">

-  <xsl:import href="http://www.FreeBSD.org/XML/www/lang/share/xml/libcommon.xsl"/>
-  <xsl:import href="http://www.FreeBSD.org/XML/www/share/xml/xhtml.xsl"/>
+  <xsl:import href="http://www.FreeBSD.org/XML/lang/share/xml/libcommon.xsl"/>
+  <xsl:import href="http://www.FreeBSD.org/XML/share/xml/xhtml.xsl"/>

  <!-- Do not add last modified date for old news/press -->
  <xsl:variable name="date"/>
--- a/share/xml/templates.press-rss.xsl
+++ b/share/xml/templates.press-rss.xsl
@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1" ?>
 <!DOCTYPE xsl:stylesheet PUBLIC "-//FreeBSD//DTD FreeBSD XSLT 1.0 DTD//EN"
-				"http://www.FreeBSD.org/XML/www/share/xml/xslt10-freebsd.dtd" [
+				"http://www.FreeBSD.org/XML/share/xml/xslt10-freebsd.dtd" [
 <!ENTITY title "FreeBSD in the Press">
 <!ENTITY link "http://www.FreeBSD.org/news/press.html">
 <!ENTITY email "freebsd-www">
@ -39,7 +39,7 @@
  xmlns:cvs="http://www.FreeBSD.org/XML/CVS"
  exclude-result-prefixes="cvs">

-  <xsl:import href="http://www.FreeBSD.org/XML/www/lang/share/xml/libcommon.xsl"/>
+  <xsl:import href="http://www.FreeBSD.org/XML/lang/share/xml/libcommon.xsl"/>

  <xsl:output method="xml" indent="yes" encoding="&xml.encoding;"/>

--- a/share/xml/templates.press.xsl
+++ b/share/xml/templates.press.xsl
@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1" ?>
 <!DOCTYPE xsl:stylesheet PUBLIC "-//FreeBSD//DTD FreeBSD XSLT 1.0 DTD//EN"
-				"http://www.FreeBSD.org/XML/www/share/xml/xslt10-freebsd.dtd" [
+				"http://www.FreeBSD.org/XML/share/xml/xslt10-freebsd.dtd" [
 <!ENTITY title "FreeBSD in the Press">
 <!ENTITY rsslink "press-rss.xml">
 <!ENTITY rsstitle "&title;">
@ -12,8 +12,8 @@
  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
  xmlns="http://www.w3.org/1999/xhtml">

-  <xsl:import href="http://www.FreeBSD.org/XML/www/lang/share/xml/libcommon.xsl"/>
-  <xsl:import href="http://www.FreeBSD.org/XML/www/share/xml/xhtml.xsl"/>
+  <xsl:import href="http://www.FreeBSD.org/XML/lang/share/xml/libcommon.xsl"/>
+  <xsl:import href="http://www.FreeBSD.org/XML/share/xml/xhtml.xsl"/>

  <xsl:param name="news.press.xml-master" select="'none'" />
  <xsl:param name="news.press.xml" select="'none'" />
--- a/share/xml/templates.usergroups.xsl
+++ b/share/xml/templates.usergroups.xsl
@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!DOCTYPE xsl:stylesheet PUBLIC "-//FreeBSD//DTD FreeBSD XSLT 1.0 DTD Fragment//EN"
-                                "http://www.FreeBSD.org/XML/www/share/xml/xslt10-freebsd.dtd" [
+                                "http://www.FreeBSD.org/XML/share/xml/xslt10-freebsd.dtd" [
 <!ENTITY title "User Groups">
 ]>

@ -10,8 +10,8 @@
  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
  xmlns="http://www.w3.org/1999/xhtml">

-  <xsl:import href="http://www.FreeBSD.org/XML/www/lang/share/xml/libcommon.xsl"/>
-  <xsl:import href="http://www.FreeBSD.org/XML/www/share/xml/xhtml.xsl"/>
+  <xsl:import href="http://www.FreeBSD.org/XML/lang/share/xml/libcommon.xsl"/>
+  <xsl:import href="http://www.FreeBSD.org/XML/share/xml/xhtml.xsl"/>

  <xsl:key name="usergroup-by-country" match="entry"
    use="../@code" />
--- a/share/xml/usergroups.dtd
+++ b/share/xml/usergroups.dtd
@ -24,15 +24,15 @@

 <!ENTITY % iso8879.ent
 PUBLIC "-//FreeBSD//ENTITIES ISO 8879:1986 Entity Set//EN//XML"
-        "http://www.FreeBSD.org/XML/www/share/xml/iso8879.ent">
+        "http://www.FreeBSD.org/XML/share/xml/iso8879.ent">
 %iso8879.ent;

 <!ENTITY % l10n.ent
 PUBLIC "-//FreeBSD//ENTITIES FreeBSD L10N Entities//EN"
-        "http://www.FreeBSD.org/XML/www/share/xml/l10n.ent">
+        "http://www.FreeBSD.org/XML/share/xml/l10n.ent">
 %l10n.ent;

 <!ENTITY % common.ent
 PUBLIC "-//FreeBSD//ENTITIES FreeBSD Common Entities//EN"
-        "http://www.FreeBSD.org/XML/www/share/xml/common.ent">
+        "http://www.FreeBSD.org/XML/share/xml/common.ent">
 %common.ent;
--- a/share/xml/usergroups.xml
+++ b/share/xml/usergroups.xml
@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!DOCTYPE usergroups PUBLIC "-//FreeBSD//DTD FreeBSD XML Database for UserGroups//EN"
-                            "http://www.FreeBSD.org/XML/www/share/xml/usergoups.dtd">
+                            "http://www.FreeBSD.org/XML/share/xml/usergoups.dtd">

 <usergroups>
    <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">
--- a/share/xml/xhtml.titlepage.xml
+++ b/share/xml/xhtml.titlepage.xml
--- a/share/xml/xhtml.xsl
+++ b/share/xml/xhtml.xsl
@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
 <!DOCTYPE xsl:stylesheet PUBLIC "-//FreeBSD//DTD FreeBSD XSLT 1.0 DTD//EN"
-"http://www.FreeBSD.org/XML/www/share/xml/xslt10-freebsd.dtd">
+"http://www.FreeBSD.org/XML/share/xml/xslt10-freebsd.dtd">
 <!-- $FreeBSD$ -->

 <xsl:stylesheet version="1.0"
--- a/share/xml/xhtml10-freebsd.dtd
+++ b/share/xml/xhtml10-freebsd.dtd
@ -8,43 +8,43 @@
 %autogen.ent;

 <!ENTITY % l10n.ent PUBLIC "-//FreeBSD//ENTITIES FreeBSD Language Specific Entities//EN"
-"http://www.FreeBSD.org/XML/doc/share/xml/l10n.ent">
+"http://www.FreeBSD.org/XML/share/xml/l10n.ent">
 %l10n.ent;

 <!ENTITY % l10n.common.ent PUBLIC "-//FreeBSD//ENTITIES FreeBSD Language Specific Common Entities//EN"
-"http://www.FreeBSD.org/XML/doc/share/xml/l10n-common.ent">
+"http://www.FreeBSD.org/XML/share/xml/l10n-common.ent">
 %l10n.common.ent;

 <!ENTITY % common.ent PUBLIC "-//FreeBSD//ENTITIES FreeBSD Common Entities//EN"
-"http://www.FreeBSD.org/XML/doc/share/xml/common.ent">
+"http://www.FreeBSD.org/XML/share/xml/common.ent">
 %common.ent;

 <!ENTITY % release.ent PUBLIC "-//FreeBSD//ENTITIES FreeBSD Release Entities//EN"
-"http://www.FreeBSD.org/XML/doc/share/xml/release.ent">
+"http://www.FreeBSD.org/XML/share/xml/release.ent">
 %release.ent;

 <!ENTITY % release.l10n.ent PUBLIC "-//FreeBSD//ENTITIES FreeBSD Release L10N Entities//EN"
-"http://www.FreeBSD.org/XML/doc/lang/share/xml/release.l10n.ent">
+"http://www.FreeBSD.org/XML/lang/share/xml/release.l10n.ent">
 %release.l10n.ent;

 <!ENTITY % navibar.l10n.ent PUBLIC "-//FreeBSD//ENTITIES HTML FreeBSD Navigation Bar L10N Entities//EN"
-"http://www.FreeBSD.org/XML/doc/lang/share/xml/navibar.l10n.ent">
+"http://www.FreeBSD.org/XML/lang/share/xml/navibar.l10n.ent">
 %navibar.l10n.ent;

 <!ENTITY % navibar.ent PUBLIC "-//FreeBSD//ENTITIES HTML FreeBSD Navigation Bar Entities//EN"
-"http://www.FreeBSD.org/XML/doc/share/xml/navibar.ent">
+"http://www.FreeBSD.org/XML/share/xml/navibar.ent">
 %navibar.ent;

 <!ENTITY % header.l10n.ent PUBLIC "-//FreeBSD//ENTITIES HTML FreeBSD Header L10N Entities//EN"
-"http://www.FreeBSD.org/XML/doc/lang/share/xml/header.l10n.ent">
+"http://www.FreeBSD.org/XML/lang/share/xml/header.l10n.ent">
 %header.l10n.ent;

 <!ENTITY % header.ent PUBLIC "-//FreeBSD//ENTITIES HTML FreeBSD Header Entities//EN"
-"http://www.FreeBSD.org/XML/doc/share/xml/header.ent">
+"http://www.FreeBSD.org/XML/share/xml/header.ent">
 %header.ent;

 <!ENTITY % authors PUBLIC "-//FreeBSD//ENTITIES FreeBSD Developers Entities//EN"
-"http://www.FreeBSD.org/XML/doc/share/xml/authors.ent">
+"http://www.FreeBSD.org/XML/share/xml/authors.ent">
 %authors;

 <!-- Allow xmlns on all elements -->
@ -57,7 +57,7 @@
  >

 <!ENTITY % cvs PUBLIC "-//FreeBSD//DTD FreeBSD CVS Keywords//EN"
-"http://www.FreeBSD.org/XML/doc/share/xml/cvs.dtd">
+"http://www.FreeBSD.org/XML/share/xml/cvs.dtd">
 %cvs;

 <!ENTITY % head.misc "(cvs:keyword|script|style|meta|link|object|isindex)*">
--- a/share/xml/xslt10-freebsd.dtd
+++ b/share/xml/xslt10-freebsd.dtd
@ -7,12 +7,12 @@
 <!--
 <!ENTITY % man-refs.ent
 PUBLIC "-//FreeBSD//ENTITIES FreeBSD Manual Page Entities//EN"
-        "http://www.FreeBSD.org/XML/doc/share/xml/man-refs.ent">
+        "http://www.FreeBSD.org/XML/share/xml/man-refs.ent">
 %man-refs.ent;

 <!ENTITY % authors.ent
 PUBLIC "-//FreeBSD//ENTITIES FreeBSD Developers Entities//EN"
-        "http://www.FreeBSD.org/XML/doc/share/xml/authors.ent">
+        "http://www.FreeBSD.org/XML/share/xml/authors.ent">
 %authors.ent;
 -->

@ -48,17 +48,17 @@

 <!ENTITY % navibar.l10n.ent
 PUBLIC "-//FreeBSD//ENTITIES HTML FreeBSD Navigation Bar L10N Entities//EN"
-        "http://www.FreeBSD.org/XML/www/lang/share/xml/navibar.l10n.ent">
+        "http://www.FreeBSD.org/XML/lang/share/xml/navibar.l10n.ent">
 %navibar.l10n.ent;

 <!ENTITY % navibar.ent
 PUBLIC "-//FreeBSD//ENTITIES HTML FreeBSD Navigation Bar Entities//EN"
-        "http://www.FreeBSD.org/XML/www/share/xml/navibar.ent">
+        "http://www.FreeBSD.org/XML/share/xml/navibar.ent">
 %navibar.ent;

 <!ENTITY % header.l10n.ent
 PUBLIC "-//FreeBSD//ENTITIES HTML FreeBSD Header L10N Entities//EN"
-        "http://www.FreeBSD.org/XML/www/lang/share/xml/header.l10n.ent">
+        "http://www.FreeBSD.org/XML/lang/share/xml/header.l10n.ent">
 %header.l10n.ent;

 <!ENTITY % header.ent
@ -68,10 +68,10 @@

 <!ENTITY % xslt10-orig.dtd
 PUBLIC "-//FreeBSD//DTD FreeBSD XSLT 1.0 DTD Fragment//EN"
-        "http://www.FreeBSD.org/XML/www/share/xml/xslt10.dtd">
+        "http://www.FreeBSD.org/XML/share/xml/xslt10.dtd">
 %xslt10-orig.dtd;

 <!ENTITY % iso8879.ent
 PUBLIC "-//FreeBSD//ENTITIES ISO 8879:1986 Entity Set//EN//XML"
-        "http://www.FreeBSD.org/XML/www/share/xml/iso8879.ent">
+        "http://www.FreeBSD.org/XML/share/xml/iso8879.ent">
 %iso8879.ent;
				`@ -1 +0,0 @@`
				\catcode`@=11\def\Gin@extensions{.pdf,.png,.jpg,.mps,.tif}\catcode`@=12