From 48a4a3cb4c88388f260615dd5238b6b6f627faab Mon Sep 17 00:00:00 2001
From: Jakub Vrana <vrana@php.net>
Date: Mon, 19 Jan 2009 15:13:01 +0000
Subject: [PATCH] Optional connection parameter

git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@273943 c90b9560-bf6c-de11-be94-00142212c4b1
---
 reference/pgsql/functions/pg-escape-bytea.xml        | 8 ++------
 reference/pgsql/functions/pg-escape-string.xml       | 8 ++------
 reference/pgsql/functions/pg-execute.xml             | 9 ++-------
 reference/pgsql/functions/pg-lo-export.xml           | 9 ++-------
 reference/pgsql/functions/pg-lo-import.xml           | 9 ++-------
 reference/pgsql/functions/pg-parameter-status.xml    | 8 ++------
 reference/pgsql/functions/pg-prepare.xml             | 9 ++-------
 reference/pgsql/functions/pg-put-line.xml            | 8 ++------
 reference/pgsql/functions/pg-query-params.xml        | 9 ++-------
 reference/pgsql/functions/pg-query.xml               | 8 ++------
 reference/pgsql/functions/pg-set-client-encoding.xml | 8 ++------
 reference/pgsql/functions/pg-set-error-verbosity.xml | 8 ++------
 12 files changed, 24 insertions(+), 77 deletions(-)

diff --git a/reference/pgsql/functions/pg-escape-bytea.xml b/reference/pgsql/functions/pg-escape-bytea.xml
index 351799309f..6838768242 100644
--- a/reference/pgsql/functions/pg-escape-bytea.xml
+++ b/reference/pgsql/functions/pg-escape-bytea.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.13 $ -->
+<!-- $Revision: 1.14 $ -->
 <!-- splitted from ./en/functions/pgsql.xml, last change in rev 1.61 -->
 <refentry xml:id='function.pg-escape-bytea' xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
@@ -13,11 +13,7 @@
   &reftitle.description;
   <methodsynopsis>
    <type>string</type><methodname>pg_escape_bytea</methodname>
-   <methodparam><type>string</type><parameter>data</parameter></methodparam>
-  </methodsynopsis>
-  <methodsynopsis>
-   <type>string</type><methodname>pg_escape_bytea</methodname>
-   <methodparam><type>resource</type><parameter>connection</parameter></methodparam>
+   <methodparam choice="opt"><type>resource</type><parameter>connection</parameter></methodparam>
    <methodparam><type>string</type><parameter>data</parameter></methodparam>
   </methodsynopsis>
   <para>
diff --git a/reference/pgsql/functions/pg-escape-string.xml b/reference/pgsql/functions/pg-escape-string.xml
index dd5466f042..e998be0355 100644
--- a/reference/pgsql/functions/pg-escape-string.xml
+++ b/reference/pgsql/functions/pg-escape-string.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.10 $ -->
+<!-- $Revision: 1.11 $ -->
 <!-- splitted from ./en/functions/pgsql.xml, last change in rev 1.61 -->
 <refentry xml:id='function.pg-escape-string' xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
@@ -13,11 +13,7 @@
   &reftitle.description;
   <methodsynopsis>
    <type>string</type><methodname>pg_escape_string</methodname>
-   <methodparam><type>resource</type><parameter>connection</parameter></methodparam>
-   <methodparam><type>string</type><parameter>data</parameter></methodparam>
-  </methodsynopsis>
-  <methodsynopsis>
-   <type>string</type><methodname>pg_escape_string</methodname>
+   <methodparam choice="opt"><type>resource</type><parameter>connection</parameter></methodparam>
    <methodparam><type>string</type><parameter>data</parameter></methodparam>
   </methodsynopsis>
   <para>
diff --git a/reference/pgsql/functions/pg-execute.xml b/reference/pgsql/functions/pg-execute.xml
index e2a36a313f..d8df73afba 100644
--- a/reference/pgsql/functions/pg-execute.xml
+++ b/reference/pgsql/functions/pg-execute.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.6 $ -->
+<!-- $Revision: 1.7 $ -->
 <!-- splitted from ./en/functions/pgsql.xml, last change in rev 1.2 -->
 <refentry xml:id="function.pg-execute" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
