Trim trailing whitespace

[postgresql] / doc / src / sgml / legal.sgml

diff --git a/doc/src/sgml/legal.sgml b/doc/src/sgml/legal.sgml
index 0be667e199db724b9b516dbcf86d61eb40760dd0..67ef88b2ff9c79cc184a2fd99463680feac93cd0 100644 (file)
--- a/doc/src/sgml/legal.sgml
+++ b/doc/src/sgml/legal.sgml
@@ -1,59 +1,48 @@
-<sect1 id="copyright">
- <title>Copyrights and Trademarks</title>
+<!-- doc/src/sgml/legal.sgml -->
+
+<date>2017</date>
+
+<copyright>
+ <year>1996-2017</year>
+ <holder>The PostgreSQL Global Development Group</holder>
+</copyright>
+
+<legalnotice id="legalnotice">
+ <title>Legal Notice</title>
 
  <para>
-  <productname>PostgreSQL</productname> is Copyright &copy; 1996-9
-  by the PostgreSQL Global Development Group,
-  and is distributed under the terms of the Berkeley license.
+  <productname>PostgreSQL</productname> is Copyright &copy; 1996-2017
+  by the PostgreSQL Global Development Group.
  </para>
 
  <para>
-  <productname>Postgres95</productname> is Copyright &copy; 1994-5 
+  <productname>Postgres95</productname> is Copyright &copy; 1994-5
   by the Regents of the University of California.
-  Permission to use, copy, modify, and distribute this software and its documentation
-  for any purpose, without fee, and without a written agreement is hereby granted,
-  provided that the above copyright notice and this paragraph and the following two
-  paragraphs appear in all copies.
  </para>
+
  <para>
-  In no event shall the University of California be liable to
-  any party for direct, indirect, special, incidental, or consequential
-  damages, including lost profits, arising out of the use of this
-  software and its documentation, even if the University of California
-  has been advised of the possibility of such damage.
+  Permission to use, copy, modify, and distribute this software and
+  its documentation for any purpose, without fee, and without a
+  written agreement is hereby granted, provided that the above
+  copyright notice and this paragraph and the following two paragraphs
+  appear in all copies.
  </para>
+
  <para>
-  The University of California specifically disclaims any
-  warranties, including, but not limited to, the implied warranties
-  of merchantability 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
-  maintainance, support, updates, enhancements, or modifications.
+  IN NO EVENT SHALL THE UNIVERSITY OF CALIFORNIA BE LIABLE TO ANY
+  PARTY FOR DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL
+  DAMAGES, INCLUDING LOST PROFITS, ARISING OUT OF THE USE OF THIS
+  SOFTWARE AND ITS DOCUMENTATION, EVEN IF THE UNIVERSITY OF CALIFORNIA
+  HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  </para>
 
  <para>
-  <acronym>Unix</acronym> is a trademark of X/Open, Ltd.  Sun4,  SPARC,  SunOS
-  and  Solaris  are trademarks of Sun Microsystems, Inc.  DEC,
-  DECstation, Alpha AXP and ULTRIX are trademarks  of  Digital
-  Equipment   Corp.   PA-RISC  and  HP-UX  are  trademarks  of
-  Hewlett-Packard Co.  OSF/1 is a trademark of the Open  
-  Software Foundation.
+  THE UNIVERSITY OF CALIFORNIA SPECIFICALLY DISCLAIMS ANY WARRANTIES,
+  INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE
+  PROVIDED HEREUNDER IS ON AN <quote>AS-IS</quote> BASIS, AND THE UNIVERSITY OF
+  CALIFORNIA HAS NO OBLIGATIONS TO PROVIDE MAINTENANCE, SUPPORT,
+  UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
  </para>
-</sect1>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:nil
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-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-ecat-files:nil
-End:
--->
+
+</legalnotice>