From 6f4ea969eae0745abce32eff5e22b6230f9369ec Mon Sep 17 00:00:00 2001
From: Jeroen van Wolffelaar <jeroen@php.net>
Date: Sun, 24 Jun 2001 23:13:23 +0000
Subject: [PATCH] Fixed some identifiers. Updated TODO

git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@50163 c90b9560-bf6c-de11-be94-00142212c4b1
---
 functions/domxml.xml    | 32 ++++++++++++++++----------------
 functions/satellite.xml |  8 ++++----
 functions/shmop.xml     | 20 ++++++++++----------
 3 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/functions/domxml.xml b/functions/domxml.xml
index f64b4fc9ee..7a8ca0e12a 100644
--- a/functions/domxml.xml
+++ b/functions/domxml.xml
@@ -491,7 +491,7 @@
    </refsect1>
   </refentry>
 
-  <refentry id="function.domxml_root">
+  <refentry id="function.domxml-root">
    <refnamediv>
     <refname>domxml_root</refname>
     <refpurpose>
@@ -554,7 +554,7 @@ print_r($root);
    </refsect1>
   </refentry>
 
-  <refentry id="function.domxml_add_root">
+  <refentry id="function.domxml-add-root">
    <refnamediv>
     <refname>domxml_add_root</refname>
     <refpurpose>
@@ -580,18 +580,18 @@ print_r($root);
       <programlisting>
 &lt;?php
 $doc = new_xmldoc("1.0");
-$root = $doc->add_root("HTML");
-$head = $root->new_child("HEAD", "");
-$head->new_child("TITLE", "Hier der Titel");
-echo $doc->dumpmem();
-?>
+$root = $doc-&gt;add_root("HTML");
+$head = $root-&gt;new_child("HEAD", "");
+$head-&gt;new_child("TITLE", "Hier der Titel");
+echo $doc-&gt;dumpmem();
+?&gt;
       </programlisting>
      </example>
     </para>
    </refsect1>
   </refentry>
 
-  <refentry id="function.domxml_dumpmem">
+  <refentry id="function.domxml-dumpmem">
    <refnamediv>
     <refname>domxml_dumpmem</refname>
     <refpurpose>
@@ -617,7 +617,7 @@ echo $doc->dumpmem();
    </refsect1>
   </refentry>
 
-  <refentry id="function.domxml_attributes">
+  <refentry id="function.domxml-attributes">
    <refnamediv>
     <refname>domxml_attributes</refname>
     <refpurpose>
@@ -639,7 +639,7 @@ echo $doc->dumpmem();
    </refsect1>
   </refentry>
 
-  <refentry id="function.domxml_get_attribute">
+  <refentry id="function.domxml-get-attribute">
    <refnamediv>
     <refname>domxml_get_attribute</refname>
     <refpurpose>
@@ -665,7 +665,7 @@ echo $doc->dumpmem();
    </refsect1>
   </refentry>
 
-  <refentry id="function.domxml_set_attribute">
+  <refentry id="function.domxml-set-attribute">
    <refnamediv>
     <refname>domxml_set_attribute</refname>
     <refpurpose>
@@ -706,7 +706,7 @@ echo $doc->dumpmem();
    </refsect1>
   </refentry>
 
-  <refentry id="function.domxml_children">
+  <refentry id="function.domxml-children">
    <refnamediv>
     <refname>domxml_children</refname>
     <refpurpose>
@@ -745,7 +745,7 @@ $children = $head->children()
    </refsect1>
   </refentry>
 
-  <refentry id="function.domxml_new_child">
+  <refentry id="function.domxml-new-child">
    <refnamediv>
     <refname>domxml_new_child</refname>
     <refpurpose>
@@ -767,7 +767,7 @@ $children = $head->children()
    </refsect1>
   </refentry>
 
-  <refentry id="function.domxml_new_xmldoc">
+  <refentry id="function.domxml-new-xmldoc">
    <refnamediv>
     <refname>domxml_new_xmldoc</refname>
     <refpurpose>
@@ -791,7 +791,7 @@ $children = $head->children()
    </refsect1>
   </refentry>
 
-  <refentry id="function.xpath_new_context">
+  <refentry id="function.xpath-new-context">
    <refnamediv>
     <refname>xpath_new_context</refname>
     <refpurpose>
@@ -814,7 +814,7 @@ $children = $head->children()
    </refsect1>
   </refentry>
 
