Merge postmaster and postgres command into just postgres. postmaster

symlink is kept for now for compatibility.  To call single-user mode, use
postgres --single.

doc/src/sgml/arch-dev.sgml

-<!-- $PostgreSQL: pgsql/doc/src/sgml/arch-dev.sgml,v 2.26 2006/03/10 19:10:46 momjian Exp $ -->
+<!-- $PostgreSQL: pgsql/doc/src/sgml/arch-dev.sgml,v 2.27 2006/06/18 15:38:35 petere Exp $ -->
 
  <chapter id="overview">
   <title>Overview of PostgreSQL Internals</title>
@@ -124,13 +124,11 @@
     know ahead of time how many connections will be made, we have to
     use a <firstterm>master process</firstterm> that spawns a new
     server process every time a connection is requested. This master
-    process is called <literal>postmaster</literal> and listens at a
+    process is called <literal>postgres</literal> and listens at a
     specified TCP/IP port for incoming connections. Whenever a request
-    for a connection is detected the <literal>postmaster</literal>
-    process spawns a new server process called
-    <literal>postgres</literal>. The server tasks
-    (<literal>postgres</literal> processes) communicate with each
-    other using <firstterm>semaphores</firstterm> and
+    for a connection is detected the <literal>postgres</literal>
+    process spawns a new server process. The server tasks
+    communicate with each other using <firstterm>semaphores</firstterm> and
     <firstterm>shared memory</firstterm> to ensure data integrity
     throughout concurrent data access.
    </para>

doc/src/sgml/backup.sgml

-<!-- $PostgreSQL: pgsql/doc/src/sgml/backup.sgml,v 2.80 2006/04/23 03:39:48 momjian Exp $ -->
+<!-- $PostgreSQL: pgsql/doc/src/sgml/backup.sgml,v 2.81 2006/06/18 15:38:35 petere Exp $ -->
 
 <chapter id="backup">
  <title>Backup and Restore</title>
@@ -296,7 +296,7 @@ tar -cf backup.tar /usr/local/pgsql/data
       (mainly because <command>tar</command> and similar tools do not take an
       atomic snapshot of the state of the file system at a point in
       time). Information about stopping the server can be found in
-      <xref linkend="postmaster-shutdown">.  Needless to say that you
+      <xref linkend="server-shutdown">.  Needless to say that you
       also need to shut down the server before restoring the data.
      </para>
     </listitem>
@@ -778,7 +778,7 @@ SELECT pg_stop_backup();
    </para>
 
    <para>
-    It is also possible to make a backup dump while the postmaster is
+    It is also possible to make a backup dump while the server is
     stopped.  In this case, you obviously cannot use
     <function>pg_start_backup</> or <function>pg_stop_backup</>, and
     you will therefore be left to your own devices to keep track of which
@@ -796,7 +796,7 @@ SELECT pg_stop_backup();
   <orderedlist>
    <listitem>
     <para>
-     Stop the postmaster, if it's running.
+     Stop the server, if it's running.
     </para>
    </listitem>
    <listitem>
@@ -853,9 +853,9 @@ SELECT pg_stop_backup();
    </listitem>
    <listitem>
     <para>
-     Start the postmaster.  The postmaster will go into recovery mode and
+     Start the server.  The server will go into recovery mode and
      proceed to read through the archived WAL files it needs.  Upon completion
-     of the recovery process, the postmaster will rename
+     of the recovery process, the server will rename
      <filename>recovery.conf</> to <filename>recovery.done</> (to prevent
      accidentally re-entering recovery mode in case of a crash later) and then
      commence normal database operations.
@@ -1269,7 +1269,7 @@ mv /usr/local/pgsql /usr/local/pgsql.old
 cd ~/postgresql-&version;
 gmake install
 initdb -D /usr/local/pgsql/data
-postmaster -D /usr/local/pgsql/data
+postgres -D /usr/local/pgsql/data
 psql -f backup postgres
 </programlisting>
 

doc/src/sgml/client-auth.sgml

-<!-- $PostgreSQL: pgsql/doc/src/sgml/client-auth.sgml,v 1.90 2006/06/16 15:16:16 momjian Exp $ -->
+<!-- $PostgreSQL: pgsql/doc/src/sgml/client-auth.sgml,v 1.91 2006/06/18 15:38:35 petere Exp $ -->
 
 <chapter id="client-authentication">
  <title>Client Authentication</title>
@@ -436,10 +436,10 @@ hostnossl  <replaceable>database</replaceable>  <replaceable>user</replaceable>
 
   <para>
    The <filename>pg_hba.conf</filename> file is read on start-up and when
-   the main server process (<command>postmaster</>) receives a
+   the main server process receives a
    <systemitem>SIGHUP</systemitem><indexterm><primary>SIGHUP</primary></indexterm>
    signal. If you edit the file on an
-   active system, you will need to signal the <command>postmaster</>
+   active system, you will need to signal the server
    (using <literal>pg_ctl reload</> or <literal>kill -HUP</>) to make it
    re-read the file.
   </para>
@@ -866,10 +866,10 @@ local   db1,db2,@demodbs  all                         md5
 
   <para>
    The <filename>pg_ident.conf</filename> file is read on start-up and
-   when the main server process (<command>postmaster</>) receives a
+   when the main server process receives a
    <systemitem>SIGHUP</systemitem><indexterm><primary>SIGHUP</primary></indexterm>
    signal. If you edit the file on an
-   active system, you will need to signal the <command>postmaster</>
+   active system, you will need to signal the server
    (using <literal>pg_ctl reload</> or <literal>kill -HUP</>) to make it
    re-read the file.
   </para>

doc/src/sgml/config.sgml

-<!-- $PostgreSQL: pgsql/doc/src/sgml/config.sgml,v 1.64 2006/06/16 12:47:49 momjian Exp $ -->
+<!-- $PostgreSQL: pgsql/doc/src/sgml/config.sgml,v 1.65 2006/06/18 15:38:35 petere Exp $ -->
 
 <chapter Id="runtime-config">
   <title>Server Configuration</title>
@@ -69,10 +69,9 @@ include 'filename'
     <indexterm>
      <primary>SIGHUP</primary>
     </indexterm>
-    The configuration file is reread whenever the
-    <command>postmaster</command> process receives a
+    The configuration file is reread whenever the main server process receives a
     <systemitem>SIGHUP</> signal (which is most easily sent by means
-    of <literal>pg_ctl reload</>). The <command>postmaster</command>
+    of <literal>pg_ctl reload</>). The main server process
     also propagates this signal to all currently running server
     processes so that existing sessions also get the new
     value. Alternatively, you can send the signal to a single server
@@ -83,9 +82,9 @@ include 'filename'
 
    <para>
     A second way to set these configuration parameters is to give them
-    as a command line option to the <command>postmaster</command>, such as:
+    as a command-line option to the <command>postgres</command> command, such as:
 <programlisting>
-postmaster -c log_connections=yes -c log_destination='syslog'
+postgres -c log_connections=yes -c log_destination='syslog'
 </programlisting>
     Command-line options override any conflicting settings in
     <filename>postgresql.conf</filename>.  Note that this means you won't
@@ -116,7 +115,7 @@ env PGOPTIONS='-c geqo=off' psql
     and <xref linkend="sql-alterdatabase" endterm="sql-alterdatabase-title">,
     respectively, are used to configure these settings.  Per-database
     settings override anything received from the
-    <command>postmaster</command> command-line or the configuration
+    <command>postgres</command> command-line or the configuration
     file, and in turn are overridden by per-user settings; both are
     overridden by per-session settings.
    </para>
@@ -192,7 +191,7 @@ SET ENABLE_SEQSCAN TO OFF;
        <para>
          Specifies the main server configuration file
          (customarily called <filename>postgresql.conf</>).
-         This parameter can only be set on the postmaster command line.
+         This parameter can only be set on the postgres command line.
        </para>
       </listitem>
      </varlistentry>
@@ -234,8 +233,7 @@ SET ENABLE_SEQSCAN TO OFF;
       <listitem>
        <para>
         Specifies the name of an additional process-id (PID) file that the
-        <application>postmaster</> should create for use by server
-        administration programs.
+        server should create for use by server administration programs.
         This parameter can only be set at server start.
        </para>
       </listitem>
@@ -252,7 +250,7 @@ SET ENABLE_SEQSCAN TO OFF;
 
      <para>
       If you wish to keep the configuration files elsewhere than the
-      data directory, the postmaster's <option>-D</option>
+      data directory, the postgres <option>-D</option>
       command-line option or <envar>PGDATA</envar> environment variable
       must point to the directory containing the configuration files,
       and the <varname>data_directory</> parameter must be set in
@@ -269,7 +267,7 @@ SET ENABLE_SEQSCAN TO OFF;
       individually using the parameters <varname>config_file</>,
       <varname>hba_file</> and/or <varname>ident_file</>.
       <varname>config_file</> can only be specified on the 
-      <command>postmaster</command> command line, but the others can be
+      <command>postgres</command> command line, but the others can be
       set within the main configuration file.  If all three parameters plus
       <varname>data_directory</> are explicitly set, then it is not necessary
       to specify <option>-D</option> or <envar>PGDATA</envar>.
@@ -277,7 +275,7 @@ SET ENABLE_SEQSCAN TO OFF;
 
      <para>
       When setting any of these parameters, a relative path will be interpreted
-      with respect to the directory in which the <command>postmaster</command>
+      with respect to the directory in which <command>postgres</command>
       is started.
      </para>
    </sect1>
@@ -2679,7 +2677,7 @@ SELECT * FROM parent WHERE key = 2400;
          below - anything else that looks like an escape is ignored. Other
          characters are copied straight to the log line. Some escapes are
          only recognized by session processes, and do not apply to
-         background processes such as the postmaster. <application>Syslog</>
+         background processes such as the main server process. <application>Syslog</>
          produces its own 
          time stamp and process ID information, so you probably do not want to
          use those escapes if you are using <application>syslog</>.
@@ -3467,7 +3465,7 @@ SELECT * FROM parent WHERE key = 2400;
 
        <para>
         Only superusers can change this setting, because it affects the
-        messages sent to the postmaster log as well as to the client.
+        messages sent to the server log as well as to the client.
        </para>
       </listitem>
      </varlistentry>

doc/src/sgml/datatype.sgml

