Modernized user guide, API reference, and FAQ generation. Overall

effect is to move away from DocBook SGML and DJ Delorie's doctool and
toward pure DocBook XSL.  (There remains just one use of doctool, and
we have plans for replacing it, too.)  See ChangeLog for details.

1 files changed, 15 insertions, 65 deletions

diff --git a/winsup/doc/faq.xml b/winsup/doc/faq.xml
index a48783410..498558907 100644
--- a/winsup/doc/faq.xml
+++ b/winsup/doc/faq.xml
@@ -1,71 +1,21 @@
-<?xml version='1.0'?>
-<!DOCTYPE article PUBLIC '-//OASIS//DTD DocBook XML V4.5//EN'
-                      "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-      <!-- see http://www.unicode.org/charts/PDF/U0080.pdf -->
-	<!ENTITY pound      "&#x00A3;">
-	<!ENTITY brokenpipe "&#x00A6;">
+<?xml version="1.0" encoding='UTF-8'?>
+<!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook V4.5//EN"
+    "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
 
-      <!-- all the files -->
-      <!ENTITY FAQ-WHAT SYSTEM "faq-what.xml">
-      <!ENTITY FAQ-SETUP SYSTEM "faq-setup.xml">
-      <!ENTITY FAQ-RESOURCES SYSTEM "faq-resources.xml">
-      <!ENTITY FAQ-USING SYSTEM "faq-using.xml">
-      <!ENTITY FAQ-API SYSTEM "faq-api.xml">
-      <!ENTITY FAQ-PROGRAMMING SYSTEM "faq-programming.xml">
-]>
-
-<article id="faq-nochunks" lang="en">
+<article id="faq" lang="en" xmlns:xi="http://www.w3.org/2001/XInclude">
   <articleinfo>
     <title>Cygwin FAQ</title>
   </articleinfo>
 
-<qandaset>
-<?dbhtml toc="1"?>
-
-<qandadiv id="faq.about">
-<title>About Cygwin</title>
-&FAQ-WHAT;
-</qandadiv>
-
-<qandadiv id="faq.setup">
-<title>Setting up Cygwin</title>
-&FAQ-SETUP;
-</qandadiv>
-
-<qandadiv id="faq.resources">
-<title>Further Resources</title>
-&FAQ-RESOURCES;
-</qandadiv>
-
-<qandadiv id="faq.using">
-<title>Using Cygwin</title>
-&FAQ-USING;
-</qandadiv>
-
-<qandadiv id="faq.api">
-<title>Cygwin API Questions</title>
-&FAQ-API;
-</qandadiv>
-
-<qandadiv id="faq.programming">
-<title>Programming Questions</title>
-&FAQ-PROGRAMMING;
-</qandadiv>
-
-<qandadiv id="faq.copyright">
-<title>Copyright</title>
-
-<qandaentry id="faq.what.copyright">
-<question><para>What are the copyrights?</para></question>
-<answer>
-
-<para>Please see
-<ulink url="http://cygwin.com/license.html" /> for more information
-about Cygwin copyright and licensing.
-</para>
-
-</answer></qandaentry>
-</qandadiv>
-</qandaset>
-
+  <qandaset>
+    <?dbhtml toc="1"?>
+
+    <xi:include href="faq-what.xml"/>
+    <xi:include href="faq-setup.xml"/>
+    <xi:include href="faq-resources.xml"/>
+    <xi:include href="faq-using.xml"/>
+    <xi:include href="faq-api.xml"/>
+    <xi:include href="faq-programming.xml"/>
+    <xi:include href="faq-copyright.xml"/>
+  </qandaset>
 </article>