goba Fri Feb 8 08:40:45 2002 EDT
Modified files:
/phpdoc/en/language types.xml
/phpdoc/en/features http-auth.xml
/phpdoc/en/appendices phpdevel.xml
/phpdoc/en/functions pcntl.xml oracle.xml
Log:
Replace exotic tags with more commonon tags/constructs. All these tags
were only used once...
Index: phpdoc/en/language/types.xml
diff -u phpdoc/en/language/types.xml:1.71 phpdoc/en/language/types.xml:1.72
--- phpdoc/en/language/types.xml:1.71 Sun Jan 6 12:50:23 2002
+++ phpdoc/en/language/types.xml Fri Feb 8 08:40:43 2002
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.71 $ -->
+<!-- $Revision: 1.72 $ -->
<chapter id="language.types">
<title>Types</title>
@@ -1108,15 +1108,12 @@
<para>
A value can be anything.
</para>
- <formalpara id="language.types.array.omit-key">
- <title>Omitting keys</title>
- <para>
- If you omit a key, the maximum of the integer-indices is taken, and
- the new key will be that maximum + 1. If no integer-indices exist
- yet, the key will be <literal>0</literal> (zero). If you specify a key
- that already has a value assigned to it, that value will be overwritten.
- </para>
- </formalpara>
+ <para>
+ If you omit a key, the maximum of the integer-indices is taken, and
+ the new key will be that maximum + 1. If no integer-indices exist
+ yet, the key will be <literal>0</literal> (zero). If you specify a key
+ that already has a value assigned to it, that value will be overwritten.
+ </para>
<para>
<synopsis>
Index: phpdoc/en/features/http-auth.xml
diff -u phpdoc/en/features/http-auth.xml:1.20 phpdoc/en/features/http-auth.xml:1.21
--- phpdoc/en/features/http-auth.xml:1.20 Sat Dec 22 11:28:34 2001
+++ phpdoc/en/features/http-auth.xml Fri Feb 8 08:40:43 2002
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.20 $ -->
+<!-- $Revision: 1.21 $ -->
<chapter id="features.http-auth">
<title>HTTP authentication with PHP</title>
@@ -59,7 +59,7 @@
Watch out for buggy Internet Explorer browsers out there. They
seem very picky about the order of the headers. Sending the
<emphasis>WWW-Authenticate</emphasis> header before the
- <errorcode>HTTP/1.0 401</errorcode> header seems to do the trick
+ <literal>HTTP/1.0 401</literal> header seems to do the trick
for now.</para>
<simpara>
Index: phpdoc/en/appendices/phpdevel.xml
diff -u phpdoc/en/appendices/phpdevel.xml:1.17 phpdoc/en/appendices/phpdevel.xml:1.18
--- phpdoc/en/appendices/phpdevel.xml:1.17 Thu Jan 17 22:32:22 2002
+++ phpdoc/en/appendices/phpdevel.xml Fri Feb 8 08:40:44 2002
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.17 $ -->
+<!-- $Revision: 1.18 $ -->
<appendix id="phpdevel">
<title>Extending PHP 3</title>
@@ -203,18 +203,20 @@
variable in the symbol table:
<itemizedlist>
- <listitem><simpara>SET_VAR_STRING(name,value) <footnoteref
linkend="symtab-1"/></simpara></listitem>
+ <listitem><simpara>SET_VAR_STRING(name,value)</simpara></listitem>
<listitem><simpara>SET_VAR_DOUBLE(name,value)</simpara></listitem>
<listitem><simpara>SET_VAR_LONG(name,value)</simpara></listitem>
- </itemizedlist></para>
+ </itemizedlist>
+ </para>
- <para>
- <footnote id="symtab-1">
- <simpara>
- Be careful here. The value part must be malloc'ed manually because
- the memory management code will try to free this pointer later. Do
- not pass statically allocated memory into a SET_VAR_STRING.</simpara>
- </footnote></para>
+ <warning>
+ <para>
+ Be careful with SET_VAR_STRING. The value part must be malloc'ed
+ manually because the memory management code will try to free this
+ pointer later. Do not pass statically allocated memory into a
+ SET_VAR_STRING.
+ </para>
+ </warning>
<simpara>
Symbol tables in PHP 3.0 are implemented as hash tables. At any
Index: phpdoc/en/functions/pcntl.xml
diff -u phpdoc/en/functions/pcntl.xml:1.10 phpdoc/en/functions/pcntl.xml:1.11
--- phpdoc/en/functions/pcntl.xml:1.10 Sat Feb 2 10:36:06 2002
+++ phpdoc/en/functions/pcntl.xml Fri Feb 8 08:40:44 2002
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.10 $ -->
+<!-- $Revision: 1.11 $ -->
<reference id="ref.pcntl">
<title>Process Control Functions</title>
<titleabbrev>PCNTL</titleabbrev>
@@ -16,9 +16,8 @@
each of the Process Control functions. For detailed information
about Unix process control you are encouraged to consult your
systems documentation including fork(2), waitpid(2) and signal(2)
- or a comprehensive reference such as <citation>Advanced
- Programming in the UNIX Environment by W. Richard Stevens
- (Addison-Wesley)</citation>.
+ or a comprehensive reference such as Advanced Programming in the
+ UNIX Environment by W. Richard Stevens (Addison-Wesley).
</para>
<para>
Process Control support in PHP is not enabled by default. You
Index: phpdoc/en/functions/oracle.xml
diff -u phpdoc/en/functions/oracle.xml:1.29 phpdoc/en/functions/oracle.xml:1.30
--- phpdoc/en/functions/oracle.xml:1.29 Sat Feb 2 10:36:06 2002
+++ phpdoc/en/functions/oracle.xml Fri Feb 8 08:40:44 2002
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.29 $ -->
+<!-- $Revision: 1.30 $ -->
<reference id="ref.oracle">
<title>Oracle functions</title>
<titleabbrev>Oracle</titleabbrev>
@@ -281,7 +281,7 @@
On UNIX versions of Oracle, you can find details about an error
message like this:
<computeroutput>
-<prompt>$</prompt> <userinput>oerr ora
+$ <userinput>oerr ora
<replaceable>00001</replaceable></userinput> 00001, 00000,
"unique constraint (%s.%s) violated" // *Cause: An update or insert
statement attempted to insert a duplicate key // For Trusted
