goba Sat Feb 16 08:37:19 2002 EDT
Modified files:
/phpdoc configure.in manual.xml.in
Log:
More lessons on what is allowed where in XML. External parsed entity
references are not allowed in 'attributes'. Using the same name, and
take advantage of precedence to override install part. Seems to work
both with jade and saxon (they test for different constraints of XML)
Index: phpdoc/configure.in
diff -u phpdoc/configure.in:1.138 phpdoc/configure.in:1.139
--- phpdoc/configure.in:1.138 Sat Feb 16 08:23:27 2002
+++ phpdoc/configure.in Sat Feb 16 08:37:19 2002
@@ -1,4 +1,4 @@
-dnl $Id: configure.in,v 1.138 2002/02/16 13:23:27 goba Exp $
+dnl $Id: configure.in,v 1.139 2002/02/16 13:37:19 goba Exp $
dnl autoconf initialisation
AC_INIT()
@@ -760,13 +760,10 @@
echo " CHM inclusion disabled"
fi
if test -f "$srcdir/$LANGDIR/chapters/install.xml"; then
- echo "<!-- old install.xml found in langauge dir -->" >> entities/chapters.ent
- echo "<!ENTITY install-chapter '&chapters.install;'>" >> entities/chapters.ent
- echo >> entities/chapters.ent
- echo " Using install.xml"
+ echo " Using install.xml in language dir"
else
echo "<!-- old install.xml not found in langauge dir -->" >> entities/chapters.ent
- echo "<!ENTITY install-chapter '$srcdir/installpart.xml'>" >> entities/chapters.ent
+ echo "<!ENTITY chapters.install SYSTEM '$srcdir/installpart.xml'>" >>
+entities/chapters.ent
echo >> entities/chapters.ent
echo " Using the install part from installpart.xml"
fi
Index: phpdoc/manual.xml.in
diff -u phpdoc/manual.xml.in:1.114 phpdoc/manual.xml.in:1.115
--- phpdoc/manual.xml.in:1.114 Sat Feb 16 08:19:19 2002
+++ phpdoc/manual.xml.in Sat Feb 16 08:37:19 2002
@@ -40,7 +40,7 @@
<part id="getting-started">
<title>&GettingStarted;</title>
&chapters.intro;
- &install-chapter; <!-- note that this is not always chapters/install.xml -->
+ &chapters.install; <!-- note that this is not always chapters/install.xml -->
&chapters.config;
&chapters.security;
</part>
