Merge branch 'PGPROEE9_6' into PGPRO9_6_bug_818

Author: dmpgpro

doc/src/sgml/advanced.sgml

@@ -711,8 +711,8 @@ SELECT name, altitude
    </para>
 
    <para>
-    If you feel you need more introductory material, please visit the &productname;
-    <ulink url="http://www.postgresql.org">web site</ulink>
+    If you feel you need more introductory material, please visit the PostgreSQL
+    <ulink url="https://www.postgresql.org">web site</ulink>
     for links to more resources.
    </para>
   </sect1>

doc/src/sgml/info.sgml

@@ -27,8 +27,8 @@
     <term>Web Site</term>
     <listitem>
      <para>
-      The <productname>&productname;</productname>
-      <ulink url="http://www.postgresql.org">web site</ulink>
+      The Postgres Professional
+      <ulink url="https://www.postgrespro.com">web site</ulink>
       carries details on the latest release and other
       information to make your work or play with
       <productname>&productname;</productname> more productive.
@@ -42,7 +42,7 @@
      <para>
       The mailing lists are a good place to have your questions
       answered, to share experiences with other users, and to contact
-      the developers.  Consult the <productname>&productname;</> web site
+      the developers.  Consult the <productname>PostgreSQL</> web site
       for details.
      </para>
     </listitem>

doc/src/sgml/installation.sgml

@@ -343,18 +343,18 @@ su - postgres
   <para>
    The <productname>&productname;</> &version; sources can be obtained from the
    download section of our
-   website: <ulink url="http://www.postgresql.org/download/"></ulink>.  You
-   should get a file named <filename>postgresql-&version;.tar.gz</filename>
-   or <filename>postgresql-&version;.tar.bz2</filename>. After
+   website: <ulink url="https://postgrespro.com/products/download"></ulink>.  You
+   should get a file named <filename>postgrepro-&version;.tar.gz</filename>
+   or <filename>postgrespro-&version;.tar.bz2</filename>. After
    you have obtained the file, unpack it:
 <screen>
-<userinput>gunzip postgresql-&version;.tar.gz</userinput>
-<userinput>tar xf postgresql-&version;.tar</userinput>
+<userinput>gunzip postgrepro-&version;.tar.gz</userinput>
+<userinput>tar xf postgrepro-&version;.tar</userinput>
 </screen>
    (Use <command>bunzip2</command> instead of <command>gunzip</command> if you
    have the <filename>.bz2</filename> file.)
    This will create a directory
-   <filename>postgresql-&version;</filename> under the current directory
+   <filename>postgrepro-&version;</filename> under the current directory
    with the <productname>&productname;</> sources.
    Change into that directory for the rest
    of the installation procedure.
@@ -2004,20 +2004,6 @@ kill `cat /usr/local/pgsql/data/postmaster.pid`
  <sect1 id="supported-platforms">
   <title>Supported Platforms</title>
 
-  <para>
-   A platform (that is, a CPU architecture and operating system combination)
-   is considered supported by the <productname>&productname;</> development
-   community if the code contains provisions to work on that platform and
-   it has recently been verified to build and pass its regression tests
-   on that platform.  Currently, most testing of platform compatibility
-   is done automatically by test machines in the
-   <ulink url="http://buildfarm.postgresql.org/">&productname; Build Farm</ulink>.
-   If you are interested in using <productname>&productname;</> on a platform
-   that is not represented in the build farm, but on which the code works
-   or can be made to work, you are strongly encouraged to set up a build
-   farm member machine so that continued compatibility can be assured.
-  </para>
-
   <para>
    In general, <productname>&productname;</> can be expected to work on
    these CPU architectures: x86, x86_64, IA64, PowerPC,

doc/src/sgml/intro.sgml

@@ -301,7 +301,6 @@
 
  &history;
  &notation;
- &info;
  &problems;
 
 </preface>

doc/src/sgml/pgprobackup.sgml

@@ -340,7 +340,7 @@ doc/src/sgml/pgprobackup.sgml
     </listitem>
     <listitem>
       <para>
-        <link linkend="adding-new-backup-instance">Add a new backup instance to the backup catalog.</link>.
+        <link linkend="adding-new-backup-instance">Add a new backup instance to the backup catalog</link>.
       </para>
     </listitem>
     <listitem>
@@ -494,7 +494,7 @@ GRANT EXECUTE ON FUNCTION txid_snapshot_xmax(txid_snapshot) TO backup;
       <orderedlist numeration="arabic">
         <listitem>
           <para>
