news: Allow empty <section> elements

Creating dummy <change> elements was a workaround for the
HTML DTD not allowing empty <ul> elements, but we can do
better by tweaking the the XSLT stylesheet.

diff --git a/docs/news-html.xsl b/docs/news-html.xsl
index dcbab86842611168514bd01c3045ce7c4817fae9..dd323f9b3fd5206f4b05eabbdfc3a841e8e1f282 100644 (file)
--- a/docs/news-html.xsl
+++ b/docs/news-html.xsl
@@ -57,9 +57,11 @@
       <strong>
         <xsl:value-of select="@title"/>
       </strong>
-      <ul>
-        <xsl:apply-templates select="change"/>
-      </ul>
+      <xsl:if test="*">
+        <ul>
+          <xsl:apply-templates select="change"/>
+        </ul>
+      </xsl:if>
     </li>
   </xsl:template>
 

diff --git a/docs/news.xml b/docs/news.xml
index 014a439f199f5d871c59258b1db76bdba26308e0..9c0dcfd23d64ab58c69c2fa6bd38e237178f40b9 100644 (file)
--- a/docs/news.xml
+++ b/docs/news.xml
@@ -23,19 +23,10 @@
 
   <release version="FIXME" date="unreleased">
     <section title="New features">
-      <change>
-        <summary/>
-      </change>
     </section>
     <section title="Improvements">
-      <change>
-        <summary/>
-      </change>
     </section>
     <section title="Bug fixes">
-      <change>
-        <summary/>
-      </change>
     </section>
   </release>
 
@@ -44,19 +35,10 @@
 <libvirt>
   <release version="v3.3.0" date="unreleased">
     <section title="New features">
-      <change>
-        <summary/>
-      </change>
     </section>
     <section title="Improvements">
-      <change>
-        <summary/>
-      </change>
     </section>
     <section title="Bug fixes">
-      <change>
-        <summary/>
-      </change>
     </section>
   </release>
   <release version="v3.2.0" date="2017-04-02">

diff --git a/docs/schemas/news.rng b/docs/schemas/news.rng
index 94a6870c18ffe8e403766c12ff9f0e3f85a2a7ed..ec4313f621a41bd7706ce3e764831498fccae54e 100644 (file)
--- a/docs/schemas/news.rng
+++ b/docs/schemas/news.rng
@@ -35,21 +35,18 @@
       <attribute name="title">
         <data type="string"/>
       </attribute>
-      <oneOrMore>
+      <zeroOrMore>
         <ref name="change"/>
-      </oneOrMore>
+      </zeroOrMore>
     </element>
   </define>
 
   <define name="change">
     <element name="change">
       <element name="summary">
-        <choice>
-          <data type="string">
-            <param name="pattern">\n[^\n]+\n +</param>
-          </data>
-          <empty/>
-        </choice>
+        <data type="string">
+          <param name="pattern">\n[^\n]+\n +</param>
+        </data>
       </element>
       <optional>
         <element name="description">