-<!-- $PostgreSQL: pgsql/doc/src/sgml/datatype.sgml,v 1.167 2006/04/23 03:39:49 momjian Exp $ -->
+<!-- $PostgreSQL: pgsql/doc/src/sgml/datatype.sgml,v 1.168 2006/06/18 15:38:35 petere Exp $ -->
 
  <chapter id="datatype">
   <title id="datatype-title">Data Types</title>
@@ -2153,7 +2153,7 @@ January 8 04:05:06 1999 PST
       <listitem>
        <para>
         If <varname>timezone</> is not specified in
-        <filename>postgresql.conf</> nor as a postmaster command-line switch,
+        <filename>postgresql.conf</> nor as a server command-line option,
         the server attempts to use the value of the <envar>TZ</envar>
         environment variable as the default time zone.  If <envar>TZ</envar>
         is not defined or is not any of the time zone names known to

doc/src/sgml/func.sgml

-<!-- $PostgreSQL: pgsql/doc/src/sgml/func.sgml,v 1.321 2006/06/15 17:52:48 momjian Exp $ -->
+<!-- $PostgreSQL: pgsql/doc/src/sgml/func.sgml,v 1.322 2006/06/18 15:38:35 petere Exp $ -->
 
  <chapter id="functions">
   <title>Functions and Operators</title>
@@ -8935,7 +8935,7 @@ select current_date + s.a as dates from generate_series(0,14,7) as s(a);
       <row>
        <entry><literal><function>pg_postmaster_start_time</function>()</literal></entry>
        <entry><type>timestamp with time zone</type></entry>
-       <entry><command>postmaster</> start time</entry>
+       <entry>server start time</entry>
       </row>
 
       <row>
@@ -9044,7 +9044,7 @@ SET search_path TO <replaceable>schema</> <optional>, <replaceable>schema</>, ..
    <para>
      <function>pg_postmaster_start_time</function> returns the
      <type>timestamp with time zone</type> when the
-     <command>postmaster</> started.
+     server started.
    </para>
 
    <indexterm zone="functions-info">
@@ -9850,7 +9850,7 @@ SELECT set_config('log_statement_stats', 'off', false);
 
    <para>
     <function>pg_reload_conf</> sends a <systemitem>SIGHUP</> signal
-    to the <application>postmaster</>, causing the configuration files
+    to the server, causing the configuration files
     to be reloaded by all server processes.
    </para>
 

doc/src/sgml/installation.sgml

-<!-- $PostgreSQL: pgsql/doc/src/sgml/installation.sgml,v 1.257 2006/06/16 15:16:16 momjian Exp $ -->
+<!-- $PostgreSQL: pgsql/doc/src/sgml/installation.sgml,v 1.258 2006/06/18 15:38:35 petere Exp $ -->
 
 <chapter id="installation">
  <title><![%standalone-include[<productname>PostgreSQL</>]]>
@@ -33,7 +33,7 @@ mkdir /usr/local/pgsql/data
 chown postgres /usr/local/pgsql/data
 su - postgres
 /usr/local/pgsql/bin/initdb -D /usr/local/pgsql/data
-/usr/local/pgsql/bin/postmaster -D /usr/local/pgsql/data &gt;logfile 2&gt;&amp;1 &amp;
+/usr/local/pgsql/bin/postgres -D /usr/local/pgsql/data &gt;logfile 2&gt;&amp;1 &amp;
 /usr/local/pgsql/bin/createdb test
 /usr/local/pgsql/bin/psql test
 </synopsis>
@@ -463,7 +463,7 @@ su - postgres
    (which you already have if you are upgrading).
 <programlisting>
 <userinput>/usr/local/pgsql/bin/initdb -D /usr/local/pgsql/data</>
-<userinput>/usr/local/pgsql/bin/postmaster -D /usr/local/pgsql/data</>
+<userinput>/usr/local/pgsql/bin/postgres -D /usr/local/pgsql/data</>
 </programlisting>
    Finally, restore your data with
 <screen>
@@ -1638,12 +1638,12 @@ postgres$ <userinput>/usr/local/pgsql/bin/initdb -D /usr/local/pgsql/data</>
      database server. Do so now. The command should look something
      like
 <programlisting>
-/usr/local/pgsql/bin/postmaster -D /usr/local/pgsql/data
+/usr/local/pgsql/bin/postgres -D /usr/local/pgsql/data
 </programlisting>
      This will start the server in the foreground. To put the server
      in the background use something like
 <programlisting>
-nohup /usr/local/pgsql/bin/postmaster -D /usr/local/pgsql/data \
+nohup /usr/local/pgsql/bin/postgres -D /usr/local/pgsql/data \
     &lt;/dev/null &gt;&gt;server.log 2&gt;&amp;1 &lt;/dev/null &amp;
 </programlisting>
     </para>
@@ -1654,12 +1654,6 @@ nohup /usr/local/pgsql/bin/postmaster -D /usr/local/pgsql/data \
 kill `cat /usr/local/pgsql/data/postmaster.pid`
 </programlisting>
     </para>
-
-    <para>
-     In order to allow TCP/IP connections (rather than only Unix
-     domain socket ones) you need to pass the <option>-i</> option to
-     <filename>postmaster</>.
-    </para>
    </step>
 
    <step>

doc/src/sgml/maintenance.sgml

-<!-- $PostgreSQL: pgsql/doc/src/sgml/maintenance.sgml,v 1.55 2006/04/23 03:39:52 momjian Exp $ -->
+<!-- $PostgreSQL: pgsql/doc/src/sgml/maintenance.sgml,v 1.56 2006/06/18 15:38:35 petere Exp $ -->
 
 <chapter id="maintenance">
  <title>Routine Database Maintenance Tasks</title>
@@ -403,10 +403,10 @@ HINT:  Stop the postmaster and use a standalone backend to VACUUM in "mydb".
     administrator recover without data loss, by manually executing the
     required <command>VACUUM</> commands.  However, since the system will not
     execute commands once it has gone into the safety shutdown mode,
-    the only way to do this is to stop the postmaster and use a standalone
+    the only way to do this is to stop the server and use a single-user
     backend to execute <command>VACUUM</>.  The shutdown mode is not enforced
-    by a standalone backend.  See the <xref linkend="app-postgres"> reference
-    page for details about using a standalone backend.
+    by a single-user backend.  See the <xref linkend="app-postgres"> reference
+    page for details about using a single-user backend.
    </para>
 
    <para>
@@ -628,17 +628,17 @@ analyze threshold = analyze base threshold + analyze scale factor * number of tu
   </para>
 
   <para>
-   If you simply direct the <systemitem>stderr</> of the
-   <command>postmaster</command> into a
+   If you simply direct the <systemitem>stderr</> of
+   <command>postgres</command> into a
    file, you will have log output, but
    the only way to truncate the log file is to stop and restart
-   the <command>postmaster</command>. This may be OK if you are using
+   the server. This may be OK if you are using
    <productname>PostgreSQL</productname> in a development environment,
    but few production servers would find this behavior acceptable.
   </para>
 
   <para>
-   A better approach is to send the <command>postmaster</>'s
+   A better approach is to send the server's
    <systemitem>stderr</> output to some type of log rotation program.
    There is a built-in log rotation program, which you can use by
    setting the configuration parameter <literal>redirect_stderr</> to
@@ -653,7 +653,7 @@ analyze threshold = analyze base threshold + analyze scale factor * number of tu
    server software. For example, the <application>rotatelogs</application>
    tool included in the <productname>Apache</productname> distribution
    can be used with <productname>PostgreSQL</productname>.  To do this,
-   just pipe the <command>postmaster</>'s
+   just pipe the server's
    <systemitem>stderr</> output to the desired program.
    If you start the server with
    <command>pg_ctl</>, then <systemitem>stderr</>

doc/src/sgml/manage-ag.sgml

-<!-- $PostgreSQL: pgsql/doc/src/sgml/manage-ag.sgml,v 2.46 2006/05/04 16:07:28 tgl Exp $ -->
+<!-- $PostgreSQL: pgsql/doc/src/sgml/manage-ag.sgml,v 2.47 2006/06/18 15:38:35 petere Exp $ -->
 
 <chapter id="managing-databases">
  <title>Managing Databases</title>
@@ -81,7 +81,7 @@ SELECT datname FROM pg_database;
   <para>
    In order to create a database, the <productname>PostgreSQL</>
    server must be up and running (see <xref
-   linkend="postmaster-start">).
+   linkend="server-start">).
   </para>
 
   <para>
@@ -491,7 +491,7 @@ SELECT spcname FROM pg_tablespace;
     point to each of the non-built-in tablespaces defined in the cluster.
     Although not recommended, it is possible to adjust the tablespace
     layout by hand by redefining these links.  Two warnings: do not do so
-    while the postmaster is running; and after you restart the postmaster,
+    while the server is running; and after you restart the server,
     update the <structname>pg_tablespace</> catalog to show the new
     locations.  (If you do not, <literal>pg_dump</> will continue to show
     the old tablespace locations.)

doc/src/sgml/monitoring.sgml

-<!-- $PostgreSQL: pgsql/doc/src/sgml/monitoring.sgml,v 1.32 2006/05/19 19:08:26 alvherre Exp $ -->
+<!-- $PostgreSQL: pgsql/doc/src/sgml/monitoring.sgml,v 1.33 2006/06/18 15:38:35 petere Exp $ -->
 
 <chapter id="monitoring">
  <title>Monitoring Database Activity</title>
@@ -49,7 +49,7 @@
 
 <screen>
 $ ps auxww | grep ^postgres
-postgres   960  0.0  1.1  6104 1480 pts/1    SN   13:17   0:00 postmaster -i
+postgres   960  0.0  1.1  6104 1480 pts/1    SN   13:17   0:00 postgres -i
 postgres   963  0.0  1.1  7084 1472 pts/1    SN   13:17   0:00 postgres: stats buffer process   
 postgres   965  0.0  1.1  6152 1512 pts/1    SN   13:17   0:00 postgres: stats collector process   
 postgres   998  0.0  2.3  6532 2992 pts/1    SN   13:18   0:00 postgres: tgl runbug 127.0.0.1 idle
@@ -60,7 +60,7 @@ postgres  1016  0.1  2.4  6532 3080 pts/1    SN   13:19   0:00 postgres: tgl reg
    (The appropriate invocation of <command>ps</> varies across different
    platforms, as do the details of what is shown.  This example is from a
    recent Linux system.)  The first process listed here is the
