Repair residual sillinesses from UUNET virtual host/socket path patch.

I hope all the dust has settled out now ...

4 files changed, 23 insertions, 23 deletions

diff --git a/doc/src/sgml/ref/pg_dump.sgml b/doc/src/sgml/ref/pg_dump.sgml
index 925e5c72cf8..465043a9a41 100644
--- a/doc/src/sgml/ref/pg_dump.sgml
+++ b/doc/src/sgml/ref/pg_dump.sgml
@@ -1,5 +1,5 @@
 <!--
-$Header: /cvsroot/pgsql/doc/src/sgml/ref/pg_dump.sgml,v 1.25 2000/11/22 01:41:13 momjian Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/ref/pg_dump.sgml,v 1.26 2000/11/30 23:20:50 tgl Exp $
 Postgres documentation
 -->
 
@@ -371,8 +371,9 @@ pg_dump [ -h <replaceable class="parameter">host</replaceable> ]
      <varlistentry>
       <term><computeroutput>
 Connection to database 'template1' failed.
-connectDB() failed: Is the postmaster running and accepting connections
-            at 'UNIX Socket' on port '<replaceable class="parameter">port</replaceable>'?
+connectDBStart() -- connect() failed: No such file or directory
+        Is the postmaster running locally
+        and accepting connections on Unix socket '/tmp/.s.PGSQL.5432'?
        </computeroutput></term>
       <listitem>
        <para>
diff --git a/doc/src/sgml/ref/pg_dumpall.sgml b/doc/src/sgml/ref/pg_dumpall.sgml
index 907dcbb3b2d..ac61de92b96 100644
--- a/doc/src/sgml/ref/pg_dumpall.sgml
+++ b/doc/src/sgml/ref/pg_dumpall.sgml
@@ -1,5 +1,5 @@
 <!--
-$Header: /cvsroot/pgsql/doc/src/sgml/ref/pg_dumpall.sgml,v 1.15 2000/11/22 01:41:13 momjian Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/ref/pg_dumpall.sgml,v 1.16 2000/11/30 23:20:50 tgl Exp $
 Postgres documentation
 -->
 
@@ -192,7 +192,9 @@ pg_dumpall [ -h <replaceable class="parameter">host</replaceable> ] [ -p <replac
      <varlistentry>
       <term><computeroutput>
 Connection to database 'template1' failed.
-connectDB() failed: Is the postmaster running and accepting connections at 'UNIX Socket' on port '<replaceable class="parameter">port</replaceable>'?
+connectDBStart() -- connect() failed: No such file or directory
+        Is the postmaster running locally
+        and accepting connections on Unix socket '/tmp/.s.PGSQL.5432'?
        </computeroutput></term>
       <listitem>
        <para>
diff --git a/doc/src/sgml/ref/pg_restore.sgml b/doc/src/sgml/ref/pg_restore.sgml
index 8af8226d948..f04a6a62c89 100644
--- a/doc/src/sgml/ref/pg_restore.sgml
+++ b/doc/src/sgml/ref/pg_restore.sgml
@@ -345,8 +345,9 @@ pg_restore [ <replaceable class="parameter">archive-file</replaceable>  ]
      <varlistentry>
       <term><computeroutput>
 Connection to database 'template1' failed.
-connectDB() failed: Is the postmaster running and accepting connections
-            at 'UNIX Socket' on port '<replaceable class="parameter">port</replaceable>'?
+connectDBStart() -- connect() failed: No such file or directory
+        Is the postmaster running locally
+        and accepting connections on Unix socket '/tmp/.s.PGSQL.5432'?
        </computeroutput></term>
       <listitem>
        <para>
diff --git a/doc/src/sgml/ref/postmaster.sgml b/doc/src/sgml/ref/postmaster.sgml
index 5bf5e4cb92b..8168ada6f4e 100644
--- a/doc/src/sgml/ref/postmaster.sgml
+++ b/doc/src/sgml/ref/postmaster.sgml
@@ -1,11 +1,11 @@
 <!--
-$Header: /cvsroot/pgsql/doc/src/sgml/ref/postmaster.sgml,v 1.17 2000/11/28 23:27:54 tgl Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/ref/postmaster.sgml,v 1.18 2000/11/30 23:20:50 tgl Exp $
 Postgres documentation
 -->
 
 <refentry id="APP-POSTMASTER">
  <docinfo>
-  <date>2000-11-12</date>
+  <date>2000-11-30</date>
  </docinfo>
 
  <refmeta>
@@ -30,7 +30,7 @@ Postgres documentation
    <arg>-F</arg>
    <arg>-h <replaceable>hostname</replaceable></arg>
    <arg>-i</arg>
-   <arg>-k <replaceable>filename</replaceable></arg>
+   <arg>-k <replaceable>directory</replaceable></arg>
    <arg>-l</arg>
    <arg>-N <replaceable>max-connections</replaceable></arg>
    <arg>-o <replaceable>extra-options</replaceable></arg>
@@ -70,10 +70,10 @@ Postgres documentation
    starts it needs to know the location of the database cluster files
    (<quote>data area</quote>).  This is done with the
    <option>-D</option> invocation option or the <envar>PGDATA</envar>
-   environment variable, there is no default.  More than one
+   environment variable; there is no default.  More than one
    postmaster process can run on a system at one time, as long as they
-   use different data areas and different port numbers (see below).  A
-   data area is created with <xref linkend="app-initdb"
+   use different data areas and different communication ports (see below).
+   A data area is created with <xref linkend="app-initdb"
    endterm="app-initdb-title">.
   </para>
 
@@ -165,10 +165,8 @@ Postgres documentation
        <para>
 	Specifies the TCP/IP hostname or address on which the
 	<application>postmaster</application> is to listen for
-	connections from client applications.  Defaults to the value
-	of the <envar>PGHOST</envar> environment variable, or if
-	<envar>PGHOST</envar> is not set, it defaults to listening on
-	all configured addresses (including localhost).
+	connections from client applications.  Defaults to
+	listening on all configured addresses (including localhost).
        </para>
       </listitem>
      </varlistentry>
@@ -185,15 +183,13 @@ Postgres documentation
      </varlistentry>
 
      <varlistentry>
-      <term>-k <replaceable class="parameter">filename</replaceable></term>
+      <term>-k <replaceable class="parameter">directoryname</replaceable></term>
       <listitem>
        <para>
-	Specifies the directory for Unix domain socket on which the
+	Specifies the directory of the Unix-domain socket on which the
 	<application>postmaster</application> is to listen for
-	connections from client applications.  Defaults to the value
-	of the <envar>PGUNIXSOCKET</envar> environment variable, or if
-	<envar>PGUNIXSOCKET</envar> is not set, then defaults to a
-	file in <filename>/tmp</filename>.
+	connections from client applications.  The default is normally
+	<filename>/tmp</filename>, but can be changed at build time.
        </para>
       </listitem>
      </varlistentry>