From b2145e9365ee38c68b74dae3dca803696cba69b4 Mon Sep 17 00:00:00 2001
From: Peter Eisentraut <peter_e@gmx.net>
Date: Thu, 21 Dec 2000 22:55:27 +0000
Subject: [PATCH] Get rid of the little "v"s in front of version numbers,
 substituting the full word "version" where appropriate.

---
 doc/src/sgml/arch-dev.sgml |   6 +-
 doc/src/sgml/cvs.sgml      |   4 +-
 doc/src/sgml/datetime.sgml |   4 +-
 doc/src/sgml/history.sgml  |   4 +-
 doc/src/sgml/jdbc.sgml     |   6 +-
 doc/src/sgml/lobj.sgml     |   4 +-
 doc/src/sgml/notation.sgml |   4 +-
 doc/src/sgml/protocol.sgml |   4 +-
 doc/src/sgml/release.sgml  | 112 ++++++++++++++++++-------------------
 doc/src/sgml/syntax.sgml   |   7 +--
 doc/src/sgml/xfunc.sgml    |   6 +-
 11 files changed, 80 insertions(+), 81 deletions(-)

diff --git a/doc/src/sgml/arch-dev.sgml b/doc/src/sgml/arch-dev.sgml
index 37b09c196ee..3c37e6e0c5c 100644
--- a/doc/src/sgml/arch-dev.sgml
+++ b/doc/src/sgml/arch-dev.sgml
@@ -1,5 +1,5 @@
 <!--
-$Header: /cvsroot/pgsql/doc/src/sgml/arch-dev.sgml,v 2.10 2000/09/29 20:21:33 petere Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/arch-dev.sgml,v 2.11 2000/12/21 22:55:26 petere Exp $
 -->
 
  <chapter id="overview">
@@ -1724,7 +1724,7 @@ havingQual} to the one attached to the field {\tt havingQual} of the
 {\it parsetree} given by the parameter {\tt parsetree}. This is done
 by adding a new {\tt AND} node and attaching the old and the new {\it
 operator tree} as arguments to it. {\tt AddHavingQual()} has not been
-existing until v6.3.2. It has been created for the {\it having logic}.
+existing until version 6.3.2. It has been created for the {\it having logic}.
 %
 \begin{verbatim}
   void
@@ -1752,7 +1752,7 @@ existing until v6.3.2. It has been created for the {\it having logic}.
 This function is similar to the above described function  {\tt
 AddHavingQual()}. It also adds the {\it operator tree} given by the
 parameter {\tt havingQual} but prefixes it by a {\tt NOT} node. {\tt
-AddNotHavingQual()} has also not been existing until v6.3.2 and has been
+AddNotHavingQual()} has also not been existing until version 6.3.2 and has been
 created for the {\it having logic}.
 %
 \begin{verbatim}
diff --git a/doc/src/sgml/cvs.sgml b/doc/src/sgml/cvs.sgml
index 2c2b514d88a..861633490ee 100644
--- a/doc/src/sgml/cvs.sgml
+++ b/doc/src/sgml/cvs.sgml
@@ -1,5 +1,5 @@
 <!--
-$Header: /cvsroot/pgsql/doc/src/sgml/cvs.sgml,v 1.10 2000/09/29 20:21:33 petere Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/cvs.sgml,v 1.11 2000/12/21 22:55:26 petere Exp $
 CVS code repository
 Thomas Lockhart
 -->
@@ -99,7 +99,7 @@ $ cvs checkout -r REL6_4 tc
   </para>
 
   <para>
-   So, to create the v6.4 release
+   So, to create the 6.4 release
    I did the following:
 
    <programlisting>
diff --git a/doc/src/sgml/datetime.sgml b/doc/src/sgml/datetime.sgml
index 35f930b33b5..06726fb1ff3 100644
--- a/doc/src/sgml/datetime.sgml
+++ b/doc/src/sgml/datetime.sgml
@@ -1,5 +1,5 @@
 <!--
