Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 14 Jan 2014 23:15:53 +0000 (UTC)
From:      Hiroki Sato <hrs@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject:   svn commit: r260656 - in stable/10/release/doc: de_DE.ISO8859-1 en_US.ISO8859-1/errata en_US.ISO8859-1/share/xml fr_FR.ISO8859-1 ja_JP.eucJP ru_RU.KOI8-R share/mk share/xml zh_CN.GB2312
Message-ID:  <201401142315.s0ENFrWY015829@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: hrs
Date: Tue Jan 14 23:15:53 2014
New Revision: 260656
URL: http://svnweb.freebsd.org/changeset/base/260656

Log:
  - MFC 260653,260655:
  
  * Purge old translations.
  * Add missing footer due to DSSSL->XSLT migration and use XML catalog to
    resolve URI.
  * Add missing arch= and revision= support.
  
  - Update release.ent and fix release number in Errata.

Added:
  stable/10/release/doc/en_US.ISO8859-1/share/xml/catalog.xml
     - copied unchanged from r260653, head/release/doc/en_US.ISO8859-1/share/xml/catalog.xml
  stable/10/release/doc/en_US.ISO8859-1/share/xml/release.xsl
     - copied unchanged from r260653, head/release/doc/en_US.ISO8859-1/share/xml/release.xsl
  stable/10/release/doc/share/xml/release.xsl
     - copied, changed from r260653, head/release/doc/share/xml/release.xsl
Deleted:
  stable/10/release/doc/de_DE.ISO8859-1/
  stable/10/release/doc/en_US.ISO8859-1/share/xml/catalog
  stable/10/release/doc/en_US.ISO8859-1/share/xml/release.dsl
  stable/10/release/doc/fr_FR.ISO8859-1/
  stable/10/release/doc/ja_JP.eucJP/
  stable/10/release/doc/ru_RU.KOI8-R/
  stable/10/release/doc/share/xml/catalog
  stable/10/release/doc/share/xml/default.dsl
  stable/10/release/doc/share/xml/release.dsl
  stable/10/release/doc/zh_CN.GB2312/
Modified:
  stable/10/release/doc/en_US.ISO8859-1/errata/article.xml
  stable/10/release/doc/share/mk/doc.relnotes.mk
  stable/10/release/doc/share/xml/catalog.xml
  stable/10/release/doc/share/xml/release.ent
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/release/doc/en_US.ISO8859-1/errata/article.xml
==============================================================================
--- stable/10/release/doc/en_US.ISO8859-1/errata/article.xml	Tue Jan 14 23:04:31 2014	(r260655)
+++ stable/10/release/doc/en_US.ISO8859-1/errata/article.xml	Tue Jan 14 23:15:53 2014	(r260656)
@@ -16,7 +16,7 @@
 
 -->
 <article xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0">
-  <info><title>&os; &release; Errata </title>
+  <info><title>&os; &release.prev; Errata </title>
     
 
     <author><orgname>
@@ -26,20 +26,7 @@
     <pubdate>$FreeBSD$</pubdate>
 
     <copyright>
-      <year>2000</year>
-      <year>2001</year>
-      <year>2002</year>
-      <year>2003</year>
-      <year>2004</year>
-      <year>2005</year>
-      <year>2006</year>
-      <year>2007</year>
-      <year>2008</year>
-      <year>2009</year>
-      <year>2010</year>
-      <year>2011</year>
-      <year>2012</year>
-      <year>2013</year>
+      <year>2014</year>
       <holder role="mailto:doc@FreeBSD.org">The &os; Documentation Project</holder>
     </copyright>
 

Copied: stable/10/release/doc/en_US.ISO8859-1/share/xml/catalog.xml (from r260653, head/release/doc/en_US.ISO8859-1/share/xml/catalog.xml)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ stable/10/release/doc/en_US.ISO8859-1/share/xml/catalog.xml	Tue Jan 14 23:15:53 2014	(r260656, copy of r260653, head/release/doc/en_US.ISO8859-1/share/xml/catalog.xml)
@@ -0,0 +1,12 @@
+<?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$ -->
+
+<catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog">
+  <rewriteSystem systemIdStartString="http://www.FreeBSD.org/release/XML/lang/"
+                 rewritePrefix="../../"/>
+  <rewriteURI uriStartString="http://www.FreeBSD.org/release/XML/lang/"
+              rewritePrefix="../../"/>
+</catalog>

