Commit 2d013c41 authored by Tom Lane's avatar Tom Lane

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

pg_dump --ignore-version comments into pg_dumpall and pg_restore pages.
parent d43b085d
<!-- $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"> <sect1 id="arrays">
<title>Arrays</title> <title>Arrays</title>
...@@ -259,8 +259,8 @@ SELECT schedule[1:2][2] FROM sal_emp WHERE name = 'Bill'; ...@@ -259,8 +259,8 @@ SELECT schedule[1:2][2] FROM sal_emp WHERE name = 'Bill';
(1 row) (1 row)
</programlisting> </programlisting>
To avoid confusion with slices, use slice syntax for all dimmension To avoid confusion with the non-slice case, it's best to use slice syntax
references, e.g. <literal>[1:2][1:1]</>, not <literal>[2][1:1]</>. for all dimensions, e.g., <literal>[1:2][1:1]</>, not <literal>[2][1:1]</>.
</para> </para>
<para> <para>
......
<!-- <!--
$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 PostgreSQL documentation
--> -->
...@@ -296,18 +296,20 @@ PostgreSQL documentation ...@@ -296,18 +296,20 @@ PostgreSQL documentation
<term><option>--ignore-version</></term> <term><option>--ignore-version</></term>
<listitem> <listitem>
<para> <para>
Ignore incompatible version check between Ignore version mismatch between
<application>pg_dump</application> and the database server. <application>pg_dump</application> and the database server.
</para> </para>
<para> <para>
Dumping from a server newer than <application>pg_dump</application> By default, <application>pg_dump</> will refuse to attempt
is likely fail and is disabled by default. to dump from a server that is of a newer <productname>PostgreSQL</>
Also, while <application>pg_dump</application> can dump from servers running version than <application>pg_dump</application> is. It will also
previous releases of <productname>PostgreSQL</>, some very old refuse to attempt to dump from a server that is older than the oldest
versions are not supported (currently, pre-7.0). supported version (currently, 7.0). The <option>-i</> option
Use this option if you need to override the version check, but overrides this check and forces a dump to be attempted anyway.
be prepared for <application>pg_dump</application> to fail. 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> </para>
</listitem> </listitem>
</varlistentry> </varlistentry>
......
<!-- <!--
$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 PostgreSQL documentation
--> -->
...@@ -161,12 +161,15 @@ PostgreSQL documentation ...@@ -161,12 +161,15 @@ PostgreSQL documentation
</para> </para>
<para> <para>
<application>pg_dumpall</application> can handle databases By default, <application>pg_dumpall</> will refuse to attempt
from previous releases of <productname>PostgreSQL</>, but very to dump from a server that is of a newer <productname>PostgreSQL</>
old versions are not supported anymore (currently prior to version than <application>pg_dumpall</application> is. It will also
7.0). Use this option if you need to override the version refuse to attempt to dump from a server that is older than the oldest
check (and if <application>pg_dumpall</application> then supported version (currently, 7.0). The <option>-i</> option
fails, don't say you weren't warned). 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> </para>
</listitem> </listitem>
</varlistentry> </varlistentry>
......
<!-- $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"> <refentry id="APP-PGRESTORE">
<refmeta> <refmeta>
...@@ -200,7 +200,8 @@ ...@@ -200,7 +200,8 @@
<term><option>--ignore-version</option></term> <term><option>--ignore-version</option></term>
<listitem> <listitem>
<para> <para>
Ignore database version checks. Ignore version mismatch between
<application>pg_restore</application> and the database server.
</para> </para>
</listitem> </listitem>
</varlistentry> </varlistentry>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment