From 3b283caf490c13554c6036bf09e6fe70a109a3fb Mon Sep 17 00:00:00 2001
From: Stanislav Malyshev <stas@php.net>
Date: Thu, 2 Jul 2009 00:26:34 +0000
Subject: [PATCH] fix docs for lookup and  filter-matches

git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@283308 c90b9560-bf6c-de11-be94-00142212c4b1
---
 reference/intl/locale/filter-matches.xml |  6 +++---
 reference/intl/locale/lookup.xml         | 21 +++++++++++++++++----
 2 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/reference/intl/locale/filter-matches.xml b/reference/intl/locale/filter-matches.xml
index 0328592026..e0c09dde17 100755
--- a/reference/intl/locale/filter-matches.xml
+++ b/reference/intl/locale/filter-matches.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision: 1.5 $ -->
+<!-- $Revision: 1.6 $ -->
 <refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="locale.filtermatches">
  <refnamediv>
   <refname>Locale::filterMatches</refname>
@@ -18,7 +18,7 @@
    <methodname>Locale::filterMatches</methodname>
    <methodparam><type>string</type><parameter>langtag</parameter></methodparam>
    <methodparam><type>string</type><parameter>locale</parameter></methodparam>
-   <methodparam><type>bool</type><parameter>canonicalize</parameter></methodparam>
+   <methodparam choice="opt"><type>bool</type><parameter>canonicalize</parameter><initializer>false</initializer></methodparam>
   </methodsynopsis>
   <para>
    Procedural style
@@ -28,7 +28,7 @@
    <methodname>locale_filter_matches</methodname>
    <methodparam><type>string</type><parameter>langtag</parameter></methodparam>
    <methodparam><type>string</type><parameter>locale</parameter></methodparam>
-   <methodparam><type>bool</type><parameter>canonicalize</parameter></methodparam>
+   <methodparam choice="opt"><type>bool</type><parameter>canonicalize</parameter><initializer>false</initializer></methodparam>
   </methodsynopsis>
   <para>
    Checks if a $langtag filter matches with $locale according to RFC 4647's
diff --git a/reference/intl/locale/lookup.xml b/reference/intl/locale/lookup.xml
index 4bb6fd93ee..52f963874f 100755
--- a/reference/intl/locale/lookup.xml
+++ b/reference/intl/locale/lookup.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision: 1.2 $ -->
+<!-- $Revision: 1.3 $ -->
 <refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="locale.lookup">
  <refnamediv>
   <refname>Locale::lookup</refname>
@@ -18,7 +18,8 @@
    <methodname>Locale::lookup</methodname>
    <methodparam><type>array</type><parameter>langtag</parameter></methodparam>
    <methodparam><type>string</type><parameter>locale</parameter></methodparam>
-   <methodparam><type>string</type><parameter>default</parameter></methodparam>
+   <methodparam choice="opt"><type>bool</type><parameter>canonicalize</parameter><initializer>false</initializer></methodparam>
+   <methodparam choice="opt"><type>string</type><parameter>default</parameter></methodparam>
   </methodsynopsis>
   <para>
    Procedural style
@@ -28,7 +29,8 @@
    <methodname>locale_lookup</methodname>
    <methodparam><type>array</type><parameter>langtag</parameter></methodparam>
    <methodparam><type>string</type><parameter>locale</parameter></methodparam>
-   <methodparam><type>string</type><parameter>default</parameter></methodparam>
+   <methodparam choice="opt"><type>bool</type><parameter>canonicalize</parameter><initializer>false</initializer></methodparam>
+   <methodparam choice="opt"><type>string</type><parameter>default</parameter></methodparam>
   </methodsynopsis>
   <para>
    Searches the items in <parameter>langtag</parameter> for the best match to 
@@ -58,7 +60,18 @@
       </para>
      </listitem>
     </varlistentry>
-    <varlistentry>
+     <varlistentry>
+       <term>
+         <parameter>canonicalize</parameter>
+       </term>
+       <listitem>
+         <para>
+           If true, the arguments will be converted to canonical form before
+           matching.
+         </para>
+       </listitem>
+     </varlistentry>
+     <varlistentry>
      <term><parameter>default</parameter></term>
      <listitem>
       <para>