From b41f54c7e08ea5b241fec9ebaf8217968c0d55f1 Mon Sep 17 00:00:00 2001
From: Jakub Vrana <vrana@php.net>
Date: Tue, 23 Nov 2004 09:38:18 +0000
Subject: [PATCH] Replace invalid characters in <parameter>

git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@173352 c90b9560-bf6c-de11-be94-00142212c4b1
---
 .../apd/functions/apd-set-socket-session-trace.xml   |  4 ++--
 reference/com/functions/class.dotnet.xml             |  4 ++--
 reference/cpdf/functions/cpdf-arc.xml                |  8 ++++----
 reference/cpdf/functions/cpdf-circle.xml             |  8 ++++----
 reference/cpdf/functions/cpdf-import-jpeg.xml        | 12 ++++++------
 reference/cpdf/functions/cpdf-lineto.xml             |  8 ++++----
 reference/cpdf/functions/cpdf-moveto.xml             | 10 +++++-----
 reference/cpdf/functions/cpdf-place-inline-image.xml | 10 +++++-----
 reference/cpdf/functions/cpdf-rect.xml               |  8 ++++----
 reference/cpdf/functions/cpdf-rlineto.xml            |  8 ++++----
 reference/cpdf/functions/cpdf-rmoveto.xml            | 10 +++++-----
 reference/cpdf/functions/cpdf-scale.xml              |  6 +++---
 reference/cpdf/functions/cpdf-set-text-pos.xml       |  6 +++---
 reference/cpdf/functions/cpdf-show-xy.xml            |  8 ++++----
 reference/cpdf/functions/cpdf-text.xml               |  8 ++++----
 reference/cpdf/functions/cpdf-translate.xml          | 10 +++++-----
 reference/mbstring/functions/mb-convert-encoding.xml | 12 ++++++------
 .../mbstring/functions/mb-convert-variables.xml      | 12 ++++++------
 reference/mbstring/functions/mb-detect-order.xml     | 10 +++++-----
 .../mbstring/functions/mb-encode-mimeheader.xml      |  6 +++---
 reference/oci8/functions/ocierror.xml                |  6 +++---
 reference/pdf/functions/pdf-open-image.xml           |  4 ++--
 reference/pdf/functions/pdf-scale.xml                |  6 +++---
 .../stream/functions/stream-context-get-options.xml  |  4 ++--
 .../stream/functions/stream-context-set-option.xml   |  4 ++--
 .../stream/functions/stream-context-set-params.xml   |  4 ++--
 reference/strings/functions/echo.xml                 |  4 ++--
 27 files changed, 100 insertions(+), 100 deletions(-)

diff --git a/reference/apd/functions/apd-set-socket-session-trace.xml b/reference/apd/functions/apd-set-socket-session-trace.xml
index 68c5654bf3..fd5435d55d 100644
--- a/reference/apd/functions/apd-set-socket-session-trace.xml
+++ b/reference/apd/functions/apd-set-socket-session-trace.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.2 $ -->
+<!-- $Revision: 1.3 $ -->
 <!-- splitted from ./en/functions/apd.xml, last change in rev 1.4 -->
   <refentry id="function.apd-set-socket-session-trace">
    <refnamediv>
@@ -10,7 +10,7 @@
     <title>Description</title>
      <methodsynopsis>
       <type>bool</type><methodname>apd_set_socket_session_trace</methodname>
-      <methodparam><type>string</type><parameter>(ip_address or unix socket file)</parameter></methodparam>
+      <methodparam><type>string</type><parameter>ip_address_or_unix_socket_file</parameter></methodparam>
       <methodparam><type>int</type><parameter>socket_type</parameter></methodparam>
       <methodparam><type>int</type><parameter>port</parameter></methodparam>
       <methodparam><type>int</type><parameter>debug_level</parameter></methodparam>
diff --git a/reference/com/functions/class.dotnet.xml b/reference/com/functions/class.dotnet.xml
index 891ae5c983..e06c2745f8 100644
--- a/reference/com/functions/class.dotnet.xml
+++ b/reference/com/functions/class.dotnet.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.1 $ -->
+<!-- $Revision: 1.2 $ -->
  <refentry id="class.dotnet">
   <refnamediv>
    <refname>DOTNET</refname>
@@ -19,7 +19,7 @@
    <title>Methods</title>
     <methodsynopsis>
      <type>string</type><methodname>DOTNET::DOTNET</methodname>
-     <methodparam><type>string</type><parameter>assembly name</parameter></methodparam>
+     <methodparam><type>string</type><parameter>assembly_name</parameter></methodparam>
      <methodparam><type>string</type><parameter>class_name</parameter></methodparam>
      <methodparam choice="opt"><type>int</type><parameter>codepage</parameter></methodparam>
     </methodsynopsis>
diff --git a/reference/cpdf/functions/cpdf-arc.xml b/reference/cpdf/functions/cpdf-arc.xml
index 57a9c1e5d1..e7a0257455 100644
--- a/reference/cpdf/functions/cpdf-arc.xml
+++ b/reference/cpdf/functions/cpdf-arc.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.4 $ -->
+<!-- $Revision: 1.5 $ -->
 <!-- splitted from ./en/functions/cpdf.xml, last change in rev 1.2 -->
   <refentry id="function.cpdf-arc">
    <refnamediv>
