Fix typos, mention pg_service.conf in same breath as .pgpass

diff --git a/check_postgres.pl b/check_postgres.pl
index 8c30a9fdbfe0146bd17bcd450166e6998aedd1ed..ccaa1f25dff61dd6b916f2a66ce4234738750a04 100755 (executable)
--- a/check_postgres.pl
+++ b/check_postgres.pl
@@ -4498,11 +4498,11 @@ argument, for example:
 
   --output=simple,MB
 
-=head3 Simple output
+=head3 Cacti output
 
 The Cacti output consists of one or more items on the same line, with a simple name, a colon, and 
 then a number. At the moment, the only action with explicit Cacti output is 'dbstats', and using 
-the --output option is not needed in this case, Cacti is the only output for this action. For many 
+the --output option is not needed in this case, as Cacti is the only output for this action. For many 
 other actions, using --simple is enough to make Cacti happy.
 
 =head1 DATABASE CONNECTION OPTIONS
@@ -4538,7 +4538,7 @@ it defaults to 'postgres'.
 =item B<--dbpass=PASSWORD>
 
 Provides the password to connect to the database with. Use of this option is highly discouraged.
-Instead, one should use a .pgpass file.
+Instead, one should use a .pgpass or pg_service.conf file.
 
 =item B<--dbservice=NAME>
 
@@ -4722,7 +4722,7 @@ given. This choice does not use the B<max_connections> setting. Second, the
 percentage of available connections can be given. Third, a negative number can 
 be given which represents the number of connections left until B<max_connections> 
 is reached. The default values for I<--warning> and I<--critical> are '90%' and '95%'.
-You can also filter the databases by use of the <--include> and I<--exclude> options.
+You can also filter the databases by use of the I<--include> and I<--exclude> options.
 See the L</"BASIC FILTERING"> section for more details.
 
 To view only non-idle processes, you can use the I<--noidle> argument. Note that the 
@@ -5205,14 +5205,14 @@ Example 2: Give a critical if there are no active LISTEN requests matching 'grim
   check_postgres_listener --db oskar --critical=~grimm
 
 For MRTG output, returns a 1 or a 0 on the first, indicating success or failure. The name of the notice must 
-be provided via the <--mrtg> option.
+be provided via the I<--mrtg> option.
 
 =head2 B<locks>
 
 (C<symlink: check_postgres_locks>) Check the total number of locks on one or more databases. There is no 
 need to run this more than once per database cluster. Databases can be filtered 
 with the I<--include> and I<--exclude> options. See the L</"BASIC FILTERING"> section 
-for more details. 
+for more details.
 
 The I<--warning> and I<--critical> options can be specified as simple numbers, 
 which represent the total number of locks, or they can be broken down by type of lock. 

diff --git a/check_postgres.pl.html b/check_postgres.pl.html
index 3c04f6459323d7e194e5e1569dfa7cf49a3fadca..c6ec590cb20554b2bfeff585ca3a7f112012047e 100644 (file)
--- a/check_postgres.pl.html
+++ b/check_postgres.pl.html
@@ -25,7 +25,7 @@
                        <li><a href="#nagios_output">Nagios output</a></li>
                        <li><a href="#mrtg_output">MRTG output</a></li>
                        <li><a href="#simple_output">Simple output</a></li>
-                       <li><a href="#simple_output">Simple output</a></li>
+                       <li><a href="#cacti_output">Cacti output</a></li>
                </ul>
 
        </ul>
@@ -190,7 +190,7 @@ argument, for example:</p>
 <h3><a name="simple_output">Simple output</a></h3>
 <p>The Cacti output consists of one or more items on the same line, with a simple name, a colon, and 
 then a number. At the moment, the only action with explicit Cacti output is 'dbstats', and using 
-the --output option is not needed in this case, Cacti is the only output for this action. For many 
+the --output option is not needed in this case, as Cacti is the only output for this action. For many 
 other actions, using --simple is enough to make Cacti happy.</p>
 <p>
 </p>
@@ -230,7 +230,7 @@ it defaults to 'postgres'.</p>
 
 <dd>
 <p>Provides the password to connect to the database with. Use of this option is highly discouraged.
-Instead, one should use a .pgpass file.</p>
+Instead, one should use a .pgpass of pg_service.conf file.</p>
 </dd>
 <dt><strong><a name="item__2d_2ddbservice_3dname"><strong>--dbservice=NAME</strong></a></strong></dt>
 
@@ -421,7 +421,7 @@ given. This choice does not use the <strong>max_connections</strong> setting. Se
 percentage of available connections can be given. Third, a negative number can 
 be given which represents the number of connections left until <strong>max_connections</strong> 
 is reached. The default values for <em>--warning</em> and <em>--critical</em> are '90%' and '95%'.
-You can also filter the databases by use of the &lt;--include&gt; and <em>--exclude</em> options.
+You can also filter the databases by use of the <em>--include</em> and <em>--exclude</em> options.
 See the <a href="#basic_filtering">BASIC FILTERING</a> section for more details.</p>
 <p>To view only non-idle processes, you can use the <em>--noidle</em> argument. Note that the 
 user you are connecting as must be a superuser for this to work properly.</p>
@@ -814,7 +814,7 @@ check.</p>
 <pre>
   check_postgres_listener --db oskar --critical=~grimm</pre>
 <p>For MRTG output, returns a 1 or a 0 on the first, indicating success or failure. The name of the notice must 
-be provided via the &lt;--mrtg&gt; option.</p>
+be provided via the <em>--mrtg</em> option.</p>
 <p>
 </p>
 <h2><a name="locks"><strong>locks</strong></a></h2>