Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Gustafsson2025-05-16 15:20:07 +0000
committerDaniel Gustafsson2025-05-16 15:20:07 +0000
commit5987553fde2cb22b69cf9c7d71a92573b7a3b7c9 (patch)
tree715757753a6772ebaeca6ed1f53c16e7186ade41
parentfe29b2a1dab2b3d81e6c350679b7d9b0e1c8c850 (diff)
Align organization wording in copyright statement
This aligns the copyright and legal notice wordig with commit a233a603bab8 and pgweb commit 2d764dbc083ab8. Backpatch down to all supported versions. Author: Daniel Gustafsson <daniel@yesql.se> Reviewed-by: Dave Page <dpage@pgadmin.org> Reviewed-by: Tom Lane <tgl@sss.pgh.pa.us> Discussion: https://postgr.es/m/744E414E-3F52-404C-97FB-ED9B3AA37DC8@yesql.se Backpatch-through: 13
-rw-r--r--COPYRIGHT2
-rw-r--r--doc/src/sgml/legal.sgml10
2 files changed, 7 insertions, 5 deletions
diff --git a/COPYRIGHT b/COPYRIGHT
index be2d694b038..3b79b1b4ca0 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,5 +1,5 @@
PostgreSQL Database Management System
-(formerly known as Postgres, then as Postgres95)
+(also known as Postgres, formerly known as Postgres95)
Portions Copyright (c) 1996-2025, PostgreSQL Global Development Group
diff --git a/doc/src/sgml/legal.sgml b/doc/src/sgml/legal.sgml
index af13bf2e055..75c1309cf73 100644
--- a/doc/src/sgml/legal.sgml
+++ b/doc/src/sgml/legal.sgml
@@ -11,13 +11,15 @@
<title>Legal Notice</title>
<para>
- <productname>PostgreSQL</productname> is Copyright &copy; 1996&ndash;2025
- by the PostgreSQL Global Development Group.
+ <productname>PostgreSQL</productname> Database Management System
+ (also known as Postgres, formerly known as Postgres95)
</para>
<para>
- <productname>Postgres95</productname> is Copyright &copy; 1994&ndash;5
- by the Regents of the University of California.
+ Portions Copyright &copy; 1996-2025, PostgreSQL Global Development Group
+ </para>
+ <para>
+ Portions Copyright &copy; 1994, The Regents of the University of California
</para>
<para>