From 387d43113c1f5376f567a292072e2caf143e3ba6 Mon Sep 17 00:00:00 2001
From: Peter Eisentraut <peter_e@gmx.net>
Date: Fri, 22 Dec 2000 19:31:56 +0000
Subject: [PATCH] Avoid using the terms 'installation', 'site', or 'instance'
 when referring to the thing you get from running initdb.  That's called a
 database cluster (per SQL).

---
 doc/src/sgml/arch-pg.sgml  |  4 ++--
 doc/src/sgml/arch.sgml     |  4 ++--
 doc/src/sgml/notation.sgml | 14 +-------------
 doc/src/sgml/query.sgml    |  6 +++---
 4 files changed, 8 insertions(+), 20 deletions(-)

diff --git a/doc/src/sgml/arch-pg.sgml b/doc/src/sgml/arch-pg.sgml
index 98c9f18f6d..7928347c00 100644
--- a/doc/src/sgml/arch-pg.sgml
+++ b/doc/src/sgml/arch-pg.sgml
@@ -34,9 +34,9 @@
 <Para>
      A single  <Application>postmaster</Application>  manages  a  given  collection  of
      databases  on  a  single  host.   Such  a collection of
-     databases is called an installation or site.   Frontend
+     databases is called a cluster (of databases).   Frontend
      applications  that  wish  to  access  a  given database
-     within an installation make calls to the   library.
+     within a cluster make calls to the   library.
      The library sends user requests over the network to the
      <Application>postmaster</Application>
 (<XRef LinkEnd="PGARCH-CONNECTIONS" EndTerm="PGARCH-CONNECTIONS">(a)), 
diff --git a/doc/src/sgml/arch.sgml b/doc/src/sgml/arch.sgml
index 3ce064192a..d5d6062976 100644
--- a/doc/src/sgml/arch.sgml
+++ b/doc/src/sgml/arch.sgml
@@ -35,9 +35,9 @@
 <Para>
      A single  <Application>postmaster</Application>  manages  a  given  collection  of
      databases  on  a  single  host.   Such  a collection of
-     databases is called an installation or site.   Frontend
+     databases is called a cluster (of databases).   Frontend
      applications  that  wish  to  access  a  given database
-     within an installation make calls to the   library.
+     within a cluster make calls to the   library.
      The library sends user requests over the network to the
      <Application>postmaster</Application> (<XRef LinkEnd="ARCH-CLIENTSERVER" EndTerm="ARCH-CLIENTSERVER">),
      which in turn  starts  a  new backend  server  process
diff --git a/doc/src/sgml/notation.sgml b/doc/src/sgml/notation.sgml
index f7991aba17..e6faf72fec 100644
--- a/doc/src/sgml/notation.sgml
+++ b/doc/src/sgml/notation.sgml
@@ -1,23 +1,11 @@
 <!--
-$Header: /cvsroot/pgsql/doc/src/sgml/notation.sgml,v 1.11 2000/12/21 22:55:27 petere Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/notation.sgml,v 1.12 2000/12/22 19:31:56 petere Exp $
 -->
 
 <sect1 id="terminology">
  <title>Terminology</title>
 
  <para>
-  In the following documentation,
-  <firstterm>site</firstterm>
-  may be interpreted as the host machine on which 
-  <Productname>Postgres</Productname> is installed.
-  Since it is possible to install more than one set of 
-  <Productname>Postgres</Productname>
-  databases on a single host, this term more precisely denotes any
-  particular set of installed 
-  <Productname>Postgres</Productname> binaries and databases.
- </para>
-
- <para>
   The 
   <Productname>Postgres</Productname> <firstterm>superuser</firstterm>
   is the user named <replaceable>postgres</replaceable>
diff --git a/doc/src/sgml/query.sgml b/doc/src/sgml/query.sgml
index 5eb535eafa..a2736b99e7 100644
--- a/doc/src/sgml/query.sgml
+++ b/doc/src/sgml/query.sgml
@@ -1,5 +1,5 @@
 <!--
-$Header: /cvsroot/pgsql/doc/src/sgml/query.sgml,v 1.15 2000/12/22 18:57:50 petere Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/query.sgml,v 1.16 2000/12/22 19:31:56 petere Exp $
 -->
 
  <chapter id="query">
@@ -88,8 +88,8 @@ mydb=> \i basics.sql
     are <firstterm>attributes</firstterm>.
     As  previously  discussed,  classes  are  grouped  into
     databases,  and  a collection of databases managed by a
-    single <application>postmaster</application> process constitutes  an  installation
-    or site.
+    single <application>postmaster</application> process constitutes  a
+    database cluster.
    </para>
   </sect1>
 
-- 
2.11.0