-$Header: /cvsroot/pgsql/doc/src/sgml/datetime.sgml,v 2.13 2000/10/20 13:57:10 thomas Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/datetime.sgml,v 2.14 2000/12/21 22:55:27 petere Exp $
 Date/time details
 -->
 
@@ -622,7 +622,7 @@ Date/time details
 	Gregorian years 1-99AD may be entered by using 4 digits with leading
 	zeros (e.g. 0099 is 99AD). Previous versions of
 	<productname>Postgres</productname> accepted years with three
-	digits and with single digits, but as of v7.0 the rules have
+	digits and with single digits, but as of version 7.0 the rules have
 	been tightened up to reduce the possibility of ambiguity.
        </para>
       </tip>
diff --git a/doc/src/sgml/history.sgml b/doc/src/sgml/history.sgml
index 14992823261..fe2168cb074 100644
--- a/doc/src/sgml/history.sgml
+++ b/doc/src/sgml/history.sgml
@@ -1,5 +1,5 @@
 <!--
-$Header: /cvsroot/pgsql/doc/src/sgml/history.sgml,v 1.10 2000/09/29 20:21:34 petere Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/history.sgml,v 1.11 2000/12/21 22:55:27 petere Exp $
 -->
 
 <sect1 id="history">
@@ -246,7 +246,7 @@ $Header: /cvsroot/pgsql/doc/src/sgml/history.sgml,v 1.10 2000/09/29 20:21:34 pet
    <listitem>
     <para>
      Overall backend code speed has been increased by approximately 20-40%, 
-     and backend start-up time has decreased 80% since v6.0 was released.
+     and backend start-up time has decreased 80% since version 6.0 was released.
     </para>
    </listitem>
   </itemizedlist>
diff --git a/doc/src/sgml/jdbc.sgml b/doc/src/sgml/jdbc.sgml
index fb00aa829ea..575087fd955 100644
--- a/doc/src/sgml/jdbc.sgml
+++ b/doc/src/sgml/jdbc.sgml
@@ -1,5 +1,5 @@
 <!--
-$Header: /cvsroot/pgsql/doc/src/sgml/Attic/jdbc.sgml,v 1.15 2000/10/27 22:28:23 momjian Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/Attic/jdbc.sgml,v 1.16 2000/12/21 22:55:27 petere Exp $
 -->
 
  <chapter id="jdbc">
@@ -438,7 +438,7 @@ db.close();
       For <productname>Postgres</productname>, you must access large
       objects within an SQL transaction. Although this has always been 
       true in principle, it was not strictly enforced until the
-      release of v6.5. You would open a transaction by using the
+      release of version 6.5. You would open a transaction by using the
       <function>setAutoCommit()</function> method with an input
       parameter of <literal>false</literal>:
 
@@ -2642,7 +2642,7 @@ Both are available on
 <para>
 <ulink url="http://www.retep.org.uk">My own web site</ulink>
  contains updated information not included in this 
-document, and also includes precompiled drivers for v6.4, and earlier.
+document, and also includes precompiled drivers for versions 6.4 and earlier.
 </para>
 </sect1>
 </chapter>
diff --git a/doc/src/sgml/lobj.sgml b/doc/src/sgml/lobj.sgml
index 43daa3c12c3..9d25be88fd9 100644
--- a/doc/src/sgml/lobj.sgml
+++ b/doc/src/sgml/lobj.sgml
@@ -1,5 +1,5 @@
 <!--
-$Header: /cvsroot/pgsql/doc/src/sgml/lobj.sgml,v 1.13 2000/09/29 20:21:34 petere Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/lobj.sgml,v 1.14 2000/12/21 22:55:27 petere Exp $
 -->
 
  <chapter id="largeObjects">