@@ -11,8 +11,8 @@
      <methodsynopsis>
       <type>bool</type><methodname>cpdf_arc</methodname>
       <methodparam><type>int</type><parameter>pdf_document</parameter></methodparam>
-      <methodparam><type>float</type><parameter>x-coor</parameter></methodparam>
-      <methodparam><type>float</type><parameter>y-coor</parameter></methodparam>
+      <methodparam><type>float</type><parameter>x_coor</parameter></methodparam>
+      <methodparam><type>float</type><parameter>y_coor</parameter></methodparam>
       <methodparam><type>float</type><parameter>radius</parameter></methodparam>
       <methodparam><type>float</type><parameter>start</parameter></methodparam>
       <methodparam><type>float</type><parameter>end</parameter></methodparam>
@@ -21,7 +21,7 @@
     <para>
      The <function>cpdf_arc</function> function draws an arc with
      center at point 
-     (<parameter>x-coor</parameter>, <parameter>y-coor</parameter>)
+     (<parameter>x_coor</parameter>, <parameter>y_coor</parameter>)
      and radius <parameter>radius</parameter>, starting at angle
      <parameter>start</parameter> and ending at angle
      <parameter>end</parameter>. &return.success;
diff --git a/reference/cpdf/functions/cpdf-circle.xml b/reference/cpdf/functions/cpdf-circle.xml
index 82e357cfeb..4a9372abe7 100644
--- a/reference/cpdf/functions/cpdf-circle.xml
+++ b/reference/cpdf/functions/cpdf-circle.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.4 $ -->
+<!-- $Revision: 1.5 $ -->
 <!-- splitted from ./en/functions/cpdf.xml, last change in rev 1.2 -->
   <refentry id="function.cpdf-circle">
    <refnamediv>
@@ -11,15 +11,15 @@
      <methodsynopsis>
       <type>bool</type><methodname>cpdf_circle</methodname>
       <methodparam><type>int</type><parameter>pdf_document</parameter></methodparam>
-      <methodparam><type>float</type><parameter>x-coor</parameter></methodparam>
-      <methodparam><type>float</type><parameter>y-coor</parameter></methodparam>
+      <methodparam><type>float</type><parameter>x_coor</parameter></methodparam>
+      <methodparam><type>float</type><parameter>y_coor</parameter></methodparam>
       <methodparam><type>float</type><parameter>radius</parameter></methodparam>
       <methodparam choice="opt"><type>int</type><parameter>mode</parameter></methodparam>
      </methodsynopsis>
     <para>
      The <function>cpdf_circle</function> function draws a circle with
      center at point 
-     (<parameter>x-coor</parameter>, <parameter>y-coor</parameter>)
+     (<parameter>x_coor</parameter>, <parameter>y_coor</parameter>)
      and radius <parameter>radius</parameter>. &return.success;
     </para>
 
diff --git a/reference/cpdf/functions/cpdf-import-jpeg.xml b/reference/cpdf/functions/cpdf-import-jpeg.xml
index fee845d080..7ed588b7eb 100644
--- a/reference/cpdf/functions/cpdf-import-jpeg.xml
+++ b/reference/cpdf/functions/cpdf-import-jpeg.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.7 $ -->
+<!-- $Revision: 1.8 $ -->
 <!-- splitted from ./en/functions/cpdf.xml, last change in rev 1.2 -->
   <refentry id="function.cpdf-import-jpeg">
    <refnamediv>
@@ -12,13 +12,13 @@
       <type>int</type><methodname>cpdf_import_jpeg</methodname>
       <methodparam><type>int</type><parameter>pdf_document</parameter></methodparam>
       <methodparam><type>string</type><parameter>file_name</parameter></methodparam>
-      <methodparam><type>float</type><parameter>x-coor</parameter></methodparam>
-      <methodparam><type>float</type><parameter>y-coor</parameter></methodparam>
+      <methodparam><type>float</type><parameter>x_coor</parameter></methodparam>
+      <methodparam><type>float</type><parameter>y_coor</parameter></methodparam>
       <methodparam><type>float</type><parameter>angle</parameter></methodparam>
       <methodparam><type>float</type><parameter>width</parameter></methodparam>
       <methodparam><type>float</type><parameter>height</parameter></methodparam>
-      <methodparam><type>float</type><parameter>x-scale</parameter></methodparam>
-      <methodparam><type>float</type><parameter>y-scale</parameter></methodparam>
+      <methodparam><type>float</type><parameter>x_scale</parameter></methodparam>
+      <methodparam><type>float</type><parameter>y_scale</parameter></methodparam>
       <methodparam><type>int</type><parameter>gsave</parameter></methodparam>
       <methodparam choice="opt"><type>int</type><parameter>mode</parameter></methodparam>
      </methodsynopsis>
@@ -27,7 +27,7 @@
      stored in the file with the name <parameter>file_name</parameter>.
      The format of the image has to be jpeg. The
      image is placed on the current page at position
-     (<parameter>x-coor</parameter>, <parameter>y-coor</parameter>).
+     (<parameter>x_coor</parameter>, <parameter>y_coor</parameter>).
      The image is rotated by <parameter>angle</parameter> degrees.
      <parameter>gsave</parameter> should be non-zero to allow this
      function to operate correctly.
