From e7a895dfc241e2a28a5d6276ef690d7a2a62b0de Mon Sep 17 00:00:00 2001
From: Shein Alexey <shein@php.net>
Date: Fri, 19 Aug 2011 10:03:54 +0000
Subject: [PATCH] Standartized description of iconv-str(r)pos functions.

git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@315172 c90b9560-bf6c-de11-be94-00142212c4b1
---
 reference/iconv/functions/iconv-strpos.xml  |  3 ++-
 reference/iconv/functions/iconv-strrpos.xml | 11 +++++++----
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/reference/iconv/functions/iconv-strpos.xml b/reference/iconv/functions/iconv-strpos.xml
index 95d25473ba..9916939012 100644
--- a/reference/iconv/functions/iconv-strpos.xml
+++ b/reference/iconv/functions/iconv-strpos.xml
@@ -16,7 +16,8 @@
    <methodparam choice="opt"><type>string</type><parameter>charset</parameter><initializer>ini_get("iconv.internal_encoding")</initializer></methodparam>
   </methodsynopsis>
   <para>
-   Finds position of first occurrence of a needle within a haystack.
+   Finds position of first occurrence of a <parameter>needle</parameter>
+   within a <parameter>haystack</parameter>.
   </para>
   <para>
    In contrast to <function>strpos</function>, the return value of
diff --git a/reference/iconv/functions/iconv-strrpos.xml b/reference/iconv/functions/iconv-strrpos.xml
index a50b308297..554d390e18 100644
--- a/reference/iconv/functions/iconv-strrpos.xml
+++ b/reference/iconv/functions/iconv-strrpos.xml
@@ -15,10 +15,15 @@
    <methodparam choice="opt"><type>string</type><parameter>charset</parameter><initializer>ini_get("iconv.internal_encoding")</initializer></methodparam>
   </methodsynopsis>
   <para>
-   In contrast to <function>strpos</function>, the return value of
+   Finds the last occurrence of a <parameter>needle</parameter>
+   within a <parameter>haystack</parameter>.
+  </para>
+  <para>
+   In contrast to <function>strrpos</function>, the return value of
    <function>iconv_strrpos</function> is the number of characters that
    appear before the needle, rather than the offset in bytes to the
-   position where the needle has been found. 
+   position where the needle has been found. The characters are counted
+   on the basis of the specified character set <parameter>charset</parameter>.
   </para>
  </refsect1>
 
@@ -66,8 +71,6 @@
   <para>
    Returns the numeric position of the last occurrence of
    <parameter>needle</parameter> in <parameter>haystack</parameter>.
-   The characters are counted
-   on the basis of the specified character set <parameter>charset</parameter>.
   </para>
   <para>
    If <parameter>needle</parameter> is not found,