@@ -70,7 +70,7 @@ $Header: /cvsroot/pgsql/doc/src/sgml/lobj.sgml,v 1.13 2000/09/29 20:21:34 petere
      <para>
       All large object manipulation <emphasis>must</emphasis> take
       place within an SQL transaction. This requirement is strictly
-      enforced as of Postgres v6.5, though it has been an
+      enforced as of Postgres 6.5, though it has been an
       implicit requirement in previous versions, resulting in
       misbehavior if ignored.
      </para>
diff --git a/doc/src/sgml/notation.sgml b/doc/src/sgml/notation.sgml
index 4d978b51317..f7991aba17b 100644
--- a/doc/src/sgml/notation.sgml
+++ b/doc/src/sgml/notation.sgml
@@ -1,5 +1,5 @@
 <!--
-$Header: /cvsroot/pgsql/doc/src/sgml/notation.sgml,v 1.10 2000/05/02 20:01:52 thomas Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/notation.sgml,v 1.11 2000/12/21 22:55:27 petere Exp $
 -->
 
 <sect1 id="terminology">
@@ -109,7 +109,7 @@ $Header: /cvsroot/pgsql/doc/src/sgml/notation.sgml,v 1.10 2000/05/02 20:01:52 th
 
  <note>
   <para>
-   At the time of writing (<Productname>Postgres</Productname> v7.0)
+   At the time of writing (<Productname>Postgres</Productname> 7.0)
    the notation for
    flagging commands is not universally consistant throughout the
    documentation set.
diff --git a/doc/src/sgml/protocol.sgml b/doc/src/sgml/protocol.sgml
index 8be998bb50f..bcf3399ebcc 100644
--- a/doc/src/sgml/protocol.sgml
+++ b/doc/src/sgml/protocol.sgml
@@ -20,7 +20,7 @@ Updates for protocol 2.0 by <ULink url="mailto:tgl@sss.pgh.pa.us">Tom Lane</ULin
 <Para>
 <ProductName>Postgres</ProductName> uses a message-based protocol for communication between frontends
 and backends.  The protocol is implemented over <Acronym>TCP/IP</Acronym> and also on Unix sockets.
-<ProductName>Postgres</ProductName> v6.3 introduced version numbers into the protocol.
+<ProductName>Postgres</ProductName> 6.3 introduced version numbers into the protocol.
 This was done in such
 a way as to still allow connections from earlier versions of frontends, but
 this document does not cover the protocol used by those earlier versions.
@@ -28,7 +28,7 @@ this document does not cover the protocol used by those earlier versions.
 
 <Para>
 This document describes version 2.0 of the protocol, implemented in
-<ProductName>Postgres</ProductName> v6.4 and later.
+<ProductName>Postgres</ProductName> 6.4 and later.
 </para>
 
 <Para>
diff --git a/doc/src/sgml/release.sgml b/doc/src/sgml/release.sgml
index bd33d881299..adb12435101 100644
--- a/doc/src/sgml/release.sgml
+++ b/doc/src/sgml/release.sgml
@@ -1,5 +1,5 @@
 <!--
-$Header: /cvsroot/pgsql/doc/src/sgml/release.sgml,v 1.69 2000/12/20 15:44:00 momjian Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/release.sgml,v 1.70 2000/12/21 22:55:27 petere Exp $
 -->
 
  <chapter id="release">
@@ -106,7 +106,7 @@ Subqueries in FROM are now supported.
    </para>
 
    <sect2>
-    <title>Migration to v7.1</title>
+    <title>Migration to version 7.1</title>
 
     <para>
 	A dump/restore using pg_dump is required for those wishing to migrate
@@ -306,11 +306,11 @@ New template0 database that contains no user additions(Tom)
 
 
    <sect2>
-    <title>Migration to v7.0.3</title>
+    <title>Migration to version 7.0.3</title>
 
     <para>
      A dump/restore is <emphasis>not</emphasis> required for those running
-     v7.0.*.
+     7.0.*.
     </para>
    </sect2>
 
