Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit1e4baa5

Browse files
committed
Update psql's \copyright to match the text we have in the COPYRIGHT file.
1 parent85f345b commit1e4baa5

File tree

1 file changed

+14
-15
lines changed

1 file changed

+14
-15
lines changed

‎src/bin/psql/help.c‎

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -425,24 +425,23 @@ void
425425
print_copyright(void)
426426
{
427427
puts(
428-
"PostgreSQL Data Base Management System\n\n"
428+
"PostgreSQL Database Management System\n"
429+
"(formerly known as Postgres, then as Postgres95)\n\n"
429430
"Portions Copyright (c) 1996-2011, PostgreSQL Global Development Group\n\n"
430-
"This software is based on Postgres95, formerly known as Postgres, which\n"
431-
"contains the following notice:\n\n"
432-
"Portions Copyright(c) 1994, Regents of the University of California\n\n"
431+
"Portions Copyright (c) 1994, The Regents of the University of California\n\n"
433432
"Permission to use, copy, modify, and distribute this software and its\n"
434433
"documentation for any purpose, without fee, and without a written agreement\n"
435-
"is hereby granted, provided that the above copyright notice and this paragraph\n"
436-
"and the following two paragraphs appear in all copies.\n\n"
434+
"is hereby granted, provided that the above copyright notice and this\n"
435+
"paragraphand the following two paragraphs appear in all copies.\n\n"
437436
"IN NO EVENT SHALL THE UNIVERSITY OF CALIFORNIA BE LIABLE TO ANY PARTY FOR\n"
438-
"DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, INCLUDING LOST\n"
439-
"PROFITS, ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF\n"
440-
"THE UNIVERSITY OF CALIFORNIA HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH\n"
441-
"DAMAGE.\n\n"
442-
"THE UNIVERSITY OF CALIFORNIA SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,\n"
443-
"BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A\n"
444-
"PARTICULAR PURPOSE.THE SOFTWARE PROVIDED HEREUNDER IS ON AN \"AS IS\" BASIS,\n"
445-
"AND THE UNIVERSITY OF CALIFORNIA HAS NO OBLIGATIONS TO PROVIDE MAINTENANCE,\n"
446-
"SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS."
437+
"DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, INCLUDING\n"
438+
"LOSTPROFITS, ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS\n"
439+
"DOCUMENTATION, EVEN IFTHE UNIVERSITY OF CALIFORNIA HAS BEEN ADVISED OF THE\n"
440+
"POSSIBILITY OF SUCHDAMAGE.\n\n"
441+
"THE UNIVERSITY OF CALIFORNIA SPECIFICALLY DISCLAIMS ANY WARRANTIES,\n"
442+
"INCLUDING,BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY\n"
443+
"AND FITNESS FOR APARTICULAR PURPOSE.THE SOFTWARE PROVIDED HEREUNDER IS\n"
444+
"ON AN \"AS IS\" BASIS,AND THE UNIVERSITY OF CALIFORNIA HAS NO OBLIGATIONS TO\n"
445+
"PROVIDE MAINTENANCE,SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.\n"
447446
);
448447
}

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp