Use Unicode characters and UTF-8 encoding.

git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@278175 c90b9560-bf6c-de11-be94-00142212c4b1
2026-03-23 23:32:18 +01:00 · 2009-04-02 12:58:06 +00:00
parent d71304cb7c
commit 8ac9109e3d
27 changed files with 89 additions and 89 deletions
--- a/appendices/history.xml
+++ b/appendices/history.xml
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.29 $ -->
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- $Revision: 1.30 $ -->

 <appendix xml:id="history" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
 <title>History of PHP and related projects</title>
@@ -297,7 +297,7 @@
  </para>
  <para>
    To the best of our knowledge, the first book dedicated to PHP was
-    'PHP - tvorba interaktivních internetových aplikací' - a Czech
+    'PHP - tvorba interaktivních internetových aplikací' - a Czech
    book published in April 1999, authored by Jirka Kosek. Next month
    followed a German book authored by Egon Schmid, Christian Cartus
    and Richard Blume. The first book in English about PHP was
--- a/bookinfo.xml
+++ b/bookinfo.xml
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.58 $ -->
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- $Revision: 1.59 $ -->

 <info xmlns="http://docbook.org/ns/docbook" xml:id="bookinfo">
  &frontpage.authors;
--- a/language/variables.xml
+++ b/language/variables.xml
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.107 $ -->
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- $Revision: 1.108 $ -->
 <chapter xml:id="language.variables" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <title>Variables</title>
  
@@ -51,7 +51,7 @@ echo "$var, $Var";      // outputs "Bob, Joe"

 $4site = 'not yet';     // invalid; starts with a number
 $_4site = 'not yet';    // valid; starts with an underscore
-$täyte = 'mansikka';    // valid; 'ä' is (Extended) ASCII 228.
+$täyte = 'mansikka';    // valid; 'ä' is (Extended) ASCII 228.
 ?>
 ]]>
     </programlisting>
