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

Commit 2d013c4

Browse files
committed
Fix bad spelling and worse grammar in recent doc commits. Propagate
pg_dump --ignore-version comments into pg_dumpall and pg_restore pages.
1 parent d43b085 commit 2d013c4

File tree

4 files changed

+27
-21
lines changed

4 files changed

+27
-21
lines changed

doc/src/sgml/array.sgml

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<!-- $PostgreSQL: pgsql/doc/src/sgml/array.sgml,v 1.63 2008/03/26 14:43:20 momjian Exp $ -->
1+
<!-- $PostgreSQL: pgsql/doc/src/sgml/array.sgml,v 1.64 2008/03/26 16:34:47 tgl Exp $ -->
22

33
<sect1 id="arrays">
44
<title>Arrays</title>
@@ -259,8 +259,8 @@ SELECT schedule[1:2][2] FROM sal_emp WHERE name = 'Bill';
259259
(1 row)
260260
</programlisting>
261261

262-
To avoid confusion with slices, use slice syntax for all dimmension
263-
references, e.g. <literal>[1:2][1:1]</>, not <literal>[2][1:1]</>.
262+
To avoid confusion with the non-slice case, it's best to use slice syntax
263+
for all dimensions, e.g., <literal>[1:2][1:1]</>, not <literal>[2][1:1]</>.
264264
</para>
265265

266266
<para>

doc/src/sgml/ref/pg_dump.sgml

+11-9
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!--
2-
$PostgreSQL: pgsql/doc/src/sgml/ref/pg_dump.sgml,v 1.100 2008/03/26 14:32:22 momjian Exp $
2+
$PostgreSQL: pgsql/doc/src/sgml/ref/pg_dump.sgml,v 1.101 2008/03/26 16:34:47 tgl Exp $
33
PostgreSQL documentation
44
-->
55

@@ -296,18 +296,20 @@ PostgreSQL documentation
296296
<term><option>--ignore-version</></term>
297297
<listitem>
298298
<para>
299-
Ignore incompatible version check between
299+
Ignore version mismatch between
300300
<application>pg_dump</application> and the database server.
301301
</para>
302302

303303
<para>
304-
Dumping from a server newer than <application>pg_dump</application>
305-
is likely fail and is disabled by default.
306-
Also, while <application>pg_dump</application> can dump from servers running
307-
previous releases of <productname>PostgreSQL</>, some very old
308-
versions are not supported (currently, pre-7.0).
309-
Use this option if you need to override the version check, but
310-
be prepared for <application>pg_dump</application> to fail.
304+
By default, <application>pg_dump</> will refuse to attempt
305+
to dump from a server that is of a newer <productname>PostgreSQL</>
306+
version than <application>pg_dump</application> is. It will also
307+
refuse to attempt to dump from a server that is older than the oldest
308+
supported version (currently, 7.0). The <option>-i</> option
309+
overrides this check and forces a dump to be attempted anyway.
310+
This option is <emphasis>deprecated</> because the dump is very
311+
likely to fail &mdash; or worse, seem to succeed but be wrong or
312+
incomplete.
311313
</para>
312314
</listitem>
313315
</varlistentry>

doc/src/sgml/ref/pg_dumpall.sgml

+10-7
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!--
2-
$PostgreSQL: pgsql/doc/src/sgml/ref/pg_dumpall.sgml,v 1.70 2008/03/20 17:36:57 tgl Exp $
2+
$PostgreSQL: pgsql/doc/src/sgml/ref/pg_dumpall.sgml,v 1.71 2008/03/26 16:34:47 tgl Exp $
33
PostgreSQL documentation
44
-->
55

@@ -161,12 +161,15 @@ PostgreSQL documentation
161161
</para>
162162

163163
<para>
164-
<application>pg_dumpall</application> can handle databases
165-
from previous releases of <productname>PostgreSQL</>, but very
166-
old versions are not supported anymore (currently prior to
167-
7.0). Use this option if you need to override the version
168-
check (and if <application>pg_dumpall</application> then
169-
fails, don't say you weren't warned).
164+
By default, <application>pg_dumpall</> will refuse to attempt
165+
to dump from a server that is of a newer <productname>PostgreSQL</>
166+
version than <application>pg_dumpall</application> is. It will also
167+
refuse to attempt to dump from a server that is older than the oldest
168+
supported version (currently, 7.0). The <option>-i</> option
169+
overrides this check and forces a dump to be attempted anyway.
170+
This option is <emphasis>deprecated</> because the dump is very
171+
likely to fail &mdash; or worse, seem to succeed but be wrong or
172+
incomplete.
170173
</para>
171174
</listitem>
172175
</varlistentry>

doc/src/sgml/ref/pg_restore.sgml

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<!-- $PostgreSQL: pgsql/doc/src/sgml/ref/pg_restore.sgml,v 1.73 2008/03/20 17:36:57 tgl Exp $ -->
1+
<!-- $PostgreSQL: pgsql/doc/src/sgml/ref/pg_restore.sgml,v 1.74 2008/03/26 16:34:47 tgl Exp $ -->
22

33
<refentry id="APP-PGRESTORE">
44
<refmeta>
@@ -200,7 +200,8 @@
200200
<term><option>--ignore-version</option></term>
201201
<listitem>
202202
<para>
203-
Ignore database version checks.
203+
Ignore version mismatch between
204+
<application>pg_restore</application> and the database server.
204205
</para>
205206
</listitem>
206207
</varlistentry>

0 commit comments

Comments
 (0)