Skip to content

Commit

Permalink
Merge pull request #807 from ka7/feature/spelling
Browse files Browse the repository at this point in the history
spelling fixes
  • Loading branch information
ssm committed Apr 14, 2017
2 parents b11b722 + 3fff4fd commit d17d409
Show file tree
Hide file tree
Showing 51 changed files with 110 additions and 110 deletions.
108 changes: 54 additions & 54 deletions ChangeLog

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion Makefile
Expand Up @@ -5,7 +5,7 @@
# In the interest of keeping this Makefile simple, it does not attempt to provide the flexibility
# provided by using Build.PL directly. (See perldoc Module::Build).

# Defaults/paths. Allows $(CONFIG) to be overrided by
# Defaults/paths. Allows $(CONFIG) to be overridden by
# make command line
DEFAULTS = Makefile.config
CONFIG = Makefile.config
Expand Down
2 changes: 1 addition & 1 deletion README.HP-UX
@@ -1,5 +1,5 @@
There is a somewhat ragged set of contributed HP-UX specific plugins
requiering various licenses. We hope for further contributions to
requiring various licenses. We hope for further contributions to
make the HP-UX support more complete.

Please note that Makefile.config needs editing almost at the very end
Expand Down
2 changes: 1 addition & 1 deletion contrib/munin-mergedb.pl
Expand Up @@ -58,7 +58,7 @@ ()
next if (/^[[:space:]]*#/); # comment
next if (/^[[:space:]]*$/); # empty line
unless (/^[[:space:]]*([^[:space:]]+)[[:space:]]+([^[:space:]]+)[[:space:]]*$/) {
die "$.: Unrecogized line format\n";
die "$.: Unrecognized line format\n";
}
my ($key, $value) = ($1, $2);
if (not defined $config_type->{$key}) {
Expand Down
2 changes: 1 addition & 1 deletion contrib/munin-node-debug
Expand Up @@ -78,7 +78,7 @@ Options:
Can be relative to now if negative [-3600]
-d --dump Only dump a generated munin.conf part [no]
--debug Print debug informations [no]
--debug Print debug information [no]
};
exit 0;
Expand Down
2 changes: 1 addition & 1 deletion contrib/plugin-gallery/www/static/css/style-doc.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion contrib/plugin-gallery/www/static/css/style-doc.scss
Expand Up @@ -2,7 +2,7 @@
* CSS file included in each generated HTML doc file
*
* IMPORTANT: please do not edit neither style.css nor _responsive files.
* We're using SASS to maintain styling, so your changes would be overriden.
* We're using SASS to maintain styling, so your changes would be overridden.
* Please edit the style.scss file instead, and use a sass compiler.
* Learn more about SASS: http://sass-lang.com/guide
*
Expand Down
2 changes: 1 addition & 1 deletion contrib/plugin-gallery/www/static/css/style.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion contrib/plugin-gallery/www/static/css/style.scss
@@ -1,6 +1,6 @@
/**
* IMPORTANT: please do not edit neither style.css nor _responsive files.
* We're using SASS to maintain styling, so your changes would be overriden.
* We're using SASS to maintain styling, so your changes would be overridden.
* Please edit the style.scss file instead, and use a sass compiler.
* Learn more about SASS: http://sass-lang.com/guide
*
Expand Down
2 changes: 1 addition & 1 deletion doc/example/index.rst
Expand Up @@ -25,6 +25,6 @@ Examples of munin and related configuration are gathered here.
Examples from Munin Wiki
------------------------

These should be checked against recent Munin versions and be transfered to the Munin-Guide.
These should be checked against recent Munin versions and be transferred to the Munin-Guide.

- `Loaning data from other graphs <http://munin-monitoring.org/wiki/LoaningData>`_
2 changes: 1 addition & 1 deletion doc/example/service/linux/cron/munin-node
Expand Up @@ -5,7 +5,7 @@
MAILTO=root

# If the APT plugin is enabled, update packages databases approx. once
# an hour (12 invokations an hour, 1 in 12 chance that the update will
# an hour (12 invocations an hour, 1 in 12 chance that the update will
# happen), but ensure that there will never be more than two hour (7200
# seconds) interval between updates..
*/5 * * * * root [ -x /etc/munin/plugins/apt ] && /etc/munin/plugins/apt update 7200 12 >/dev/null
2 changes: 1 addition & 1 deletion doc/example/tips/multimaster.rst
Expand Up @@ -33,7 +33,7 @@ to have **all** nodes in groups.
Overview
========

Munin-Master runs differents scripts via the cron script (munin-cron).
Munin-Master runs different scripts via the cron script (munin-cron).

``munin-update``
is the only part actually connecting to the nodes. It gathers
Expand Down
2 changes: 1 addition & 1 deletion doc/preface/index.rst
Expand Up @@ -32,7 +32,7 @@ hyperlinking abilities of modern documentation readers.
*This is the part you are currently reading.*

It focus on very generic
informations about Munin, and also gives some guidelines on how to
information about Munin, and also gives some guidelines on how to
interact with the Munin ecosystem.

**Every Munin user should read this.**
Expand Down
4 changes: 2 additions & 2 deletions doc/preface/moreinfo.rst
Expand Up @@ -14,7 +14,7 @@ Munin Guide

These are the pages you are currently reading. It is aimed at the first read.
The chapters are designed as a walk-through of Munin's components in a very guided
manner. Its read constitutes the **basis** of every documention available.
manner. Its read constitutes the **basis** of every documentation available.
Specially when asking live (IRC_, mailing-lists_) channels, users there will
expect that you read the Guide prior to asking.

Expand Down Expand Up @@ -140,7 +140,7 @@ lives, families and jobs to deal with also.

You are more than welcome to just hang out, and while we don't mind
the occational intrusion of the real world into the flow, keep it
mostly on topic, and dont paste random links unless they are *really*
mostly on topic, and don't paste random links unless they are *really*
spectacular and intelligent.

Note that ``m-r-b`` is our beloved ``munin-relay-bot`` that bridges the
Expand Down
2 changes: 1 addition & 1 deletion doc/tutorial/alert.rst
Expand Up @@ -266,7 +266,7 @@ The ``${var:value}`` variables get the correct values from munin-limits prior to

Then, the ``${var:*range}`` variables are set from {fieldname}.warning and {fieldname}.critical.

Based on those, ``{fieldname}.label`` occurences where warning or critical levels are breached
Based on those, ``{fieldname}.label`` occurrences where warning or critical levels are breached
or unknown are summarized into the ``${var:*fields}`` variables.

.. _alert_variables_example_usage:
Expand Down
2 changes: 1 addition & 1 deletion doc/tutorial/troubleshooting.rst
Expand Up @@ -78,7 +78,7 @@ Debugging Plugins
Which plugins are enabled on the node?
--------------------------------------

Does :ref:`munin-node` recognize any plugins? Try issuing the command ``list`` (beeing connected to the agent) and a (long) list of plugins should show.
Does :ref:`munin-node` recognize any plugins? Try issuing the command ``list`` (being connected to the agent) and a (long) list of plugins should show.

::

Expand Down
4 changes: 2 additions & 2 deletions lib/Munin/Master/Graph.pm
Expand Up @@ -302,7 +302,7 @@ sub handle_request
# - reduce the size of the CGI part, which is good for
# security (& sometimes performances)

# Fields inherit this field from their plugin, if not overrided
# Fields inherit this field from their plugin, if not overridden
$_printf = $graph_printf unless defined $_printf;
$_printf .= "%s";

Expand Down Expand Up @@ -372,7 +372,7 @@ sub handle_request

# Handle an eventual cdef
if ($_rrdcdef) {
# Populate the CDEF dictionnary, to be able to swosh it at the end.
# Populate the CDEF dictionary, to be able to swosh it at the end.
# As it will enable to solve inter-field CDEFs.
$rrd_cdefs{$_rrdname}->{_rrdcdef} = $_rrdcdef;
$rrd_cdefs{$_rrdname}->{real_rrdname} = $real_rrdname;
Expand Down
2 changes: 1 addition & 1 deletion lib/Munin/Master/HTML.pm
Expand Up @@ -270,7 +270,7 @@ sub handle_request

my $sth_cat;
if ($category eq 'other') {
# account for those that explictly mention 'other' as category
# account for those that explicitly mention 'other' as category
$sth_cat = $dbh->prepare_cached(
"SELECT DISTINCT s.name, s.service_title FROM service s
LEFT JOIN service_categories sc ON s.id = sc.id
Expand Down
2 changes: 1 addition & 1 deletion lib/Munin/Master/Update.pm
Expand Up @@ -618,7 +618,7 @@ sub _dump_into_sql {

my $rrd_file_type = lc(substr($ds_type, 0, 1));
my $rrd_file = "$rrdfile_prefix-$rrd_file_type.rrd";
my $rrd_field = "42"; # TODO - This could be overriden
my $rrd_field = "42"; # TODO - This could be overridden

# Insert RRD specific attributes
$sth_ds_attr->execute($ds_id, "rrd:file", $rrd_file);
Expand Down
2 changes: 1 addition & 1 deletion lib/Munin/Master/Utils.pm
Expand Up @@ -837,7 +837,7 @@ sub munin_readconfig_part {
my @stat = stat($filename);
if ($config_parts->{$what}{timestamp} < $stat[9]) {
# could use _raw if we wanted to read non-storable fallback
$config_parts->{$what}{config} = undef; # Unalloc RAM for old config, since it will be overriden anyway.
$config_parts->{$what}{config} = undef; # Unalloc RAM for old config, since it will be overridden anyway.
$part = munin_readconfig_storable($filename);
$config_parts->{$what}{timestamp} = $stat[9];
$doupdate = 1;
Expand Down
4 changes: 2 additions & 2 deletions lib/Munin/Node/Service.pm
Expand Up @@ -97,7 +97,7 @@ sub prepare_plugin_environment
# LC_ALL should be enough, but some plugins don't follow specs (#1014)
$ENV{LANG} = 'C';

# PATH should be *very* sane by default. Can be overrided via
# PATH should be *very* sane by default. Can be overridden via
# config file if needed (Closes #863 and #1128).
$ENV{PATH} = '/usr/sbin:/usr/bin:/sbin:/bin';

Expand Down Expand Up @@ -276,7 +276,7 @@ sub _service_command

if ($sconf->{$service}{command}) {
for my $t (@{ $sconf->{$service}{command} }) {
# Unfortunately, every occurence of %c will be expanded,
# Unfortunately, every occurrence of %c will be expanded,
# even if we want to pass it unmodified to the target command,
# because we parse the original string during the config
# parsing step, at which we do not yet know the
Expand Down
2 changes: 1 addition & 1 deletion lib/Munin/Plugin/Framework.pm
Expand Up @@ -21,7 +21,7 @@

=head1 NAME
Munin::Plugin::Framwork - Framework for Munin Perl plugins
Munin::Plugin::Framework - Framework for Munin Perl plugins
=head1 SYNOPSIS
Expand Down
2 changes: 1 addition & 1 deletion lib/Munin/Plugin/Pgsql.pm
Expand Up @@ -209,7 +209,7 @@ by 'configquery'.
The size of the array should match the number of defined counters. If 'stack'
parameter is in use, then only first element of array will be used for the first
counter and the remaining ones will be overidden by 'STACK'.
counter and the remaining ones will be overridden by 'STACK'.
=cut

Expand Down
2 changes: 1 addition & 1 deletion lib/Munin/Plugin/SNMP.pm
Expand Up @@ -491,7 +491,7 @@ sub get_single {
return $response->{$oid};
}

=head2 get_by_regex() - Retrive table of values filtered by regex applied to the value
=head2 get_by_regex() - Retrieve table of values filtered by regex applied to the value
This example shows the usage for a netstat plugin.
Expand Down
2 changes: 1 addition & 1 deletion plugins/node.d.aix/memory
Expand Up @@ -33,7 +33,7 @@ space being used. It uses /usr/bin/svmon, /usr/sbin/lsps, and
=head2 RESTRICTIONS
/usr/bin/svmon can only be executed by root. The other commands
(lsps, lsattr) should be executable by everyone be defualt.
(lsps, lsattr) should be executable by everyone be default.
=head1 MAGIC MARKERS
Expand Down
2 changes: 1 addition & 1 deletion plugins/node.d.aix/processes
Expand Up @@ -14,7 +14,7 @@ No configuration
=head2 DESCRIPTION
This will report back the number of processes currently running on a
server. By defualt it will report back the total number of processes
server. By default it will report back the total number of processes
running (global). Optionally you can edit the script and add items to
look for to the "lookFor" array. These should be simple things that
can be grep'd for.
Expand Down
2 changes: 1 addition & 1 deletion plugins/node.d.darwin/load
Expand Up @@ -38,7 +38,7 @@ Unknownl LICENSE
=cut

# If run with the "autoconf"-parameter, give our opinion on whether we
# should be run on this system or not. This is optinal, and only used by
# should be run on this system or not. This is optional, and only used by
# munin-config. In the case of this plugin, we should most probably
# always be included.

Expand Down
2 changes: 1 addition & 1 deletion plugins/node.d.freebsd/load
Expand Up @@ -100,4 +100,4 @@ echo -n "load.value "
# Except for the Nagios-warnings (which most people don't have any need
# for) and things used by installation scripts and munin-config (which
# you don't need if you don't plan on submitting your plugin to the
# pacakge), the two versions will work identically.
# package), the two versions will work identically.
2 changes: 1 addition & 1 deletion plugins/node.d.linux/df_abs
Expand Up @@ -12,7 +12,7 @@ The following configuration parameters are used by this plugin
[df_abs]
env.exclude - space separated list of file system types to exclude
env.exclude_re - space separated regex list of devices or mount points to exlcude
env.exclude_re - space separated regex list of devices or mount points to exclude
env.warning - Warning percentage
env.critical - Critical percentage
env.total - Enable/Disable graph total [on|off]
Expand Down
2 changes: 1 addition & 1 deletion plugins/node.d.linux/diskstats
Expand Up @@ -45,7 +45,7 @@ if ( defined $ARGV[0] && $ARGV[0] eq 'config' ) {
my ( $prev_time, %prev_diskstats );
eval {
# Using eval, if it breaks while retrieve, $R is still undef.
# No need to unlink() it, since it will be overriden anyway.
# No need to unlink() it, since it will be overridden anyway.
( $prev_time, %prev_diskstats ) = choose_old_state();
};

Expand Down
2 changes: 1 addition & 1 deletion plugins/node.d.linux/iostat_ios
Expand Up @@ -212,7 +212,7 @@ sub get_state {
return(undef) unless ( -r STATEFILE);
eval {
# Using eval, if it breaks while retrieve, $R is still undef.
# No need to unlink() it, since it will be overriden anyway.
# No need to unlink() it, since it will be overridden anyway.
$R = retrieve( STATEFILE );
};
return($R);
Expand Down
2 changes: 1 addition & 1 deletion plugins/node.d.linux/port_
Expand Up @@ -20,7 +20,7 @@ a numeric port number.
=head1 BUGS
The plugin doesnt count the tcp6 connections if tcp and tcp6 is used.
The plugin doesn't count the tcp6 connections if tcp and tcp6 is used.
=head1 AUTHOR
Expand Down
2 changes: 1 addition & 1 deletion plugins/node.d.linux/vserver_resources
Expand Up @@ -143,7 +143,7 @@ common vserver plugin code into Munin::Plugin::Linux::Vserver?
=item Multigraph
make it so you can specify more than one resource to be graphed?
Alternatively define combined ressource-display: VM+RSS+ANON+SHM and
Alternatively define combined resource-display: VM+RSS+ANON+SHM and
FILES+OFD+LOCK+SOCK (for one vserver only), and/or make it so you can
graph all resources for one vserver
Expand Down
4 changes: 2 additions & 2 deletions plugins/node.d.netbsd/load
Expand Up @@ -28,7 +28,7 @@


# If run with the "autoconf"-parameter, give our opinion on whether we
# should be run on this system or not. This is optinal, and only used by
# should be run on this system or not. This is optional, and only used by
# munin-config. In the case of this plugin, we should most probably
# always be included.

Expand Down Expand Up @@ -119,4 +119,4 @@ echo -n "load.value "
# Except for the Nagios-warnings (which most people don't have any need
# for) and things used by installation scripts and munin-config (which
# you don't need if you don't plan on submitting your plugin to the
# pacakge), the two versions will work identically.
# package), the two versions will work identically.
2 changes: 1 addition & 1 deletion plugins/node.d.openbsd/load
Expand Up @@ -100,4 +100,4 @@ echo -n "load.value "
# Except for the Nagios-warnings (which most people don't have any need
# for) and things used by installation scripts and munin-config (which
# you don't need if you don't plan on submitting your plugin to the
# pacakge), the two versions will work identically.
# package), the two versions will work identically.
2 changes: 1 addition & 1 deletion plugins/node.d/courier_mta_mailvolume
Expand Up @@ -9,7 +9,7 @@ delivered by courier-mta
=head1 CONFIGURATION
The following environent variables are used by this plugin:
The following environment variables are used by this plugin:
logdir - Where to find logfiles
logfile - What file to read in logdir
Expand Down
2 changes: 1 addition & 1 deletion plugins/node.d/jenkins_builds
Expand Up @@ -12,7 +12,7 @@ Contributed by Holger Levsen. I wrote and used them first for
https://jenkins.debian.net and very much like to hear about
other users of these plugins! Please do tell me!
Use at your own risk and monitor the ressource usage of the plugins
Use at your own risk and monitor the resource usage of the plugins
too - it will vary depending on your setup!
Patches, postcards and pancakes are all very much welcome!
Expand Down
2 changes: 1 addition & 1 deletion plugins/node.d/jenkins_builds_results
Expand Up @@ -12,7 +12,7 @@ Contributed by Holger Levsen. I wrote and used them first for
https://jenkins.debian.net and very much like to hear about
other users of these plugins! Please do tell me!
Use at your own risk and monitor the ressource usage of the plugins
Use at your own risk and monitor the resource usage of the plugins
too - it will vary depending on your setup!
Patches, postcards and pancakes are all very much welcome!
Expand Down
2 changes: 1 addition & 1 deletion plugins/node.d/jenkins_builds_results_summary
Expand Up @@ -12,7 +12,7 @@ Contributed by Holger Levsen. I wrote and used them first for
https://jenkins.debian.net and very much like to hear about
other users of these plugins! Please do tell me!
Use at your own risk and monitor the ressource usage of the plugins
Use at your own risk and monitor the resource usage of the plugins
too - it will vary depending on your setup!
Patches, postcards and pancakes are all very much welcome!
Expand Down
2 changes: 1 addition & 1 deletion plugins/node.d/jenkins_builds_running
Expand Up @@ -12,7 +12,7 @@ Contributed by Holger Levsen. I wrote and used them first for
https://jenkins.debian.net and very much like to hear about
other users of these plugins! Please do tell me!
Use at your own risk and monitor the ressource usage of the plugins
Use at your own risk and monitor the resource usage of the plugins
too - it will vary depending on your setup!
Patches, postcards and pancakes are all very much welcome!
Expand Down
2 changes: 1 addition & 1 deletion plugins/node.d/jenkins_jobs
Expand Up @@ -12,7 +12,7 @@ Contributed by Holger Levsen. I wrote and used them first for
https://jenkins.debian.net and very much like to hear about
other users of these plugins! Please do tell me!
Use at your own risk and monitor the ressource usage of the plugins
Use at your own risk and monitor the resource usage of the plugins
too - it will vary depending on your setup!
Patches, postcards and pancakes are all very much welcome!
Expand Down
2 changes: 1 addition & 1 deletion plugins/node.d/munin_update
Expand Up @@ -12,7 +12,7 @@ Munin master servers.
=head1 CONFIGURATION
Normaly needs no configuration. You may configure it with the
Normally needs no configuration. You may configure it with the
following parameter:
[munin*]
Expand Down

0 comments on commit d17d409

Please sign in to comment.