Author: gjb
Date: Thu Jun 19 03:59:52 2014
New Revision: 267628
URL: http://svnweb.freebsd.org/changeset/base/267628
Log:
MFC r265590, r265594, r265595, r265599 [1], r265601 [1],
r265602 [1], r265603 [1], r265605 [1], r265607 [1],
r267554 [1], r267595:
r265590:
Modify release.xsl to allow proper attribution for
sponsored and/or contributed works.
r265594:
Add two new entity files in followup to r265590,
sponsor.ent and vendor.ent, which will be used for
sponsor/vendor names and URLs.
r265595:
Add references to sponsor.ent and vendor.ent in
relnotes/article.xml and share/xml/catalog.xml.
r265599:
Add DARPA, AFRL to sponsor.ent.
r265601:
Add LSI and Spectra Logic to sponsor.ent.
r265602:
Add Netgate to sponsor.ent.
r265603:
Add a note to keep the entity lists sorted alphabetically.
r265605:
Add Google to the sponsor.ent file.
r265607:
Separate &darpa; entity and create &darpa_afrl to
avoid confusion.
r267554:
Add &citrix; and &citrix.rd; macros.
r267595:
Remove 'Inc.' for consistency.
[1] - Partial, entity addition only.
Approved by: re (hrs)
Sponsored by: The FreeBSD Foundation
Added:
stable/9/release/doc/share/xml/sponsor.ent
- copied, changed from r265594, head/release/doc/share/xml/sponsor.ent
stable/9/release/doc/share/xml/vendor.ent
- copied, changed from r265594, head/release/doc/share/xml/vendor.ent
Modified:
stable/9/release/doc/en_US.ISO8859-1/relnotes/article.xml
stable/9/release/doc/share/xml/catalog.xml
stable/9/release/doc/share/xml/release.xsl
Directory Properties:
stable/9/release/ (props changed)
stable/9/release/doc/ (props changed)
Modified: stable/9/release/doc/en_US.ISO8859-1/relnotes/article.xml
==============================================================================
--- stable/9/release/doc/en_US.ISO8859-1/relnotes/article.xml Wed Jun 18
23:34:48 2014 (r267627)
+++ stable/9/release/doc/en_US.ISO8859-1/relnotes/article.xml Thu Jun 19
03:59:52 2014 (r267628)
@@ -3,6 +3,10 @@
"../../../share/xml/freebsd50.dtd" [
<!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN"
"release.ent">
%release;
+<!ENTITY % sponsor PUBLIC "-//FreeBSD//ENTITIES Sponsor Specification//EN"
"sponsor.ent">
+ %sponsor;
+<!ENTITY % vendor PUBLIC "-//FreeBSD//ENTITIES Vendor Specification//EN"
"vendor.ent">
+ %vendor;
]>
<article xmlns="http://docbook.org/ns/docbook";
xmlns:xlink="http://www.w3.org/1999/xlink"; version="5.0">
<info>
Modified: stable/9/release/doc/share/xml/catalog.xml
==============================================================================
--- stable/9/release/doc/share/xml/catalog.xml Wed Jun 18 23:34:48 2014
(r267627)
+++ stable/9/release/doc/share/xml/catalog.xml Thu Jun 19 03:59:52 2014
(r267628)
@@ -7,5 +7,7 @@
rewritePrefix="../../"/>
<public publicId="-//FreeBSD//ENTITIES Release Specification//EN"
uri="release.ent"/>
+ <public publicId="-//FreeBSD//ENTITIES Sponsor Specification//EN"
uri="sponsor.ent"/>
+ <public publicId="-//FreeBSD//ENTITIES Vendor Specification//EN"
uri="vendor.ent"/>
<public publicId="-//FreeBSD//ENTITIES Auto Generated Device Lists//EN"
uri="dev-auto.ent"/>
</catalog>
Modified: stable/9/release/doc/share/xml/release.xsl
==============================================================================
--- stable/9/release/doc/share/xml/release.xsl Wed Jun 18 23:34:48 2014
(r267627)
+++ stable/9/release/doc/share/xml/release.xsl Thu Jun 19 03:59:52 2014
(r267628)
@@ -43,6 +43,51 @@
<xsl:value-of select="concat('[r', @revision, ']')"/>
</xsl:element>
</xsl:if>
+ <xsl:if test="@contrib">
+ <xsl:element name="span">
+ <xsl:attribute name="class">
+ <xsl:value-of select="'contrib'"/>
+ </xsl:attribute>
+ <xsl:choose>
+ <xsl:when test="@contrib = 'sponsor'">
+ <xsl:if test="@sponsor != ''">
+ (Sponsored by
+ <xsl:choose>
+ <xsl:when test="@sponsorurl != ''">
+ <xsl:element name="a">
+ <xsl:attribute name="href">
+ <xsl:value-of select="@sponsorurl"/>
+ </xsl:attribute>
+ <xsl:value-of select="concat(@sponsor, ')')"/>
+ </xsl:element>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:value-of select="concat(@sponsor, ')')"/>
+ </xsl:otherwise>
+ </xsl:choose>
+ </xsl:if>
+ </xsl:when>
+ <xsl:when test="@contrib = 'vendor'">
+ <xsl:if test="@vendor != ''">
+ (Contributed / provided by
+ <xsl:choose>
+ <xsl:when test="@vendorurl != ''">
+ <xsl:element name="a">
+ <xsl:attribute name="href">
+ <xsl:value-of select="@vendorurl"/>
+ </xsl:attribute>
+ <xsl:value-of select="concat(@vendor, ')')"/>
+ </xsl:element>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:value-of select="concat(@vendor, ')')"/>
+ </xsl:otherwise>
+ </xsl:choose>
+ </xsl:if>
+ </xsl:when>
+ </xsl:choose>
+ </xsl:element>
+ </xsl:if>
</p>
</xsl:variable>
Copied and modified: stable/9/release/doc/share/xml/sponsor.ent (from r265594,
head/release/doc/share/xml/sponsor.ent)
==============================================================================
--- head/release/doc/share/xml/sponsor.ent Wed May 7 19:43:23 2014
(r265594, copy source)
+++ stable/9/release/doc/share/xml/sponsor.ent Thu Jun 19 03:59:52 2014
(r267628)
@@ -4,7 +4,25 @@
Sponsors of various works.
+ Please keep the entity list sorted alphabetically.
+
-->
+<!ENTITY afrl "AFRL">
+
+<!ENTITY citrix "Citrix Systems">
+<!ENTITY citrix.rd "Citrix Systems R&D">
+
+<!ENTITY darpa "DARPA">
+<!ENTITY darpa_afrl "DARPA, AFRL">
+
<!ENTITY ff "The &os; Foundation">
<!ENTITY ff.url "https://www.FreeBSDFoundation.org/";>
+
+<!ENTITY google "Google">
+
+<!ENTITY lsi "LSI">
+
+<!ENTITY netgate "Netgate">
+
+<!ENTITY spectralogic "Spectra Logic">
Copied and modified: stable/9/release/doc/share/xml/vendor.ent (from r265594,
head/release/doc/share/xml/vendor.ent)
==============================================================================
--- head/release/doc/share/xml/vendor.ent Wed May 7 19:43:23 2014
(r265594, copy source)
+++ stable/9/release/doc/share/xml/vendor.ent Thu Jun 19 03:59:52 2014
(r267628)
@@ -4,4 +4,6 @@
Vendors and contributors.
+ Please keep the entity list sorted alphabetically.
+
-->
_______________________________________________
svn-src-stable-9@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9
To unsubscribe, send any mail to "svn-src-stable-9-unsubscr...@freebsd.org"
