Clarify user of "postmaster" vs. "server" in FAQs.

Brendan Jurd

doc/FAQ

@@ -423,10 +423,10 @@
    
   3.5) Why do I get "Sorry, too many clients" when trying to connect?
   
-   You have reached the default limit is 100 database sessions. You need
+   You have reached the default limit of 100 database sessions. You need
-   to increase the postmaster's limit on how many concurrent backend
+   to increase the server's limit on how many concurrent backend
    processes it can start by changing the max_connections value in
-   postgresql.conf and restarting the postmaster.
+   postgresql.conf and restarting the server.
    
   3.6) What is the upgrade process for PostgreSQL?
   
@@ -753,7 +753,7 @@
   
    You probably have run out of virtual memory on your system, or your
    kernel has a low limit for certain resources. Try this before starting
-   postmaster:
+   the server:
     ulimit -d 262144
     limit datasize 256m
 

doc/FAQ_AIX

@@ -3,7 +3,7 @@ Frequently Asked Questions (FAQ) for PostgreSQL
 AIX Specific
 TO BE READ IN CONJUNCTION WITH THE NORMAL FAQ
 =======================================================
-Last updated:        $Date: 2006/12/06 15:45:30 $
+Last updated:        $Date: 2007/10/09 01:28:24 $
 
 Topics
 
@@ -16,7 +16,7 @@ Topics
 -----
 
 From: Zeugswetter Andreas <ZeugswetterA@spardat.at>
-$Date: 2006/12/06 15:45:30 $
+$Date: 2007/10/09 01:28:24 $
 
 On AIX 4.3.2 PostgreSQL compiled with the native IBM compiler xlc
 (vac.C 5.0.1) passes all regression tests.  Other versions of OS and
@@ -301,7 +301,7 @@ The cause of these problems
 ----------------------------
 
 The overall cause of all these problems is the default bittedness and
-memory model used by the postmaster process.
+memory model used by the server process.
 
 By default, all binaries built on AIX are 32-bit.  This does not
 depend upon hardware type or kernel in use.  These 32-bit processes
@@ -327,10 +327,10 @@ but that's not always practical.  Systems with 32-bit processors can
 build, but not run, 64-bit binaries.  
 
 If a 32-bit binary is desired, set LDR_CNTRL to "MAXDATA=0xn0000000",
-where 1 <= n <= 8, before starting the postmaster and try different
+where 1 <= n <= 8, before starting the postgres server and try different
 values and postgresql.conf settings to find a configuration that works
 satisfactorily.  This use of LDR_CNTRL tells AIX that you want the
-postmaster to have $MAXDATA bytes set aside for the heap, allocated in
+server to have $MAXDATA bytes set aside for the heap, allocated in
 256MB segments.
 
 When you find a workable configuration, ldedit can be used to modify

doc/FAQ_CYGWIN

@@ -1,7 +1,7 @@
 Installing PostgreSQL on Windows Using Cygwin FAQ
 =================================================
 
-$Date: 2004/10/15 16:18:35 $
+$Date: 2007/10/09 01:28:24 $
 
 PostgreSQL requires the appropriate subset of Cygwin DLLs to be
 installed in order that it functions under Windows.
@@ -30,8 +30,8 @@ adjust these instructions accordingly.
 
     3a.  Start cygserver for shared memory support.  To do this,
          enter the command "/usr/sbin/cygserver &".  This program
-         needs to be running anytime you start the PostgreSQL server
+         needs to be running anytime you start the Postgres server
-         (postmaster) or initialize a database (initdb).
+         or initialize a database (initdb).
 
     3b.  Use the initdb command to create a new database cluster.  An
          example command would be:
@@ -42,18 +42,18 @@ adjust these instructions accordingly.
          directory, will prompt for a superuser password and will
          set the default database encoding to LATIN1.
 
-    3c.  Start up the postmaster.  Use a command similar to the
+    3c.  Start up the Postgres server.  Use a command similar to the
          following:
 
-            postmaster -D /usr/local/pgsql/data
+            postgres -D /usr/local/pgsql/data
 
-         This will start the postmaster, and if successful you will
+         This will start the server, and if successful you will
          see some initial log entries, and an entry "LOG: database
          system is ready".
 
 4.  You are now running a PostgreSQL server on your Windows machine.
 
-5.  It is possible to install cygserver and the postmaster as
+5.  It is possible to install cygserver and the Postgres server as
     Windows NT services.  For information on how to do this, please
     refer to the README document included with Cygwin PostgreSQL.  It
     is installed in the /usr/share/doc/Cygwin directory.