diff --git a/reference/cpdf/functions/cpdf-lineto.xml b/reference/cpdf/functions/cpdf-lineto.xml
index 3f73844bce..ced147eff2 100644
--- a/reference/cpdf/functions/cpdf-lineto.xml
+++ b/reference/cpdf/functions/cpdf-lineto.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.4 $ -->
+<!-- $Revision: 1.5 $ -->
 <!-- splitted from ./en/functions/cpdf.xml, last change in rev 1.2 -->
   <refentry id="function.cpdf-lineto">
    <refnamediv>
@@ -11,14 +11,14 @@
      <methodsynopsis>
       <type>bool</type><methodname>cpdf_lineto</methodname>
       <methodparam><type>int</type><parameter>pdf_document</parameter></methodparam>
-      <methodparam><type>float</type><parameter>x-coor</parameter></methodparam>
-      <methodparam><type>float</type><parameter>y-coor</parameter></methodparam>
+      <methodparam><type>float</type><parameter>x_coor</parameter></methodparam>
+      <methodparam><type>float</type><parameter>y_coor</parameter></methodparam>
       <methodparam choice="opt"><type>int</type><parameter>mode</parameter></methodparam>
      </methodsynopsis>
     <para>
      The <function>cpdf_lineto</function> function draws a line from
      the current point to the point with coordinates
-     (<parameter>x-coor</parameter>, <parameter>y-coor</parameter>).
+     (<parameter>x_coor</parameter>, <parameter>y_coor</parameter>).
      &return.success;
     </para>
 
diff --git a/reference/cpdf/functions/cpdf-moveto.xml b/reference/cpdf/functions/cpdf-moveto.xml
index 8f4f501244..570e999bde 100644
--- a/reference/cpdf/functions/cpdf-moveto.xml
+++ b/reference/cpdf/functions/cpdf-moveto.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.4 $ -->
+<!-- $Revision: 1.5 $ -->
 <!-- splitted from ./en/functions/cpdf.xml, last change in rev 1.2 -->
   <refentry id="function.cpdf-moveto">
    <refnamediv>
@@ -11,14 +11,14 @@
      <methodsynopsis>
       <type>bool</type><methodname>cpdf_moveto</methodname>
       <methodparam><type>int</type><parameter>pdf_document</parameter></methodparam>
-      <methodparam><type>float</type><parameter>x-coor</parameter></methodparam>
-      <methodparam><type>float</type><parameter>y-coor</parameter></methodparam>
+      <methodparam><type>float</type><parameter>x_coor</parameter></methodparam>
+      <methodparam><type>float</type><parameter>y_coor</parameter></methodparam>
       <methodparam choice="opt"><type>int</type><parameter>mode</parameter></methodparam>
      </methodsynopsis>
     <para>
      The <function>cpdf_moveto</function> function set the current
-     point to the coordinates <parameter>x-coor</parameter> and
-     <parameter>y-coor</parameter>. &return.success;
+     point to the coordinates <parameter>x_coor</parameter> and
+     <parameter>y_coor</parameter>. &return.success;
     </para>
 
     &cpdf.ul;
diff --git a/reference/cpdf/functions/cpdf-place-inline-image.xml b/reference/cpdf/functions/cpdf-place-inline-image.xml
index ca2c1b826e..1b6088dfa2 100644
--- a/reference/cpdf/functions/cpdf-place-inline-image.xml
+++ b/reference/cpdf/functions/cpdf-place-inline-image.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.6 $ -->
+<!-- $Revision: 1.7 $ -->
 <!-- splitted from ./en/functions/cpdf.xml, last change in rev 1.2 -->
   <refentry id="function.cpdf-place-inline-image">
    <refnamediv>
@@ -12,8 +12,8 @@
       <type>bool</type><methodname>cpdf_place_inline_image</methodname>
       <methodparam><type>int</type><parameter>pdf_document</parameter></methodparam>
       <methodparam><type>int</type><parameter>image</parameter></methodparam>
-      <methodparam><type>float</type><parameter>x-coor</parameter></methodparam>
-      <methodparam><type>float</type><parameter>y-coor</parameter></methodparam>
+      <methodparam><type>float</type><parameter>x_coor</parameter></methodparam>
+      <methodparam><type>float</type><parameter>y_coor</parameter></methodparam>
       <methodparam><type>float</type><parameter>angle</parameter></methodparam>
       <methodparam><type>float</type><parameter>width</parameter></methodparam>
       <methodparam><type>float</type><parameter>height</parameter></methodparam>
@@ -23,8 +23,8 @@
     <para>
      The <function>cpdf_place_inline_image</function> function places
      an image created with the PHP image functions on the page at
-     position (<parameter>x-coor</parameter>,
-     <parameter>y-coor</parameter>). The image can be scaled at the
+     position (<parameter>x_coor</parameter>,
+     <parameter>y_coor</parameter>). The image can be scaled at the
      same time. &return.success;
     </para>
 
diff --git a/reference/cpdf/functions/cpdf-rect.xml b/reference/cpdf/functions/cpdf-rect.xml
index 40b35c0fbb..81491a0808 100644
--- a/reference/cpdf/functions/cpdf-rect.xml
+++ b/reference/cpdf/functions/cpdf-rect.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.4 $ -->
+<!-- $Revision: 1.5 $ -->
 <!-- splitted from ./en/functions/cpdf.xml, last change in rev 1.2 -->
   <refentry id="function.cpdf-rect">
    <refnamediv>
