Make $PostgreSQL CVS tags consistent for SGML files.

63 files changed, 67 insertions, 183 deletions

diff --git a/doc/src/sgml/advanced.sgml b/doc/src/sgml/advanced.sgml
index 35359f76ef..0d4873156b 100644
--- a/doc/src/sgml/advanced.sgml
+++ b/doc/src/sgml/advanced.sgml
@@ -1,6 +1,4 @@
-<!--
-$PostgreSQL$
--->
+<!-- $PostgreSQL$ -->
 
  <chapter id="tutorial-advanced">
   <title>Advanced Features</title>
diff --git a/doc/src/sgml/arch-dev.sgml b/doc/src/sgml/arch-dev.sgml
index b8986f9409..4e7b94757a 100644
--- a/doc/src/sgml/arch-dev.sgml
+++ b/doc/src/sgml/arch-dev.sgml
@@ -1,6 +1,4 @@
-<!--
-$PostgreSQL$
--->
+<!-- $PostgreSQL$ -->
 
  <chapter id="overview">
   <title>Overview of PostgreSQL Internals</title>
diff --git a/doc/src/sgml/backup.sgml b/doc/src/sgml/backup.sgml
index 86eec2825b..e7bde3c68c 100644
--- a/doc/src/sgml/backup.sgml
+++ b/doc/src/sgml/backup.sgml
@@ -1,6 +1,5 @@
-<!--
-$PostgreSQL$
--->
+<!-- $PostgreSQL$ -->
+
 <chapter id="backup">
  <title>Backup and Restore</title>
 
diff --git a/doc/src/sgml/biblio.sgml b/doc/src/sgml/biblio.sgml
index 3fead82e53..099592d4bd 100644
--- a/doc/src/sgml/biblio.sgml
+++ b/doc/src/sgml/biblio.sgml
@@ -1,6 +1,4 @@
-<!--
-$PostgreSQL$
--->
+<!-- $PostgreSQL$ -->
 
  <bibliography id="biblio">
   <title>Bibliography</title>
diff --git a/doc/src/sgml/bki.sgml b/doc/src/sgml/bki.sgml
index c6a2438ef0..7b75b086bd 100644
--- a/doc/src/sgml/bki.sgml
+++ b/doc/src/sgml/bki.sgml
@@ -1,6 +1,4 @@
-<!--
-$PostgreSQL$
- -->
+<!-- $PostgreSQL$ -->
 
 <chapter id="bki">
  <title><acronym>BKI</acronym> Backend Interface</title>
diff --git a/doc/src/sgml/catalogs.sgml b/doc/src/sgml/catalogs.sgml
index d77f8a219d..9d37197090 100644
--- a/doc/src/sgml/catalogs.sgml
+++ b/doc/src/sgml/catalogs.sgml
@@ -1,6 +1,6 @@
+<!-- $PostgreSQL$ -->
 <!--
  Documentation of the system catalogs, directed toward PostgreSQL developers
- $PostgreSQL$
  -->
 
 <chapter id="catalogs">
diff --git a/doc/src/sgml/client-auth.sgml b/doc/src/sgml/client-auth.sgml
index aa35a070a8..342a924d27 100644
--- a/doc/src/sgml/client-auth.sgml
+++ b/doc/src/sgml/client-auth.sgml
@@ -1,6 +1,4 @@
-<!--
-$PostgreSQL$
--->
+<!-- $PostgreSQL$ -->
 
 <chapter id="client-authentication">
  <title>Client Authentication</title>
diff --git a/doc/src/sgml/config.sgml b/doc/src/sgml/config.sgml
index da12ad1df4..8c3917cf26 100644
--- a/doc/src/sgml/config.sgml
+++ b/doc/src/sgml/config.sgml
@@ -1,6 +1,5 @@
-<!--
-$PostgreSQL$
--->
+<!-- $PostgreSQL$ -->
+
 <chapter Id="runtime-config">
   <title>Server Configuration</title>
 
diff --git a/doc/src/sgml/contacts.sgml b/doc/src/sgml/contacts.sgml
index b5d88947ae..5dba2dfcf5 100644
--- a/doc/src/sgml/contacts.sgml
+++ b/doc/src/sgml/contacts.sgml
@@ -1,3 +1,5 @@
+<!-- $PostgreSQL$ -->
+
 <appendix label="B" id="contacts">
 <title>Contacts</title>
 
