From 161085f10921399944e2a95a6aa45ee5b25a969c Mon Sep 17 00:00:00 2001 From: Sebastian Harl Date: Sun, 24 Jan 2010 14:42:13 +0100 Subject: [PATCH] patches: Added typo_fixes.dpatch. MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit …fixing some typos in manpages and error messages; thanks to lintian(1) for reporting this. --- debian/changelog | 4 +- debian/patches/00list | 1 + debian/patches/typo_fixes.dpatch | 111 +++++++++++++++++++++++++++++++ 3 files changed, 115 insertions(+), 1 deletion(-) create mode 100755 debian/patches/typo_fixes.dpatch diff --git a/debian/changelog b/debian/changelog index e3eda82..0f34842 100644 --- a/debian/changelog +++ b/debian/changelog @@ -49,11 +49,13 @@ collectd (4.9.1-1) unstable; urgency=low - Added bts566199_collection_hide_types.dpatch -- added ability to hide specified types in collection.cgi; thanks to Pavel Piatruk for the patch (Closes: #566199). + - Added typo_fixes.dpatch -- fixing some typos in manpages and error + messages; thanks to lintian(1) for reporting this. * debian/collectd-core.overrides: - Replaced overrides for spelling-error-in-description with capitalization-error-in-description. - -- Sebastian Harl Sun, 24 Jan 2010 14:17:39 +0100 + -- Sebastian Harl Sun, 24 Jan 2010 14:40:32 +0100 collectd (4.8.2-1) unstable; urgency=medium diff --git a/debian/patches/00list b/debian/patches/00list index 9f9026b..51fdf6c 100644 --- a/debian/patches/00list +++ b/debian/patches/00list @@ -1,5 +1,6 @@ rrd_filter_path.dpatch collection_conf_path.dpatch +typo_fixes.dpatch bts561577_collectd2html_recursive_fix.dpatch bts557599_powerdns_fix.dpatch bts559801_plugin_find_fix.dpatch diff --git a/debian/patches/typo_fixes.dpatch b/debian/patches/typo_fixes.dpatch new file mode 100755 index 0000000..ee1e774 --- /dev/null +++ b/debian/patches/typo_fixes.dpatch @@ -0,0 +1,111 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## typo_fixes.dpatch by Sebastian Harl +## +## DP: collectd{-perl,.conf}(5), {my,postgre}sql plugins: Fixed some typos. +## DP: +## DP: Thanks to lintian(1) for catching (some of) those! :-) + +@DPATCH@ + +diff a/src/collectd-perl.pod b/src/collectd-perl.pod +--- a/src/collectd-perl.pod ++++ b/src/collectd-perl.pod +@@ -163,7 +163,7 @@ and collectd: + + =item Config-Item + +-A config-item is one structure which keeps the informations provided in the ++A config-item is one structure which keeps the information provided in the + configuration file. The array of children keeps one entry for each + configuration option. Each such entry is another config-item structure, which + may nest further if nested blocks are used. +diff a/src/collectd.conf.pod b/src/collectd.conf.pod +--- a/src/collectd.conf.pod ++++ b/src/collectd.conf.pod +@@ -112,7 +112,7 @@ a value higher than the number of plugins you've loaded is totally useless. + =item B I + + Sets the hostname that identifies a host. If you omit this setting, the +-hostname will be determinded using the L system call. ++hostname will be determined using the L system call. + + =item B B + +@@ -443,7 +443,7 @@ The curl plugin uses the B (L) to read web pages + and the match infrastructure (the same code used by the tail plugin) to use + regular expressions with the received data. + +-The following example will read the current value of AMD stock from google's ++The following example will read the current value of AMD stock from Google's + finance page and dispatch the value to collectd. + + +@@ -921,7 +921,7 @@ is set to B, all disks are collected B the ones matched. + + =item B I + +-The dns plugin uses B to capture dns traffic and analyses it. This ++The dns plugin uses B to capture dns traffic and analyzes it. This + option sets the interface that should be used. If this option is not set, or + set to "any", the plugin will try to get packets from B interfaces. This + may not work on certain platforms, such as MacEOSEX. +@@ -1709,7 +1709,7 @@ Here are some examples to help you understand the above text more easily: + + =item B + +-The behaviour is the same as with all other similar plugins: If nothing is ++The behavior is the same as with all other similar plugins: If nothing is + selected at all, everything is collected. If some things are selected using the + options described above, only these statistics are collected. If you set + B to B, this behavior is inverted, i.Ee. the +@@ -1721,7 +1721,7 @@ specified statistics will not be collected. + + The Network plugin sends data to a remote instance of collectd, receives data + from a remote instance, or both at the same time. Data which has been received +-from the network is usually not transmitted again, but this can be actived, see ++from the network is usually not transmitted again, but this can be activated, see + the B option below. + + The default IPv6 multicast group is C. The default IPv4 +@@ -2007,7 +2007,7 @@ UDP-Port to connect to. Defaults to B<123>. + + =item B B|B + +-Sets wether or not to perform reverse lookups on peers. Since the name or ++Sets whether or not to perform reverse lookups on peers. Since the name or + IP-address may be used in a filename it is recommended to disable reverse + lookups. The default is to do reverse lookups to preserve backwards + compatibility, though. +diff a/src/mysql.c b/src/mysql.c +--- a/src/mysql.c ++++ b/src/mysql.c +@@ -397,7 +397,7 @@ static MYSQL *getconnection (mysql_database_t *db) + } + else + { +- INFO ("mysql plugin: Sucessfully connected to database %s " ++ INFO ("mysql plugin: Successfully connected to database %s " + "at server %s (server version: %s, protocol version: %d)", + (db->database != NULL) ? db->database : "", + mysql_get_host_info (db->con), +diff a/src/postgresql.c b/src/postgresql.c +--- a/src/postgresql.c ++++ b/src/postgresql.c +@@ -345,7 +345,7 @@ static int c_psql_exec_query (c_psql_database_t *db, udb_query_t *q) + * `BAIL_OUT'. */ + column_names[col] = PQfname (res, col); + if (NULL == column_names[col]) { +- log_err ("Failed to resolv name of column %i.", col); ++ log_err ("Failed to resolve name of column %i.", col); + BAIL_OUT (-1); + } + } +@@ -496,7 +496,7 @@ static int c_psql_init (void) + + server_host = PQhost (db->conn); + server_version = PQserverVersion (db->conn); +- log_info ("Sucessfully connected to database %s (user %s) " ++ log_info ("Successfully connected to database %s (user %s) " + "at server %s%s%s (server version: %d.%d.%d, " + "protocol version: %d, pid: %d)", + PQdb (db->conn), PQuser (db->conn), -- 2.30.2