From owner-svn-doc-all@freebsd.org  Sun Sep 17 21:33:03 2017
Return-Path: <owner-svn-doc-all@freebsd.org>
Delivered-To: svn-doc-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id A64EDE06D65;
 Sun, 17 Sep 2017 21:33:03 +0000 (UTC) (envelope-from bjk@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::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 74E5A6F1A3;
 Sun, 17 Sep 2017 21:33:03 +0000 (UTC) (envelope-from bjk@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v8HLX2GM067734;
 Sun, 17 Sep 2017 21:33:02 GMT (envelope-from bjk@FreeBSD.org)
Received: (from bjk@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v8HLX2nU067732;
 Sun, 17 Sep 2017 21:33:02 GMT (envelope-from bjk@FreeBSD.org)
Message-Id: <201709172133.v8HLX2nU067732@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: bjk set sender to bjk@FreeBSD.org
 using -f
From: Benjamin Kaduk <bjk@FreeBSD.org>
Date: Sun, 17 Sep 2017 21:33:02 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r50861 - in head: en_US.ISO8859-1/htdocs/news/status
 share/xml
X-SVN-Group: doc-head
X-SVN-Commit-Author: bjk
X-SVN-Commit-Paths: in head: en_US.ISO8859-1/htdocs/news/status share/xml
X-SVN-Commit-Revision: 50861
X-SVN-Commit-Repository: doc
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-all@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: "SVN commit messages for the entire doc trees \(except for &quot;
 user&quot; , &quot; projects&quot; , and &quot; translations&quot;
 \)" <svn-doc-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-all/>
List-Post: <mailto:svn-doc-all@freebsd.org>
List-Help: <mailto:svn-doc-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 17 Sep 2017 21:33:03 -0000

Author: bjk
Date: Sun Sep 17 21:33:02 2017
New Revision: 50861
URL: https://svnweb.freebsd.org/changeset/doc/50861

Log:
  Allow per-category intro text in quarterly status reports
  
  Update the dtd to permit the <p> element to appear within
  <category> and update the xsl template to render any paragraph(s)
  of such introductory text before the line break that preceeds the
  rendering of project entries in the given category.

Modified:
  head/en_US.ISO8859-1/htdocs/news/status/report.xsl
  head/share/xml/statusreport.dtd

Modified: head/en_US.ISO8859-1/htdocs/news/status/report.xsl
==============================================================================
--- head/en_US.ISO8859-1/htdocs/news/status/report.xsl	Sun Sep 17 20:45:11 2017	(r50860)
+++ head/en_US.ISO8859-1/htdocs/news/status/report.xsl	Sun Sep 17 21:33:02 2017	(r50861)
@@ -74,7 +74,9 @@
 		<br/><h1><a>
 		  <xsl:attribute name="name"><xsl:value-of select="translate(normalize-space(description), ' ', '-')"/></xsl:attribute>
 		  <xsl:attribute name="href">#<xsl:value-of select="translate(normalize-space(description), ' ', '-')"/></xsl:attribute>
-		  <xsl:value-of select="description"/></a></h1><br/>
+		  <xsl:value-of select="description"/></a></h1>
+		  <!-- per-category intro text, if present -->
+		  <xsl:apply-templates select="p" mode="copy.html"/><br/>
 
 		<xsl:variable name="cat-short" select="name"/>
 		<xsl:apply-templates select="//project[@cat=$cat-short]">

Modified: head/share/xml/statusreport.dtd
==============================================================================
--- head/share/xml/statusreport.dtd	Sun Sep 17 20:45:11 2017	(r50860)
+++ head/share/xml/statusreport.dtd	Sun Sep 17 21:33:02 2017	(r50861)
@@ -29,7 +29,7 @@
   id		ID	#IMPLIED
 >
 
-<!ELEMENT category (name, description)>
+<!ELEMENT category (name, description, p*)>
 <!ATTLIST category
   id		ID	#IMPLIED
 >