Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit 797c2b2

Browse files
committed
More minor updates and copy-editing.
1 parent 7737d01 commit 797c2b2

File tree

5 files changed

+156
-123
lines changed

5 files changed

+156
-123
lines changed

doc/src/sgml/ecpg.sgml

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!--
2-
$PostgreSQL: pgsql/doc/src/sgml/ecpg.sgml,v 1.59 2003/12/26 20:00:00 meskes Exp $
2+
$PostgreSQL: pgsql/doc/src/sgml/ecpg.sgml,v 1.60 2004/12/28 22:47:15 tgl Exp $
33
-->
44

55
<chapter id="ecpg">
@@ -19,7 +19,7 @@ $PostgreSQL: pgsql/doc/src/sgml/ecpg.sgml,v 1.59 2003/12/26 20:00:00 meskes Exp
1919
</para>
2020

2121
<para>
22-
Admittedly, this documentation is quite incomplete. But since this
22+
This documentation is quite incomplete. But since this
2323
interface is standardized, additional information can be found in
2424
many resources about SQL.
2525
</para>
@@ -31,9 +31,9 @@ $PostgreSQL: pgsql/doc/src/sgml/ecpg.sgml,v 1.59 2003/12/26 20:00:00 meskes Exp
3131
An embedded SQL program consists of code written in an ordinary
3232
programming language, in this case C, mixed with SQL commands in
3333
specially marked sections. To build the program, the source code
34-
is first passed to the embedded SQL preprocessor, which converts it
34+
is first passed through the embedded SQL preprocessor, which converts it
3535
to an ordinary C program, and afterwards it can be processed by a C
36-
compilation tool chain.
36+
compiler.
3737
</para>
3838

3939
<para>
@@ -53,16 +53,16 @@ $PostgreSQL: pgsql/doc/src/sgml/ecpg.sgml,v 1.59 2003/12/26 20:00:00 meskes Exp
5353
</para>
5454

5555
<para>
56-
As indicated, programs written for the embedded
56+
As already stated, programs written for the embedded
5757
<acronym>SQL</acronym> interface are normal C programs with special
5858
code inserted to perform database-related actions. This special
5959
code always has the form
6060
<programlisting>
6161
EXEC SQL ...;
6262
</programlisting>
6363
These statements syntactically take the place of a C statement.
64-
Depending on the particular statement, they may appear in the
65-
global context or within a function. Embedded
64+
Depending on the particular statement, they may appear at the
65+
global level or within a function. Embedded
6666
<acronym>SQL</acronym> statements follow the case-sensitivity rules
6767
of normal <acronym>SQL</acronym> code, and not those of C.
6868
</para>
@@ -326,9 +326,9 @@ EXEC SQL COMMIT;
326326
<para>
327327
In the default mode, statements are committed only when
328328
<command>EXEC SQL COMMIT</command> is issued. The embedded SQL
329-
interface also supports autocommit of transactions (as known from
330-
other interfaces) via the <option>-t</option> command-line option
331-
to <command>ecpg</command> (see below) or via the <literal>EXEC SQL
329+
interface also supports autocommit of transactions (similar to
330+
<application>libpq</> behavior) via the <option>-t</option> command-line
331+
option to <command>ecpg</command> (see below) or via the <literal>EXEC SQL
332332
SET AUTOCOMMIT TO ON</literal> statement. In autocommit mode, each
333333
command is automatically committed unless it is inside an explicit
334334
transaction block. This mode can be explicitly turned off using
@@ -448,7 +448,7 @@ char foo[16], bar[16];
448448
<para>
449449
The declarations are also echoed to the output file as a normal C
450450
variables, so there's no need to declare them again. Variables
451-
that are not intended to be used with SQL commands can be declared
451+
that are not intended to be used in SQL commands can be declared
452452
normally outside these special sections.
453453
</para>
454454