@@ -384,11 +384,11 @@ Fix for crash of backend, on abort (Tom)
 
 
    <sect2>
-    <title>Migration to v7.0.2</title>
+    <title>Migration to version 7.0.2</title>
 
     <para>
      A dump/restore is <emphasis>not</emphasis> required for those running
-     v7.*.
+     7.*.
     </para>
    </sect2>
 
@@ -424,11 +424,11 @@ Added documentation to tarball.
    </para>
 
    <sect2>
-    <title>Migration to v7.0.1</title>
+    <title>Migration to version 7.0.1</title>
 
     <para>
      A dump/restore is <emphasis>not</emphasis> required for those running
-     v7.0.
+     7.0.
     </para>
    </sect2>
 
@@ -561,7 +561,7 @@ ecpg changes (Michael)
    </para>
 
    <sect2>
-    <title>Migration to v7.0</title>
+    <title>Migration to version 7.0</title>
 
     <para>
      A dump/restore using <application>pg_dump</application>
@@ -987,7 +987,7 @@ New multibyte encodings
 
 
    <sect2>
-    <title>Migration to v6.5.3</title>
+    <title>Migration to version 6.5.3</title>
 
     <para>
      A dump/restore is <emphasis>not</emphasis> required for those running
@@ -1030,7 +1030,7 @@ Fix dumping rules on inherited tables
 
 
    <sect2>
-    <title>Migration to v6.5.2</title>
+    <title>Migration to version 6.5.2</title>
 
     <para>
      A dump/restore is <emphasis>not</emphasis> required for those running
@@ -1095,7 +1095,7 @@ Updated version of pgaccess 0.98
    </para>
 
    <sect2>
-    <title>Migration to v6.5.1</title>
+    <title>Migration to version 6.5.1</title>
 
     <para>
      A dump/restore is <emphasis>not</emphasis> required for those running
@@ -1299,7 +1299,7 @@ Add Win1250 (Czech) support (Pavel Behal)
    </para>
 
    <sect2>
-    <title>Migration to v6.5</title>
+    <title>Migration to version 6.5</title>
 
     <para>
      A dump/restore using <application>pg_dump</application>
@@ -1565,7 +1565,7 @@ bug fix.
 
 
 <sect2>
-<title>Migration to v6.4.2</title>
+<title>Migration to version 6.4.2</title>
 
 <para>
 A dump/restore is <emphasis>not</emphasis> required for those running
@@ -1609,7 +1609,7 @@ problems reported by 6.4 users.
 
 
 <sect2>
-<title>Migration to v6.4.1</title>
+<title>Migration to version 6.4.1</title>
 
 <para>
 A dump/restore is <emphasis>not</emphasis> required for those running
@@ -1752,7 +1752,7 @@ been.
 </para>
 
 <sect2>
-<title>Migration to v6.4</title>
+<title>Migration to version 6.4</title>
 
 <para>
 A dump/restore using <application>pg_dump</application> 
@@ -1983,7 +1983,7 @@ new Makefile.shlib for shared library configuration(Tom)
 </para>
 <para>
 This is a bugfix release for 6.3.x.
-Refer to the release notes for v6.3 for a more complete summary of new features.
+Refer to the release notes for version 6.3 for a more complete summary of new features.
 </para>
 <para>
 Summary:
@@ -1992,7 +1992,7 @@ Summary:
 <listitem>
 <para>
 Repairs automatic configuration support for some platforms, including Linux,
-from breakage inadvertently introduced in v6.3.1.
+from breakage inadvertently introduced in version 6.3.1.
 </para>
 </listitem>
 
@@ -2011,8 +2011,8 @@ This last step should be performed while the postmaster is not running.
 You should re-link any custom applications that use <productname>Postgres</productname> libraries.
 </para>
 <para>
