Skip to content

Commit bcd2a78

Browse files
committed
Fixed incorrect usage of productname entity. Patch by A.Lakhin
1 parent 3f5a7dc commit bcd2a78

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

64 files changed

+153
-153
lines changed

doc/src/sgml/array.sgml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -728,7 +728,7 @@ SELECT f1[1][-2][3] AS e1, f1[1][-1][5] AS e2
728728
variant), the element is taken to be NULL. The presence of any quotes
729729
or backslashes disables this and allows the literal string value
730730
<quote>NULL</> to be entered. Also, for backward compatibility with
731-
pre-8.2 versions of <productname>&productname;</>, the <xref
731+
pre-8.2 versions of <productname>PostgreSQL</>, the <xref
732732
linkend="guc-array-nulls"> configuration parameter can be turned
733733
<literal>off</> to suppress recognition of <literal>NULL</> as a NULL.
734734
</para>

doc/src/sgml/catalogs.sgml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7845,7 +7845,7 @@
78457845
<para>
78467846
The view <structname>pg_group</structname> exists for backwards
78477847
compatibility: it emulates a catalog that existed in
7848-
<productname>&productname;</productname> before version 8.1.
7848+
<productname>PostgreSQL</productname> before version 8.1.
78497849
It shows the names and members of all roles that are marked as not
78507850
<structfield>rolcanlogin</>, which is an approximation to the set
78517851
of roles that are being used as groups.
@@ -9349,7 +9349,7 @@ SELECT * FROM pg_locks pl LEFT JOIN pg_prepared_xacts ppx
93499349
<para>
93509350
The view <structname>pg_shadow</structname> exists for backwards
93519351
compatibility: it emulates a catalog that existed in
9352-
<productname>&productname;</productname> before version 8.1.
9352+
<productname>PostgreSQL</productname> before version 8.1.
93539353
It shows properties of all roles that are marked as
93549354
<structfield>rolcanlogin</> in
93559355
<link linkend="catalog-pg-authid"><structname>pg_authid</structname></link>.

doc/src/sgml/citext.sgml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,7 @@ SELECT * FROM users WHERE nick = 'Larry';
196196

197197
<listitem>
198198
<para>
199-
As of <productname>&productname;</> 9.1, you can attach a
199+
As of <productname>PostgreSQL</> 9.1, you can attach a
200200
<literal>COLLATE</> specification to <type>citext</> columns or data
201201
values. Currently, <type>citext</> operators will honor a non-default
202202
<literal>COLLATE</> specification while comparing case-folded strings,

doc/src/sgml/config.sgml

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2363,11 +2363,11 @@ include_dir 'conf.d'
23632363
Only superusers can change this setting.
23642364
</para>
23652365
<para>
2366-
In <productname>&productname;</> releases prior to 9.3,
2366+
In <productname>PostgreSQL</> releases prior to 9.3,
23672367
<varname>commit_delay</varname> behaved differently and was much
23682368
less effective: it affected only commits, rather than all WAL flushes,
23692369
and waited for the entire configured delay even if the WAL flush
2370-
was completed sooner. Beginning in <productname>&productname;</> 9.3,
2370+
was completed sooner. Beginning in <productname>PostgreSQL</> 9.3,
23712371
the first process that becomes ready to flush waits for the configured
23722372
interval, while subsequent processes wait only until the leader
23732373
completes the flush operation.
@@ -3926,7 +3926,7 @@ local0.* /var/log/postgresql
39263926
use a log rotation utility to avoid eventually filling the
39273927
entire disk. In releases prior to 8.4, if
39283928
no <literal>%</literal> escapes were
3929-
present, <productname>&productname;</productname> would append
3929+
present, <productname>PostgreSQL</productname> would append
39303930
the epoch of the new log file's creation time, but this is no
39313931
longer the case.
39323932
</para>
@@ -6088,11 +6088,11 @@ SET XML OPTION { DOCUMENT | CONTENT };
60886088
The value <literal>sql_standard</> will produce
60896089
output matching <acronym>SQL</acronym> standard interval literals.
60906090
The value <literal>postgres</> (which is the default) will produce
6091-
output matching <productname>&productname;</> releases prior to 8.4
6091+
output matching <productname>PostgreSQL</> releases prior to 8.4
60926092
when the <xref linkend="guc-datestyle">
60936093
parameter was set to <literal>ISO</>.
60946094
The value <literal>postgres_verbose</> will produce output
6095-
matching <productname>&productname;</> releases prior to 8.4
6095+
matching <productname>PostgreSQL</> releases prior to 8.4
60966096
when the <varname>DateStyle</>
60976097
parameter was set to non-<literal>ISO</> output.
60986098
The value <literal>iso_8601</> will produce output matching the time
@@ -6687,7 +6687,7 @@ dynamic_library_path = 'C:\tools\postgresql;H:\my_project\lib;$libdir'
66876687
This controls whether the array input parser recognizes
66886688
unquoted <literal>NULL</> as specifying a null array element.
66896689
By default, this is <literal>on</>, allowing array values containing
6690-
null values to be entered. However, <productname>&productname;</> versions
6690+
null values to be entered. However, <productname>PostgreSQL</> versions
66916691
before 8.2 did not support null values in arrays, and therefore would
66926692
treat <literal>NULL</> as specifying a normal array element with
66936693
the string value <quote>NULL</>. For backward compatibility with
@@ -6753,7 +6753,7 @@ dynamic_library_path = 'C:\tools\postgresql;H:\my_project\lib;$libdir'
67536753
nor <literal>WITHOUT OIDS</literal> is specified. It also
67546754
determines whether OIDs will be included in tables created by
67556755
<command>SELECT INTO</command>. The parameter is <literal>off</>
6756-
by default; in <productname>&productname;</> 8.0 and earlier, it
6756+
by default; in <productname>PostgreSQL</> 8.0 and earlier, it
67576757
was <literal>on</> by default.
67586758
</para>
67596759

