From a328586a54a5a641abad1ddc3daa3341f1ac887c Mon Sep 17 00:00:00 2001
From: Gabor Hojtsy <goba@php.net>
Date: Fri, 8 Feb 2002 13:40:44 +0000
Subject: [PATCH] Replace exotic tags with more commonon tags/constructs. All
these tags were only used once...
git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@69758 c90b9560-bf6c-de11-be94-00142212c4b1
---
appendices/phpdevel.xml | 22 ++++++++++++----------
features/http-auth.xml | 4 ++--
functions/oracle.xml | 4 ++--
functions/pcntl.xml | 7 +++----
language/types.xml | 17 +++++++----------
5 files changed, 26 insertions(+), 28 deletions(-)
diff --git a/appendices/phpdevel.xml b/appendices/phpdevel.xml
index 62c3447e48..3212d003ca 100644
--- a/appendices/phpdevel.xml
+++ b/appendices/phpdevel.xml
@@ -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 @@ convert_string_to_number(arg1); /* Converts string to either LONG or DOUBLE dep
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
diff --git a/features/http-auth.xml b/features/http-auth.xml
index 0a95f79a48..f6904a2dfe 100644
--- a/features/http-auth.xml
+++ b/features/http-auth.xml
@@ -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>
diff --git a/functions/oracle.xml b/functions/oracle.xml
index b98d7fc7eb..b551a1fbad 100644
--- a/functions/oracle.xml
+++ b/functions/oracle.xml
@@ -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 @@ echo "Result: $result<BR>Out: $output<BR>In: $input";
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
diff --git a/functions/pcntl.xml b/functions/pcntl.xml
index 3bc61821d3..e67c434a8a 100644
--- a/functions/pcntl.xml
+++ b/functions/pcntl.xml
@@ -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
diff --git a/language/types.xml b/language/types.xml
index 83adf80ead..1ed6aa87f4 100644
--- a/language/types.xml
+++ b/language/types.xml
@@ -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 @@ echo "\$foo==$foo; type is " . gettype ($foo) . "<br>\n";
<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>