-   <application>postmaster</>, the master server process.  The command arguments
+   the master server process.  The command arguments
    shown for it are the same ones given when it was launched.  The next two
    processes implement the statistics collector, which will be described in
    detail in the next section.  (These will not be present if you have set
@@ -89,10 +89,10 @@ postgres: <replaceable>user</> <replaceable>database</> <replaceable>host</> <re
   use <command>/usr/ucb/ps</command>, rather than
   <command>/bin/ps</command>. You also must use two <option>w</option>
   flags, not just one. In addition, your original invocation of the
-  <command>postmaster</command> command must have a shorter
+  <command>postgres</command> command must have a shorter
   <command>ps</command> status display than that provided by each
   server process.  If you fail to do all three things, the <command>ps</>
-  output for each server process will be the original <command>postmaster</>
+  output for each server process will be the original <command>postgres</>
   command line.
   </para>
   </tip>

doc/src/sgml/problems.sgml

-<!-- $PostgreSQL: pgsql/doc/src/sgml/problems.sgml,v 2.25 2006/03/10 19:10:48 momjian Exp $ -->
+<!-- $PostgreSQL: pgsql/doc/src/sgml/problems.sgml,v 2.26 2006/06/18 15:38:36 petere Exp $ -->
 
 <sect1 id="bug-reporting">
  <title>Bug Reporting Guidelines</title>
@@ -223,7 +223,7 @@
       <literal>SELECT version();</literal> to
       find out the version of the server you are connected to.  Most executable
       programs also support a <option>--version</option> option; at least
-      <literal>postmaster --version</literal> and <literal>psql --version</literal>
+      <literal>postgres --version</literal> and <literal>psql --version</literal>
       should work.
       If the function or the options do not exist then your version is
       more than old enough to warrant an upgrade.
@@ -283,7 +283,7 @@
    are specifically talking about the backend server, mention that, do not
    just say <quote>PostgreSQL crashes</quote>.  A crash of a single
    backend server process is quite different from crash of the parent
-   <quote>postmaster</> process; please don't say <quote>the postmaster
+   <quote>postgres</> process; please don't say <quote>the server
    crashed</> when you mean a single backend process went down, nor vice versa.
    Also, client programs such as the interactive frontend <quote><application>psql</application></quote>
    are completely separate from the backend.  Please try to be specific

doc/src/sgml/protocol.sgml

-<!-- $PostgreSQL: pgsql/doc/src/sgml/protocol.sgml,v 1.64 2006/03/03 19:54:09 tgl Exp $ -->
+<!-- $PostgreSQL: pgsql/doc/src/sgml/protocol.sgml,v 1.65 2006/06/18 15:38:36 petere Exp $ -->
 
 <chapter id="protocol">
  <title>Frontend/Backend Protocol</title>
@@ -1044,7 +1044,7 @@
     this case is effectively synchronous &mdash; but it is also possible
     for parameter status changes to occur because the administrator
     changed a configuration file and then sent the
-    <systemitem>SIGHUP</systemitem> signal to the postmaster.  Also,
+    <systemitem>SIGHUP</systemitem> signal to the server.  Also,
     if a <command>SET</command> command is rolled back, an appropriate
     ParameterStatus message will be generated to report the current
     effective value.

doc/src/sgml/ref/alter_database.sgml

 <!--
-$PostgreSQL: pgsql/doc/src/sgml/ref/alter_database.sgml,v 1.17 2005/10/13 22:44:51 tgl Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/alter_database.sgml,v 1.18 2006/06/18 15:38:36 petere Exp $
 PostgreSQL documentation
 -->
 
@@ -55,7 +55,7 @@ ALTER DATABASE <replaceable class="PARAMETER">name</replaceable> OWNER TO <repla
    database, the specified value becomes the session default value.
    The database-specific default overrides whatever setting is present
    in <filename>postgresql.conf</> or has been received from the
-   <command>postmaster</command> command line.  Only the database
+   <command>postgres</command> command line.  Only the database
    owner or a superuser can change the session defaults for a
    database.  Certain variables cannot be set this way, or can only be
    set by a superuser.

doc/src/sgml/ref/alter_role.sgml

 <!--
-$PostgreSQL: pgsql/doc/src/sgml/ref/alter_role.sgml,v 1.5 2006/04/25 14:56:04 momjian Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/alter_role.sgml,v 1.6 2006/06/18 15:38:36 petere Exp $
 PostgreSQL documentation
 -->
 
@@ -81,7 +81,7 @@ ALTER ROLE <replaceable class="PARAMETER">name</replaceable> RESET <replaceable>
    a specified configuration variable.  Whenever the role subsequently
    starts a new session, the specified value becomes the session default,
    overriding whatever setting is present in <filename>postgresql.conf</>
-   or has been received from the <command>postmaster</command> command line.
+   or has been received from the <command>postgres</command> command line.
    (For a role without <literal>LOGIN</> privilege, session defaults have
    no effect.)
    Ordinary roles can change their own session defaults.

doc/src/sgml/ref/initdb.sgml

 <!--
-$PostgreSQL: pgsql/doc/src/sgml/ref/initdb.sgml,v 1.35 2005/06/21 04:02:31 tgl Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/initdb.sgml,v 1.36 2006/06/18 15:38:36 petere Exp $
 PostgreSQL documentation
 -->
 
@@ -127,7 +127,7 @@ PostgreSQL documentation
         <command>initdb</command>, but you can avoid writing it by
         setting the <envar>PGDATA</envar> environment variable, which
         can be convenient since the database server
-        (<command>postmaster</command>) can find the database
+        (<command>postgres</command>) can find the database
         directory later by the same variable.
        </para>
       </listitem>
@@ -287,7 +287,6 @@ PostgreSQL documentation
 
   <simplelist type="inline">
    <member><xref linkend="app-postgres"></member>
-   <member><xref linkend="app-postmaster"></member>
   </simplelist>
  </refsect1>
 

doc/src/sgml/ref/ipcclean.sgml

 <!--
-$PostgreSQL: pgsql/doc/src/sgml/ref/ipcclean.sgml,v 1.11 2005/01/04 03:58:16 tgl Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/ipcclean.sgml,v 1.12 2006/06/18 15:38:36 petere Exp $
 PostgreSQL documentation
 -->
 
@@ -32,7 +32,7 @@ PostgreSQL documentation
    semaphore sets owned by the current user.  It is intended to be
    used for cleaning up after a crashed
    <productname>PostgreSQL</productname> server (<xref
-   linkend="app-postmaster">).  Note that immediately restarting the
+   linkend="app-postgres">).  Note that immediately restarting the
    server will also clean up shared memory and semaphores, so this
    command is of little real utility.
   </para>
@@ -53,7 +53,7 @@ PostgreSQL documentation
   <para>
    This script is a hack, but in the many years since it was written,
    no one has come up with an equally effective and portable solution.
-   Since the <command>postmaster</command> can now clean up by
+   Since <command>postgres</command> can now clean up by
    itself, it is unlikely that <command>ipcclean</command> will be
    improved upon in the future.
   </para>

doc/src/sgml/ref/pg_ctl-ref.sgml

 <!--
-$PostgreSQL: pgsql/doc/src/sgml/ref/pg_ctl-ref.sgml,v 1.32 2005/11/04 23:14:02 petere Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/pg_ctl-ref.sgml,v 1.33 2006/06/18 15:38:36 petere Exp $
 PostgreSQL documentation
 -->
 
@@ -92,7 +92,7 @@ PostgreSQL documentation
   <para>
    <application>pg_ctl</application> is a utility for starting,
    stopping, or restarting the <productname>PostgreSQL</productname>
-   backend server (<xref linkend="app-postmaster">), or displaying the
+   backend server (<xref linkend="app-postgres">), or displaying the
    status of a running server.  Although the server can be started
    manually, <application>pg_ctl</application> encapsulates tasks such
    as redirecting log output and properly detaching from the terminal
@@ -109,7 +109,7 @@ PostgreSQL documentation
    standard output (not standard error).  If no log file is chosen, the 
    standard output of <application>pg_ctl</application> should be redirected 
    to a file or piped to another process such as a log rotating program
-   like <application>rotatelogs</>; otherwise the <command>postmaster</command> 
+   like <application>rotatelogs</>; otherwise <command>postgres</command> 
    will write its output to the controlling terminal (from the background) 
    and will not leave the shell's process group.
   </para>
@@ -129,13 +129,13 @@ PostgreSQL documentation
 
   <para>
    <option>restart</option> mode effectively executes a stop followed
-   by a start.  This allows changing the <command>postmaster</command>
+   by a start.  This allows changing the <command>postgres</command>
    command-line options.
   </para>
 
   <para>
    <option>reload</option> mode simply sends the
-   <command>postmaster</command> process a <systemitem>SIGHUP</>
+   <command>postgres</command> process a <systemitem>SIGHUP</>
    signal, causing it to reread its configuration files
    (<filename>postgresql.conf</filename>,
    <filename>pg_hba.conf</filename>, etc.).  This allows changing of
@@ -215,7 +215,7 @@ PostgreSQL documentation
       <listitem>
        <para>
         Specifies options to be passed directly to the
-        <command>postmaster</command> command.
+        <command>postgres</command> command.
        </para>
        <para>
 	The options are usually surrounded by single or double
@@ -228,12 +228,12 @@ PostgreSQL documentation
       <term><option>-p <replaceable class="parameter">path</replaceable></option></term>
       <listitem>
        <para>
-	Specifies the location of the <filename>postmaster</filename>
-	executable.  By default the <filename>postmaster</filename> executable is taken from the same
+	Specifies the location of the <filename>postgres</filename>
+	executable.  By default the <filename>postgres</filename> executable is taken from the same
 	directory as <command>pg_ctl</command>, or failing that, the hard-wired
 	installation directory.  It is not necessary to use this
 	option unless you are doing something unusual and get errors
-	that the <filename>postmaster</filename> executable was not found.
+	that the <filename>postgres</filename> executable was not found.
        </para>
       </listitem>
      </varlistentry>
@@ -344,7 +344,7 @@ PostgreSQL documentation
   </variablelist>
 
   <para>
-   For others, see <xref linkend="app-postmaster">.
+   For others, see <xref linkend="app-postgres">.
   </para>
  </refsect1>
 