-For upgrades from pre-v6.3 installations,
-refer to the installation and migration instructions for v6.3.
+For upgrades from pre-6.3 installations,
+refer to the installation and migration instructions for version 6.3.
 </para>
 
    <sect2>
@@ -2095,8 +2095,8 @@ This last step should be performed while the postmaster is not running.
 You should re-link any custom applications that use <productname>Postgres</productname> libraries.
 </para>
 <para>
-For upgrades from pre-v6.3 installations,
-refer to the installation and migration instructions for v6.3.
+For upgrades from pre-6.3 installations,
+refer to the installation and migration instructions for version 6.3.
 </para>
 
    <sect2>
@@ -2271,7 +2271,7 @@ Better identify tcl and tk libs and includes(Bruce)
    </para>
 
    <sect2>
-    <title>Migration to v6.3</title>
+    <title>Migration to version 6.3</title>
 
     <para>
      A dump/restore using <application>pg_dump</application> 
@@ -2473,7 +2473,7 @@ Remove un-needed malloc() calls and replace with palloc()(Bruce)
 1997-10-17
 </para>
 <para>
-v6.2.1 is a bug-fix and usability release on v6.2.
+6.2.1 is a bug-fix and usability release on 6.2.
 </para>
 <para>
 Summary:
@@ -2494,20 +2494,20 @@ Include example trigger function for inserting user names on table updates.
 </itemizedlist>
 </para>
 <para>
-This is a minor bug-fix release on v6.2. 
-For upgrades from pre-v6.2 systems, a full dump/reload is required. 
-Refer to the v6.2 release notes for instructions.
+This is a minor bug-fix release on 6.2. 
+For upgrades from pre-6.2 systems, a full dump/reload is required. 
+Refer to the 6.2 release notes for instructions.
 </para>
 
 <sect2>
-<title>Migration from v6.2 to v6.2.1</title>
+<title>Migration from version 6.2 to version 6.2.1</title>
 
 <para>
-This is a minor bug-fix release. A dump/reload is not required from v6.2,
-but is required from any release prior to v6.2.
+This is a minor bug-fix release. A dump/reload is not required from version 6.2,
+but is required from any release prior to 6.2.
 </para>
 <para>
-In upgrading from v6.2, if you choose to dump/reload you will find that
+In upgrading from version 6.2, if you choose to dump/reload you will find that
 avg(money) is now calculated correctly. All other bug fixes take effect
 upon updating the executables.
 </para>
@@ -2570,7 +2570,7 @@ previous releases of <productname>Postgres</productname>.
 </para>
 
 <sect2>
-<title>Migration from v6.1 to v6.2</title>
+<title>Migration from version 6.1 to version 6.2</title>
 
 <para>
 This migration requires a complete dump of the 6.1 database and a
@@ -2583,7 +2583,7 @@ to dump the 6.1 database.
 </sect2>
 
 <sect2>
-<title>Migration from v1.x to v6.2</title>
+<title>Migration from version 1.<replaceable>x</> to version 6.2</title>
 
 <para>
 Those migrating from earlier 1.* releases should first upgrade to 1.09
