Date: Fri, 21 Mar 2014 17:17:39 +0000 (UTC) From: Glen Barber <gjb@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r263499 - in stable/9/release/doc: en_US.ISO8859-1/share/xml share/mk share/xml Message-ID: <201403211717.s2LHHdSu014368@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: gjb Date: Fri Mar 21 17:17:39 2014 New Revision: 263499 URL: http://svnweb.freebsd.org/changeset/base/263499 Log: MFC r260653 (partial), r260655: r260653 (hrs): Add missing footer due to DSSSL->XSLT migration and use XML catalog to resolve URI r260655 (hrs): Add missing arch= and revision= support. Sponsored by: The FreeBSD Foundation Added: stable/9/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/9/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/9/release/doc/share/xml/release.xsl - copied, changed from r260653, head/release/doc/share/xml/release.xsl Deleted: stable/9/release/doc/en_US.ISO8859-1/share/xml/catalog stable/9/release/doc/share/xml/catalog stable/9/release/doc/share/xml/default.dsl Modified: stable/9/release/doc/share/mk/doc.relnotes.mk stable/9/release/doc/share/xml/catalog.xml Directory Properties: stable/9/release/doc/ (props changed) Copied: stable/9/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/9/release/doc/en_US.ISO8859-1/share/xml/catalog.xml Fri Mar 21 17:17:39 2014 (r263499, 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/9/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/9/release/doc/en_US.ISO8859-1/share/xml/release.xsl Fri Mar 21 17:17:39 2014 (r263499, 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 <<a href="mailto:questions@FreeBSD.org">questions@FreeBSD.org</a>>.</small></p> + + <p align="center"><small>All users of FreeBSD <xsl:value-of select="$release.branch"/> should + subscribe to the <<a href="mailto:current@FreeBSD.org">current@FreeBSD.org</a>> + mailing list.</small></p> + + <p align="center"><small>For questions about this documentation, + e-mail <<a href="mailto:doc@FreeBSD.org">doc@FreeBSD.org</a>>.</small></p> + </xsl:template> +</xsl:stylesheet> Modified: stable/9/release/doc/share/mk/doc.relnotes.mk ============================================================================== --- stable/9/release/doc/share/mk/doc.relnotes.mk Fri Mar 21 17:17:19 2014 (r263498) +++ stable/9/release/doc/share/mk/doc.relnotes.mk Fri Mar 21 17:17:39 2014 (r263499) @@ -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/9/release/doc/share/xml/catalog.xml ============================================================================== --- stable/9/release/doc/share/xml/catalog.xml Fri Mar 21 17:17:19 2014 (r263498) +++ stable/9/release/doc/share/xml/catalog.xml Fri Mar 21 17:17:39 2014 (r263499) @@ -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> Copied and modified: stable/9/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/9/release/doc/share/xml/release.xsl Fri Mar 21 17:17:39 2014 (r263499) @@ -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&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?201403211717.s2LHHdSu014368>