diff --git a/doc/src/sgml/cvs.sgml b/doc/src/sgml/cvs.sgml
index 9126a81807..c50739acf4 100644
--- a/doc/src/sgml/cvs.sgml
+++ b/doc/src/sgml/cvs.sgml
@@ -1,6 +1,4 @@
-<!--
-$PostgreSQL$
--->
+<!-- $PostgreSQL$ -->
 
 <appendix id="cvs">
  <appendixinfo>
diff --git a/doc/src/sgml/datatype.sgml b/doc/src/sgml/datatype.sgml
index b629b3ee64..b25836e508 100644
--- a/doc/src/sgml/datatype.sgml
+++ b/doc/src/sgml/datatype.sgml
@@ -1,6 +1,4 @@
-<!--
-$PostgreSQL$
--->
+<!-- $PostgreSQL$ -->
 
  <chapter id="datatype">
   <title id="datatype-title">Data Types</title>
diff --git a/doc/src/sgml/datetime.sgml b/doc/src/sgml/datetime.sgml
index aeeb129833..7cd8758310 100644
--- a/doc/src/sgml/datetime.sgml
+++ b/doc/src/sgml/datetime.sgml
@@ -1,6 +1,4 @@
-<!--
-$PostgreSQL$
--->
+<!-- $PostgreSQL$ -->
 
  <appendix id="datetime-appendix">
   <title>Date/Time Support</title>
diff --git a/doc/src/sgml/dfunc.sgml b/doc/src/sgml/dfunc.sgml
index f2e69ee181..3489a09d40 100644
--- a/doc/src/sgml/dfunc.sgml
+++ b/doc/src/sgml/dfunc.sgml
@@ -1,6 +1,4 @@
-<!--
-$PostgreSQL$
--->
+<!-- $PostgreSQL$ -->
 
 <sect2 id="dfunc">
  <title id="dfunc-title">Compiling and Linking Dynamically-Loaded Functions</title>
diff --git a/doc/src/sgml/diskusage.sgml b/doc/src/sgml/diskusage.sgml
index bd554b50df..bd908e89e7 100644
--- a/doc/src/sgml/diskusage.sgml
+++ b/doc/src/sgml/diskusage.sgml
@@ -1,6 +1,4 @@
-<!--
-$PostgreSQL$
--->
+<!-- $PostgreSQL$ -->
 
 <chapter id="diskusage">
  <title>Monitoring Disk Usage</title>
diff --git a/doc/src/sgml/ecpg.sgml b/doc/src/sgml/ecpg.sgml
index 0bee792bba..b4ddc637ef 100644
--- a/doc/src/sgml/ecpg.sgml
+++ b/doc/src/sgml/ecpg.sgml
@@ -1,6 +1,4 @@
-<!--
-$PostgreSQL$
--->
+<!-- $PostgreSQL$ -->
 
 <chapter id="ecpg">
  <title><application>ECPG</application> - Embedded <acronym>SQL</acronym> in C</title>
diff --git a/doc/src/sgml/extend.sgml b/doc/src/sgml/extend.sgml
index ec5314d1c3..b949752507 100644
--- a/doc/src/sgml/extend.sgml
+++ b/doc/src/sgml/extend.sgml
@@ -1,6 +1,4 @@
-<!--
-$PostgreSQL$
--->
+<!-- $PostgreSQL$ -->
 
  <chapter id="extend">
   <title>Extending <acronym>SQL</acronym></title>
diff --git a/doc/src/sgml/external-projects.sgml b/doc/src/sgml/external-projects.sgml
index 0a4ded3d9f..2a669d6f7d 100644
--- a/doc/src/sgml/external-projects.sgml
+++ b/doc/src/sgml/external-projects.sgml
@@ -1,6 +1,4 @@
-<!--
-$PostgreSQL$
--->
+<!-- $PostgreSQL$ -->
 
  <appendix id="external-projects">
   <title>External Projects</title>
diff --git a/doc/src/sgml/features.sgml b/doc/src/sgml/features.sgml
index 7213c8bdef..092b107cb0 100644
--- a/doc/src/sgml/features.sgml
+++ b/doc/src/sgml/features.sgml
@@ -1,6 +1,4 @@
-<!--
-$PostgreSQL$
--->
+<!-- $PostgreSQL$ -->
 
 <appendix id="features">
  <title>SQL Conformance</title>
