summaryrefslogtreecommitdiff
path: root/doc/src/sgml/ref
diff options
context:
space:
mode:
authorTom Lane <tgl@sss.pgh.pa.us>2011-03-08 17:10:34 -0500
committerTom Lane <tgl@sss.pgh.pa.us>2011-03-08 17:10:59 -0500
commita612b17120fc011cefcdec6948b1cc8543529d06 (patch)
tree4d44863e18e5de4b3d9fee9bcc1020f24bc1074b /doc/src/sgml/ref
parent4502c8e1c06164adb7be526096e91e04d1844d36 (diff)
Assorted editing for collation documentation.
I made a pass over this to familiarize myself with the feature, and found some things that could be improved.
Diffstat (limited to 'doc/src/sgml/ref')
-rw-r--r--doc/src/sgml/ref/create_collation.sgml39
-rw-r--r--doc/src/sgml/ref/drop_collation.sgml2
2 files changed, 21 insertions, 20 deletions
diff --git a/doc/src/sgml/ref/create_collation.sgml b/doc/src/sgml/ref/create_collation.sgml
index 9d03ca5a4eb..fc792250011 100644
--- a/doc/src/sgml/ref/create_collation.sgml
+++ b/doc/src/sgml/ref/create_collation.sgml
@@ -21,7 +21,7 @@
CREATE COLLATION <replaceable>name</replaceable> (
[ LOCALE = <replaceable>locale</replaceable>, ]
[ LC_COLLATE = <replaceable>lc_collate</replaceable>, ]
- [ LC_CTYPE = <replaceable>lc_ctype</replaceable>, ]
+ [ LC_CTYPE = <replaceable>lc_ctype</replaceable> ]
)
CREATE COLLATION <replaceable>name</replaceable> FROM <replaceable>existing_collation</replaceable>
</synopsis>
@@ -32,7 +32,8 @@ CREATE COLLATION <replaceable>name</replaceable> FROM <replaceable>existing_coll
<para>
<command>CREATE COLLATION</command> defines a new collation using
- the specified operating system locales or from an existing collation.
+ the specified operating system locale settings,
+ or by copying an existing collation.
</para>
<para>
@@ -53,34 +54,22 @@ CREATE COLLATION <replaceable>name</replaceable> FROM <replaceable>existing_coll
<para>
The name of the collation. The collation name can be
schema-qualified. If it is not, the collation is defined in the
- current schema. The collation name must be unique within a
+ current schema. The collation name must be unique within that
schema. (The system catalogs can contain collations with the
- same name for other encodings, but these are not usable if the
+ same name for other encodings, but these are ignored if the
database encoding does not match.)
</para>
</listitem>
</varlistentry>
<varlistentry>
- <term><replaceable>existing_collation</replaceable></term>
-
- <listitem>
- <para>
- The name of an existing collation to copy. The new collation
- will have the same properties as the existing one, but they
- will become independent objects.
- </para>
- </listitem>
- </varlistentry>
-
- <varlistentry>
<term><replaceable>locale</replaceable></term>
<listitem>
<para>
This is a shortcut for setting <symbol>LC_COLLATE</symbol>
and <symbol>LC_CTYPE</symbol> at once. If you specify this,
- you cannot specify either of the other parameters.
+ you cannot specify either of those parameters.
</para>
</listitem>
</varlistentry>
@@ -112,6 +101,18 @@ CREATE COLLATION <replaceable>name</replaceable> FROM <replaceable>existing_coll
</para>
</listitem>
</varlistentry>
+
+ <varlistentry>
+ <term><replaceable>existing_collation</replaceable></term>
+
+ <listitem>
+ <para>
+ The name of an existing collation to copy. The new collation
+ will have the same properties as the existing one, but they
+ will become independent objects.
+ </para>
+ </listitem>
+ </varlistentry>
</variablelist>
</refsect1>
@@ -145,8 +146,8 @@ CREATE COLLATION french (LOCALE = 'fr_FR.utf8');
<programlisting>
CREATE COLLATION german FROM "de_DE";
</programlisting>
- This can be convenient to be able to use operating-system
- independent collation names in applications.
+ This can be convenient to be able to use operating-system-independent
+ collation names in applications.
</para>
</refsect1>
diff --git a/doc/src/sgml/ref/drop_collation.sgml b/doc/src/sgml/ref/drop_collation.sgml
index 7be9317932c..0afcaaf2dee 100644
--- a/doc/src/sgml/ref/drop_collation.sgml
+++ b/doc/src/sgml/ref/drop_collation.sgml
@@ -94,7 +94,7 @@ DROP COLLATION german;
<para>
The <command>DROP COLLATION</command> command conforms to the
<acronym>SQL</acronym> standard, apart from the <literal>IF
- EXISTS</> option, which is a <productname>PostgreSQL</> extension..
+ EXISTS</> option, which is a <productname>PostgreSQL</> extension.
</para>
</refsect1>