Copied: stable/10/release/doc/en_US.ISO8859-1/share/xml/release.xsl (from r260653, head/release/doc/en_US.ISO8859-1/share/xml/release.xsl)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ stable/10/release/doc/en_US.ISO8859-1/share/xml/release.xsl	Tue Jan 14 23:15:53 2014	(r260656, copy of r260653, head/release/doc/en_US.ISO8859-1/share/xml/release.xsl)
@@ -0,0 +1,27 @@
+<?xml version="1.0"?>
+<!-- $FreeBSD$ -->
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+                version='1.0'
+                xmlns="http://www.w3.org/TR/xhtml1/transitional"
+                xmlns:db="http://docbook.org/ns/docbook"
+                exclude-result-prefixes="db">
+
+  <xsl:param name="release.url"/>
+  <xsl:param name="release.branch"/>
+
+  <xsl:template name="user.footer.content">
+    <p align="center"><small>This file, and other release-related documents,
+      can be downloaded from <a href="{$release.url}"><xsl:value-of select="$release.url"/></a>.</small></p>
+
+    <p align="center"><small>For questions about FreeBSD, read the
+      <a href="http://www.FreeBSD.org/docs.html">documentation</a>; before
+      contacting &lt;<a href="mailto:questions@FreeBSD.org">questions@FreeBSD.org</a>&gt;.</small></p>
+
+    <p align="center"><small>All users of FreeBSD <xsl:value-of select="$release.branch"/> should
+      subscribe to the &lt;<a href="mailto:current@FreeBSD.org">current@FreeBSD.org</a>&gt;
+      mailing list.</small></p>
+  
+    <p align="center"><small>For questions about this documentation,
+      e-mail &lt;<a href="mailto:doc@FreeBSD.org">doc@FreeBSD.org</a>&gt;.</small></p>
+  </xsl:template>
+</xsl:stylesheet>

Modified: stable/10/release/doc/share/mk/doc.relnotes.mk
==============================================================================
--- stable/10/release/doc/share/mk/doc.relnotes.mk	Tue Jan 14 23:04:31 2014	(r260655)
+++ stable/10/release/doc/share/mk/doc.relnotes.mk	Tue Jan 14 23:15:53 2014	(r260656)
@@ -4,6 +4,8 @@ DOC_PREFIX?= ${RELN_ROOT}/../../../doc
 
 # XXX
 RELEASETYPE!= grep -o 'release.type "[a-z]*"' ${RELN_ROOT}/share/xml/release.ent | sed 's|[a-z.]* "\([a-z]*\)"|\1|'
+RELEASEURL!= grep -o 'release.url \"[^\"]*\"' ${RELN_ROOT}/share/xml/release.ent | sed 's|[^ ]* "\([^"]*\)"|\1|'
+RELEASEBRANCH!= grep -o 'release.branch "\([^"]*\)"' ${RELN_ROOT}/share/xml/release.ent | sed 's|[^ ]* "\([^"]*\)"|\1|'
 .if ${RELEASETYPE} == "current"
 PROFILING+= --param profile.attribute "'releasetype'" --param profile.value "'current'"
 .elif ${RELEASETYPE} == "snapshot"
@@ -11,13 +13,14 @@ PROFILING+= --param profile.attribute "'
 .elif ${RELEASETYPE} == "release"
 PROFILING+= --param profile.attribute "'releasetype'" --param profile.value "'release'"
 .endif
+XSLTPROCFLAGS+= --param release.url "'${RELEASEURL}'"
+XSLTPROCFLAGS+= --param release.branch "'${RELEASEBRANCH}'"
 
 # Find the RELNOTESng document catalogs
 EXTRA_CATALOGS+= file://${RELN_ROOT}/${LANGCODE}/share/xml/catalog.xml \
-		file://${RELN_ROOT}/share/xml/catalog.xml
+		 file://${RELN_ROOT}/share/xml/catalog.xml
 
-# Use the appropriate architecture-dependent RELNOTESng stylesheet
-DSLPRINT?=	${RELN_ROOT}/share/xml/default.dsl
+XSLXHTML= http://www.FreeBSD.org/release/XML/share/xml/release.xsl
 
 #
 # Automatic device list generation:

Modified: stable/10/release/doc/share/xml/catalog.xml
==============================================================================
--- stable/10/release/doc/share/xml/catalog.xml	Tue Jan 14 23:04:31 2014	(r260655)
+++ stable/10/release/doc/share/xml/catalog.xml	Tue Jan 14 23:15:53 2014	(r260656)
@@ -1,6 +1,11 @@
 <?xml version="1.0"?>
 <!-- $FreeBSD$ -->
 <catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog">
