Move remaining design/understanding content to design.

git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@196332 13f79535-47bb-0310-9956-ffa450edef68

6 files changed, 4 insertions, 52 deletions

diff --git a/src/documentation/content/xdocs/design/book.xml b/src/documentation/content/xdocs/design/book.xml
index 5d1ffca75..8e63c05a7 100644
--- a/src/documentation/content/xdocs/design/book.xml
+++ b/src/documentation/content/xdocs/design/book.xml
@@ -2,11 +2,6 @@
 <!DOCTYPE book PUBLIC "-//APACHE//DTD Cocoon Documentation Book V1.0//EN"
     "http://cvs.apache.org/viewcvs.cgi/*checkout*/xml-cocoon2/src/documentation/xdocs/dtd/book-cocoon-v10.dtd">
 
-<!--
-IF YOU MAKE CHANGES TO THIS FILE, PLEASE MAKE CORRESPONDING CHANGES TO
-understanding/book.xml, WHICH SEE FOR AN EXPLANATION.
--->
-
 <book software="FOP"
     title="FOP Design"
     copyright="@year@ The Apache Software Foundation"
@@ -16,7 +11,7 @@ understanding/book.xml, WHICH SEE FOR AN EXPLANATION.
       <menu-item label="Introduction" href="index.html"/>
     </menu>
     <menu label="Compliance">
-      <menu-item label="XML Parsing" href="understanding/xml_parsing.html"/>
+      <menu-item label="XML Parsing" href="parsing.html"/>
       <menu-item label="FO Tree" href="fotree.html"/>
       <menu-item label="Properties" href="properties.html"/>
       <menu-item label="Layout" href="layout.html"/>
@@ -24,9 +19,9 @@ understanding/book.xml, WHICH SEE FOR AN EXPLANATION.
       <menu-item label="Renderers" href="renderers.html"/>
     </menu>
     <menu label="Extras">
-      <menu-item label="Images" href="understanding/images.html"/>
-      <menu-item label="PDF Library" href="understanding/pdf_library.html"/>
-      <menu-item label="SVG" href="understanding/svg.html"/>
+      <menu-item label="Images" href="images.html"/>
+      <menu-item label="PDF Library" href="pdf-library.html"/>
+      <menu-item label="SVG" href="svg.html"/>
     </menu>
     <menu label="Miscellaneous">
       <menu-item label="Embedding" href="embedding.html"/>
diff --git a/src/documentation/content/xdocs/design/understanding/images.xml b/src/documentation/content/xdocs/design/images.xml
index fc40a64d6..fc40a64d6 100644
--- a/src/documentation/content/xdocs/design/understanding/images.xml
+++ b/src/documentation/content/xdocs/design/images.xml
diff --git a/src/documentation/content/xdocs/design/understanding/xml_parsing.xml b/src/documentation/content/xdocs/design/parsing.xml
index 9dc2646c3..9dc2646c3 100644
--- a/src/documentation/content/xdocs/design/understanding/xml_parsing.xml
+++ b/src/documentation/content/xdocs/design/parsing.xml
diff --git a/src/documentation/content/xdocs/design/understanding/pdf_library.xml b/src/documentation/content/xdocs/design/pdf-library.xml
index e7301f6b1..e7301f6b1 100644
--- a/src/documentation/content/xdocs/design/understanding/pdf_library.xml
+++ b/src/documentation/content/xdocs/design/pdf-library.xml
diff --git a/src/documentation/content/xdocs/design/understanding/svg.xml b/src/documentation/content/xdocs/design/svg.xml
index 74730dcd4..74730dcd4 100644
--- a/src/documentation/content/xdocs/design/understanding/svg.xml
+++ b/src/documentation/content/xdocs/design/svg.xml
diff --git a/src/documentation/content/xdocs/design/understanding/book.xml b/src/documentation/content/xdocs/design/understanding/book.xml
deleted file mode 100644
index 576d556f2..000000000
--- a/src/documentation/content/xdocs/design/understanding/book.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE book PUBLIC "-//APACHE//DTD Cocoon Documentation Book V1.0//EN"
-    "http://cvs.apache.org/viewcvs.cgi/*checkout*/xml-cocoon2/src/documentation/xdocs/dtd/book-cocoon-v10.dtd">
-
-
-<!-- NOTE: This menu attempts to be identical to the one in its parent directory.
-From display standpoint, "Understanding" is a subset of "Design", so we wish to present
-them as one entity. However, Forrest is not flexible enough to allow this directly.
-So, we make the two menus identical, except for the differences in the paths that are
-needed because one is a parent and one is a child.
-IF YOU MAKE CHANGES TO THIS FILE, PLEASE MAKE CORRESPONDING CHANGES TO book.xml IN THE
-PARENT DIRECTORY!
--->
-<book software="FOP"
-    title="Understanding FOP Design"
-    copyright="@year@ The Apache Software Foundation"
-    xmlns:xlink="http://www.w3.org/1999/xlink">
-
-    <menu label="About">
-      <menu-item label="Introduction" href="../index.html"/>
-    </menu>
-    <menu label="Compliance">
-      <menu-item label="XML Parsing" href="xml_parsing.html"/>
-      <menu-item label="FO Tree" href="../fotree.html"/>
-      <menu-item label="Properties" href="../properties.html"/>
-      <menu-item label="Layout" href="../layout.html"/>
-      <menu-item label="Area Tree" href="../areas.html"/>
-      <menu-item label="Renderers" href="../renderers.html"/>
-    </menu>
-    <menu label="Extras">
-      <menu-item label="Images" href="images.html"/>
-      <menu-item label="PDF Library" href="pdf_library.html"/>
-      <menu-item label="SVG" href="svg.html"/>
-    </menu>
-    <menu label="Miscellaneous">
-      <menu-item label="Embedding" href="../embedding.html"/>
-      <menu-item label="Extending" href="../extending.html"/>
-      <menu-item label="Break Possibility" href="../breakpos.html"/>
-      <menu-item label="Optimisations" href="../optimise.html"/>
-      <menu-item label="User Agent" href="../useragent.html"/>
-    </menu>
-</book>
-