jah Sun Aug 5 06:51:48 2001 EDT
Modified files:
/phpdoc/en bookinfo.xml
/phpdoc/en/chapters security.xml
/phpdoc/en/faq languages.xml obtaining.xml using.xml
/phpdoc/en/functions com.xml info.xml mbstring.xml ming.xml
sockets.xml strings.xml xslt.xml
/phpdoc/en/language variables.xml
Log:
Fixed a lot of things fop doesn't think to be legal.
Index: phpdoc/en/bookinfo.xml
diff -u phpdoc/en/bookinfo.xml:1.12 phpdoc/en/bookinfo.xml:1.13
--- phpdoc/en/bookinfo.xml:1.12 Thu Aug 2 13:36:36 2001
+++ phpdoc/en/bookinfo.xml Sun Aug 5 06:51:43 2001
@@ -1,4 +1,4 @@
-<!-- $Revision: 1.12 $ -->
+<!-- $Revision: 1.13 $ -->
<bookinfo id="bookinfo">
<authorgroup id="authors">
@@ -66,7 +66,7 @@
<simpara>
This manual is © Copyright 1997, 1998, 1999, 2000, 2001 by
the PHP Documentation Group. The members of this group are listed
- <link linkend="authors">on the front page of this manual</link>.
+ on the front page of this manual.
</simpara>
<simpara>
This manual can be redistributed under the terms of the GNU
Index: phpdoc/en/chapters/security.xml
diff -u phpdoc/en/chapters/security.xml:1.22 phpdoc/en/chapters/security.xml:1.23
--- phpdoc/en/chapters/security.xml:1.22 Fri Aug 3 03:12:58 2001
+++ phpdoc/en/chapters/security.xml Sun Aug 5 06:51:44 2001
@@ -1,4 +1,4 @@
-<!-- $Revision: 1.22 $ -->
+<!-- $Revision: 1.23 $ -->
<chapter id="security">
<title>Security</title>
@@ -590,8 +590,8 @@
<title>Detecting simple variable poisoning</title>
<programlisting role="php">
<?php
-if ($HTTP_COOKIE_VARS['username'] &&
- !$HTTP_POST_VARS['username'] &&
+if ($HTTP_COOKIE_VARS['username'] &&
+ !$HTTP_POST_VARS['username'] &&
!$HTTP_GET_VARS['username'] ) {
// Perform other checks to validate the user name...
$good_login = 1;
Index: phpdoc/en/faq/languages.xml
diff -u phpdoc/en/faq/languages.xml:1.3 phpdoc/en/faq/languages.xml:1.4
--- phpdoc/en/faq/languages.xml:1.3 Thu Aug 2 13:36:43 2001
+++ phpdoc/en/faq/languages.xml Sun Aug 5 06:51:44 2001
@@ -1,4 +1,4 @@
-<!-- $Revision: 1.3 $ -->
+<!-- $Revision: 1.4 $ -->
<chapter id="faq.languages">
<title>PHP and other languages</title>
<titleabbrev>PHP and other languages</titleabbrev>
@@ -71,7 +71,7 @@
<para>
A great summary by Michael J Sheldon on this topic has
been posted to the PHP mailing list. A copy can be found
- <ulink url="&faqurl.coldfusion.summary">here</ulink>.
+ <ulink url="&faqurl.coldfusion.summary;">here</ulink>.
</para>
</answer>
</qandaentry>
Index: phpdoc/en/faq/obtaining.xml
diff -u phpdoc/en/faq/obtaining.xml:1.4 phpdoc/en/faq/obtaining.xml:1.5
--- phpdoc/en/faq/obtaining.xml:1.4 Thu Aug 2 13:36:43 2001
+++ phpdoc/en/faq/obtaining.xml Sun Aug 5 06:51:44 2001
@@ -1,4 +1,4 @@
-<!-- $Revision: 1.4 $ -->
+<!-- $Revision: 1.5 $ -->
<chapter id="faq.obtaining">
<title>Obtaining PHP</title>
<titleabbrev>Obtaining PHP</titleabbrev>
@@ -88,88 +88,88 @@
</listitem>
<listitem>
<simpara>
- <ulink url="&faqurl.snmp">SNMP* (Unix): </ulink>.
+ <ulink url="&faqurl.snmp;">SNMP* (Unix): </ulink>.
</simpara>
</listitem>
<listitem>
<simpara>
- <ulink url="&faqurl.gd">GD* (Unix/Win)</ulink>.
+ <ulink url="&faqurl.gd;">GD* (Unix/Win)</ulink>.
</simpara>
</listitem>
<listitem>
<simpara>
- <ulink url="&faqurl.msql.win">mSQL* (Win)</ulink>.
+ <ulink url="&faqurl.msql.win;">mSQL* (Win)</ulink>.
</simpara>
</listitem>
<listitem>
<simpara>
- <ulink url="&faqurl.msql.unix">mSQL* (Unix)</ulink>.
+ <ulink url="&faqurl.msql.unix;">mSQL* (Unix)</ulink>.
</simpara>
</listitem>
<listitem>
<simpara>
- <ulink url="&faqurl.mysql">MySQL* (Unix)</ulink>.
+ <ulink url="&faqurl.mysql;">MySQL* (Unix)</ulink>.
</simpara>
</listitem>
<listitem>
<simpara>
- <ulink url="&faqurl.imap">IMAP* (Win/Unix)</ulink>.
+ <ulink url="&faqurl.imap;">IMAP* (Win/Unix)</ulink>.
</simpara>
</listitem>
<listitem>
<simpara>
- <ulink url="&faqurl.snmp">Sybase-CT* (Linux, libc5)</ulink> :
+ <ulink url="&faqurl.sybase;">Sybase-CT* (Linux, libc5)</ulink> :
Available locally.
</simpara>
</listitem>
<listitem>
<simpara>
- <ulink url="&faqurl.freetype">FreeType (libttf):</ulink>.
+ <ulink url="&faqurl.freetype;">FreeType (libttf):</ulink>.
</simpara>
</listitem>
<listitem>
<simpara>
- <ulink url="&faqurl.zlib">ZLib (Unix/Win32)</ulink>.
+ <ulink url="&faqurl.zlib;">ZLib (Unix/Win32)</ulink>.
</simpara>
</listitem>
<listitem>
<simpara>
- <ulink url="&faqurl.expat">expat XML parser (Unix/Win32)</ulink>.
+ <ulink url="&faqurl.expat;">expat XML parser (Unix/Win32)</ulink>.
</simpara>
</listitem>
<listitem>
<simpara>
- <ulink url="&faqurl.pdflib">PDFLib</ulink>.
+ <ulink url="&faqurl.pdflib;">PDFLib</ulink>.
</simpara>
</listitem>
<listitem>
<simpara>
- <ulink url="&faqurl.mcrypt">mcrypt</ulink>.
+ <ulink url="&faqurl.mcrypt;">mcrypt</ulink>.
</simpara>
</listitem>
<listitem>
<simpara>
- <ulink url="&faqurl.mhash">mhash</ulink>.
+ <ulink url="&faqurl.mhash;">mhash</ulink>.
</simpara>
</listitem>
<listitem>
<simpara>
- <ulink url="&faqurl.t1lib">t1lib</ulink>.
+ <ulink url="&faqurl.t1lib;">t1lib</ulink>.
</simpara>
</listitem>
<listitem>
<simpara>
- <ulink url="&faqurl.dmalloc">dmalloc</ulink>.
+ <ulink url="&faqurl.dmalloc;">dmalloc</ulink>.
</simpara>
</listitem>
<listitem>
<simpara>
- <ulink url="&faqurl.aspell">aspell</ulink>.
+ <ulink url="&faqurl.aspell;">aspell</ulink>.
</simpara>
</listitem>
<listitem>
<simpara>
- <ulink url="&faqurl.readline">readline</ulink>.
+ <ulink url="&faqurl.readline;">readline</ulink>.
</simpara>
</listitem>
</itemizedlist>
@@ -194,7 +194,8 @@
</qandaentry>
<qandaentry id="faq.obtaining.compileNT">
<question>
- <para>
+ <para>:w
+
I got the latest version of the PHP source code from the CVS
repository on my Windows 95/NT machine, what do I need to compile it?
</para>
Index: phpdoc/en/faq/using.xml
diff -u phpdoc/en/faq/using.xml:1.3 phpdoc/en/faq/using.xml:1.4
--- phpdoc/en/faq/using.xml:1.3 Thu Aug 2 13:36:43 2001
+++ phpdoc/en/faq/using.xml Sun Aug 5 06:51:44 2001
@@ -1,4 +1,4 @@
-<!-- $Revision: 1.3 $ -->
+<!-- $Revision: 1.4 $ -->
<chapter id="faq.using">
<title>Using PHP</title>
<titleabbrev>Using PHP</titleabbrev>
@@ -223,7 +223,7 @@
<answer>
<para>
One of the easiest things to do is to enable using ASP tags in your
- PHP code. This allows you to use the ASP-style <% and %> code
+ PHP code. This allows you to use the ASP-style <% and %> code
delimiters. Most of the popular HTML editors handle those more
intelligently (for now). To enable the ASP-style tags, you need
to set the asp_tags <filename>php.ini</filename> variable, or use the
@@ -373,4 +373,4 @@
sgml-local-catalogs:nil
sgml-local-ecat-files:nil
End:
- -->
\ No newline at end of file
+ -->
Index: phpdoc/en/functions/com.xml
diff -u phpdoc/en/functions/com.xml:1.18 phpdoc/en/functions/com.xml:1.19
--- phpdoc/en/functions/com.xml:1.18 Thu Aug 2 13:36:51 2001
+++ phpdoc/en/functions/com.xml Sun Aug 5 06:51:45 2001
@@ -1,4 +1,4 @@
-<!-- $Revision: 1.18 $ -->
+<!-- $Revision: 1.19 $ -->
<reference id="ref.com">
<title>COM support functions for Windows</title>
<titleabbrev>COM</titleabbrev>
@@ -109,7 +109,7 @@
$num_columns = $rs->Fields->Count();
echo $num_columns . "\n";
-for ($i=0; $i < $num_columns; $i++)
+for ($i=0; $i < $num_columns; $i++)
{
$fld[$i] = $rs->Fields($i);
}
@@ -117,7 +117,7 @@
$rowcount = 0;
while (!$rs->EOF)
{
- for ($i=0; $i < $num_columns; $i++)
+ for ($i=0; $i < $num_columns; $i++)
{
echo $fld[$i]->value . "\t";
}
Index: phpdoc/en/functions/info.xml
diff -u phpdoc/en/functions/info.xml:1.59 phpdoc/en/functions/info.xml:1.60
--- phpdoc/en/functions/info.xml:1.59 Thu Aug 2 13:37:01 2001
+++ phpdoc/en/functions/info.xml Sun Aug 5 06:51:45 2001
@@ -1,4 +1,4 @@
-<!-- $Revision: 1.59 $ -->
+<!-- $Revision: 1.60 $ -->
<reference id="ref.info">
<title>PHP options & information</title>
<titleabbrev>PHP options/info</titleabbrev>
@@ -816,7 +816,7 @@
</row>
<row>
<entry>arg_separator</entry>
- <entry>"&"</entry>
+ <entry>"&"</entry>
<entry>PHP_INI_ALL</entry>
</row>
<row>
Index: phpdoc/en/functions/mbstring.xml
diff -u phpdoc/en/functions/mbstring.xml:1.6 phpdoc/en/functions/mbstring.xml:1.7
--- phpdoc/en/functions/mbstring.xml:1.6 Thu Aug 2 13:37:03 2001
+++ phpdoc/en/functions/mbstring.xml Sun Aug 5 06:51:46 2001
@@ -1,4 +1,4 @@
-<!-- $Revision: 1.6 $ -->
+<!-- $Revision: 1.7 $ -->
<reference id="ref.mbstring">
<title>Multi-Byte String Functions</title>
<titleabbrev>
@@ -1625,7 +1625,7 @@
$name = ""; // kanji
$mbox = "kru";
$doma = "gtinn.mon";
-$addr = mb_encode_mimeheader($name, "UTF-7", "Q") . " <" . $mbox . "@" . $doma . ">";
+$addr = mb_encode_mimeheader($name, "UTF-7", "Q") . " <" . $mbox . "@" . $doma .
+">";
echo $addr;
</programlisting>
</example>
Index: phpdoc/en/functions/ming.xml
diff -u phpdoc/en/functions/ming.xml:1.15 phpdoc/en/functions/ming.xml:1.16
--- phpdoc/en/functions/ming.xml:1.15 Thu Aug 2 13:37:05 2001
+++ phpdoc/en/functions/ming.xml Sun Aug 5 06:51:46 2001
@@ -1,4 +1,4 @@
-<!-- $Revision: 1.15 $ -->
+<!-- $Revision: 1.16 $ -->
<reference id="ref.ming">
<title>Ming functions for Flash</title>
<titleabbrev>Ming (flash)</titleabbrev>
@@ -751,7 +751,7 @@
$i2 = text(0x00, 0x33, 0xff, 0x7f, -560, 1200, 800, 0.04, $thetext);
$i3 = text(0xff, 0xff, 0xff, 0x9f, 180, 1200, 800, 0.001, $thetext);
- for($i=1; $i<=100; ++$i)
+ for($i=1; $i<=100; ++$i)
{
$i1 = step($i1);
$i2 = step($i2);
@@ -1106,7 +1106,7 @@
$i = $m->add($p);
$i->moveTo(160, 120);
- for($n=0; $n<=1.001; $n+=0.01)
+ for($n=0; $n<=1.001; $n+=0.01)
{
$i->setRatio($n);
$m->nextFrame();
@@ -1200,7 +1200,7 @@
$i = $m->add($s);
- for($n=0; $n<=20; ++$n)
+ for($n=0; $n<=20; ++$n)
{
$i->multColor(1.0-$n/10, 1.0, 1.0);
$i->addColor(0xff*$n/20, 0, 0);
@@ -1479,7 +1479,7 @@
$i = $m->add($p);
$i->moveTo($width/2, $height/2);
- for($n=0; $n<1.001; $n+=0.03)
+ for($n=0; $n<1.001; $n+=0.03)
{
$i->setRatio($n);
$m->nextFrame();
@@ -1974,9 +1974,9 @@
$m->setBackground(0xcc, 0xcc, 0xcc);
// draw checkerboard background
- for($y=0; $y<480; $y+=40)
+ for($y=0; $y<480; $y+=40)
{
- for($x=0; $x<640; $x+=80)
+ for($x=0; $x<640; $x+=80)
{
$i = $m->add($c);
$i->moveTo($x, $y);
@@ -1984,7 +1984,7 @@
$y+=40;
- for($x=40; $x<640; $x+=80)
+ for($x=40; $x<640; $x+=80)
{
$i = $m->add($c);
$i->moveTo($x, $y);
@@ -2255,7 +2255,7 @@
$i = $m->add($p);
$i->moveTo(1500,1000);
- for($r=0.0; $r<=1.0; $r+=0.1)
+ for($r=0.0; $r<=1.0; $r+=0.1)
{
$i->setRatio($r);
$m->nextFrame();
@@ -3885,7 +3885,7 @@
$i->setDepth(1);
$p->nextFrame();
- for($n=0; $n<5; ++$n)
+ for($n=0; $n<5; ++$n)
{
$i->rotate(-15);
$p->nextFrame();
@@ -3971,7 +3971,7 @@
"));
$i = $box->add($r);
- for($n=0; $n<=20; ++$n)
+ for($n=0; $n<=20; ++$n)
{
$i->setRatio($n/20);
$box->nextFrame();
@@ -4008,9 +4008,9 @@
/* finally, add a bunch of the cells to the movie */
- for($x=0; $x<12; ++$x)
+ for($x=0; $x<12; ++$x)
{
- for($y=0; $y<8; ++$y)
+ for($y=0; $y<8; ++$y)
{
$i = $m->add($cell);
$i->moveTo(100*$x+50, 100*$y+50);
@@ -4145,8 +4145,8 @@
if(num == 11)
num = 1;
-removeClip('char' & num);
-duplicateClip(/frames, 'char' & num, num);
+removeClip('char' & num);
+duplicateClip(/frames, 'char' & num, num);
"));
@@ -4177,7 +4177,7 @@
$chars = "abcdefghijklmnopqrstuvwxyz".
"ABCDEFGHIJKLMNOPQRSTUVWXYZ".
- "1234567890!@#$%^&*()_+-=/[]{}|;:,.<>?`~";
+ "1234567890!@#$%^&*()_+-=/[]{}|;:,.<>?`~";
$f = new SWFFont("_sans");
Index: phpdoc/en/functions/sockets.xml
diff -u phpdoc/en/functions/sockets.xml:1.17 phpdoc/en/functions/sockets.xml:1.18
--- phpdoc/en/functions/sockets.xml:1.17 Thu Aug 2 13:37:33 2001
+++ phpdoc/en/functions/sockets.xml Sun Aug 5 06:51:46 2001
@@ -1,4 +1,4 @@
-<!-- $Revision: 1.17 $ -->
+<!-- $Revision: 1.18 $ -->
<reference id="ref.sockets">
<title>Socket functions</title>
<titleabbrev>Sockets</titleabbrev>
@@ -439,7 +439,7 @@
</listitem>
<listitem>
<simpara>
- PHP_NORMAL_READ - reading stops at \n or \r. (Default in PHP <= 4.0.6)
+ PHP_NORMAL_READ - reading stops at \n or \r. (Default in PHP <= 4.0.6)
</simpara>
</listitem>
</itemizedlist>
Index: phpdoc/en/functions/strings.xml
diff -u phpdoc/en/functions/strings.xml:1.100 phpdoc/en/functions/strings.xml:1.101
--- phpdoc/en/functions/strings.xml:1.100 Thu Aug 2 13:37:34 2001
+++ phpdoc/en/functions/strings.xml Sun Aug 5 06:51:46 2001
@@ -1,5 +1,5 @@
-<!-- $Revision: 1.100 $ -->
<?xml encoding="iso-8859-1"?>
+<!-- $Revision: 1.101 $ -->
<reference id="ref.strings">
<title>String functions</title>
<titleabbrev>Strings</titleabbrev>
Index: phpdoc/en/functions/xslt.xml
diff -u phpdoc/en/functions/xslt.xml:1.21 phpdoc/en/functions/xslt.xml:1.22
--- phpdoc/en/functions/xslt.xml:1.21 Thu Aug 2 13:37:43 2001
+++ phpdoc/en/functions/xslt.xml Sun Aug 5 06:51:47 2001
@@ -1,5 +1,5 @@
-<!-- $Revision: 1.21 $ -->
<?xml encoding="iso-8859-1"?>
+<!-- $Revision: 1.22 $ -->
<reference id="ref.xslt">
<title>XSLT functions</title>
<titleabbrev>XSLT</titleabbrev>
@@ -349,7 +349,7 @@
<table border="1" cellpadding="2" cellspacing="1">
<tr>
<td width="20%">
- &#160;
+ &#160;
</td>
<td width="80%">
<h2><xsl:value-of select="title"/></h2>
Index: phpdoc/en/language/variables.xml
diff -u phpdoc/en/language/variables.xml:1.16 phpdoc/en/language/variables.xml:1.17
--- phpdoc/en/language/variables.xml:1.16 Thu Aug 2 13:37:49 2001
+++ phpdoc/en/language/variables.xml Sun Aug 5 06:51:47 2001
@@ -1,5 +1,5 @@
-<!-- $Revision: 1.16 $ -->
<?xml encoding="iso-8859-1"?>
+<!-- $Revision: 1.17 $ -->
<chapter id="language.variables">
<title>Variables</title>