diff --git a/doc/src/sgml/func.sgml b/doc/src/sgml/func.sgml
index 5753f49c48..1695092535 100644
--- a/doc/src/sgml/func.sgml
+++ b/doc/src/sgml/func.sgml
@@ -1,7 +1,4 @@
-<!--
-$PostgreSQL$
-PostgreSQL documentation
--->
+<!-- $PostgreSQL$ -->
 
  <chapter id="functions">
   <title>Functions and Operators</title>
diff --git a/doc/src/sgml/geqo.sgml b/doc/src/sgml/geqo.sgml
index f80fca6dc5..881b3a663f 100644
--- a/doc/src/sgml/geqo.sgml
+++ b/doc/src/sgml/geqo.sgml
@@ -1,7 +1,4 @@
-<!--
-$PostgreSQL$
-Genetic Optimizer
--->
+<!-- $PostgreSQL$ -->
 
  <chapter id="geqo">
   <chapterinfo>
diff --git a/doc/src/sgml/gist.sgml b/doc/src/sgml/gist.sgml
index 0be1e2f806..e3f247acb8 100644
--- a/doc/src/sgml/gist.sgml
+++ b/doc/src/sgml/gist.sgml
@@ -1,6 +1,4 @@
-<!--
-$PostgreSQL$
--->
+<!-- $PostgreSQL$ -->
 
 <chapter id="GiST">
 <title>GiST Indexes</title>
diff --git a/doc/src/sgml/history.sgml b/doc/src/sgml/history.sgml
index f082e9e01f..dbcd5df715 100644
--- a/doc/src/sgml/history.sgml
+++ b/doc/src/sgml/history.sgml
@@ -1,6 +1,4 @@
-<!--
-$PostgreSQL$
--->
+<!-- $PostgreSQL$ -->
 
 <sect1 id="history">
  <title>A Brief History of <productname>PostgreSQL</productname></title>
diff --git a/doc/src/sgml/indexam.sgml b/doc/src/sgml/indexam.sgml
index 3cbc539fb5..f3794c724d 100644
--- a/doc/src/sgml/indexam.sgml
+++ b/doc/src/sgml/indexam.sgml
@@ -1,6 +1,4 @@
-<!--
-$PostgreSQL$
--->
+<!-- $PostgreSQL$ -->
 
 <chapter id="indexam">
  <title>Index Access Method Interface Definition</title>
diff --git a/doc/src/sgml/info.sgml b/doc/src/sgml/info.sgml
index 5c818af07b..62cac68f9b 100644
--- a/doc/src/sgml/info.sgml
+++ b/doc/src/sgml/info.sgml
@@ -1,6 +1,4 @@
-<!--
-$PostgreSQL$
--->
+<!-- $PostgreSQL$ -->
 
 <sect1 id="resources">
  <title>Further Information</title>
diff --git a/doc/src/sgml/install-win32.sgml b/doc/src/sgml/install-win32.sgml
index 232d6d7bf8..8f869fa5c3 100644
--- a/doc/src/sgml/install-win32.sgml
+++ b/doc/src/sgml/install-win32.sgml
@@ -1,6 +1,4 @@
-<!--
-$PostgreSQL$
--->
+<!-- $PostgreSQL$ -->
 
 <chapter id="install-win32">
  <title>Client-Only Installation on <productname>Windows</productname></title>
diff --git a/doc/src/sgml/intro.sgml b/doc/src/sgml/intro.sgml
index 6fd5571cd6..c5ea26a60f 100644
--- a/doc/src/sgml/intro.sgml
+++ b/doc/src/sgml/intro.sgml
@@ -1,6 +1,4 @@
-<!--
-$PostgreSQL$
--->
+<!-- $PostgreSQL$ -->
 
 <preface id="preface">
  <title>Preface</title>
diff --git a/doc/src/sgml/legal.sgml b/doc/src/sgml/legal.sgml
index 53251f6c10..1ac0a196bd 100644
--- a/doc/src/sgml/legal.sgml
+++ b/doc/src/sgml/legal.sgml
@@ -1,6 +1,4 @@
-<!--
-$PostgreSQL$
--->
+<!-- $PostgreSQL$ -->
 
 <copyright>
  <year>1996-2006</year>
