From 1ec8bcb2f1692e071ec2317e02c12a3a26b6ad19 Mon Sep 17 00:00:00 2001
From: Nikita Popov <nikic@php.net>
Date: Thu, 1 Sep 2011 14:32:05 +0000
Subject: [PATCH] Fix Doc Bug #55532

git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@315994 c90b9560-bf6c-de11-be94-00142212c4b1
---
 reference/strings/functions/strpos.xml   |  6 ++----
 reference/strings/functions/strripos.xml | 20 ++++++++------------
 reference/strings/functions/strrpos.xml  |  9 ++++-----
 3 files changed, 14 insertions(+), 21 deletions(-)

diff --git a/reference/strings/functions/strpos.xml b/reference/strings/functions/strpos.xml
index 6b7cc982f3..6e4d9a4d04 100644
--- a/reference/strings/functions/strpos.xml
+++ b/reference/strings/functions/strpos.xml
@@ -17,9 +17,7 @@
   <para>
    Returns the numeric position of the first occurrence of
    <parameter>needle</parameter> in the <parameter>haystack</parameter>
-   string.  Unlike the <function>strrpos</function> before PHP 5, this
-   function can take a full string as the <parameter>needle</parameter>
-   parameter and the entire string will be used.
+   string.
   </para>
  </refsect1>
 
@@ -31,7 +29,7 @@
      <term><parameter>haystack</parameter></term>
      <listitem>
       <para>
-       The string to search in
+       The string to search in.
       </para>
      </listitem>
     </varlistentry>
diff --git a/reference/strings/functions/strripos.xml b/reference/strings/functions/strripos.xml
index 524b41384c..e0f6f1a602 100644
--- a/reference/strings/functions/strripos.xml
+++ b/reference/strings/functions/strripos.xml
@@ -15,8 +15,8 @@
    <methodparam choice="opt"><type>int</type><parameter>offset</parameter><initializer>0</initializer></methodparam>
   </methodsynopsis>
   <para>
-   Find position of last occurrence of a case-insensitive string in a string.
-   Unlike <function>strrpos</function>, <function>strripos</function> is
+   Find position of last occurrence of a string in a string. Unlike
+   <function>strrpos</function>, <function>strripos</function> is
    case-insensitive.
   </para>
  </refsect1>
@@ -29,7 +29,7 @@
      <term><parameter>haystack</parameter></term>
      <listitem>
       <para>
-       The string to search in
+       The string to search in.
       </para>
      </listitem>
     </varlistentry>
@@ -37,8 +37,8 @@
      <term><parameter>needle</parameter></term>
      <listitem>
       <para>
-       Note that the <parameter>needle</parameter> may be a string of one or
-       more characters.
+       If <parameter>needle</parameter> is not a string, it is converted
+       to an integer and applied as the ordinal value of a character.
       </para>
      </listitem>
     </varlistentry>
@@ -46,13 +46,9 @@
      <term><parameter>offset</parameter></term>
      <listitem>
       <para>
-       The <parameter>offset</parameter> parameter may be specified to begin
-       searching an arbitrary number of characters into the string.
-      </para>
-      <para>
-       Negative offset values will start the search at
-       <parameter>offset</parameter> characters from the
-       <emphasis>start</emphasis> of the string.
+       If specified, search will stop this number of characters counted from the
+       beginning of the string. If the value is negative, search will instead start
+       from that many characters from the end of the string.
       </para>
      </listitem>
     </varlistentry>
diff --git a/reference/strings/functions/strrpos.xml b/reference/strings/functions/strrpos.xml
index 17f66bdaf1..e390a83793 100644
--- a/reference/strings/functions/strrpos.xml
+++ b/reference/strings/functions/strrpos.xml
@@ -38,8 +38,7 @@
      <listitem>
       <para>
        If <parameter>needle</parameter> is not a string, it is converted
-       to an integer and applied as the ordinal value of a character. The
-       <parameter>needle</parameter> can only be a single character in PHP 4.
+       to an integer and applied as the ordinal value of a character.
       </para>
      </listitem>
     </varlistentry>
@@ -47,9 +46,9 @@
      <term><parameter>offset</parameter></term>
      <listitem>
       <para>
-       May be specified to begin searching an arbitrary number of characters into
-       the string.  Negative values will stop searching at an arbitrary point
-       prior to the end of the string.
+       If specified, search will stop this number of characters counted from the
+       beginning of the string. If the value is negative, search will instead start
+       from that many characters from the end of the string.
       </para>
      </listitem>
     </varlistentry>