diff options
Diffstat (limited to 'doc/src')
| -rw-r--r-- | doc/src/sgml/catalogs.sgml | 8 | ||||
| -rw-r--r-- | doc/src/sgml/config.sgml | 17 |
2 files changed, 23 insertions, 2 deletions
diff --git a/doc/src/sgml/catalogs.sgml b/doc/src/sgml/catalogs.sgml index cf5d3f3b855..dfb6348e1d6 100644 --- a/doc/src/sgml/catalogs.sgml +++ b/doc/src/sgml/catalogs.sgml @@ -1,4 +1,4 @@ -<!-- $PostgreSQL: pgsql/doc/src/sgml/catalogs.sgml,v 2.127 2006/07/25 03:51:21 tgl Exp $ --> +<!-- $PostgreSQL: pgsql/doc/src/sgml/catalogs.sgml,v 2.128 2006/07/27 08:30:41 petere Exp $ --> <!-- Documentation of the system catalogs, directed toward PostgreSQL developers --> @@ -5483,6 +5483,12 @@ <entry>current value of the parameter</entry> </row> <row> + <entry><structfield>unit</structfield></entry> + <entry><type>text</type></entry> + <entry></entry> + <entry>implicit unit of the parameter</entry> + </row> + <row> <entry><structfield>category</structfield></entry> <entry><type>text</type></entry> <entry></entry> diff --git a/doc/src/sgml/config.sgml b/doc/src/sgml/config.sgml index 45350ac7ae9..0acdd275078 100644 --- a/doc/src/sgml/config.sgml +++ b/doc/src/sgml/config.sgml @@ -1,4 +1,4 @@ -<!-- $PostgreSQL: pgsql/doc/src/sgml/config.sgml,v 1.70 2006/07/26 11:35:55 petere Exp $ --> +<!-- $PostgreSQL: pgsql/doc/src/sgml/config.sgml,v 1.71 2006/07/27 08:30:41 petere Exp $ --> <chapter Id="runtime-config"> <title>Server Configuration</title> @@ -29,6 +29,20 @@ </para> <para> + Some settings specify a memory or time value. Each of these has + an implicit unit, which is either kilobytes, blocks (typically 8 + kilobytes), milliseconds, seconds, or minutes. For convenience, a + (possibly different) unit can also be specified explicitly. Valid + memory units are <literal>kB</literal> (kilobytes), + <literal>MB</literal> (megabytes), and <literal>GB</literal> + (gigabytes); valid time units are <literal>ms</literal> + (milliseconds), <literal>s</literal> (seconds), + <literal>min</literal> (minutes), <literal>h</literal> (hours), + and <literal>d</literal> (days). Note that the multiplier for + memory units in 1024, not 1000. + </para> + + <para> One way to set these parameters is to edit the file <filename>postgresql.conf</><indexterm><primary>postgresql.conf</></>, which is normally kept in the data directory. (<application>initdb</> @@ -39,6 +53,7 @@ log_connections = yes log_destination = 'syslog' search_path = '"$user", public' +shared_buffers = 128MB </programlisting> One parameter is specified per line. The equal sign between name and value is optional. Whitespace is insignificant and blank lines are |