@@ -11,12 +11,7 @@
   &reftitle.description;
   <methodsynopsis>
    <type>resource</type><methodname>pg_execute</methodname>
-   <methodparam><type>resource</type><parameter>connection</parameter></methodparam>
-   <methodparam><type>string</type><parameter>stmtname</parameter></methodparam>
-   <methodparam><type>array</type><parameter>params</parameter></methodparam>
-  </methodsynopsis>
-  <methodsynopsis>
-   <type>resource</type><methodname>pg_execute</methodname>
+   <methodparam choice="opt"><type>resource</type><parameter>connection</parameter></methodparam>
    <methodparam><type>string</type><parameter>stmtname</parameter></methodparam>
    <methodparam><type>array</type><parameter>params</parameter></methodparam>
   </methodsynopsis>
diff --git a/reference/pgsql/functions/pg-lo-export.xml b/reference/pgsql/functions/pg-lo-export.xml
index fa0857f0fa..7a5bfa9bad 100644
--- a/reference/pgsql/functions/pg-lo-export.xml
+++ b/reference/pgsql/functions/pg-lo-export.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.9 $ -->
+<!-- $Revision: 1.10 $ -->
 <!-- splitted from ./en/functions/pgsql.xml, last change in rev 1.6 -->
 <refentry xml:id="function.pg-lo-export" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
@@ -11,12 +11,7 @@
   &reftitle.description;
   <methodsynopsis>
    <type>bool</type><methodname>pg_lo_export</methodname>
-   <methodparam><type>resource</type><parameter>connection</parameter></methodparam>
-   <methodparam><type>int</type><parameter>oid</parameter></methodparam>
-   <methodparam><type>string</type><parameter>pathname</parameter></methodparam>
-  </methodsynopsis>
-  <methodsynopsis>
-   <type>bool</type><methodname>pg_lo_export</methodname>
+   <methodparam choice="opt"><type>resource</type><parameter>connection</parameter></methodparam>
    <methodparam><type>int</type><parameter>oid</parameter></methodparam>
    <methodparam><type>string</type><parameter>pathname</parameter></methodparam>
   </methodsynopsis>
diff --git a/reference/pgsql/functions/pg-lo-import.xml b/reference/pgsql/functions/pg-lo-import.xml
index 207d22f0e2..7847f64a17 100644
--- a/reference/pgsql/functions/pg-lo-import.xml
+++ b/reference/pgsql/functions/pg-lo-import.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.12 $ -->
+<!-- $Revision: 1.13 $ -->
 <!-- splitted from ./en/functions/pgsql.xml, last change in rev 1.6 -->
 <refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.pg-lo-import">
  <refnamediv>
@@ -11,12 +11,7 @@
   &reftitle.description;
   <methodsynopsis>
    <type>int</type><methodname>pg_lo_import</methodname>
-   <methodparam><type>resource</type><parameter>connection</parameter></methodparam>
-   <methodparam><type>string</type><parameter>pathname</parameter></methodparam>
-   <methodparam><type>mixed</type><parameter>object_id</parameter></methodparam>
-  </methodsynopsis>
-  <methodsynopsis>
-   <type>int</type><methodname>pg_lo_import</methodname>
+   <methodparam choice="opt"><type>resource</type><parameter>connection</parameter></methodparam>
    <methodparam><type>string</type><parameter>pathname</parameter></methodparam>
    <methodparam><type>mixed</type><parameter>object_id</parameter></methodparam>
   </methodsynopsis>
diff --git a/reference/pgsql/functions/pg-parameter-status.xml b/reference/pgsql/functions/pg-parameter-status.xml
index 3fba11fda0..e2baf10959 100644
--- a/reference/pgsql/functions/pg-parameter-status.xml
+++ b/reference/pgsql/functions/pg-parameter-status.xml
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='iso-8859-1'?>
-<!-- $Revision: 1.10 $ -->
+<!-- $Revision: 1.11 $ -->
 <refentry xml:id="function.pg-parameter-status" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>pg_parameter_status</refname>
