From 0a12c53385172f3405a79f9374a238bacd22f77c Mon Sep 17 00:00:00 2001
From: Bruce Momjian <bruce@momjian.us>
Date: Mon, 31 Jan 2005 01:38:10 +0000
Subject: Clarify license FAQ item.

---
 doc/src/FAQ/FAQ.html | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'doc/src')

diff --git a/doc/src/FAQ/FAQ.html b/doc/src/FAQ/FAQ.html
index 0fe048744fc..3285a1d5662 100644
--- a/doc/src/FAQ/FAQ.html
+++ b/doc/src/FAQ/FAQ.html
@@ -10,7 +10,7 @@
   alink="#0000ff">
     <H1>Frequently Asked Questions (FAQ) for PostgreSQL</H1>
 
-    <P>Last updated: Sun Jan 30 20:25:19 EST 2005</P>
+    <P>Last updated: Sun Jan 30 20:37:18 EST 2005</P>
 
     <P>Current maintainer: Bruce Momjian (<A href=
     "mailto:pgman@candle.pha.pa.us">pgman@candle.pha.pa.us</A>)
@@ -27,7 +27,7 @@
 
     <H2 align="center">General Questions</H2>
     <A href="#1.1">1.1</A>) What is PostgreSQL? How is it pronounced?<BR>
-     <A href="#1.2">1.2</A>) What is the copyright on PostgreSQL?<BR>
+     <A href="#1.2">1.2</A>) What is the copyright of PostgreSQL?<BR>
      <A href="#1.3">1.3</A>) What platforms does PostgreSQL support?<BR>
      <A href="#1.4">1.4</A>) Where can I get PostgreSQL?<BR>
      <A href="#1.5">1.5</A>) Where can I get support?<BR>
@@ -157,10 +157,14 @@
     http://www.postgresql.org/files/documentation/faqs/FAQ_DEV.html</A>
     </P>
 
-    <H4><A name="1.2">1.2</A>) What is the copyright on
+    <H4><A name="1.2">1.2</A>) What is the copyright of
     PostgreSQL?</H4>
 
-    <P>PostgreSQL is subject to the following COPYRIGHT:</P>
+    <P>PostgreSQL is distributed under the classic BSD license. It has
+    no restrictions on how the source code can be used. We like it and
+    have no intention of changing it.</P>
+
+    <P>This is the BSD license we use:</P>
 
     <P>PostgreSQL Data Base Management System</P>
 
@@ -186,10 +190,6 @@
     UNIVERSITY OF CALIFORNIA HAS NO OBLIGATIONS TO PROVIDE MAINTENANCE,
     SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.</P>
 
-    <P>The above is the BSD license, the classic open-source license.
-    It has no restrictions on how the source code may be used. We like
-    it and have no intention of changing it.</P>
-
     <H4><A name="1.3">1.3</A>) What platforms does PostgreSQL support?</H4>
 
     <P>In general, any modern Unix-compatible platform should be able to
-- 
cgit v1.2.3