diff --git a/doc/src/sgml/libpq.sgml b/doc/src/sgml/libpq.sgml
index 7067c840cf..a154435012 100644
--- a/doc/src/sgml/libpq.sgml
+++ b/doc/src/sgml/libpq.sgml
@@ -1,6 +1,4 @@
-<!--
-$PostgreSQL$
--->
+<!-- $PostgreSQL$ -->
 
  <chapter id="libpq">
   <title><application>libpq</application> - C Library</title>
diff --git a/doc/src/sgml/lobj.sgml b/doc/src/sgml/lobj.sgml
index 11463b28ea..113eb6076e 100644
--- a/doc/src/sgml/lobj.sgml
+++ b/doc/src/sgml/lobj.sgml
@@ -1,6 +1,4 @@
-<!--
-$PostgreSQL$
--->
+<!-- $PostgreSQL$ -->
 
  <chapter id="largeObjects">
   <title id="largeObjects-title">Large Objects</title>
diff --git a/doc/src/sgml/maintenance.sgml b/doc/src/sgml/maintenance.sgml
index b3c2087290..209d51c477 100644
--- a/doc/src/sgml/maintenance.sgml
+++ b/doc/src/sgml/maintenance.sgml
@@ -1,6 +1,4 @@
-<!--
-$PostgreSQL$
--->
+<!-- $PostgreSQL$ -->
 
 <chapter id="maintenance">
  <title>Routine Database Maintenance Tasks</title>
diff --git a/doc/src/sgml/manage-ag.sgml b/doc/src/sgml/manage-ag.sgml
index b084152833..7a9fef0aa6 100644
--- a/doc/src/sgml/manage-ag.sgml
+++ b/doc/src/sgml/manage-ag.sgml
@@ -1,6 +1,4 @@
-<!--
-$PostgreSQL$
--->
+<!-- $PostgreSQL$ -->
 
 <chapter id="managing-databases">
  <title>Managing Databases</title>
diff --git a/doc/src/sgml/monitoring.sgml b/doc/src/sgml/monitoring.sgml
index 16b5c55987..841ecebc1c 100644
--- a/doc/src/sgml/monitoring.sgml
+++ b/doc/src/sgml/monitoring.sgml
@@ -1,6 +1,4 @@
-<!--
-$PostgreSQL$
--->
+<!-- $PostgreSQL$ -->
 
 <chapter id="monitoring">
  <title>Monitoring Database Activity</title>
diff --git a/doc/src/sgml/mvcc.sgml b/doc/src/sgml/mvcc.sgml
index 88024860b2..6c1c581b34 100644
--- a/doc/src/sgml/mvcc.sgml
+++ b/doc/src/sgml/mvcc.sgml
@@ -1,6 +1,4 @@
-<!--
-$PostgreSQL$
--->
+<!-- $PostgreSQL$ -->
 
  <chapter id="mvcc">
   <title>Concurrency Control</title>
diff --git a/doc/src/sgml/nls.sgml b/doc/src/sgml/nls.sgml
index 324db467fe..291e29bdf6 100644
--- a/doc/src/sgml/nls.sgml
+++ b/doc/src/sgml/nls.sgml
@@ -1,6 +1,4 @@
-<!--
-$PostgreSQL$
--->
+<!-- $PostgreSQL$ -->
 
 <chapter id="nls">
  <chapterinfo>
diff --git a/doc/src/sgml/notation.sgml b/doc/src/sgml/notation.sgml
index edd8e360a1..abcd536b1b 100644
--- a/doc/src/sgml/notation.sgml
+++ b/doc/src/sgml/notation.sgml
@@ -1,6 +1,4 @@
-<!--
-$PostgreSQL$
--->
+<!-- $PostgreSQL$ -->
 
 <sect1 id="notation">
  <title>Conventions</title>
diff --git a/doc/src/sgml/perform.sgml b/doc/src/sgml/perform.sgml
index 06cca98e0f..a379382140 100644
--- a/doc/src/sgml/perform.sgml
+++ b/doc/src/sgml/perform.sgml
@@ -1,6 +1,4 @@
-<!--
-$PostgreSQL$
--->
+<!-- $PostgreSQL$ -->
 
  <chapter id="performance-tips">
   <title>Performance Tips</title>