@@ -11,8 +11,8 @@
      <methodsynopsis>
       <type>bool</type><methodname>cpdf_rect</methodname>
       <methodparam><type>int</type><parameter>pdf_document</parameter></methodparam>
-      <methodparam><type>float</type><parameter>x-coor</parameter></methodparam>
-      <methodparam><type>float</type><parameter>y-coor</parameter></methodparam>
+      <methodparam><type>float</type><parameter>x_coor</parameter></methodparam>
+      <methodparam><type>float</type><parameter>y_coor</parameter></methodparam>
       <methodparam><type>float</type><parameter>width</parameter></methodparam>
       <methodparam><type>float</type><parameter>height</parameter></methodparam>
       <methodparam choice="opt"><type>int</type><parameter>mode</parameter></methodparam>
@@ -20,7 +20,7 @@
     <para>
      The <function>cpdf_rect</function> function draws a rectangle with
      its lower left corner at point 
-     (<parameter>x-coor</parameter>, <parameter>y-coor</parameter>).
+     (<parameter>x_coor</parameter>, <parameter>y_coor</parameter>).
      This width is set to <parameter>width</parameter>.
      This height is set to <parameter>height</parameter>. &return.success;
     </para>
diff --git a/reference/cpdf/functions/cpdf-rlineto.xml b/reference/cpdf/functions/cpdf-rlineto.xml
index 91cc72ff12..8341b02185 100644
--- a/reference/cpdf/functions/cpdf-rlineto.xml
+++ b/reference/cpdf/functions/cpdf-rlineto.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.4 $ -->
+<!-- $Revision: 1.5 $ -->
 <!-- splitted from ./en/functions/cpdf.xml, last change in rev 1.2 -->
   <refentry id="function.cpdf-rlineto">
    <refnamediv>
@@ -11,14 +11,14 @@
      <methodsynopsis>
       <type>bool</type><methodname>cpdf_rlineto</methodname>
       <methodparam><type>int</type><parameter>pdf_document</parameter></methodparam>
-      <methodparam><type>float</type><parameter>x-coor</parameter></methodparam>
-      <methodparam><type>float</type><parameter>y-coor</parameter></methodparam>
+      <methodparam><type>float</type><parameter>x_coor</parameter></methodparam>
+      <methodparam><type>float</type><parameter>y_coor</parameter></methodparam>
       <methodparam choice="opt"><type>int</type><parameter>mode</parameter></methodparam>
      </methodsynopsis>
     <para>
      The <function>cpdf_rlineto</function> function draws a line from
      the current point to the relative point with coordinates
-     (<parameter>x-coor</parameter>, <parameter>y-coor</parameter>).
+     (<parameter>x_coor</parameter>, <parameter>y_coor</parameter>).
      &return.success;
     </para>
 
diff --git a/reference/cpdf/functions/cpdf-rmoveto.xml b/reference/cpdf/functions/cpdf-rmoveto.xml
index 286c58a347..9f482fe998 100644
--- a/reference/cpdf/functions/cpdf-rmoveto.xml
+++ b/reference/cpdf/functions/cpdf-rmoveto.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.4 $ -->
+<!-- $Revision: 1.5 $ -->
 <!-- splitted from ./en/functions/cpdf.xml, last change in rev 1.2 -->
   <refentry id="function.cpdf-rmoveto">
    <refnamediv>
@@ -11,14 +11,14 @@
      <methodsynopsis>
       <type>bool</type><methodname>cpdf_rmoveto</methodname>
       <methodparam><type>int</type><parameter>pdf_document</parameter></methodparam>
-      <methodparam><type>float</type><parameter>x-coor</parameter></methodparam>
-      <methodparam><type>float</type><parameter>y-coor</parameter></methodparam>
+      <methodparam><type>float</type><parameter>x_coor</parameter></methodparam>
+      <methodparam><type>float</type><parameter>y_coor</parameter></methodparam>
       <methodparam choice="opt"><type>int</type><parameter>mode</parameter></methodparam>
      </methodsynopsis>
     <para>
      The <function>cpdf_rmoveto</function> function set the current point
-     relative to the coordinates <parameter>x-coor</parameter> and
-     <parameter>y-coor</parameter>. &return.success;
+     relative to the coordinates <parameter>x_coor</parameter> and
+     <parameter>y_coor</parameter>. &return.success;
     </para>
 
     &cpdf.ul;
diff --git a/reference/cpdf/functions/cpdf-scale.xml b/reference/cpdf/functions/cpdf-scale.xml
index fa6889c6b4..fae1d0fb70 100644
--- a/reference/cpdf/functions/cpdf-scale.xml
+++ b/reference/cpdf/functions/cpdf-scale.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.4 $ -->
+<!-- $Revision: 1.5 $ -->
 <!-- splitted from ./en/functions/cpdf.xml, last change in rev 1.2 -->
   <refentry id="function.cpdf-scale">
    <refnamediv>
@@ -11,8 +11,8 @@
      <methodsynopsis>
       <type>bool</type><methodname>cpdf_scale</methodname>
       <methodparam><type>int</type><parameter>pdf_document</parameter></methodparam>
