aboutsummaryrefslogtreecommitdiff
path: root/doc/src/sgml/ref/postgres-ref.sgml
diff options
context:
space:
mode:
authorBruce Momjian <bruce@momjian.us>2012-08-30 17:58:36 -0400
committerBruce Momjian <bruce@momjian.us>2012-08-30 17:58:36 -0400
commitb5dc7612a5f66a08c6d46656d359fc1c69670f36 (patch)
treefae9008b2d3af3ed528115175f1ac01193292da1 /doc/src/sgml/ref/postgres-ref.sgml
parent39d0653d058b87b437be05fd295ceb5bb4e9e05c (diff)
downloadpostgresql-b5dc7612a5f66a08c6d46656d359fc1c69670f36.tar.gz
postgresql-b5dc7612a5f66a08c6d46656d359fc1c69670f36.zip
Properly document that SIGTERM is OK for users to use on a postgres
session, now that pg_terminate_backend() uses it. Josh Kupershmidt
Diffstat (limited to 'doc/src/sgml/ref/postgres-ref.sgml')
-rw-r--r--doc/src/sgml/ref/postgres-ref.sgml14
1 files changed, 9 insertions, 5 deletions
diff --git a/doc/src/sgml/ref/postgres-ref.sgml b/doc/src/sgml/ref/postgres-ref.sgml
index 41745fb34dc..943a3be00e3 100644
--- a/doc/src/sgml/ref/postgres-ref.sgml
+++ b/doc/src/sgml/ref/postgres-ref.sgml
@@ -732,14 +732,18 @@ PostgreSQL documentation
<para>
To cancel a running query, send the <literal>SIGINT</literal> signal
- to the process running that command.
+ to the process running that command. To terminate a backend process
+ cleanly, send <literal>SIGTERM</literal> to that process. See
+ also <function>pg_cancel_backend</> and <function>pg_terminate_backend</>
+ in <xref linkend="functions-admin-signal"> for the SQL-callable equivalents
+ of these two actions.
</para>
<para>
- The <command>postgres</command> server uses <literal>SIGTERM</literal>
- to tell subordinate server processes to quit normally and
- <literal>SIGQUIT</literal> to terminate without the normal cleanup.
- These signals <emphasis>should not</emphasis> be used by users. It
+ The <command>postgres</command> server uses <literal>SIGQUIT</literal>
+ to tell subordinate server processes to terminate without normal
+ cleanup.
+ This signal <emphasis>should not</emphasis> be used by users. It
is also unwise to send <literal>SIGKILL</literal> to a server
process &mdash; the main <command>postgres</command> process will
interpret this as a crash and will force all the sibling processes