diff options
author | Tom Lane | 2008-03-26 16:34:47 +0000 |
---|---|---|
committer | Tom Lane | 2008-03-26 16:34:47 +0000 |
commit | 105f08f72a274cd9c1798d9d34e57163a1bb1221 (patch) | |
tree | a1a5b41016e44b66e56348d13cf7dfee11e32ab1 | |
parent | dbb6e9253895f6c0a2d682de559609e88838b4ff (diff) |
Fix bad spelling and worse grammar in recent doc commits. Propagate
pg_dump --ignore-version comments into pg_dumpall and pg_restore pages.
-rw-r--r-- | doc/src/sgml/array.sgml | 4 | ||||
-rw-r--r-- | doc/src/sgml/ref/pg_dump.sgml | 18 | ||||
-rw-r--r-- | doc/src/sgml/ref/pg_dumpall.sgml | 15 | ||||
-rw-r--r-- | doc/src/sgml/ref/pg_restore.sgml | 3 |
4 files changed, 23 insertions, 17 deletions
diff --git a/doc/src/sgml/array.sgml b/doc/src/sgml/array.sgml index 3f7e5d9a3e..caea47c802 100644 --- a/doc/src/sgml/array.sgml +++ b/doc/src/sgml/array.sgml @@ -259,8 +259,8 @@ SELECT schedule[1:2][2] FROM sal_emp WHERE name = 'Bill'; (1 row) </programlisting> - To avoid confusion with slices, use slice syntax for all dimmension - references, e.g. <literal>[1:2][1:1]</>, not <literal>[2][1:1]</>. + To avoid confusion with the non-slice case, it's best to use slice syntax + for all dimensions, e.g., <literal>[1:2][1:1]</>, not <literal>[2][1:1]</>. </para> <para> diff --git a/doc/src/sgml/ref/pg_dump.sgml b/doc/src/sgml/ref/pg_dump.sgml index 30528402cc..1e07120026 100644 --- a/doc/src/sgml/ref/pg_dump.sgml +++ b/doc/src/sgml/ref/pg_dump.sgml @@ -296,18 +296,20 @@ PostgreSQL documentation <term><option>--ignore-version</></term> <listitem> <para> - Ignore incompatible version check between + Ignore version mismatch between <application>pg_dump</application> and the database server. </para> <para> - Dumping from a server newer than <application>pg_dump</application> - is likely fail and is disabled by default. - Also, while <application>pg_dump</application> can dump from servers running - previous releases of <productname>PostgreSQL</>, some very old - versions are not supported (currently, pre-7.0). - Use this option if you need to override the version check, but - be prepared for <application>pg_dump</application> to fail. + By default, <application>pg_dump</> will refuse to attempt + to dump from a server that is of a newer <productname>PostgreSQL</> + version than <application>pg_dump</application> is. It will also + refuse to attempt to dump from a server that is older than the oldest + supported version (currently, 7.0). The <option>-i</> option + overrides this check and forces a dump to be attempted anyway. + This option is <emphasis>deprecated</> because the dump is very + likely to fail — or worse, seem to succeed but be wrong or + incomplete. </para> </listitem> </varlistentry> diff --git a/doc/src/sgml/ref/pg_dumpall.sgml b/doc/src/sgml/ref/pg_dumpall.sgml index 1fef132782..ce5b8232c8 100644 --- a/doc/src/sgml/ref/pg_dumpall.sgml +++ b/doc/src/sgml/ref/pg_dumpall.sgml @@ -161,12 +161,15 @@ PostgreSQL documentation </para> <para> - <application>pg_dumpall</application> can handle databases - from previous releases of <productname>PostgreSQL</>, but very - old versions are not supported anymore (currently prior to - 7.0). Use this option if you need to override the version - check (and if <application>pg_dumpall</application> then - fails, don't say you weren't warned). + By default, <application>pg_dumpall</> will refuse to attempt + to dump from a server that is of a newer <productname>PostgreSQL</> + version than <application>pg_dumpall</application> is. It will also + refuse to attempt to dump from a server that is older than the oldest + supported version (currently, 7.0). The <option>-i</> option + overrides this check and forces a dump to be attempted anyway. + This option is <emphasis>deprecated</> because the dump is very + likely to fail — or worse, seem to succeed but be wrong or + incomplete. </para> </listitem> </varlistentry> diff --git a/doc/src/sgml/ref/pg_restore.sgml b/doc/src/sgml/ref/pg_restore.sgml index 502a307d0b..073aeca01c 100644 --- a/doc/src/sgml/ref/pg_restore.sgml +++ b/doc/src/sgml/ref/pg_restore.sgml @@ -200,7 +200,8 @@ <term><option>--ignore-version</option></term> <listitem> <para> - Ignore database version checks. + Ignore version mismatch between + <application>pg_restore</application> and the database server. </para> </listitem> </varlistentry> |