From 20eea253d030d485d2e1a26415515c60db2b4d98 Mon Sep 17 00:00:00 2001
From: Philip Olson <philip@php.net>
Date: Tue, 21 Jan 2003 09:34:17 +0000
Subject: [PATCH] Added note regarding bug #19836;  Fixed a previous notes
 format; Fixed WS in example.

git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@112924 c90b9560-bf6c-de11-be94-00142212c4b1
---
 reference/strings/functions/setlocale.xml | 28 +++++++++++++++--------
 1 file changed, 19 insertions(+), 9 deletions(-)

diff --git a/reference/strings/functions/setlocale.xml b/reference/strings/functions/setlocale.xml
index fd0839458d..61262d3644 100644
--- a/reference/strings/functions/setlocale.xml
+++ b/reference/strings/functions/setlocale.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.5 $ -->
+<!-- $Revision: 1.6 $ -->
 <!-- splitted from ./en/functions/strings.xml, last change in rev 1.2 -->
   <refentry id="function.setlocale">
    <refnamediv>
@@ -75,29 +75,39 @@
      new locale until success. This is usefull if a locale is known under
      different names on different systems or for providing a fallback 
      for a possibly not available locale.
-    <note><simpara>Passing multiple locales is not available before PHP 4.3</simpara></note>
     </para>
+    <note>
+     <simpara>
+      Passing multiple locales is not available before PHP 4.3.0
+     </simpara>
+    </note>
     <para>
      Setlocale returns the new current locale, or &false; if the locale
      functionality is not implemented in the platform, the specified
      locale does not exist or the category name is invalid.
      An invalid category name also causes a warning message.
     </para>
+    <note>
+     <para>
+      The return value of <function>setlocale</function> depends
+      on the system on which PHP is running.
+     </para>
+    </note>
     <para>
      <example>
       <title><function>setlocale</function> Examples</title>
       <programlisting role="php">
 <![CDATA[
 <?php
-    /* Set locale to Dutch */
-    setlocale (LC_ALL, 'nl_NL');
+/* Set locale to Dutch */
+setlocale (LC_ALL, 'nl_NL');
 
-    /* Output: vrijdag 22 december 1978 */
-    echo strftime ("%A %e %B %Y", mktime (0, 0, 0, 12, 22, 1978));
+/* Output: vrijdag 22 december 1978 */
+echo strftime ("%A %e %B %Y", mktime (0, 0, 0, 12, 22, 1978));
 
-    /* try different possible locale names for german */
-    $loc_de = setlocale (LC_ALL, 'de_DE@euro', 'de_DE', 'de', 'ge');
-    echo "Preferred locale for german on this system is '$loc_de'";
+/* try different possible locale names for german as of PHP 4.3.0 */
+$loc_de = setlocale (LC_ALL, 'de_DE@euro', 'de_DE', 'de', 'ge');
+echo "Preferred locale for german on this system is '$loc_de'";
 ?>
 ]]>
       </programlisting>