-      <methodparam><type>float</type><parameter>x-scale</parameter></methodparam>
-      <methodparam><type>float</type><parameter>y-scale</parameter></methodparam>
+      <methodparam><type>float</type><parameter>x_scale</parameter></methodparam>
+      <methodparam><type>float</type><parameter>y_scale</parameter></methodparam>
      </methodsynopsis>
     <para>
      The <function>cpdf_scale</function> function set the scaling factor
diff --git a/reference/cpdf/functions/cpdf-set-text-pos.xml b/reference/cpdf/functions/cpdf-set-text-pos.xml
index 8635a9042b..5abc7bbf31 100644
--- a/reference/cpdf/functions/cpdf-set-text-pos.xml
+++ b/reference/cpdf/functions/cpdf-set-text-pos.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.4 $ -->
+<!-- $Revision: 1.5 $ -->
 <!-- splitted from ./en/functions/cpdf.xml, last change in rev 1.2 -->
   <refentry id="function.cpdf-set-text-pos">
    <refnamediv>
@@ -11,8 +11,8 @@
      <methodsynopsis>
       <type>bool</type><methodname>cpdf_set_text_pos</methodname>
       <methodparam><type>int</type><parameter>pdf_document</parameter></methodparam>
-      <methodparam><type>float</type><parameter>x-coor</parameter></methodparam>
-      <methodparam><type>float</type><parameter>y-coor</parameter></methodparam>
+      <methodparam><type>float</type><parameter>x_coor</parameter></methodparam>
+      <methodparam><type>float</type><parameter>y_coor</parameter></methodparam>
       <methodparam choice="opt"><type>int</type><parameter>mode</parameter></methodparam>
      </methodsynopsis>
     <para>
diff --git a/reference/cpdf/functions/cpdf-show-xy.xml b/reference/cpdf/functions/cpdf-show-xy.xml
index 5270491be2..12ede2509a 100644
--- a/reference/cpdf/functions/cpdf-show-xy.xml
+++ b/reference/cpdf/functions/cpdf-show-xy.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.4 $ -->
+<!-- $Revision: 1.5 $ -->
 <!-- splitted from ./en/functions/cpdf.xml, last change in rev 1.2 -->
   <refentry id="function.cpdf-show-xy">
    <refnamediv>
@@ -12,14 +12,14 @@
       <type>bool</type><methodname>cpdf_show_xy</methodname>
       <methodparam><type>int</type><parameter>pdf_document</parameter></methodparam>
       <methodparam><type>string</type><parameter>text</parameter></methodparam>
-      <methodparam><type>float</type><parameter>x-coor</parameter></methodparam>
-      <methodparam><type>float</type><parameter>y-coor</parameter></methodparam>
+      <methodparam><type>float</type><parameter>x_coor</parameter></methodparam>
+      <methodparam><type>float</type><parameter>y_coor</parameter></methodparam>
       <methodparam choice="opt"><type>int</type><parameter>mode</parameter></methodparam>
      </methodsynopsis>
     <para>
      The <function>cpdf_show_xy</function> function outputs the
      string <parameter>text</parameter> at position with coordinates
-     (<parameter>x-coor</parameter>, <parameter>y-coor</parameter>).
+     (<parameter>x_coor</parameter>, <parameter>y_coor</parameter>).
      &return.success;
     </para>
 
diff --git a/reference/cpdf/functions/cpdf-text.xml b/reference/cpdf/functions/cpdf-text.xml
index e3a1e7ecb6..b25fb4c938 100644
--- a/reference/cpdf/functions/cpdf-text.xml
+++ b/reference/cpdf/functions/cpdf-text.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.5 $ -->
+<!-- $Revision: 1.6 $ -->
 <!-- splitted from ./en/functions/cpdf.xml, last change in rev 1.2 -->
   <refentry id="function.cpdf-text">
    <refnamediv>
@@ -12,8 +12,8 @@
       <type>bool</type><methodname>cpdf_text</methodname>
       <methodparam><type>int</type><parameter>pdf_document</parameter></methodparam>
       <methodparam><type>string</type><parameter>text</parameter></methodparam>
-      <methodparam choice="opt"><type>float</type><parameter>x-coor</parameter></methodparam>
-      <methodparam><type>float</type><parameter>y-coor</parameter></methodparam>
+      <methodparam choice="opt"><type>float</type><parameter>x_coor</parameter></methodparam>
+      <methodparam><type>float</type><parameter>y_coor</parameter></methodparam>
       <methodparam choice="opt"><type>int</type><parameter>mode</parameter></methodparam>
       <methodparam choice="opt"><type>float</type><parameter>orientation</parameter></methodparam>
       <methodparam choice="opt"><type>int</type><parameter>alignmode</parameter></methodparam>
@@ -21,7 +21,7 @@
     <para>
      The <function>cpdf_text</function> function outputs the string
      <parameter>text</parameter> at position with coordinates
-     (<parameter>x-coor</parameter>, <parameter>y-coor</parameter>).
+     (<parameter>x_coor</parameter>, <parameter>y_coor</parameter>).
      &return.success;
     </para>
 