doc/FAQ_DEV

@@ -428,7 +428,7 @@ General Questions
     4. A README.rpm-dist document that tries to adequately document both
        the differences between the RPM build and the WHY of the
        differences, as well as useful RPM environment operations (like,
-       using syslog, upgrading, getting postmaster to start at OS boot,
+       using syslog, upgrading, getting the server to start at OS boot,
        etc);
     5. The spec file that throws it all together. This is not a trivial
        undertaking in a package of this size.
@@ -755,8 +755,8 @@ typedef struct nameData
 (gdb) call print(any_pointer)
     (gdb) call pprint(any_pointer)
 
-   The output appears in the postmaster log file, or on your screen if
+   The output appears in the server log file, or on your screen if
-   you are running a backend directly without a postmaster.
+   you are running a backend directly.
    
   2.4) I just added a field to a structure. What else should I do?
   
@@ -782,7 +782,7 @@ typedef struct nameData
    ereport() is used to send messages to the front-end, and optionally
    terminate the current query being processed. The first parameter is an
    ereport level of DEBUG (levels 1-5), LOG, INFO, NOTICE, ERROR, FATAL,
-   or PANIC. NOTICE prints on the user's terminal and the postmaster
+   or PANIC. NOTICE prints on the user's terminal and to the server
    logs. INFO prints only to the user's terminal and LOG prints only to
    the server logs. (These can be changed from postgresql.conf.) ERROR
    prints in both places, and terminates the current query, never
@@ -811,7 +811,7 @@ typedef struct nameData
    assert()s monitor the progress of the backend and halt the program
    when something unexpected occurs.
    
-   The postmaster has a -d option that allows even more detailed
+   The postgres server has a -d option that allows even more detailed
    information to be reported. The -d option takes a number that
    specifies the debug level. Be warned that high debug level values
    generate large log files.

doc/src/FAQ/FAQ.html

@@ -577,11 +577,11 @@
     <H3 id="item3.5">3.5) Why do I get <I>"Sorry, too many
     clients"</I> when trying to connect?</H3>
 
-    <P>You have reached the default limit is 100 database sessions. You
+    <P>You have reached the default limit of 100 database sessions. You
-    need to increase the <I>postmaster</I>'s limit on how many
+    need to increase the server's limit on how many
     concurrent backend processes it can start by changing the
     <I>max_connections</I> value in <I>postgresql.conf</I> and
-    restarting the <I>postmaster</I>.</P>
+    restarting the server.</P>
 
     <H3 id="item3.6">3.6) What is the upgrade process for PostgreSQL?</H3>
 
@@ -991,7 +991,7 @@ length</TD></TR>
 
     <P>You probably have run out of virtual memory on your system,
     or your kernel has a low limit for certain resources. Try this
-    before starting <I>postmaster</I>:</P>
+    before starting the server:</P>
 <PRE>
     ulimit -d 262144
     limit datasize 256m

doc/src/FAQ/FAQ_DEV.html

@@ -939,7 +939,7 @@
     (gdb) call pprint(any_pointer)
 </CODE>
 </PRE>
-    The output appears in the postmaster log file, or on your screen if
+    The output appears in the server log file, or on your screen if
     you are running a backend directly without a postmaster. 
 
     <H3 id="item2.4">2.4) I just added a field to a structure.
@@ -972,7 +972,7 @@
     parameter is an ereport level of <I>DEBUG</I> (levels 1-5),
     <I>LOG,</I> <I>INFO,</I> <I>NOTICE,</I> <I>ERROR,</I> <I>FATAL,</I>
     or <I>PANIC.</I> <I>NOTICE</I> prints on the user's terminal and
-    the postmaster logs. <I>INFO</I> prints only to the user's terminal
+    to the server logs. <I>INFO</I> prints only to the user's terminal
     and <I>LOG</I> prints only to the server logs. (These can be
     changed from <I>postgresql.conf.</I>) <I>ERROR</I> prints in both
     places, and terminates the current query, never returning from the
@@ -1004,7 +1004,7 @@
     option, many <I>assert()</I>s monitor the progress of the
     backend and halt the program when something unexpected occurs.</P>
 
-    <P>The <I>postmaster</I> has a <I>-d</I> option that allows
+    <P>The postgres server has a <I>-d</I> option that allows
     even more detailed information to be reported. The <I>-d</I>
     option takes a number that specifies the debug level. Be warned
     that high debug level values generate large log files.</P>