Merge 2.5.x doc changes into trunk.

This commit is contained in:
b1v1r 2009-08-26 05:41:08 +00:00
parent 826124b378
commit 91b215562c
4 changed files with 10 additions and 6 deletions

View File

@ -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"/>

View File

@ -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>

View File

@ -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

View File

@ -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>