Skip to content

Commit

Permalink
Fix a few typos
Browse files Browse the repository at this point in the history
  • Loading branch information
rubenk committed May 11, 2014
1 parent 36c2225 commit 8438e24
Show file tree
Hide file tree
Showing 18 changed files with 24 additions and 24 deletions.
4 changes: 2 additions & 2 deletions ChangeLog
Original file line number Diff line number Diff line change
Expand Up @@ -1632,7 +1632,7 @@

2008-07-15, Version 4.4.2
* build system: Use pkg-config to detect the upsclient library.
* collectd: Try even harder to determine the endianess of the
* collectd: Try even harder to determine the endianness of the
architecture collectd is being built on.
* disk plugin: Fix for Linux 2.4: A wrong field was used as the name
of disks.
Expand Down Expand Up @@ -1697,7 +1697,7 @@
2008-08-30, Version 4.3.4
* Build system: Improved detection of and linking with the statgrab
library.
* collectd: Portability fixes, especially to determine endianess more
* collectd: Portability fixes, especially to determine endianness more
reliable.
* Various plugins: Fix format strings.
* disk plugin: A fix for giving disks under Linux 2.4 the right names
Expand Down
2 changes: 1 addition & 1 deletion contrib/collection3/lib/Collectd/Config.pm
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ return (1);
=item B<gc_read_config> (I<$file>)
Reads the configuration from the file located at I<$file>. Returns B<true> when
successfull and B<false> otherwise.
successful and B<false> otherwise.
=cut

Expand Down
2 changes: 1 addition & 1 deletion contrib/collection3/lib/Collectd/Graph/Config.pm
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ return (1);
=item B<gc_read_config> (I<$file>)
Reads the configuration from the file located at I<$file>. Returns B<true> when
successfull and B<false> otherwise.
successful and B<false> otherwise.
=cut

Expand Down
2 changes: 1 addition & 1 deletion contrib/collection3/lib/Collectd/Graph/TypeLoader.pm
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ sub _create_object
my $module = shift;
my $obj;

# Surpress warnings and error messages caused by the eval.
# Suppress warnings and error messages caused by the eval.
local $SIG{__WARN__} = sub { return (1); print STDERR "WARNING: " . join (', ', @_) . "\n"; };
local $SIG{__DIE__} = sub { return (1); print STDERR "FATAL: " . join (', ', @_) . "\n"; };

