wordml->roundtrip rename

diff --git a/xsl/docsrc/Makefile b/xsl/docsrc/Makefile
index 8a284a0a4b8322fb1e9cd33faa3c613f912d734d..5ba1845f939a7f571307f236a71c1fc41326f34e 100644 (file)
--- a/xsl/docsrc/Makefile
+++ b/xsl/docsrc/Makefile
@@ -1,5 +1,5 @@
 include ../../releasetools/Variables.mk
-DIRS=common refentry html fo manpages wordml slides website template
+DIRS=common refentry html fo manpages roundtrip slides website template
 
 DOCBOOK5_RNG=../../docbook/relaxng/docbook/docbook.rng
 PARAM_XSL_FILES=$(shell for file in $$(find .. -name "param.xsl"); do \

diff --git a/xsl/docsrc/reference.dbk b/xsl/docsrc/reference.dbk
index 29ee4bc86f69c2b4ed1446955a4e49a8ae223f5d..c0ba579587a1eb8c8cc8469492fd6f18c7613989 100644 (file)
--- a/xsl/docsrc/reference.dbk
+++ b/xsl/docsrc/reference.dbk
@@ -36,7 +36,7 @@
       </listitem>
       <listitem>
         <para><xi:include
-        href="./wordml/docparam.xml"
+        href="./roundtrip/docparam.xml"
         xpointer="xpointer(/book/bookinfo/title/node())"/></para>
       </listitem>
       <listitem>
@@ -90,7 +90,7 @@
     <xi:include href="./html/docparam.xml" xpointer="xpointer(/book/bookinfo/title)" />
     <partintro id="htmlintro">
       <xi:include href="./html/docparam.xml"
-                  xpointer="xpointer(/book/preface/node())" />
+                  xpointer="xpointer(/book/bookinfo/abstract/node())" />
     </partintro>
     <xi:include href="./html/docparam.xml" xpointer="xpointer(/book/reference)" />
   </part>
@@ -99,7 +99,7 @@
     <xi:include href="./fo/docparam.xml" xpointer="xpointer(/book/bookinfo/title)" />
     <partintro id="fointro">
       <xi:include href="./fo/docparam.xml"
-                  xpointer="xpointer(/book/preface/node())" />
+                  xpointer="xpointer(/book/bookinfo/abstract/node())" />
     </partintro>
     <xi:include href="./fo/docparam.xml" xpointer="xpointer(/book/reference)" />
   </part>
@@ -108,25 +108,25 @@
     <xi:include href="./manpages/docparam.xml" xpointer="xpointer(/book/bookinfo/title)" />
     <partintro id="manintro">
       <xi:include href="./manpages/docparam.xml"
-                  xpointer="xpointer(/book/preface/node())" />
+                  xpointer="xpointer(/book/bookinfo/abstract/node())" />
     </partintro>
     <xi:include href="./manpages/docparam.xml" xpointer="xpointer(/book/reference)" />
   </part>
 
-  <part id="wordml">
-    <xi:include href="./wordml/docparam.xml" xpointer="xpointer(/book/bookinfo/title)" />
-    <partintro id="wordmlintro">
-      <xi:include href="./wordml/docparam.xml"
-                  xpointer="xpointer(/book/preface/node())" />
+  <part id="roundtrip">
+    <xi:include href="./roundtrip/docparam.xml" xpointer="xpointer(/book/bookinfo/title)" />
+    <partintro id="roundtripintro">
+      <xi:include href="./roundtrip/docparam.xml"
+                  xpointer="xpointer(/book/bookinfo/abstract/node())" />
     </partintro>
-    <xi:include href="./wordml/docparam.xml" xpointer="xpointer(/book/reference)" />
+    <xi:include href="./roundtrip/docparam.xml" xpointer="xpointer(/book/reference)" />
   </part>
 
   <part id="slides">
     <xi:include href="./slides/docparam.xml" xpointer="xpointer(/book/bookinfo/title)" />
     <partintro id="slidesintro">
       <xi:include href="./slides/docparam.xml"
-                  xpointer="xpointer(/book/preface/node())" />
+                  xpointer="xpointer(/book/bookinfo/abstract/node())" />
     </partintro>
     <xi:include href="./slides/docparam.xml" xpointer="xpointer(/book/reference)" />
   </part>
@@ -135,7 +135,7 @@
     <xi:include href="./website/docparam.xml" xpointer="xpointer(/book/bookinfo/title)" />
     <partintro id="websiteintro">
       <xi:include href="./website/docparam.xml"
-                  xpointer="xpointer(/book/preface/node())" />
+                  xpointer="xpointer(/book/bookinfo/abstract/node())" />
     </partintro>
     <xi:include href="./website/docparam.xml" xpointer="xpointer(/book/reference)" />
   </part>
@@ -144,7 +144,7 @@
     <xi:include href="./pi/pi.xml" xpointer="xpointer(/book/bookinfo/title)" />
     <partintro id="piintro">
       <xi:include href="./pi/pi.xml"
-                  xpointer="xpointer(/book/preface/node())" />
+                  xpointer="xpointer(/book/bookinfo/abstract/node())" />
     </partintro>
     <xi:include href="./pi/pi.xml" xpointer="xpointer(/book/reference)" />
   </part>

diff --git a/xsl/docsrc/reference.xml b/xsl/docsrc/reference.xml
index fb46a55defa6411fc4e12aeaadfcfb48472f6f4a..8001fa28a78b8790180852ae4e22f3140ee79407 100644 (file)
--- a/xsl/docsrc/reference.xml
+++ b/xsl/docsrc/reference.xml
@@ -8,7 +8,7 @@ PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"
 <!ENTITY fo-param.xml SYSTEM "fo/docparam.xml" NDATA SGML>
 <!ENTITY fo-table.xml SYSTEM "fo/table.xml" NDATA SGML>
 <!ENTITY manpages-param.xml SYSTEM "manpages/docparam.xml" NDATA SGML>
-<!ENTITY wordml-param.xml SYSTEM "wordml/docparam.xml" NDATA SGML>
+<!ENTITY roundtrip-param.xml SYSTEM "roundtrip/docparam.xml" NDATA SGML>
 <!ENTITY slides-param.xml SYSTEM "slides/docparam.xml" NDATA SGML>
 <!ENTITY website-param.xml SYSTEM "website/docparam.xml" NDATA SGML>
 <!ENTITY titlepage.xml SYSTEM "template/titlepage.xml" NDATA SGML>
@@ -60,8 +60,8 @@ PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"
       <listitem><para><olink type="title" localinfo="manpages/index.html"
       targetdocent="manpages-param.xml"/></para>
       </listitem>
-      <listitem><para><olink type="title" localinfo="wordml/index.html"
-      targetdocent="wordml-param.xml"/></para>
+      <listitem><para><olink type="title" localinfo="roundtrip/index.html"
+      targetdocent="roundtrip-param.xml"/></para>
       </listitem>
       <listitem><para><olink type="title" localinfo="slides/index.html"
       targetdocent="slides-param.xml"/></para>