nlopess Mon Mar 22 10:16:22 2004 EDT
Removed files:
/phpdoc/en/reference/apache note-nsapi-module.xml
Modified files:
/phpdoc/en bookinfo.xml language-snippets.ent
/phpdoc/en/appendices migration5.xml
/phpdoc/en/reference/apache/functions apache-request-headers.xml
apache-response-headers.xml
getallheaders.xml virtual.xml
/phpdoc/en/reference/hw configure.xml constants.xml ini.xml
reference.xml
Log:
move the NSAPI note to snippets
rename hyperwave IDs to hw to keep livedocs happy
http://cvs.php.net/diff.php/phpdoc/en/bookinfo.xml?r1=1.36&r2=1.37&ty=u
Index: phpdoc/en/bookinfo.xml
diff -u phpdoc/en/bookinfo.xml:1.36 phpdoc/en/bookinfo.xml:1.37
--- phpdoc/en/bookinfo.xml:1.36 Wed Dec 31 19:04:24 2003
+++ phpdoc/en/bookinfo.xml Mon Mar 22 10:11:20 2004
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.36 $ -->
+<!-- $Revision: 1.37 $ -->
<bookinfo id="bookinfo">
<title>&PHPManual;</title>
@@ -59,14 +59,7 @@
</authorgroup>
<copyright>
- <year>1997</year>
- <year>1998</year>
- <year>1999</year>
- <year>2000</year>
- <year>2001</year>
- <year>2002</year>
- <year>2003</year>
- <year>2004</year>
+ <year>1997-2004</year>
<holder>the PHP Documentation Group</holder>
</copyright>
http://cvs.php.net/diff.php/phpdoc/en/language-snippets.ent?r1=1.79&r2=1.80&ty=u
Index: phpdoc/en/language-snippets.ent
diff -u phpdoc/en/language-snippets.ent:1.79 phpdoc/en/language-snippets.ent:1.80
--- phpdoc/en/language-snippets.ent:1.79 Fri Mar 12 11:48:12 2004
+++ phpdoc/en/language-snippets.ent Mon Mar 22 10:11:21 2004
@@ -1,4 +1,4 @@
-<!-- $Revision: 1.79 $ -->
+<!-- $Revision: 1.80 $ -->
<!ENTITY warn.experimental '<warning><simpara>This extension is
<emphasis>EXPERIMENTAL</emphasis>. The behaviour of this extension --
@@ -256,6 +256,11 @@
<!ENTITY php '<literal>PHP</literal>'>
<!ENTITY safemode '<link linkend="ini.safe-mode">safe mode</link>'>
+<!-- Notes for SAPI/Apache -->
+<!ENTITY note.apache.nsapi-module '<note><para>From PHP 4.3.3 on you can use this
function with the
+<link linkend="ref.nsapi">NSAPI server module</link> in Netscape/iPlanet/SunONE
+webservers, too.</para></note>'>
+
<!-- SimpleXML Notes -->
<!ENTITY simplexml.iteration '<note><simpara>SimpleXML has made a rule of adding
iterative properties to most methods. They cannot be viewed using
<function>var_dump</function> or anything else which can examine
objects.</simpara></note>'>
http://cvs.php.net/diff.php/phpdoc/en/appendices/migration5.xml?r1=1.12&r2=1.13&ty=u
Index: phpdoc/en/appendices/migration5.xml
diff -u phpdoc/en/appendices/migration5.xml:1.12
phpdoc/en/appendices/migration5.xml:1.13
--- phpdoc/en/appendices/migration5.xml:1.12 Wed Mar 17 03:30:35 2004
+++ phpdoc/en/appendices/migration5.xml Mon Mar 22 10:12:36 2004
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.12 $ -->
+<!-- $Revision: 1.13 $ -->
<appendix id="migration5">
<title>Migrating from PHP 4 to PHP 5</title>
@@ -385,6 +385,10 @@
<function>convert_uuencode</function> - uuencode a string
</simpara></listitem>
<listitem><simpara>
+ <function>curl_copy_handle</function> - Copy a cURL handle
+ along with all of it's preferences
+ </simpara></listitem>
+ <listitem><simpara>
<function>dba_key_split</function> - Splits a key in string
representation into array representation
</simpara></listitem>
@@ -442,6 +446,10 @@
<function>ldap_sasl_bind</function> - Bind to LDAP directory using SASL
</simpara></listitem>
<listitem><simpara>
+ <function>mb_list_encodings</function> - Returns an array of all
+ supported encodings
+ </simpara></listitem>
+ <listitem><simpara>
<function>pcntl_getpriority</function> - Get the priority of any
process
</simpara></listitem>
@@ -502,6 +510,12 @@
nano seconds
</simpara></listitem>
</itemizedlist>
+ <note>
+ <para>
+ The <link linkend="ref.tidy">Tidy</link> extension has also changed its
+ API completly.
+ </para>
+ </note>
</section>
@@ -559,13 +573,6 @@
PostgreSQL). The SQLite library reads and writes directly to and from the
database files on disk.
</para>
-
- <note>
- <para>
- The <link linkend="ref.tidy">Tidy</link> extension has also changed its
- API completly.
- </para>
- </note>
</section>
<section id='migration5.oop'>
http://cvs.php.net/diff.php/phpdoc/en/reference/apache/functions/apache-request-headers.xml?r1=1.5&r2=1.6&ty=u
Index: phpdoc/en/reference/apache/functions/apache-request-headers.xml
diff -u phpdoc/en/reference/apache/functions/apache-request-headers.xml:1.5
phpdoc/en/reference/apache/functions/apache-request-headers.xml:1.6
--- phpdoc/en/reference/apache/functions/apache-request-headers.xml:1.5 Sun Dec 7
15:59:47 2003
+++ phpdoc/en/reference/apache/functions/apache-request-headers.xml Mon Mar 22
10:15:06 2004
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.5 $ -->
+<!-- $Revision: 1.6 $ -->
<!-- splitted from ./en/functions/apache.xml, last change in rev 1.2 -->
<refentry id="function.apache-request-headers">
<refnamediv>
@@ -51,7 +51,7 @@
<link linkend="language.variables.predefined">environment variables</link>.
</para>
</note>
- &reference.apache.note-nsapi-module;
+ ¬e.apache.nsapi-module;
<para>
See also <function>apache_response_headers</function>.
</para>
http://cvs.php.net/diff.php/phpdoc/en/reference/apache/functions/apache-response-headers.xml?r1=1.6&r2=1.7&ty=u
Index: phpdoc/en/reference/apache/functions/apache-response-headers.xml
diff -u phpdoc/en/reference/apache/functions/apache-response-headers.xml:1.6
phpdoc/en/reference/apache/functions/apache-response-headers.xml:1.7
--- phpdoc/en/reference/apache/functions/apache-response-headers.xml:1.6 Fri
Mar 5 21:40:18 2004
+++ phpdoc/en/reference/apache/functions/apache-response-headers.xml Mon Mar 22
10:15:06 2004
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.6 $ -->
+<!-- $Revision: 1.7 $ -->
<!-- splitted from ./en/functions/apache.xml, last change in rev 1.2 -->
<refentry id="function.apache-response-headers">
<refnamediv>
@@ -18,7 +18,7 @@
Returns an array of all Apache response headers. This functionality
is only available in PHP 4.3.0 and greater.
</para>
- &reference.apache.note-nsapi-module;
+ ¬e.apache.nsapi-module;
<para>
See also <function>apache_request_headers</function>, and
<function>headers_sent</function>.
http://cvs.php.net/diff.php/phpdoc/en/reference/apache/functions/getallheaders.xml?r1=1.7&r2=1.8&ty=u
Index: phpdoc/en/reference/apache/functions/getallheaders.xml
diff -u phpdoc/en/reference/apache/functions/getallheaders.xml:1.7
phpdoc/en/reference/apache/functions/getallheaders.xml:1.8
--- phpdoc/en/reference/apache/functions/getallheaders.xml:1.7 Sun Dec 7 16:12:58
2003
+++ phpdoc/en/reference/apache/functions/getallheaders.xml Mon Mar 22 10:15:06
2004
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.7 $ -->
+<!-- $Revision: 1.8 $ -->
<!-- splitted from ./en/functions/apache.xml, last change in rev 1.2 -->
<refentry id="function.getallheaders">
<refnamediv>
@@ -28,7 +28,7 @@
<productname>Apache</productname> Module.
</para>
</note>
- &reference.apache.note-nsapi-module;
+ ¬e.apache.nsapi-module;
<para>
See also <function>apache_request_headers</function>.
</para>
http://cvs.php.net/diff.php/phpdoc/en/reference/apache/functions/virtual.xml?r1=1.6&r2=1.7&ty=u
Index: phpdoc/en/reference/apache/functions/virtual.xml
diff -u phpdoc/en/reference/apache/functions/virtual.xml:1.6
phpdoc/en/reference/apache/functions/virtual.xml:1.7
--- phpdoc/en/reference/apache/functions/virtual.xml:1.6 Wed Nov 26 19:50:00
2003
+++ phpdoc/en/reference/apache/functions/virtual.xml Mon Mar 22 10:15:06 2004
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.6 $ -->
+<!-- $Revision: 1.7 $ -->
<!-- splitted from ./en/functions/apache.xml, last change in rev 1.20 -->
<refentry id="function.virtual">
<refnamediv>
@@ -30,7 +30,7 @@
However, it is typically better to use <function>include</function> or
<function>require</function> if you need to include another PHP file.
</para>
- &reference.apache.note-nsapi-module;
+ ¬e.apache.nsapi-module;
</refsect1>
</refentry>
http://cvs.php.net/diff.php/phpdoc/en/reference/hw/configure.xml?r1=1.1&r2=1.2&ty=u
Index: phpdoc/en/reference/hw/configure.xml
diff -u phpdoc/en/reference/hw/configure.xml:1.1
phpdoc/en/reference/hw/configure.xml:1.2
--- phpdoc/en/reference/hw/configure.xml:1.1 Wed Nov 27 19:42:47 2002
+++ phpdoc/en/reference/hw/configure.xml Mon Mar 22 10:16:22 2004
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.1 $ -->
-<section id="hyperwave.installation">
+<!-- $Revision: 1.2 $ -->
+<section id="hw.installation">
&reftitle.install;
<para>
To enable Hyperwave support compile PHP
http://cvs.php.net/diff.php/phpdoc/en/reference/hw/constants.xml?r1=1.2&r2=1.3&ty=u
Index: phpdoc/en/reference/hw/constants.xml
diff -u phpdoc/en/reference/hw/constants.xml:1.2
phpdoc/en/reference/hw/constants.xml:1.3
--- phpdoc/en/reference/hw/constants.xml:1.2 Wed May 28 19:03:07 2003
+++ phpdoc/en/reference/hw/constants.xml Mon Mar 22 10:16:22 2004
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.2 $ -->
-<section id="hyperwave.constants">
+<!-- $Revision: 1.3 $ -->
+<section id="hw.constants">
&reftitle.constants;
&extension.constants;
<variablelist>
http://cvs.php.net/diff.php/phpdoc/en/reference/hw/ini.xml?r1=1.4&r2=1.5&ty=u
Index: phpdoc/en/reference/hw/ini.xml
diff -u phpdoc/en/reference/hw/ini.xml:1.4 phpdoc/en/reference/hw/ini.xml:1.5
--- phpdoc/en/reference/hw/ini.xml:1.4 Wed Dec 17 09:32:18 2003
+++ phpdoc/en/reference/hw/ini.xml Mon Mar 22 10:16:22 2004
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.4 $ -->
-<section id="hyperwave.configuration">
+<!-- $Revision: 1.5 $ -->
+<section id="hw.configuration">
&reftitle.runtime;
&extension.runtime;
<para>
http://cvs.php.net/diff.php/phpdoc/en/reference/hw/reference.xml?r1=1.7&r2=1.8&ty=u
Index: phpdoc/en/reference/hw/reference.xml
diff -u phpdoc/en/reference/hw/reference.xml:1.7
phpdoc/en/reference/hw/reference.xml:1.8
--- phpdoc/en/reference/hw/reference.xml:1.7 Tue Feb 24 03:45:47 2004
+++ phpdoc/en/reference/hw/reference.xml Mon Mar 22 10:16:22 2004
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.7 $ -->
- <reference id="ref.hyperwave">
+<!-- $Revision: 1.8 $ -->
+ <reference id="ref.hw">
<title>Hyperwave Functions</title>
<titleabbrev>Hyperwave</titleabbrev>
<partintro>
- <section id="hyperwave.intro">
+ <section id="hw.intro">
&reftitle.intro;
<para>
<productname>Hyperwave</productname> has been developed at
@@ -267,7 +267,7 @@
&reference.hw.configure;
- <section id="hyperwave.apache">
+ <section id="hw.apache">
<title>Integration with Apache</title>
<para>
The Hyperwave extension is best used when PHP is compiled as an
@@ -376,14 +376,14 @@
&reference.hw.ini;
- <section id="hyperwave.resources">
+ <section id="hw.resources">
&reftitle.resources;
&no.resource;
</section>
&reference.hw.constants;
- <section id="hyperwave.todo">
+ <section id="hw.todo">
<title>Todo</title>
<para>
There are still some things to do:
