postgrespro
diff --git a/‎doc/src/sgml/catalogs.sgml
Lines changed: 7 additions & 1 deletion b/‎doc/src/sgml/catalogs.sgml
Lines changed: 7 additions & 1 deletion
diff --git a/‎doc/src/sgml/config.sgml
Lines changed: 16 additions & 1 deletion b/‎doc/src/sgml/config.sgml
Lines changed: 16 additions & 1 deletion
diff --git a/‎src/backend/catalog/system_views.sql
Lines changed: 2 additions & 2 deletions b/‎src/backend/catalog/system_views.sql
Lines changed: 2 additions & 2 deletions
diff --git a/‎src/backend/utils/misc/guc-file.l
Lines changed: 4 additions & 2 deletions b/‎src/backend/utils/misc/guc-file.l
Lines changed: 4 additions & 2 deletions
@@ -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
  -->
@@ -5482,6 +5482,12 @@
       <entry></entry>
       <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>
 
@@ -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>
@@ -28,6 +28,20 @@
     (all case-insensitive) or any unambiguous prefix of these.
    </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</></>,
@@ -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
 
@@ -3,7 +3,7 @@
  *
  * Copyright (c) 1996-2006, PostgreSQL Global Development Group
  *
- * $PostgreSQL: pgsql/src/backend/catalog/system_views.sql,v 1.28 2006/07/25 03:51:21 tgl Exp $
+ * $PostgreSQL: pgsql/src/backend/catalog/system_views.sql,v 1.29 2006/07/27 08:30:41 petere Exp $
  */
 
 CREATE VIEW pg_roles AS 
@@ -172,7 +172,7 @@ CREATE VIEW pg_prepared_statements AS
 CREATE VIEW pg_settings AS 
     SELECT * 
     FROM pg_show_all_settings() AS A 
-    (name text, setting text, category text, short_desc text, extra_desc text,
+    (name text, setting text, unit text, category text, short_desc text, extra_desc text,
      context text, vartype text, source text, min_val text, max_val text);
 
 CREATE RULE pg_settings_u AS 
 
@@ -4,7 +4,7 @@
  *
  * Copyright (c) 2000-2006, PostgreSQL Global Development Group
  *
- * $PostgreSQL: pgsql/src/backend/utils/misc/guc-file.l,v 1.37 2006/03/07 01:03:12 tgl Exp $
+ * $PostgreSQL: pgsql/src/backend/utils/misc/guc-file.l,v 1.38 2006/07/27 08:30:41 petere Exp $
  */
 
 %{
@@ -68,7 +68,9 @@ SIGN            ("-"|"+")
 DIGIT           [0-9]
 HEXDIGIT        [0-9a-fA-F]
 
-INTEGER         {SIGN}?({DIGIT}+|0x{HEXDIGIT}+)
+UNIT_LETTER     [a-zA-Z]
+
+INTEGER         {SIGN}?({DIGIT}+|0x{HEXDIGIT}+){UNIT_LETTER}*
 
 EXPONENT        [Ee]{SIGN}?{DIGIT}+
 REAL            {SIGN}?{DIGIT}*"."{DIGIT}*{EXPONENT}?