-            Grant the <link linkend="role-attributes"><literal>REPLICATION</literal> privileges</link>
+            Grant the <link linkend="role-attributes"><literal>REPLICATION</literal> privilege</link>
             to the <literal>backup</literal> role:
           </para>
           <programlisting>
@@ -762,7 +762,7 @@ pg_probackup show-config -B <replaceable>backupdir</replaceable> --instance <rep
 </programlisting>
        <para>
        Displays the contents of the <filename>pg_probackup.conf</filename>
-       configuration file located in the <filename>backupdir/<replaceable>instance_name</replaceable></filename> directory.
+       configuration file located in the <filename><replaceable>backupdir</replaceable>/backups/<replaceable>instance_name</replaceable></filename> directory.
        To edit <filename>pg_probackup.conf</filename>, use the <xref linkend="pg-probackup-set-config"> command.
        It is not allowed to edit <filename>pg_probackup.conf</filename> directly.
        </para>
@@ -801,7 +801,7 @@ pg_probackup backup -B <replaceable>backupdir</replaceable> -b <replaceable>back
        <programlisting>
 pg_probackup restore -B <replaceable>backupdir</replaceable> --instance <replaceable>instance_name</replaceable>
 [-D <replaceable>datadir</replaceable>]
-[ -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>]
+[ -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>]
 [-j <replaceable>num_threads</replaceable>] [--progress] [-q] [-v]
 </programlisting>
        <para>
@@ -905,9 +905,9 @@ pg_probackup archive-push -B <replaceable>backupdir</replaceable> --instance <re
       Stores <acronym>WAL</acronym> files in the corresponding subdirectory of the backup catalog.
       Can be set as <varname>archive_command</varname> in <filename>postgresql.conf</filename> to perform
       archive backups. In addition to copying files, this command also validates the instance by
-      <replaceable>instance_name</replaceable>, <literal>systemd ID</literal> and <literal>PGDATA</literal>.
+      <replaceable>instance_name</replaceable>, <literal>system-identifier</literal> and <literal>PGDATA</literal>.
       If parameters of the backup instance and the cluster do not match, this command will fail with the following error message:
-      <quote>Refuse to push <acronym>WAL</acronym> segment <replaceable>segment_name</replaceable> into archive. Instance parameters mismatch</quote>
+      <quote>Refuse to push <acronym>WAL</acronym> segment <replaceable>segment_name</replaceable> into archive. Instance parameters mismatch.</quote>
       For each <acronym>WAL</acronym> file moved to the backup catalog, you will see the following message in <productname>&productname;</productname> logfile:
       <quote>pg_probackup archive-push completed successfully</quote>.
        </para>
@@ -1463,15 +1463,15 @@ pg_probackup help [<replaceable>command</replaceable>]
       <term><option>--master-db=<replaceable>dbname</replaceable></></term>
       <listitem>
       <para>
-       Specifies the name of the database to connect to from the master server. The connection is used
+       Specifies the name of the database on the master server to connect to. The connection is used
        only for managing the backup process, so you can connect to any existing database.
        Can be set in the <filename>pg_probackup.conf</filename> using the <command>set-config</command> command.
        Default: <literal>postgres</literal>, the default <productname>&productname;</productname> <literal>dbname</literal>.
       </para>
       </listitem>
      </varlistentry>
      <varlistentry>
-      <term><option>--master-host= <replaceable>host</replaceable></></term>
+      <term><option>--master-host=<replaceable>host</replaceable></></term>
       <listitem>
       <para>
        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
   <title>Configuring pg_probackup</title>
   <para>Once the backup catalog is initialized and a new backup instance is added,
   you can use the <filename>pg_probackup.conf</filename> configuration file located
-  in the <filename>backup/<replaceable>instance_name</replaceable></filename> directory
+  in the <filename>backups/<replaceable>instance_name</replaceable></filename> directory
   to fine-tune <application>pg_probackup</application> configuration.
   </para>
   <para>

doc/src/sgml/sourcerepo.sgml

@@ -11,8 +11,8 @@
  </para>
 
  <para>
-  Our wiki, <ulink
-  url="http://wiki.postgresql.org/wiki/Working_with_Git"></ulink>,
+  PostgreSQL wiki, <ulink
+  url="https://wiki.postgresql.org/wiki/Working_with_Git"></ulink>,
   has some discussion on working with Git.
  </para>
 
@@ -52,7 +52,8 @@
      To begin using the Git repository, make a clone of the official mirror:
 
 <programlisting>
-git clone git://git.postgresql.org/git/postgresql.git
+git clone https://github.com/postgrespro/postgrespro.git
+
 </programlisting>
 
      This will copy the full repository to your local machine, so it may take