folded in material from README-11.html

finally totally and completely stomped out "introduction"
minor formatting changes
generating better filenames for the progguide
added A4 version of quick reference

1 files changed, 16 insertions, 36 deletions

diff --git a/docs/progGuideDB/progguide.xml b/docs/progGuideDB/progguide.xml
index 405d7267d..f23ca03b3 100644
--- a/docs/progGuideDB/progguide.xml
+++ b/docs/progGuideDB/progguide.xml
@@ -3,7 +3,6 @@
 <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"
                       "../../lib/docbook/docbook-dtd/docbookx.dtd"
 [
-
 <!ENTITY preface        SYSTEM "preface.xml">
 <!ENTITY gettingstarted SYSTEM "gettingstarted.xml">
 <!ENTITY language       SYSTEM "language.xml">
@@ -13,43 +12,38 @@
 <!ENTITY quickreference SYSTEM "quickreference.xml">
 <!ENTITY semantics      SYSTEM "semantics.xml">
 <!ENTITY limitations    SYSTEM "limitations.xml">
-<!-- <!ENTITY glossary       SYSTEM "glossary.xml"> -->
-<!-- <!ENTITY bibliography   SYSTEM "bibliography.xml"> -->
-<!ENTITY index          SYSTEM "index.xml">
-
-<!ENTITY % early	"ignore">
-
 ]>
 
 <book>
   <bookinfo>
-      <title>The AspectJ<superscript>TM</superscript> Programming Guide</title>
+    <title>The AspectJ<superscript>TM</superscript> Programming Guide</title>
 
     <authorgroup>
       <author>
-	<othername>the AspectJ Team</othername>
+        <othername>the AspectJ Team</othername>
       </author>
     </authorgroup>
       
-      <legalnotice>
-	   <para>Copyright (c) 1998-2001 Xerox Corporation, 
-         2002-2003 Palo Alto Research Center, Incorporated.  
-         All rights reserved.
-        </para>
-      </legalnotice>
+    <legalnotice>
+      <para>
+        Copyright (c) 1998-2001 Xerox Corporation, 
+        2002-2003 Palo Alto Research Center, Incorporated.  
+        All rights reserved.
+      </para>
+    </legalnotice>
 
     <abstract>
       <para>
-	This programming guide describes the AspectJ language. A
-	companion guide describes the tools which are part of the
-	AspectJ development environment.
+        This programming guide describes the AspectJ language. A
+        companion guide describes the tools which are part of the
+        AspectJ development environment.
       </para>
 
       <para>
-	If you are completely new to AspectJ, you should first read
-        <xref linkend="gettingstarted"/> for a broad overview of programming
+        If you are completely new to AspectJ, you should first read
+        <xref linkend="starting"/> for a broad overview of programming
         in AspectJ. If you are already familiar with AspectJ, but want a deeper
-        understanding, you should read <xref linkend="aspectjlanguage"/> and
+        understanding, you should read <xref linkend="language"/> and
         look at the examples in the chapter. If you want a more formal
         definition of AspectJ, you should read <xref linkend="semantics"/>.
       </para>
@@ -60,24 +54,10 @@
   &gettingstarted;
   &language;
   &examples;
-  &idioms; 
+  &idioms;
   &pitfalls;
   &quickreference;
   &semantics;
   &limitations;
-<!--   &glossary; -->
-<!--   &bibliography; -->
-<!--   &index; -->
-
-
 
 </book>
-
-<!-- 
-Local Variables:
-compile-command: "java com.icl.saxon.StyleSheet -w0 progguide.xml progguide.html.xsl"
-fill-column: 79
-sgml-indent-step: 3
-sgml-local-ecat-files: "progguide.ced"
-End:
--->