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

dmpgpro · dmpgpro · commit c84b97fd4111 · 2017-03-20T12:41:09.000+03:00
diff --git a/doc/src/sgml/aqo.sgml b/doc/src/sgml/aqo.sgml
@@ -44,7 +44,7 @@ shared_preload_libraries = 'aqo'
           Create the <filename>aqo</filename> extension using the following query:
         </para>
         <programlisting>
-&quot;CREATE EXTENSION aqo;&quot;
+CREATE EXTENSION aqo;
 </programlisting>
       </listitem>
     </orderedlist>
@@ -231,7 +231,7 @@ SELECT * FROM aqo_queries;
 
 SET aqo.mode='intelligent';
 SELECT * FROM a, b WHERE a.id=b.id;
-SET aqo.mode='manual';
+SET aqo.mode='controlled';
 
  -- Disable auto_tuning, enable both learn_aqo and use_aqo 
  -- for this query type:
@@ -325,7 +325,7 @@ UPDATE aqo_queries SET use_aqo=false, learn_aqo=false, auto_tuning=false;
      <entry>Optimizes all queries together, regardless of the query type.</entry>
     </row>
     <row>
-     <entry><literal>manual</literal></entry>
+     <entry><literal>controlled</literal></entry>
      <entry><emphasis role="strong">Default.</emphasis> Uses the default planner for all new queries, but can reuse the collected statistics for already known query types, if any.</entry>
     </row>
     <row>
@@ -424,7 +424,7 @@ UPDATE aqo_queries SET use_aqo=false, learn_aqo=false, auto_tuning=false;
               intelligent mode. In other modes, new queries are not
               appended to <structname>aqo_queries</structname> automatically.
               You can change this behavior by setting the
-              <literal>auto_tuning</literal> variable to TRUE.</entry>
+              <literal>auto_tuning</literal> variable to <literal>true</literal>.</entry>
     </row>
    </tbody>
   </tgroup>
diff --git a/doc/src/sgml/mamonsu.sgml b/doc/src/sgml/mamonsu.sgml
@@ -52,15 +52,15 @@
     <para>
       To use <filename>mamonsu</filename>, you must have a <filename>zabbix</filename> account and a <filename>zabbix</filename> server set up, and install the
       <filename>zabbix</filename> agent on the system you are going to monitor.</para>
-      <para>Pre-built <filename>mamonsu</filename> packages are
-      provided together with <productname>&productname;</productname>, but have a
+      <para>A pre-built <filename>mamonsu</filename> package is provided together with 
+      <productname>&productname;</productname>, but has a
       separate installer. Once you have installed both <productname>&productname;</productname> and <filename>mamonsu</filename>, complete the following
       steps to set up metrics collection:
     </para>
     <orderedlist>
       <listitem>
         <para>
-          If you are starting from scratch, configure your <productname>&productname;</productname> instance and intialize a new database. For details, see
+          If you are starting from scratch, configure your <productname>&productname;</productname> instance and initialize a new database. For details, see
           <xref linkend="creating-cluster">.
         </para>
       </listitem>
@@ -90,7 +90,7 @@ mamonsu bootstrap --host <replaceable>host_ip</replaceable> --dbname <replaceabl
         <para>Set the <varname>ZABBIX_USER</varname> and <varname>ZABBIX_PASSWD</varname> variables to the login and password of your <filename>zabbix</filename> account, respectively.</para>
         </listitem>
         <listitem>
-        <para>Set the <varname>ZABBIX_URL</varname> to <literal>'http://zabbix/'</literal></para>
+        <para>Set the <varname>ZABBIX_URL</varname> to <literal>http://zabbix/</literal></para>
         </listitem>
         </itemizedlist>
         <para>
@@ -110,7 +110,7 @@ mamonsu bootstrap --host <replaceable>host_ip</replaceable> --dbname <replaceabl
       <listitem>
         <para>
           Configure <filename>zabbix</filename>-related settings. You must
-          set <varname>address</varname>to the <filename>zabbix</filename> server address and specify the name of the <filename>zabbix</filename> host that will receive the collected metrics. You can find the hosts available for your account in the <filename>zabbix</filename> web interface under <emphasis role="srong"><guimenu>Configuration</guimenu></emphasis> > <emphasis role="srong"><guimenu>Hosts</guimenu></emphasis>. 
+          set <varname>address</varname> to the <filename>zabbix</filename> server address and specify the name of the <filename>zabbix</filename> host that will receive the collected metrics. You can find the hosts available for your account in the <filename>zabbix</filename> web interface under <emphasis role="srong"><guimenu>Configuration</guimenu></emphasis> > <emphasis role="srong"><guimenu>Hosts</guimenu></emphasis>. 
         </para>
     <programlisting>
 [zabbix]
@@ -236,7 +236,7 @@ mamonsu report
     <para>
       Based on the hardware information, <filename>mamonsu</filename>
       enables you to make a generic optimization for your system and the
-      <productname>PostgreSQL</productname> instance:
+      <productname>&productname;</productname> instance:
     </para>
     <programlisting>
 mamonsu tune