@@ -2725,15 +2725,15 @@ SPI and Trigger programming guides (Vadim & D'Arcy)
 
 
 <sect2>
-<title>Migration from v6.1 to v6.1.1</title>
+<title>Migration from version 6.1 to version 6.1.1</title>
 
 <para>
 1997-07-22
 </para>
 <para>
-This is a minor bug-fix release. A dump/reload is not required from v6.1,
-but is required from any release prior to v6.1.
-Refer to the release notes for v6.1 for more details.
+This is a minor bug-fix release. A dump/reload is not required from version 6.1,
+but is required from any release prior to 6.1.
+Refer to the release notes for 6.1 for more details.
 </para>
 </sect2>
 
@@ -2783,7 +2783,7 @@ pg_dumpall now returns proper status, portability fix(Bruce)
 </para>
 <para>
   The regression tests have been adapted and extensively modified for the
-  v6.1 release of <productname>Postgres</productname>.
+  6.1 release of <productname>Postgres</productname>.
 </para>
 
 <para>
@@ -2795,7 +2795,7 @@ pg_dumpall now returns proper status, portability fix(Bruce)
 </para>
 
 <para>
-  <productname>Postgres</productname> v6.1 introduces a new, alternate
+  <productname>Postgres</productname> 6.1 introduces a new, alternate
 optimizer which uses <firstterm>genetic</firstterm>
   algorithms. These algorithms introduce a random behavior in the ordering
   of query results when the query contains multiple qualifiers or multiple
@@ -2828,7 +2828,7 @@ optimizer which uses <firstterm>genetic</firstterm>
 </para>
 
 <sect2>
-<title>Migration to v6.1</title>
+<title>Migration to version 6.1</title>
 
 <para>
 This migration requires a complete dump of the 6.0 database and a
@@ -2945,7 +2945,7 @@ DG-UX, Ultrix, Irix, AIX portability fixes
 </sect1>
 
 <sect1 id="release-6-0">
-<title>Release v6.0</title>
+<title>Release 6.0</title>
 <!--
 <docinfo>
 <authorgroup>
@@ -2967,7 +2967,7 @@ previous releases of <productname>Postgres</productname>.
 </para>
 
 <sect2>
-<title>Migration from v1.09 to v6.0</title>
+<title>Migration from version 1.09 to version 6.0</title>
 
 <para>
 This migration requires a complete dump of the 1.09 database and a
@@ -2976,7 +2976,7 @@ restore of the database in 6.0.
 </sect2>
 
 <sect2>
-<title>Migration from pre-v1.09 to v6.0</title>
+<title>Migration from pre-1.09 to version 6.0</title>
 
 <para>
 Those migrating from earlier 1.* releases should first upgrade to 1.09
@@ -3098,7 +3098,7 @@ Unused/uninialized variables corrected
 </sect1>
 
 <sect1 id="release-1-09">
-<title>Release v1.09</title>
+<title>Release 1.09</title>
 <!--
 <docinfo>
 <authorgroup>
@@ -3123,7 +3123,7 @@ releases.
 </sect1>
 
 <sect1 id="release-1-02">
-<title>Release v1.02</title>
+<title>Release 1.02</title>
 <!--
 <docinfo>
 <authorgroup>
@@ -3137,7 +3137,7 @@ releases.
 -->
 
 <sect2>
-<title>Migration from v1.02 to v1.02.1</title>
+<title>Migration from version 1.02 to version 1.02.1</title>
 
 <para>
 1996-08-01
@@ -3281,7 +3281,7 @@ Contributors (appologies to any missed)
 </sect1>
 
 <sect1 id="release-1-01">
-<title>Release v1.01</title>
+<title>Release 1.01</title>
 <!--
 <docinfo>
 <authorgroup>
@@ -3295,7 +3295,7 @@ Contributors (appologies to any missed)
 -->
 
 <sect2>
-<title>Migration from v1.0 to v1.01</title>
+<title>Migration from version 1.0 to version 1.01</title>
 
 <para>
 1996-02-23
@@ -3481,7 +3481,7 @@ Bug fixes:
 </sect1>
 
 <sect1 id="release-1-0">
-<title>Release v1.0</title>
+<title>Release 1.0</title>
 <!--
 <docinfo>
 <authorgroup>
@@ -3778,12 +3778,12 @@ Initial release.
    </para>
 
    <sect2>
-    <title>v6.5</title>
+    <title>Version 6.5</title>
 
     <para>
      As has been the case for previous releases, timing between
      releases is not directly comparable since new regression tests
-     have been added. In general, v6.5 is faster than previous
+     have been added. In general, 6.5 is faster than previous
      releases.
     </para>
 
@@ -3811,12 +3811,12 @@ Initial release.
    </sect2>
 
 <sect2>
-<title>v6.4beta</title>
+<title>Version 6.4beta</title>
 
 <para>
 The times for this release are not directly comparable to those for previous releases
 since some additional regression tests have been included.
-In general, however, v6.4 should be slightly faster than the previous release (thanks, Bruce!).
+In general, however, 6.4 should be slightly faster than the previous release (thanks, Bruce!).
 </para>
 <para>
 <programlisting>
@@ -3827,13 +3827,13 @@ In general, however, v6.4 should be slightly faster than the previous release (t
 </sect2>
 
 <sect2>
-<title>v6.3</title>
+<title>Version 6.3</title>
 
 <para>
 The times for this release are not directly comparable to those for previous releases
 since some additional regression tests have been included and some obsolete tests involving
 time travel have been removed.
-In general, however, v6.3 is substantially faster than previous releases (thanks, Bruce!).
+In general, however, 6.3 is substantially faster than previous releases (thanks, Bruce!).
 </para>
 <para>
 <programlisting>
@@ -3845,7 +3845,7 @@ In general, however, v6.3 is substantially faster than previous releases (thanks
 </sect2>
 
 <sect2>
-<title>v6.1</title>
+<title>Version 6.1</title>
 
 <para>
 <programlisting>
diff --git a/doc/src/sgml/syntax.sgml b/doc/src/sgml/syntax.sgml
index ee249b684a3..7ca791f8e0d 100644
--- a/doc/src/sgml/syntax.sgml
+++ b/doc/src/sgml/syntax.sgml
@@ -1,5 +1,5 @@
 <!--
-$Header: /cvsroot/pgsql/doc/src/sgml/syntax.sgml,v 1.29 2000/12/18 23:39:37 tgl Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/syntax.sgml,v 1.30 2000/12/21 22:55:27 petere Exp $
 -->
 
  <chapter id="syntax">
@@ -184,8 +184,7 @@ DATETIME TIMESPAN
 
      (translated to <type>TIMESTAMP</type> and <type>INTERVAL</type>,
      respectively). This feature is intended to help with
-     transitioning to v7.0, and will be removed in the next full
-     release (likely v7.1).
+     transitioning to version 7.0, and will be removed in a future release.
     </para>
 
     <para>
@@ -193,7 +192,7 @@ DATETIME TIMESPAN
      or <acronym>SQL3</acronym> reserved key words
      which are not key words in <productname>Postgres</productname>.
      These have no proscribed usage in <productname>Postgres</productname>
-     at the time of writing (v7.0) but may become reserved key words in the
+     at the time of writing (version 7.0) but may become reserved key words in the
      future:
 
      <note>
diff --git a/doc/src/sgml/xfunc.sgml b/doc/src/sgml/xfunc.sgml
index f2dc2981746..5d192cc4ed3 100644
--- a/doc/src/sgml/xfunc.sgml
+++ b/doc/src/sgml/xfunc.sgml
@@ -1,5 +1,5 @@
 <!--
-$Header: /cvsroot/pgsql/doc/src/sgml/xfunc.sgml,v 1.23 2000/11/20 20:36:47 tgl Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/xfunc.sgml,v 1.24 2000/12/21 22:55:27 petere Exp $
 -->
 
  <chapter id="xfunc">
@@ -1226,7 +1226,7 @@ LANGUAGE 'c';
     <title>Name Space Conflicts</title>
 
     <para>
-     As of <productname>Postgres</productname> v7.0, the alternative
+     As of <productname>Postgres</productname> 7.0, the alternative
      form of the AS clause for the SQL
      <command>CREATE FUNCTION</command> command
      decouples the SQL function name from the function name in the C
@@ -1235,7 +1235,7 @@ LANGUAGE 'c';
     </para>
 
     <sect3>
-     <title>Pre-v7.0</title>
+     <title>Pre-7.0</title>
 
      <para>
       For functions written in C, the SQL name declared in
-- 
GitLab