@@ -373,7 +373,7 @@ PostgreSQL documentation
       If this file exists in the data directory,
       <application>pg_ctl</application> (in <option>start</option>
       mode) will pass the contents of the file as options to the
-      <command>postmaster</command> command, unless overridden by the
+      <command>postgres</command> command, unless overridden by the
       <option>-o</option> option.
      </para>
     </listitem>
@@ -385,8 +385,8 @@ PostgreSQL documentation
     <listitem>
      <para>If this file exists in the data directory,
       <application>pg_ctl</application> (in <option>restart</option> mode) 
-      will pass the contents of the file as options to the 
-      <application>postmaster</application>, unless overridden 
+      will pass the contents of the file as options to
+      <application>postgres</application>, unless overridden 
       by the <option>-o</option> option. The contents of this file 
       are also displayed in <option>status</option> mode.
      </para>
@@ -500,9 +500,9 @@ PostgreSQL documentation
 <screen>
 <prompt>$</prompt> <userinput>pg_ctl status</userinput>
 <computeroutput>
-pg_ctl: postmaster is running (pid: 13718)
+pg_ctl: server is running (pid: 13718)
 Command line was:
-/usr/local/pgsql/bin/postmaster '-D' '/usr/local/pgsql/data' '-p' '5433' '-B' '128'
+/usr/local/pgsql/bin/postgres '-D' '/usr/local/pgsql/data' '-p' '5433' '-B' '128'
 </computeroutput>
 </screen>
     This is the command line that would be invoked in restart mode.
@@ -515,7 +515,7 @@ Command line was:
   <title>See Also</title>
 
   <para>
-   <xref linkend="app-postmaster">
+   <xref linkend="app-postgres">
   </para>
  </refsect1>
 

doc/src/sgml/ref/pg_resetxlog.sgml

 <!--
-$PostgreSQL: pgsql/doc/src/sgml/ref/pg_resetxlog.sgml,v 1.15 2006/06/03 02:19:24 momjian Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/pg_resetxlog.sgml,v 1.16 2006/06/18 15:38:36 petere Exp $
 PostgreSQL documentation
 -->
 
@@ -168,8 +168,7 @@ PostgreSQL documentation
    server crashed then a lock file may have been left
    behind; in that case you can remove the lock file to allow
    <command>pg_resetxlog</command> to run.  But before you do
-   so, make doubly certain that there
-   is no <command>postmaster</command> nor any backend server process still alive.
+   so, make doubly certain that there is no server process still alive.
   </para>
  </refsect1>
 

doc/src/sgml/ref/reindex.sgml

 <!--
-$PostgreSQL: pgsql/doc/src/sgml/ref/reindex.sgml,v 1.29 2005/09/12 16:43:29 tgl Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/reindex.sgml,v 1.30 2006/06/18 15:38:36 petere Exp $
 PostgreSQL documentation
 -->
 
@@ -148,7 +148,7 @@ REINDEX { INDEX | TABLE | DATABASE | SYSTEM } <replaceable class="PARAMETER">nam
   </para>
 
   <para>
-   One way to do this is to shut down the postmaster and start a stand-alone
+   One way to do this is to shut down the server and start a single-user
    <productname>PostgreSQL</productname> server
    with the <option>-P</option> option included on its command line.
    Then, <command>REINDEX DATABASE</>, <command>REINDEX SYSTEM</>,
@@ -156,9 +156,9 @@ REINDEX { INDEX | TABLE | DATABASE | SYSTEM } <replaceable class="PARAMETER">nam
    issued, depending on how much you want to reconstruct.  If in
    doubt, use <command>REINDEX SYSTEM</> to select
    reconstruction of all system indexes in the database.  Then quit
-   the standalone server session and restart the regular server.
+   the single-user server session and restart the regular server.
    See the <xref linkend="app-postgres"> reference page for more
-   information about how to interact with the stand-alone server
+   information about how to interact with the single-user server
    interface.
   </para>
 

doc/src/sgml/ref/show.sgml

 <!--
-$PostgreSQL: pgsql/doc/src/sgml/ref/show.sgml,v 1.39 2005/06/14 20:42:52 momjian Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/show.sgml,v 1.40 2006/06/18 15:38:36 petere Exp $
 PostgreSQL documentation
 -->
 
@@ -36,7 +36,7 @@ SHOW ALL
    the <envar>PGOPTIONS</envar> environmental variable (when using
    <application>libpq</> or a <application>libpq</>-based
    application), or through command-line flags when starting the
-   <command>postmaster</command>.  See <xref
+   <command>postgres</command>.  See <xref
    linkend="runtime-config"> for details.
   </para>
  </refsect1>

doc/src/sgml/regress.sgml

-<!-- $PostgreSQL: pgsql/doc/src/sgml/regress.sgml,v 1.51 2006/04/06 18:54:36 petere Exp $ -->
+<!-- $PostgreSQL: pgsql/doc/src/sgml/regress.sgml,v 1.52 2006/06/18 15:38:36 petere Exp $ -->
 
  <chapter id="regress">
   <title id="regress-title">Regression Tests</title>
@@ -316,7 +316,7 @@ exclusion of those that don't.
      <![%standalone-ignore;[<xref linkend="guc-max-stack-depth">]]>
      <![%standalone-include;[<literal>max_stack_depth</literal>]]>
      parameter indicates.  This
-     can be fixed by running the postmaster under a higher stack
+     can be fixed by running the server under a higher stack
      size limit (4MB is recommended with the default value of 
      <varname>max_stack_depth</>).  If you are unable to do that, an
      alternative is to reduce the value of <varname>max_stack_depth</>.

doc/src/sgml/runtime.sgml

-<!-- $PostgreSQL: pgsql/doc/src/sgml/runtime.sgml,v 1.371 2006/04/27 02:29:14 momjian Exp $ -->
+<!-- $PostgreSQL: pgsql/doc/src/sgml/runtime.sgml,v 1.372 2006/06/18 15:38:36 petere Exp $ -->
 
 <chapter Id="runtime">
  <title>Operating System Environment</title>
@@ -161,19 +161,19 @@ postgres$ <userinput>initdb -D /usr/local/pgsql/data</userinput>
   </para>
  </sect1>
 
- <sect1 id="postmaster-start">
+ <sect1 id="server-start">
   <title>Starting the Database Server</title>
 
   <para>
    Before anyone can access the database, you must start the database
    server. The database server program is called
-   <command>postmaster</command>.<indexterm><primary>postmaster</></>
-   The <command>postmaster</command> must know where to
+   <command>postgres</command>.<indexterm><primary>postgres</></>
+   The <command>postgres</command> program must know where to
    find the data it is supposed to use. This is done with the
    <option>-D</option> option. Thus, the simplest way to start the
    server is:
 <screen>
-$ <userinput>postmaster -D /usr/local/pgsql/data</userinput>
+$ <userinput>postgres -D /usr/local/pgsql/data</userinput>
 </screen>
    which will leave the server running in the foreground. This must be
    done while logged into the <productname>PostgreSQL</productname> user
@@ -183,10 +183,10 @@ $ <userinput>postmaster -D /usr/local/pgsql/data</userinput>
   </para>
 
   <para>
-   Normally it is better to start the <command>postmaster</command> in the
+   Normally it is better to start <command>postgres</command> in the
    background.  For this, use the usual shell syntax:
 <screen>
-$ <userinput>postmaster -D /usr/local/pgsql/data &gt;logfile 2&gt;&amp;1 &amp;</userinput>
+$ <userinput>postgres -D /usr/local/pgsql/data &gt;logfile 2&gt;&amp;1 &amp;</userinput>
 </screen>
    It is important to store the server's <systemitem>stdout</> and
    <systemitem>stderr</> output somewhere, as shown above. It will help
@@ -196,9 +196,9 @@ $ <userinput>postmaster -D /usr/local/pgsql/data &gt;logfile 2&gt;&amp;1 &amp;</
   </para>
 
   <para>
-   The <command>postmaster</command> also takes a number of other
-   command line options. For more information, see the
-   <xref linkend="app-postmaster"> reference page
+   The <command>postgres</command> program also takes a number of other
+   command-line options. For more information, see the
+   <xref linkend="app-postgres"> reference page
    and <xref linkend="runtime-config"> below.
   </para>
 
@@ -212,7 +212,7 @@ pg_ctl start -l logfile
 </programlisting>
    will start the server in the background and put the output into the
    named log file. The <option>-D</option> option has the same meaning
-   here as in the <command>postmaster</command>. <command>pg_ctl</command>
+   here as for <command>postgres</command>. <command>pg_ctl</command>
    is also capable of stopping the server.
   </para>
 
@@ -262,7 +262,7 @@ su -c 'pg_ctl start -D /usr/local/pgsql/data -l serverlog' postgres
       to the file <filename>/etc/rc.local</filename>:
       <indexterm><primary>OpenBSD</><secondary>start script</secondary></>
 <programlisting>
-if [ -x /usr/local/pgsql/bin/pg_ctl -a -x /usr/local/pgsql/bin/postmaster ]; then
+if [ -x /usr/local/pgsql/bin/pg_ctl -a -x /usr/local/pgsql/bin/postgres ]; then
     su - -c '/usr/local/pgsql/bin/pg_ctl start -l /var/postgresql/log -s' postgres
     echo -n ' postgresql'
 fi
@@ -310,15 +310,15 @@ su - postgres -c "/usr/local/pgsql/bin/pg_ctl start -l logfile -D /usr/local/pgs
   </para>
 
    <para>
-    While the <command>postmaster</command> is running, its
+    While the server is running, its
     <acronym>PID</acronym> is stored in the file
     <filename>postmaster.pid</filename> in the data directory. This is
-    used to prevent multiple <command>postmaster</command> processes
+    used to prevent multiple server instances from
     running in the same data directory and can also be used for
-    shutting down the <command>postmaster</command> process.
+    shutting down the server.
    </para>
 
-   <sect2 id="postmaster-start-failures">
+   <sect2 id="server-start-failures">
     <title>Server Start-up Failures</title>
 
     <para>
@@ -336,13 +336,13 @@ HINT:  Is another postmaster already running on port 5432? If not, wait a few se
 FATAL:  could not create TCP/IP listen socket
 </screen>
      This usually means just what it suggests: you tried to start
-     another <command>postmaster</command> on the same port where one is already running.
+     another server on the same port where one is already running.
      However, if the kernel error message is not <computeroutput>Address
      already in use</computeroutput> or some variant of that, there may