diff --git a/reference/cpdf/functions/cpdf-translate.xml b/reference/cpdf/functions/cpdf-translate.xml
index 086157bc93..5c91553daa 100644
--- a/reference/cpdf/functions/cpdf-translate.xml
+++ b/reference/cpdf/functions/cpdf-translate.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.5 $ -->
+<!-- $Revision: 1.6 $ -->
 <!-- splitted from ./en/functions/cpdf.xml, last change in rev 1.35 -->
   <refentry id="function.cpdf-translate">
    <refnamediv>
@@ -11,13 +11,13 @@
      <methodsynopsis>
       <type>bool</type><methodname>cpdf_translate</methodname>
       <methodparam><type>int</type><parameter>pdf_document</parameter></methodparam>
-      <methodparam><type>float</type><parameter>x-coor</parameter></methodparam>
-      <methodparam><type>float</type><parameter>y-coor</parameter></methodparam>
+      <methodparam><type>float</type><parameter>x_coor</parameter></methodparam>
+      <methodparam><type>float</type><parameter>y_coor</parameter></methodparam>
      </methodsynopsis>
     <para>
      The <function>cpdf_translate</function> function set the origin of
-     coordinate system to the point (<parameter>x-coor</parameter>,
-     <parameter>y-coor</parameter>). &return.success;
+     coordinate system to the point (<parameter>x_coor</parameter>,
+     <parameter>y_coor</parameter>). &return.success;
     </para>
 
     &cpdf.ul;
diff --git a/reference/mbstring/functions/mb-convert-encoding.xml b/reference/mbstring/functions/mb-convert-encoding.xml
index feb32d2186..fb8ad07866 100644
--- a/reference/mbstring/functions/mb-convert-encoding.xml
+++ b/reference/mbstring/functions/mb-convert-encoding.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.3 $ -->
+<!-- $Revision: 1.4 $ -->
 <!-- splitted from ./en/functions/mbstring.xml, last change in rev 1.1 -->
   <refentry id="function.mb-convert-encoding">
    <refnamediv>
@@ -11,20 +11,20 @@
      <methodsynopsis>
       <type>string</type><methodname>mb_convert_encoding</methodname>
       <methodparam><type>string</type><parameter>str</parameter></methodparam>
-      <methodparam><type>string</type><parameter>to-encoding</parameter></methodparam>
-      <methodparam choice="opt"><type>mixed</type><parameter>from-encoding</parameter></methodparam>
+      <methodparam><type>string</type><parameter>to_encoding</parameter></methodparam>
+      <methodparam choice="opt"><type>mixed</type><parameter>from_encoding</parameter></methodparam>
      </methodsynopsis>
     <para>
      <function>mb_convert_encoding</function> converts 
      character encoding of string <parameter>str</parameter> from
-     <parameter>from-encoding</parameter> to
-     <parameter>to-encoding</parameter>.
+     <parameter>from_encoding</parameter> to
+     <parameter>to_encoding</parameter>.
     </para>
     <para>
      <parameter>str</parameter> : String to be converted.
     </para>
     <para>
-     <parameter>from-encoding</parameter> is specified by character
+     <parameter>from_encoding</parameter> is specified by character
      code name before conversion. it can be array or string - comma
      separated  enumerated list. If it is not specified, the internal
      encoding will be used.
diff --git a/reference/mbstring/functions/mb-convert-variables.xml b/reference/mbstring/functions/mb-convert-variables.xml
index 70e97f4b3f..9b6b463276 100644
--- a/reference/mbstring/functions/mb-convert-variables.xml
+++ b/reference/mbstring/functions/mb-convert-variables.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.6 $ -->
+<!-- $Revision: 1.7 $ -->
 <!-- splitted from ./en/functions/mbstring.xml, last change in rev 1.1 -->
   <refentry id="function.mb-convert-variables">
    <refnamediv>
@@ -10,16 +10,16 @@
     <title>Description</title>
      <methodsynopsis>
       <type>string</type><methodname>mb_convert_variables</methodname>
-      <methodparam><type>string</type><parameter>to-encoding</parameter></methodparam>
-      <methodparam><type>mixed</type><parameter>from-encoding</parameter></methodparam>
+      <methodparam><type>string</type><parameter>to_encoding</parameter></methodparam>
+      <methodparam><type>mixed</type><parameter>from_encoding</parameter></methodparam>
       <methodparam><type>mixed</type><parameter role="reference">vars</parameter></methodparam>
       <methodparam choice="opt"><type>mixed</type><parameter role="reference">...</parameter></methodparam>
      </methodsynopsis>
     <para>
      <function>mb_convert_variables</function> convert 
      character encoding of variables <parameter>vars</parameter> in
-     encoding <parameter>from-encoding</parameter> to encoding 
-     <parameter>to-encoding</parameter>. It returns character encoding
+     encoding <parameter>from_encoding</parameter> to encoding 
+     <parameter>to_encoding</parameter>. It returns character encoding
      before conversion for success, &false; for failure.
     </para>
     <para>
@@ -29,7 +29,7 @@
      encoding in single array or object.
     </para>
     <para>
-     It <parameter>from-encoding</parameter> is specified by 
+     It <parameter>from_encoding</parameter> is specified by 
      array or comma separated string, it tries to detect encoding from
      <parameter>from-coding</parameter>. When
      <parameter>encoding</parameter> is omitted,
