From 7d02afd834f58bfd058133405d393541acc3213d Mon Sep 17 00:00:00 2001
From: Rui Hirokawa <hirokawa@php.net>
Date: Thu, 4 Oct 2001 13:00:00 +0000
Subject: [PATCH] fixed some jade errors (deleted some old links.)

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

diff --git a/functions/strings.xml b/functions/strings.xml
index 96026b86ca..010b4c941a 100644
--- a/functions/strings.xml
+++ b/functions/strings.xml
@@ -1,5 +1,5 @@
 <?xml encoding="iso-8859-1"?>
-<!-- $Revision: 1.114 $ -->
+<!-- $Revision: 1.115 $ -->
  <reference id="ref.strings">
   <title>String functions</title>
   <titleabbrev>Strings</titleabbrev>
@@ -838,6 +838,9 @@ $original = strtr($str, $trans);
       <paramdef>int 
        <parameter><optional>quote_style</optional></parameter>
       </paramdef>
+      <paramdef>string 
+       <parameter><optional>charset</optional></parameter>
+      </paramdef>
      </funcprototype>
     </funcsynopsis>
     <para>
@@ -854,8 +857,13 @@ $original = strtr($str, $trans);
      both double and single quotes unconverted.
     </para>
     <para>
-     At present, the ISO-8859-1 character set is used.  Note that the
-     optional second argument was added in PHP 3.0.17 and PHP 4.0.3.
+     At present, the ISO-8859-1 character set is used as default.
+     Note that the optional second argument was added in PHP 3.0.17
+     and PHP 4.0.3.
+    </para>
+    <para>
+     Like <function>htmlspecialchars</function>, it takes an optional
+     third argument which defines character set used in conversion.
     </para>
     <para>
      See also <function>htmlspecialchars</function> and
@@ -880,6 +888,9 @@ $original = strtr($str, $trans);
       <paramdef>int 
        <parameter><optional>quote_style</optional></parameter>
       </paramdef>
+      <paramdef>string 
+       <parameter><optional>charset</optional></parameter>
+      </paramdef>
      </funcprototype>
     </funcsynopsis>
     <para>
@@ -946,6 +957,10 @@ $new = htmlspecialchars("&lt;a href='test'&gt;Test&lt;/a&gt;", ENT_QUOTES);
      <function>htmlentities</function>.  Also note that the optional
      second argument was added in PHP 3.0.17 and PHP 4.0.3.
     </para>
+    <para>
+     The third argument defines character set used in conversion. The
+     default character set is ISO-8859-1.
+    </para>
     <para>
      See also <function>htmlentities</function> and
      <function>nl2br</function>.