-     be a different problem. For example, trying to start a <command>postmaster</command>
+     be a different problem. For example, trying to start a server
      on a reserved port number may draw something like:
 <screen>
-$ <userinput>postmaster -p 666</userinput>
+$ <userinput>postgres -p 666</userinput>
 LOG:  could not bind IPv4 socket: Permission denied
 HINT:  Is another postmaster already running on port 666? If not, wait a few seconds and retry.
 FATAL:  could not create TCP/IP listen socket
@@ -495,7 +495,7 @@ psql: could not connect to server: No such file or directory
     <acronym>IPC</> limits, the server will refuse to start and
     should leave an instructive error message describing the problem
     encountered and what to do about it. (See also <xref
-    linkend="postmaster-start-failures">.) The relevant kernel
+    linkend="server-start-failures">.) The relevant kernel
     parameters are named consistently across different systems; <xref
     linkend="sysvipc-parameters"> gives an overview. The methods to set
     them, however, vary. Suggestions for some platforms are given below.
@@ -1181,7 +1181,7 @@ default:\
     optimal for <productname>PostgreSQL</productname>. Because of the
     way that the kernel implements memory overcommit, the kernel may
     terminate the <productname>PostgreSQL</productname> server (the
-    <filename>postmaster</filename> process) if the memory demands of
+    master server process) if the memory demands of
     another process cause the system to run out of virtual memory.
    </para>
 
@@ -1190,9 +1190,9 @@ default:\
     this (consult your system documentation and configuration on where
     to look for such a message):
 <programlisting>
-Out of Memory: Killed process 12345 (postmaster). 
+Out of Memory: Killed process 12345 (postgres). 
 </programlisting>
-    This indicates that the <filename>postmaster</filename> process
+    This indicates that the <filename>postgres</filename> process
     has been terminated due to memory pressure.
     Although existing database connections will continue to function
     normally, no new connections will be accepted.  To recover,
@@ -1237,17 +1237,17 @@ sysctl -w vm.overcommit_memory=2
  </sect1>
 
 
- <sect1 id="postmaster-shutdown">
+ <sect1 id="server-shutdown">
   <title>Shutting Down the Server</title>
 
-  <indexterm zone="postmaster-shutdown">
+  <indexterm zone="server-shutdown">
    <primary>shutdown</>
   </indexterm>
 
   <para>
    There are several ways to shut down the database server. You control
-   the type of shutdown by sending different signals to the
-   <command>postmaster</command> process.
+   the type of shutdown by sending different signals to the master
+   <command>postgres</command> process.
 
    <variablelist>
     <varlistentry>
@@ -1281,7 +1281,7 @@ sysctl -w vm.overcommit_memory=2
      <listitem>
       <para>
       This is the <firstterm>Immediate Shutdown</firstterm>, which
-      will cause the <command>postmaster</command> process to send a
+      will cause the master <command>postgres</command> process to send a
       <systemitem>SIGQUIT</systemitem> to all child processes and exit
       immediately, without properly shutting itself down. The child processes
       likewise exit immediately upon receiving
@@ -1301,7 +1301,7 @@ sysctl -w vm.overcommit_memory=2
 
   <para>
    Alternatively, you can send the signal directly using <command>kill</>.
-   The <acronym>PID</> of the <command>postmaster</command> process can be
+   The <acronym>PID</> of the <command>postgres</command> process can be
    found using the <command>ps</command> program, or from the file
    <filename>postmaster.pid</filename> in the data directory. For
    example, to do a fast shutdown:
@@ -1316,7 +1316,7 @@ $ <userinput>kill -INT `head -1 /usr/local/pgsql/data/postmaster.pid`</userinput
      the server.  Doing so will prevent the server from releasing
      shared memory and semaphores, which may then have to be done
      manually before a new server can be started.  Furthermore,
-     <systemitem>SIGKILL</systemitem> kills the <command>postmaster</command>
+     <systemitem>SIGKILL</systemitem> kills the <command>postgres</command>
      process without letting it relay the signal to its subprocesses,
      so it will be necessary to kill the individual subprocesses by hand as
      well.

doc/src/sgml/start.sgml

-<!-- $PostgreSQL: pgsql/doc/src/sgml/start.sgml,v 1.40 2006/03/10 19:10:49 momjian Exp $ -->
+<!-- $PostgreSQL: pgsql/doc/src/sgml/start.sgml,v 1.41 2006/06/18 15:38:36 petere Exp $ -->
 
  <chapter id="tutorial-start">
   <title>Getting Started</title>
@@ -76,8 +76,8 @@
        connections to the database from client applications, and
        performs actions on the database on behalf of the clients.  The
        database server program is called
-       <filename>postmaster</filename>.
-       <indexterm><primary>postmaster</primary></indexterm>
+       <filename>postgres</filename>.
+       <indexterm><primary>postgres</primary></indexterm>
       </para>
      </listitem>
 
@@ -112,8 +112,8 @@
     starts (<quote>forks</quote>) a new process for each connection.
     From that point on, the client and the new server process
     communicate without intervention by the original
-    <filename>postmaster</filename> process.  Thus, the
-    <filename>postmaster</filename> is always running, waiting for
+    <filename>postgres</filename> process.  Thus, the
+    master server process is always running, waiting for
     client connections, whereas client and associated server processes
     come and go.  (All of this is of course invisible to the user.  We
     only mention it here for completeness.)

doc/src/sgml/storage.sgml

-<!-- $PostgreSQL: pgsql/doc/src/sgml/storage.sgml,v 1.10 2006/04/23 03:39:52 momjian Exp $ -->
+<!-- $PostgreSQL: pgsql/doc/src/sgml/storage.sgml,v 1.11 2006/06/18 15:38:36 petere Exp $ -->
 
 <chapter id="storage">
 
@@ -23,7 +23,7 @@ All the data needed for a database cluster is stored within the cluster's data
 directory, commonly referred to as <varname>PGDATA</> (after the name of the
 environment variable that can be used to define it).  A common location for
 <varname>PGDATA</> is <filename>/var/lib/pgsql/data</>.  Multiple clusters,
-managed by different postmasters, can exist on the same machine.
+managed by different server instances, can exist on the same machine.
 </para>
 
 <para>
@@ -99,14 +99,14 @@ Item
 
 <row>
  <entry><filename>postmaster.opts</></entry>
- <entry>A file recording the command-line options the postmaster was
+ <entry>A file recording the command-line options the server was
 last started with</entry>
 </row>
 
 <row>
  <entry><filename>postmaster.pid</></entry>
- <entry>A lock file recording the current postmaster PID and shared memory
-segment ID (not present after postmaster shutdown)</entry>
+ <entry>A lock file recording the current server PID and shared memory
+segment ID (not present after server shutdown)</entry>
 </row>
 
 </tbody>

src/backend/Makefile

@@ -4,11 +4,11 @@
 #
 # Copyright (c) 1994, Regents of the University of California
 #
-# $PostgreSQL: pgsql/src/backend/Makefile,v 1.114 2006/01/05 01:56:29 momjian Exp $
+# $PostgreSQL: pgsql/src/backend/Makefile,v 1.115 2006/06/18 15:38:36 petere Exp $
 #
 #-------------------------------------------------------------------------
 
-PGFILEDESC = "PostgreSQL Database Backend"
+PGFILEDESC = "PostgreSQL Server"
 subdir = src/backend
 top_builddir = ../..
 include $(top_builddir)/src/Makefile.global

src/backend/bootstrap/bootstrap.c

@@ -8,7 +8,7 @@
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/bootstrap/bootstrap.c,v 1.216 2006/06/08 23:55:48 tgl Exp $
+ *	  $PostgreSQL: pgsql/src/backend/bootstrap/bootstrap.c,v 1.217 2006/06/18 15:38:36 petere Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -53,7 +53,6 @@ extern char *optarg;
 
 #define ALLOC(t, c)		((t *) calloc((unsigned)(c), sizeof(t)))
 
-static void usage(void);
 static void bootstrap_signals(void);
 static void ShutdownDummyProcess(int code, Datum arg);
 static hashnode *AddStr(char *str, int strlength, int mderef);
@@ -247,8 +246,8 @@ BootstrapMain(int argc, char *argv[])
 	if (!IsUnderPostmaster)
 		InitializeGUCOptions();
 
-	/* Ignore the initial -boot argument, if present */
-	if (argc > 1 && strcmp(argv[1], "-boot") == 0)
+	/* Ignore the initial --boot argument, if present */
+	if (argc > 1 && strcmp(argv[1], "--boot") == 0)
 	{
 		argv++;
 		argc--;
@@ -317,7 +316,9 @@ BootstrapMain(int argc, char *argv[])
 					break;
 				}
 			default:
-				usage();
+				write_stderr("Try \"%s --help\" for more information.\n",
+							 progname);
+				proc_exit(1);
 				break;
 		}
 	}
@@ -328,7 +329,10 @@ BootstrapMain(int argc, char *argv[])
 		optind++;
 	}
 	if (!dbname || argc != optind)
-		usage();
+	{
+		write_stderr("%s: invalid command-line arguments\n", progname);
+		proc_exit(1);
+	}
 
 	/*
 	 * Identify myself via ps
@@ -498,26 +502,6 @@ BootstrapMain(int argc, char *argv[])
  * ----------------------------------------------------------------
  */
 
-/* usage:
- *		usage help for the bootstrap backend
- */
-static void
-usage(void)
-{
-	fprintf(stderr, _("This is the PostgreSQL bootstrap process.\n\n"));
-	fprintf(stderr, _("Usage:\n  postgres -boot [OPTION]... DBNAME\n\n"));
-	fprintf(stderr, _("Options:\n"));
-	fprintf(stderr, _("  -B NBUFFERS     number of shared buffers\n"));
-	fprintf(stderr, _("  -c NAME=VALUE   set run-time parameter\n"));
-	fprintf(stderr, _("  -d 1-5          debugging level\n"));
-	fprintf(stderr, _("  -D DATADIR      database directory\n"));
-	fprintf(stderr, _("  -F              turn fsync off\n"));
-	fprintf(stderr, _("  -r FILENAME     send stdout and stderr to given file\n"));
-	fprintf(stderr, _("  -x NUM          internal use\n"));
-
-	proc_exit(1);
-}
-
 /*
  * Set up signal handling for a bootstrap process
  */

