From 7fe7a860b8aec72a525559a55cb849a8caddb31b Mon Sep 17 00:00:00 2001
From: "Daniel P. Brown" <danbrown@php.net>
Date: Thu, 23 Jul 2009 03:56:10 +0000
Subject: [PATCH] Addresses Bug #48876, describes optional parameters 3+, and
 includes some grammatical changes.

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

diff --git a/reference/strings/functions/setlocale.xml b/reference/strings/functions/setlocale.xml
index 0dce5e4536..a7c3c9532a 100644
--- a/reference/strings/functions/setlocale.xml
+++ b/reference/strings/functions/setlocale.xml
@@ -105,10 +105,16 @@
      <term><parameter>...</parameter></term>
      <listitem>
       <para>
+       (Optional string or array parameters to try as locale settings until
+       success.)
       </para>
      </listitem>
     </varlistentry>
    </variablelist>
+   <note>
+    On Windows, setlocale(LC_ALL, '') sets the locale names from the
+    system's regional/language settings (accessible via Control Panel).
+   </note>
   </para>
  </refsect1>
 
@@ -223,12 +229,12 @@ echo "Preferred locale for german on this system is '$loc_de'";
   <warning>
    <para>
     The locale information is maintained per process, not per thread. If you
-    are running PHP on a multithreaded server api like IIS or Apache on
-    Windows you may experience sudden changes of locale settings while a
-    script is running although the script itself never called 
-    <function>setlocale</function> itself. This happens due to other scripts
-    running in different threads of the same process at the same time
-    changing the processwide locale using <function>setlocale</function>.
+    are running PHP on a multithreaded server API like IIS or Apache on
+    Windows, you may experience sudden changes in locale settings while a
+    script is running, though the script itself never called 
+    <function>setlocale</function>. This happens due to other scripts
+    running in different threads of the same process at the same time,
+    changing the process-wide locale using <function>setlocale</function>.
    </para>
   </warning>
   <tip>