diff --git a/reference/mbstring/functions/mb-detect-order.xml b/reference/mbstring/functions/mb-detect-order.xml
index 9726690a43..2e52768bf6 100644
--- a/reference/mbstring/functions/mb-detect-order.xml
+++ b/reference/mbstring/functions/mb-detect-order.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.4 $ -->
+<!-- $Revision: 1.5 $ -->
 <!-- splitted from ./en/functions/mbstring.xml, last change in rev 1.1 -->
   <refentry id="function.mb-detect-order">
    <refnamediv>
@@ -12,21 +12,21 @@
     <title>Description</title>
      <methodsynopsis>
       <type>array</type><methodname>mb_detect_order</methodname>
-      <methodparam choice="opt"><type>mixed</type><parameter>encoding-list</parameter></methodparam>
+      <methodparam choice="opt"><type>mixed</type><parameter>encoding_list</parameter></methodparam>
      </methodsynopsis>
     <para>
      <function>mb_detect_order</function> sets automatic character
-     encoding detection order to <parameter>encoding-list</parameter>.
+     encoding detection order to <parameter>encoding_list</parameter>.
      It returns &true; for success,
      &false; for failure.
     </para>
     <para>
-     <parameter>encoding-list</parameter> is array or comma separated
+     <parameter>encoding_list</parameter> is array or comma separated
      list of character encoding. ("auto" is expanded to
      "ASCII, JIS, UTF-8, EUC-JP, SJIS")
     </para>
     <para>
-     If <parameter>encoding-list</parameter> is omitted, it returns
+     If <parameter>encoding_list</parameter> is omitted, it returns
      current character encoding detection order as array.
     </para>
     <para>
diff --git a/reference/mbstring/functions/mb-encode-mimeheader.xml b/reference/mbstring/functions/mb-encode-mimeheader.xml
index 4f86993f81..9f0cc3adae 100644
--- a/reference/mbstring/functions/mb-encode-mimeheader.xml
+++ b/reference/mbstring/functions/mb-encode-mimeheader.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.5 $ -->
+<!-- $Revision: 1.6 $ -->
 <!-- splitted from ./en/functions/mbstring.xml, last change in rev 1.1 -->
   <refentry id="function.mb-encode-mimeheader">
    <refnamediv>
@@ -12,7 +12,7 @@
       <type>string</type><methodname>mb_encode_mimeheader</methodname>
       <methodparam><type>string</type><parameter>str</parameter></methodparam>
       <methodparam choice="opt"><type>string</type><parameter>charset</parameter></methodparam>
-      <methodparam choice="opt"><type>string</type><parameter>transfer-encoding</parameter></methodparam>
+      <methodparam choice="opt"><type>string</type><parameter>transfer_encoding</parameter></methodparam>
       <methodparam choice="opt"><type>string</type><parameter>linefeed</parameter></methodparam>
      </methodsynopsis>
     <para>
@@ -26,7 +26,7 @@
      is determined by the current NLS setting (<literal>mbstring.language</literal>).
     </para>
     <para>
-     <parameter>transfer-encoding</parameter> specifies the scheme of MIME
+     <parameter>transfer_encoding</parameter> specifies the scheme of MIME
      encoding. It should be either <literal>"B"</literal> (Base64) or
      <literal>"Q"</literal> (Quoted-Printable). Falls back to
      <literal>"B"</literal> if not given.
diff --git a/reference/oci8/functions/ocierror.xml b/reference/oci8/functions/ocierror.xml
index 99bd13c3c2..71ac3503ad 100644
--- a/reference/oci8/functions/ocierror.xml
+++ b/reference/oci8/functions/ocierror.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.10 $ -->
+<!-- $Revision: 1.11 $ -->
 <!--
 
 DO NOT TRANSLATE THIS FILE.
@@ -17,11 +17,11 @@ PLEASE, TRANSLATE THE APPROPRIATE NEW FILE.
     <title>Description</title>
      <methodsynopsis>
       <type>array</type><methodname>ocierror</methodname>
-      <methodparam choice="opt"><type>resource</type><parameter>stmt|conn|global</parameter></methodparam>
+      <methodparam choice="opt"><type>resource</type><parameter>stmt_or_conn_or_global</parameter></methodparam>
      </methodsynopsis>
     <simpara>
      <function>ocierror</function> returns the last error found.  If
-     the optional <parameter>stmt|conn|global</parameter> is not
+     the optional <parameter>stmt_or_conn_or_global</parameter> is not
      provided, the last error encountered is returned.  If no error is
      found, <function>ocierror</function> returns
      &false;. <function>ocierror</function> returns the error as an
diff --git a/reference/pdf/functions/pdf-open-image.xml b/reference/pdf/functions/pdf-open-image.xml
index 4980dd9905..6680d6b230 100644
--- a/reference/pdf/functions/pdf-open-image.xml
+++ b/reference/pdf/functions/pdf-open-image.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.4 $ -->
+<!-- $Revision: 1.5 $ -->
 <!-- splitted from ./en/functions/pdf.xml, last change in rev 1.42 -->
   <refentry id="function.pdf-open-image">
    <refnamediv>
@@ -10,7 +10,7 @@
     <title>Description</title>
      <methodsynopsis>
       <type>int</type><methodname>pdf_open_image</methodname>
