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

Commit 63b55ea

Browse files
author
Liudmila Mantrova
committed
DOC: style changes in add-collprovider option
1 parent 47ddc4b commit 63b55ea

File tree

2 files changed

+22
-24
lines changed

2 files changed

+22
-24
lines changed

doc/src/sgml/ref/pg_dump.sgml

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -638,23 +638,22 @@ doc/src/sgml/ref/pg_dump.sgml
638638
</listitem>
639639
</varlistentry>
640640

641-
<varlistentry>
641+
<varlistentry>
642642
<term><option>--add-collprovider</option></term>
643643
<listitem>
644644
<para>
645-
This option is recommended when upgrading with
645+
If the collation provider for the database to be dumped is implicit,
646+
this option explicitly adds the collation provider to the dump.
647+
This option is recommended if you are using
646648
<application>pg_dump</application> and
647-
<application>pg_restore</application> from previous versions of
648-
<productname>&project;</> as well as from all versions of
649-
<productname>PostgreSQL</> (it's automatically used in case of a binary
650-
upgrade; and it actually does nothing for the current version of
651-
<productname>&project;</>). If you do not want to manually fix the
652-
scripts (or do not know how to do it correctly) this helps to avoid mess
653-
when the templated database and the created database actually use
654-
different collation providers that are ommitted (see <xref
655-
linkend="collation-managing">). In this case the check constrains that
649+
<application>pg_restore</application> to upgrade from previous versions of
650+
<productname>&project;</> or any version of <productname>PostgreSQL</>.
651+
It allows to preserve the original collation provider for the migrated database if
652+
the <literal>template0</literal> database in the new cluster uses different
653+
collation settings. Otherwise, check constraints that
656654
use the default collation of the database may change and the
657-
<command>COPY</command> command may end with fail.
655+
<command>COPY</command> command may end with a failure.
656+
For binary upgrades, this option is used automatically.
658657
</para>
659658
</listitem>
660659
</varlistentry>

doc/src/sgml/ref/pg_dumpall.sgml

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -231,23 +231,22 @@ doc/src/sgml/ref/pg_dumpall.sgml
231231
</listitem>
232232
</varlistentry>
233233

234-
<varlistentry>
234+
<varlistentry>
235235
<term><option>--add-collprovider</option></term>
236236
<listitem>
237237
<para>
238-
This option is recommended when upgrading with
238+
If the collation provider for the database to be dumped is implicit,
239+
this option explicitly adds the collation provider to the dump.
240+
This option is recommended if you are using
239241
<application>pg_dumpall</application> and
240-
<application>pg_restore</application> from previous versions of
241-
<productname>&project;</> as well as from all versions of
242-
<productname>PostgreSQL</> (it's automatically used in case of a binary
243-
upgrade; and it actually does nothing for the current version of
244-
<productname>&project;</>). If you do not want to manually fix the
245-
scripts (or do not know how to do it correctly) this helps to avoid mess
246-
when the templated database and the created database actually use
247-
different collation providers that are ommitted (see <xref
248-
linkend="collation-managing">). In this case the check constrains that
242+
<application>pg_restore</application> to upgrade from previous versions of
243+
<productname>&project;</> or any version of <productname>PostgreSQL</>.
244+
It allows to preserve the original collation provider for the migrated database if
245+
the <literal>template0</literal> database in the new cluster uses different
246+
collation settings. Otherwise, check constraints that
249247
use the default collation of the database may change and the
250-
<command>COPY</command> command may end with fail.
248+
<command>COPY</command> command may end with a failure.
249+
For binary upgrades, this option is used automatically.
251250
</para>
252251
</listitem>
253252
</varlistentry>

0 commit comments

Comments
 (0)