From 9804d7589793cbe3023148130d351e6cf19fe6c7 Mon Sep 17 00:00:00 2001
From: Andrea Faulds <ajf@php.net>
Date: Wed, 30 Jul 2014 15:05:00 +0000
Subject: [PATCH] Clarified function of mb_http_output and the http_output
 setting

git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@334422 c90b9560-bf6c-de11-be94-00142212c4b1
---
 reference/mbstring/functions/mb-http-output.xml | 2 +-
 reference/mbstring/ini.xml                      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/reference/mbstring/functions/mb-http-output.xml b/reference/mbstring/functions/mb-http-output.xml
index 7cc4c9b720..fa23fa02e2 100644
--- a/reference/mbstring/functions/mb-http-output.xml
+++ b/reference/mbstring/functions/mb-http-output.xml
@@ -14,7 +14,7 @@
   </methodsynopsis>
   <para>
    Set/Get the HTTP output character encoding.
-   Output after this function is converted to <parameter>encoding</parameter>.
+   Output after this function is called will be converted from the set internal encoding to <parameter>encoding</parameter>.
   </para>
  </refsect1>
 
diff --git a/reference/mbstring/ini.xml b/reference/mbstring/ini.xml
index caec19a2d7..806f5f78c0 100644
--- a/reference/mbstring/ini.xml
+++ b/reference/mbstring/ini.xml
@@ -147,7 +147,7 @@
     </term>
     <listitem>
      <para>
-      Defines the default HTTP output character encoding.
+      Defines the default HTTP output character encoding (output will be converted from the internal encoding to the HTTP output encoding upon output).
      </para>
     </listitem>
    </varlistentry>