Minor improvements to postmaster/backend man pages.

diff --git a/src/man/postgres.1 b/src/man/postgres.1
index a8a971a..244f5f8 100644 (file)
--- a/src/man/postgres.1
+++ b/src/man/postgres.1
@@ -1,7 +1,7 @@
 .\" This is -*-nroff-*-
 .\" XXX standard disclaimer belongs here....
-.\" $Header: /cvsroot/pgsql/src/man/Attic/postgres.1,v 1.14 1999/03/17 22:53:31 momjian Exp $
-.TH POSTGRESQL UNIX 12/08/96 PostgreSQL PostgreSQL
+.\" $Header: /cvsroot/pgsql/src/man/Attic/postgres.1,v 1.15 1999/05/19 23:30:43 tgl Exp $
+.TH POSTGRESQL UNIX 05/19/99 PostgreSQL PostgreSQL
 .SH NAME
 postgres - the Postgres backend server
 .SH SYNOPSIS
@@ -57,6 +57,11 @@ done while other Postgres backends are being managed by a
 .IR postmaster
 on this set of databases.
 .PP
+Some of the switches explained in this man page can be passed to the backend
+through the "database options" field of a connection request, and thus can be
+set for a particular backend without going to the trouble of restarting the
+postmaster.  This is particularly handy for debugging-related switches.
+.PP
 The optional argument
 .IR dbname
 specifies the name of the database to be accessed.
@@ -77,7 +82,8 @@ is the number of shared-memory buffers that the
 .IR "postmaster"
 has allocated for the backend server processes that it starts.  If the
 backend is running standalone, this specifies the number of buffers to
-allocate.  This value defaults to 64, and each buffer is 8k bytes.
+allocate.  This value defaults to 64 buffers, where each buffer is 8k bytes
+(or whatever BLCKSZ is set to in config.h).
 .TP
 .BR "-C"
 Do not show server version number.
