xmlops Updating xml formats

modules/xmlops/README

@@ -40,6 +40,7 @@ Daniel-Constantin Mierla
 
    3.1. buf_size (integer)
    3.2. xml_ns (str)
+   3.3. Pseudo-Variables
 
 3.1. buf_size (integer)
 
@@ -62,11 +63,9 @@ modparam("xmlops", "buf_size", 8192)
 modparam("xmlops", "xml_ns", "rpid=urn:ietf:params:xml:ns:pidf:rpid")
 ...
 
-4. Pseudo-Variables
+3.3. Pseudo-Variables
 
-   4.1. $xml(name=>spec)
-
-4.1.  $xml(name=>spec)
+3.3. Pseudo-Variables
 
    Pseudo-variable for XML document operations using xpath syntax. For
    more see the Pseudo-Variables Cookbook.

modules/xmlops/doc/xmlops.xml

@@ -59,8 +59,7 @@
 		</section>
     </section>
 
-    <xi:include href="xmlops_params.xml"/>
-    <xi:include href="xmlops_functions.xml"/>
+    <xi:include href="xmlops_admin.xml"/>
 
 </book>
 

modules/xmlops/doc/xmlops_params.xml → modules/xmlops/doc/xmlops_admin.xml

@@ -38,4 +38,27 @@ modparam("xmlops", "xml_ns", "rpid=urn:ietf:params:xml:ns:pidf:rpid")
 		</example>
 	</section>
 
+
+	<section id="pv-xml">
+    <title>Pseudo-Variables</title>
+		<title>
+		<function moreinfo="none">$xml(name=>spec)</function>
+		</title>
+		<para>
+		Pseudo-variable for XML document operations using xpath syntax. For
+		more see the Pseudo-Variables Cookbook.
+		</para>
+		<example>
+		<title><function>xml</function> usage</title>
+		<programlisting format="linespecific">
+...
+$xml(x=&gt;doc)
+    = '&lt;?xml version="1.0" encoding="UTF-8"?&gt;&lt;a&gt;&lt;b&gt;test&lt;/b&gt;&lt;/a&gt;';
+xlog("content of node b: $xml(x=&gt;xpath:/a/b/text())\n");
+$xml(x=&gt;xpath:/a/b) = "1234";
+...
+</programlisting>
+		</example>
+	</section>
+
 </section>

modules/xmlops/doc/xmlops_functions.xml

@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-   "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
-
-<section id="textopsx.pvs" xmlns:xi="http://www.w3.org/2001/XInclude">
-    <title>Pseudo-Variables</title>
-
-	<section id="pv-xml">
-		<title>
-		<function moreinfo="none">$xml(name=>spec)</function>
-		</title>
-		<para>
-		Pseudo-variable for XML document operations using xpath syntax. For
-		more see the Pseudo-Variables Cookbook.
-		</para>
-		<example>
-		<title><function>xml</function> usage</title>
-		<programlisting format="linespecific">
-...
-$xml(x=&gt;doc)
-    = '&lt;?xml version="1.0" encoding="UTF-8"?&gt;&lt;a&gt;&lt;b&gt;test&lt;/b&gt;&lt;/a&gt;';
-xlog("content of node b: $xml(x=&gt;xpath:/a/b/text())\n");
-$xml(x=&gt;xpath:/a/b) = "1234";
-...
-</programlisting>
-		</example>
-	</section>
-
-</section>