move the NSAPI note to snippets

rename hyperwave IDs to hw to keep livedocs happy


git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@154215 c90b9560-bf6c-de11-be94-00142212c4b1

appendices/migration5.xml

@@ -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>
 
@@ -384,6 +384,10 @@ Action application/x-httpd-php "/php/php-cgi.exe"
     <listitem><simpara>
       <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
@@ -441,6 +445,10 @@ Action application/x-httpd-php "/php/php-cgi.exe"
     <listitem><simpara>
       <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
@@ -502,6 +510,12 @@ Action application/x-httpd-php "/php/php-cgi.exe"
       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 @@ Action application/x-httpd-php "/php/php-cgi.exe"
     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'>

bookinfo.xml

@@ -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>
 

language-snippets.ent

@@ -256,6 +256,11 @@ extension in order to use these functions.</simpara>'>
 <!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>'>
 

reference/apache/functions/apache-request-headers.xml

@@ -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 @@ foreach ($headers as $header => $value) {
       <link linkend="language.variables.predefined">environment variables</link>.
      </para>
     </note>
-    &reference.apache.note-nsapi-module;
+    &note.apache.nsapi-module;
     <para>
      See also <function>apache_response_headers</function>.
     </para>

reference/apache/functions/apache-response-headers.xml

@@ -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;
+    &note.apache.nsapi-module;
     <para>
      See also <function>apache_request_headers</function>, and
      <function>headers_sent</function>.

reference/apache/functions/getallheaders.xml

@@ -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;
+    &note.apache.nsapi-module;
     <para>
      See also <function>apache_request_headers</function>.
     </para>

reference/apache/functions/virtual.xml

@@ -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;
+    &note.apache.nsapi-module;
    </refsect1>
   </refentry>
 

reference/apache/note-nsapi-module.xml

@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.1 $ -->
-<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>
- 
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"../../../manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->

reference/hw/configure.xml

@@ -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

reference/hw/constants.xml

@@ -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>

reference/hw/ini.xml

@@ -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>

reference/hw/reference.xml

@@ -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 @@ RewriteEngine on
 
     &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: