From fcef2ea0d9dc68d563b85de80d40f6051ffdc6a6 Mon Sep 17 00:00:00 2001
From: Kalle Sommer Nielsen <kalle@php.net>
Date: Thu, 14 Aug 2008 10:08:30 +0000
Subject: [PATCH] Added examples for: * imagedashedline * imagestringup

And added example usage for is_xhtml parameter on nl2br()


git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@264826 c90b9560-bf6c-de11-be94-00142212c4b1
---
 reference/image/figures/dashedline.png        | Bin 0 -> 167 bytes
 reference/image/figures/stringup.png          | Bin 0 -> 379 bytes
 reference/image/functions/imagedashedline.xml |  32 +++++++++++++++++-
 reference/image/functions/imagestringup.xml   |  32 +++++++++++++++++-
 reference/strings/functions/nl2br.xml         |  23 +++++++++++--
 5 files changed, 82 insertions(+), 5 deletions(-)
 create mode 100644 reference/image/figures/dashedline.png
 create mode 100644 reference/image/figures/stringup.png

diff --git a/reference/image/figures/dashedline.png b/reference/image/figures/dashedline.png
new file mode 100644
index 0000000000000000000000000000000000000000..e79594b79871c91d872a66b9610a862a9fbd8943
GIT binary patch
literal 167
zcmeAS@N?(olHy`uVBq!ia0vp^DIm<j1SJ1AFfjwEJWm(Lkcv5PuWjUHFce^R{QUQO
zP2K}x)pQnP(T?5{KA;j1c$@a@Ym5B-*NnbLm=Y$x4)9;o5W$f1Y4fX2Q337--?}i{
zjZ8_58%~~Ir5@&>!(jF^^6L?<4%P!|_N(VbFm8kx!oVcH^{uFgebId-kbtMFpUXO@
GgeCwx#WffJ

literal 0
HcmV?d00001

diff --git a/reference/image/figures/stringup.png b/reference/image/figures/stringup.png
new file mode 100644
index 0000000000000000000000000000000000000000..e0336819efab8904257f5b45ac4b68a8ed71fb7d
GIT binary patch
literal 379
zcmV->0fhdEP)<h;3K|Lk000e1NJLTq003kF003kN0ssI2|9}Dm0003(Nkl<Zc%1Fq
z!3u*g5Jgc_`v1S2E^NidC<Iz^AKtTc6^1usjJhn6BuSE_yDPI7@K$R*UMz*Oywzj&
z0<Lr`s4rWMXvIP&i{?3d0dKSrbx|hhzF4%mu5kQLqzrg|r9dKzMM+i!%6;dUEZ{xS
zWa&RZQExiYHarz^H>6mLg*|UrQIZvba_X>QW(um-YQ6MR{6J9#Jik&P5yhe;D+1+_
z!czy`7%1xew_%huMa(RUrdZ6KgadxS<fvaH2-t=uOSj^Hk2m>Pc}-9$g&C!W$qE#)
zDTT6F`VVHZ9Pk4WTZa@TE5})~vJy9$#gZgRx)a|U4)ED9P{gsa$r=Fq!-AQnJ<t&4
zf6S&p^<#f!;(EG3Y2T`|f17VVb~L|bHveiuxOEsn3He!wY{R~7z%zSLk|arzBuSE_
ZF)#6@t-}V8JcIxM002ovPDHLkV1fWtp|t=2

literal 0
HcmV?d00001

diff --git a/reference/image/functions/imagedashedline.xml b/reference/image/functions/imagedashedline.xml
index 135b1c5cf4..5d73eef29c 100644
--- a/reference/image/functions/imagedashedline.xml
+++ b/reference/image/functions/imagedashedline.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.9 $ -->
+<!-- $Revision: 1.10 $ -->
 <refentry xml:id="function.imagedashedline" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>imagedashedline</refname>
@@ -77,6 +77,36 @@
    Always returns true
   </para>
  </refsect1>
+ <refsect1 role="examples">
+  &reftitle.examples;
+  <para>
+   <example>
+    <title><function>imagedashedline</function> example</title>
+    <programlisting role="php">
+<![CDATA[
+<?php
+// Create a 100x100 image
+$im = imagecreatetruecolor(100, 100);
+$white = imagecolorallocate($im, 0xFF, 0xFF, 0xFF);
+
+// Draw a vertical dashed line
+imagedashedline($im, 50, 25, 50, 75, $white);
+
+// Save the image
+imagepng($im, './dashedline.png');
+imagedestroy($im);
+?>
+]]>
+    </programlisting>
+    &example.outputs.similar;
+    <mediaobject>
+     <imageobject>
+      <imagedata fileref="figures/image.dashedline.png"/>
+     </imageobject>
+    </mediaobject>
+   </example>
+  </para>
+ </refsect1>
  <refsect1 role="seealso">
   &reftitle.seealso;
   <para>
diff --git a/reference/image/functions/imagestringup.xml b/reference/image/functions/imagestringup.xml
index 500927eb81..fd12b9fefe 100644
--- a/reference/image/functions/imagestringup.xml
+++ b/reference/image/functions/imagestringup.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.9 $ -->
+<!-- $Revision: 1.10 $ -->
 <refentry xml:id="function.imagestringup" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>imagestringup</refname>
@@ -69,6 +69,36 @@
    &return.success;
   </para>
  </refsect1>
+ <refsect1 role="examples">
+  &reftitle.examples;
+  <para>
+   <example>
+    <title><function>imagestring</function> example</title>
+    <programlisting role="php">
+<![CDATA[
+<?php
+// create a 100*100 image
+$im = imagecreatetruecolor(100, 100);
+
+// Write the text
+$textcolor = imagecolorallocate($im, 0xFF, 0xFF, 0xFF);
+imagestringup($im, 3, 40, 80, 'gd library', $textcolor);
+
+// Save the image
+imagepng($im, './stringup.png');
+imagedestroy($im);
+?>
+]]>
+    </programlisting>
+    &example.outputs.similar;
+    <mediaobject>
+     <imageobject>
+      <imagedata fileref="figures/image.imagestringup.png"/>
+     </imageobject>
+    </mediaobject>
+   </example>
+  </para>
+ </refsect1>
  <refsect1 role="seealso">
   &reftitle.seealso;
   <para>
diff --git a/reference/strings/functions/nl2br.xml b/reference/strings/functions/nl2br.xml
index 7fed5b8c8c..d4b8ff7940 100644
--- a/reference/strings/functions/nl2br.xml
+++ b/reference/strings/functions/nl2br.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.8 $ -->
+<!-- $Revision: 1.9 $ -->
 <refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.nl2br">
  <refnamediv>
   <refname>nl2br</refname>
@@ -14,8 +14,8 @@
    <methodparam><type>bool</type><parameter>is_xhtml</parameter></methodparam>
   </methodsynopsis>
   <para>
-   Returns <parameter>string</parameter> with '&lt;br /&gt;' inserted
-   before all newlines.
+   Returns <parameter>string</parameter> with '&lt;br /&gt;' or 
+   '&lt;br&gt;' inserted before all newlines.
   </para>
  </refsect1>
 
@@ -67,6 +67,23 @@ echo nl2br("foo isn't\n bar");
 <![CDATA[
 foo isn't<br />
  bar
+]]>
+    </screen>
+   </example>
+   <example>
+    <title>Generating valid HTML markup using the <parameter>is_xhtml</parameter></title>
+    <programlisting role="php">
+<![CDATA[
+<?php
+echo nl2br("Welcome\r\nThis is my HTML document", false);
+?>
+]]>
+    </programlisting>
+    &example.outputs;
+    <screen>
+<![CDATA[
+Welcome<br>
+This is my HTML document
 ]]>
     </screen>
    </example>