src/backend/postmaster/autovacuum.c

@@ -10,7 +10,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/postmaster/autovacuum.c,v 1.19 2006/05/19 15:15:37 alvherre Exp $
+ *	  $PostgreSQL: pgsql/src/backend/postmaster/autovacuum.c,v 1.20 2006/06/18 15:38:37 petere Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -208,7 +208,7 @@ autovac_forkexec(void)
 	int			ac = 0;
 
 	av[ac++] = "postgres";
-	av[ac++] = "-forkautovac";
+	av[ac++] = "--forkautovac";
 	av[ac++] = NULL;			/* filled in by postmaster_forkexec */
 	av[ac] = NULL;
 

src/backend/postmaster/pgarch.c

@@ -19,7 +19,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/postmaster/pgarch.c,v 1.22 2006/05/30 17:08:14 tgl Exp $
+ *	  $PostgreSQL: pgsql/src/backend/postmaster/pgarch.c,v 1.23 2006/06/18 15:38:37 petere Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -197,7 +197,7 @@ pgarch_forkexec(void)
 
 	av[ac++] = "postgres";
 
-	av[ac++] = "-forkarch";
+	av[ac++] = "--forkarch";
 
 	av[ac++] = NULL;			/* filled in by postmaster_forkexec */
 

src/backend/postmaster/pgstat.c

@@ -13,7 +13,7 @@
  *
  *	Copyright (c) 2001-2006, PostgreSQL Global Development Group
  *
- *	$PostgreSQL: pgsql/src/backend/postmaster/pgstat.c,v 1.127 2006/05/30 02:35:39 momjian Exp $
+ *	$PostgreSQL: pgsql/src/backend/postmaster/pgstat.c,v 1.128 2006/06/18 15:38:37 petere Exp $
  * ----------
  */
 #include "postgres.h"
@@ -491,11 +491,11 @@ pgstat_forkexec(STATS_PROCESS_TYPE procType)
 	switch (procType)
 	{
 		case STAT_PROC_BUFFER:
-			av[ac++] = "-forkbuf";
+			av[ac++] = "--forkbuf";
 			break;
 
 		case STAT_PROC_COLLECTOR:
-			av[ac++] = "-forkcol";
+			av[ac++] = "--forkcol";
 			break;
 
 		default:

src/backend/postmaster/postmaster.c

@@ -37,7 +37,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/postmaster/postmaster.c,v 1.485 2006/06/07 22:24:44 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/backend/postmaster/postmaster.c,v 1.486 2006/06/18 15:38:37 petere Exp $
  *
  * NOTES
  *
@@ -266,7 +266,6 @@ static void LogChildExit(int lev, const char *procname,
 static void BackendInitialize(Port *port);
 static int	BackendRun(Port *port);
 static void ExitPostmaster(int status);
-static void usage(const char *);
 static int	ServerLoop(void);
 static int	BackendStartup(Port *port);
 static int	ProcessStartupPacket(Port *port, bool SSLdone);
@@ -384,29 +383,6 @@ PostmasterMain(int argc, char *argv[])
 
 	IsPostmasterEnvironment = true;
 
-	/*
-	 * Catch standard options before doing much else.  This even works on
-	 * systems without getopt_long.
-	 */
-	if (argc > 1)
-	{
-		if (strcmp(argv[1], "--help") == 0 || strcmp(argv[1], "-?") == 0)
-		{
-			usage(progname);
-			ExitPostmaster(0);
-		}
-		if (strcmp(argv[1], "--version") == 0 || strcmp(argv[1], "-V") == 0)
-		{
-			puts("postmaster (PostgreSQL) " PG_VERSION);
-			ExitPostmaster(0);
-		}
-	}
-
-#ifdef WIN32
-	/* Start our win32 signal implementation */
-	pgwin32_signal_initialize();
-#endif
-
 	/*
 	 * for security, no dir or file created can be group or other accessible
 	 */
@@ -1133,55 +1109,6 @@ pmdaemonize(void)
 }
 
 
-/*
- * Print out help message
- */
-static void
-usage(const char *progname)
-{
-	printf(_("%s is the PostgreSQL server.\n\n"), progname);
-	printf(_("Usage:\n  %s [OPTION]...\n\n"), progname);
-	printf(_("Options:\n"));
-#ifdef USE_ASSERT_CHECKING
-	printf(_("  -A 1|0          enable/disable run-time assert checking\n"));
-#endif
-	printf(_("  -B NBUFFERS     number of shared buffers\n"));
-	printf(_("  -c NAME=VALUE   set run-time parameter\n"));
-	printf(_("  -d 1-5          debugging level\n"));
-	printf(_("  -D DATADIR      database directory\n"));
-	printf(_("  -e              use European date input format (DMY)\n"));
-	printf(_("  -F              turn fsync off\n"));
-	printf(_("  -h HOSTNAME     host name or IP address to listen on\n"));
-	printf(_("  -i              enable TCP/IP connections\n"));
-	printf(_("  -k DIRECTORY    Unix-domain socket location\n"));
-#ifdef USE_SSL
-	printf(_("  -l              enable SSL connections\n"));
-#endif
-	printf(_("  -N MAX-CONNECT  maximum number of allowed connections\n"));
-	printf(_("  -o OPTIONS      pass \"OPTIONS\" to each server process (obsolete)\n"));
-	printf(_("  -p PORT         port number to listen on\n"));
-	printf(_("  -s              show statistics after each query\n"));
-	printf(_("  -S WORK-MEM     set amount of memory for sorts (in kB)\n"));
-	printf(_("  --NAME=VALUE    set run-time parameter\n"));
-	printf(_("  --help          show this help, then exit\n"));
-	printf(_("  --version       output version information, then exit\n"));
-
-	printf(_("\nDeveloper options:\n"));
-	printf(_("  -f s|i|n|m|h    forbid use of some plan types\n"));
-	printf(_("  -n              do not reinitialize shared memory after abnormal exit\n"));
-	printf(_("  -O              allow system table structure changes\n"));
-	printf(_("  -P              disable system indexes\n"));
-	printf(_("  -t pa|pl|ex     show timings after each query\n"));
-	printf(_("  -T              send SIGSTOP to all backend servers if one dies\n"));
-	printf(_("  -W NUM          wait NUM seconds to allow attach from a debugger\n"));
-
-	printf(_("\nPlease read the documentation for the complete list of run-time\n"
-			 "configuration settings and how to set them on the command line or in\n"
-			 "the configuration file.\n\n"
-			 "Report bugs to <pgsql-bugs@postgresql.org>.\n"));
-}
-
-
 /*
  * Main idle loop of postmaster
  */
@@ -2957,7 +2884,7 @@ backend_forkexec(Port *port)
 	int			ac = 0;
 
 	av[ac++] = "postgres";
-	av[ac++] = "-forkbackend";
+	av[ac++] = "--forkbackend";
 	av[ac++] = NULL;			/* filled in by internal_forkexec */
 
 	av[ac] = NULL;
@@ -3030,10 +2957,10 @@ internal_forkexec(int argc, char *argv[], Port *port)
 	/* Make sure caller set up argv properly */
 	Assert(argc >= 3);
 	Assert(argv[argc] == NULL);
-	Assert(strncmp(argv[1], "-fork", 5) == 0);
+	Assert(strncmp(argv[1], "--fork", 6) == 0);
 	Assert(argv[2] == NULL);
 
-	/* Insert temp file name after -fork argument */
+	/* Insert temp file name after --fork argument */
 	argv[2] = tmpfilename;
 
 	/* Fire off execv in child */
@@ -3081,7 +3008,7 @@ internal_forkexec(int argc, char *argv[], Port *port)
 	/* Make sure caller set up argv properly */
 	Assert(argc >= 3);
 	Assert(argv[argc] == NULL);
-	Assert(strncmp(argv[1], "-fork", 5) == 0);
+	Assert(strncmp(argv[1], "--fork", 6) == 0);
 	Assert(argv[2] == NULL);
 
 	/* Verify that there is room in the child list */
@@ -3119,7 +3046,7 @@ internal_forkexec(int argc, char *argv[], Port *port)
 		return -1;
 	}
 
-	/* Insert temp file name after -fork argument */
+	/* Insert temp file name after --fork argument */
 	sprintf(paramHandleStr, "%lu", (DWORD) paramHandle);
 	argv[2] = paramHandleStr;
 
@@ -3242,7 +3169,7 @@ internal_forkexec(int argc, char *argv[], Port *port)
  *			to what it would be if we'd simply forked on Unix, and then
  *			dispatch to the appropriate place.
  *
- * The first two command line arguments are expected to be "-forkFOO"
+ * The first two command line arguments are expected to be "--forkFOO"
  * (where FOO indicates which postmaster child we are to become), and
  * the name of a variables file that we can read to load data that would
  * have been inherited by fork() on Unix.  Remaining arguments go to the
@@ -3282,9 +3209,9 @@ SubPostmasterMain(int argc, char *argv[])
 	 * to do this before going any further to ensure that we can attach at the
 	 * same address the postmaster used.
 	 */
-	if (strcmp(argv[1], "-forkbackend") == 0 ||
-		strcmp(argv[1], "-forkautovac") == 0 ||
-		strcmp(argv[1], "-forkboot") == 0)
+	if (strcmp(argv[1], "--forkbackend") == 0 ||
+		strcmp(argv[1], "--forkautovac") == 0 ||
+		strcmp(argv[1], "--forkboot") == 0)
 		PGSharedMemoryReAttach();
 
 	/*
@@ -3304,7 +3231,7 @@ SubPostmasterMain(int argc, char *argv[])
 	read_nondefault_variables();
 
 	/* Run backend or appropriate child */
-	if (strcmp(argv[1], "-forkbackend") == 0)
+	if (strcmp(argv[1], "--forkbackend") == 0)
 	{
 		Assert(argc == 3);		/* shouldn't be any more args */
 
@@ -3356,7 +3283,7 @@ SubPostmasterMain(int argc, char *argv[])
 		/* And run the backend */
 		proc_exit(BackendRun(&port));
 	}
-	if (strcmp(argv[1], "-forkboot") == 0)
+	if (strcmp(argv[1], "--forkboot") == 0)
 	{
 		/* Close the postmaster's sockets */
 		ClosePostmasterPorts(false);
@@ -3373,7 +3300,7 @@ SubPostmasterMain(int argc, char *argv[])
 		BootstrapMain(argc - 2, argv + 2);
 		proc_exit(0);
 	}
