aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/backend/catalog/genbki.pl6
-rw-r--r--src/include/catalog/pg_aggregate.dat2
-rw-r--r--src/include/catalog/pg_aggregate.h2
-rw-r--r--src/include/catalog/pg_am.dat2
-rw-r--r--src/include/catalog/pg_am.h2
-rw-r--r--src/include/catalog/pg_amop.dat2
-rw-r--r--src/include/catalog/pg_amop.h2
-rw-r--r--src/include/catalog/pg_amproc.dat2
-rw-r--r--src/include/catalog/pg_amproc.h2
-rw-r--r--src/include/catalog/pg_attrdef.h2
-rw-r--r--src/include/catalog/pg_attribute.h2
-rw-r--r--src/include/catalog/pg_auth_members.h2
-rw-r--r--src/include/catalog/pg_authid.dat2
-rw-r--r--src/include/catalog/pg_authid.h2
-rw-r--r--src/include/catalog/pg_cast.dat2
-rw-r--r--src/include/catalog/pg_cast.h6
-rw-r--r--src/include/catalog/pg_class.dat4
-rw-r--r--src/include/catalog/pg_class.h2
-rw-r--r--src/include/catalog/pg_collation.dat2
-rw-r--r--src/include/catalog/pg_collation.h5
-rw-r--r--src/include/catalog/pg_constraint.h2
-rw-r--r--src/include/catalog/pg_conversion.h2
-rw-r--r--src/include/catalog/pg_database.dat2
-rw-r--r--src/include/catalog/pg_database.h2
-rw-r--r--src/include/catalog/pg_db_role_setting.h3
-rw-r--r--src/include/catalog/pg_default_acl.h3
-rw-r--r--src/include/catalog/pg_depend.h2
-rw-r--r--src/include/catalog/pg_description.h2
-rw-r--r--src/include/catalog/pg_enum.h5
-rw-r--r--src/include/catalog/pg_event_trigger.h2
-rw-r--r--src/include/catalog/pg_extension.h2
-rw-r--r--src/include/catalog/pg_foreign_data_wrapper.h2
-rw-r--r--src/include/catalog/pg_foreign_server.h2
-rw-r--r--src/include/catalog/pg_foreign_table.h2
-rw-r--r--src/include/catalog/pg_index.h2
-rw-r--r--src/include/catalog/pg_inherits.h2
-rw-r--r--src/include/catalog/pg_init_privs.h2
-rw-r--r--src/include/catalog/pg_language.dat2
-rw-r--r--src/include/catalog/pg_language.h2
-rw-r--r--src/include/catalog/pg_largeobject.h2
-rw-r--r--src/include/catalog/pg_largeobject_metadata.h3
-rw-r--r--src/include/catalog/pg_namespace.dat2
-rw-r--r--src/include/catalog/pg_namespace.h2
-rw-r--r--src/include/catalog/pg_opclass.dat2
-rw-r--r--src/include/catalog/pg_opclass.h2
-rw-r--r--src/include/catalog/pg_operator.dat2
-rw-r--r--src/include/catalog/pg_operator.h2
-rw-r--r--src/include/catalog/pg_opfamily.dat2
-rw-r--r--src/include/catalog/pg_opfamily.h2
-rw-r--r--src/include/catalog/pg_partitioned_table.h4
-rw-r--r--src/include/catalog/pg_pltemplate.dat2
-rw-r--r--src/include/catalog/pg_pltemplate.h2
-rw-r--r--src/include/catalog/pg_policy.h2
-rw-r--r--src/include/catalog/pg_proc.dat2
-rw-r--r--src/include/catalog/pg_proc.h2
-rw-r--r--src/include/catalog/pg_publication.h2
-rw-r--r--src/include/catalog/pg_publication_rel.h5
-rw-r--r--src/include/catalog/pg_range.dat2
-rw-r--r--src/include/catalog/pg_range.h2
-rw-r--r--src/include/catalog/pg_replication_origin.h3
-rw-r--r--src/include/catalog/pg_rewrite.h2
-rw-r--r--src/include/catalog/pg_seclabel.h8
-rw-r--r--src/include/catalog/pg_sequence.h8
-rw-r--r--src/include/catalog/pg_shdepend.h2
-rw-r--r--src/include/catalog/pg_shdescription.h2
-rw-r--r--src/include/catalog/pg_shseclabel.h8
-rw-r--r--src/include/catalog/pg_statistic.h2
-rw-r--r--src/include/catalog/pg_statistic_ext.h2
-rw-r--r--src/include/catalog/pg_subscription.h8
-rw-r--r--src/include/catalog/pg_subscription_rel.h10
-rw-r--r--src/include/catalog/pg_tablespace.dat2
-rw-r--r--src/include/catalog/pg_tablespace.h2
-rw-r--r--src/include/catalog/pg_transform.h2
-rw-r--r--src/include/catalog/pg_trigger.h2
-rw-r--r--src/include/catalog/pg_ts_config.dat2
-rw-r--r--src/include/catalog/pg_ts_config.h3
-rw-r--r--src/include/catalog/pg_ts_config_map.dat2
-rw-r--r--src/include/catalog/pg_ts_config_map.h3
-rw-r--r--src/include/catalog/pg_ts_dict.dat2
-rw-r--r--src/include/catalog/pg_ts_dict.h2
-rw-r--r--src/include/catalog/pg_ts_parser.dat2
-rw-r--r--src/include/catalog/pg_ts_parser.h2
-rw-r--r--src/include/catalog/pg_ts_template.dat2
-rw-r--r--src/include/catalog/pg_ts_template.h2
-rw-r--r--src/include/catalog/pg_type.dat2
-rw-r--r--src/include/catalog/pg_type.h2
-rw-r--r--src/include/catalog/pg_user_mapping.h2
87 files changed, 136 insertions, 97 deletions
diff --git a/src/backend/catalog/genbki.pl b/src/backend/catalog/genbki.pl
index 90506b6a804..9cf26263f8f 100644
--- a/src/backend/catalog/genbki.pl
+++ b/src/backend/catalog/genbki.pl
@@ -535,8 +535,8 @@ sub gen_pg_attribute
{
my $table = $catalogs{$table_name};
- # Currently, all bootstrapped relations also need schemapg.h
- # entries, so skip if the relation isn't to be in schemapg.h.
+ # Currently, all bootstrap catalogs also need schemapg.h
+ # entries, so skip if it isn't to be in schemapg.h.
next if !$table->{schema_macro};
$schemapg_entries{$table_name} = [];
@@ -769,7 +769,7 @@ sub form_pg_type_symbol
{
my $typename = shift;
- # Skip for rowtypes of bootstrap tables, since they have their
+ # Skip for rowtypes of bootstrap catalogs, since they have their
# own naming convention defined elsewhere.
return
if $typename eq 'pg_type'
diff --git a/src/include/catalog/pg_aggregate.dat b/src/include/catalog/pg_aggregate.dat
index f8d20410efe..d2a42985695 100644
--- a/src/include/catalog/pg_aggregate.dat
+++ b/src/include/catalog/pg_aggregate.dat
@@ -1,7 +1,7 @@
#----------------------------------------------------------------------
#
# pg_aggregate.dat
-# Initial contents of the pg_aggregate system relation.
+# Initial contents of the pg_aggregate system catalog.
#
# Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
# Portions Copyright (c) 1994, Regents of the University of California
diff --git a/src/include/catalog/pg_aggregate.h b/src/include/catalog/pg_aggregate.h
index 8eb5f63f56e..72dd581e7a4 100644
--- a/src/include/catalog/pg_aggregate.h
+++ b/src/include/catalog/pg_aggregate.h
@@ -1,7 +1,7 @@
/*-------------------------------------------------------------------------
*
* pg_aggregate.h
- * definition of the system "aggregate" relation (pg_aggregate)
+ * definition of the "aggregate" system catalog (pg_aggregate)
*
*
* Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
diff --git a/src/include/catalog/pg_am.dat b/src/include/catalog/pg_am.dat
index 8722cacaaef..bef53a319af 100644
--- a/src/include/catalog/pg_am.dat
+++ b/src/include/catalog/pg_am.dat
@@ -1,7 +1,7 @@
#----------------------------------------------------------------------
#
# pg_am.dat
-# Initial contents of the pg_am system relation.
+# Initial contents of the pg_am system catalog.
#
# Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
# Portions Copyright (c) 1994, Regents of the University of California
diff --git a/src/include/catalog/pg_am.h b/src/include/catalog/pg_am.h
index f821749af82..26cb2349875 100644
--- a/src/include/catalog/pg_am.h
+++ b/src/include/catalog/pg_am.h
@@ -1,7 +1,7 @@
/*-------------------------------------------------------------------------
*
* pg_am.h
- * definition of the system "access method" relation (pg_am)
+ * definition of the "access method" system catalog (pg_am)
*
*
* Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
diff --git a/src/include/catalog/pg_amop.dat b/src/include/catalog/pg_amop.dat
index b1cf8ec5fca..fb58f774b93 100644
--- a/src/include/catalog/pg_amop.dat
+++ b/src/include/catalog/pg_amop.dat
@@ -1,7 +1,7 @@
#----------------------------------------------------------------------
#
# pg_amop.dat
-# Initial contents of the pg_amop system relation.
+# Initial contents of the pg_amop system catalog.
#
# Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
# Portions Copyright (c) 1994, Regents of the University of California
diff --git a/src/include/catalog/pg_amop.h b/src/include/catalog/pg_amop.h
index 4be325221f0..8e6f7408872 100644
--- a/src/include/catalog/pg_amop.h
+++ b/src/include/catalog/pg_amop.h
@@ -1,7 +1,7 @@
/*-------------------------------------------------------------------------
*
* pg_amop.h
- * definition of the system "amop" relation (pg_amop)
+ * definition of the "access method operator" system catalog (pg_amop)
*
* The amop table identifies the operators associated with each index operator
* family and operator class (classes are subsets of families). An associated
diff --git a/src/include/catalog/pg_amproc.dat b/src/include/catalog/pg_amproc.dat
index 6b6c807f90e..086f76c4759 100644
--- a/src/include/catalog/pg_amproc.dat
+++ b/src/include/catalog/pg_amproc.dat
@@ -1,7 +1,7 @@
#----------------------------------------------------------------------
#
# pg_amproc.dat
-# Initial contents of the pg_amproc system relation.
+# Initial contents of the pg_amproc system catalog.
#
# Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
# Portions Copyright (c) 1994, Regents of the University of California
diff --git a/src/include/catalog/pg_amproc.h b/src/include/catalog/pg_amproc.h
index d638e0cbfe0..c34c3faa8ff 100644
--- a/src/include/catalog/pg_amproc.h
+++ b/src/include/catalog/pg_amproc.h
@@ -1,7 +1,7 @@
/*-------------------------------------------------------------------------
*
* pg_amproc.h
- * definition of the system "amproc" relation (pg_amproc)
+ * definition of the "access method procedure" system catalog (pg_amproc)
*
* The amproc table identifies support procedures associated with index
* operator families and classes. These procedures can't be listed in pg_amop
diff --git a/src/include/catalog/pg_attrdef.h b/src/include/catalog/pg_attrdef.h
index 16b106d9add..68800ffd8e4 100644
--- a/src/include/catalog/pg_attrdef.h
+++ b/src/include/catalog/pg_attrdef.h
@@ -1,7 +1,7 @@
/*-------------------------------------------------------------------------
*
* pg_attrdef.h
- * definition of the system "attribute defaults" relation (pg_attrdef)
+ * definition of the "attribute defaults" system catalog (pg_attrdef)
*
*
* Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
diff --git a/src/include/catalog/pg_attribute.h b/src/include/catalog/pg_attribute.h
index 8eef7d2fedc..dc36753ede0 100644
--- a/src/include/catalog/pg_attribute.h
+++ b/src/include/catalog/pg_attribute.h
@@ -1,7 +1,7 @@
/*-------------------------------------------------------------------------
*
* pg_attribute.h
- * definition of the system "attribute" relation (pg_attribute)
+ * definition of the "attribute" system catalog (pg_attribute)
*
* The initial contents of pg_attribute are generated at compile time by
* genbki.pl, so there is no pg_attribute.dat file. Only "bootstrapped"
diff --git a/src/include/catalog/pg_auth_members.h b/src/include/catalog/pg_auth_members.h
index 75bc2baa14c..277ea89c6f2 100644
--- a/src/include/catalog/pg_auth_members.h
+++ b/src/include/catalog/pg_auth_members.h
@@ -1,7 +1,7 @@
/*-------------------------------------------------------------------------
*
* pg_auth_members.h
- * definition of the system "authorization identifier members" relation
+ * definition of the "authorization identifier members" system catalog
* (pg_auth_members).
*
*
diff --git a/src/include/catalog/pg_authid.dat b/src/include/catalog/pg_authid.dat
index d8421b01627..55be3173691 100644
--- a/src/include/catalog/pg_authid.dat
+++ b/src/include/catalog/pg_authid.dat
@@ -1,7 +1,7 @@
#----------------------------------------------------------------------
#
# pg_authid.dat
-# Initial contents of the pg_authid system relation.
+# Initial contents of the pg_authid system catalog.
#
# Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
# Portions Copyright (c) 1994, Regents of the University of California
diff --git a/src/include/catalog/pg_authid.h b/src/include/catalog/pg_authid.h
index 863ef65ebfa..ba482f1cb91 100644
--- a/src/include/catalog/pg_authid.h
+++ b/src/include/catalog/pg_authid.h
@@ -1,7 +1,7 @@
/*-------------------------------------------------------------------------
*
* pg_authid.h
- * definition of the system "authorization identifier" relation (pg_authid)
+ * definition of the "authorization identifier" system catalog (pg_authid)
*
* pg_shadow and pg_group are now publicly accessible views on pg_authid.
*
diff --git a/src/include/catalog/pg_cast.dat b/src/include/catalog/pg_cast.dat
index c335a7686d5..cf007528fde 100644
--- a/src/include/catalog/pg_cast.dat
+++ b/src/include/catalog/pg_cast.dat
@@ -1,7 +1,7 @@
#----------------------------------------------------------------------
#
# pg_cast.dat
-# Initial contents of the pg_cast system relation.
+# Initial contents of the pg_cast system catalog.
#
# Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
# Portions Copyright (c) 1994, Regents of the University of California
diff --git a/src/include/catalog/pg_cast.h b/src/include/catalog/pg_cast.h
index 10c796ab02e..7f4a25b2dad 100644
--- a/src/include/catalog/pg_cast.h
+++ b/src/include/catalog/pg_cast.h
@@ -1,13 +1,13 @@
/*-------------------------------------------------------------------------
*
* pg_cast.h
- * definition of the system "type casts" relation (pg_cast)
+ * definition of the "type casts" system catalog (pg_cast)
*
* As of Postgres 8.0, pg_cast describes not only type coercion functions
* but also length coercion functions.
*
- *
- * Copyright (c) 2002-2018, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1994, Regents of the University of California
*
* src/include/catalog/pg_cast.h
*
diff --git a/src/include/catalog/pg_class.dat b/src/include/catalog/pg_class.dat
index e1450e3fc7a..9fffdef3790 100644
--- a/src/include/catalog/pg_class.dat
+++ b/src/include/catalog/pg_class.dat
@@ -1,7 +1,7 @@
#----------------------------------------------------------------------
#
# pg_class.dat
-# Initial contents of the pg_class system relation.
+# Initial contents of the pg_class system catalog.
#
# Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
# Portions Copyright (c) 1994, Regents of the University of California
@@ -12,7 +12,7 @@
[
-# Note: only "bootstrapped" relations, ie those marked BKI_BOOTSTRAP, need to
+# Note: only bootstrap catalogs, ie those marked BKI_BOOTSTRAP, need to
# have entries here. Be sure that the OIDs listed here match those given in
# their CATALOG and BKI_ROWTYPE_OID macros, and that the relnatts values are
# correct.
diff --git a/src/include/catalog/pg_class.h b/src/include/catalog/pg_class.h
index ef62c30cf95..d1541bdfcce 100644
--- a/src/include/catalog/pg_class.h
+++ b/src/include/catalog/pg_class.h
@@ -1,7 +1,7 @@
/*-------------------------------------------------------------------------
*
* pg_class.h
- * definition of the system "relation" relation (pg_class)
+ * definition of the "relation" system catalog (pg_class)
*
*
* Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
diff --git a/src/include/catalog/pg_collation.dat b/src/include/catalog/pg_collation.dat
index e98a4fd8177..ad16116cf4d 100644
--- a/src/include/catalog/pg_collation.dat
+++ b/src/include/catalog/pg_collation.dat
@@ -1,7 +1,7 @@
#----------------------------------------------------------------------
#
# pg_collation.dat
-# Initial contents of the pg_collation system relation.
+# Initial contents of the pg_collation system catalog.
#
# Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
# Portions Copyright (c) 1994, Regents of the University of California
diff --git a/src/include/catalog/pg_collation.h b/src/include/catalog/pg_collation.h
index 5c73bbf94f4..7e0f4461c61 100644
--- a/src/include/catalog/pg_collation.h
+++ b/src/include/catalog/pg_collation.h
@@ -1,14 +1,13 @@
/*-------------------------------------------------------------------------
*
* pg_collation.h
- * definition of the system "collation" relation (pg_collation)
+ * definition of the "collation" system catalog (pg_collation)
*
*
* Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
* Portions Copyright (c) 1994, Regents of the University of California
*
- * IDENTIFICATION
- * src/include/catalog/pg_collation.h
+ * src/include/catalog/pg_collation.h
*
* NOTES
* The Catalog.pm module reads this file and derives schema
diff --git a/src/include/catalog/pg_constraint.h b/src/include/catalog/pg_constraint.h
index 017e4de4aba..7c1c0e1db85 100644
--- a/src/include/catalog/pg_constraint.h
+++ b/src/include/catalog/pg_constraint.h
@@ -1,7 +1,7 @@
/*-------------------------------------------------------------------------
*
* pg_constraint.h
- * definition of the system "constraint" relation (pg_constraint)
+ * definition of the "constraint" system catalog (pg_constraint)
*
*
* Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
diff --git a/src/include/catalog/pg_conversion.h b/src/include/catalog/pg_conversion.h
index 7ca54e84306..37515f64c2f 100644
--- a/src/include/catalog/pg_conversion.h
+++ b/src/include/catalog/pg_conversion.h
@@ -1,7 +1,7 @@
/*-------------------------------------------------------------------------
*
* pg_conversion.h
- * definition of the system "conversion" relation (pg_conversion)
+ * definition of the "conversion" system catalog (pg_conversion)
*
*
* Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
diff --git a/src/include/catalog/pg_database.dat b/src/include/catalog/pg_database.dat
index 002075685cc..37ee2f9458f 100644
--- a/src/include/catalog/pg_database.dat
+++ b/src/include/catalog/pg_database.dat
@@ -1,7 +1,7 @@
#----------------------------------------------------------------------
#
# pg_database.dat
-# Initial contents of the pg_database system relation.
+# Initial contents of the pg_database system catalog.
#
# Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
# Portions Copyright (c) 1994, Regents of the University of California
diff --git a/src/include/catalog/pg_database.h b/src/include/catalog/pg_database.h
index 7f03d24c1e9..ac027b79199 100644
--- a/src/include/catalog/pg_database.h
+++ b/src/include/catalog/pg_database.h
@@ -1,7 +1,7 @@
/*-------------------------------------------------------------------------
*
* pg_database.h
- * definition of the system "database" relation (pg_database)
+ * definition of the "database" system catalog (pg_database)
*
*
* Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
diff --git a/src/include/catalog/pg_db_role_setting.h b/src/include/catalog/pg_db_role_setting.h
index f6ae9712193..eff801c3ce5 100644
--- a/src/include/catalog/pg_db_role_setting.h
+++ b/src/include/catalog/pg_db_role_setting.h
@@ -1,7 +1,8 @@
/*-------------------------------------------------------------------------
*
* pg_db_role_setting.h
- * definition of per-database/per-user configuration settings relation
+ * definition of the system catalog for per-database/per-user
+ * configuration settings (pg_db_role_setting)
*
*
* Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
diff --git a/src/include/catalog/pg_default_acl.h b/src/include/catalog/pg_default_acl.h
index d672d5b3f88..d0410f55868 100644
--- a/src/include/catalog/pg_default_acl.h
+++ b/src/include/catalog/pg_default_acl.h
@@ -1,7 +1,8 @@
/*-------------------------------------------------------------------------
*
* pg_default_acl.h
- * definition of default ACLs for new objects.
+ * definition of the system catalog for default ACLs of new objects
+ * (pg_default_acl)
*
*
* Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
diff --git a/src/include/catalog/pg_depend.h b/src/include/catalog/pg_depend.h
index bf31c1ab408..482b8bd2516 100644
--- a/src/include/catalog/pg_depend.h
+++ b/src/include/catalog/pg_depend.h
@@ -1,7 +1,7 @@
/*-------------------------------------------------------------------------
*
* pg_depend.h
- * definition of the system "dependency" relation (pg_depend)
+ * definition of the "dependency" system catalog (pg_depend)
*
* pg_depend has no preloaded contents, so there is no pg_depend.dat
* file; system-defined dependencies are loaded into it during a late stage
diff --git a/src/include/catalog/pg_description.h b/src/include/catalog/pg_description.h
index b95b188d289..74302bd451d 100644
--- a/src/include/catalog/pg_description.h
+++ b/src/include/catalog/pg_description.h
@@ -1,7 +1,7 @@
/*-------------------------------------------------------------------------
*
* pg_description.h
- * definition of the system "description" relation (pg_description)
+ * definition of the "description" system catalog (pg_description)
*
* Because the contents of this table are taken from the *.dat files
* of other catalogs, there is no pg_description.dat file. The initial
diff --git a/src/include/catalog/pg_enum.h b/src/include/catalog/pg_enum.h
index 52ec55debd1..e6fd41e5b23 100644
--- a/src/include/catalog/pg_enum.h
+++ b/src/include/catalog/pg_enum.h
@@ -1,10 +1,11 @@
/*-------------------------------------------------------------------------
*
* pg_enum.h
- * definition of the system "enum" relation (pg_enum)
+ * definition of the "enum" system catalog (pg_enum)
*
*
- * Copyright (c) 2006-2018, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1994, Regents of the University of California
*
* src/include/catalog/pg_enum.h
*
diff --git a/src/include/catalog/pg_event_trigger.h b/src/include/catalog/pg_event_trigger.h
index f06cbe04dc1..9af00fd68ff 100644
--- a/src/include/catalog/pg_event_trigger.h
+++ b/src/include/catalog/pg_event_trigger.h
@@ -1,7 +1,7 @@
/*-------------------------------------------------------------------------
*
* pg_event_trigger.h
- * definition of the system "event trigger" relation (pg_event_trigger)
+ * definition of the "event trigger" system catalog (pg_event_trigger)
*
*
* Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
diff --git a/src/include/catalog/pg_extension.h b/src/include/catalog/pg_extension.h
index 10bbb692a5d..c698ddd699a 100644
--- a/src/include/catalog/pg_extension.h
+++ b/src/include/catalog/pg_extension.h
@@ -1,7 +1,7 @@
/*-------------------------------------------------------------------------
*
* pg_extension.h
- * definition of the system "extension" relation (pg_extension)
+ * definition of the "extension" system catalog (pg_extension)
*
*
* Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
diff --git a/src/include/catalog/pg_foreign_data_wrapper.h b/src/include/catalog/pg_foreign_data_wrapper.h
index 67e331987cf..3e6191e3e25 100644
--- a/src/include/catalog/pg_foreign_data_wrapper.h
+++ b/src/include/catalog/pg_foreign_data_wrapper.h
@@ -1,7 +1,7 @@
/*-------------------------------------------------------------------------
*
* pg_foreign_data_wrapper.h
- * definition of the system "foreign-data wrapper" relation (pg_foreign_data_wrapper)
+ * definition of the "foreign-data wrapper" system catalog (pg_foreign_data_wrapper)
*
*
* Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
diff --git a/src/include/catalog/pg_foreign_server.h b/src/include/catalog/pg_foreign_server.h
index 0d25839c3da..3f7cc0c0469 100644
--- a/src/include/catalog/pg_foreign_server.h
+++ b/src/include/catalog/pg_foreign_server.h
@@ -1,7 +1,7 @@
/*-------------------------------------------------------------------------
*
* pg_foreign_server.h
- * definition of the system "foreign server" relation (pg_foreign_server)
+ * definition of the "foreign server" system catalog (pg_foreign_server)
*
* Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
* Portions Copyright (c) 1994, Regents of the University of California
diff --git a/src/include/catalog/pg_foreign_table.h b/src/include/catalog/pg_foreign_table.h
index 13de918880f..6e8b4195201 100644
--- a/src/include/catalog/pg_foreign_table.h
+++ b/src/include/catalog/pg_foreign_table.h
@@ -1,7 +1,7 @@
/*-------------------------------------------------------------------------
*
* pg_foreign_table.h
- * definition of the system "foreign table" relation (pg_foreign_table)
+ * definition of the "foreign table" system catalog (pg_foreign_table)
*
* Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
* Portions Copyright (c) 1994, Regents of the University of California
diff --git a/src/include/catalog/pg_index.h b/src/include/catalog/pg_index.h
index 88ff40f8207..5f72a5571f2 100644
--- a/src/include/catalog/pg_index.h
+++ b/src/include/catalog/pg_index.h
@@ -1,7 +1,7 @@
/*-------------------------------------------------------------------------
*
* pg_index.h
- * definition of the system "index" relation (pg_index)
+ * definition of the "index" system catalog (pg_index)
*
*
* Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
diff --git a/src/include/catalog/pg_inherits.h b/src/include/catalog/pg_inherits.h
index 3303a9c2973..2a98e02c6ac 100644
--- a/src/include/catalog/pg_inherits.h
+++ b/src/include/catalog/pg_inherits.h
@@ -1,7 +1,7 @@
/*-------------------------------------------------------------------------
*
* pg_inherits.h
- * definition of the system "inherits" relation (pg_inherits)
+ * definition of the "inherits" system catalog (pg_inherits)
*
*
* Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
diff --git a/src/include/catalog/pg_init_privs.h b/src/include/catalog/pg_init_privs.h
index 6ce26463507..39de09cb9da 100644
--- a/src/include/catalog/pg_init_privs.h
+++ b/src/include/catalog/pg_init_privs.h
@@ -1,7 +1,7 @@
/*-------------------------------------------------------------------------
*
* pg_init_privs.h
- * definition of the system "initial privileges" relation (pg_init_privs)
+ * definition of the "initial privileges" system catalog (pg_init_privs)
*
* NOTE: an object is identified by the OID of the row that primarily
* defines the object, plus the OID of the table that that row appears in.
diff --git a/src/include/catalog/pg_language.dat b/src/include/catalog/pg_language.dat
index 1b50a66ea48..c79d566d8a0 100644
--- a/src/include/catalog/pg_language.dat
+++ b/src/include/catalog/pg_language.dat
@@ -1,7 +1,7 @@
#----------------------------------------------------------------------
#
# pg_language.dat
-# Initial contents of the pg_language system relation.
+# Initial contents of the pg_language system catalog.
#
# Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
# Portions Copyright (c) 1994, Regents of the University of California
diff --git a/src/include/catalog/pg_language.h b/src/include/catalog/pg_language.h
index e2d8d1571b4..83a7aa3e6a4 100644
--- a/src/include/catalog/pg_language.h
+++ b/src/include/catalog/pg_language.h
@@ -1,7 +1,7 @@
/*-------------------------------------------------------------------------
*
* pg_language.h
- * definition of the system "language" relation (pg_language)
+ * definition of the "language" system catalog (pg_language)
*
*
* Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
diff --git a/src/include/catalog/pg_largeobject.h b/src/include/catalog/pg_largeobject.h
index 481d2ff63ba..a8aa42e049a 100644
--- a/src/include/catalog/pg_largeobject.h
+++ b/src/include/catalog/pg_largeobject.h
@@ -1,7 +1,7 @@
/*-------------------------------------------------------------------------
*
* pg_largeobject.h
- * definition of the system "largeobject" relation (pg_largeobject)
+ * definition of the "large object" system catalog (pg_largeobject)
*
*
* Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
diff --git a/src/include/catalog/pg_largeobject_metadata.h b/src/include/catalog/pg_largeobject_metadata.h
index a8732bc4890..c8560dc2afb 100644
--- a/src/include/catalog/pg_largeobject_metadata.h
+++ b/src/include/catalog/pg_largeobject_metadata.h
@@ -1,7 +1,8 @@
/*-------------------------------------------------------------------------
*
* pg_largeobject_metadata.h
- * definition of the system "largeobject_metadata" relation (pg_largeobject_metadata)
+ * definition of the "large object metadata" system catalog
+ * (pg_largeobject_metadata)
*
*
* Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
diff --git a/src/include/catalog/pg_namespace.dat b/src/include/catalog/pg_namespace.dat
index e3549df2735..8a5c5c40a74 100644
--- a/src/include/catalog/pg_namespace.dat
+++ b/src/include/catalog/pg_namespace.dat
@@ -1,7 +1,7 @@
#----------------------------------------------------------------------
#
# pg_namespace.dat
-# Initial contents of the pg_namespace system relation.
+# Initial contents of the pg_namespace system catalog.
#
# Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
# Portions Copyright (c) 1994, Regents of the University of California
diff --git a/src/include/catalog/pg_namespace.h b/src/include/catalog/pg_namespace.h
index 0d9cada79f7..0923e066b46 100644
--- a/src/include/catalog/pg_namespace.h
+++ b/src/include/catalog/pg_namespace.h
@@ -1,7 +1,7 @@
/*-------------------------------------------------------------------------
*
* pg_namespace.h
- * definition of the system "namespace" relation (pg_namespace)
+ * definition of the "namespace" system catalog (pg_namespace)
*
*
* Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
diff --git a/src/include/catalog/pg_opclass.dat b/src/include/catalog/pg_opclass.dat
index 94e3e1e5fa5..5271c5c915c 100644
--- a/src/include/catalog/pg_opclass.dat
+++ b/src/include/catalog/pg_opclass.dat
@@ -1,7 +1,7 @@
#----------------------------------------------------------------------
#
# pg_opclass.dat
-# Initial contents of the pg_opclass system relation.
+# Initial contents of the pg_opclass system catalog.
#
# Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
# Portions Copyright (c) 1994, Regents of the University of California
diff --git a/src/include/catalog/pg_opclass.h b/src/include/catalog/pg_opclass.h
index 16c3875daa8..b980327fc03 100644
--- a/src/include/catalog/pg_opclass.h
+++ b/src/include/catalog/pg_opclass.h
@@ -1,7 +1,7 @@
/*-------------------------------------------------------------------------
*
* pg_opclass.h
- * definition of the system "opclass" relation (pg_opclass)
+ * definition of the "operator class" system catalog (pg_opclass)
*
* The primary key for this table is <opcmethod, opcname, opcnamespace> ---
* that is, there is a row for each valid combination of opclass name and
diff --git a/src/include/catalog/pg_operator.dat b/src/include/catalog/pg_operator.dat
index 43827384cfe..d9b6bad614e 100644
--- a/src/include/catalog/pg_operator.dat
+++ b/src/include/catalog/pg_operator.dat
@@ -1,7 +1,7 @@
#----------------------------------------------------------------------
#
# pg_operator.dat
-# Initial contents of the pg_operator system relation.
+# Initial contents of the pg_operator system catalog.
#
# Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
# Portions Copyright (c) 1994, Regents of the University of California
diff --git a/src/include/catalog/pg_operator.h b/src/include/catalog/pg_operator.h
index bbf330320e7..3212b21418b 100644
--- a/src/include/catalog/pg_operator.h
+++ b/src/include/catalog/pg_operator.h
@@ -1,7 +1,7 @@
/*-------------------------------------------------------------------------
*
* pg_operator.h
- * definition of the system "operator" relation (pg_operator)
+ * definition of the "operator" system catalog (pg_operator)
*
*
* Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
diff --git a/src/include/catalog/pg_opfamily.dat b/src/include/catalog/pg_opfamily.dat
index 72d71ee5b2d..4a9a28b87e1 100644
--- a/src/include/catalog/pg_opfamily.dat
+++ b/src/include/catalog/pg_opfamily.dat
@@ -1,7 +1,7 @@
#----------------------------------------------------------------------
#
# pg_opfamily.dat
-# Initial contents of the pg_opfamily system relation.
+# Initial contents of the pg_opfamily system catalog.
#
# Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
# Portions Copyright (c) 1994, Regents of the University of California
diff --git a/src/include/catalog/pg_opfamily.h b/src/include/catalog/pg_opfamily.h
index ddb0641228c..99dedbc42d1 100644
--- a/src/include/catalog/pg_opfamily.h
+++ b/src/include/catalog/pg_opfamily.h
@@ -1,7 +1,7 @@
/*-------------------------------------------------------------------------
*
* pg_opfamily.h
- * definition of the system "opfamily" relation (pg_opfamily)
+ * definition of the "operator family" system catalog (pg_opfamily)
*
*
* Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
diff --git a/src/include/catalog/pg_partitioned_table.h b/src/include/catalog/pg_partitioned_table.h
index 676532ae3f1..78bc5c81fbc 100644
--- a/src/include/catalog/pg_partitioned_table.h
+++ b/src/include/catalog/pg_partitioned_table.h
@@ -1,10 +1,12 @@
/*-------------------------------------------------------------------------
*
* pg_partitioned_table.h
- * definition of the system "partitioned table" relation
+ * definition of the "partitioned table" system catalog
+ * (pg_partitioned_table)
*
*
* Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1994, Regents of the University of California
*
* src/include/catalog/pg_partitioned_table.h
*
diff --git a/src/include/catalog/pg_pltemplate.dat b/src/include/catalog/pg_pltemplate.dat
index 2d8bfabbe09..8f1b8dab0f7 100644
--- a/src/include/catalog/pg_pltemplate.dat
+++ b/src/include/catalog/pg_pltemplate.dat
@@ -1,7 +1,7 @@
#----------------------------------------------------------------------
#
# pg_pltemplate.dat
-# Initial contents of the pg_pltemplate system relation.
+# Initial contents of the pg_pltemplate system catalog.
#
# Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
# Portions Copyright (c) 1994, Regents of the University of California
diff --git a/src/include/catalog/pg_pltemplate.h b/src/include/catalog/pg_pltemplate.h
index d84c86b08d2..ae06b752125 100644
--- a/src/include/catalog/pg_pltemplate.h
+++ b/src/include/catalog/pg_pltemplate.h
@@ -1,7 +1,7 @@
/*-------------------------------------------------------------------------
*
* pg_pltemplate.h
- * definition of the system "PL template" relation (pg_pltemplate)
+ * definition of the "PL template" system catalog (pg_pltemplate)
*
*
* Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
diff --git a/src/include/catalog/pg_policy.h b/src/include/catalog/pg_policy.h
index 45fdc285f79..ea3765b1cbc 100644
--- a/src/include/catalog/pg_policy.h
+++ b/src/include/catalog/pg_policy.h
@@ -1,7 +1,7 @@
/*-------------------------------------------------------------------------
*
* pg_policy.h
- * definition of the system "policy" relation (pg_policy)
+ * definition of the "policy" system catalog (pg_policy)
*
*
* Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
diff --git a/src/include/catalog/pg_proc.dat b/src/include/catalog/pg_proc.dat
index 9b53855236f..f643f564a6b 100644
--- a/src/include/catalog/pg_proc.dat
+++ b/src/include/catalog/pg_proc.dat
@@ -1,7 +1,7 @@
#----------------------------------------------------------------------
#
# pg_proc.dat
-# Initial contents of the pg_proc system relation.
+# Initial contents of the pg_proc system catalog.
#
# Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
# Portions Copyright (c) 1994, Regents of the University of California
diff --git a/src/include/catalog/pg_proc.h b/src/include/catalog/pg_proc.h
index 821bc60f01f..a34b2596fa0 100644
--- a/src/include/catalog/pg_proc.h
+++ b/src/include/catalog/pg_proc.h
@@ -1,7 +1,7 @@
/*-------------------------------------------------------------------------
*
* pg_proc.h
- * definition of the system "procedure" relation (pg_proc)
+ * definition of the "procedure" system catalog (pg_proc)
*
* Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
* Portions Copyright (c) 1994, Regents of the University of California
diff --git a/src/include/catalog/pg_publication.h b/src/include/catalog/pg_publication.h
index e81d62dac34..83c59cb10dd 100644
--- a/src/include/catalog/pg_publication.h
+++ b/src/include/catalog/pg_publication.h
@@ -1,7 +1,7 @@
/*-------------------------------------------------------------------------
*
* pg_publication.h
- * definition of the relation sets relation (pg_publication)
+ * definition of the "publication" system catalog (pg_publication)
*
* Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
* Portions Copyright (c) 1994, Regents of the University of California
diff --git a/src/include/catalog/pg_publication_rel.h b/src/include/catalog/pg_publication_rel.h
index 2208e424f4d..d97b0fe9bd3 100644
--- a/src/include/catalog/pg_publication_rel.h
+++ b/src/include/catalog/pg_publication_rel.h
@@ -1,8 +1,9 @@
/*-------------------------------------------------------------------------
*
* pg_publication_rel.h
- * definition of the publication to relation map (pg_publication_rel)
- *
+ * definition of the system catalog for mappings between relations and
+ * publications (pg_publication_rel)
+ *
* Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
* Portions Copyright (c) 1994, Regents of the University of California
*
diff --git a/src/include/catalog/pg_range.dat b/src/include/catalog/pg_range.dat
index 4781ea9d36e..54d4d1648f9 100644
--- a/src/include/catalog/pg_range.dat
+++ b/src/include/catalog/pg_range.dat
@@ -1,7 +1,7 @@
#----------------------------------------------------------------------
#
# pg_range.dat
-# Initial contents of the pg_range system relation.
+# Initial contents of the pg_range system catalog.
#
# Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
# Portions Copyright (c) 1994, Regents of the University of California
diff --git a/src/include/catalog/pg_range.h b/src/include/catalog/pg_range.h
index d8e16ccee75..ca2b28b4936 100644
--- a/src/include/catalog/pg_range.h
+++ b/src/include/catalog/pg_range.h
@@ -1,7 +1,7 @@
/*-------------------------------------------------------------------------
*
* pg_range.h
- * definition of the system "range" relation (pg_range)
+ * definition of the "range type" system catalog (pg_range)
*
*
* Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
diff --git a/src/include/catalog/pg_replication_origin.h b/src/include/catalog/pg_replication_origin.h
index eacdd39b83b..82ff7a7c692 100644
--- a/src/include/catalog/pg_replication_origin.h
+++ b/src/include/catalog/pg_replication_origin.h
@@ -1,7 +1,8 @@
/*-------------------------------------------------------------------------
*
* pg_replication_origin.h
- * Persistent replication origin registry
+ * definition of the "replication origin" system catalog
+ * (pg_replication_origin)
*
* Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
* Portions Copyright (c) 1994, Regents of the University of California
diff --git a/src/include/catalog/pg_rewrite.h b/src/include/catalog/pg_rewrite.h
index 77125867b32..a385445884c 100644
--- a/src/include/catalog/pg_rewrite.h
+++ b/src/include/catalog/pg_rewrite.h
@@ -1,7 +1,7 @@
/*-------------------------------------------------------------------------
*
* pg_rewrite.h
- * definition of the system "rewrite-rule" relation (pg_rewrite)
+ * definition of the "rewrite rule" system catalog (pg_rewrite)
*
* As of Postgres 7.3, the primary key for this table is <ev_class, rulename>
* --- ie, rule names are only unique among the rules of a given table.
diff --git a/src/include/catalog/pg_seclabel.h b/src/include/catalog/pg_seclabel.h
index 48d454897cd..6889369b5de 100644
--- a/src/include/catalog/pg_seclabel.h
+++ b/src/include/catalog/pg_seclabel.h
@@ -1,11 +1,17 @@
/* -------------------------------------------------------------------------
*
* pg_seclabel.h
- * definition of the system "security label" relation (pg_seclabel)
+ * definition of the "security label" system catalog (pg_seclabel)
*
* Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
* Portions Copyright (c) 1994, Regents of the University of California
*
+ * src/include/catalog/pg_seclabel.h
+ *
+ * NOTES
+ * The Catalog.pm module reads this file and derives schema
+ * information.
+ *
* -------------------------------------------------------------------------
*/
#ifndef PG_SECLABEL_H
diff --git a/src/include/catalog/pg_sequence.h b/src/include/catalog/pg_sequence.h
index a13b05e8007..beea215c81e 100644
--- a/src/include/catalog/pg_sequence.h
+++ b/src/include/catalog/pg_sequence.h
@@ -1,11 +1,17 @@
/* -------------------------------------------------------------------------
*
* pg_sequence.h
- * definition of the system "sequence" relation (pg_sequence)
+ * definition of the "sequence" system catalog (pg_sequence)
*
* Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
* Portions Copyright (c) 1994, Regents of the University of California
*
+ * src/include/catalog/pg_sequence.h
+ *
+ * NOTES
+ * The Catalog.pm module reads this file and derives schema
+ * information.
+ *
* -------------------------------------------------------------------------
*/
#ifndef PG_SEQUENCE_H
diff --git a/src/include/catalog/pg_shdepend.h b/src/include/catalog/pg_shdepend.h
index 0f8508cf262..01e1eb760c7 100644
--- a/src/include/catalog/pg_shdepend.h
+++ b/src/include/catalog/pg_shdepend.h
@@ -1,7 +1,7 @@
/*-------------------------------------------------------------------------
*
* pg_shdepend.h
- * definition of the system "shared dependency" relation (pg_shdepend)
+ * definition of the "shared dependency" system catalog (pg_shdepend)
*
* pg_shdepend has no preloaded contents, so there is no pg_shdepend.dat
* file; system-defined dependencies are loaded into it during a late stage
diff --git a/src/include/catalog/pg_shdescription.h b/src/include/catalog/pg_shdescription.h
index 00fd0e0e54f..53cade15488 100644
--- a/src/include/catalog/pg_shdescription.h
+++ b/src/include/catalog/pg_shdescription.h
@@ -1,7 +1,7 @@
/*-------------------------------------------------------------------------
*
* pg_shdescription.h
- * definition of the system "shared description" relation
+ * definition of the "shared description" system catalog
* (pg_shdescription)
*
* Because the contents of this table are taken from the *.dat files
diff --git a/src/include/catalog/pg_shseclabel.h b/src/include/catalog/pg_shseclabel.h
index 22ecf981680..2630f965fd3 100644
--- a/src/include/catalog/pg_shseclabel.h
+++ b/src/include/catalog/pg_shseclabel.h
@@ -1,11 +1,17 @@
/* -------------------------------------------------------------------------
*
* pg_shseclabel.h
- * definition of the system "shared security label" relation (pg_shseclabel)
+ * definition of the "shared security label" system catalog (pg_shseclabel)
*
* Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
* Portions Copyright (c) 1994, Regents of the University of California
*
+ * src/include/catalog/pg_shseclabel.h
+ *
+ * NOTES
+ * The Catalog.pm module reads this file and derives schema
+ * information.
+ *
* -------------------------------------------------------------------------
*/
#ifndef PG_SHSECLABEL_H
diff --git a/src/include/catalog/pg_statistic.h b/src/include/catalog/pg_statistic.h
index d654d3db26e..141e260de94 100644
--- a/src/include/catalog/pg_statistic.h
+++ b/src/include/catalog/pg_statistic.h
@@ -1,7 +1,7 @@
/*-------------------------------------------------------------------------
*
* pg_statistic.h
- * definition of the system "statistic" relation (pg_statistic)
+ * definition of the "statistics" system catalog (pg_statistic)
*
*
* Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
diff --git a/src/include/catalog/pg_statistic_ext.h b/src/include/catalog/pg_statistic_ext.h
index 9ccfce7c724..443798ae523 100644
--- a/src/include/catalog/pg_statistic_ext.h
+++ b/src/include/catalog/pg_statistic_ext.h
@@ -1,7 +1,7 @@
/*-------------------------------------------------------------------------
*
* pg_statistic_ext.h
- * definition of the system "extended statistic" relation (pg_statistic_ext)
+ * definition of the "extended statistics" system catalog (pg_statistic_ext)
*
*
* Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
diff --git a/src/include/catalog/pg_subscription.h b/src/include/catalog/pg_subscription.h
index 7fc1c29603a..82dd6faf238 100644
--- a/src/include/catalog/pg_subscription.h
+++ b/src/include/catalog/pg_subscription.h
@@ -1,11 +1,17 @@
/* -------------------------------------------------------------------------
*
* pg_subscription.h
- * Definition of the subscription catalog (pg_subscription).
+ * definition of the "subscription" system catalog (pg_subscription)
*
* Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
* Portions Copyright (c) 1994, Regents of the University of California
*
+ * src/include/catalog/pg_subscription.h
+ *
+ * NOTES
+ * The Catalog.pm module reads this file and derives schema
+ * information.
+ *
* -------------------------------------------------------------------------
*/
#ifndef PG_SUBSCRIPTION_H
diff --git a/src/include/catalog/pg_subscription_rel.h b/src/include/catalog/pg_subscription_rel.h
index 8971b679cdd..556cb94841d 100644
--- a/src/include/catalog/pg_subscription_rel.h
+++ b/src/include/catalog/pg_subscription_rel.h
@@ -1,12 +1,18 @@
/* -------------------------------------------------------------------------
*
* pg_subscription_rel.h
- * Local info about tables that come from the publisher of a
- * subscription (pg_subscription_rel).
+ * definition of the system catalog containing the state for each
+ * replicated table in each subscription (pg_subscription_rel)
*
* Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
* Portions Copyright (c) 1994, Regents of the University of California
*
+ * src/include/catalog/pg_subscription_rel.h
+ *
+ * NOTES
+ * The Catalog.pm module reads this file and derives schema
+ * information.
+ *
* -------------------------------------------------------------------------
*/
#ifndef PG_SUBSCRIPTION_REL_H
diff --git a/src/include/catalog/pg_tablespace.dat b/src/include/catalog/pg_tablespace.dat
index b623a2d39c4..dc942f4be04 100644
--- a/src/include/catalog/pg_tablespace.dat
+++ b/src/include/catalog/pg_tablespace.dat
@@ -1,7 +1,7 @@
#----------------------------------------------------------------------
#
# pg_tablespace.dat
-# Initial contents of the pg_tablespace system relation.
+# Initial contents of the pg_tablespace system catalog.
#
# Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
# Portions Copyright (c) 1994, Regents of the University of California
diff --git a/src/include/catalog/pg_tablespace.h b/src/include/catalog/pg_tablespace.h
index 4782e78e6b3..4010f1b5a73 100644
--- a/src/include/catalog/pg_tablespace.h
+++ b/src/include/catalog/pg_tablespace.h
@@ -1,7 +1,7 @@
/*-------------------------------------------------------------------------
*
* pg_tablespace.h
- * definition of the system "tablespace" relation (pg_tablespace)
+ * definition of the "tablespace" system catalog (pg_tablespace)
*
*
* Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
diff --git a/src/include/catalog/pg_transform.h b/src/include/catalog/pg_transform.h
index 6059b897c66..f46ff0a90e0 100644
--- a/src/include/catalog/pg_transform.h
+++ b/src/include/catalog/pg_transform.h
@@ -1,7 +1,7 @@
/*-------------------------------------------------------------------------
*
* pg_transform.h
- * definition of the system "transform" relation (pg_transform)
+ * definition of the "transform" system catalog (pg_transform)
*
*
* Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
diff --git a/src/include/catalog/pg_trigger.h b/src/include/catalog/pg_trigger.h
index 9955e62d3a0..951d7d86e75 100644
--- a/src/include/catalog/pg_trigger.h
+++ b/src/include/catalog/pg_trigger.h
@@ -1,7 +1,7 @@
/*-------------------------------------------------------------------------
*
* pg_trigger.h
- * definition of the system "trigger" relation (pg_trigger)
+ * definition of the "trigger" system catalog (pg_trigger)
*
*
* Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
diff --git a/src/include/catalog/pg_ts_config.dat b/src/include/catalog/pg_ts_config.dat
index b57db6787dc..142aa35ab63 100644
--- a/src/include/catalog/pg_ts_config.dat
+++ b/src/include/catalog/pg_ts_config.dat
@@ -1,7 +1,7 @@
#----------------------------------------------------------------------
#
# pg_ts_config.dat
-# Initial contents of the pg_ts_config system relation.
+# Initial contents of the pg_ts_config system catalog.
#
# Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
# Portions Copyright (c) 1994, Regents of the University of California
diff --git a/src/include/catalog/pg_ts_config.h b/src/include/catalog/pg_ts_config.h
index d344bb76de8..ce93c2b7ffb 100644
--- a/src/include/catalog/pg_ts_config.h
+++ b/src/include/catalog/pg_ts_config.h
@@ -1,7 +1,8 @@
/*-------------------------------------------------------------------------
*
* pg_ts_config.h
- * definition of configuration of tsearch
+ * definition of the "text search configuration" system catalog
+ * (pg_ts_config)
*
*
* Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
diff --git a/src/include/catalog/pg_ts_config_map.dat b/src/include/catalog/pg_ts_config_map.dat
index 090a1ca1e91..097a9f5e6df 100644
--- a/src/include/catalog/pg_ts_config_map.dat
+++ b/src/include/catalog/pg_ts_config_map.dat
@@ -1,7 +1,7 @@
#----------------------------------------------------------------------
#
# pg_ts_config_map.dat
-# Initial contents of the pg_ts_config_map system relation.
+# Initial contents of the pg_ts_config_map system catalog.
#
# Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
# Portions Copyright (c) 1994, Regents of the University of California
diff --git a/src/include/catalog/pg_ts_config_map.h b/src/include/catalog/pg_ts_config_map.h
index 21200215c45..58563233733 100644
--- a/src/include/catalog/pg_ts_config_map.h
+++ b/src/include/catalog/pg_ts_config_map.h
@@ -1,7 +1,8 @@
/*-------------------------------------------------------------------------
*
* pg_ts_config_map.h
- * definition of token mappings for configurations of tsearch
+ * definition of the system catalog for text search token mappings
+ * (pg_ts_config_map)
*
*
* Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
diff --git a/src/include/catalog/pg_ts_dict.dat b/src/include/catalog/pg_ts_dict.dat
index 6852303604c..6db8284bb78 100644
--- a/src/include/catalog/pg_ts_dict.dat
+++ b/src/include/catalog/pg_ts_dict.dat
@@ -1,7 +1,7 @@
#----------------------------------------------------------------------
#
# pg_ts_dict.dat
-# Initial contents of the pg_ts_dict system relation.
+# Initial contents of the pg_ts_dict system catalog.
#
# Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
# Portions Copyright (c) 1994, Regents of the University of California
diff --git a/src/include/catalog/pg_ts_dict.h b/src/include/catalog/pg_ts_dict.h
index 1e285adcec9..cd5f150fe8e 100644
--- a/src/include/catalog/pg_ts_dict.h
+++ b/src/include/catalog/pg_ts_dict.h
@@ -1,7 +1,7 @@
/*-------------------------------------------------------------------------
*
* pg_ts_dict.h
- * definition of dictionaries for tsearch
+ * definition of the "text search dictionary" system catalog (pg_ts_dict)
*
*
* Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
diff --git a/src/include/catalog/pg_ts_parser.dat b/src/include/catalog/pg_ts_parser.dat
index 8c507705962..68a639b50d5 100644
--- a/src/include/catalog/pg_ts_parser.dat
+++ b/src/include/catalog/pg_ts_parser.dat
@@ -1,7 +1,7 @@
#----------------------------------------------------------------------
#
# pg_ts_parser.dat
-# Initial contents of the pg_ts_parser system relation.
+# Initial contents of the pg_ts_parser system catalog.
#
# Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
# Portions Copyright (c) 1994, Regents of the University of California
diff --git a/src/include/catalog/pg_ts_parser.h b/src/include/catalog/pg_ts_parser.h
index ccaf40bbb41..34585eac00c 100644
--- a/src/include/catalog/pg_ts_parser.h
+++ b/src/include/catalog/pg_ts_parser.h
@@ -1,7 +1,7 @@
/*-------------------------------------------------------------------------
*
* pg_ts_parser.h
- * definition of parsers for tsearch
+ * definition of the "text search parser" system catalog (pg_ts_parser)
*
*
* Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
diff --git a/src/include/catalog/pg_ts_template.dat b/src/include/catalog/pg_ts_template.dat
index 1322c390226..8d750ecac00 100644
--- a/src/include/catalog/pg_ts_template.dat
+++ b/src/include/catalog/pg_ts_template.dat
@@ -1,7 +1,7 @@
#----------------------------------------------------------------------
#
# pg_ts_template.dat
-# Initial contents of the pg_ts_template system relation.
+# Initial contents of the pg_ts_template system catalog.
#
# Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
# Portions Copyright (c) 1994, Regents of the University of California
diff --git a/src/include/catalog/pg_ts_template.h b/src/include/catalog/pg_ts_template.h
index 5e66e02beff..50be08eca56 100644
--- a/src/include/catalog/pg_ts_template.h
+++ b/src/include/catalog/pg_ts_template.h
@@ -1,7 +1,7 @@
/*-------------------------------------------------------------------------
*
* pg_ts_template.h
- * definition of dictionary templates for tsearch
+ * definition of the "text search template" system catalog (pg_ts_template)
*
*
* Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
diff --git a/src/include/catalog/pg_type.dat b/src/include/catalog/pg_type.dat
index ae7e89b3222..48e01cd6947 100644
--- a/src/include/catalog/pg_type.dat
+++ b/src/include/catalog/pg_type.dat
@@ -1,7 +1,7 @@
#----------------------------------------------------------------------
#
# pg_type.dat
-# Initial contents of the pg_type system relation.
+# Initial contents of the pg_type system catalog.
#
# Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
# Portions Copyright (c) 1994, Regents of the University of California
diff --git a/src/include/catalog/pg_type.h b/src/include/catalog/pg_type.h
index 8f301db91c5..5914ee706ae 100644
--- a/src/include/catalog/pg_type.h
+++ b/src/include/catalog/pg_type.h
@@ -1,7 +1,7 @@
/*-------------------------------------------------------------------------
*
* pg_type.h
- * definition of the system "type" relation (pg_type)
+ * definition of the "type" system catalog (pg_type)
*
*
* Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
diff --git a/src/include/catalog/pg_user_mapping.h b/src/include/catalog/pg_user_mapping.h
index 6efbed0a9d4..e4e2ff36dcf 100644
--- a/src/include/catalog/pg_user_mapping.h
+++ b/src/include/catalog/pg_user_mapping.h
@@ -1,7 +1,7 @@
/*-------------------------------------------------------------------------
*
* pg_user_mapping.h
- * definition of the system "user mapping" relation (pg_user_mapping)
+ * definition of the "user mapping" system catalog (pg_user_mapping)
*
* Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
* Portions Copyright (c) 1994, Regents of the University of California