From bd2c171414f67b7323b1ba5ede5cd46a46e968b4 Mon Sep 17 00:00:00 2001
From: Neil Conway <neilc@samurai.com>
Date: Thu, 1 Feb 2007 04:39:33 +0000
Subject: [PATCH] This patch adds documentation for the long-version parameters
 --username and --password for pg_dump, pg_dumpall and pg_restore, per
 complaint by Michael Schmidt. Patch from Magnus Hagander.

---
 doc/src/sgml/ref/pg_dump.sgml    | 6 ++++--
 doc/src/sgml/ref/pg_dumpall.sgml | 4 ++--
 doc/src/sgml/ref/pg_restore.sgml | 6 ++++--
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/doc/src/sgml/ref/pg_dump.sgml b/doc/src/sgml/ref/pg_dump.sgml
index f71117ad89..5d3a16d7af 100644
--- a/doc/src/sgml/ref/pg_dump.sgml
+++ b/doc/src/sgml/ref/pg_dump.sgml
@@ -1,5 +1,5 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/ref/pg_dump.sgml,v 1.93 2007/01/31 23:26:04 momjian Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/pg_dump.sgml,v 1.94 2007/02/01 04:39:33 neilc Exp $
 PostgreSQL documentation
 -->
 
@@ -644,15 +644,17 @@ PostgreSQL documentation
 
      <varlistentry>
       <term><option>-U <replaceable>username</replaceable></option></term>
+      <term><option>--username=<replaceable class="parameter">username</replaceable></option></term>
       <listitem>
        <para>
-        Connect as the given user
+        Connect as the given user.
        </para>
       </listitem>
      </varlistentry>
 
      <varlistentry>
       <term><option>-W</option></term>
+      <term><option>--password</option></term>
       <listitem>
        <para>
         Force a password prompt.  This should happen automatically if
diff --git a/doc/src/sgml/ref/pg_dumpall.sgml b/doc/src/sgml/ref/pg_dumpall.sgml
index b6d74f1e0d..8dfa773a49 100644
--- a/doc/src/sgml/ref/pg_dumpall.sgml
+++ b/doc/src/sgml/ref/pg_dumpall.sgml
@@ -1,5 +1,5 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/ref/pg_dumpall.sgml,v 1.64 2007/01/31 23:26:04 momjian Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/pg_dumpall.sgml,v 1.65 2007/02/01 04:39:33 neilc Exp $
 PostgreSQL documentation
 -->
 
@@ -374,7 +374,7 @@ PostgreSQL documentation
 
      <varlistentry>
       <term>-W</term>
-	    <term>--password</term>
+      <term>--password</term>
       <listitem>
        <para>
         Force a password prompt.  This should happen automatically if
diff --git a/doc/src/sgml/ref/pg_restore.sgml b/doc/src/sgml/ref/pg_restore.sgml
index a5b2bbadb7..0a3b3d12aa 100644
--- a/doc/src/sgml/ref/pg_restore.sgml
+++ b/doc/src/sgml/ref/pg_restore.sgml
@@ -1,4 +1,4 @@
-<!-- $PostgreSQL: pgsql/doc/src/sgml/ref/pg_restore.sgml,v 1.66 2007/02/01 00:28:19 momjian Exp $ -->
+<!-- $PostgreSQL: pgsql/doc/src/sgml/ref/pg_restore.sgml,v 1.67 2007/02/01 04:39:33 neilc Exp $ -->
 
 <refentry id="APP-PGRESTORE">
  <refmeta>
@@ -454,15 +454,17 @@
 
      <varlistentry>
       <term><option>-U <replaceable>username</replaceable></option></term>
+      <term><option>--username=<replaceable class="parameter">username</replaceable></option></term>
       <listitem>
        <para>
-        Connect as the given user
+        Connect as the given user.
        </para>
       </listitem>
      </varlistentry>
 
      <varlistentry>
       <term><option>-W</option></term>
+      <term><option>--password</option></term>
       <listitem>
        <para>
         Force a password prompt.  This should happen automatically if