-  <refentry id="function.xpath_eval">
+  <refentry id="function.xpath-eval">
    <refnamediv>
     <refname>xpath_eval</refname>
     <refpurpose>
diff --git a/functions/satellite.xml b/functions/satellite.xml
index 37f33c35a1..08b0cd6108 100644
--- a/functions/satellite.xml
+++ b/functions/satellite.xml
@@ -1,6 +1,6 @@
 <!-- 
 
-	$Id: satellite.xml,v 1.5 2001-06-24 15:27:21 jeroen Exp $
+	$Id: satellite.xml,v 1.6 2001-06-24 23:13:22 jeroen Exp $
 
 	Author: David Eriksson <david@2good.com> 
 
@@ -179,7 +179,7 @@ echo $values->stringvalue;
    </refsect1>
   </refentry>
 
-  <refentry id="function.satellite_caught_exception">
+  <refentry id="function.satellite-caught-exception">
    <refnamediv>
     <refname>satellite_caught_exception</refname>
     <refpurpose>
@@ -236,7 +236,7 @@ if (satellite_caught_exception()) {
    </refsect1>
   </refentry>
 
-  <refentry id="function.satellite_exception_id">
+  <refentry id="function.satellite-exception-id">
    <refnamediv>
     <refname>satellite_exception_id</refname>
     <refpurpose>Get the repository id for the latest excetpion.</refpurpose>
@@ -257,7 +257,7 @@ if (satellite_caught_exception()) {
    </refsect1>
   </refentry>
 
-  <refentry id="function.satellite_exception_value">
+  <refentry id="function.satellite-exception-value">
    <refnamediv>
     <refname>satellite_exception_value</refname>
     <refpurpose>
diff --git a/functions/shmop.xml b/functions/shmop.xml
index 5d81c2d8a2..498f688c42 100755
--- a/functions/shmop.xml
+++ b/functions/shmop.xml
@@ -12,10 +12,10 @@
    </para>
    <note>
     <simpara>
-     The functions explained in the chapter begin all with
-     <function>shm_</function> in PHP 4.0.3, but in PHP 4.0.4 and later
-     versions these names are changed to begin with
-     <function>shmop_</function>.
+	 In PHP 4.0.3, there functions were prefixed by <literal>shm</literal>
+	 rather than <literal>shmop</literal>.
+	 <!-- TODO: do the old shm_* funcs still work, i.e. are they still
+	 aliased? -->
     </simpara>
    </note>
    <para>
@@ -59,7 +59,7 @@ shmop_close($shm_id);
    </para>
   </partintro>  
 
-  <refentry id="function.shmop_open">
+  <refentry id="function.shmop-open">
    <refnamediv>
     <refname>shmop_open</refname>
     <refpurpose>Create or open shared memory block</refpurpose>
@@ -124,7 +124,7 @@ $shm_id = shmop_open(0x0fff, "c", 0644, 100);
    </refsect1>
   </refentry>  
   
-  <refentry id="function.shmop_read">
+  <refentry id="function.shmop-read">
    <refnamediv>
     <refname>shmop_read</refname>
     <refpurpose>Read data from shared memory block</refpurpose>
@@ -164,7 +164,7 @@ $shm_data = shmop_read($shm_id, 0, 50);
    </refsect1>
   </refentry>
  
-  <refentry id="function.shmop_write">
+  <refentry id="function.shmop-write">
    <refnamediv>
     <refname>shmop_write</refname>
      <refpurpose>Write data into shared memory block</refpurpose>
@@ -206,7 +206,7 @@ $shm_bytes_written = shmop_write($shm_id, $my_string, 0);
    </refsect1>
   </refentry>
  
-  <refentry id="function.size">
+  <refentry id="function.shmop-size">
   <refnamediv>
    <refname>shmop_size</refname>
    <refpurpose>Get size of shared memory block</refpurpose>
@@ -246,7 +246,7 @@ $shm_size = shmop_size($shm_id);
    </refsect1>
   </refentry>
 
-  <refentry id="function.shmop_delete">
+  <refentry id="function.shmop-delete">
    <refnamediv>
     <refname>shmop_delete</refname>
     <refpurpose>Delete shared memory block</refpurpose>
@@ -284,7 +284,7 @@ shmop_delete($shm_id);
    </refsect1>
   </refentry>
  
-  <refentry id="function.shmop_close">
+  <refentry id="function.shmop-close">
    <refnamediv>
     <refname>shmop_close</refname>
     <refpurpose>Close shared memory block</refpurpose>