Fix bad spelling and worse grammar in recent doc commits. Propagate

pg_dump --ignore-version comments into pg_dumpall and pg_restore pages.

diff --git a/doc/src/sgml/array.sgml b/doc/src/sgml/array.sgml
index 3f7e5d9a3e6304d65bc1e4a4fe01637344dd83df..caea47c80202d96ef3406408450ba1b227c2b2a6 100644 (file)
--- 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 30528402cce1a7b0e08a6452ebc2e016165d2b20..1e0712002602732de5616edbff722b3d28cdd55f 100644 (file)
--- 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 &mdash; 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 1fef1327820a954057fe76c00895700a5ae0be7b..ce5b8232c85c31f071727eb58e69a18e5b667a03 100644 (file)
--- 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 &mdash; 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 502a307d0ba8fabffeb51f9baaf870ce6e6e2f87..073aeca01c5bf3b804e8a52a8d1eb8a842fc0ace 100644 (file)
--- 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>