-	if (strcmp(argv[1], "-forkautovac") == 0)
+	if (strcmp(argv[1], "--forkautovac") == 0)
 	{
 		/* Close the postmaster's sockets */
 		ClosePostmasterPorts(false);
@@ -3390,7 +3317,7 @@ SubPostmasterMain(int argc, char *argv[])
 		AutoVacMain(argc - 2, argv + 2);
 		proc_exit(0);
 	}
-	if (strcmp(argv[1], "-forkarch") == 0)
+	if (strcmp(argv[1], "--forkarch") == 0)
 	{
 		/* Close the postmaster's sockets */
 		ClosePostmasterPorts(false);
@@ -3400,7 +3327,7 @@ SubPostmasterMain(int argc, char *argv[])
 		PgArchiverMain(argc, argv);
 		proc_exit(0);
 	}
-	if (strcmp(argv[1], "-forkbuf") == 0)
+	if (strcmp(argv[1], "--forkbuf") == 0)
 	{
 		/* Close the postmaster's sockets */
 		ClosePostmasterPorts(false);
@@ -3410,7 +3337,7 @@ SubPostmasterMain(int argc, char *argv[])
 		PgstatBufferMain(argc, argv);
 		proc_exit(0);
 	}
-	if (strcmp(argv[1], "-forkcol") == 0)
+	if (strcmp(argv[1], "--forkcol") == 0)
 	{
 		/*
 		 * Do NOT close postmaster sockets here, because we are forking from
@@ -3422,7 +3349,7 @@ SubPostmasterMain(int argc, char *argv[])
 		PgstatCollectorMain(argc, argv);
 		proc_exit(0);
 	}
-	if (strcmp(argv[1], "-forklog") == 0)
+	if (strcmp(argv[1], "--forklog") == 0)
 	{
 		/* Close the postmaster's sockets */
 		ClosePostmasterPorts(true);
@@ -3635,7 +3562,7 @@ StartChildProcess(int xlop)
 	av[ac++] = "postgres";
 
 #ifdef EXEC_BACKEND
-	av[ac++] = "-forkboot";
+	av[ac++] = "--forkboot";
 	av[ac++] = NULL;			/* filled in by postmaster_forkexec */
 #endif
 

src/backend/postmaster/syslogger.c

@@ -18,7 +18,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/postmaster/syslogger.c,v 1.24 2006/06/07 22:24:44 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/backend/postmaster/syslogger.c,v 1.25 2006/06/18 15:38:37 petere Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -534,7 +534,7 @@ syslogger_forkexec(void)
 	char		numbuf[2][32];
 
 	av[ac++] = "postgres";
-	av[ac++] = "-forklog";
+	av[ac++] = "--forklog";
 	av[ac++] = NULL;			/* filled in by postmaster_forkexec */
 
 	/* static variables (those not passed by write_backend_variables) */

src/backend/tcop/postgres.c

@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/tcop/postgres.c,v 1.487 2006/06/11 15:49:28 tgl Exp $
+ *	  $PostgreSQL: pgsql/src/backend/tcop/postgres.c,v 1.488 2006/06/18 15:38:37 petere Exp $
  *
  * NOTES
  *	  this is the "main" module of the postgres backend and
@@ -2399,41 +2399,6 @@ assign_max_stack_depth(int newval, bool doit, GucSource source)
 }
 
 
-static void
-usage(const char *progname)
-{
-	printf(_("%s is the PostgreSQL stand-alone backend.  It is not\nintended to be used by normal users.\n\n"), progname);
-
-	printf(_("Usage:\n  %s [OPTION]... DBNAME\n\n"), progname);
-	printf(_("Options:\n"));
-#ifdef USE_ASSERT_CHECKING
-	printf(_("  -A 1|0          enable/disable run-time assert checking\n"));
-#endif
-	printf(_("  -B NBUFFERS     number of shared buffers\n"));
-	printf(_("  -c NAME=VALUE   set run-time parameter\n"));
-	printf(_("  -d 0-5          debugging level\n"));
-	printf(_("  -D DATADIR      database directory\n"));
-	printf(_("  -e              use European date input format (DMY)\n"));
-	printf(_("  -E              echo statement before execution\n"));
-	printf(_("  -F              turn fsync off\n"));
-	printf(_("  -j              do not use newline as interactive query delimiter\n"));
-	printf(_("  -r FILENAME     send stdout and stderr to given file\n"));
-	printf(_("  -s              show statistics after each query\n"));
-	printf(_("  -S WORK-MEM     set amount of memory for sorts (in kB)\n"));
-	printf(_("  --NAME=VALUE    set run-time parameter\n"));
-	printf(_("  --describe-config  describe configuration parameters, then exit\n"));
-	printf(_("  --help          show this help, then exit\n"));
-	printf(_("  --version       output version information, then exit\n"));
-	printf(_("\nDeveloper options:\n"));
-	printf(_("  -f s|i|n|m|h    forbid use of some plan types\n"));
-	printf(_("  -O              allow system table structure changes\n"));
-	printf(_("  -P              disable system indexes\n"));
-	printf(_("  -t pa|pl|ex     show timings after each query\n"));
-	printf(_("  -W NUM          wait NUM seconds to allow attach from a debugger\n"));
-	printf(_("\nReport bugs to <pgsql-bugs@postgresql.org>.\n"));
-}
-
-
 /*
  * set_debug_options --- apply "-d N" command line option
  *
@@ -2563,24 +2528,6 @@ PostgresMain(int argc, char *argv[], const char *username)
 	(guc_names = lappend(guc_names, pstrdup(name)), \
 	 guc_values = lappend(guc_values, pstrdup(val)))
 
-	/*
-	 * Catch standard options before doing much else.  This even works on
-	 * systems without getopt_long.
-	 */
-	if (!IsUnderPostmaster && argc > 1)
-	{
-		if (strcmp(argv[1], "--help") == 0 || strcmp(argv[1], "-?") == 0)
-		{
-			usage(argv[0]);
-			exit(0);
-		}
-		if (strcmp(argv[1], "--version") == 0 || strcmp(argv[1], "-V") == 0)
-		{
-			puts(PG_VERSIONSTR);
-			exit(0);
-		}
-	}
-
 	/*
 	 * initialize globals (already done if under postmaster, but not if
 	 * standalone; cheap enough to do over)
@@ -2638,6 +2585,13 @@ PostgresMain(int argc, char *argv[], const char *username)
 	 * ----------------
 	 */
 
+	/* Ignore the initial --single argument, if present */
+	if (argc > 1 && strcmp(argv[1], "--single") == 0)
+	{
+		argv++;
+		argc--;
+	}
+
 	/* all options are allowed until '-p' */
 	secure = true;
 	ctx = PGC_POSTMASTER;

src/bin/initdb/initdb.c

@@ -4,7 +4,7 @@
  *
  * initdb creates (initializes) a PostgreSQL database cluster (site,
  * instance, installation, whatever).  A database cluster is a
- * collection of PostgreSQL databases all managed by the same postmaster.
+ * collection of PostgreSQL databases all managed by the same server.
  *
  * To create the database cluster, we create the directory that contains
  * all its data, create the files that hold the global tables, create
@@ -42,7 +42,7 @@
  * Portions Copyright (c) 1994, Regents of the University of California
  * Portions taken from FreeBSD.
  *
- * $PostgreSQL: pgsql/src/bin/initdb/initdb.c,v 1.117 2006/06/07 22:24:44 momjian Exp $
+ * $PostgreSQL: pgsql/src/bin/initdb/initdb.c,v 1.118 2006/06/18 15:38:37 petere Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -140,7 +140,7 @@ static char *authwarning = NULL;
  * (no quoting to worry about).
  */
 static const char *boot_options = "-F";
-static const char *backend_options = "-F -O -c search_path=pg_catalog -c exit_on_error=true";
+static const char *backend_options = "--single -F -O -c search_path=pg_catalog -c exit_on_error=true";
 
 
 /* path to 'initdb' binary directory */
