aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--doc/src/sgml/runtime.sgml6
-rw-r--r--src/backend/utils/misc/guc.c4
2 files changed, 5 insertions, 5 deletions
diff --git a/doc/src/sgml/runtime.sgml b/doc/src/sgml/runtime.sgml
index 6de2e4039c3..0142b6b6452 100644
--- a/doc/src/sgml/runtime.sgml
+++ b/doc/src/sgml/runtime.sgml
@@ -1,5 +1,5 @@
<!--
-$Header: /cvsroot/pgsql/doc/src/sgml/runtime.sgml,v 1.20 2000/08/26 19:34:24 petere Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/runtime.sgml,v 1.21 2000/08/28 11:57:40 petere Exp $
-->
<Chapter Id="runtime">
@@ -964,7 +964,7 @@ env PGOPTIONS='--geqo=off' psql
</varlistentry>
<varlistentry>
- <term>SHMEM_BUFFERS (<type>integer</type>)</term>
+ <term>SHARED_BUFFERS (<type>integer</type>)</term>
<listitem>
<para>
Sets the number of shared memory buffers the database server
@@ -1030,7 +1030,7 @@ env PGOPTIONS='--geqo=off' psql
<tbody>
<row>
<entry>-B <replaceable>x</replaceable></entry>
- <entry>shmem_buffers = <replaceable>x</replaceable></entry>
+ <entry>shared_buffers = <replaceable>x</replaceable></entry>
<entry></entry>
</row>
<row>
diff --git a/src/backend/utils/misc/guc.c b/src/backend/utils/misc/guc.c
index 485a15ff356..09b236e25bb 100644
--- a/src/backend/utils/misc/guc.c
+++ b/src/backend/utils/misc/guc.c
@@ -4,7 +4,7 @@
* Support for grand unified configuration scheme, including SET
* command, configuration file, and command line options.
*
- * $Header: /cvsroot/pgsql/src/backend/utils/misc/guc.c,v 1.9 2000/08/25 10:00:31 petere Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/misc/guc.c,v 1.10 2000/08/28 11:57:41 petere Exp $
*
* Copyright 2000 by PostgreSQL Global Development Group
* Written by Peter Eisentraut <peter_e@gmx.net>.
@@ -231,7 +231,7 @@ ConfigureNamesInt[] =
*/
{"max_connections", PGC_POSTMASTER, &MaxBackends,
DEF_MAXBACKENDS, 1, MAXBACKENDS},
- {"shmem_buffers", PGC_POSTMASTER, &NBuffers,
+ {"shared_buffers", PGC_POSTMASTER, &NBuffers,
DEF_NBUFFERS, 16, INT_MAX},
{"port", PGC_POSTMASTER, &PostPortName,
DEF_PGPORT, 1, 65535},