@@ -10,11 +10,7 @@
   &reftitle.description;
   <methodsynopsis>
    <type>string</type><methodname>pg_parameter_status</methodname>
-   <methodparam><type>resource</type><parameter>connection</parameter></methodparam>
-   <methodparam><type>string</type><parameter>param_name</parameter></methodparam>
-  </methodsynopsis>
-  <methodsynopsis>
-   <type>string</type><methodname>pg_parameter_status</methodname>
+   <methodparam choice="opt"><type>resource</type><parameter>connection</parameter></methodparam>
    <methodparam><type>string</type><parameter>param_name</parameter></methodparam>
   </methodsynopsis>
   <para>
diff --git a/reference/pgsql/functions/pg-prepare.xml b/reference/pgsql/functions/pg-prepare.xml
index f9a2b3eed4..5ffd23be1e 100644
--- a/reference/pgsql/functions/pg-prepare.xml
+++ b/reference/pgsql/functions/pg-prepare.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.6 $ -->
+<!-- $Revision: 1.7 $ -->
 <!-- splitted from ./en/functions/pgsql.xml, last change in rev 1.2 -->
 <refentry xml:id="function.pg-prepare" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
@@ -12,12 +12,7 @@
   &reftitle.description;
   <methodsynopsis>
    <type>resource</type><methodname>pg_prepare</methodname>
-   <methodparam><type>resource</type><parameter>connection</parameter></methodparam>
-   <methodparam><type>string</type><parameter>stmtname</parameter></methodparam>
-   <methodparam><type>string</type><parameter>query</parameter></methodparam>
-  </methodsynopsis>
-  <methodsynopsis>
-   <type>resource</type><methodname>pg_prepare</methodname>
+   <methodparam choice="opt"><type>resource</type><parameter>connection</parameter></methodparam>
    <methodparam><type>string</type><parameter>stmtname</parameter></methodparam>
    <methodparam><type>string</type><parameter>query</parameter></methodparam>
   </methodsynopsis>
diff --git a/reference/pgsql/functions/pg-put-line.xml b/reference/pgsql/functions/pg-put-line.xml
index fef1bed833..37473743d7 100644
--- a/reference/pgsql/functions/pg-put-line.xml
+++ b/reference/pgsql/functions/pg-put-line.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.9 $ -->
+<!-- $Revision: 1.10 $ -->
 <!-- splitted from ./en/functions/pgsql.xml, last change in rev 1.20 -->
 <refentry xml:id="function.pg-put-line" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
@@ -11,11 +11,7 @@
   &reftitle.description;
   <methodsynopsis>
    <type>bool</type><methodname>pg_put_line</methodname>
-   <methodparam><type>string</type><parameter>data</parameter></methodparam>
-  </methodsynopsis>
-  <methodsynopsis>
-   <type>bool</type><methodname>pg_put_line</methodname>
-   <methodparam><type>resource</type><parameter>connection</parameter></methodparam>
+   <methodparam choice="opt"><type>resource</type><parameter>connection</parameter></methodparam>
    <methodparam><type>string</type><parameter>data</parameter></methodparam>
   </methodsynopsis>
   <para>
diff --git a/reference/pgsql/functions/pg-query-params.xml b/reference/pgsql/functions/pg-query-params.xml
index b82508e63d..8cd42804df 100644
--- a/reference/pgsql/functions/pg-query-params.xml
+++ b/reference/pgsql/functions/pg-query-params.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.6 $ -->
+<!-- $Revision: 1.7 $ -->
 <!-- splitted from ./en/functions/pgsql.xml, last change in rev 1.2 -->
 <refentry xml:id="function.pg-query-params" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
@@ -11,12 +11,7 @@
   &reftitle.description;
   <methodsynopsis>
    <type>resource</type><methodname>pg_query_params</methodname>
