From: Ruben Kerkhof Date: Sun, 11 May 2014 11:17:53 +0000 (+0200) Subject: Fix a few typos X-Git-Tag: collectd-5.5.0~278^2 X-Git-Url: https://git.octo.it/?p=collectd.git;a=commitdiff_plain;h=8438e249445f2a1785f9de40a0c8da9889f0b8d1 Fix a few typos --- diff --git a/ChangeLog b/ChangeLog index 3c8128a8..8cd1579e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -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. @@ -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 diff --git a/contrib/collection3/lib/Collectd/Config.pm b/contrib/collection3/lib/Collectd/Config.pm index d20be359..a3760027 100644 --- a/contrib/collection3/lib/Collectd/Config.pm +++ b/contrib/collection3/lib/Collectd/Config.pm @@ -44,7 +44,7 @@ return (1); =item B (I<$file>) Reads the configuration from the file located at I<$file>. Returns B when -successfull and B otherwise. +successful and B otherwise. =cut diff --git a/contrib/collection3/lib/Collectd/Graph/Config.pm b/contrib/collection3/lib/Collectd/Graph/Config.pm index 42582a7e..36f8706f 100644 --- a/contrib/collection3/lib/Collectd/Graph/Config.pm +++ b/contrib/collection3/lib/Collectd/Graph/Config.pm @@ -43,7 +43,7 @@ return (1); =item B (I<$file>) Reads the configuration from the file located at I<$file>. Returns B when -successfull and B otherwise. +successful and B otherwise. =cut diff --git a/contrib/collection3/lib/Collectd/Graph/TypeLoader.pm b/contrib/collection3/lib/Collectd/Graph/TypeLoader.pm index 5a0b522b..3d6f61e3 100644 --- a/contrib/collection3/lib/Collectd/Graph/TypeLoader.pm +++ b/contrib/collection3/lib/Collectd/Graph/TypeLoader.pm @@ -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"; }; diff --git a/contrib/php-collection/graph.php b/contrib/php-collection/graph.php index b9fefa6a..fdfcbaaf 100644 --- a/contrib/php-collection/graph.php +++ b/contrib/php-collection/graph.php @@ -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); diff --git a/contrib/postgresql/collectd_insert.sql b/contrib/postgresql/collectd_insert.sql index 00c5519b..bee182cb 100644 --- a/contrib/postgresql/collectd_insert.sql +++ b/contrib/postgresql/collectd_insert.sql @@ -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 diff --git a/contrib/redhat/collectd.spec b/contrib/redhat/collectd.spec index 2379c8d5..6af91e8a 100644 --- a/contrib/redhat/collectd.spec +++ b/contrib/redhat/collectd.spec @@ -2051,7 +2051,7 @@ fi * Sat Nov 17 2012 Ruben Kerkhof 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 @@ -2059,7 +2059,7 @@ fi - 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. diff --git a/src/battery.c b/src/battery.c index 4178d8b5..691ba5d1 100644 --- a/src/battery.c +++ b/src/battery.c @@ -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 diff --git a/src/cgroups.c b/src/cgroups.c index 17b12d04..6d419722 100644 --- a/src/cgroups.c +++ b/src/cgroups.c @@ -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, diff --git a/src/collectd-snmp.pod b/src/collectd-snmp.pod index db955d69..b3085d3d 100644 --- a/src/collectd-snmp.pod +++ b/src/collectd-snmp.pod @@ -186,7 +186,7 @@ traffic. =item B I The gauge-values returned by the SNMP-agent are multiplied by I. 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>. diff --git a/src/collectd.conf.pod b/src/collectd.conf.pod index a14a8f68..f1df4b9a 100644 --- a/src/collectd.conf.pod +++ b/src/collectd.conf.pod @@ -2482,7 +2482,7 @@ The following options are valid inside the Bmic> block: =item B B|B -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 B|B @@ -6368,7 +6368,7 @@ number. =head2 Plugin C -The I will send values to I, a powerfull stream +The I will send values to I, a powerful stream aggregation and monitoring system. The plugin sends I encoded data to I using UDP packets. diff --git a/src/cpython.h b/src/cpython.h index 4b8aa721..81e580d4 100644 --- a/src/cpython.h +++ b/src/cpython.h @@ -28,7 +28,7 @@ #include -/* 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. @@ -36,7 +36,7 @@ * 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. */ diff --git a/src/java.c b/src/java.c index b69ca946..aa47f804 100644 --- a/src/java.c +++ b/src/java.c @@ -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); diff --git a/src/teamspeak2.c b/src/teamspeak2.c index 2552ad30..138b4dfa 100644 --- a/src/teamspeak2.c +++ b/src/teamspeak2.c @@ -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."); @@ -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."); diff --git a/src/uptime.c b/src/uptime.c index 064c3cee..345128da 100644 --- a/src/uptime.c +++ b/src/uptime.c @@ -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; diff --git a/src/utils_fbhash.c b/src/utils_fbhash.c index 97f21a1f..38b713e7 100644 --- a/src/utils_fbhash.c +++ b/src/utils_fbhash.c @@ -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); diff --git a/src/utils_mount.h b/src/utils_mount.h index 83f789be..bc0077f9 100644 --- a/src/utils_mount.h +++ b/src/utils_mount.h @@ -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 ','. diff --git a/src/write_riemann.c b/src/write_riemann.c index e85e9436..69fdaad3 100644 --- a/src/write_riemann.c +++ b/src/write_riemann.c @@ -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; }