From: Tom Lane <tgl@sss.pgh.pa.us>
Date: Wed, 26 Mar 2008 16:34:47 +0000 (+0000)
Subject: Fix bad spelling and worse grammar in recent doc commits.  Propagate
X-Git-Tag: REL8_4_BETA1~1651
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2d013c41a354f644079409157c71617887c298ce;p=thirdparty%2Fpostgresql.git

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 9b0e658d81a..bf81c29aaf1 100644
--- a/doc/src/sgml/array.sgml
+++ b/doc/src/sgml/array.sgml
@@ -1,4 +1,4 @@
-<!-- $PostgreSQL: pgsql/doc/src/sgml/array.sgml,v 1.63 2008/03/26 14:43:20 momjian Exp $ -->
+<!-- $PostgreSQL: pgsql/doc/src/sgml/array.sgml,v 1.64 2008/03/26 16:34:47 tgl Exp $ -->
 
 <sect1 id="arrays">
  <title>Arrays</title>
@@ -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 1fb93fbb880..c6e82c29479 100644
--- a/doc/src/sgml/ref/pg_dump.sgml
+++ b/doc/src/sgml/ref/pg_dump.sgml
@@ -1,5 +1,5 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/ref/pg_dump.sgml,v 1.100 2008/03/26 14:32:22 momjian Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/pg_dump.sgml,v 1.101 2008/03/26 16:34:47 tgl Exp $
 PostgreSQL documentation
 -->
 
@@ -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 e624210bac4..2dbf8524cf4 100644
--- a/doc/src/sgml/ref/pg_dumpall.sgml
+++ b/doc/src/sgml/ref/pg_dumpall.sgml
@@ -1,5 +1,5 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/ref/pg_dumpall.sgml,v 1.70 2008/03/20 17:36:57 tgl Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/pg_dumpall.sgml,v 1.71 2008/03/26 16:34:47 tgl Exp $
 PostgreSQL documentation
 -->
 
@@ -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 f908d93dcab..edc5672c20f 100644
--- a/doc/src/sgml/ref/pg_restore.sgml
+++ b/doc/src/sgml/ref/pg_restore.sgml
@@ -1,4 +1,4 @@
-<!-- $PostgreSQL: pgsql/doc/src/sgml/ref/pg_restore.sgml,v 1.73 2008/03/20 17:36:57 tgl Exp $ -->
+<!-- $PostgreSQL: pgsql/doc/src/sgml/ref/pg_restore.sgml,v 1.74 2008/03/26 16:34:47 tgl Exp $ -->
 
 <refentry id="APP-PGRESTORE">
  <refmeta>
@@ -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>