diff --git a/doc/src/sgml/planstats.sgml b/doc/src/sgml/planstats.sgml
index 0190708f46..cf0f4ccd39 100644
--- a/doc/src/sgml/planstats.sgml
+++ b/doc/src/sgml/planstats.sgml
@@ -1,6 +1,4 @@
-<!--
-$PostgreSQL$
--->
+<!-- $PostgreSQL$ -->
 
 <chapter id="planner-stats-details">
  <title>How the Planner Uses Statistics</title>
diff --git a/doc/src/sgml/plhandler.sgml b/doc/src/sgml/plhandler.sgml
index 37195bafc1..073798ef69 100644
--- a/doc/src/sgml/plhandler.sgml
+++ b/doc/src/sgml/plhandler.sgml
@@ -1,6 +1,4 @@
-<!--
-$PostgreSQL$
--->
+<!-- $PostgreSQL$ -->
 
  <chapter id="plhandler">
    <title>Writing A Procedural Language Handler</title>
diff --git a/doc/src/sgml/plperl.sgml b/doc/src/sgml/plperl.sgml
index 43bf6243cb..76a3699aaf 100644
--- a/doc/src/sgml/plperl.sgml
+++ b/doc/src/sgml/plperl.sgml
@@ -1,6 +1,4 @@
-<!--
-$PostgreSQL$
--->
+<!-- $PostgreSQL$ -->
 
  <chapter id="plperl">
   <title>PL/Perl - Perl Procedural Language</title>
diff --git a/doc/src/sgml/plpgsql.sgml b/doc/src/sgml/plpgsql.sgml
index 5131ea5144..1812368bcf 100644
--- a/doc/src/sgml/plpgsql.sgml
+++ b/doc/src/sgml/plpgsql.sgml
@@ -1,6 +1,4 @@
-<!--
-$PostgreSQL$
--->
+<!-- $PostgreSQL$ -->
 
 <chapter id="plpgsql"> 
   <title><application>PL/pgSQL</application> - <acronym>SQL</acronym> Procedural Language</title>
diff --git a/doc/src/sgml/pltcl.sgml b/doc/src/sgml/pltcl.sgml
index 8e4c04a4ca..d8c362bc96 100644
--- a/doc/src/sgml/pltcl.sgml
+++ b/doc/src/sgml/pltcl.sgml
@@ -1,6 +1,4 @@
-<!--
-$PostgreSQL$
--->
+<!-- $PostgreSQL$ -->
 
  <chapter id="pltcl">
   <title>PL/Tcl - Tcl Procedural Language</title>
diff --git a/doc/src/sgml/postgres.sgml b/doc/src/sgml/postgres.sgml
index 80d36accbf..d57f3e1b32 100644
--- a/doc/src/sgml/postgres.sgml
+++ b/doc/src/sgml/postgres.sgml
@@ -1,6 +1,4 @@
-<!--
-$PostgreSQL$
--->
+<!-- $PostgreSQL$ -->
 
 <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook V4.2//EN" [
 
diff --git a/doc/src/sgml/problems.sgml b/doc/src/sgml/problems.sgml
index 1cac744f94..3642c50820 100644
--- a/doc/src/sgml/problems.sgml
+++ b/doc/src/sgml/problems.sgml
@@ -1,6 +1,4 @@
-<!--
-$PostgreSQL$
--->
+<!-- $PostgreSQL$ -->
 
 <sect1 id="bug-reporting">
  <title>Bug Reporting Guidelines</title>
diff --git a/doc/src/sgml/query.sgml b/doc/src/sgml/query.sgml
index 754003f3d4..94f0f17735 100644
--- a/doc/src/sgml/query.sgml
+++ b/doc/src/sgml/query.sgml
@@ -1,6 +1,4 @@
-<!--
-$PostgreSQL$
--->
+<!-- $PostgreSQL$ -->
 
  <chapter id="tutorial-sql">
   <title>The <acronym>SQL</acronym> Language</title>
diff --git a/doc/src/sgml/reference.sgml b/doc/src/sgml/reference.sgml
index ae2ac9f281..0797325507 100644
--- a/doc/src/sgml/reference.sgml
+++ b/doc/src/sgml/reference.sgml
@@ -1,8 +1,4 @@
-<!-- reference.sgml
-$PostgreSQL$
-
-PostgreSQL Reference Manual
--->
+<!-- $PostgreSQL$ -->
 
 <part id="reference">
  <title>Reference</title>
