This patch fixes a few more uppercase GUC vars. I also removed an

example from the RESET reference page because it seemed completely
redundant.

diff --git a/doc/src/sgml/ref/analyze.sgml b/doc/src/sgml/ref/analyze.sgml
index ca8a7518ac7d5577025ebbf72b2b6dd57b24928e..102d1dafccc9f5cf2416cf64fcb280fc67933a71 100644 (file)
--- a/doc/src/sgml/ref/analyze.sgml
+++ b/doc/src/sgml/ref/analyze.sgml
@@ -1,5 +1,5 @@
 
 
@@ -134,7 +134,7 @@ ANALYZE [ VERBOSE ] [ table [ (
 
   
    The extent of analysis can be controlled by adjusting the
-   DEFAULT_STATISTICS_TARGET parameter variable, or
+   default_statistics_target parameter variable, or
    on a column-by-column basis by setting the per-column statistics
    target with ALTER TABLE ... ALTER COLUMN ... SET
    STATISTICS (see 


diff --git a/doc/src/sgml/ref/create_user.sgml b/doc/src/sgml/ref/create_user.sgml

index 3a08393e27b5078edecf2c9e7ab8ce565194bcb7..a243d611401af011208d1dac6326bd070d6d36af 100644 (file)

--- a/doc/src/sgml/ref/create_user.sgml
+++ b/doc/src/sgml/ref/create_user.sgml
@@ -1,5 +1,5 @@
 
 
@@ -98,7 +98,7 @@ where option can be:
    These key words control whether the password is stored
    encrypted in the system catalogs.  (If neither is specified,
    the default behavior is determined by the configuration
-   parameter PASSWORD_ENCRYPTION.)  If the
+   parameter password_encryption.)  If the
    presented password string is already in MD5-encrypted format,
    then it is stored encrypted as-is, regardless of whether
    ENCRYPTED or UNENCRYPTED is specified


diff --git a/doc/src/sgml/ref/postmaster.sgml b/doc/src/sgml/ref/postmaster.sgml

index f3e55507cf0737d84dc56c5c924a70107fcce6dd..6623b247de7e066c03ef2a07ae8f6c6daf1b1f85 100644 (file)

--- a/doc/src/sgml/ref/postmaster.sgml
+++ b/doc/src/sgml/ref/postmaster.sgml
@@ -1,5 +1,5 @@
 
 
@@ -376,7 +376,7 @@ PostgreSQL documentation
 
     
      
-      Default value of the DATESTYLE run-time
+      Default value of the DateStyle run-time
       parameter.  (The use of this environment variable is deprecated.)
      
     
@@ -544,7 +544,7 @@ PostgreSQL documentation
 $ postmaster -c sort_mem=1234
 $ postmaster --sort-mem=1234
 
-   Either form overrides whatever setting might exist for SORT_MEM
+   Either form overrides whatever setting might exist for sort_mem
    in postgresql.conf.  Notice that underscores in parameter
    names can be written as either underscore or dash on the command line.
   


diff --git a/doc/src/sgml/ref/reset.sgml b/doc/src/sgml/ref/reset.sgml

index d90fb29003b8c2dcc0a255004271c67c642fe35d..e94ad782cc9cef459ae746e69a60842d1ef98543 100644 (file)

--- a/doc/src/sgml/ref/reset.sgml
+++ b/doc/src/sgml/ref/reset.sgml
@@ -1,5 +1,5 @@
 
 
@@ -83,14 +83,7 @@ SET parameter TO DEFAULT
   Examples
 
   
-   Set DATESTYLE to its default value:
-
-RESET datestyle;
-
-  
-
-  
-   Set GEQO to its default value:
+   Set the geqo configuration variable to its default value:
 
 RESET geqo;
 


diff --git a/doc/src/sgml/ref/select.sgml b/doc/src/sgml/ref/select.sgml

index 5bd546afa6c975c0e4d0f570a307345f9880a952..c765329df11fde15c2f4419cc6a62d70a572a3d3 100644 (file)

--- a/doc/src/sgml/ref/select.sgml
+++ b/doc/src/sgml/ref/select.sgml
@@ -1,5 +1,5 @@
 
 
@@ -1022,7 +1022,7 @@ SELECT distributors.* FROM distributors d, distributors distributors;
     SELECT statement that also contains an explicit
     FROM clause.  Also, it is possible to disable
     the implicit-FROM feature by setting the
-    ADD_MISSING_FROM parameter to false.
+    add_missing_from parameter to false.
    
   
 

diff --git a/doc/src/sgml/ref/create_user.sgml b/doc/src/sgml/ref/create_user.sgml
index 3a08393e27b5078edecf2c9e7ab8ce565194bcb7..a243d611401af011208d1dac6326bd070d6d36af 100644 (file)
--- a/doc/src/sgml/ref/create_user.sgml
+++ b/doc/src/sgml/ref/create_user.sgml
@@ -1,5 +1,5 @@
 
 
@@ -98,7 +98,7 @@ where option can be:
    These key words control whether the password is stored
    encrypted in the system catalogs.  (If neither is specified,
    the default behavior is determined by the configuration
-   parameter PASSWORD_ENCRYPTION.)  If the
+   parameter password_encryption.)  If the
    presented password string is already in MD5-encrypted format,
    then it is stored encrypted as-is, regardless of whether
    ENCRYPTED or UNENCRYPTED is specified

diff --git a/doc/src/sgml/ref/postmaster.sgml b/doc/src/sgml/ref/postmaster.sgml
index f3e55507cf0737d84dc56c5c924a70107fcce6dd..6623b247de7e066c03ef2a07ae8f6c6daf1b1f85 100644 (file)
--- a/doc/src/sgml/ref/postmaster.sgml
+++ b/doc/src/sgml/ref/postmaster.sgml
@@ -1,5 +1,5 @@
 
 
@@ -376,7 +376,7 @@ PostgreSQL documentation
 
     
      
-      Default value of the DATESTYLE run-time
+      Default value of the DateStyle run-time
       parameter.  (The use of this environment variable is deprecated.)
      
     
@@ -544,7 +544,7 @@ PostgreSQL documentation
 $ postmaster -c sort_mem=1234
 $ postmaster --sort-mem=1234
 
-   Either form overrides whatever setting might exist for SORT_MEM
+   Either form overrides whatever setting might exist for sort_mem
    in postgresql.conf.  Notice that underscores in parameter
    names can be written as either underscore or dash on the command line.
   

diff --git a/doc/src/sgml/ref/reset.sgml b/doc/src/sgml/ref/reset.sgml
index d90fb29003b8c2dcc0a255004271c67c642fe35d..e94ad782cc9cef459ae746e69a60842d1ef98543 100644 (file)
--- a/doc/src/sgml/ref/reset.sgml
+++ b/doc/src/sgml/ref/reset.sgml
@@ -1,5 +1,5 @@
 
 
@@ -83,14 +83,7 @@ SET parameter TO DEFAULT
   Examples
 
   
-   Set DATESTYLE to its default value:
-
-RESET datestyle;
-
-  
-
-  
-   Set GEQO to its default value:
+   Set the geqo configuration variable to its default value:
 
 RESET geqo;
 

diff --git a/doc/src/sgml/ref/select.sgml b/doc/src/sgml/ref/select.sgml
index 5bd546afa6c975c0e4d0f570a307345f9880a952..c765329df11fde15c2f4419cc6a62d70a572a3d3 100644 (file)
--- a/doc/src/sgml/ref/select.sgml
+++ b/doc/src/sgml/ref/select.sgml
@@ -1,5 +1,5 @@
 
 
@@ -1022,7 +1022,7 @@ SELECT distributors.* FROM distributors d, distributors distributors;
     SELECT statement that also contains an explicit
     FROM clause.  Also, it is possible to disable
     the implicit-FROM feature by setting the
-    ADD_MISSING_FROM parameter to false.
+    add_missing_from parameter to false.