@@ -553,7 +553,7 @@ do {
553553
second host variable specification to each host variable that
554554
contains data. This second host variable is called the
555555
<firstterm>indicator</firstterm> and contains a flag that tells
556-
whether the datums is null, in which case the value of the real
556+
whether the datum is null, in which case the value of the real
557557
host variable is ignored. Here is an example that handles the
558558
retrieval of null values correctly:
559559
<programlisting>
@@ -1043,7 +1043,7 @@ static void set_error_handler(void)
10431043
<title>sqlca</title>
10441044

10451045
<para>
1046-
For a more powerful error handling, the embedded SQL interface
1046+
For more powerful error handling, the embedded SQL interface
10471047
provides a global variable with the name <varname>sqlca</varname>
10481048
that has the following structure:
10491049
<programlisting>
@@ -1064,7 +1064,7 @@ struct
10641064
} sqlca;
10651065
</programlisting>
10661066
(In a multithreaded program, every thread automatically gets its
1067-
own copy of <varname>sqlca</varname>. This works similar to the
1067+
own copy of <varname>sqlca</varname>. This works similarly to the
10681068
handling of the standard C global variable
10691069
<varname>errno</varname>.)
10701070
</para>
@@ -1132,7 +1132,7 @@ struct
11321132
<para>
11331133
The structure <varname>sqlca</varname> is not defined in the SQL
11341134
standard, but is implemented in several other SQL database
1135-
systems. The definitions are similar in the core, but if you want
1135+
systems. The definitions are similar at the core, but if you want
11361136
to write portable applications, then you should investigate the
11371137
different implementations carefully.
11381138
</para>
@@ -1539,7 +1539,7 @@ ecpg prog1.pgc
15391539
<programlisting>
15401540
cc -c prog1.c
15411541
</programlisting>
1542-
The generated C source files include headers files from the
1542+
The generated C source files include header files from the
15431543
<productname>PostgreSQL</> installation, so if you installed
15441544
<productname>PostgreSQL</> in a location that is not searched by
15451545
default, you have to add an option such as
@@ -1575,9 +1575,9 @@ ECPG = ecpg
15751575
</para>
15761576

