From d083dac69badc0192eab38fbda15d5dfddec2211 Mon Sep 17 00:00:00 2001
From: Benjamin Kaduk <bjk@FreeBSD.org>
Date: Sun, 17 Sep 2017 21:33:02 +0000
Subject: [PATCH] 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.
---
 en_US.ISO8859-1/htdocs/news/status/report.xsl | 4 +++-
 share/xml/statusreport.dtd                    | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/en_US.ISO8859-1/htdocs/news/status/report.xsl b/en_US.ISO8859-1/htdocs/news/status/report.xsl
index 2c1a7ece4f..06a4ec0844 100644
--- a/en_US.ISO8859-1/htdocs/news/status/report.xsl
+++ b/en_US.ISO8859-1/htdocs/news/status/report.xsl
@@ -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]">
diff --git a/share/xml/statusreport.dtd b/share/xml/statusreport.dtd
index 25ffb5f5d9..bbdf0a5aa6 100644
--- a/share/xml/statusreport.dtd
+++ b/share/xml/statusreport.dtd
@@ -29,7 +29,7 @@
   id		ID	#IMPLIED
 >
 
-<!ELEMENT category (name, description)>
+<!ELEMENT category (name, description, p*)>
 <!ATTLIST category
   id		ID	#IMPLIED
 >