aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Lane <tgl@sss.pgh.pa.us>2011-06-20 16:27:32 -0400
committerTom Lane <tgl@sss.pgh.pa.us>2011-06-20 16:27:32 -0400
commit31e8ab4dd98dbe702df8b2029cf6e2424b12850e (patch)
tree524f8457db0faa07ab4c9b991b356634ee24cb6e
parentcd1f0d04bf06938c0ee5728fc8424d62bcf2eef3 (diff)
downloadpostgresql-31e8ab4dd98dbe702df8b2029cf6e2424b12850e.tar.gz
postgresql-31e8ab4dd98dbe702df8b2029cf6e2424b12850e.zip
Fix missed use of "cp -i" in an example, per Fujii Masao.
Also be more careful about markup: use &amp; not just &.
-rw-r--r--doc/src/sgml/backup.sgml4
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/src/sgml/backup.sgml b/doc/src/sgml/backup.sgml
index bdffb4b859e..b8daedcbb6e 100644
--- a/doc/src/sgml/backup.sgml
+++ b/doc/src/sgml/backup.sgml
@@ -579,7 +579,7 @@ tar -cf backup.tar /usr/local/pgsql/data
character in the command. The simplest useful command is something
like:
<programlisting>
-archive_command = 'test ! -f /mnt/server/archivedir/%f && cp %p /mnt/server/archivedir/%f' # Unix
+archive_command = 'test ! -f /mnt/server/archivedir/%f &amp;&amp; cp %p /mnt/server/archivedir/%f' # Unix
archive_command = 'copy "%p" "C:\\server\\archivedir\\%f"' # Windows
</programlisting>
which will copy archivable WAL segments to the directory
@@ -1213,7 +1213,7 @@ restore_command = 'cp /mnt/server/archivedir/%f %p'
<literal>on</>, and set up an <varname>archive_command</> that performs
archiving only when a <emphasis>switch file</> exists. For example:
<programlisting>
-archive_command = 'test ! -f /var/lib/pgsql/backup_in_progress || cp -i %p /var/lib/pgsql/archive/%f &lt; /dev/null'
+archive_command = 'test ! -f /var/lib/pgsql/backup_in_progress || (test ! -f /var/lib/pgsql/archive/%f &amp;&amp; cp %p /var/lib/pgsql/archive/%f)'
</programlisting>
This command will perform archiving when
<filename>/var/lib/pgsql/backup_in_progress</> exists, and otherwise