15771577
<para>
1578-
<application>ecpg</application> is thread-safe if it is compiled using
1579-
the <option>--enable-thread-safety</> <filename>configure</filename>
1580-
command-line option. (You might need to use other threading
1578+
The <application>ecpg</application> library is thread-safe if it is built
1579+
using the <option>--enable-thread-safety</> command-line option to
1580+
<filename>configure</filename>. (You might need to use other threading
15811581
command-line options to compile your client code.)
15821582
</para>
15831583
</sect1>
@@ -1621,7 +1621,7 @@ ECPG = ecpg
16211621
<title>Internals</title>
16221622

16231623
<para>
1624-
This section explain how <application>ECPG</application> works
1624+
This section explains how <application>ECPG</application> works
16251625
internally. This information can occasionally be useful to help
16261626
users understand how to use <application>ECPG</application>.
16271627
</para>

doc/src/sgml/external-projects.sgml

Lines changed: 40 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!--
2-
$PostgreSQL: pgsql/doc/src/sgml/external-projects.sgml,v 1.5 2004/12/13 18:05:08 petere Exp $
2+
$PostgreSQL: pgsql/doc/src/sgml/external-projects.sgml,v 1.6 2004/12/28 22:47:15 tgl Exp $
33
-->
44

55
<chapter id="external-projects">
@@ -9,15 +9,28 @@ $PostgreSQL: pgsql/doc/src/sgml/external-projects.sgml,v 1.5 2004/12/13 18:05:08
99
<productname>PostgreSQL</productname> is a complex software project,
1010
and managing it is difficult. We have found that many
1111
enhancements to <productname>PostgreSQL</productname> can be more
12-
efficiently developed independently of the main project. They can
13-
have their own developer teams, email lists, their own bug tracking,
14-
and their own release schedule. While their independence makes
15-
development easier, it makes user's jobs harder. They have to hunt
12+
efficiently developed separately from the core project. Separate
13+
projects can
14+
have their own developer teams, email lists, bug tracking,
15+
and release schedules. While their independence makes
16+
development easier, it makes users' jobs harder. They have to hunt
1617
around looking for database enhancements to meet their needs.
17-
This section outlines some of the more popular externally
18+
This section describes some of the more popular externally
1819
developed enhancements and guides you on how to find them.
1920
</para>
2021

22+
<para>
23+
Many <productname>PostgreSQL</productname>-related projects are
24+
hosted at either
25+
<productname>GBorg</> at <ulink url="http://gborg.postgresql.org">
26+
http://gborg.postgresql.org</ulink> or
27+
<productname>pgFoundry</> at <ulink
28+
url="http://pgfoundry.org">http://pgfoundry.org</ulink>.
29+
There are other
30+
<productname>PostgreSQL</productname>-related projects that are hosted
31+
elsewhere, but you will have to do an Internet search to find them.
32+
</para>
33+
2134
<sect1 id="interfaces">
2235
<title>Externally Developed Interfaces</title>
2336

@@ -36,11 +49,7 @@ $PostgreSQL: pgsql/doc/src/sgml/external-projects.sgml,v 1.5 2004/12/13 18:05:08
3649
</para>
3750

3851
<para>
39-
To use other interfaces, you have to do some searching. For example,
40-
<productname>GBorg</> at <ulink url="http://gborg.postgresql.org">
41-
http://gborg.postgresql.org</ulink> has over thirty interfaces listed
42-
in its <literal>Drivers/Interfaces</> section. Some of the more
43-
popular interfaces are:
52+
Some of the more popular interfaces are:
4453

4554
<variablelist>
4655
<varlistentry>
@@ -54,20 +63,20 @@ $PostgreSQL: pgsql/doc/src/sgml/external-projects.sgml,v 1.5 2004/12/13 18:05:08
5463
</varlistentry>
5564

5665
<varlistentry>
57-
<term>Npgsql</term>
66+
<term>pgjdbc</term>
5867
<listitem>
5968
<para>
60-
<application>.Net</> interface for more recent
61-
<application>Windows</> applications.
69+
A <application>JDBC</> interface.
6270
</para>
6371
</listitem>
6472
</varlistentry>
6573

6674
<varlistentry>
67-
<term>libpq++</term>
75+
<term>Npgsql</term>
6876
<listitem>
6977
<para>
70-
An older <application>C++</> interface.
78+
<application>.Net</> interface for more recent
79+
<application>Windows</> applications.
7180
</para>
7281
</listitem>
7382
</varlistentry>
@@ -82,72 +91,64 @@ $PostgreSQL: pgsql/doc/src/sgml/external-projects.sgml,v 1.5 2004/12/13 18:05:08
8291
</varlistentry>
8392

8493
<varlistentry>
85-
<term>pgperl</term>
94+
<term>libpq++</term>
8695
<listitem>
8796
<para>
88-
A <application>Perl</> interface with an <acronym>API</> similar
89-
to <application>libpq</>.
97+
An older <application>C++</> interface.
9098
</para>
9199
</listitem>
92100
</varlistentry>
93101

94102
<varlistentry>
95-
<term>DBD-Pg</term>
103+
<term>pgperl</term>
96104
<listitem>
97105
<para>
98-
A <application>Perl</> interface that uses the
99-
<acronym>DBD</>-standard <application>API</>.
106+
A <application>Perl</> interface with an <acronym>API</> similar
107+
to <application>libpq</>.
100108
</para>
101109
</listitem>
102110
</varlistentry>
103111

104112
<varlistentry>
105-
<term>pgtcl</term>
113+
<term>DBD-Pg</term>
106114
<listitem>
107115
<para>
108-
The original version of the <application>TCL</> interface.
116+
A <application>Perl</> interface that uses the
117+
<acronym>DBD</>-standard <application>API</>.
109118
</para>
110119
</listitem>
111120
</varlistentry>
112121

113122
<varlistentry>
114-
<term>PyGreSQL</term>
123+
<term>pgtclng</term>
115124
<listitem>
116125
<para>
117-
A <application>Python</> interface library.
126+
A newer version of the <application>Tcl</> interface.
118127
</para>
119128
</listitem>
120129
</varlistentry>
121130

122131
<varlistentry>
123-
<term>pgjdbc</term>
132+
<term>pgtcl</term>
124133
<listitem>
125134
<para>
126-
A <application>JDBC</> interface.
135+
The original version of the <application>Tcl</> interface.
127136
</para>
128137
</listitem>
129138
</varlistentry>
130139

131140
<varlistentry>
132-
<term>pgtclng</term>
141+
<term>PyGreSQL</term>
133142
<listitem>
134143
<para>
135-
A newer version of the <application>TCL</> interface.
144+
A <application>Python</> interface library.
136145
</para>
137146
</listitem>
138147
</varlistentry>
139148

140149
</variablelist>
141150
</para>
142151

143-
<para>
144-
That section also contains several server-side languages that are
145-
separate projects. <application>pgFoundry</> at <ulink
146-
url="http://pgfoundry.org">http://pgfoundry.org</ulink> contains
147-
even more projects. Other projects are not even hosted on these
148-
servers and you will have to do an Internet search to find them.
149-
</para>
150-
151152
</sect1>
152153

153154
<sect1 id="extensions">
@@ -169,7 +170,7 @@ $PostgreSQL: pgsql/doc/src/sgml/external-projects.sgml,v 1.5 2004/12/13 18:05:08
169170
like <application>PostGIS</>. Even <application>PostgreSQL</>
170171
replication solutions are developed externally. For example,
171172
<application>Slony-I</> is a popular master/slave replication solution
172-
that is developed independently from the main projects.
173+
that is developed independently from the core project.
173174
</para>
174175

175176
<para>

doc/src/sgml/information_schema.sgml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<!-- $PostgreSQL: pgsql/doc/src/sgml/information_schema.sgml,v 1.19 2004/11/27 21:27:06 petere Exp $ -->
1+
<!-- $PostgreSQL: pgsql/doc/src/sgml/information_schema.sgml,v 1.20 2004/12/28 22:47:15 tgl Exp $ -->
22

33
<chapter id="information-schema">
44
<title>The Information Schema</title>
@@ -30,7 +30,7 @@
3030
exists in all databases. The owner of this schema is the initial
3131
database user in the cluster, and that user naturally has all the
3232
privileges on this schema, including the ability to drop it (but
33-
the space savings achieved by this are minuscule).
33+
the space savings achieved by that are minuscule).
3434
</para>
3535