+  <rewriteSystem systemIdStartString="http://www.FreeBSD.org/release/XML/"
+                 rewritePrefix="../../"/>
+  <rewriteURI uriStartString="http://www.FreeBSD.org/release/XML/"
+              rewritePrefix="../../"/>
+
   <public publicId="-//FreeBSD//ENTITIES Release Specification//EN" uri="release.ent"/>
   <public publicId="-//FreeBSD//ENTITIES Auto Generated Device Lists//EN" uri="dev-auto.ent"/>
 </catalog>

Modified: stable/10/release/doc/share/xml/release.ent
==============================================================================
--- stable/10/release/doc/share/xml/release.ent	Tue Jan 14 23:04:31 2014	(r260655)
+++ stable/10/release/doc/share/xml/release.ent	Tue Jan 14 23:15:53 2014	(r260656)
@@ -6,17 +6,17 @@
 
 <!-- Version of the OS we're describing.  This needs to be updated
      with each new release. -->
-<!ENTITY release.current "10.0-RELEASE">
+<!ENTITY release.current "10.0-STABLE">
 
 <!-- The previous version used for comparison in the "What's New"
      section.  For -CURRENT, we might point back to the last
      branchpoint. -->
-<!ENTITY release.prev "10.0-CURRENT">
+<!ENTITY release.prev "10.0-RELEASE">
 
 <!-- The previous stable release, useful for pointing user's at the
      release they SHOULD be running if they don't want the bleeding
      edge. -->
-<!ENTITY release.prev.stable "9.2-RELEASE">
+<!ENTITY release.prev.stable "10.0-RELEASE">
 
 <!-- The next version to be released, usually used for snapshots. -->
 <!ENTITY release.next "10.1-RELEASE">
@@ -52,7 +52,7 @@
 <!ENTITY release.manpath.xorg          "7.5.1">
 <!ENTITY release.manpath.netbsd        "5.1">
 <!ENTITY release.manpath.freebsd-ports "Ports">
-<!ENTITY release.manpath.freebsd       "10-current">
+<!ENTITY release.manpath.freebsd       "10-stable">
 
 <!-- Text constants which probably don't need to be changed.-->
 
@@ -70,6 +70,3 @@
 <!ENTITY arch.pc98 "pc98">
 <!ENTITY arch.powerpc "powerpc">
 <!ENTITY arch.sparc64 "sparc64">
-
-<!-- The marker for MFCs. -->
-<!ENTITY merged "MERGED">

Copied and modified: stable/10/release/doc/share/xml/release.xsl (from r260653, head/release/doc/share/xml/release.xsl)
==============================================================================
--- head/release/doc/share/xml/release.xsl	Tue Jan 14 22:46:23 2014	(r260653, copy source)
+++ stable/10/release/doc/share/xml/release.xsl	Tue Jan 14 23:15:53 2014	(r260656)
@@ -12,4 +12,49 @@
 
   <xsl:param name="release.url"/>
   <xsl:param name="release.branch"/>
+
+  <xsl:template name="paragraph">
+    <xsl:param name="class" select="''"/>
+    <xsl:param name="content"/>
+
+    <xsl:variable name="p">
+      <p>
+	<xsl:choose>
+          <xsl:when test="$class != ''">
+            <xsl:call-template name="common.html.attributes">
+              <xsl:with-param name="class" select="$class"/>
+             </xsl:call-template>
+           </xsl:when>
+          <xsl:otherwise>
+            <xsl:call-template name="locale.html.attributes"/>
+           </xsl:otherwise>
+	 </xsl:choose>
+	<xsl:if test="@arch">
+	  <xsl:value-of select="concat('[', @arch, ']')"/>
+	  <xsl:value-of select='" "'/>
+	</xsl:if>
+	<xsl:copy-of select="$content"/>
+	<xsl:value-of select='" "'/>
+	<xsl:if test="@revision">
+	  <xsl:element name="a">
+	    <xsl:attribute name="href">
+	      <xsl:value-of select="concat('http://svn.freebsd.org/viewvc/base?view=revision&#38;revision=', @revision)"/>
+	    </xsl:attribute>
+	    <xsl:value-of select="concat('[r', @revision, ']')"/>
+	  </xsl:element>
+	</xsl:if>
+       </p>
+     </xsl:variable>
+
+    <xsl:choose>
+      <xsl:when test="$html.cleanup != 0">
+	<xsl:call-template name="unwrap.p">
+          <xsl:with-param name="p" select="$p"/>
+	 </xsl:call-template>
+       </xsl:when>
+      <xsl:otherwise>
+	<xsl:copy-of select="$p"/>
+       </xsl:otherwise>
+     </xsl:choose>
+   </xsl:template>
 </xsl:stylesheet>



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201401142315.s0ENFrWY015829>