From 91b215562c82eaf8442f592a5404358531178a51 Mon Sep 17 00:00:00 2001
From: b1v1r <b1v1r@9017d574-64ec-4062-9424-5e00b32a252b>
Date: Wed, 26 Aug 2009 05:41:08 +0000
Subject: [PATCH] Merge 2.5.x doc changes into trunk.

---
 doc/html-chunked.xsl                  | 3 ++-
 doc/html.xsl                          | 3 ++-
 doc/modsecurity2-apache-reference.xml | 3 ++-
 doc/pdf.xsl                           | 7 ++++---
 4 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/doc/html-chunked.xsl b/doc/html-chunked.xsl
index fb8b55ec..739ca0e1 100644
--- a/doc/html-chunked.xsl
+++ b/doc/html-chunked.xsl
@@ -1,7 +1,8 @@
 <?xml version='1.0'?> 
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
 
-<xsl:import href="/opt/docbook/xsl/html/chunk.xsl"/>
+<!--xsl:import href="/opt/docbook/xsl/html/chunk.xsl"/-->
+<xsl:import href="/usr/share/xml/docbook/stylesheet/nwalsh/html/chunk.xsl"/>
 
 <xsl:param name="chunk.first.sections" select="1"/>
 <xsl:param name="use.id.as.filename" select="1"/>
diff --git a/doc/html.xsl b/doc/html.xsl
index 36c4f4c3..b1cd6183 100644
--- a/doc/html.xsl
+++ b/doc/html.xsl
@@ -1,7 +1,8 @@
 <?xml version='1.0'?> 
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
 
-<xsl:import href="/opt/docbook/xsl/html/onechunk.xsl"/>
+<!--xsl:import href="/opt/docbook/xsl/html/onechunk.xsl"/-->
+<xsl:import href="/usr/share/xml/docbook/stylesheet/nwalsh/html/onechunk.xsl"/>
 
 <xsl:template name="user.header.navigation">
     <div style="background:#F5F5F5;width:100%;border-top:1px solid #DDDDDD;border-bottom:1px solid #DDDDDD"><table cellpadding="0" cellspacing="0" width="100%"><tr><td><a href="http://www.modsecurity.org"><img border="0" alt="ModSecurity" height="36" width="120" src="modsecurity.gif" style="margin:4px"/></a></td><td align="right"><a href="http://www.breach.com"><img border="0" width="100" height="36" src="breach-logo-small.gif" style="margin:6px"/></a></td></tr></table></div>	
diff --git a/doc/modsecurity2-apache-reference.xml b/doc/modsecurity2-apache-reference.xml
index 920a8c8d..e9f510d2 100644
--- a/doc/modsecurity2-apache-reference.xml
+++ b/doc/modsecurity2-apache-reference.xml
@@ -2646,7 +2646,8 @@ SecAction setsid:%{REQUEST_COOKIES.PHPSESSID}
     <para>Below is a diagram of the standard Apache Request Cycle. In the
     diagram, the 5 ModSecurity processing phases are shown.</para>
 
-    <para><graphic fileref="apache_request_cycle-modsecurity.jpg" scale="150"
+    <para><graphic contentwidth="5.5in"
+    fileref="apache_request_cycle-modsecurity.jpg" role="" scale=""
     scalefit="" /></para>
 
     <para>In order to select the phase a rule executes during, use the phase
diff --git a/doc/pdf.xsl b/doc/pdf.xsl
index af720411..b0ace8a3 100644
--- a/doc/pdf.xsl
+++ b/doc/pdf.xsl
@@ -5,7 +5,8 @@
     version="1.0"
 >
 
-<xsl:import href="/opt/docbook/xsl/fo/docbook.xsl"/>
+<!--xsl:import href="/opt/docbook/xsl/fo/docbook.xsl"/-->
+<xsl:import href="/usr/share/xml/docbook/stylesheet/nwalsh/fo/docbook.xsl"/>
 
 <xsl:param name="paper.type" select="A4"/>
 
@@ -15,7 +16,7 @@
 <xsl:param name="section.label.include.component.label" select="1"/>
 -->
 
-<xsl:param name="fop.extensions" select="1"/>
+<xsl:param name="fop1.extensions" select="1"/>
 <xsl:param name="title.margin.left">0pt</xsl:param>
 <xsl:param name="body.font.master">11</xsl:param>
 <xsl:param name="line-height">1.5</xsl:param>
@@ -158,7 +159,7 @@
 
 <xsl:template name="article.titlepage.before.recto">
   <fo:block>&#8203;
-    <fo:external-graphic width="8cm" src="url(modsecurity-logo.png)"/>
+    <fo:external-graphic content-width="8cm" src="url(modsecurity-logo.png)"/>
   </fo:block>
 </xsl:template>