@@ -868,7 +868,7 @@ if ($_POST) {
    <select multiple name="beer[]">
        <option value="warthog">Warthog</option>
        <option value="guinness">Guinness</option>
-        <option value="stuttgarter">Stuttgarter Schwabenbräu</option>
+        <option value="stuttgarter">Stuttgarter Schwabenbräu</option>
    </select><br />
    <input type="submit" value="submit me!" />
 </form>
--- a/reference/calendar/functions/frenchtojd.xml
+++ b/reference/calendar/functions/frenchtojd.xml
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.7 $ -->
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- $Revision: 1.8 $ -->
 <refentry xml:id="function.frenchtojd" xmlns="http://docbook.org/ns/docbook">
 <refnamediv>
  <refname>FrenchToJD</refname>
--- a/reference/fdf/functions/fdf-add-doc-javascript.xml
+++ b/reference/fdf/functions/fdf-add-doc-javascript.xml
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.6 $ -->
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- $Revision: 1.7 $ -->
 <refentry xml:id='function.fdf-add-doc-javascript' xmlns="http://docbook.org/ns/docbook">
 <refnamediv>
  <refname>fdf_add_doc_javascript</refname>
@@ -81,7 +81,7 @@ fdf_save($fdf);
    <screen>
 <![CDATA[
 %FDF-1.2
-%âãÏÓ
+%âãÏÓ
 1 0 obj
 <<
 /FDF << /JavaScript << /Doc [ (PlusOne)(function PlusOne\(x\)\r{\r  return x+1;\r}\r)] >> >>
--- a/reference/fdf/functions/fdf-save-string.xml
+++ b/reference/fdf/functions/fdf-save-string.xml
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.5 $ -->
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- $Revision: 1.6 $ -->
 <refentry xml:id="function.fdf-save-string" xmlns="http://docbook.org/ns/docbook">
 <refnamediv>
  <refname>fdf_save_string</refname>
@@ -61,7 +61,7 @@ echo $str;
    <screen>
 <![CDATA[
 %FDF-1.2
-%âãÏÓ
+%âãÏÓ
 1 0 obj
 <<
 /FDF << /Fields 2 0 R >>
--- a/reference/i18n/functions/locale_set_default.xml
+++ b/reference/i18n/functions/locale_set_default.xml
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.2 $ -->
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- $Revision: 1.3 $ -->
 <refentry xml:id="function.locale-set-default" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
 <refnamediv>
  <refname>locale_set_default</refname>
@@ -59,7 +59,7 @@
 $array = array(
    'caramelo',
    'cacto',
-    'caçada'
+    'caçada'
 );

 // set our locale (Portuguese, in this case)
@@ -77,7 +77,7 @@ print_r($array);
 <![CDATA[
 Array
 (
-    [0] => caçada
+    [0] => caçada
    [1] => cacto
    [2] => caramelo
 )
@@ -93,7 +93,7 @@ Array
 (
    [0] => cacto
    [1] => caramelo
-    [2] => caçada
+    [2] => caçada
 )
 ]]>
    </screen>
--- a/reference/iconv/configure.xml
+++ b/reference/iconv/configure.xml
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.7 $ -->
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- $Revision: 1.8 $ -->
 <section xml:id="iconv.installation" xmlns="http://docbook.org/ns/docbook">
 &reftitle.install;
 <para>
--- a/reference/iconv/functions/iconv-mime-decode-headers.xml
+++ b/reference/iconv/functions/iconv-mime-decode-headers.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='iso-8859-1'?>
-<!-- $Revision: 1.17 $ -->
+<?xml version='1.0' encoding='UTF-8'?>
+<!-- $Revision: 1.18 $ -->
 <refentry xml:id="function.iconv-mime-decode-headers" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
 <refnamediv>
  <refname>iconv_mime_decode_headers</refname>
@@ -139,7 +139,7 @@ print_r($headers);
 <![CDATA[
 Array
 (
-    [Subject] => Pr<EFBFBD>fung Pr<EFBFBD>fung
+    [Subject] => Prüfung Prüfung
    [To] => example@example.com
    [Date] => Thu, 1 Jan 1970 00:00:00 +0000
    [Message-Id] => <example@example.com>
--- a/reference/iconv/functions/iconv-mime-decode.xml
+++ b/reference/iconv/functions/iconv-mime-decode.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='iso-8859-1'?>
-<!-- $Revision: 1.12 $ -->
+<?xml version='1.0' encoding='UTF-8'?>
+<!-- $Revision: 1.13 $ -->
 <refentry xml:id="function.iconv-mime-decode" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
 <refnamediv>
  <refname>iconv_mime_decode</refname>
@@ -107,7 +107,7 @@
    <programlisting role="php">
 <![CDATA[
 <?php
-// This yields "Subject: Prüfung Prüfung"
+// This yields "Subject: Prüfung Prüfung"
 echo iconv_mime_decode("Subject: =?UTF-8?B?UHLDvGZ1bmcgUHLDvGZ1bmc=?=",
                       0, "ISO-8859-1");
 ?>
--- a/reference/iconv/functions/iconv-mime-encode.xml
+++ b/reference/iconv/functions/iconv-mime-encode.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='iso-8859-1'?>
-<!-- $Revision: 1.16 $ -->
+<?xml version='1.0' encoding='UTF-8'?>
+<!-- $Revision: 1.17 $ -->
 <refentry xml:id="function.iconv-mime-encode" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
 <refnamediv>
  <refname>iconv_mime_encode</refname>
@@ -173,11 +173,11 @@ $preferences = array(
 );
 $preferences["scheme"] = "Q";
 // This yields "Subject: =?UTF-8?Q?Pr=C3=BCfung_Pr=C3=BCfung?="
-echo iconv_mime_encode("Subject", "Prüfung Prüfung", $preferences);
+echo iconv_mime_encode("Subject", "Prüfung Prüfung", $preferences);

 $preferences["scheme"] = "B";
 // This yields "Subject: =?UTF-8?B?UHLDvGZ1bmcgUHLDvGZ1bmc=?="
-echo iconv_mime_encode("Subject", "Prüfung Prüfung", $preferences);
+echo iconv_mime_encode("Subject", "Prüfung Prüfung", $preferences);
 ?>
 ]]>
    </programlisting>
--- a/reference/id3/functions/id3-get-tag.xml
+++ b/reference/id3/functions/id3-get-tag.xml
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.6 $ -->
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- $Revision: 1.7 $ -->
 <refentry xml:id="function.id3-get-tag" xmlns="http://docbook.org/ns/docbook">
 <refnamediv>
  <refname>id3_get_tag</refname>
@@ -108,7 +108,7 @@ Array
 (
    [copyright] => Dirty Mac
    [originalArtist] => Dirty Mac
-    [composer] => Marcus Götze
+    [composer] => Marcus Götze
    [artist] => Dirty Mac
    [title] => Little Big Man
    [album] => Demo-Tape
--- a/reference/imap/functions/imap-mime-header-decode.xml
+++ b/reference/imap/functions/imap-mime-header-decode.xml
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.12 $ -->
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- $Revision: 1.13 $ -->
 <refentry xml:id="function.imap-mime-header-decode" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
 <refnamediv>
  <refname>imap_mime_header_decode</refname>
@@ -66,7 +66,7 @@ for ($i=0; $i<count($elements); $i++) {
    <screen>
 <![CDATA[
 Charset: ISO-8859-1
-Text: Keld Jørn Simonsen
+Text: Keld Jørn Simonsen

 Charset: default
 Text:  <keld@example.com>
--- a/reference/mbstring/encodings.xml
+++ b/reference/mbstring/encodings.xml
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.6 $ -->
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- $Revision: 1.7 $ -->
 <chapter xml:id="mbstring.encodings" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <title>Summaries of supported encodings</title>
  <segmentedlist>
--- a/reference/mysqli/summary.xml
+++ b/reference/mysqli/summary.xml
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision: 1.5 $ -->
+<?xml version="1.0" encoding="utf-8"?>
+<!-- $Revision: 1.6 $ -->
 <chapter xml:id="mysqli.summary" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">

 <title>The MySQLi Extension Function Summary</title>
--- a/reference/pdf/functions/pdf-begin-page-ext.xml
+++ b/reference/pdf/functions/pdf-begin-page-ext.xml
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.6 $ -->
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- $Revision: 1.7 $ -->
 <refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.pdf-begin-page-ext">
 <refnamediv>
  <refname>PDF_begin_page_ext</refname>
@@ -32,51 +32,51 @@
     <tbody>
      <row>
       <entry>A0</entry>
-       <entry>2380✗3368</entry>
+       <entry>2380 x 3368</entry>
      </row>
      <row>
       <entry>A1</entry>
-       <entry>1684✗2380</entry>
+       <entry>1684 x 2380</entry>
      </row>
      <row>
       <entry>A2</entry>
-       <entry>1190✗1684</entry>
+       <entry>1190 x 1684</entry>
      </row>
      <row>
       <entry>A3</entry>
-       <entry>842✗1190</entry>
+       <entry>842 x 1190</entry>
      </row>
      <row>
       <entry>A4</entry>
-       <entry>595✗842</entry>
+       <entry>595 x 842</entry>
      </row>
      <row>
       <entry>A5</entry>
-       <entry>421✗595</entry>
+       <entry>421 x 595</entry>
      </row>
      <row>
       <entry>A6</entry>
-       <entry>297✗421</entry>
+       <entry>297 x 421</entry>
      </row>
      <row>
       <entry>B5</entry>
-       <entry>501✗709</entry>
+       <entry>501 x 709</entry>
      </row>
      <row>
-       <entry>letter (8.5"✗11")</entry>
-       <entry>612✗792</entry>
+       <entry>letter (8.5" x 11")</entry>
+       <entry>612 x 792</entry>
      </row>
      <row>
-       <entry>legal (8.5"✗14")</entry>
-       <entry>612✗1008</entry>
+       <entry>legal (8.5" x 14")</entry>
+       <entry>612 x 1008</entry>
      </row>
      <row>
-       <entry>ledger (17"✗11")</entry>
-       <entry>1224✗792</entry>
+       <entry>ledger (17" x 11")</entry>
+       <entry>1224 x 792</entry>
      </row>
      <row>
-       <entry>11"✗17"</entry>
-       <entry>792✗1224</entry>
+       <entry>11" x 17"</entry>
+       <entry>792 x 1224</entry>
      </row>
     </tbody>
    </tgroup>
--- a/reference/ps/functions/ps-add-bookmark.xml
+++ b/reference/ps/functions/ps-add-bookmark.xml
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.8 $ -->
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- $Revision: 1.9 $ -->
 <!-- splitted from ./en/functions/ps.xml, last change in rev 1.12 -->
 <refentry xml:id="function.ps-add-bookmark" xmlns="http://docbook.org/ns/docbook">
 <refnamediv>
--- a/reference/ps/functions/ps-add-launchlink.xml
+++ b/reference/ps/functions/ps-add-launchlink.xml
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.6 $ -->
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- $Revision: 1.7 $ -->
 <!-- splitted from ./en/functions/ps.xml, last change in rev 1.12 -->
 <refentry xml:id="function.ps-add-launchlink" xmlns="http://docbook.org/ns/docbook">
 <refnamediv>
--- a/reference/ps/functions/ps-add-locallink.xml
+++ b/reference/ps/functions/ps-add-locallink.xml
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.6 $ -->
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- $Revision: 1.7 $ -->
 <!-- splitted from ./en/functions/ps.xml, last change in rev 1.12 -->
 <refentry xml:id="function.ps-add-locallink" xmlns="http://docbook.org/ns/docbook">
 <refnamediv>
--- a/reference/ps/functions/ps-add-note.xml
+++ b/reference/ps/functions/ps-add-note.xml
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.8 $ -->
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- $Revision: 1.9 $ -->
 <!-- splitted from ./en/functions/ps.xml, last change in rev 1.12 -->
 <refentry xml:id="function.ps-add-note" xmlns="http://docbook.org/ns/docbook">
 <refnamediv>
--- a/reference/ps/functions/ps-add-pdflink.xml
+++ b/reference/ps/functions/ps-add-pdflink.xml
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.6 $ -->
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- $Revision: 1.7 $ -->
 <!-- splitted from ./en/functions/ps.xml, last change in rev 1.12 -->
 <refentry xml:id="function.ps-add-pdflink" xmlns="http://docbook.org/ns/docbook">
 <refnamediv>
--- a/reference/ps/functions/ps-add-weblink.xml
+++ b/reference/ps/functions/ps-add-weblink.xml
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.5 $ -->
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- $Revision: 1.6 $ -->
 <!-- splitted from ./en/functions/ps.xml, last change in rev 1.12 -->
 <refentry xml:id="function.ps-add-weblink" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
--- a/reference/ps/functions/ps-curveto.xml
+++ b/reference/ps/functions/ps-curveto.xml
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.3 $ -->
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- $Revision: 1.4 $ -->
 <!-- splitted from ./en/functions/ps.xml, last change in rev 1.12 -->
 <refentry xml:id="function.ps-curveto" xmlns="http://docbook.org/ns/docbook">
 <refnamediv>
@@ -20,7 +20,7 @@
   <methodparam><type>float</type><parameter>y3</parameter></methodparam>
  </methodsynopsis>
  <para>
-   Add a section of a cubic Bézier curve described by the three given control
+   Add a section of a cubic Bézier curve described by the three given control
   points to the current path.
  </para>
 </refsect1>
--- a/reference/strings/functions/get-html-translation-table.xml
+++ b/reference/strings/functions/get-html-translation-table.xml
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.14 $ -->
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- $Revision: 1.15 $ -->
 <refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.get-html-translation-table">
 <refnamediv>
  <refname>get_html_translation_table</refname>
@@ -77,7 +77,7 @@
 <![CDATA[
 <?php
 $trans = get_html_translation_table(HTML_ENTITIES);
-$str = "Hallo & <Frau> & Krämer";
+$str = "Hallo & <Frau> & Krämer";
 $encoded = strtr($str, $trans);

 echo $encoded;
--- a/reference/strings/functions/str-word-count.xml
+++ b/reference/strings/functions/str-word-count.xml
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.9 $ -->
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- $Revision: 1.10 $ -->
 <refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.str-word-count">
 <refnamediv>
  <refname>str_word_count</refname>
@@ -130,7 +130,7 @@ $str = "Hello fri3nd, you're

 print_r(str_word_count($str, 1));
 print_r(str_word_count($str, 2));
-print_r(str_word_count($str, 1, 'àáãç3'));
+print_r(str_word_count($str, 1, 'àáãç3'));

 echo str_word_count($str);

--- a/reference/strings/functions/strtoupper.xml
+++ b/reference/strings/functions/strtoupper.xml
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.9 $ -->
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- $Revision: 1.10 $ -->
 <refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.strtoupper">
 <refnamediv>
  <refname>strtoupper</refname>
@@ -18,7 +18,7 @@
  </para>
  <para>
   Note that 'alphabetic' is determined by the current locale. For instance,
-   in the default "C" locale characters such as umlaut-a (ä) will not be
+   in the default "C" locale characters such as umlaut-a (ä) will not be
   converted.
  </para>
 </refsect1>
--- a/reference/strings/functions/strtr.xml
+++ b/reference/strings/functions/strtr.xml
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.8 $ -->
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- $Revision: 1.9 $ -->
 <refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.strtr" xmlns:xlink="http://www.w3.org/1999/xlink">
 <refnamediv>
  <refname>strtr</refname>
@@ -117,7 +117,7 @@
    <programlisting role="php">
 <![CDATA[
 <?php
-$addr = strtr($addr, "äåö", "aao");
+$addr = strtr($addr, "äåö", "aao");
 ?>
 ]]>
    </programlisting>