Fix alphabetization in catalogs.sgml.

System catalogs and views should be listed alphabetically
in catalog.sgml, but only pg_file_settings view not.

This patch also fixes typos in pg_file_settings comments.

diff --git a/doc/src/sgml/catalogs.sgml b/doc/src/sgml/catalogs.sgml
index b6e0268e3fecf77876dface3257443cfbcf3bed3..5cd8b115cac3d2c84a16572228131f4340430eda 100644 (file)
--- a/doc/src/sgml/catalogs.sgml
+++ b/doc/src/sgml/catalogs.sgml
@@ -7624,6 +7624,11 @@
       open cursors
      
 
+     
+      pg_file_settings
+      file location of parameter settings
+     
+
      
       pg_group
       groups of database users
@@ -7679,11 +7684,6 @@
       parameter settings
      
 
-     
-      pg_file_settings
-      file location of parameter settings
-     
-
      
       pg_shadow
       database users
@@ -7999,6 +7999,79 @@
 
  
 
+ 
+  <structname>pg_file_settings</structname>
+
+  
+   pg_file_settings
+  
+
+  
+   The view pg_file_settings provides the file
+   name, line number and value of all parameters which are set through
+   configuration files.
+   In contrast to pg_settings, a row is provided for
+   each occurrence of the parameter across all configuration files. This is helpful
+   for discovering why one value may have been used in preference to another
+   when the parameters were loaded.
+  
+
+  +   <structname>pg_file_settings</> Columns++  +   +    +     Name+     Type+     Description+    +   +   +    +     sourcefile+     text+     Path to and name of the configration file+    +    +     sourceline+     integer+     +      Line number within the configuration file where the value was set+     +    +    +     seqno+     integer+     Order in which the setting was loaded+    +    +     name+     text+     Run-time configuration parameter name+    +    +     setting+     text+     value of the parameter+    +   +  + 









































+
+  
+   See  for more information about the various
+   ways to change these parameters.
+  
+
+  
+   The pg_file_settings view cannot be modified
+   directly as it represents information, as read in at server start or
+   reload time, about all parameter settings across all configuration files.
+  
+
+
+
  
   <structname>pg_group</structname>
 
@@ -9306,79 +9379,6 @@ SELECT * FROM pg_locks pl LEFT JOIN pg_prepared_xacts ppx
 
  
 
- 
-  <structname>pg_file_settings</structname>
-
-  
-   pg_file_settings
-  
-
-  
-   The view pg_file_settings provides the file
-   name, line number and value of all parameters which are set through
-   configuration files.
-   In contrast to pg_settings, a row is provided for
-   each occurrence of the parameter across all configuration files. This is helpful
-   for discovering why one value may have been used in preference to another
-   when the parameters were loaded.
-  
-
-  -   <structname>pg_file_settings</> Columns--  -   -    -     Name-     Type-     Description-    -   -   -    -     sourcefile-     text-     Path to and name of the configration file-    -    -     sourceline-     integer-     -      Line number within the configuration file where the value was set-     -    -    -     seqno-     integer-     Order in which the setting was loaded-    -    -     name-     text-     Run-time configuration parameter name-    -    -     setting-     text-     value of the parameter-    -   -  - 









































-
-  
-   See  for more information about the various
-   ways to change these parameters.
-  
-
-  
-   The pg_file_settings view cannot be modified
-   directly as it represents information, as read in at server start or
-   reload time, about all parameter settings across all configuration files.
-  
-
-
-
  
   <structname>pg_shadow</structname>
 

diff --git a/src/backend/utils/misc/guc.c b/src/backend/utils/misc/guc.c
index b3c9f14ea4dfbcd6d65cd5d1ad64d1aee700f0f8..230c5cc0ef2586ae183e2e3e2301f81822a7edb0 100644 (file)
--- a/src/backend/utils/misc/guc.c
+++ b/src/backend/utils/misc/guc.c
@@ -8182,7 +8182,7 @@ show_all_settings(PG_FUNCTION_ARGS)
  * show_all_file_settings
  *
  * returns a table of all parameter settings in all configuration files
- * which includes the config file path/name, filename, a sequence number
+ * which includes the config file path/name, the line number, a sequence number
  * indicating when we loaded it, the parameter name, and the value it is
  * set to.
  *
@@ -8208,8 +8208,8 @@ show_all_file_settings(PG_FUNCTION_ARGS)
        oldcontext = MemoryContextSwitchTo(funcctx->multi_call_memory_ctx);
 
        /*
-        * need a tuple descriptor representing NUM_PG_SETTINGS_ATTS columns
-        * of the appropriate types
+        * need a tuple descriptor representing NUM_PG_FILE_SETTINGS_ATTS
+        * columns of the appropriate types
         */
 
        tupdesc = CreateTemplateTupleDesc(NUM_PG_FILE_SETTINGS_ATTS, false);
@@ -8279,7 +8279,6 @@ show_all_file_settings(PG_FUNCTION_ARGS)
    {
        SRF_RETURN_DONE(funcctx);
    }
-
 }
 
 static char *