3636
<para>
@@ -1003,7 +1003,7 @@
10031003
function (as parameter or return type) and stores some information
10041004
about how the data type is used in that instance (for example, the
10051005
declared maximum length, if applicable). Each data type
1006-
descriptors is assigned an arbitrary identifier that is unique
1006+
descriptor is assigned an arbitrary identifier that is unique
10071007
among the data type descriptor identifiers assigned for one object
10081008
(table, domain, function). This view is probably not useful for
10091009
applications, but it is used to define some other views in the
@@ -1735,7 +1735,7 @@ ORDER BY c.ordinal_position;
17351735
in the current database that are restricted by some unique, primary
17361736
key, or foreign key constraint. Check constraints are not included
17371737
in this view. Only those columns are shown that are contained in a
1738-
table owned the current user.
1738+
table owned by the current user.
17391739
</para>
17401740

17411741
<table>
@@ -3320,7 +3320,7 @@ ORDER BY c.ordinal_position;
33203320

33213321
<para>
33223322
The table <literal>sql_packages</literal> contains information
3323-
about which features packages defined in the SQL standard are
3323+
about which feature packages defined in the SQL standard are
33243324
supported by <productname>PostgreSQL</productname>. Refer to <xref
33253325
linkend="features"> for background information on feature packages.
33263326
</para>
@@ -3888,7 +3888,7 @@ ORDER BY c.ordinal_position;
38883888
incompatibilities with the SQL standard that affect the
38893889
representation in the information schema. First, trigger names are
38903890
local to the table in <productname>PostgreSQL</productname>, rather
3891-
than independent schema objects. Therefore there may be duplicate
3891+
than being independent schema objects. Therefore there may be duplicate
38923892
trigger names defined in one schema, as long as they belong to
38933893
different tables. (<literal>trigger_catalog</literal> and
38943894
<literal>trigger_schema</literal> are really the values pertaining

0 commit comments

Comments
 (0)