From 90783beb49834e62d7803b2eb3919bb94dc29b52 Mon Sep 17 00:00:00 2001
From: Adam Harvey <aharvey@php.net>
Date: Fri, 10 Sep 2010 02:53:06 +0000
Subject: [PATCH] Fix doc bug #52806 (key_exists (alias of array_key_exists)
 undocumented) by adding key_exists() to the list of function aliases and
 moving the note about the deprecated alias to the normal place on the
 array_key_exists() manual page. Also removed the now horribly out of date
 note on the function alias list about it being correct "as of 4.0.6".

git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@303248 c90b9560-bf6c-de11-be94-00142212c4b1
---
 appendices/aliases.xml                         |  8 +++++---
 reference/array/functions/array-key-exists.xml | 16 ++++++++++------
 2 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/appendices/aliases.xml b/appendices/aliases.xml
index b45fe37661..f7b48de86e 100644
--- a/appendices/aliases.xml
+++ b/appendices/aliases.xml
@@ -14,9 +14,6 @@
   renaming, which will lead to unportable script. This list is provided
   to help those who want to upgrade their old scripts to newer syntax.
  </para>
- <para>
-  This list is consistent with PHP 4.0.6.
- </para>
  <para>
   <table>
    <title>Aliases</title>
@@ -419,6 +416,11 @@
       <entry><function>implode</function></entry>
       <entry>Base syntax</entry>
      </row>
+     <row>
+      <entry>key_exists</entry>
+      <entry><function>array_key_exists</function></entry>
+      <entry>Base syntax</entry>
+     </row>
      <row>
       <entry>labelframe</entry>
       <entry><function>swfmovie_labelFrame</function></entry>
diff --git a/reference/array/functions/array-key-exists.xml b/reference/array/functions/array-key-exists.xml
index f552be7709..0c5267e624 100644
--- a/reference/array/functions/array-key-exists.xml
+++ b/reference/array/functions/array-key-exists.xml
@@ -94,12 +94,6 @@ if (array_key_exists('first', $search_array)) {
     </programlisting>
    </example>
   </para>
-  <note>
-   <simpara>
-    The name of this function is <function>key_exists</function>
-    in PHP 4.0.6.
-   </simpara>
-  </note>
   <example>
    <title><function>array_key_exists</function> vs <function>isset</function></title>
    <para>
@@ -123,6 +117,16 @@ array_key_exists('first', $search_array);
   </example>
  </refsect1>
 
+ <refsect1 role="notes">
+  &reftitle.notes;
+  <note>
+   <para>
+    &info.deprecated.alias;
+    <function>key_exists</function>
+   </para>
+  </note>
+ </refsect1>
+
  <refsect1 role="seealso">
   &reftitle.seealso;
   <para>