@@ -6800,7 +6800,7 @@ dynamic_library_path = 'C:\tools\postgresql;H:\my_project\lib;$libdir'
68006800
</term>
68016801
<listitem>
68026802
<para>
6803-
In <productname>&productname;</> releases prior to 9.0, large objects
6803+
In <productname>PostgreSQL</> releases prior to 9.0, large objects
68046804
did not have access privileges and were, therefore, always readable
68056805
and writable by all users. Setting this variable to <literal>on</>
68066806
disables the new privilege checks, for compatibility with prior
@@ -6810,7 +6810,7 @@ dynamic_library_path = 'C:\tools\postgresql;H:\my_project\lib;$libdir'
68106810
<para>
68116811
Setting this variable does not disable all security checks related to
68126812
large objects &mdash; only those for which the default behavior has
6813-
changed in <productname>&productname;</> 9.0.
6813+
changed in <productname>PostgreSQL</> 9.0.
68146814
For example, <literal>lo_import()</literal> and
68156815
<literal>lo_export()</literal> need superuser privileges regardless
68166816
of this setting.
@@ -6827,7 +6827,7 @@ dynamic_library_path = 'C:\tools\postgresql;H:\my_project\lib;$libdir'
68276827
<listitem>
68286828
<para>
68296829
When on, the parser will emit a warning for any construct that might
6830-
have changed meanings since <productname>&productname;</> 9.4 as a result
6830+
have changed meanings since <productname>PostgreSQL</> 9.4 as a result
68316831
of changes in operator precedence. This is useful for auditing
68326832
applications to see if precedence changes have broken anything; but it
68336833
is not meant to be kept turned on in production, since it will warn
@@ -6876,7 +6876,7 @@ dynamic_library_path = 'C:\tools\postgresql;H:\my_project\lib;$libdir'
68766876
<literal>ONLY</literal> prefix is assumed). The SQL standard
68776877
requires child tables to be included, so the <literal>off</> setting
68786878
is not spec-compliant, but it is provided for compatibility with
6879-
<productname>&productname;</> releases prior to 7.1.
6879+
<productname>PostgreSQL</> releases prior to 7.1.
68806880
See <xref linkend="ddl-inherit"> for more information.
68816881
</para>
68826882

@@ -6901,7 +6901,7 @@ dynamic_library_path = 'C:\tools\postgresql;H:\my_project\lib;$libdir'
69016901
This controls whether ordinary string literals
69026902
(<literal>'...'</>) treat backslashes literally, as specified in
69036903
the SQL standard.
6904-
Beginning in <productname>&productname;</productname> 9.1, the default is
6904+
Beginning in <productname>PostgreSQL</productname> 9.1, the default is
69056905
<literal>on</> (prior releases defaulted to <literal>off</>).
69066906
Applications can check this
69076907
parameter to determine how string literals will be processed.

doc/src/sgml/contrib.sgml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -54,9 +54,9 @@
5454
Many modules supply new user-defined functions, operators, or types.
5555
To make use of one of these modules, after you have installed the code
5656
you need to register the new SQL objects in the database system.
57-
In <productname>&productname;</> 9.1 and later, this is done by executing
58-
a <xref linkend="sql-createextension"> command. In a fresh database,
59-
you can simply do
57+
In <productname>&productname;</>, and <productname>PostgreSQL</> 9.1 and later,
58+
this is done by executing a <xref linkend="sql-createextension"> command.
59+
In a fresh database, you can simply do
6060

6161
<programlisting>
6262
CREATE EXTENSION <replaceable>module_name</>;
@@ -80,7 +80,7 @@ CREATE EXTENSION <replaceable>module_name</>;
8080

8181
<para>
8282
If your database was brought forward by dump and reload from a pre-9.1
83-
version of <productname>&productname;</>, and you had been using the pre-9.1
83+
version of <productname>PostgreSQL</>, and you had been using the pre-9.1
8484
version of the module in it, you should instead do
8585

8686
<programlisting>

doc/src/sgml/cube.sgml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@
136136
</table>
137137

