From b6332952b7dae311befd5f8bf09329d9a9ddeba7 Mon Sep 17 00:00:00 2001
From: "Thomas G. Lockhart" <lockhart@fourpalms.org>
Date: Mon, 6 Dec 1999 16:37:11 +0000
Subject: [PATCH] Remove references to PostgreSQL as "public-domain" since that
 has a  specific meaning wrt copyright (or lack thereof).

---
 doc/src/sgml/admin.sgml        |  8 ++++++--
 doc/src/sgml/history.sgml      |  4 ++--
 doc/src/sgml/installation.sgml |  8 ++++++--
 doc/src/sgml/postgres.sgml     |  8 ++++----
 doc/src/sgml/programmer.sgml   | 10 +++++++---
 doc/src/sgml/tutorial.sgml     |  2 +-
 doc/src/sgml/user.sgml         |  2 +-
 7 files changed, 27 insertions(+), 15 deletions(-)

diff --git a/doc/src/sgml/admin.sgml b/doc/src/sgml/admin.sgml
index fd2f2840d7f..dbe6c8920e5 100644
--- a/doc/src/sgml/admin.sgml
+++ b/doc/src/sgml/admin.sgml
@@ -1,11 +1,15 @@
 <!--
-$Header: /cvsroot/pgsql/doc/src/sgml/Attic/admin.sgml,v 1.17 1999/09/29 05:18:14 thomas Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/Attic/admin.sgml,v 1.18 1999/12/06 16:37:11 thomas Exp $
 
 Postgres Administrator's Guide.
 Derived from postgres.sgml.
 - thomas 1998-10-27
 
 $Log: admin.sgml,v $
+Revision 1.18  1999/12/06 16:37:11  thomas
+Remove references to PostgreSQL as "public-domain" since that has a
+ specific meaning wrt copyright (or lack thereof).
+
 Revision 1.17  1999/09/29 05:18:14  thomas
 Strip out some cvs log info.
 
@@ -110,7 +114,7 @@ Your name here...
    now becoming available in some commercial databases.
    It provides SQL92/SQL3 language support,
    transaction integrity, and type extensibility.
-   <ProductName>PostgreSQL</ProductName> is a public-domain, open source descendant
+   <ProductName>PostgreSQL</ProductName> is an open-source descendant
    of this original Berkeley code.
   </Para>
  </Preface>
diff --git a/doc/src/sgml/history.sgml b/doc/src/sgml/history.sgml
index fc861e7a5a3..05acdff2b69 100644
--- a/doc/src/sgml/history.sgml
+++ b/doc/src/sgml/history.sgml
@@ -98,8 +98,8 @@
    <ulink url="http://http.cs.berkeley.edu/~jolly/">Jolly Chen</ulink>
    added a SQL language interpreter to <productname>Postgres</productname>.
    <productname>Postgres95</productname> was subsequently released to
-   the Web to find its own way in the world as a public-domain,
-   open source descendant of the original <productname>Postgres</productname>
+   the Web to find its own way in the world as an
+   open-source descendant of the original <productname>Postgres</productname>
    Berkeley code.
   </para>
 
diff --git a/doc/src/sgml/installation.sgml b/doc/src/sgml/installation.sgml
index aa4b33608ef..fb48215c85a 100644
--- a/doc/src/sgml/installation.sgml
+++ b/doc/src/sgml/installation.sgml
@@ -1,10 +1,14 @@
 <!--
-$Header: /cvsroot/pgsql/doc/src/sgml/installation.sgml,v 1.6 1999/06/04 15:51:42 thomas Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/installation.sgml,v 1.7 1999/12/06 16:37:11 thomas Exp $
 
 Postgres quick Installation Guide.
 - thomas 1998-10-26
 
 $Log: installation.sgml,v $
+Revision 1.7  1999/12/06 16:37:11  thomas
+Remove references to PostgreSQL as "public-domain" since that has a
+ specific meaning wrt copyright (or lack thereof).
+
 Revision 1.6  1999/06/04 15:51:42  thomas
 Add blurb on new docs in release notes.
 Make minor info and markup changes for v6.5 release.
@@ -122,7 +126,7 @@ Your name here...
  now becoming available in some commercial databases.
 It provides SQL92/SQL3 language support,
  transaction integrity, and type extensibility.