-      <methodparam><type>resource</type><parameter>PDF-document</parameter></methodparam>
+      <methodparam><type>resource</type><parameter>pdfdoc</parameter></methodparam>
       <methodparam><type>string</type><parameter>imagetype</parameter></methodparam>
       <methodparam><type>string</type><parameter>source</parameter></methodparam>
       <methodparam><type>string</type><parameter>data</parameter></methodparam>
diff --git a/reference/pdf/functions/pdf-scale.xml b/reference/pdf/functions/pdf-scale.xml
index 7967e41198..d14b755dc3 100644
--- a/reference/pdf/functions/pdf-scale.xml
+++ b/reference/pdf/functions/pdf-scale.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.4 $ -->
+<!-- $Revision: 1.5 $ -->
 <!-- splitted from ./en/functions/pdf.xml, last change in rev 1.42 -->
   <refentry id="function.pdf-scale">
    <refnamediv>
@@ -11,8 +11,8 @@
      <methodsynopsis>
       <type>bool</type><methodname>pdf_scale</methodname>
       <methodparam><type>resource</type><parameter>pdfdoc</parameter></methodparam>
-      <methodparam><type>float</type><parameter>x-scale</parameter></methodparam>
-      <methodparam><type>float</type><parameter>y-scale</parameter></methodparam>
+      <methodparam><type>float</type><parameter>x_scale</parameter></methodparam>
+      <methodparam><type>float</type><parameter>y_scale</parameter></methodparam>
      </methodsynopsis>
     <para>
      Scale the coordinate system. &return.success;
diff --git a/reference/stream/functions/stream-context-get-options.xml b/reference/stream/functions/stream-context-get-options.xml
index 356d1f8aee..9d9efa2b36 100644
--- a/reference/stream/functions/stream-context-get-options.xml
+++ b/reference/stream/functions/stream-context-get-options.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.2 $ -->
+<!-- $Revision: 1.3 $ -->
   <refentry id="function.stream-context-get-options">
    <refnamediv>
     <refname>stream_context_get_options</refname>
@@ -9,7 +9,7 @@
     <title>Description</title>
      <methodsynopsis>
       <type>array</type><methodname>stream_context_get_options</methodname>
-      <methodparam><type>resource</type><parameter>stream|context</parameter></methodparam>
+      <methodparam><type>resource</type><parameter>stream_or_context</parameter></methodparam>
      </methodsynopsis>
     <simpara>
      Returns an array of options on the specified stream or context.
diff --git a/reference/stream/functions/stream-context-set-option.xml b/reference/stream/functions/stream-context-set-option.xml
index 1b18263e54..7f8c01177a 100644
--- a/reference/stream/functions/stream-context-set-option.xml
+++ b/reference/stream/functions/stream-context-set-option.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.1 $ -->
+<!-- $Revision: 1.2 $ -->
   <refentry id="function.stream-context-set-option">
    <refnamediv>
     <refname>stream_context_set_option</refname>
@@ -9,7 +9,7 @@
     <title>Description</title>
      <methodsynopsis>
       <type>bool</type><methodname>stream_context_set_option</methodname>
-      <methodparam><type>resource</type><parameter>context|stream</parameter></methodparam>
+      <methodparam><type>resource</type><parameter>stream_or_context</parameter></methodparam>
       <methodparam><type>string</type><parameter>wrapper</parameter></methodparam>
       <methodparam><type>string</type><parameter>option</parameter></methodparam>
       <methodparam><type>mixed</type><parameter>value</parameter></methodparam>
diff --git a/reference/stream/functions/stream-context-set-params.xml b/reference/stream/functions/stream-context-set-params.xml
index 8158fa4995..c2a4baa8e7 100644
--- a/reference/stream/functions/stream-context-set-params.xml
+++ b/reference/stream/functions/stream-context-set-params.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.1 $ -->
+<!-- $Revision: 1.2 $ -->
   <refentry id="function.stream-context-set-params">
    <refnamediv>
     <refname>stream_context_set_params</refname>
@@ -9,7 +9,7 @@
     <title>Description</title>
      <methodsynopsis>
       <type>bool</type><methodname>stream_context_set_params</methodname>
-      <methodparam><type>resource</type><parameter>stream|context</parameter></methodparam>
+      <methodparam><type>resource</type><parameter>stream_or_context</parameter></methodparam>
       <methodparam><type>array</type><parameter>params</parameter></methodparam>
      </methodsynopsis>
     <simpara>
diff --git a/reference/strings/functions/echo.xml b/reference/strings/functions/echo.xml
index 258d439020..3f8e003f8c 100644
--- a/reference/strings/functions/echo.xml
+++ b/reference/strings/functions/echo.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.14 $ -->
+<!-- $Revision: 1.15 $ -->
 <!-- splitted from ./en/functions/strings.xml, last change in rev 1.2 -->
   <refentry id="function.echo">
    <refnamediv>
@@ -11,7 +11,7 @@
      <methodsynopsis>
       <type>void</type><methodname>echo</methodname>
       <methodparam><type>string</type><parameter>arg1</parameter></methodparam>
-      <methodparam choice="opt"><type>string</type><parameter>argn...</parameter></methodparam>
+      <methodparam choice="opt"><type>string</type><parameter>...</parameter></methodparam>
      </methodsynopsis>
     <simpara>
      Outputs all parameters.