138138
<para>
139-
(Before &productname; 8.2, the containment operators <literal>@&gt;</> and <literal>&lt;@</> were
139+
(Before PostgreSQL 8.2, the containment operators <literal>@&gt;</> and <literal>&lt;@</> were
140140
respectively called <literal>@</> and <literal>~</>. These names are still available, but are
141141
deprecated and will eventually be retired. Notice that the old names
142142
are reversed from the convention formerly followed by the core geometric

doc/src/sgml/datatype.sgml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1272,7 +1272,7 @@ SELECT b, char_length(b) FROM test2;
12721272
of these are always accepted on input. The output format depends
12731273
on the configuration parameter <xref linkend="guc-bytea-output">;
12741274
the default is hex. (Note that the hex format was introduced in
1275-
<productname>&productname;</productname> 9.0; earlier versions and some
1275+
<productname>PostgreSQL</productname> 9.0; earlier versions and some
12761276
tools don't understand it.)
12771277
</para>
12781278

@@ -2478,7 +2478,7 @@ January 8 04:05:06 1999 PST
24782478

24792479
<para>
24802480
In all cases, timezone names and abbreviations are recognized
2481-
case-insensitively. (This is a change from <productname>&productname;</>
2481+
case-insensitively. (This is a change from <productname>PostgreSQL</>
24822482
versions prior to 8.2, which were case-sensitive in some contexts but
24832483
not others.)
24842484
</para>
@@ -2756,13 +2756,13 @@ P <optional> <replaceable>years</>-<replaceable>months</>-<replaceable>days</> <
27562756

27572757
<para>
27582758
The output of the <literal>postgres</> style matches the output of
2759-
<productname>&productname;</> releases prior to 8.4 when the
2759+
<productname>PostgreSQL</> releases prior to 8.4 when the
27602760
<xref linkend="guc-datestyle"> parameter was set to <literal>ISO</>.
27612761
</para>
27622762

27632763
<para>
27642764
The output of the <literal>postgres_verbose</> style matches the output of
2765-
<productname>&productname;</> releases prior to 8.4 when the
2765+
<productname>PostgreSQL</> releases prior to 8.4 when the
27662766
<varname>DateStyle</> parameter was set to non-<literal>ISO</> output.
27672767
</para>
27682768

doc/src/sgml/dblink.sgml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1828,7 +1828,7 @@ dblink_build_sql_insert(text relname,
18281828
<title>Notes</title>
18291829

18301830
<para>
1831-
As of <productname>&productname;</> 9.0, the attribute numbers in
1831+
As of <productname>PostgreSQL</> 9.0, the attribute numbers in
18321832
<parameter>primary_key_attnums</parameter> are interpreted as logical
18331833
column numbers, corresponding to the column's position in
18341834
<literal>SELECT * FROM relname</>. Previous versions interpreted the
@@ -1946,7 +1946,7 @@ dblink_build_sql_delete(text relname,
19461946
<title>Notes</title>
19471947

19481948
<para>
1949-
As of <productname>&productname;</> 9.0, the attribute numbers in
1949+
As of <productname>PostgreSQL</> 9.0, the attribute numbers in
19501950
<parameter>primary_key_attnums</parameter> are interpreted as logical
19511951
column numbers, corresponding to the column's position in
19521952
<literal>SELECT * FROM relname</>. Previous versions interpreted the
@@ -2083,7 +2083,7 @@ dblink_build_sql_update(text relname,
20832083
<title>Notes</title>
20842084

20852085
<para>
2086-
As of <productname>&productname;</> 9.0, the attribute numbers in
2086+
As of <productname>PostgreSQL</> 9.0, the attribute numbers in
20872087
<parameter>primary_key_attnums</parameter> are interpreted as logical
20882088
column numbers, corresponding to the column's position in
20892089
<literal>SELECT * FROM relname</>. Previous versions interpreted the

doc/src/sgml/ddl.sgml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1088,7 +1088,7 @@ CREATE TABLE circles (
10881088
<listitem>
10891089
<para>
10901090
Of course, the tables in question must be created <literal>WITH
1091-
OIDS</literal>. As of <productname>&productname;</productname> 8.1,
1091+
OIDS</literal>. As of <productname>PostgreSQL</productname> 8.1,
10921092
<literal>WITHOUT OIDS</> is the default.
10931093
</para>
10941094
</listitem>

doc/src/sgml/ecpg.sgml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3597,7 +3597,7 @@ EXEC SQL DESCRIBE stmt1 INTO SQL DESCRIPTOR mydesc;
35973597
</para>
35983598

35993599
<para>
3600-
Before &productname; 9.0, the <literal>SQL</literal> keyword was optional,
3600+
Before PostgreSQL 9.0, the <literal>SQL</literal> keyword was optional,
36013601
so using <literal>DESCRIPTOR</literal> and <literal>SQL DESCRIPTOR</literal>
36023602
produced named SQL Descriptor Areas. Now it is mandatory, omitting
36033603
the <literal>SQL</literal> keyword produces SQLDA Descriptor Areas,

0 commit comments

Comments
 (0)