Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit e8019cd

Browse files
author
Liudmila Mantrova
committed
DOC: bug fix in probackup docs
1 parent 8996151 commit e8019cd

File tree

1 file changed

+9
-9
lines changed

1 file changed

+9
-9
lines changed

doc/src/sgml/pgprobackup.sgml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -340,7 +340,7 @@ doc/src/sgml/pgprobackup.sgml
340340
</listitem>
341341
<listitem>
342342
<para>
343-
<link linkend="adding-new-backup-instance">Add a new backup instance to the backup catalog.</link>.
343+
<link linkend="adding-new-backup-instance">Add a new backup instance to the backup catalog</link>.
344344
</para>
345345
</listitem>
346346
<listitem>
@@ -494,7 +494,7 @@ GRANT EXECUTE ON FUNCTION txid_snapshot_xmax(txid_snapshot) TO backup;
494494
<orderedlist numeration="arabic">
495495
<listitem>
496496
<para>
497-
Grant the <link linkend="role-attributes"><literal>REPLICATION</literal> privileges</link>
497+
Grant the <link linkend="role-attributes"><literal>REPLICATION</literal> privilege</link>
498498
to the <literal>backup</literal> role:
499499
</para>
500500
<programlisting>
@@ -762,7 +762,7 @@ pg_probackup show-config -B <replaceable>backupdir</replaceable> --instance <rep
762762
</programlisting>
763763
<para>
764764
Displays the contents of the <filename>pg_probackup.conf</filename>
765-
configuration file located in the <filename>backupdir/<replaceable>instance_name</replaceable></filename> directory.
765+
configuration file located in the <filename><replaceable>backupdir</replaceable>/backups/<replaceable>instance_name</replaceable></filename> directory.
766766
To edit <filename>pg_probackup.conf</filename>, use the <xref linkend="pg-probackup-set-config"> command.
767767
It is not allowed to edit <filename>pg_probackup.conf</filename> directly.
768768
</para>
@@ -801,7 +801,7 @@ pg_probackup backup -B <replaceable>backupdir</replaceable> -b <replaceable>back
801801
<programlisting>
802802
pg_probackup restore -B <replaceable>backupdir</replaceable> --instance <replaceable>instance_name</replaceable>
803803
[-D <replaceable>datadir</replaceable>]
804-
[ -i <replaceable>backup_id</replaceable> | [{--time=<replaceable>time</replaceable> | --xid=<replaceable>xid</replaceable> } [--inclusive=<replaceable>boolean</replaceable>]]][--timeline=<replaceable>timeline</replaceable>] [-T OLDDIR=<replaceable>NEWDIR</replaceable>]
804+
[ -i <replaceable>backup_id</replaceable> | [{--time=<replaceable>time</replaceable> | --xid=<replaceable>xid</replaceable> } [--inclusive=<replaceable>boolean</replaceable>]]][--timeline=<replaceable>timeline</replaceable>] [-T <replaceable class="parameter">OLDDIR=NEWDIR</replaceable>]
805805
[-j <replaceable>num_threads</replaceable>] [--progress] [-q] [-v]
806806
</programlisting>
807807
<para>
@@ -905,9 +905,9 @@ pg_probackup archive-push -B <replaceable>backupdir</replaceable> --instance <re
905905
Stores <acronym>WAL</acronym> files in the corresponding subdirectory of the backup catalog.
906906
Can be set as <varname>archive_command</varname> in <filename>postgresql.conf</filename> to perform
907907
archive backups. In addition to copying files, this command also validates the instance by
908-
<replaceable>instance_name</replaceable>, <literal>systemd ID</literal> and <literal>PGDATA</literal>.
908+
<replaceable>instance_name</replaceable>, <literal>system-identifier</literal> and <literal>PGDATA</literal>.
909909
If parameters of the backup instance and the cluster do not match, this command will fail with the following error message:
910-
<quote>Refuse to push <acronym>WAL</acronym> segment <replaceable>segment_name</replaceable> into archive. Instance parameters mismatch</quote>
910+
<quote>Refuse to push <acronym>WAL</acronym> segment <replaceable>segment_name</replaceable> into archive. Instance parameters mismatch.</quote>
911911
For each <acronym>WAL</acronym> file moved to the backup catalog, you will see the following message in <productname>&productname;</productname> logfile:
912912
<quote>pg_probackup archive-push completed successfully</quote>.
913913
</para>
@@ -1463,15 +1463,15 @@ pg_probackup help [<replaceable>command</replaceable>]
14631463
<term><option>--master-db=<replaceable>dbname</replaceable></></term>
14641464
<listitem>
14651465
<para>
1466-
Specifies the name of the database to connect to from the master server. The connection is used
1466+
Specifies the name of the database on the master server to connect to. The connection is used
14671467
only for managing the backup process, so you can connect to any existing database.
14681468
Can be set in the <filename>pg_probackup.conf</filename> using the <command>set-config</command> command.
14691469
Default: <literal>postgres</literal>, the default <productname>&productname;</productname> <literal>dbname</literal>.
14701470
</para>
14711471
</listitem>
14721472
</varlistentry>
14731473
<varlistentry>
1474-
<term><option>--master-host= <replaceable>host</replaceable></></term>
1474+
<term><option>--master-host=<replaceable>host</replaceable></></term>
14751475
<listitem>
14761476
<para>
14771477
Specifies the host name of the system on which the master server is running.
@@ -1778,7 +1778,7 @@ pg_probackup backup -B <replaceable>backupdir</replaceable> --instance <replacea
17781778
<title>Configuring pg_probackup</title>
17791779
<para>Once the backup catalog is initialized and a new backup instance is added,
17801780
you can use the <filename>pg_probackup.conf</filename> configuration file located
1781-
in the <filename>backup/<replaceable>instance_name</replaceable></filename> directory
1781+
in the <filename>backups/<replaceable>instance_name</replaceable></filename> directory
17821782
to fine-tune <application>pg_probackup</application> configuration.
17831783
</para>
17841784
<para>

0 commit comments

Comments
 (0)