From 0cc8f380b38cee96be9f55b701b23c532ef3fd5a Mon Sep 17 00:00:00 2001
From: Hannes Magnusson <bjori@php.net>
Date: Wed, 27 Apr 2011 08:45:13 +0000
Subject: [PATCH] Fixed bug#54611 one functionality is left out

git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@310543 c90b9560-bf6c-de11-be94-00142212c4b1
---
 reference/strings/functions/nl2br.xml | 25 +++++++++++++++++++++++--
 1 file changed, 23 insertions(+), 2 deletions(-)

diff --git a/reference/strings/functions/nl2br.xml b/reference/strings/functions/nl2br.xml
index 82fe9300ab..ec440aad7d 100644
--- a/reference/strings/functions/nl2br.xml
+++ b/reference/strings/functions/nl2br.xml
@@ -15,7 +15,8 @@
   </methodsynopsis>
   <para>
    Returns <parameter>string</parameter> with '&lt;br /&gt;' or 
-   '&lt;br&gt;' inserted before all newlines.
+   '&lt;br&gt;' inserted before all newlines (<literal>\r\n</literal>,
+   <literal>\n\r</literal>, <literal>\n</literal> and <literal>\r</literal>).
   </para>
  </refsect1>
 
@@ -54,7 +55,7 @@
   &reftitle.examples;
   <para>
    <example>
-    <title>using <function>nl2br</function></title>
+    <title>Using <function>nl2br</function></title>
     <programlisting role="php">
 <![CDATA[
 <?php
@@ -84,6 +85,26 @@ echo nl2br("Welcome\r\nThis is my HTML document", false);
 <![CDATA[
 Welcome<br>
 This is my HTML document
+]]>
+    </screen>
+   </example>
+   <example>
+    <title>Various newline seperators</title>
+    <programlisting role="php">
+<![CDATA[
+<?php
+$string = "This\r\nis\n\ra\nstring\r";
+echo nl2br($string);
+?>
+]]>
+    </programlisting>
+    &example.outputs;
+    <screen>
+<![CDATA[
+This<br />
+is<br />
+a<br />
+string<br />
 ]]>
     </screen>
    </example>