From 719247b2cca4356199b794f87b971cbaaef36ae7 Mon Sep 17 00:00:00 2001
From: Yasuo Ohgaki <yohgaki@php.net>
Date: Thu, 26 Dec 2013 06:58:01 +0000
Subject: [PATCH] Fixed mb_send_mail() addtional_header param description.
 (Copied from mail())

git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@332513 c90b9560-bf6c-de11-be94-00142212c4b1
---
 reference/mbstring/functions/mb-send-mail.xml | 36 ++++++++++++++++---
 1 file changed, 31 insertions(+), 5 deletions(-)

diff --git a/reference/mbstring/functions/mb-send-mail.xml b/reference/mbstring/functions/mb-send-mail.xml
index 9ae2e3f3ae..182063ce4b 100644
--- a/reference/mbstring/functions/mb-send-mail.xml
+++ b/reference/mbstring/functions/mb-send-mail.xml
@@ -55,14 +55,40 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>additional_headers</parameter></term>
+     <term><parameter>additional_headers</parameter> (optional)</term>
      <listitem>
       <para>
-       <parameter>additional_headers</parameter> is inserted at
-       the end of the header. This is typically used to add extra
-       headers.  Multiple extra headers are separated with a
-       newline ("\n").
+       String to be inserted at the end of the email header.
       </para>
+      <para>
+       This is typically used to add extra headers (From, Cc, and Bcc).
+       Multiple extra headers should be separated with a CRLF (\r\n).
+      </para>
+      <note>
+       <para>
+        When sending mail, the mail <emphasis>must</emphasis> contain
+        a <literal>From</literal> header. This can be set with the 
+        <parameter>additional_headers</parameter> parameter, or a default
+        can be set in &php.ini;.
+       </para>
+       <para>
+        Failing to do this will result in an error
+        message similar to <literal>Warning: mail(): "sendmail_from" not
+        set in php.ini or custom "From:" header missing</literal>.
+        The <literal>From</literal> header sets also
+        <literal>Return-Path</literal> under Windows.
+       </para>
+      </note>
+      <note>
+       <para>
+        If messages are not received, try using a LF (\n) only.
+        Some Unix mail transfer agents (most notably
+        <link xlink:href="&url.qmail;">qmail</link>) replace LF by CRLF
+        automatically (which leads to doubling CR if CRLF is used).
+        This should be a last resort, as it does not comply with
+        <link xlink:href="&url.rfc;2822">RFC 2822</link>.
+       </para>
+      </note>
      </listitem>
     </varlistentry>
     <varlistentry>