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

Commit361318e

Browse files
committed
Partially fixed use of PostgresPro and PostgreSQL in the docs
1 parentd7813de commit361318e

File tree

4 files changed

+21
-15
lines changed

4 files changed

+21
-15
lines changed

‎doc/src/sgml/history.sgml

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
<!-- doc/src/sgml/history.sgml -->
22

33
<sect1 id="history">
4-
<title>A Brief History of <productname>&productname;</productname></title>
4+
<title>A Brief History of <productname>PostgreSQL</productname></title>
55

66
<indexterm zone="history">
77
<primary>history</primary>
8-
<secondary>of&productname;</secondary>
8+
<secondary>ofPostgreSQL</secondary>
99
</indexterm>
1010

1111
<para>
1212
The object-relational database management system now known as
13-
<productname>&productname;</productname> is derived from the
13+
<productname>PostgreSQL</productname> is derived from the
1414
<productname>POSTGRES</productname> package written at the
1515
University of California at Berkeley. With over two decades of
16-
development behind it, <productname>&productname;</productname> is now
16+
development behind it, <productname>PostgreSQL</productname> is now
1717
the most advanced open-source database available anywhere.
1818
</para>
1919

@@ -117,7 +117,7 @@
117117
<acronym>SQL</acronym> (implemented in the server). (Interface
118118
library <link linkend="libpq">libpq</link> was named after PostQUEL.)
119119
Subqueries
120-
were not supported until <productname>&productname;</productname>
120+
were not supported until <productname>PostgreSQL</productname>
121121
(see below), but they could be imitated in
122122
<productname>Postgres95</productname> with user-defined
123123
<acronym>SQL</acronym> functions. Aggregate functions were
@@ -184,12 +184,12 @@
184184
</sect2>
185185

186186
<sect2>
187-
<title><productname>&productname;</productname></title>
187+
<title><productname>PostgreSQL</productname></title>
188188

189189
<para>
190190
By 1996, it became clear that the name <quote>Postgres95</quote>
191191
would not stand the test of time. We chose a new name,
192-
<productname>&productname;</productname>, to reflect the relationship
192+
<productname>PostgreSQL</productname>, to reflect the relationship
193193
between the original <productname>POSTGRES</productname> and the
194194
more recent versions with <acronym>SQL</acronym> capability. At
195195
the same time, we set the version numbering to start at 6.0,
@@ -199,7 +199,7 @@
199199

200200
<para>
201201
Many people continue to refer to
202-
<productname>&productname;</productname> as <quote>Postgres</quote>
202+
<productname>PostgreSQL</productname> as <quote>Postgres</quote>
203203
(now rarely in all capital letters) because of tradition or because
204204
it is easier to pronounce. This usage is widely accepted as a
205205
nickname or alias.
@@ -209,14 +209,15 @@
209209
The emphasis during development of
210210
<productname>Postgres95</productname> was on identifying and
211211
understanding existing problems in the server code. With
212-
<productname>&productname;</productname>, the emphasis has shifted to
212+
<productname>PostgreSQL</productname>, the emphasis has shifted to
213213
augmenting features and capabilities, although work continues in
214214
all areas.
215215
</para>
216216

217217
<para>
218-
Details about what has happened in <productname>&productname;</> since
218+
Details about what has happened in <productname>PostgreSQL</> since
219219
then can be found in <xref linkend="release">.
220+
220221
</para>
221222
</sect2>
222223
</sect1>

‎doc/src/sgml/intro.sgml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,8 @@
8686

8787
<para>
8888
<productname>&productname;</productname> is an object-relational
89-
database management system (<acronym>ORDBMS</acronym>) based on
89+
database management system (<acronym>ORDBMS</acronym>) based on <ulink
90+
url="http://postgresql.org"><productname>PostgreSQL</productname></ulink>, which is in turn based on
9091
<ulink url="http://db.cs.berkeley.edu/postgres.html">
9192
<productname>POSTGRES, Version 4.2</productname></ulink>,
9293
developed at the University of California at Berkeley Computer Science
@@ -95,7 +96,7 @@
9596
</para>
9697

9798
<para>
98-
<productname>&productname;</productname> is an open-source descendant
99+
<productname>PostgreSQL</productname> is an open-source descendant
99100
of this original Berkeley code. It supports a large part of the SQL
100101
standard and offers many modern features:
101102

‎doc/src/sgml/legal.sgml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,17 @@
33
<date>2016</date>
44

55
<copyright>
6-
<year>1996-2016</year>
7-
<holder>The PostgreSQL Global Development Group</holder>
6+
<year>2016</year>
7+
<holder>Postgres Professional</holder>
88
</copyright>
99

1010
<legalnotice id="legalnotice">
1111
<title>Legal Notice</title>
1212

13+
<para>
14+
<productname>PostgresPro</productname> is Copyright &copy; 2016 by the
15+
Postgres Professional.
16+
</para>
1317
<para>
1418
<productname>PostgreSQL</productname> is Copyright &copy; 1996-2016
1519
by the PostgreSQL Global Development Group.

‎doc/src/sgml/postgres.sgml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<title>&productname; &version; Documentation</title>
1616

1717
<bookinfo>
18-
<corpauthor>The PostgreSQL Global Development Group</corpauthor>
18+
<corpauthor>Postgres Professional</corpauthor>
1919
<productname>&productname;</productname>
2020
<productnumber>&version;</productnumber>
2121
&legal;

0 commit comments

Comments
 (0)

[8]ページ先頭

©2009-2025 Movatter.jp