Change standard_compliant_strings to standard_conforming_strings.

diff --git a/doc/src/sgml/libpq.sgml b/doc/src/sgml/libpq.sgml
index 74219f368b6530122a7b8faaf1a7225d217a6064..7f9bc97b0d7a81a6a9313ec168fa592562722d13 100644 (file)
--- a/doc/src/sgml/libpq.sgml
+++ b/doc/src/sgml/libpq.sgml
@@ -1,5 +1,5 @@
 
 
  
@@ -890,10 +890,10 @@ Parameters reported as of the current release include
 DateStyle,
 TimeZone,
 integer_datetimes, and
-standard_compliant_strings.
+standard_conforming_strings.
 (server_encoding, TimeZone, and
 integer_datetimes were not reported by releases before 8.0;
-standard_compliant_strings was not reported by releases
+standard_conforming_strings was not reported by releases
 before 8.1.)
 Note that
 server_version,
@@ -917,7 +917,7 @@ in a numeric form that is much easier to compare against.
 
 
 
-If no value for standard_compliant_strings is reported,
+If no value for standard_conforming_strings is reported,
 applications may assume it is false, that is, backslashes
 are treated as escapes in string literals.  Also, the presence of this
 parameter may be taken as an indication that the escape string syntax

diff --git a/doc/src/sgml/protocol.sgml b/doc/src/sgml/protocol.sgml
index 9663c7c08c677fa80d5c201d5040717f8d6f1b9a..07c9c642c75287e578df3093739e7fc044aec375 100644 (file)
--- a/doc/src/sgml/protocol.sgml
+++ b/doc/src/sgml/protocol.sgml
@@ -1,4 +1,4 @@
-
+
 
 
  Frontend/Backend Protocol
@@ -1061,10 +1061,10 @@
     DateStyle,
     TimeZone,
     integer_datetimes, and
-    standard_compliant_strings.
+    standard_conforming_strings.
     (server_encoding, TimeZone, and
     integer_datetimes were not reported by releases before 8.0;
-    standard_compliant_strings was not reported by releases
+    standard_conforming_strings was not reported by releases
     before 8.1.)
     Note that
     server_version,

diff --git a/doc/src/sgml/runtime.sgml b/doc/src/sgml/runtime.sgml
index 060cd91ea16bae7ce50b0b52a98f83159f9d244a..efb46060d966491f548fcfe6a8255bbd955a7220 100644 (file)
--- a/doc/src/sgml/runtime.sgml
+++ b/doc/src/sgml/runtime.sgml
@@ -1,5 +1,5 @@
 
 
 
@@ -4089,7 +4089,7 @@ dynamic_library_path = 'C:\tools\postgresql;H:\my_project\lib;$libdir'
         Escape string syntax (E'...') should be used for
         escapes, because in future versions of
         PostgreSQL ordinary strings will have
-        the standard-compliant behavior of treating backslashes
+        the standard-conforming behavior of treating backslashes
         literally.
        
       
@@ -4303,11 +4303,11 @@ dynamic_library_path = 'C:\tools\postgresql;H:\my_project\lib;$libdir'
       
      
 
-     mpliant-strings" xreflabel="standard_compliant_strings">
-      standard_compliant_strings (boolean)
+     nforming-strings" xreflabel="standard_conforming_strings">
+      standard_conforming_strings (boolean)
       stringsescape
       
-       standard_compliant_strings configuration parameter
+       standard_conforming_strings configuration parameter
       
       
        

diff --git a/doc/src/sgml/syntax.sgml b/doc/src/sgml/syntax.sgml
index 0d3d7f19f1896d3dae07f4b7e8ebe28e1c0f007a..ae6ae9468dd2fa7c22017a4805b188be3d62471b 100644 (file)
--- a/doc/src/sgml/syntax.sgml
+++ b/doc/src/sgml/syntax.sgml
@@ -1,5 +1,5 @@
 
 
 
@@ -274,7 +274,7 @@ UPDATE "my_table" SET "a" = 5;
      While ordinary strings now support C-style backslash escapes,
      future versions will generate warnings for such usage and
      eventually treat backslashes as literal characters to be
-     standard-compliant. The proper way to specify escape processing is
+     standard-conforming. The proper way to specify escape processing is
      to use the escape string syntax to indicate that escape
      processing is desired. Escape string syntax is specified by writing
      the letter E (upper or lower case) just before

diff --git a/src/backend/utils/misc/guc.c b/src/backend/utils/misc/guc.c
index bb0634463ed113463a65b911da6a86db11667093..5176ac05cba3fbcdec625f09d2e9bb87aea1d45e 100644 (file)
--- a/src/backend/utils/misc/guc.c
+++ b/src/backend/utils/misc/guc.c
@@ -10,7 +10,7 @@
  * Written by Peter Eisentraut .
  *
  * IDENTIFICATION
- *   $PostgreSQL: pgsql/src/backend/utils/misc/guc.c,v 1.281 2005/08/11 21:11:47 tgl Exp $
+ *   $PostgreSQL: pgsql/src/backend/utils/misc/guc.c,v 1.282 2005/08/14 22:19:50 petere Exp $
  *
  *--------------------------------------------------------------------
  */
@@ -202,7 +202,7 @@ static int  max_index_keys;
 static int max_identifier_length;
 static int block_size;
 static bool    integer_datetimes;
-static bool    standard_compliant_strings;
+static bool    standard_conforming_strings;
 
 /* should be static, but commands/variable.c needs to get at these */
 char      *role_string;
@@ -930,12 +930,12 @@ static struct config_bool ConfigureNamesBool[] =
    },
 
    {
-       {"standard_compliant_strings", PGC_INTERNAL, PRESET_OPTIONS,
+       {"standard_conforming_strings", PGC_INTERNAL, PRESET_OPTIONS,
            gettext_noop("'...' strings treat backslashes literally."),
            NULL,
            GUC_REPORT | GUC_NOT_IN_SAMPLE | GUC_DISALLOW_IN_FILE
        },
-       &standard_compliant_strings,
+       &standard_conforming_strings,
        false, NULL, NULL
    },