From owner-svn-src-all@FreeBSD.ORG  Wed May  7 19:20:55 2014
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 8E9257CF;
 Wed,  7 May 2014 19:20:55 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 6F66D12B;
 Wed,  7 May 2014 19:20:55 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s47JKttH041638;
 Wed, 7 May 2014 19:20:55 GMT (envelope-from gjb@svn.freebsd.org)
Received: (from gjb@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s47JKt66041613;
 Wed, 7 May 2014 19:20:55 GMT (envelope-from gjb@svn.freebsd.org)
Message-Id: <201405071920.s47JKt66041613@svn.freebsd.org>
From: Glen Barber <gjb@FreeBSD.org>
Date: Wed, 7 May 2014 19:20:55 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r265590 - head/release/doc/share/xml
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 07 May 2014 19:20:55 -0000

Author: gjb
Date: Wed May  7 19:20:54 2014
New Revision: 265590
URL: http://svnweb.freebsd.org/changeset/base/265590

Log:
  Modify release.xsl to allow proper attribution for
  sponsored and/or contributed works.
  
  This works similarly to how the subversion revision is
  suffixed in release notes entries when 'revision="NNNNNN"'
  is set.
  
  The <para> tag in relnotes/article.xml can now take the
  following new elements:
  
   - contrib: defined to what type of contribution the change
     is.  Right now, only 'vendor' or 'sponsor' are used.
     'vendor' is intended for vendor-contributed code, such as
     driver updates, etc.  'sponsor' is intended for sponsored
     work (the 'Sponsored by:' in the commit template).
  
   - vendor: The canonical name of the vendor.
  
   - sponsor: The canonical name of the sponsor.
  
   - vendorurl: The URL for the vendor website, if applicable.
  
   - sponsorurl: The URL for the sponsor website, if applicable.
  
  If 'vendor' or 'sponsor' are set, but 'contrib' is not, nothing
  is rendered.  If 'contrib' is set, but no 'vendor' or 'sponsor'
  are defined, nothing is printed.  If 'vendorurl' or 'sponsorurl'
  are set, the 'vendor' or 'sponsor' text is link, otherwise is
  non-clickable text.
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  head/release/doc/share/xml/release.xsl

Modified: head/release/doc/share/xml/release.xsl
==============================================================================
--- head/release/doc/share/xml/release.xsl	Wed May  7 19:13:09 2014	(r265589)
+++ head/release/doc/share/xml/release.xsl	Wed May  7 19:20:54 2014	(r265590)
@@ -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>