Put a tad more detail in the discussion of postmaster and postgres

signal handling.

diff --git a/doc/src/sgml/ref/postgres-ref.sgml b/doc/src/sgml/ref/postgres-ref.sgml
index 9c961492a9e40a36b7844b1c845d1dfb0056cc00..b80c9caafac0b55f49cec418849b4b34c4494a4a 100644 (file)
--- a/doc/src/sgml/ref/postgres-ref.sgml
+++ b/doc/src/sgml/ref/postgres-ref.sgml
@@ -1,5 +1,5 @@
 <!--
-$Header: /cvsroot/pgsql/doc/src/sgml/ref/postgres-ref.sgml,v 1.35 2003/08/31 17:32:24 petere Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/ref/postgres-ref.sgml,v 1.36 2003/09/18 20:30:15 tgl Exp $
 PostgreSQL documentation
 -->
 
@@ -365,13 +365,29 @@ PostgreSQL documentation
   <title>Notes</title>
 
   <para>
-   To stop a running query use the <literal>SIGINT</literal> signal. To
-   tell <command>postgres</command> to reread the configuration file,
-   use a <literal>SIGHUP</literal> signal. The
-   <command>postmaster</command> uses <literal>SIGTERM</literal>
+   To cancel a running query, send the <literal>SIGINT</literal> signal
+   to the <command>postgres</command> process running that command.
+  </para>
+
+  <para>
+   To tell <command>postgres</command> to reread the configuration file,
+   send a <literal>SIGHUP</literal> signal.  Normally it's best to
+   <literal>SIGHUP</literal> the <command>postmaster</command> instead;
+   the <command>postmaster</command> will in turn <literal>SIGHUP</literal>
+   each of its children.  But in some cases it might be desirable to have only
+   one <command>postgres</command> process reread the configuration file.
+  </para>
+
+  <para>
+   The <command>postmaster</command> uses <literal>SIGTERM</literal>
    to tell a <command>postgres</command> process to quit normally and
    <literal>SIGQUIT</literal> to terminate without the normal cleanup.
-   These <emphasis>should not</emphasis> be used by users.
+   These signals <emphasis>should not</emphasis> be used by users.  It is also
+   unwise to send <literal>SIGKILL</literal> to a <command>postgres</command>
+   process --- the <command>postmaster</command> will interpret this as
+   a crash in <command>postgres</command>, and will force all the sibling
+   <command>postgres</command> processes to quit as part of its standard
+   crash-recovery procedure.
   </para>
 
  </refsect1>

diff --git a/doc/src/sgml/ref/postmaster.sgml b/doc/src/sgml/ref/postmaster.sgml
index 77aecf70310fc2b5f112d8268d28820059ae7585..f4ec3c98986e5e38b52333574edc7f414ab03721 100644 (file)
--- a/doc/src/sgml/ref/postmaster.sgml
+++ b/doc/src/sgml/ref/postmaster.sgml
@@ -1,5 +1,5 @@
 <!--
-$Header: /cvsroot/pgsql/doc/src/sgml/ref/postmaster.sgml,v 1.39 2003/09/12 00:12:47 tgl Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/ref/postmaster.sgml,v 1.40 2003/09/18 20:30:15 tgl Exp $
 PostgreSQL documentation
 -->
 
@@ -473,10 +473,11 @@ PostgreSQL documentation
   <para>
    If at all possible, <emphasis>do not</emphasis> use
    <literal>SIGKILL</literal> to kill the
-   <command>postmaster</command>.  This will prevent
+   <command>postmaster</command>.  Doing so will prevent
    <command>postmaster</command> from freeing the system
    resources (e.g., shared memory and semaphores) that it holds before
-   terminating.
+   terminating.  This may cause problems for starting a fresh
+   <command>postmaster</command> run.
   </para>
 
   <para>