- <productname>PostgreSQL</productname> is a public-domain, open source descendant
+ <productname>PostgreSQL</productname> is an open-source descendant
  of this original Berkeley code.
 </para>
 </preface>
diff --git a/doc/src/sgml/postgres.sgml b/doc/src/sgml/postgres.sgml
index 99c72d1fa64..19e5c52807f 100644
--- a/doc/src/sgml/postgres.sgml
+++ b/doc/src/sgml/postgres.sgml
@@ -157,8 +157,8 @@ Your name here...
    now becoming available in some commercial databases.
    It provides SQL92/SQL3 language support,
    transaction integrity, and type extensibility.
-   <ProductName>PostgreSQL</ProductName> is a public-domain,
-   open source descendant of this original Berkeley code.
+   <ProductName>PostgreSQL</ProductName> is an
+   open-source descendant of this original Berkeley code.
   </Para>
  </Preface>
 
@@ -320,7 +320,7 @@ Omit index until we have some index entries.
 
 <!-- Keep this comment at the end of the file
 Local variables:
-mode: sgml
+mode:sgml
 sgml-omittag:nil
 sgml-shorttag:t
 sgml-minimize-attributes:nil
@@ -330,7 +330,7 @@ sgml-indent-data:t
 sgml-parent-document:nil
 sgml-default-dtd-file:"./reference.ced"
 sgml-exposed-tags:nil
-sgml-local-catalogs:"/usr/lib/sgml/CATALOG"
+sgml-local-catalogs:("/usr/lib/sgml/CATALOG")
 sgml-local-ecat-files:nil
 End:
 -->
diff --git a/doc/src/sgml/programmer.sgml b/doc/src/sgml/programmer.sgml
index 93ea1dbc818..f6c465af284 100644
--- a/doc/src/sgml/programmer.sgml
+++ b/doc/src/sgml/programmer.sgml
@@ -1,9 +1,13 @@
 <!--
-$Header: /cvsroot/pgsql/doc/src/sgml/Attic/programmer.sgml,v 1.19 1999/07/22 15:11:04 thomas Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/Attic/programmer.sgml,v 1.20 1999/12/06 16:37:11 thomas Exp $
 
 Postgres Programmer's Guide.
 
 $Log: programmer.sgml,v $
+Revision 1.20  1999/12/06 16:37:11  thomas
+Remove references to PostgreSQL as "public-domain" since that has a
+ specific meaning wrt copyright (or lack thereof).
+
 Revision 1.19  1999/07/22 15:11:04  thomas
 Complete merge of all old man page information.
 lisp.sgml is a placeholder for Eric Marsden's upcoming contribution.
@@ -143,8 +147,8 @@ Your name here...
    now becoming available in some commercial databases.
    It provides SQL92/SQL3 language support,
    transaction integrity, and type extensibility.
-   <productname>PostgreSQL</productname> is a public-domain, 
-   open source descendant of this original Berkeley code.
+   <productname>PostgreSQL</productname> is an 
+   open-source descendant of this original Berkeley code.
   </para>
  </preface>
 
diff --git a/doc/src/sgml/tutorial.sgml b/doc/src/sgml/tutorial.sgml
index 958a713d050..49fe34a04a8 100644
--- a/doc/src/sgml/tutorial.sgml
+++ b/doc/src/sgml/tutorial.sgml
@@ -85,7 +85,7 @@ Your name here...
    now becoming available in some commercial databases.
    It provides SQL92/SQL3 language support,
    transaction integrity, and type extensibility.
-   <ProductName>PostgreSQL</ProductName> is a public-domain, open source descendant
+   <ProductName>PostgreSQL</ProductName> is an open-source descendant
    of this original Berkeley code.
   </Para>
  </Preface>
diff --git a/doc/src/sgml/user.sgml b/doc/src/sgml/user.sgml
index 0bb677c6863..21dce96b9b1 100644
--- a/doc/src/sgml/user.sgml
+++ b/doc/src/sgml/user.sgml
@@ -93,7 +93,7 @@ Your name here...
    now becoming available in some commercial databases.
    It provides SQL92/SQL3 language support,
    transaction integrity, and type extensibility.
-   <ProductName>PostgreSQL</ProductName> is a public-domain, open source descendant
+   <ProductName>PostgreSQL</ProductName> is an open-source descendant
    of this original Berkeley code.
   </Para>
  </Preface>
-- 
2.39.5