Merge 2.5.x changes into trunk.

This commit is contained in:
b1v1r
2009-10-21 17:15:40 +00:00
parent a1a67592ff
commit 55f54e17e5
7 changed files with 114 additions and 13 deletions

45
doc/Makefile Normal file
View File

@@ -0,0 +1,45 @@
FOP = /opt/fop/fop.sh
XALAN = /opt/fop/xalan.sh
JAVA_HOME = /usr/lib/jvm/java-6-sun
ALLDOCS = modsecurity2-apache-reference.pdf modsecurity2-data-formats.pdf modsecurity2-apache-reference.html modsecurity2-data-formats.html html-multipage/index.html index.html
all: $(ALLDOCS)
modsecurity2-apache-reference.pdf: modsecurity2-apache-reference.xml
JAVA_HOME=$(JAVA_HOME); export JAVA_HOME; \
$(FOP) -q -xsl pdf.xsl -xml modsecurity2-apache-reference.xml -pdf modsecurity2-apache-reference.pdf;
modsecurity2-data-formats.pdf: modsecurity2-data-formats.xml
JAVA_HOME=$(JAVA_HOME); export JAVA_HOME; \
$(FOP) -q -xsl pdf.xsl -xml modsecurity2-data-formats.xml -pdf modsecurity2-data-formats.pdf;
modsecurity2-apache-reference.html: modsecurity2-apache-reference.xml
JAVA_HOME=$(JAVA_HOME); export JAVA_HOME; \
$(XALAN) -q -xsl html.xsl -in modsecurity2-apache-reference.xml -param base.dir ./; \
mv index.html modsecurity2-apache-reference.html;
modsecurity2-data-formats.html: modsecurity2-data-formats.xml
JAVA_HOME=$(JAVA_HOME); export JAVA_HOME; \
$(XALAN) -q -xsl html.xsl -in modsecurity2-data-formats.xml -param base.dir ./; \
mv index.html modsecurity2-data-formats.html;
html-multipage/index.html: modsecurity2-apache-reference.xml
JAVA_HOME=$(JAVA_HOME); export JAVA_HOME; \
mkdir html-multipage/; \
$(XALAN) -q -xsl html-chunked.xsl -in modsecurity2-apache-reference.xml -param base.dir html-multipage/; \
cp modsecurity-reference.css html-multipage/; \
cp modsecurity.gif html-multipage/; \
cp breach-logo-small.gif html-multipage/; \
cp apache_request_cycle-modsecurity.jpg html-multipage/
index.html: main-index.html
(cp main-index.html index.html && \
VERSION=`grep "<releaseinfo>.*</releaseinfo>" modsecurity2-apache-reference.xml | sed 's/[ \t]*<\/\?releaseinfo>[ \t]*//g'` && \
perl -pi -e "s/\\\$$version/$$VERSION/" index.html)
clean:
rm -rf docindex.html $(ALLDOCS) html-multipage
.PHONY: setup cleanup

View File

@@ -1,8 +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="/usr/share/xml/docbook/stylesheet/nwalsh/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,8 +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="/usr/share/xml/docbook/stylesheet/nwalsh/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

@@ -18,7 +18,7 @@ height="36" width="100" border="0"></a></td></tr></table>
<h2>ModSecurity for Apache Documentation</h2>
<p>Version $version</p>
<p>$version</p>
<ul>
<li><a href="html-multipage/index.html">HTML, one page per chapter</a></li>

View File

@@ -5,8 +5,8 @@
version="1.0"
>
<!--xsl:import href="/opt/docbook/xsl/fo/docbook.xsl"/-->
<xsl:import href="/usr/share/xml/docbook/stylesheet/nwalsh/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"/>