From owner-svn-doc-projects@FreeBSD.ORG  Mon Jan 21 17:33:51 2013
Return-Path: <owner-svn-doc-projects@FreeBSD.ORG>
Delivered-To: svn-doc-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id 424C8EE7;
 Mon, 21 Jan 2013 17:33:51 +0000 (UTC)
 (envelope-from gabor@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 25C6F138;
 Mon, 21 Jan 2013 17:33:51 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r0LHXoQs095221;
 Mon, 21 Jan 2013 17:33:50 GMT (envelope-from gabor@svn.freebsd.org)
Received: (from gabor@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r0LHXocW095216;
 Mon, 21 Jan 2013 17:33:50 GMT (envelope-from gabor@svn.freebsd.org)
Message-Id: <201301211733.r0LHXocW095216@svn.freebsd.org>
From: Gabor Kovesdan <gabor@FreeBSD.org>
Date: Mon, 21 Jan 2013 17:33:50 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-projects@freebsd.org
Subject: svn commit: r40695 - projects/xml-tools/share/xml
X-SVN-Group: doc-projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-projects@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for doc projects trees
 <svn-doc-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-projects>, 
 <mailto:svn-doc-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-projects>
List-Post: <mailto:svn-doc-projects@freebsd.org>
List-Help: <mailto:svn-doc-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-projects>, 
 <mailto:svn-doc-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 21 Jan 2013 17:33:51 -0000

Author: gabor
Date: Mon Jan 21 17:33:49 2013
New Revision: 40695
URL: http://svnweb.freebsd.org/changeset/doc/40695

Log:
  - Drop some old artifacts and go towards XML validity

Modified:
  projects/xml-tools/share/xml/bibliography.xml
  projects/xml-tools/share/xml/catalog.xml
  projects/xml-tools/share/xml/mirrors-local.xsl
  projects/xml-tools/share/xml/mirrors-master.xsl
  projects/xml-tools/share/xml/urls.ent

Modified: projects/xml-tools/share/xml/bibliography.xml
==============================================================================
--- projects/xml-tools/share/xml/bibliography.xml	Mon Jan 21 17:31:17 2013	(r40694)
+++ projects/xml-tools/share/xml/bibliography.xml	Mon Jan 21 17:33:49 2013	(r40695)
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
   $FreeBSD$
 -->

Modified: projects/xml-tools/share/xml/catalog.xml
==============================================================================
--- projects/xml-tools/share/xml/catalog.xml	Mon Jan 21 17:31:17 2013	(r40694)
+++ projects/xml-tools/share/xml/catalog.xml	Mon Jan 21 17:33:49 2013	(r40695)
@@ -37,7 +37,7 @@
         uri="common.ent" />
   <public
         publicId="-//FreeBSD//ENTITIES FreeBSD L10N Common Entities//EN"
-        uri="l10n.ent" />
+        uri="l10n-common.ent" />
   <public
         publicId="-//FreeBSD//ENTITIES FreeBSD L10N Entities//EN"
         uri="l10n.ent" />
@@ -66,6 +66,9 @@
         publicId="-//FreeBSD//DTD FreeBSD XML Database for Multimedia//EN"
         uri="multimedia.dtd"/>
   <public
+        publicId="-//FreeBSD//DTD FreeBSD XML Database for Mirrors//EN"
+        uri="mirrors.dtd" />
+  <public
         publicId="-//FreeBSD//DTD FreeBSD XML Database for Events//EN"
         uri="events.dtd" />
   <public
@@ -77,4 +80,32 @@
   <public
 publicId="-//FreeBSD//DTD XHTML 1.0 Transitional-Based Extension//EN"
 uri="xhtml10-freebsd.dtd" />
+  <public
+	publicId="-//FreeBSD//ENTITIES DocBook Manual Page Entities//EN"
+	uri="man-refs.ent" />
+  <public
+	publicId="-//FreeBSD//ENTITIES DocBook Miscellaneous FreeBSD Entities//EN"
+	uri="freebsd.ent" />
+  <public
+	publicId="-//FreeBSD//ENTITIES DocBook Trademark Entities//EN"
+	uri="trademarks.ent" />
+  <public
+	publicId="-//FreeBSD//ENTITIES DocBook URL Entities//EN"
+	uri="urls.ent" />
+  <public
+	publicId="-//FreeBSD//ENTITIES DocBook Author Entities//EN"
+	uri="authors.ent"/>
+  <public
+	publicId="-//FreeBSD//ENTITIES DocBook Team Entities//EN"
+	uri="../../en_US.ISO8859-1/share/xml/teams.ent"/>
+
+  <public
+	publicId="-//FreeBSD//ENTITIES DocBook Newsgroup Entities//EN"
+	uri="../../en_US.ISO8859-1/share/xml/newsgroups.ent"/>
+  <public
+	publicId="-//FreeBSD//ENTITIES DocBook Glossary Entities//EN"
+	uri="../../en_US.ISO8859-1/share/xml/glossary.ent"/>
+  <public
+	publicId="-//FreeBSD//ENTITIES DocBook Mailing List Entities//EN"
+	uri="../../en_US.ISO8859-1/share/xml/mailing-lists.ent"/>
 </catalog>

Modified: projects/xml-tools/share/xml/mirrors-local.xsl
==============================================================================
--- projects/xml-tools/share/xml/mirrors-local.xsl	Mon Jan 21 17:31:17 2013	(r40694)
+++ projects/xml-tools/share/xml/mirrors-local.xsl	Mon Jan 21 17:33:49 2013	(r40695)
@@ -7,7 +7,6 @@
   <xsl:import href="./mirrors-master.xsl" />
 
   <xsl:output type="xml" encoding="iso-8859-1"
-	      omit-xml-declaration="yes"
 	      indent="yes"/>
 
 </xsl:stylesheet>

Modified: projects/xml-tools/share/xml/mirrors-master.xsl
==============================================================================
--- projects/xml-tools/share/xml/mirrors-master.xsl	Mon Jan 21 17:31:17 2013	(r40694)
+++ projects/xml-tools/share/xml/mirrors-master.xsl	Mon Jan 21 17:33:49 2013	(r40695)
@@ -4,7 +4,6 @@
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
 
   <xsl:output type="xml" encoding="iso-8859-1"
-	      omit-xml-declaration="yes"
 	      indent="yes"/>
 
   <!-- these params should be externally bound. The values
@@ -13,8 +12,6 @@
   <xsl:param name="proto" select="''" />
   <xsl:param name="target" select="''" />
 
-  <xsl:param name="mirrors-docbook-country-anchor-id" select="translate($target, '/.', '--')" />
-
   <xsl:variable name="date">
     <xsl:value-of xmlns:cvs="http://www.FreeBSD.org/XML/CVS"
                   select="normalize-space(//cvs:keyword[@name='freebsd'])"/>
@@ -32,16 +29,22 @@
 
   <xsl:template match="/">
     <xsl:choose>
-      <xsl:when test="$target = 'handbook/mirrors/chapter.xml'">
-	<xsl:call-template name="mirrors-docbook-country-index-all" />
+      <xsl:when test="$target = 'lastmod'">
 	<para>(<xsl:call-template name="mirrors-lastmodified" />)</para>
+      </xsl:when>
+
+      <xsl:when test="$target = 'index'">
+	<xsl:call-template name="mirrors-docbook-country-index-all" />
+      </xsl:when>
+
+      <xsl:when test="$target = 'handbook/mirrors/chapter.xml'">
 	<xsl:call-template name="mirrors-docbook-variablelist" />
       </xsl:when>
+
       <xsl:when test="$target = 'handbook/eresources/chapter.xml'">
-	<xsl:call-template name="mirrors-docbook-country-index-all" />
-	<para>(<xsl:call-template name="mirrors-lastmodified" />)</para>
 	<xsl:call-template name="mirrors-docbook-itemizedlist" />
       </xsl:when>
+
       <xsl:otherwise>
 	<xsl:value-of select="'*** processing error ***'" />
       </xsl:otherwise>
@@ -91,7 +94,7 @@
     <xsl:param name="mirrors-docbook-country-index-without-period" />
     <link>
       <xsl:attribute name="linkend">
-	<xsl:value-of select="concat($mirrors-docbook-country-anchor-id, '-', @id, '-', $type)" />
+	<xsl:value-of select="concat(@id, '-', $type)" />
       </xsl:attribute>
       <xsl:value-of select="country" />
     </link>
@@ -126,7 +129,7 @@
       <term>
 	<anchor>
 	  <xsl:attribute name="id">
-	    <xsl:value-of select="concat($mirrors-docbook-country-anchor-id, '-', @id, '-', $type)" />
+	    <xsl:value-of select="concat(@id, '-', $type)" />
 	  </xsl:attribute>
 	</anchor>
 	<xsl:value-of select="country" />
@@ -211,7 +214,7 @@
     <listitem>
       <anchor>
 	<xsl:attribute name="id">
-	  <xsl:value-of select="concat($mirrors-docbook-country-anchor-id, '-', @id, '-', $type)" />
+	  <xsl:value-of select="concat(@id, '-', $type)" />
 	</xsl:attribute>
       </anchor>
 

Modified: projects/xml-tools/share/xml/urls.ent
==============================================================================
--- projects/xml-tools/share/xml/urls.ent	Mon Jan 21 17:31:17 2013	(r40694)
+++ projects/xml-tools/share/xml/urls.ent	Mon Jan 21 17:33:49 2013	(r40695)
@@ -1,41 +1,10 @@
 <!-- $FreeBSD$ -->
 
 <!ENTITY % freebsd.urls.absolute "IGNORE">
-<!ENTITY % freebsd.urls.relprefix.1 "IGNORE">
-<!ENTITY % freebsd.urls.relprefix.2 "IGNORE">
-<!ENTITY % freebsd.urls.relprefix.3 "IGNORE">
-<!ENTITY % freebsd.urls.relprefix.4 "IGNORE">
-<!ENTITY % freebsd.urls.relprefix.5 "IGNORE">
-<!ENTITY % freebsd.urls.relprefix.6 "IGNORE">
-<!ENTITY % freebsd.urls.relprefix.7 "IGNORE">
-<!ENTITY % freebsd.urls.relprefix.8 "IGNORE">
 
 <!-- Do not edit: start here -->
 
-<![%freebsd.urls.relprefix.1;[
-	<!ENTITY url.relprefix "..">
-]]>
-<![%freebsd.urls.relprefix.2;[
-	<!ENTITY url.relprefix "../..">
-]]>
-<![%freebsd.urls.relprefix.3;[
-	<!ENTITY url.relprefix "../../..">
-]]>
-<![%freebsd.urls.relprefix.4;[
-	<!ENTITY url.relprefix "../../../..">
-]]>
-<![%freebsd.urls.relprefix.5;[
-	<!ENTITY url.relprefix "../../../../..">
-]]>
-<![%freebsd.urls.relprefix.6;[
-	<!ENTITY url.relprefix "../../../../../..">
-]]>
-<![%freebsd.urls.relprefix.7;[
-	<!ENTITY url.relprefix "../../../../../../..">
-]]>
-<![%freebsd.urls.relprefix.8;[
-	<!ENTITY url.relprefix "../../../../../../../..">
-]]>
+<!ENTITY url.relprefix "../../../..">
 
 <![ %freebsd.urls.absolute; [
 <!ENTITY url.base "http://www.FreeBSD.org">