-   <methodparam><type>resource</type><parameter>connection</parameter></methodparam>
-   <methodparam><type>string</type><parameter>query</parameter></methodparam>
-   <methodparam><type>array</type><parameter>params</parameter></methodparam>
-  </methodsynopsis>
-  <methodsynopsis>
-   <type>resource</type><methodname>pg_query_params</methodname>
+   <methodparam choice="opt"><type>resource</type><parameter>connection</parameter></methodparam>
    <methodparam><type>string</type><parameter>query</parameter></methodparam>
    <methodparam><type>array</type><parameter>params</parameter></methodparam>
   </methodsynopsis>
diff --git a/reference/pgsql/functions/pg-query.xml b/reference/pgsql/functions/pg-query.xml
index 49dde90833..2963af6dd0 100644
--- a/reference/pgsql/functions/pg-query.xml
+++ b/reference/pgsql/functions/pg-query.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.15 $ -->
+<!-- $Revision: 1.16 $ -->
 <!-- splitted from ./en/functions/pgsql.xml, last change in rev 1.2 -->
 <refentry xml:id="function.pg-query" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
@@ -11,11 +11,7 @@
   &reftitle.description;
   <methodsynopsis>
    <type>resource</type><methodname>pg_query</methodname>
-   <methodparam><type>string</type><parameter>query</parameter></methodparam>
-  </methodsynopsis>
-  <methodsynopsis>
-   <type>resource</type><methodname>pg_query</methodname>
-   <methodparam><type>resource</type><parameter>connection</parameter></methodparam>
+   <methodparam choice="opt"><type>resource</type><parameter>connection</parameter></methodparam>
    <methodparam><type>string</type><parameter>query</parameter></methodparam>
   </methodsynopsis>
   <para>
diff --git a/reference/pgsql/functions/pg-set-client-encoding.xml b/reference/pgsql/functions/pg-set-client-encoding.xml
index eec43e3723..2d5651d42a 100644
--- a/reference/pgsql/functions/pg-set-client-encoding.xml
+++ b/reference/pgsql/functions/pg-set-client-encoding.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.12 $ -->
+<!-- $Revision: 1.13 $ -->
 <!-- splitted from ./en/functions/pgsql.xml, last change in rev 1.16 -->
 <refentry xml:id="function.pg-set-client-encoding" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
@@ -13,11 +13,7 @@
   &reftitle.description;
   <methodsynopsis>
    <type>int</type><methodname>pg_set_client_encoding</methodname>
-   <methodparam><type>string</type><parameter>encoding</parameter></methodparam>
-  </methodsynopsis>
-  <methodsynopsis>
-   <type>int</type><methodname>pg_set_client_encoding</methodname>
-   <methodparam><type>resource</type><parameter>connection</parameter></methodparam>
+   <methodparam choice="opt"><type>resource</type><parameter>connection</parameter></methodparam>
    <methodparam><type>string</type><parameter>encoding</parameter></methodparam>
   </methodsynopsis>
   <para>
diff --git a/reference/pgsql/functions/pg-set-error-verbosity.xml b/reference/pgsql/functions/pg-set-error-verbosity.xml
index 4fcf3bff38..f5504d7abb 100644
--- a/reference/pgsql/functions/pg-set-error-verbosity.xml
+++ b/reference/pgsql/functions/pg-set-error-verbosity.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.7 $ -->
+<!-- $Revision: 1.8 $ -->
 <!-- splitted from ./en/functions/pgsql.xml, last change in rev 1.16 -->
 <refentry xml:id="function.pg-set-error-verbosity" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
@@ -14,11 +14,7 @@
   &reftitle.description;
   <methodsynopsis>
    <type>int</type><methodname>pg_set_error_verbosity</methodname>
-   <methodparam><type>resource</type><parameter>connection</parameter></methodparam>
-   <methodparam><type>int</type><parameter>verbosity</parameter></methodparam>
-  </methodsynopsis>
-  <methodsynopsis>
-   <type>int</type><methodname>pg_set_error_verbosity</methodname>
+   <methodparam choice="opt"><type>resource</type><parameter>connection</parameter></methodparam>
    <methodparam><type>int</type><parameter>verbosity</parameter></methodparam>
   </methodsynopsis>
   <para>