diff --git a/doc/src/sgml/arch-pg.sgml b/doc/src/sgml/arch-pg.sgml
index 98c9f18f6dacf7e73aac55bd47fb89ac0bc0e3f5..7928347c00d2aac248dc17aa51a0dd65aeafafd5 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 3ce064192aae3e798b100a4b900aa95ae09c2218..d5d6062976124be5ec2c535479b65a1eaf4383cf 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 f7991aba17b95637d8371dd7d385f4a6cf9dbc0e..e6faf72fecd592a30da0bd50d098ed56f70b7e47 100644
--- a/doc/src/sgml/notation.sgml
+++ b/doc/src/sgml/notation.sgml
@@ -1,22 +1,10 @@
 <!--
-$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>
diff --git a/doc/src/sgml/query.sgml b/doc/src/sgml/query.sgml
index 5eb535eafa5d522479ec55b9b4173a32734f39db..a2736b99e78de877d6f245a5640ae0b81c503329 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>