docs: Move news.rng out of docs/schemas

docs/schemas directory is meant for schemas which are installed on the
system. The schema for the news file does not need to be installed.
Store it along with the file it describes for simplicity.

diff --git a/docs/news.rng b/docs/news.rng
new file mode 100644 (file)
index 0000000..a633e22
--- /dev/null
+++ b/docs/news.rng
@@ -0,0 +1,72 @@
+<?xml version="1.0"?>
+<grammar xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
+  <start>
+    <ref name="libvirt"/>
+  </start>
+
+  <define name="libvirt">
+    <element name="libvirt">
+      <oneOrMore>
+        <ref name="release"/>
+      </oneOrMore>
+    </element>
+  </define>
+
+  <define name="release">
+    <element name="release">
+      <attribute name="version">
+        <data type="string">
+          <param name="pattern">v[0-9]+\.[0-9]+\.[0-9]+</param>
+        </data>
+      </attribute>
+      <attribute name="date">
+        <data type="string">
+          <param name="pattern">[0-9]{4}-[0-9]{2}-[0-9]{2}|unreleased</param>
+        </data>
+      </attribute>
+      <oneOrMore>
+        <ref name="section"/>
+      </oneOrMore>
+    </element>
+  </define>
+
+  <define name="section">
+    <element name="section">
+      <attribute name="title">
+        <data type="string"/>
+      </attribute>
+      <zeroOrMore>
+        <ref name="change"/>
+      </zeroOrMore>
+    </element>
+  </define>
+
+  <define name="change">
+    <element name="change">
+      <element name="summary">
+        <data type="string">
+          <!-- Use literal newline instead of \n for bug in libxml2 2.7.6 -->
+          <param name="pattern">\n[^
+]+\n +</param>
+        </data>
+      </element>
+      <optional>
+        <element name="description">
+          <ref name="description"/>
+        </element>
+      </optional>
+    </element>
+  </define>
+
+  <define name="description">
+    <oneOrMore>
+      <choice>
+        <text/>
+        <element name="code">
+          <text/>
+        </element>
+      </choice>
+    </oneOrMore>
+  </define>
+
+</grammar>

diff --git a/docs/news.xml b/docs/news.xml
index 9c0dcfd23d64ab58c69c2fa6bd38e237178f40b9..2a15b1236500d3e3cfd346580876e3204f48d6eb 100644 (file)
--- a/docs/news.xml
+++ b/docs/news.xml
@@ -17,7 +17,7 @@
 
      Lines should be kept under 80 columns, and should not exceed 100 columns.
 
-     This file is validated against docs/schemas/news.rng schema.
+     This file is validated against docs/news.rng schema.
 
      Use the following template to add a new release section:
 

diff --git a/docs/schemas/news.rng b/docs/schemas/news.rng
deleted file mode 100644 (file)
index a633e22..0000000
--- a/docs/schemas/news.rng
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0"?>
-<grammar xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
-  <start>
-    <ref name="libvirt"/>
-  </start>
-
-  <define name="libvirt">
-    <element name="libvirt">
-      <oneOrMore>
-        <ref name="release"/>
-      </oneOrMore>
-    </element>
-  </define>
-
-  <define name="release">
-    <element name="release">
-      <attribute name="version">
-        <data type="string">
-          <param name="pattern">v[0-9]+\.[0-9]+\.[0-9]+</param>
-        </data>
-      </attribute>
-      <attribute name="date">
-        <data type="string">
-          <param name="pattern">[0-9]{4}-[0-9]{2}-[0-9]{2}|unreleased</param>
-        </data>
-      </attribute>
-      <oneOrMore>
-        <ref name="section"/>
-      </oneOrMore>
-    </element>
-  </define>
-
-  <define name="section">
-    <element name="section">
-      <attribute name="title">
-        <data type="string"/>
-      </attribute>
-      <zeroOrMore>
-        <ref name="change"/>
-      </zeroOrMore>
-    </element>
-  </define>
-
-  <define name="change">
-    <element name="change">
-      <element name="summary">
-        <data type="string">
-          <!-- Use literal newline instead of \n for bug in libxml2 2.7.6 -->
-          <param name="pattern">\n[^
-]+\n +</param>
-        </data>
-      </element>
-      <optional>
-        <element name="description">
-          <ref name="description"/>
-        </element>
-      </optional>
-    </element>
-  </define>
-
-  <define name="description">
-    <oneOrMore>
-      <choice>
-        <text/>
-        <element name="code">
-          <text/>
-        </element>
-      </choice>
-    </oneOrMore>
-  </define>
-
-</grammar>

diff --git a/tests/virschematest.c b/tests/virschematest.c
index 1f990f7cd5bb464a17f46c5e9d77b68ea374b846..119d4ba395e267bf6f7f1e29b913be00e5c455f6 100644 (file)
--- a/tests/virschematest.c
+++ b/tests/virschematest.c
@@ -236,7 +236,7 @@ mymain(void)
     DO_TEST_DIR("storagevol.rng", "storagevolxml2xmlin", "storagevolxml2xmlout",
                 "storagevolschemadata");
 
-    DO_TEST_FILE("news.rng", "../docs/news.xml");
+    DO_TEST_FILE("../news.rng", "../docs/news.xml");
 
     return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE;
 }