From 025ab4ce1a53cea0ca9823e1c190f8323caac170 Mon Sep 17 00:00:00 2001
From: Luke Taylor <luke.taylor@springsource.com>
Date: Sun, 21 Feb 2010 20:41:44 +0000
Subject: [PATCH] Tweaking of table size in namespace chapter and PDF page
 margins to try to reduce overlapping of text

---
 docs/manual/src/docbook/namespace-config.xml | 14 +++++++++-----
 docs/manual/src/xsl/pdf-custom.xsl           | 11 ++++++-----
 2 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/docs/manual/src/docbook/namespace-config.xml b/docs/manual/src/docbook/namespace-config.xml
index c6f19cc76a..f6a9c93680 100644
--- a/docs/manual/src/docbook/namespace-config.xml
+++ b/docs/manual/src/docbook/namespace-config.xml
@@ -545,11 +545,15 @@ List&lt;OpenIDAttribute> attributes = token.getAttributes();</programlisting>The
               <literal>&lt;http></literal> element, so the syntax has changed slightly in
             3.0.</para></note>The filters, aliases and namespace elements/attributes which create
         the filters are shown in <xref linkend="filter-stack"/>. The filters are listed in the order
-        in which they occur in the filter chain. <table xml:id="filter-stack"><title>Standard Filter
-            Aliases and Ordering</title><tgroup cols="3" align="left"><thead><row><entry
-                  align="center">Alias</entry><entry align="center">Filter Class</entry><entry
-                  align="center">Namespace Element or
-                  Attribute</entry></row></thead><tbody><row><entry>
+        in which they occur in the filter chain. 
+          <table xml:id="filter-stack"><title>Standard Filter Aliases and Ordering</title>
+              <tgroup cols="3" align="left">
+                  <colspec colnum="1" colname="col1" colwidth="2*"/>
+                  <colspec colnum="2" colname="col2" colwidth="2*"/>
+                  <colspec colnum="3" colname="col3" colwidth="1*"/>
+                  <thead><row><entry align="center">Alias</entry><entry align="center">Filter Class</entry><entry align="center">Namespace Element or Attribute</entry></row>
+                  </thead>
+               <tbody><row><entry>
                     CHANNEL_FILTER</entry><entry><literal>ChannelProcessingFilter</literal></entry><entry><literal>http/intercept-url@requires-channel</literal></entry></row><row><entry>
                   CONCURRENT_SESSION_FILTER</entry><entry><literal>ConcurrentSessionFilter</literal>
                 </entry><entry><literal>session-management/concurrency-control</literal></entry></row><row><entry>
diff --git a/docs/manual/src/xsl/pdf-custom.xsl b/docs/manual/src/xsl/pdf-custom.xsl
index 19220e2c8d..7de82b2546 100644
--- a/docs/manual/src/xsl/pdf-custom.xsl
+++ b/docs/manual/src/xsl/pdf-custom.xsl
@@ -27,8 +27,6 @@
     <xsl:import href="http://docbook.sourceforge.net/release/xsl/current/fo/docbook.xsl"/>
     <xsl:import href="http://docbook.sourceforge.net/release/xsl/current/fo/highlight.xsl"/>
 
-    <xsl:param name="fop1.extensions" select="1"/>
-
     <!-- xsl:param name="draft.watermark.image" select="'images/draft.png'"/ -->
     <xsl:param name="paper.type" select="'A4'"/>
 
@@ -41,6 +39,9 @@
     <xsl:param name="page.margin.bottom" select="'1cm'"/>
     <xsl:param name="title.margin.left" select="'0cm'"/>
 
+    <xsl:param name="page.margin.inner" select="'2cm'"/>
+    <xsl:param name="page.margin.outer" select="'2cm'"/>
+
 <!--###################################################
         Header
     ################################################### -->
@@ -191,12 +192,12 @@
         Extensions
     ################################################### -->
 
-    <!-- These extensions are required for table printing and other stuff
+    <!-- These extensions are required for table printing and other stuff -->
     <xsl:param name="use.extensions">1</xsl:param>
     <xsl:param name="tablecolumns.extension">0</xsl:param>
     <xsl:param name="callout.extensions">1</xsl:param>
-    <xsl:param name="fop.extensions">1</xsl:param>
-    -->
+    <xsl:param name="fop1.extensions">1</xsl:param>
+
 <!--###################################################
         Paper & Page Size
     ################################################### -->