aboutsummaryrefslogtreecommitdiff
path: root/doc/src
diff options
context:
space:
mode:
authorTom Lane <tgl@sss.pgh.pa.us>2001-11-23 22:06:20 +0000
committerTom Lane <tgl@sss.pgh.pa.us>2001-11-23 22:06:20 +0000
commitb104ffbd3d044d5117ca16b74dab868f7bc71190 (patch)
tree182b9c2ae45cf0d869f954acbd7dd7d4a3d5c9fd /doc/src
parentec27da1ce31ccdd1f62df75a4b1e796b6d66fa9c (diff)
downloadpostgresql-b104ffbd3d044d5117ca16b74dab868f7bc71190.tar.gz
postgresql-b104ffbd3d044d5117ca16b74dab868f7bc71190.zip
Copy-editing.
Diffstat (limited to 'doc/src')
-rw-r--r--doc/src/sgml/history.sgml11
-rw-r--r--doc/src/sgml/intro.sgml6
-rw-r--r--doc/src/sgml/notation.sgml4
3 files changed, 11 insertions, 10 deletions
diff --git a/doc/src/sgml/history.sgml b/doc/src/sgml/history.sgml
index 65893a22db6..2dee0921089 100644
--- a/doc/src/sgml/history.sgml
+++ b/doc/src/sgml/history.sgml
@@ -1,5 +1,5 @@
<!--
-$Header: /cvsroot/pgsql/doc/src/sgml/history.sgml,v 1.16 2001/11/08 23:34:33 petere Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/history.sgml,v 1.17 2001/11/23 22:06:20 tgl Exp $
-->
<sect1 id="history">
@@ -42,8 +42,8 @@ $Header: /cvsroot/pgsql/doc/src/sgml/history.sgml,v 1.16 2001/11/08 23:34:33 pet
<productname>Postgres</productname> has undergone several major releases since
then. The first <quote>demoware</quote> system became operational
in 1987 and was shown at the 1988 <acronym>ACM-SIGMOD</acronym>
- Conference. We released Version 1, described in
- <xref linkend="STON90a">,
+ Conference. Version 1, described in
+ <xref linkend="STON90a">, was released
to a few external users in June 1989. In response to a
critique of the first rule system
(<xref linkend="STON89">),
@@ -54,7 +54,7 @@ $Header: /cvsroot/pgsql/doc/src/sgml/history.sgml,v 1.16 2001/11/08 23:34:33 pet
released in June 1990 with the new rule system.
Version 3 appeared in 1991 and added support for multiple
storage managers, an improved query executor, and a
- rewritten rewrite rule system. For the most part,
+ rewritten rewrite rule system. For the most part, subsequent
releases until <productname>Postgres95</productname> (see below)
focused on portability and reliability.
</para>
@@ -87,7 +87,8 @@ $Header: /cvsroot/pgsql/doc/src/sgml/history.sgml,v 1.16 2001/11/08 23:34:33 pet
obvious that maintenance of the prototype code and
support was taking up large amounts of time that should
have been devoted to database research. In an effort
- to reduce this support burden, the project officially
+ to reduce this support burden, the Berkeley
+ <productname>Postgres</productname> project officially
ended with Version 4.2.
</para>
</sect2>
diff --git a/doc/src/sgml/intro.sgml b/doc/src/sgml/intro.sgml
index 070b3215cf7..51b405d1688 100644
--- a/doc/src/sgml/intro.sgml
+++ b/doc/src/sgml/intro.sgml
@@ -1,5 +1,5 @@
<!--
-$Header: /cvsroot/pgsql/doc/src/sgml/intro.sgml,v 1.17 2001/11/21 05:53:41 thomas Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/intro.sgml,v 1.18 2001/11/23 22:06:20 tgl Exp $
-->
<preface id="preface">
@@ -42,7 +42,7 @@ $Header: /cvsroot/pgsql/doc/src/sgml/intro.sgml,v 1.17 2001/11/21 05:53:41 thoma
processing applications.
The relational model successfully replaced previous
models in part because of its <quote>Spartan simplicity</quote>.
- However, as mentioned, this simplicity often makes the
+ However, this simplicity makes the
implementation of certain applications very difficult.
<productname>PostgreSQL</productname> offers substantial additional
power by incorporating the following additional
@@ -86,7 +86,7 @@ $Header: /cvsroot/pgsql/doc/src/sgml/intro.sgml,v 1.17 2001/11/21 05:53:41 thoma
category of databases referred to as
<firstterm>object-relational</firstterm>. Note that this is distinct
from those referred to as <firstterm>object-oriented</firstterm>,
- which in general are not as well suited to supporting the
+ which in general are not as well suited to supporting
traditional relational database languages.
So, although <productname>PostgreSQL</productname> has some
object-oriented features, it is firmly in the relational database
diff --git a/doc/src/sgml/notation.sgml b/doc/src/sgml/notation.sgml
index 2c42bc0dd42..e95735e11e1 100644
--- a/doc/src/sgml/notation.sgml
+++ b/doc/src/sgml/notation.sgml
@@ -1,5 +1,5 @@
<!--
-$Header: /cvsroot/pgsql/doc/src/sgml/notation.sgml,v 1.18 2001/11/21 05:53:41 thomas Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/notation.sgml,v 1.19 2001/11/23 22:06:20 tgl Exp $
-->
<sect1 id="notation">
@@ -33,7 +33,7 @@ $Header: /cvsroot/pgsql/doc/src/sgml/notation.sgml,v 1.18 2001/11/21 05:53:41 th
Anything in braces
(<literal>{</literal> and <literal>}</literal>) and containing vertical bars
(<literal>|</literal>)
- indicates that you must choose one.
+ indicates that you must choose one alternative.
</para>
<para>