Expand Down
2 changes: 1 addition & 1 deletion contrib/php-collection/graph.php
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ function error($code, $code_msg, $title, $msg) {
imagestring($png, 4, ceil(($w-strlen($title)*imagefontwidth(4)) / 2), 10, $title, $c_txt);
imagestring($png, 5, 60, 35, sprintf('%s [%d]', $code_msg, $code), $c_etxt);
if (function_exists('imagettfbbox') && is_file($config['error_font'])) {
// Detailled error message
// Detailed error message
$fmt_msg = makeTextBlock($msg, $errorfont, 10, $w-86);
$fmtbox = imagettfbbox(12, 0, $errorfont, $fmt_msg);
imagettftext($png, 10, 0, 55, 35+3+imagefontwidth(5)-$fmtbox[7]+$fmtbox[1], $c_txt, $errorfont, $fmt_msg);
Expand Down
4 changes: 2 additions & 2 deletions contrib/postgresql/collectd_insert.sql
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@
-- and 'values' to store the value-list identifier and the actual values
-- respectively.
--
-- The 'values' table is partitioned to improve performance and maintainance.
-- Please note that additional maintainance scripts are required in order to
-- The 'values' table is partitioned to improve performance and maintenance.
-- Please note that additional maintenance scripts are required in order to
-- keep the setup running -- see the comments below for details.
--
-- The function 'collectd_insert' may be used to actually insert values
Expand Down
4 changes: 2 additions & 2 deletions contrib/redhat/collectd.spec
Original file line number Diff line number Diff line change
Expand Up @@ -2051,15 +2051,15 @@ fi
* Sat Nov 17 2012 Ruben Kerkhof <[email protected]> 5.1.0-2
- Move perl stuff to perl_vendorlib
- Replace hardcoded paths with macros
- Remove unneccesary Requires
- Remove unnecessary Requires
- Removed .a and .la files
- Some other small cleanups

* Fri Nov 16 2012 Marc Fournier <[email protected]> 5.1.0-1
- New upstream version
- Changes to support 5.1.0
- Enabled all buildable plugins based on libraries available on EL6 + EPEL
- All plugins requiring external libraries are now shipped in seperate
- All plugins requiring external libraries are now shipped in separate
packages.
- No longer treat Java plugin as an exception, correctly set $JAVA_HOME during
the build process + ensure build deps are installed.
Expand Down
2 changes: 1 addition & 1 deletion src/battery.c
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ static const char *battery_acpi_dir = "/proc/acpi/battery";
static int battery_init (void)
{
#if HAVE_IOKIT_IOKITLIB_H || HAVE_IOKIT_PS_IOPOWERSOURCES_H
/* No init neccessary */
/* No init necessary */
/* #endif HAVE_IOKIT_IOKITLIB_H || HAVE_IOKIT_PS_IOPOWERSOURCES_H */

#elif KERNEL_LINUX
Expand Down
2 changes: 1 addition & 1 deletion src/cgroups.c
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ static int read_cpuacct_procs (const char *dirname, char const *cgroup_name,

/*
* Gets called for every file/folder in /sys/fs/cgroup/cpu,cpuacct (or
* whereever cpuacct is mounted on the system). Calls walk_directory with the
* wherever cpuacct is mounted on the system). Calls walk_directory with the
* read_cpuacct_procs callback on every folder it finds, such as "system".
*/
static int read_cpuacct_root (const char *dirname, const char *filename,
Expand Down
2 changes: 1 addition & 1 deletion src/collectd-snmp.pod
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@ traffic.
=item B<Scale> I<Value>

The gauge-values returned by the SNMP-agent are multiplied by I<Value>. This
is useful when values are transfered as a fixed point real number. For example,
is useful when values are transferred as a fixed point real number. For example,
thermometers may transfer B<243> but actually mean B<24.3>, so you can specify
a scale value of B<0.1> to correct this. The default value is, of course,
B<1.0>.
Expand Down
4 changes: 2 additions & 2 deletions src/collectd.conf.pod
Original file line number Diff line number Diff line change
Expand Up @@ -2482,7 +2482,7 @@ The following options are valid inside the B<PluginE<nbsp>mic> block:

=item B<ShowCPU> B<true>|B<false>

If enabled (the default) a sum of the CPU usage accross all cores is reported.
If enabled (the default) a sum of the CPU usage across all cores is reported.

=item B<ShowCPUCores> B<true>|B<false>

Expand Down Expand Up @@ -6368,7 +6368,7 @@ number.

=head2 Plugin C<write_riemann>

The I<write_riemann plugin> will send values to I<Riemann>, a powerfull stream
The I<write_riemann plugin> will send values to I<Riemann>, a powerful stream
aggregation and monitoring system. The plugin sends I<Protobuf> encoded data to
I<Riemann> using UDP packets.

Expand Down
4 changes: 2 additions & 2 deletions src/cpython.h
Original file line number Diff line number Diff line change
Expand Up @@ -28,15 +28,15 @@

#include <longintrepr.h>

/* These two macros are basicly Py_BEGIN_ALLOW_THREADS and Py_BEGIN_ALLOW_THREADS
/* These two macros are basically Py_BEGIN_ALLOW_THREADS and Py_BEGIN_ALLOW_THREADS
* from the other direction. If a Python thread calls a C function
* Py_BEGIN_ALLOW_THREADS is used to allow other python threads to run because
* we don't intend to call any Python functions.
*
* These two macros are used whenever a C thread intends to call some Python
* function, usually because some registered callback was triggered.
* Just like Py_BEGIN_ALLOW_THREADS it opens a block so these macros have to be
* used in pairs. They aquire the GIL, create a new Python thread state and swap
* used in pairs. They acquire the GIL, create a new Python thread state and swap
* the current thread state with the new one. This means this thread is now allowed
* to execute Python code. */

Expand Down
2 changes: 1 addition & 1 deletion src/java.c
Original file line number Diff line number Diff line change
Expand Up @@ -2436,7 +2436,7 @@ static void cjni_callback_info_destroy (void *arg) /* {{{ */

cbi = (cjni_callback_info_t *) arg;

/* This condition can occurr when shutting down. */
/* This condition can occur when shutting down. */
if (jvm == NULL)
{
sfree (cbi);
Expand Down
4 changes: 2 additions & 2 deletions src/teamspeak2.c
Original file line number Diff line number Diff line change
Expand Up @@ -439,7 +439,7 @@ static int tss2_vserver_gapl (FILE *read_fh, FILE *write_fh,
status = tss2_receive_line (read_fh, buffer, sizeof (buffer));
if (status != 0)
{
/* Set to NULL just to make sure noone uses these FHs anymore. */
/* Set to NULL just to make sure no one uses these FHs anymore. */
read_fh = NULL;
write_fh = NULL;
ERROR ("teamspeak2 plugin: tss2_receive_line failed.");
Expand Down Expand Up @@ -564,7 +564,7 @@ static int tss2_read_vserver (vserver_list_t *vserver)
status = tss2_receive_line (read_fh, buffer, sizeof (buffer));
if (status != 0)
{
/* Set to NULL just to make sure noone uses these FHs anymore. */
/* Set to NULL just to make sure no one uses these FHs anymore. */
read_fh = NULL;
write_fh = NULL;
ERROR ("teamspeak2 plugin: tss2_receive_line failed.");
Expand Down
2 changes: 1 addition & 1 deletion src/uptime.c
Original file line number Diff line number Diff line change
Expand Up @@ -241,7 +241,7 @@ static int uptime_read (void)
gauge_t uptime;
time_t elapsed;

/* calculate the ammount of time elapsed since boot, AKA uptime */
/* calculate the amount of time elapsed since boot, AKA uptime */
elapsed = time (NULL) - boottime;

uptime = (gauge_t) elapsed;
Expand Down
2 changes: 1 addition & 1 deletion src/utils_fbhash.c
Original file line number Diff line number Diff line change
Expand Up @@ -253,7 +253,7 @@ char *fbh_get (fbhash_t *h, const char *key) /* {{{ */

pthread_mutex_lock (&h->lock);

/* TODO: Checking this everytime may be a bit much..? */
/* TODO: Checking this every time may be a bit much..? */
fbh_check_file (h);

status = c_avl_get (h->tree, key, (void *) &value);
Expand Down
2 changes: 1 addition & 1 deletion src/utils_mount.h
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ char *cu_mount_checkoption(char *line, char *keyword, int full);
DESCRIPTION
The cu_mount_checkoption() function is a replacement of
char *hasmntopt(const struct mntent *mnt, const char *opt).
In fact hasmntopt() just looks for the first occurence of the
In fact hasmntopt() just looks for the first occurrence of the
characters at opt in mnt->mnt_opts. cu_mount_checkoption()
checks for the *option* keyword in line, starting at the
first character of line or after a ','.
Expand Down
2 changes: 1 addition & 1 deletion src/write_riemann.c
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ static int riemann_connect(struct riemann_host *host) /* {{{ */
}

host->flags |= F_CONNECT;
DEBUG("write_riemann plugin: got a succesful connection for: %s:%s",
DEBUG("write_riemann plugin: got a successful connection for: %s:%s",
node, service);
break;
}
Expand Down

0 comments on commit 8438e24

Please sign in to comment.