jimw Sat Jan 20 13:08:28 2001 EDT
Modified files:
/phpdoc/en/features file-upload.xml
/phpdoc/en/functions funchand.xml gmp.xml ibase.xml imap.xml
mysql.xml oci8.xml ovrimos.xml readline.xml
sesam.xml var.xml
Log:
fix a bunch more entities that cause a stricter xml parser (xerces) to choke
Index: phpdoc/en/features/file-upload.xml
diff -u phpdoc/en/features/file-upload.xml:1.17 phpdoc/en/features/file-upload.xml:1.18
--- phpdoc/en/features/file-upload.xml:1.17 Sat Jan 20 12:56:42 2001
+++ phpdoc/en/features/file-upload.xml Sat Jan 20 13:08:27 2001
@@ -175,7 +175,7 @@
</note>
</para>
<programlisting role="php">
-<?php
+<?php
/* Userland test for uploaded file. */
function is_uploaded_file($filename) {
if (!$tmp_file = get_cfg_var('upload_tmp_dir')) {
Index: phpdoc/en/functions/funchand.xml
diff -u phpdoc/en/functions/funchand.xml:1.4 phpdoc/en/functions/funchand.xml:1.5
--- phpdoc/en/functions/funchand.xml:1.4 Sat Dec 9 20:25:35 2000
+++ phpdoc/en/functions/funchand.xml Sat Jan 20 13:08:27 2001
@@ -126,7 +126,7 @@
create_function('$b,$a','if (strncmp($a,$b,3) == 0) return "** \"$a\" '.
'and \"$b\"\n** Look the same to me! (looking at the first 3 chars)";'),
create_function('$a,$b','; return "CRCs: ".crc32($a)." , ".crc32(b);'),
- create_function('$a,$b','; return "similar(a,b) =
".similar_text($a,$b,&$p)."($p%)";')
+ create_function('$a,$b','; return "similar(a,b) =
+".similar_text($a,$b,&$p)."($p%)";')
);
echo "\nUsing the second array of anonymous functions\n";
process("Twas brilling and the slithy toves", "Twas the night", $garr);
@@ -157,7 +157,7 @@
<title>Using anonymous functions as callback functions</title>
<programlisting role="php">
$av = array("the ","a ","that ","this ");
-array_walk($av, create_function('&$v,$k','$v = $v."mango";'));
+array_walk($av, create_function('&$v,$k','$v = $v."mango";'));
print_r($av); // for PHP 3 use var_dump()
// outputs:
// Array
Index: phpdoc/en/functions/gmp.xml
diff -u phpdoc/en/functions/gmp.xml:1.5 phpdoc/en/functions/gmp.xml:1.6
--- phpdoc/en/functions/gmp.xml:1.5 Tue Jan 2 12:03:22 2001
+++ phpdoc/en/functions/gmp.xml Sat Jan 20 13:08:27 2001
@@ -40,14 +40,14 @@
<programlisting role="php">
<?php
function fact ($x) {
- if ($x <= 1)
+ if ($x <= 1)
return 1;
else
return gmp_mul ($x, fact ($x-1));
}
print gmp_strval (fact (1000)) . "\n";
-?>
+?>
</programlisting>
</example>
</para>
Index: phpdoc/en/functions/ibase.xml
diff -u phpdoc/en/functions/ibase.xml:1.24 phpdoc/en/functions/ibase.xml:1.25
--- phpdoc/en/functions/ibase.xml:1.24 Sat Dec 9 20:13:27 2000
+++ phpdoc/en/functions/ibase.xml Sat Jan 20 13:08:27 2001
@@ -345,7 +345,7 @@
$rs=ibase_query("Select * from something");
$coln = ibase_num_fields($rs);
-for ($i=0 ; $i < $coln ; $i++) {
+for ($i=0 ; $i < $coln ; $i++) {
$col_info = ibase_field_info($rs, $i);
echo "name: ".$col_info['name']."\n";
echo "alias: ".$col_info['alias']."\n";
Index: phpdoc/en/functions/imap.xml
diff -u phpdoc/en/functions/imap.xml:1.30 phpdoc/en/functions/imap.xml:1.31
--- phpdoc/en/functions/imap.xml:1.30 Wed Dec 27 00:51:15 2000
+++ phpdoc/en/functions/imap.xml Sat Jan 20 13:08:27 2001
@@ -79,7 +79,7 @@
A detailed overview is also available in the books
<ulink url="&url.email.book;">Programming Internet Email</ulink>
by David Wood and <ulink url="&url.imap.book;">Managing
- IMAP</ulink> by Dianna Mullet & Kevin Mullet.
+ IMAP</ulink> by Dianna Mullet & Kevin Mullet.
</para>
</partintro>
Index: phpdoc/en/functions/mysql.xml
diff -u phpdoc/en/functions/mysql.xml:1.32 phpdoc/en/functions/mysql.xml:1.33
--- phpdoc/en/functions/mysql.xml:1.32 Sat Dec 9 07:04:10 2000
+++ phpdoc/en/functions/mysql.xml Sat Jan 20 13:08:27 2001
@@ -400,11 +400,11 @@
$i = 0;
$cnt = mysql_num_rows($db_list);
-while ($i < $cnt) {
+while ($i < $cnt) {
echo mysql_db_name($db_list, $i) . "\n";
$i++;
}
-?>
+?>
</programlisting>
</example>
@@ -1420,7 +1420,7 @@
$fields = mysql_list_fields("database1", "table1", $link);
$columns = mysql_num_fields($fields);
-for ($i = 0; $i < $columns; $i++) {
+for ($i = 0; $i < $columns; $i++) {
echo mysql_field_name($fields, $i) . "\n";;
}
</programlisting>
Index: phpdoc/en/functions/oci8.xml
diff -u phpdoc/en/functions/oci8.xml:1.15 phpdoc/en/functions/oci8.xml:1.16
--- phpdoc/en/functions/oci8.xml:1.15 Sat Nov 4 22:40:30 2000
+++ phpdoc/en/functions/oci8.xml Sat Jan 20 13:08:27 2001
@@ -69,7 +69,7 @@
// for retrieve data use (after fetch):
$result = OCIResult($stmt, $n);
-if (is_object ($result)) $result = $result->load();
+if (is_object ($result)) $result = $result->load();
// For INSERT or UPDATE statement use:
@@ -77,9 +77,9 @@
field2 = empty_clob()) returning field2 into :field2";
OCIParse($conn, $sql);
$clob = OCINewDescriptor($conn, OCI_D_LOB);
-OCIBindByName ($stmt, ":field2", &$clob, -1, OCI_B_CLOB);
+OCIBindByName ($stmt, ":field2", &$clob, -1, OCI_B_CLOB);
OCIExecute($stmt, OCI_DEFAULT);
-$clob->save ("some text");
+$clob->save ("some text");
?>
</programlisting>
Index: phpdoc/en/functions/ovrimos.xml
diff -u phpdoc/en/functions/ovrimos.xml:1.2 phpdoc/en/functions/ovrimos.xml:1.3
--- phpdoc/en/functions/ovrimos.xml:1.2 Tue Oct 17 05:33:25 2000
+++ phpdoc/en/functions/ovrimos.xml Sat Jan 20 13:08:27 2001
@@ -356,10 +356,10 @@
$res=ovrimos_exec ($conn,"select table_id, table_name from sys.tables");
if ($res != 0) {
echo "Statement ok!";
- if (ovrimos_fetch_into ($res, &$row)) {
+ if (ovrimos_fetch_into ($res, &$row)) {
list ($table_id, $table_name) = $row;
echo "table_id=".$table_id.", table_name=".$table_name."\n";
- if (ovrimos_fetch_into ($res, &$row)) {
+ if (ovrimos_fetch_into ($res, &$row)) {
list ($table_id, $table_name) = $row;
echo "table_id=".$table_id.", table_name=".$table_name."\n";
} else {
@@ -540,7 +540,7 @@
echo "Statement ok! cursor=".ovrimos_cursor ($res)."\n";
$colnb = ovrimos_num_fields ($res);
echo "Output columns=".$colnb."\n";
- for ($i=1; $i<=$colnb; $i++) {
+ for ($i=1; $i<=$colnb; $i++) {
$name = ovrimos_field_name ($res, $i);
$type = ovrimos_field_type ($res, $i);
$len = ovrimos_field_len ($res, $i);
Index: phpdoc/en/functions/readline.xml
diff -u phpdoc/en/functions/readline.xml:1.5 phpdoc/en/functions/readline.xml:1.6
--- phpdoc/en/functions/readline.xml:1.5 Sat Dec 23 08:15:15 2000
+++ phpdoc/en/functions/readline.xml Sat Jan 20 13:08:27 2001
@@ -46,7 +46,7 @@
<title><function>Readline</function></title>
<programlisting role="php">
//get 3 commands from user
-for ($i=0; $i < 3; $i++) {
+for ($i=0; $i < 3; $i++) {
$line = readline ("Command: ");
readline_add_history ($line);
}
Index: phpdoc/en/functions/sesam.xml
diff -u phpdoc/en/functions/sesam.xml:1.3 phpdoc/en/functions/sesam.xml:1.4
--- phpdoc/en/functions/sesam.xml:1.3 Fri Dec 15 01:24:35 2000
+++ phpdoc/en/functions/sesam.xml Sat Jan 20 13:08:27 2001
@@ -805,7 +805,7 @@
<?php
if (sesam_connect ("mycatalog", "myschema", "otto")) {
if (sesam_execimm ("INSERT INTO mytable VALUES (*, 'Small Test', <0, 8,
15>)")
- && sesam_execimm ("INSERT INTO othertable VALUES (*, 'Another Test', 1)"))
+ && sesam_execimm ("INSERT INTO othertable VALUES (*, 'Another Test',
+1)"))
sesam_commit();
else
sesam_rollback();
@@ -1852,7 +1852,7 @@
}
// print the table:
print "<TABLE BORDER>\n";
-while (($row = sesam_fetch_array ($result)) && count ($row) > 0) {
+while (($row = sesam_fetch_array ($result)) && count ($row) > 0) {
print " <TR>\n";
print " <TD>".htmlspecialchars
($row["firstname"])."</TD>\n";
print " <TD>".htmlspecialchars
($row["lastname"])."</TD>\n";
Index: phpdoc/en/functions/var.xml
diff -u phpdoc/en/functions/var.xml:1.32 phpdoc/en/functions/var.xml:1.33
--- phpdoc/en/functions/var.xml:1.32 Thu Nov 23 23:05:32 2000
+++ phpdoc/en/functions/var.xml Sat Jan 20 13:08:27 2001
@@ -885,7 +885,7 @@
was called.
<informalexample>
<programlisting role="php">
-function foo(&$bar) {
+function foo(&$bar) {
unset($bar);
$bar = "blah";
}
@@ -978,12 +978,12 @@
<para>
<informalexample>
<programlisting role="php">
-<pre>
+<pre>
<?php
$a = array (1, 2, array ("a", "b", "c"));
var_dump ($a);
-?>
-</pre>
+?>
+</pre>
</programlisting>
</informalexample>
</para>
