Update licence info from 'BSD' to 'PostgreSQL'

git-svn-id: file:///Users/dpage/pgweb/svn-repo/trunk@2636 8f5c7a92-453e-0410-a47f-ad33c8a6b003

diff --git a/portal/template/en/about.html b/portal/template/en/about.html
index 62c4fcabd4946f52020ef97d0850029ab5ebc918..f3e126120c52da2f80ab27dfa1a7b023479d092b 100644 (file)
--- a/portal/template/en/about.html
+++ b/portal/template/en/about.html
@@ -93,8 +93,9 @@ are also many library interfaces as well, allowing various languages both
 compiled and interpreted to interface with PostgreSQL. There are interfaces for
 Java (JDBC), ODBC, Perl, Python, Ruby, C, C++, PHP, Lisp, Scheme, and Qt just to
 name a few.
-</p><p>Best of all, PostgreSQL's source code is available under the most liberal
-open source license: the BSD license. This license gives you the freedom to use,
+</p><p>Best of all, PostgreSQL's source code is available under a liberal
+open source license: the <a href="http://www.opensource.org/licenses/postgresql">PostgreSQL License</a>. 
+This license gives you the freedom to use,
 modify and distribute PostgreSQL in any form you like, open or closed
 source. Any modifications, enhancements, or changes you make are yours to do
 with as you please. As such, PostgreSQL is not only a powerful database system

diff --git a/portal/template/en/about/licence.html b/portal/template/en/about/licence.html
index f4fef51084ccd3f305b026a2e1eea252800c88e1..2c369b46bff5b37f8ae0a9693c917e199a918267 100644 (file)
--- a/portal/template/en/about/licence.html
+++ b/portal/template/en/about/licence.html
@@ -2,11 +2,13 @@
 License
 <!-- END page_title_block -->
 <h1>License</h1>
-<h2>PostgreSQL is released under the BSD license.</h2>
+<p>PostgreSQL is released under the <a href="http://www.opensource.org/licenses/postgresql">PostgreSQL License</a>,
+a liberal Open Source license, similar to the BSD or MIT licenses.</p>
+
 <p>PostgreSQL Database Management System<br />
 (formerly known as Postgres, then as Postgres95)<br /><br />
 
-Portions Copyright (c) 1996-2009, The PostgreSQL Global Development Group<br /><br />
+Portions Copyright (c) 1996-2010, The PostgreSQL Global Development Group<br /><br />
 
 Portions Copyright (c) 1994, The Regents of the University of California<br /><br />
 
@@ -27,6 +29,12 @@ AND FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
 ON AN "AS IS" BASIS, AND THE UNIVERSITY OF CALIFORNIA HAS NO OBLIGATIONS TO
 PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.<br />
 </p>
+
 <h2>Why not the GNU General Public License?</h2>
-<p>People often ask why PostgreSQL is not released under the GNU General Public License. The simple answer is because we like the BSD license and do not want to change it. If you are keen to read more about this topic, then please take a look in the <a href="http://archives.postgresql.org/">Archives</a> at any of the many threads on this subject, but please don't start yet another debate on the subject!
+<p>People often ask why PostgreSQL is not released under the GNU General 
+Public License. The simple answer is because we like our license and do not 
+want to change it. If you are keen to read more about this topic, then please 
+take a look in the <a href="http://archives.postgresql.org/">Archives</a> at 
+any of the many threads on this subject, but please don't start yet another 
+debate on the subject!
 </p>