- 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.

6 files changed, 39 insertions, 7 deletions

diff --git a/fr_FR.ISO8859-1/share/xml/catalog.xml b/fr_FR.ISO8859-1/share/xml/catalog.xml
index d947212956..58cb485c0d 100644
--- a/fr_FR.ISO8859-1/share/xml/catalog.xml
+++ b/fr_FR.ISO8859-1/share/xml/catalog.xml
@@ -5,10 +5,22 @@
 <!-- $FreeBSD$ -->
 
 <catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog">
-  <rewriteSystem systemIdStartString="http://www.FreeBSD.org/XML/www/lang/"
+  <rewriteSystem systemIdStartString="http://www.FreeBSD.org/XML/lang/"
                  rewritePrefix="../../"/>
-  <rewriteURI uriStartString="http://www.FreeBSD.org/XML/www/lang/"
+  <rewriteURI uriStartString="http://www.FreeBSD.org/XML/lang/"
               rewritePrefix="../../"/>
+  <system
+    systemId="http://www.FreeBSD.org/XML/lang/share/xml/freebsd-common.xsl"
+    uri="http://www.FreeBSD.org/XML/share/xml/empty.xsl" />
+  <system
+    systemId="http://www.FreeBSD.org/XML/lang/share/xml/freebsd-epub.xsl"
+    uri="http://www.FreeBSD.org/XML/share/xml/empty.xsl" />
+  <system
+    systemId="http://www.FreeBSD.org/XML/lang/share/xml/freebsd-fo.xsl"
+    uri="http://www.FreeBSD.org/XML/share/xml/empty.xsl" />
+  <system
+    systemId="http://www.FreeBSD.org/XML/lang/share/xml/freebsd-dblatex.xsl"
+    uri="http://www.FreeBSD.org/XML/share/xml/empty.xsl" />
 
   <public publicId="-//FreeBSD//ENTITIES FreeBSD Language Specific Entities//EN"
         uri="l10n.ent" />
diff --git a/fr_FR.ISO8859-1/share/xml/events.xml b/fr_FR.ISO8859-1/share/xml/events.xml
index 192e9e9129..fa2492a35b 100644
--- a/fr_FR.ISO8859-1/share/xml/events.xml
+++ b/fr_FR.ISO8859-1/share/xml/events.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
 <!DOCTYPE events PUBLIC "-//FreeBSD//DTD FreeBSD XML Database for Events//EN"
-                        "http://www.FreeBSD.org/XML/www/share/xml/evenets.dtd">
+                        "http://www.FreeBSD.org/XML/share/xml/evenets.dtd">
 <!--
      Events which might be interesting for FreeBSD users.
 
diff --git a/fr_FR.ISO8859-1/share/xml/freebsd-xhtml.xsl b/fr_FR.ISO8859-1/share/xml/freebsd-xhtml.xsl
new file mode 100644
index 0000000000..3865c406a6
--- /dev/null
+++ b/fr_FR.ISO8859-1/share/xml/freebsd-xhtml.xsl
@@ -0,0 +1,20 @@
+<?xml version='1.0' encoding='iso-8859-1'?>
+
+<!-- $FreeBSD$ -->
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+                version='1.0'
+                xmlns="http://www.w3.org/TR/xhtml1/transitional"
+                exclude-result-prefixes="#default">
+
+  <xsl:template name="user.footer.navigation">
+    <p align="center"><small>Ce document, ainsi que d'autres peut être téléchargé sur
+    <a href="ftp://ftp.FreeBSD.org/pub/FreeBSD/doc/">ftp://ftp.FreeBSD.org/pub/FreeBSD/doc/</a></small></p>
+
+    <p align="center"><small>Pour toutes questions à propos de FreeBSD, lisez la
+    <a href="http://www.FreeBSD.org/docs.html">documentation</a> avant de contacter
+    &lt;<a href="mailto:questions@FreeBSD.org">questions@FreeBSD.org</a>&gt;.<br/>
+    Pour les questions sur cette documentation, contactez
+    &lt;<a href="mailto:doc@FreeBSD.org">doc@FreeBSD.org</a>&gt;.</small></p>
+  </xsl:template>
+</xsl:stylesheet>
diff --git a/fr_FR.ISO8859-1/share/xml/libcommon.xsl b/fr_FR.ISO8859-1/share/xml/libcommon.xsl
index dd0fb2283c..309c1e4344 100644
--- a/fr_FR.ISO8859-1/share/xml/libcommon.xsl
+++ b/fr_FR.ISO8859-1/share/xml/libcommon.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 version="1.0"
   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/share/xml/libcommon.xsl"/>
 
   <xsl:template name="html-news-list-newsflash-preface">
     <img src="&enbase;/gifs/news.jpg" align="right" border="0" width="193"
diff --git a/fr_FR.ISO8859-1/share/xml/news.xml b/fr_FR.ISO8859-1/share/xml/news.xml
index c3b4ece18f..4aba6a4a10 100644
--- a/fr_FR.ISO8859-1/share/xml/news.xml
+++ b/fr_FR.ISO8859-1/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.
 
diff --git a/fr_FR.ISO8859-1/share/xml/press.xml b/fr_FR.ISO8859-1/share/xml/press.xml
index bdaf08fb05..3041228ea4 100644
--- a/fr_FR.ISO8859-1/share/xml/press.xml
+++ b/fr_FR.ISO8859-1/share/xml/press.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1" ?>
 <!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