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

Brendan Jurd

2 files changed, 7 insertions, 7 deletions

diff --git a/doc/src/FAQ/FAQ.html b/doc/src/FAQ/FAQ.html
index 7a10b56d9c3..cc461f89d56 100644
--- a/doc/src/FAQ/FAQ.html
+++ b/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
-    need to increase the <I>postmaster</I>'s limit on how many
+    <P>You have reached the default limit of 100 database sessions. You
+    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
diff --git a/doc/src/FAQ/FAQ_DEV.html b/doc/src/FAQ/FAQ_DEV.html
index 104e68591dc..76e22142ecb 100644
--- a/doc/src/FAQ/FAQ_DEV.html
+++ b/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>