Merge postmaster and postgres command into just postgres. postmaster

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

Author: petere

doc/src/sgml/arch-dev.sgml

@@ -1,4 +1,4 @@
-<!-- $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

@@ -1,4 +1,4 @@
-<!-- $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

@@ -1,4 +1,4 @@
-<!-- $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

@@ -1,4 +1,4 @@
-<!-- $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,15 +267,15 @@ 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>.
      </para>
 
      <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

@@ -1,4 +1,4 @@
-<!-- $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

@@ -1,4 +1,4 @@
-<!-- $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

@@ -1,4 +1,4 @@
-<!-- $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

@@ -1,4 +1,4 @@
-<!-- $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

@@ -1,4 +1,4 @@
-<!-- $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.)