diff --git a/doc/src/sgml/release.sgml b/doc/src/sgml/release.sgml
index bd17a2b377..4addcb637e 100644
--- a/doc/src/sgml/release.sgml
+++ b/doc/src/sgml/release.sgml
@@ -1,5 +1,5 @@
+<!-- $PostgreSQL$ -->
 <!--
-$PostgreSQL$
 
 Typical markup:
 
diff --git a/doc/src/sgml/runtime.sgml b/doc/src/sgml/runtime.sgml
index b7b0589ba8..45ec851246 100644
--- a/doc/src/sgml/runtime.sgml
+++ b/doc/src/sgml/runtime.sgml
@@ -1,6 +1,4 @@
-<!--
-$PostgreSQL$
--->
+<!-- $PostgreSQL$ -->
 
 <chapter Id="runtime">
  <title>Operating System Environment</title>
diff --git a/doc/src/sgml/sources.sgml b/doc/src/sgml/sources.sgml
index f20ee37878..3e8c5733e7 100644
--- a/doc/src/sgml/sources.sgml
+++ b/doc/src/sgml/sources.sgml
@@ -1,6 +1,4 @@
-<!--
-$PostgreSQL$
--->
+<!-- $PostgreSQL$ -->
 
  <chapter id="source">
   <title>PostgreSQL Coding Conventions</title>
diff --git a/doc/src/sgml/spi.sgml b/doc/src/sgml/spi.sgml
index 5a3388a033..e0cd06ab69 100644
--- a/doc/src/sgml/spi.sgml
+++ b/doc/src/sgml/spi.sgml
@@ -1,6 +1,4 @@
-<!--
-$PostgreSQL$
--->
+<!-- $PostgreSQL$ -->
 
 <chapter id="spi">
  <title>Server Programming Interface</title>
diff --git a/doc/src/sgml/sql.sgml b/doc/src/sgml/sql.sgml
index 5462462297..bcb5a7669b 100644
--- a/doc/src/sgml/sql.sgml
+++ b/doc/src/sgml/sql.sgml
@@ -1,6 +1,4 @@
-<!--
-$PostgreSQL$
--->
+<!-- $PostgreSQL$ -->
 
  <chapter id="sql-intro">
   <title>SQL</title>
diff --git a/doc/src/sgml/start.sgml b/doc/src/sgml/start.sgml
index f140167bdf..d4133f63e7 100644
--- a/doc/src/sgml/start.sgml
+++ b/doc/src/sgml/start.sgml
@@ -1,6 +1,4 @@
-<!--
-$PostgreSQL$
--->
+<!-- $PostgreSQL$ -->
 
  <chapter id="tutorial-start">
   <title>Getting Started</title>
diff --git a/doc/src/sgml/storage.sgml b/doc/src/sgml/storage.sgml
index 45e0c988c0..22b4a51210 100644
--- a/doc/src/sgml/storage.sgml
+++ b/doc/src/sgml/storage.sgml
@@ -1,6 +1,4 @@
-<!--
-$PostgreSQL$
--->
+<!-- $PostgreSQL$ -->
 
 <chapter id="storage">
 
diff --git a/doc/src/sgml/syntax.sgml b/doc/src/sgml/syntax.sgml
index c3498e4317..7b94d20245 100644
--- a/doc/src/sgml/syntax.sgml
+++ b/doc/src/sgml/syntax.sgml
@@ -1,6 +1,4 @@
-<!--
-$PostgreSQL$
--->
+<!-- $PostgreSQL$ -->
 
 <chapter id="sql-syntax">
  <title>SQL Syntax</title>
diff --git a/doc/src/sgml/trigger.sgml b/doc/src/sgml/trigger.sgml
index e233eb56ee..37ee345bc3 100644
--- a/doc/src/sgml/trigger.sgml
+++ b/doc/src/sgml/trigger.sgml
@@ -1,6 +1,4 @@
-<!--
-$PostgreSQL$
--->
+<!-- $PostgreSQL$ -->
 
  <chapter id="triggers">
   <title>Triggers</title>
diff --git a/doc/src/sgml/typeconv.sgml b/doc/src/sgml/typeconv.sgml
index 8d77d70222..1328128cef 100644
--- a/doc/src/sgml/typeconv.sgml
+++ b/doc/src/sgml/typeconv.sgml
@@ -1,6 +1,4 @@
-<!--
-$PostgreSQL$
--->
+<!-- $PostgreSQL$ -->
 
 <chapter Id="typeconv">
 <title>Type Conversion</title>
