From owner-svn-src-all@FreeBSD.ORG Thu Jun 19 03:59:54 2014 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 5FC64912; Thu, 19 Jun 2014 03:59:54 +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 4A3622131; Thu, 19 Jun 2014 03:59:54 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s5J3xstP059129; Thu, 19 Jun 2014 03:59:54 GMT (envelope-from gjb@svn.freebsd.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s5J3xrom059124; Thu, 19 Jun 2014 03:59:53 GMT (envelope-from gjb@svn.freebsd.org) Message-Id: <201406190359.s5J3xrom059124@svn.freebsd.org> From: Glen Barber Date: Thu, 19 Jun 2014 03:59:53 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r267628 - in stable/9/release/doc: en_US.ISO8859-1/relnotes share/xml X-SVN-Group: stable-9 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 " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 19 Jun 2014 03:59:54 -0000 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" [ %release; + + %sponsor; + + %vendor; ]>
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="../../"/> + + 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 @@ + + + + + + + + + (Sponsored by + + + + + + + + + + + + + + + + + + (Contributed / provided by + + + + + + + + + + + + + + + + + +

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. + --> + + + + + + + + + + + + + + + + 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. + -->