From ee4aadc727b2fb4ab710f2a91b30d10af71e202d Mon Sep 17 00:00:00 2001
From: Christopher Kings-Lynne <chriskl@php.net>
Date: Mon, 4 Jul 2005 14:42:12 +0000
Subject: [PATCH] Tweak pg_update() docs.  Complete remaining new format pgsql
 docs. PHEW.

git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@189883 c90b9560-bf6c-de11-be94-00142212c4b1
---
 reference/pgsql/functions/pg-update.xml  |  7 ++-
 reference/pgsql/functions/pg-version.xml | 69 +++++++++++++++++++++++-
 2 files changed, 71 insertions(+), 5 deletions(-)

diff --git a/reference/pgsql/functions/pg-update.xml b/reference/pgsql/functions/pg-update.xml
index 32db2d0648..b56b39465a 100644
--- a/reference/pgsql/functions/pg-update.xml
+++ b/reference/pgsql/functions/pg-update.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.14 $ -->
+<!-- $Revision: 1.15 $ -->
 <!-- splitted from ./en/functions/pgsql.xml, last change in rev 1.80 -->
 <refentry id='function.pg-update'>
  <refnamediv>
@@ -29,7 +29,7 @@
   &warn.experimental.func;
  </refsect1>
 
-<refsect1 role="parameters">
+ <refsect1 role="parameters">
   &reftitle.parameters;
   <para>
    <variablelist>
@@ -45,8 +45,7 @@
      <term><parameter>table_name</parameter></term>
      <listitem>
       <para>
-       Name of the table into which to insert rows.  The table <parameter>table_name</parameter> must at least 
-       have as many columns as <parameter>condition</parameter> has elements.
+       Name of the table into which to update rows.
       </para>
      </listitem>
     </varlistentry>
diff --git a/reference/pgsql/functions/pg-version.xml b/reference/pgsql/functions/pg-version.xml
index 6aaf13cf12..b06f625344 100644
--- a/reference/pgsql/functions/pg-version.xml
+++ b/reference/pgsql/functions/pg-version.xml
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='iso-8859-1'?>
-<!-- $Revision: 1.3 $ -->
+<!-- $Revision: 1.4 $ -->
 <refentry id="function.pg-version">
  <refnamediv>
   <refname>pg_version</refname>
@@ -19,6 +19,73 @@
    and server version. Protocol and server versions are only avaliable if PHP
    was compiled with PostgreSQL 7.4 or later.
   </para>
+  <para>
+   For more detailed server information, use <function>pg_parameter_status</function>.
+  </para>
+ </refsect1>
+
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  <para>
+   <variablelist>
+    <varlistentry>
+     <term><parameter>connection</parameter></term>
+     <listitem>
+      <para>
+       PostgreSQL database connection resource.  When 
+       <parameter>connection</parameter> is not present, the default connection 
+       is used. The default connection is the last connection made by 
+       <function>pg_connect</function> or <function>pg_pconnect</function>.
+      </para>
+     </listitem>
+    </varlistentry>
+   </variablelist>
+  </para>
+ </refsect1>
+
+ <refsect1 role="returnvalues">
+  &reftitle.returnvalues;
+  <para>
+   Returns an array with <literal>client</literal>, <literal>protocol</literal> 
+   and <literal>server_version</literal> keys and values (if available).  Returns
+   &false; on error or invalid connection.
+  </para>
+ </refsect1>
+ 
+ <refsect1 role="examples">
+  &reftitle.examples;
+  <para>
+   <example>
+    <title><function>pg_version</function> example</title>
+    <programlisting role="php">
+<![CDATA[
+<?php
+  $dbconn = pg_connect("host=localhost port=5432 dbname=mary")
+     or die("Could not connect");
+     
+  $v = pg_version($dbconn);
+  
+  echo $v['client'];
+?>
+]]>
+    </programlisting>
+    &example.outputs;
+    <screen>
+<![CDATA[
+7.4
+]]>
+    </screen>
+   </example>
+  </para>
+ </refsect1>
+
+ <refsect1 role="seealso">
+  &reftitle.seealso;
+  <para>
+   <simplelist>
+    <member><function>pg_parameter_status</function></member>
+   </simplelist>
+  </para>
  </refsect1>
 </refentry>