diff --git a/doc/FAQ b/doc/FAQ index 45a19741590e78df143e4cbf39c4a07d85d34d80..76f35713ed4081e44de5a069c0a387e754491f9a 100644 --- a/doc/FAQ +++ b/doc/FAQ @@ -1,7 +1,7 @@ Frequently Asked Questions (FAQ) for PostgreSQL - Last updated: Sun Jan 30 20:25:19 EST 2005 + Last updated: Sun Jan 30 20:37:18 EST 2005 Current maintainer: Bruce Momjian (pgman@candle.pha.pa.us) @@ -15,7 +15,7 @@ General Questions 1.1) What is PostgreSQL? How is it pronounced? - 1.2) What is the copyright on PostgreSQL? + 1.2) What is the copyright of PostgreSQL? 1.3) What platforms does PostgreSQL support? 1.4) Where can I get PostgreSQL? 1.5) Where can I get support? @@ -111,9 +111,13 @@ company. To get involved, see the developer's FAQ at http://www.postgresql.org/files/documentation/faqs/FAQ_DEV.html - 1.2) What is the copyright on PostgreSQL? + 1.2) What is the copyright of PostgreSQL? - PostgreSQL is subject to the following COPYRIGHT: + 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. + + This is the BSD license we use: PostgreSQL Data Base Management System @@ -139,10 +143,6 @@ CALIFORNIA HAS NO OBLIGATIONS TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. - 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. - 1.3) What platforms does PostgreSQL support? In general, any modern Unix-compatible platform should be able to run diff --git a/doc/src/FAQ/FAQ.html b/doc/src/FAQ/FAQ.html index 0fe048744fc5b7e10c483ecfcf41e4db3e008ae1..3285a1d5662b7358357e14687558bd6fe01cc1f0 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