summaryrefslogtreecommitdiff
path: root/doc/src
diff options
context:
space:
mode:
Diffstat (limited to 'doc/src')
-rw-r--r--doc/src/sgml/datatype.sgml4
-rw-r--r--doc/src/sgml/ecpg.sgml4
-rw-r--r--doc/src/sgml/ref/create_role.sgml4
-rw-r--r--doc/src/sgml/ref/create_rule.sgml4
4 files changed, 8 insertions, 8 deletions
diff --git a/doc/src/sgml/datatype.sgml b/doc/src/sgml/datatype.sgml
index 5f173c907af..9cebbff7190 100644
--- a/doc/src/sgml/datatype.sgml
+++ b/doc/src/sgml/datatype.sgml
@@ -1,4 +1,4 @@
-<!-- $PostgreSQL: pgsql/doc/src/sgml/datatype.sgml,v 1.214 2007/11/05 16:45:52 momjian Exp $ -->
+<!-- $PostgreSQL: pgsql/doc/src/sgml/datatype.sgml,v 1.215 2007/11/07 12:24:23 petere Exp $ -->
<chapter id="datatype">
<title id="datatype-title">Data Types</title>
@@ -1180,7 +1180,7 @@ SELECT b, char_length(b) FROM test2;
general, to escape an octet, it is converted into the three-digit
octal number equivalent of its decimal octet value, and preceded
by two backslashes. <xref linkend="datatype-binary-sqlesc">
- shows the characters that must be escaped, and gives the alternate
+ shows the characters that must be escaped, and gives the alternative
escape sequences where applicable.
</para>
diff --git a/doc/src/sgml/ecpg.sgml b/doc/src/sgml/ecpg.sgml
index d8ebbd46b8f..e57b5222d05 100644
--- a/doc/src/sgml/ecpg.sgml
+++ b/doc/src/sgml/ecpg.sgml
@@ -1,4 +1,4 @@
-<!-- $PostgreSQL: pgsql/doc/src/sgml/ecpg.sgml,v 1.83 2007/04/17 17:30:35 tgl Exp $ -->
+<!-- $PostgreSQL: pgsql/doc/src/sgml/ecpg.sgml,v 1.84 2007/11/07 12:24:23 petere Exp $ -->
<chapter id="ecpg">
<title><application>ECPG</application> - Embedded <acronym>SQL</acronym> in C</title>
@@ -1771,7 +1771,7 @@ int PGTYPEStimestamp_fmt_asc(timestamp *ts, char *output, int str_len, char *fmt
<literal>%Ow</literal>
<literal>%OW</literal>
<literal>%Oy</literal>
- are supposed to provide alternate representations.
+ are supposed to provide alternative representations.
</para>
<para>
Additionally <literal>%OB</literal> implemented to represent
diff --git a/doc/src/sgml/ref/create_role.sgml b/doc/src/sgml/ref/create_role.sgml
index 1ad27d221ce..17c3a5399d0 100644
--- a/doc/src/sgml/ref/create_role.sgml
+++ b/doc/src/sgml/ref/create_role.sgml
@@ -1,5 +1,5 @@
<!--
-$PostgreSQL: pgsql/doc/src/sgml/ref/create_role.sgml,v 1.9 2007/01/31 23:26:03 momjian Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/create_role.sgml,v 1.10 2007/11/07 12:24:23 petere Exp $
PostgreSQL documentation
-->
@@ -167,7 +167,7 @@ where <replaceable class="PARAMETER">option</replaceable> can be:
privileges, but are not users in the usual sense of the word.
If not specified,
<literal>NOLOGIN</literal> is the default, except when
- <command>CREATE ROLE</> is invoked through its alternate spelling
+ <command>CREATE ROLE</> is invoked through its alternative spelling
<command>CREATE USER</>.
</para>
</listitem>
diff --git a/doc/src/sgml/ref/create_rule.sgml b/doc/src/sgml/ref/create_rule.sgml
index 6d42196d573..73181f0228d 100644
--- a/doc/src/sgml/ref/create_rule.sgml
+++ b/doc/src/sgml/ref/create_rule.sgml
@@ -1,5 +1,5 @@
<!--
-$PostgreSQL: pgsql/doc/src/sgml/ref/create_rule.sgml,v 1.51 2007/02/01 19:10:24 momjian Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/create_rule.sgml,v 1.52 2007/11/07 12:24:23 petere Exp $
PostgreSQL documentation
-->
@@ -39,7 +39,7 @@ CREATE [ OR REPLACE ] RULE <replaceable class="parameter">name</replaceable> AS
<para>
The <productname>PostgreSQL</productname> rule system allows one to
- define an alternate action to be performed on insertions, updates,
+ define an alternative action to be performed on insertions, updates,
or deletions in database tables. Roughly speaking, a rule causes
additional commands to be executed when a given command on a given
table is executed. Alternatively, an <literal>INSTEAD</literal>