From d895a58b2ac0d33fac87365eed6f94f056934354 Mon Sep 17 00:00:00 2001
From: Justin Martin <frozenfire@php.net>
Date: Sat, 12 Jan 2013 03:54:14 +0000
Subject: [PATCH] Added and clarified function alternatives relating to the
 deprecation of the regex extension. Contribution by Ole Aass. Relates to and
 closes bug #63934.

git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@329092 c90b9560-bf6c-de11-be94-00142212c4b1
---
 reference/regex/functions/ereg-replace.xml  | 5 ++---
 reference/regex/functions/ereg.xml          | 9 ++++-----
 reference/regex/functions/eregi-replace.xml | 6 ++++++
 reference/regex/functions/eregi.xml         | 6 ++++++
 reference/regex/functions/split.xml         | 5 ++---
 reference/regex/functions/spliti.xml        | 6 ++++++
 6 files changed, 26 insertions(+), 11 deletions(-)

diff --git a/reference/regex/functions/ereg-replace.xml b/reference/regex/functions/ereg-replace.xml
index 649d36dbf7..196bdf686c 100644
--- a/reference/regex/functions/ereg-replace.xml
+++ b/reference/regex/functions/ereg-replace.xml
@@ -140,9 +140,8 @@ $text = ereg_replace("[[:alpha:]]+://[^<>[:space:]]+[[:alnum:]/]",
   &note.regex.deprecated;
   <tip>
    <para>
-    <function>preg_replace</function>, which uses a Perl-compatible
-    regular expression syntax, is often a faster alternative to
-    <function>ereg_replace</function>.
+    <function>ereg_replace</function> is deprecated as of PHP 5.3.0. <function>preg_replace</function> 
+    is the suggested alternative to this function.
    </para>
   </tip>
  </refsect1>
diff --git a/reference/regex/functions/ereg.xml b/reference/regex/functions/ereg.xml
index 81b45f061a..f332fa2654 100644
--- a/reference/regex/functions/ereg.xml
+++ b/reference/regex/functions/ereg.xml
@@ -133,13 +133,12 @@ if (ereg ("([0-9]{4})-([0-9]{1,2})-([0-9]{1,2})", $date, $regs)) {
  <refsect1 role="notes">
   &reftitle.notes;
   &note.regex.deprecated;
-  <note>
+  <tip>
    <para>
-    <function>preg_match</function>, which uses a Perl-compatible
-    regular expression syntax, is often a faster alternative to
-    <function>ereg</function>.
+    <function>ereg</function> is deprecated as of PHP 5.3.0. <function>preg_match</function> 
+    is the suggested alternative to this function.
    </para>
-  </note>
+  </tip>
  </refsect1>
 
  <refsect1 role="seealso">
diff --git a/reference/regex/functions/eregi-replace.xml b/reference/regex/functions/eregi-replace.xml
index f5b8b2f368..341ed6f0f7 100644
--- a/reference/regex/functions/eregi-replace.xml
+++ b/reference/regex/functions/eregi-replace.xml
@@ -89,6 +89,12 @@ $body = eregi_replace($pattern, $replacement, $body);
  <refsect1 role="notes">
   &reftitle.notes;
   &note.regex.deprecated;
+  <tip>
+   <para>
+    <function>eregi_replace</function> is deprecated as of PHP 5.3.0. <function>preg_replace</function> 
+    with the <literal>i</literal> (<constant>PCRE_CASELESS</constant>) modifier is the suggested alternative.
+   </para>
+  </tip>
  </refsect1>
 
  <refsect1 role="seealso">
diff --git a/reference/regex/functions/eregi.xml b/reference/regex/functions/eregi.xml
index 403f7147fb..47164f1200 100644
--- a/reference/regex/functions/eregi.xml
+++ b/reference/regex/functions/eregi.xml
@@ -97,6 +97,12 @@ if (eregi('z', $string)) {
  <refsect1 role="notes">
   &reftitle.notes;
   &note.regex.deprecated;
+  <tip>
+   <para>
+    <function>eregi</function> is deprecated as of PHP 5.3.0. <function>preg_match</function> 
+    with the <literal>i</literal> (<constant>PCRE_CASELESS</constant>) modifier is the suggested alternative.
+   </para>
+  </tip>
  </refsect1>
 
  <refsect1 role="seealso">
diff --git a/reference/regex/functions/split.xml b/reference/regex/functions/split.xml
index 006f6ee904..2962de0d9b 100644
--- a/reference/regex/functions/split.xml
+++ b/reference/regex/functions/split.xml
@@ -127,9 +127,8 @@ echo "Month: $month; Day: $day; Year: $year<br />\n";
   &note.regex.deprecated;
   <tip>
    <para>
-    <function>preg_split</function>, which uses a Perl-compatible regular
-    expression syntax, is often a faster alternative to
-    <function>split</function>.  If you don't require the power of regular
+    <function>split</function> is deprecated as of PHP 5.3.0. <function>preg_split</function> 
+    is the suggested alternative to this function. If you don't require the power of regular
     expressions, it is faster to use <function>explode</function>, which
     doesn't incur the overhead of the regular expression engine.
    </para>
diff --git a/reference/regex/functions/spliti.xml b/reference/regex/functions/spliti.xml
index fdc06490e2..070121a146 100644
--- a/reference/regex/functions/spliti.xml
+++ b/reference/regex/functions/spliti.xml
@@ -122,6 +122,12 @@ Array
  <refsect1 role="notes">
   &reftitle.notes;
   &note.regex.deprecated;
+  <tip>
+   <para>
+    <function>spliti</function> is deprecated as of PHP 5.3.0. <function>preg_split</function> 
+    with the <literal>i</literal> (<constant>PCRE_CASELESS</constant>) modifier is the suggested alternative.
+   </para>
+  </tip>
  </refsect1>
 
  <refsect1 role="seealso">