@@ -116,9 +122,12 @@ useful for interactive use.
 Specifies \*(lqquiet\*(rq mode.
 .TP
 .BR "-S"
-Specifies the amount of memory to be used by internal sorts before using
-disk files for sorting.  This value is specified in 1k bytes, and
-defaults to 512.
+Specifies the amount of memory to be used by internal sorts and hashes
+before resorting to temporary disk files.  The value is specified in
+kilobytes, and defaults to 512 kilobytes.  Note that for a complex query,
+several sorts and/or hashes might be running in parallel, and each one
+will be allowed to use as much as -S kilobytes before it starts to put
+data into temporary files.
 .TP
 .BR "-e"
 The
@@ -185,8 +194,9 @@ Forbids the use of particular scan and join methods:
 disable sequential and index scans respectively, while
 .IR n ", " m " and " h
 disable nested-loop, merge and hash joins respectively.
-This is another feature that may not necessarily produce executable
-plans.
+(Neither sequential scans nor nested-loop joins can be disabled completely;
+the -fs and -fn options simply discourage the optimizer from using those
+plan types if it has any other alternative.)
 .TP
 .BR "-i"
 Prevents query execution, but shows the plan tree.

diff --git a/src/man/postmaster.1 b/src/man/postmaster.1
index 4740cd4..5bf5e94 100644 (file)
--- a/src/man/postmaster.1
+++ b/src/man/postmaster.1
@@ -1,7 +1,7 @@
 .\" This is -*-nroff-*-
 .\" XXX standard disclaimer belongs here....
-.\" $Header: /cvsroot/pgsql/src/man/Attic/postmaster.1,v 1.15 1999/02/22 05:26:58 momjian Exp $
-.TH POSTMASTER UNIX 02/20/99 PostgreSQL PostgreSQL
+.\" $Header: /cvsroot/pgsql/src/man/Attic/postmaster.1,v 1.16 1999/05/19 23:30:43 tgl Exp $
+.TH POSTMASTER UNIX 05/19/99 PostgreSQL PostgreSQL
 .SH "NAME"
 postmaster - run the Postgres postmaster
 .SH "SYNOPSIS"
@@ -49,12 +49,17 @@ port]
 The
 .IR "postmaster"
 manages the communication between frontend and backend processes, as
-well as allocating the shared buffer pool and semaphores (on machines
-without a test-and-set instruction).  The 
+well as allocating the shared buffer pool and SysV semaphores
+(on machines without a test-and-set instruction).  The 
 .IR postmaster
 does not itself interact with the user and should be started as a
 background process.
-.BR "Only one postmaster should be run on a machine."
+.PP
+.BR "Only one postmaster should be running at a time in a given
+Postgres installation."
+Here, an installation means a database directory and postmaster port number.
+You can run more than one postmaster on a machine only if each one has a
+separate directory and port number.
 .PP
 The 
 .IR "postmaster"
@@ -65,12 +70,13 @@ understands the following command-line options:
 is the number of shared-memory buffers for the 
 .IR "postmaster"
 to allocate and manage for the backend server processes that it
-starts.  This value defaults to 64, and each buffer is 8k bytes.
+starts.  This value defaults to 64 buffers, where each buffer is 8k bytes
+(or whatever BLCKSZ is set to in config.h).
 .TP
 .BR "-D" " data_dir"
 Specifies the directory to use as the root of the tree of database
-directories.  This directory uses the value of the environment
-variable 
+directories.  If -D is not given, the default data directory name is
+the value of the environment variable 
 .SM PGDATA.
 If 
 .SM PGDATA
@@ -86,7 +92,7 @@ is the maximum number of backend server processes that this postmaster
 is allowed to start.  In the stock configuration, this value defaults
 to 64, and can be set as high as 1024 if your system will support that
 many processes. Both the default and upper limit values can be altered
-when building Postgres.
+when building Postgres (see src/include/config.h).
 .TP
 .BR "-S"
 Specifies that the
@@ -113,7 +119,8 @@ authentication, use
 to deny any unauthenticated
 connections, use
 .BR "-a nounauth .
-This option no longer has any effect.
+This option no longer has any effect!  The pg_hba.conf configuration
+file now controls authentication.
 .TP
 .BR "-b" " backend_pathname"
 .IR "backend_pathname"
@@ -131,6 +138,9 @@ was invoked.  If no pathname was specified, then the
 .SM PATH
 environment variable is searched for an executable named
 \*(lqpostgres\*(rq).
+This option is also obsolete, since the postmaster and backend are now
+a single executable --- the postmaster forks a backend but does not do
+an exec.
 .TP
 .BR "-d" " [debug_level]"
 The optional argument
@@ -201,9 +211,12 @@ Specifies the TCP/IP port or local Unix domain socket file extension
 on which the
 .IR postmaster
 is to listen for connections from frontend applications.  Defaults to
-5432, or the value of the 
+the value of the 
+.SM PGPORT 
+environment variable, or if
 .SM PGPORT 
-environment variable (if set).  If you specify a port other than the
+is not set, then the default value established when Postgres was
+compiled (normally 5432).  If you specify a port other than the
 default port then all frontend application users must specify the same
 port (using command-line options or
 .SM PGPORT\c
@@ -253,7 +266,7 @@ simplest and most common way to start the
 .nf
 
 # start with specific port and executable name
-nohup postmaster -p -b /usr/postgres/bin/postgres &
+nohup postmaster -p 1234 -b /usr/postgres/bin/postgres &
 
 .fi
 This command will start up a 
@@ -281,7 +294,7 @@ postgres(1),
 .BR "FindBackend: could not find a backend to execute..."
 If you see this message, you do not have the 
 .IR "postgres"
-executable in your path.  Add the directoy in which postgres resides to
+executable in your path.  Add the directory in which postgres resides to
 your path.
 .TP
 .BR "semget: No space left on device"
@@ -293,10 +306,11 @@ again.  If this still doesn't work, you probably need to configure
 your kernel for shared memory and semaphores as described in the
 installation notes.  If you run multiple 
 .IR postmaster s
-on a single host, or have reduced the shared memory and semaphore
-parameters from the defaults in the generic kernel, you may have to 
-go back and increase the shared memory and semaphores configured 
-into your kernel.
+on a single host, or have a kernel with particularly small shared memory
+and/or semaphore limits, you may have to reconfigure your kernel to increase
+its shared memory or semaphore parameters.  (You may be able to postpone
+reconfiguring your kernel by reducing -B to reduce Postgres' shared memory
+consumption, or by reducing -N to reduce Postgres' semaphore consumption.)
 .TP
 .BR "StreamServerPort: cannot bind to port"
 If you see this message, you should be certain that there is no other