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

Commit 92c001b

Browse files
committed
Minor copy-editing in tutorial.
1 parent 1ef38f2 commit 92c001b

File tree

3 files changed

+17
-17
lines changed

3 files changed

+17
-17
lines changed

doc/src/sgml/advanced.sgml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!--
2-
$PostgreSQL: pgsql/doc/src/sgml/advanced.sgml,v 1.46 2004/11/15 06:32:13 neilc Exp $
2+
$PostgreSQL: pgsql/doc/src/sgml/advanced.sgml,v 1.47 2004/12/17 04:50:32 tgl Exp $
33
-->
44

55
<chapter id="tutorial-advanced">
@@ -196,7 +196,7 @@ UPDATE branches SET balance = balance + 100.00
196196
and won't be lost even if a crash ensues shortly thereafter.
197197
For example, if we are recording a cash withdrawal by Bob,
198198
we do not want any chance that the debit to his account will
199-
disappear in a crash just as he walks out the bank door.
199+
disappear in a crash just after he walks out the bank door.
200200
A transactional database guarantees that all the updates made by
201201
a transaction are logged in permanent storage (i.e., on disk) before
202202
the transaction is reported complete.

doc/src/sgml/query.sgml

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!--
2-
$PostgreSQL: pgsql/doc/src/sgml/query.sgml,v 1.40 2004/11/15 06:32:14 neilc Exp $
2+
$PostgreSQL: pgsql/doc/src/sgml/query.sgml,v 1.41 2004/12/17 04:50:32 tgl Exp $
33
-->
44

55
<chapter id="tutorial-sql">
@@ -154,7 +154,7 @@ CREATE TABLE weather (
154154
</para>
155155

156156
<para>
157-
<productname>PostgreSQL</productname> supports the usual
157+
<productname>PostgreSQL</productname> supports the standard
158158
<acronym>SQL</acronym> types <type>int</type>,
159159
<type>smallint</type>, <type>real</type>, <type>double
160160
precision</type>, <type>char(<replaceable>N</>)</type>,
@@ -297,8 +297,8 @@ SELECT * FROM weather;
297297
<footnote>
298298
<para>
299299
While <literal>SELECT *</literal> is useful for off-the-cuff
300-
queries, it is considered bad style in production code for
301-
maintenance reasons: adding a column to the table changes the results.
300+
queries, it is widely considered bad style in production code,
301+
since adding a column to the table would change the results.
302302
</para>
303303
</footnote>
304304
The output should be:
@@ -400,9 +400,9 @@ SELECT DISTINCT city
400400
the cities table, and select the pairs of rows where these values match.
401401
<note>
402402
<para>
403-
This is only a conceptual model. The actual join may
404-
be performed in a more efficient manner, but this is invisible
405-
to the user.
403+
This is only a conceptual model. The join is usually performed
404+
in a more efficient manner than actually comparing each possible
405+
pair of rows, but this is invisible to the user.
406406
</para>
407407
</note>
408408
This would be accomplished by the following query:
@@ -727,15 +727,15 @@ SELECT city, max(temp_lo)
727727
aggregates are computed. Thus, the
728728
<literal>WHERE</literal> clause must not contain aggregate functions;
729729
it makes no sense to try to use an aggregate to determine which rows
730-
will be inputs to the aggregates. On the other hand,
730+
will be inputs to the aggregates. On the other hand, the
731731
<literal>HAVING</literal> clause always contains aggregate functions.
732732
(Strictly speaking, you are allowed to write a <literal>HAVING</literal>
733-
clause that doesn't use aggregates, but it's wasteful: The same condition
733+
clause that doesn't use aggregates, but it's wasteful. The same condition
734734
could be used more efficiently at the <literal>WHERE</literal> stage.)
735735
</para>
736736

737737
<para>
738-
Observe that we can apply the city name restriction in
738+
In the previous example, we can apply the city name restriction in
739739
<literal>WHERE</literal>, since it needs no aggregate. This is
740740
more efficient than adding the restriction to <literal>HAVING</literal>,
741741
because we avoid doing the grouping and aggregate calculations
@@ -788,10 +788,10 @@ SELECT * FROM weather;
788788
</indexterm>
789789

790790
<para>
791+
Rows can be removed from a table using the <command>DELETE</command>
792+
command.
791793
Suppose you are no longer interested in the weather of Hayward.
792-
Then you can do the following to delete those rows from the table.
793-
Deletions are performed using the <command>DELETE</command>
794-
command:
794+
Then you can do the following to delete those rows from the table:
795795
<programlisting>
796796
DELETE FROM weather WHERE city = 'Hayward';
797797
</programlisting>

doc/src/sgml/start.sgml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!--
2-
$PostgreSQL: pgsql/doc/src/sgml/start.sgml,v 1.36 2004/06/29 19:57:40 petere Exp $
2+
$PostgreSQL: pgsql/doc/src/sgml/start.sgml,v 1.37 2004/12/17 04:50:32 tgl Exp $
33
-->
44

55
<chapter id="tutorial-start">
@@ -218,7 +218,7 @@ createdb: database creation failed: ERROR: permission denied to create database
218218
operating system account. As it happens, there will always be a
219219
<productname>PostgreSQL</productname> user account that has the
220220
same name as the operating system user that started the server,
221-
and it also happens that the user always has permission to
221+
and it also happens that that user always has permission to
222222
create databases. Instead of logging in as that user you can
223223
also specify the <option>-U</option> option everywhere to select
224224
a <productname>PostgreSQL</productname> user name to connect as.

0 commit comments

Comments
 (0)