diff --git a/doc/src/sgml/user-manag.sgml b/doc/src/sgml/user-manag.sgml
index 1f4428630e..aa2f21d3a8 100644
--- a/doc/src/sgml/user-manag.sgml
+++ b/doc/src/sgml/user-manag.sgml
@@ -1,6 +1,4 @@
-<!--
-$PostgreSQL$
--->
+<!-- $PostgreSQL$ -->
 
 <chapter id="user-manag">
  <title>Database Roles and Privileges</title>
diff --git a/doc/src/sgml/xaggr.sgml b/doc/src/sgml/xaggr.sgml
index 7810fc628e..286f5faf32 100644
--- a/doc/src/sgml/xaggr.sgml
+++ b/doc/src/sgml/xaggr.sgml
@@ -1,6 +1,4 @@
-<!--
-$PostgreSQL$
--->
+<!-- $PostgreSQL$ -->
 
  <sect1 id="xaggr">
   <title>User-Defined Aggregates</title>
diff --git a/doc/src/sgml/xfunc.sgml b/doc/src/sgml/xfunc.sgml
index 8eb82f7c0e..4bc418690e 100644
--- a/doc/src/sgml/xfunc.sgml
+++ b/doc/src/sgml/xfunc.sgml
@@ -1,6 +1,4 @@
-<!--
-$PostgreSQL$
--->
+<!-- $PostgreSQL$ -->
 
  <sect1 id="xfunc">
   <title>User-Defined Functions</title>
diff --git a/doc/src/sgml/xindex.sgml b/doc/src/sgml/xindex.sgml
index 7d0c7542d2..69faacc13c 100644
--- a/doc/src/sgml/xindex.sgml
+++ b/doc/src/sgml/xindex.sgml
@@ -1,6 +1,4 @@
-<!--
-$PostgreSQL$
--->
+<!-- $PostgreSQL$ -->
 
 <sect1 id="xindex">
  <title>Interfacing Extensions To Indexes</title>
diff --git a/doc/src/sgml/xoper.sgml b/doc/src/sgml/xoper.sgml
index c936339204..9fafbc5415 100644
--- a/doc/src/sgml/xoper.sgml
+++ b/doc/src/sgml/xoper.sgml
@@ -1,6 +1,4 @@
-<!--
-$PostgreSQL$
--->
+<!-- $PostgreSQL$ -->
 
  <sect1 id="xoper">
   <title>User-Defined Operators</title>
diff --git a/doc/src/sgml/xplang.sgml b/doc/src/sgml/xplang.sgml
index 37f1f0adc3..f6291738b6 100644
--- a/doc/src/sgml/xplang.sgml
+++ b/doc/src/sgml/xplang.sgml
@@ -1,6 +1,4 @@
-<!--
-$PostgreSQL$
--->
+<!-- $PostgreSQL$ -->
 
  <chapter id="xplang">
   <title id="xplang-title">Procedural Languages</title>
diff --git a/doc/src/sgml/xtypes.sgml b/doc/src/sgml/xtypes.sgml
index dcaaa6481a..5d36e46e76 100644
--- a/doc/src/sgml/xtypes.sgml
+++ b/doc/src/sgml/xtypes.sgml
@@ -1,6 +1,4 @@
-<!--
-$PostgreSQL$
--->
+<!-- $PostgreSQL$ -->
 
  <sect1 id="xtypes">
   <title>User-Defined Types</title>
diff --git a/src/include/catalog/pg_proc.h b/src/include/catalog/pg_proc.h
index e4fdbc8466..ba3c35f273 100644
--- a/src/include/catalog/pg_proc.h
+++ b/src/include/catalog/pg_proc.h
@@ -1614,6 +1614,8 @@ DATA(insert OID = 1298 (  timetzdate_pl    PGNSP PGUID 14 f f t f i 2 1184 "1266
 DESCR("convert time with time zone and date to timestamp with time zone");
 DATA(insert OID = 1299 (  now			   PGNSP PGUID 12 f f t f s 0 1184 "" _null_ _null_ _null_	now - _null_ ));
 DESCR("current transaction time");
+DATA(insert OID = 2512 (  transaction_timestamp	   PGNSP PGUID 12 f f t f s 0 1184 "" _null_ _null_ _null_	now - _null_ ));
+DESCR("current transaction time");
 
 /* OIDS 1300 - 1399 */