@@ -1138,7 +1138,7 @@ test_config_settings(void)
 		test_max_fsm = FSM_FOR_BUFS(test_buffs);
 
 		snprintf(cmd, sizeof(cmd),
-				 "%s\"%s\" -boot -x0 %s "
+				 "%s\"%s\" --boot -x0 %s "
 				 "-c max_connections=%d "
 				 "-c shared_buffers=%d "
 				 "-c max_fsm_pages=%d "
@@ -1173,7 +1173,7 @@ test_config_settings(void)
 		test_max_fsm = FSM_FOR_BUFS(test_buffs);
 
 		snprintf(cmd, sizeof(cmd),
-				 "%s\"%s\" -boot -x0 %s "
+				 "%s\"%s\" --boot -x0 %s "
 				 "-c max_connections=%d "
 				 "-c shared_buffers=%d "
 				 "-c max_fsm_pages=%d "
@@ -1402,7 +1402,7 @@ bootstrap_template1(char *short_version)
 	unsetenv("PGCLIENTENCODING");
 
 	snprintf(cmd, sizeof(cmd),
-			 "\"%s\" -boot -x1 %s %s template1",
+			 "\"%s\" --boot -x1 %s %s template1",
 			 backend_exec, boot_options, talkargs);
 
 	PG_CMD_OPEN;
@@ -2963,7 +2963,7 @@ main(int argc, char *argv[])
 	get_parent_directory(bin_dir);
 
 	printf(_("\nSuccess. You can now start the database server using:\n\n"
-			 "    %s%s%spostmaster%s -D %s%s%s\n"
+			 "    %s%s%spostgres%s -D %s%s%s\n"
 			 "or\n"
 			 "    %s%s%spg_ctl%s -D %s%s%s -l logfile start\n\n"),
 	   QUOTE_PATH, bin_dir, (strlen(bin_dir) > 0) ? DIR_SEP : "", QUOTE_PATH,

src/bin/pg_ctl/pg_ctl.c

@@ -4,7 +4,7 @@
  *
  * Portions Copyright (c) 1996-2006, PostgreSQL Global Development Group
  *
- * $PostgreSQL: pgsql/src/bin/pg_ctl/pg_ctl.c,v 1.68 2006/06/07 22:24:44 momjian Exp $
+ * $PostgreSQL: pgsql/src/bin/pg_ctl/pg_ctl.c,v 1.69 2006/06/18 15:38:37 petere Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -46,8 +46,8 @@ typedef long pgpid_t;
 
 #define WHITESPACE "\f\n\r\t\v" /* as defined by isspace() */
 
-/* postmaster version ident string */
-#define PM_VERSIONSTR "postmaster (PostgreSQL) " PG_VERSION "\n"
+/* postgres version ident string */
+#define PM_VERSIONSTR "postgres (PostgreSQL) " PG_VERSION "\n"
 
 
 typedef enum
@@ -487,8 +487,8 @@ do_start(void)
 	{
 		old_pid = get_pgpid();
 		if (old_pid != 0)
-			write_stderr(_("%s: another postmaster may be running; "
-						   "trying to start postmaster anyway\n"),
+			write_stderr(_("%s: another server may be running; "
+						   "trying to start server anyway\n"),
 						 progname);
 	}
 
@@ -553,7 +553,7 @@ do_start(void)
 
 		postmaster_path = pg_malloc(MAXPGPATH);
 
-		if ((ret = find_other_exec(argv0, "postmaster", PM_VERSIONSTR,
+		if ((ret = find_other_exec(argv0, "postgres", PM_VERSIONSTR,
 								   postmaster_path)) < 0)
 		{
 			char		full_path[MAXPGPATH];
@@ -562,13 +562,13 @@ do_start(void)
 				StrNCpy(full_path, progname, MAXPGPATH);
 
 			if (ret == -1)
-				write_stderr(_("The program \"postmaster\" is needed by %s "
+				write_stderr(_("The program \"postgres\" is needed by %s "
 							   "but was not found in the\n"
 							   "same directory as \"%s\".\n"
 							   "Check your installation.\n"),
 							 progname, full_path);
 			else
-				write_stderr(_("The program \"postmaster\" was found by \"%s\"\n"
+				write_stderr(_("The program \"postgres\" was found by \"%s\"\n"
 							   "but was not the same version as %s.\n"
 							   "Check your installation.\n"),
 							 full_path, progname);
@@ -580,7 +580,7 @@ do_start(void)
 	exitcode = start_postmaster();
 	if (exitcode != 0)
 	{
-		write_stderr(_("%s: could not start postmaster: exit code was %d\n"),
+		write_stderr(_("%s: could not start server: exit code was %d\n"),
 					 progname, exitcode);
 		exit(1);
 	}
@@ -591,7 +591,7 @@ do_start(void)
 		pid = get_pgpid();
 		if (pid == old_pid)
 		{
-			write_stderr(_("%s: could not start postmaster\n"
+			write_stderr(_("%s: could not start server\n"
 						   "Examine the log output.\n"),
 						 progname);
 			exit(1);
@@ -600,21 +600,21 @@ do_start(void)
 
 	if (do_wait)
 	{
-		print_msg(_("waiting for postmaster to start..."));
+		print_msg(_("waiting for server to start..."));
 
 		if (test_postmaster_connection() == false)
 		{
-			printf(_("could not start postmaster\n"));
+			printf(_("could not start server\n"));
 			exit(1);
 		}
 		else
 		{
 			print_msg(_(" done\n"));
-			print_msg(_("postmaster started\n"));
+			print_msg(_("server started\n"));
 		}
 	}
 	else
-		print_msg(_("postmaster starting\n"));
+		print_msg(_("server starting\n"));
 }
 
 
@@ -629,14 +629,14 @@ do_stop(void)
 	if (pid == 0)				/* no pid file */
 	{
 		write_stderr(_("%s: PID file \"%s\" does not exist\n"), progname, pid_file);
-		write_stderr(_("Is postmaster running?\n"));
+		write_stderr(_("Is server running?\n"));
 		exit(1);
 	}
 	else if (pid < 0)			/* standalone backend, not postmaster */
 	{
 		pid = -pid;
-		write_stderr(_("%s: cannot stop postmaster; "
-					   "postgres is running (PID: %ld)\n"),
+		write_stderr(_("%s: cannot stop server; "
+					   "single-user server is running (PID: %ld)\n"),
 					 progname, pid);
 		exit(1);
 	}
@@ -650,12 +650,12 @@ do_stop(void)
 
 	if (!do_wait)
 	{
-		print_msg(_("postmaster shutting down\n"));
+		print_msg(_("server shutting down\n"));
 		return;
 	}
 	else
 	{
-		print_msg(_("waiting for postmaster to shut down..."));
+		print_msg(_("waiting for server to shut down..."));
 
 		for (cnt = 0; cnt < wait_seconds; cnt++)
 		{
@@ -672,12 +672,12 @@ do_stop(void)
 		{
 			print_msg(_(" failed\n"));
 
-			write_stderr(_("%s: postmaster does not shut down\n"), progname);
+			write_stderr(_("%s: server does not shut down\n"), progname);
 			exit(1);
 		}
 		print_msg(_(" done\n"));
 
-		printf(_("postmaster stopped\n"));
+		printf(_("server stopped\n"));
 	}
 }
 
@@ -698,8 +698,8 @@ do_restart(void)
 	{
 		write_stderr(_("%s: PID file \"%s\" does not exist\n"),
 					 progname, pid_file);
-		write_stderr(_("Is postmaster running?\n"));
-		write_stderr(_("starting postmaster anyway\n"));
+		write_stderr(_("Is server running?\n"));
+		write_stderr(_("starting server anyway\n"));
 		do_start();
 		return;
 	}
@@ -708,10 +708,10 @@ do_restart(void)
 		pid = -pid;
 		if (postmaster_is_alive((pid_t) pid))
 		{
-			write_stderr(_("%s: cannot restart postmaster; "
-						   "postgres is running (PID: %ld)\n"),
+			write_stderr(_("%s: cannot restart server; "
+						   "single-user server is running (PID: %ld)\n"),
 						 progname, pid);
-			write_stderr(_("Please terminate postgres and try again.\n"));
+			write_stderr(_("Please terminate the single-user server and try again.\n"));
 			exit(1);
 		}
 	}
@@ -725,7 +725,7 @@ do_restart(void)
 			exit(1);
 		}
 
-		print_msg(_("waiting for postmaster to shut down..."));
+		print_msg(_("waiting for server to shut down..."));
 
 		/* always wait for restart */
 
@@ -744,18 +744,18 @@ do_restart(void)
 		{
 			print_msg(_(" failed\n"));
 
-			write_stderr(_("%s: postmaster does not shut down\n"), progname);
+			write_stderr(_("%s: server does not shut down\n"), progname);
 			exit(1);
 		}
 
 		print_msg(_(" done\n"));
-		printf(_("postmaster stopped\n"));
+		printf(_("server stopped\n"));
 	}
 	else
 	{
-		write_stderr(_("%s: old postmaster process (PID: %ld) seems to be gone\n"),
+		write_stderr(_("%s: old server process (PID: %ld) seems to be gone\n"),
 					 progname, pid);
-		write_stderr(_("starting postmaster anyway\n"));
+		write_stderr(_("starting server anyway\n"));
 	}
 
 	do_start();
@@ -771,16 +771,16 @@ do_reload(void)
 	if (pid == 0)				/* no pid file */
 	{
 		write_stderr(_("%s: PID file \"%s\" does not exist\n"), progname, pid_file);
-		write_stderr(_("Is postmaster running?\n"));
+		write_stderr(_("Is server running?\n"));
 		exit(1);
 	}
 	else if (pid < 0)			/* standalone backend, not postmaster */
 	{
 		pid = -pid;
-		write_stderr(_("%s: cannot reload postmaster; "
-					   "postgres is running (PID: %ld)\n"),
+		write_stderr(_("%s: cannot reload server; "
+					   "single-user server is running (PID: %ld)\n"),
 					 progname, pid);
-		write_stderr(_("Please terminate postgres and try again.\n"));
+		write_stderr(_("Please terminate the single-user server and try again.\n"));
 		exit(1);
 	}
 
@@ -791,7 +791,7 @@ do_reload(void)
 		exit(1);
 	}
 
-	print_msg(_("postmaster signaled\n"));
+	print_msg(_("server signaled\n"));
 }
 
 /*
@@ -835,7 +835,7 @@ do_status(void)
 			pid = -pid;
 			if (postmaster_is_alive((pid_t) pid))
 			{
-				printf(_("%s: a standalone backend \"postgres\" is running (PID: %ld)\n"),
+				printf(_("%s: single-user server is running (PID: %ld)\n"),
 					   progname, pid);
 				return;
 			}
@@ -847,7 +847,7 @@ do_status(void)
 			{
 				char	  **optlines;
 
-				printf(_("%s: postmaster is running (PID: %ld)\n"),
+				printf(_("%s: server is running (PID: %ld)\n"),
 					   progname, pid);
 
 				optlines = readfile(postopts_file);
@@ -858,7 +858,7 @@ do_status(void)
 			}
 		}
 	}
-	printf(_("%s: neither postmaster nor postgres running\n"), progname);
+	printf(_("%s: no server running\n"), progname);
 	exit(1);
 }
 
@@ -909,10 +909,10 @@ pgwin32_CommandLine(bool registration)
 	}
 	else
 	{
-		ret = find_other_exec(argv0, "postmaster", PM_VERSIONSTR, cmdLine);
+		ret = find_other_exec(argv0, "postgres", PM_VERSIONSTR, cmdLine);
 		if (ret != 0)
 		{
-			write_stderr(_("%s: could not find postmaster program executable\n"), progname);
+			write_stderr(_("%s: could not find postgres program executable\n"), progname);
 			exit(1);
 		}
 	}
@@ -1373,9 +1373,9 @@ do_help(void)
 
 	printf(_("\nOptions for start or restart:\n"));
 	printf(_("  -l, --log FILENAME     write (or append) server log to FILENAME\n"));
-	printf(_("  -o OPTIONS             command line options to pass to the postmaster\n"
+	printf(_("  -o OPTIONS             command line options to pass to postgres\n"
 			 "                         (PostgreSQL server executable)\n"));
-	printf(_("  -p PATH-TO-POSTMASTER  normally not necessary\n"));
+	printf(_("  -p PATH-TO-POSTGRES    normally not necessary\n"));
 
 	printf(_("\nOptions for stop or restart:\n"));
 	printf(_("  -m SHUTDOWN-MODE   may be \"smart\", \"fast\", or \"immediate\"\n"));