Merge branch 'PGPRO10' of gitlab.postgrespro.ru:pgpro-dev/postgrespro into PGPRO10

Author: vbwagner

doc/src/sgml/demodb-bookings.sgml

@@ -754,9 +754,9 @@ Referenced by:
    <para>
     Some fields in the demo database are available in English and Russian.
     Translations to other languages are not provided, but are easy to add.
-    The <function>bookings.lang</function> function selects the language
-    in which to display these fields, returning the value of the
-    <parameter>bookings.lang</parameter> parameter.
+    The <function>bookings.lang</function> returns the value of the
+    <parameter>bookings.lang</parameter> parameter, that is, the language
+    in which these fields will be displayed.
    </para>
 
    <para>
@@ -811,6 +811,9 @@ ALTER DATABASE demo SET bookings.lang = en;
     For other methods of settings configuration parameters,
     see <xref linkend="config-setting">.
    </para>
+
+   <para>In the examples below, the English language is selected for translatable fields.
+   </para>
   </sect2>
 
 
@@ -822,7 +825,7 @@ ALTER DATABASE demo SET bookings.lang = en;
    </para>
 
    <para>
-    The results displayed below were received on a small database version (demo_small) of August 15, 2017.
+    The results displayed below were received on a small database version (demo-small) of August 15, 2017.
     If the same queries return different data on your system,
     check your demo database version  (using the <function>bookings.now</function> function).
     Some minor deviations may be caused by the difference between your local time and Moscow time,

doc/src/sgml/installation-bin.sgml

@@ -264,7 +264,8 @@ pg-setup service start
               </entry>
               <entry>
                 <para>Shared libraries required to deploy client
-                applications; runtime libraries for ECPG processor.</para>
+                applications, including <application>libpq</application>;
+                runtime libraries for ECPG processor.</para>
               </entry>
             </row>
             <row>
@@ -496,7 +497,7 @@ pg-setup service disable
           <tbody>
            <row>
               <entry>
-                <para>RHEL 7
+                <para>RHEL 7, SLES 12.1
                 </para>
               </entry>
               <entry>
@@ -506,7 +507,7 @@ pg-setup service disable
             </row>
             <row>
               <entry>
-                <para>RHEL 6 and compatible distributions, SLES, ALT Linux 6
+                <para>RHEL 6 and compatible distributions, SLES 11, ALT Linux 6
                 </para>
               </entry>
               <entry>
@@ -539,7 +540,7 @@ systemctl enable postgrespro-std-&majorversion;.service
 <itemizedlist>
   <listitem>
     <para>
-    On RHEL 6, SLES and ALT Linux systems, use <literal>chkconfig</literal> command to add
+    On RHEL 6, SLES 11, and ALT Linux systems, use <literal>chkconfig</literal> command to add
     the <literal>postgrespro-std-&majorversion;</literal> script to the appropriate runlevel.
     See <literal>chkconfig</literal> <application>man</application> page for the exact syntax.
     </para>

doc/src/sgml/ref/pg-wrapper.sgml

@@ -115,26 +115,46 @@
     to the provided client and server programs, as well as add
     <acronym>SQL</acronym> man pages to the man page configuration file.
     </para>
-    <para>
-      If <acronym>SQL</acronym> man pages are already installed
-      from a different product, the previous installation will keep
-      its priority. For the new <acronym>SQL</acronym> documentation
-      to be displayed first, you have to modify the system configuration,
-      for example, change the <envar>MANPATH</envar> value.
-    </para>
-    <important>
-     <para>
-       If you have been using the same programs provided with
-       other products, running <application>pg-wrapper</application> may result in a conflict.
-       In this case, you can either continue using the already
-       available program version, or adjust the settings manually.
-     </para>
      <para>
-       Alternatively, you can add <filename>/opt/pgpro/std-&majorversion;/bin</filename>
-       before <filename>/usr/bin</filename> into your <envar>PATH</envar> to
-       make these programs available just for a particular user or user session.
+        For parallel installations with other <filename>PostgreSQL</filename>-based
+        products, <filename>pg-wrapper</filename> behavior depends
+        on whether the <application>update-alternatives</application> utility
+        is supported by your system and the already installed
+        <filename>PostgreSQL</filename>-based product:
+      <itemizedlist>
+        <listitem>
+          <para>
+            If <application>update-alternatives</application> is supported,
+            <filename>pg-wrapper</filename> adds symbolic links to <productname>&productname;</productname>
+            programs into the alternative system, in accordance with their priority, as well as adds
+            <acronym>SQL</acronym> man pages to the man page configuration file.
+            For details on how to change the alternatives system priorities,
+            see the man page for <application>update-alternatives</application>
+            on your system.
+          </para>
+          <para>
+            If <acronym>SQL</acronym> man pages are already installed from a different product,
+            the pages unique for the new installation will be displayed,
+            while the previous installation will keep its priority for all the coinciding
+            man pages. For the new <acronym>SQL</acronym> documentation to be displayed
+            for all pages, you have to modify the system configuration,
+            for example, change the <envar>MANPATH</envar> value.
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            If <application>update-alternatives</application> is not supported,
+            <filename>pg-wrapper</filename> updates the system configuration
+            only if there are no conflicts with any programs or man pages already installed.
+            Otherwise, <application>pg-wrapper</application> does not create or update
+            any program links and skips <acronym>SQL</acronym> man page integration. In this case,
+            you can either continue using the already available program versions and <acronym>SQL</acronym> man pages,
+            or modify the <envar>PATH</envar> and <envar>MANPATH</envar>
+            settings manually.
+          </para>
+        </listitem>
+      </itemizedlist>
      </para>
-    </important>
 
   <para>
     For details on binary installation specifics on Linux,