Menu
▾
▴
[Xymon-developer] SF.net SVN: xymon:[7999] branches/4.3.28
|
From: <jcc...@us...> - 2017-01-06 02:00:09
|
Revision: 7999
http://sourceforge.net/p/xymon/code/7999
Author: jccleaver
Date: 2017-01-06 02:00:06 +0000 (Fri, 06 Jan 2017)
Log Message:
-----------
Fix lots of typos (Thanks, Debian)
Modified Paths:
--------------
branches/4.3.28/Changes
branches/4.3.28/client/xymonclient-sunos.sh
branches/4.3.28/common/hosts.cfg.5
branches/4.3.28/common/xymon-xmh.5
branches/4.3.28/common/xymon.1
branches/4.3.28/debian/changelog
branches/4.3.28/docs/known-issues.html
branches/4.3.28/lib/netservices.c
branches/4.3.28/lib/sendmsg.h
branches/4.3.28/web/chpasswd.c
branches/4.3.28/web/findhost.c
branches/4.3.28/web/graphs.cfg.5
branches/4.3.28/xymond/alerts.cfg.5
branches/4.3.28/xymond/do_alert.c
branches/4.3.28/xymond/etcfiles/alerts.cfg.DIST
branches/4.3.28/xymond/rrd/do_beastat.c
branches/4.3.28/xymond/rrd/do_devmon.c
branches/4.3.28/xymond/xymond.8
branches/4.3.28/xymond/xymond.c
branches/4.3.28/xymond/xymonweb.5
branches/4.3.28/xymonnet/xymonnet.1
branches/4.3.28/xymonnet/xymonping.c
Modified: branches/4.3.28/Changes
===================================================================
--- branches/4.3.28/Changes 2017-01-06 01:52:35 UTC (rev 7998)
+++ branches/4.3.28/Changes 2017-01-06 02:00:06 UTC (rev 7999)
@@ -22,6 +22,8 @@
* The size limit of message data passed to SCRIPT alerts is
configurable with the MAXMSG_ALERTSCRIPT variable.
* Summary messages should work again (Thanks, Axel)
+* Many typos in comments and man pages have been corrected
+ (Thanks, Axel et al. at Debian)
Changes from 4.3.26 -> 4.3.27 (24 Mar 2016)
Modified: branches/4.3.28/client/xymonclient-sunos.sh
===================================================================
--- branches/4.3.28/client/xymonclient-sunos.sh 2017-01-06 01:52:35 UTC (rev 7998)
+++ branches/4.3.28/client/xymonclient-sunos.sh 2017-01-06 02:00:06 UTC (rev 7999)
@@ -109,7 +109,7 @@
esac
echo "[swap]"
/usr/sbin/swap -s
-# dont report the swaplist in a non-global zone because it will cause the
+# don't report the swaplist in a non-global zone because it will cause the
# server client module to miscalculate memory
case $ZTYPE in
global|Global)
Modified: branches/4.3.28/common/hosts.cfg.5
===================================================================
--- branches/4.3.28/common/hosts.cfg.5 2017-01-06 01:52:35 UTC (rev 7998)
+++ branches/4.3.28/common/hosts.cfg.5 2017-01-06 02:00:06 UTC (rev 7999)
@@ -75,7 +75,7 @@
.IP "optional include/directory"
Both "include" and "directory" can be prefixed with the tag
-'optional', which will preven an error message being logged if
+"optional", which will preven an error message being logged if
the file or directory is not present on a system.
@@ -181,7 +181,9 @@
the parent page in the "subparent" tag was what made
it easy to implement.
-.IP "vpage" "vsubpage" "vsubparent"
+.IP "vpage"
+.IP "vsubpage"
+.IP "vsubparent"
These are page-definitions similar to the "page", "subpage" and
"subparent" definitions. However, on these pages the rows are
the tests, and the columns are the hosts (normal pages have it
@@ -1173,7 +1175,7 @@
form. Data can be posted to the form by specifying them
in the form-data field, and the result can be checked
as if it was a normal content check (see above for a description
-of the cont-tag and the restrictions on how the URL must be writen).
+of the cont-tag and the restrictions on how the URL must be written).
The form-data field must be entered in "application/x\-www\-form\-urlencoded"
format, which is the most commonly used format for web
Modified: branches/4.3.28/common/xymon-xmh.5
===================================================================
--- branches/4.3.28/common/xymon-xmh.5 2017-01-06 01:52:35 UTC (rev 7998)
+++ branches/4.3.28/common/xymon-xmh.5 2017-01-06 02:00:06 UTC (rev 7999)
@@ -1,6 +1,6 @@
.TH XYMON-XMH 5 "Version 4.3.28-rc1: 28 Dec 2016" "Xymon"
.SH NAME
-Xymon XMH variables \- Configuration items available online
+Xymon-XMH-variables \- Configuration items available online
.SH DESCRIPTION
The
Modified: branches/4.3.28/common/xymon.1
===================================================================
--- branches/4.3.28/common/xymon.1 2017-01-06 01:52:35 UTC (rev 7998)
+++ branches/4.3.28/common/xymon.1 2017-01-06 02:00:06 UTC (rev 7999)
@@ -293,16 +293,16 @@
Advanced Filtering
.sp
.BR msg=MESSAGE
-Include only tests with full content matching MESSAGE. Use "\s" to escape
+Include only tests with full content matching MESSAGE. Use "\\s" to escape
spaces (or other PCRE strings)
.sp
.BR ackmsg=MESSAGE
-Include only tests with acknowledgement(s) MESSAGE. Use "\s" to escape
+Include only tests with acknowledgement(s) MESSAGE. Use "\\s" to escape
spaces (or other PCRE strings)
.sp
.BR dismsg=MESSAGE
Include only tests that have been disabled with strings matching MESSAGE.
-Use "\s" to escape spaces (or other PCRE strings). (It is most efficient
+Use "\\s" to escape spaces (or other PCRE strings). (It is most efficient
to pair this with color=blue.)
Modified: branches/4.3.28/debian/changelog
===================================================================
--- branches/4.3.28/debian/changelog 2017-01-06 01:52:35 UTC (rev 7998)
+++ branches/4.3.28/debian/changelog 2017-01-06 02:00:06 UTC (rev 7999)
@@ -21,6 +21,8 @@
* The size limit of message data passed to SCRIPT alerts is
configurable with the MAXMSG_ALERTSCRIPT variable.
* Summary messages should work again (Thanks, Axel)
+ * Many typos in comments and man pages have been corrected
+ (Thanks, Axel et al. at Debian)
-- Japheth Cleaver <cle...@te...> Sat, 31 Dec 2016 15:00:00 -0700
Modified: branches/4.3.28/docs/known-issues.html
===================================================================
--- branches/4.3.28/docs/known-issues.html 2017-01-06 01:52:35 UTC (rev 7998)
+++ branches/4.3.28/docs/known-issues.html 2017-01-06 02:00:06 UTC (rev 7999)
@@ -57,7 +57,7 @@
try running xymonnet with the "--no-ares" option to use the
standard DNS lookups instead.</p>
-<h3><a name="netfail">Network tests fail sporadically, or report long reponsetimes</a></h3>
+<h3><a name="netfail">Network tests fail sporadically, or report long response times</a></h3>
<p>The xymonnet network tester runs many tests in parallel; by default
it will typically run up to 256 tests concurrently. This may be more
than your network test server or network infrastructure can handle; if
Modified: branches/4.3.28/lib/netservices.c
===================================================================
--- branches/4.3.28/lib/netservices.c 2017-01-06 01:52:35 UTC (rev 7998)
+++ branches/4.3.28/lib/netservices.c 2017-01-06 02:00:06 UTC (rev 7999)
@@ -280,7 +280,7 @@
/* This should not happen */
if (walk) {
- errprintf("Whoa - didnt copy all services! svccount=%d, next service '%s'\n",
+ errprintf("Whoa - didn't copy all services! svccount=%d, next service '%s'\n",
svccount, walk->rec->svcname);
}
Modified: branches/4.3.28/lib/sendmsg.h
===================================================================
--- branches/4.3.28/lib/sendmsg.h 2017-01-06 01:52:35 UTC (rev 7998)
+++ branches/4.3.28/lib/sendmsg.h 2017-01-06 02:00:06 UTC (rev 7999)
@@ -41,7 +41,7 @@
extern int dontsendmessages;
extern void setproxy(char *proxy);
-extern sendresult_t sendmessage(char *msg, char *recipient, int timeout, sendreturn_t *reponse);
+extern sendresult_t sendmessage(char *msg, char *recipient, int timeout, sendreturn_t *response);
extern sendreturn_t *newsendreturnbuf(int fullresponse, FILE *respfd);
extern void freesendreturnbuf(sendreturn_t *s);
extern char *getsendreturnstr(sendreturn_t *s, int takeover);
Modified: branches/4.3.28/web/chpasswd.c
===================================================================
--- branches/4.3.28/web/chpasswd.c 2017-01-06 01:52:35 UTC (rev 7998)
+++ branches/4.3.28/web/chpasswd.c 2017-01-06 02:00:06 UTC (rev 7999)
@@ -161,7 +161,7 @@
infomsg = "New password cannot be blank";
}
else if (strcmp(adduser_password1, adduser_password2) != 0) {
- infomsg = "New passwords dont match";
+ infomsg = "New passwords don't match";
}
else if (strlen(adduser_name) != strspn(adduser_name,"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789_-.,@/=^") ) {
infomsg = "Username has invalid characters!";
Modified: branches/4.3.28/web/findhost.c
===================================================================
--- branches/4.3.28/web/findhost.c 2017-01-06 01:52:35 UTC (rev 7998)
+++ branches/4.3.28/web/findhost.c 2017-01-06 02:00:06 UTC (rev 7999)
@@ -13,7 +13,7 @@
/* 2004/09/08 - Werner Michels [wm] */
/* Added support regular expression on the host search. */
/* Minor changes on errormsg() and error messagess. */
-/* The parse_query was rewriten to meet the new needs. */
+/* The parse_query was rewritten to meet the new needs. */
/* */
/*----------------------------------------------------------------------------*/
Modified: branches/4.3.28/web/graphs.cfg.5
===================================================================
--- branches/4.3.28/web/graphs.cfg.5 2017-01-06 01:52:35 UTC (rev 7998)
+++ branches/4.3.28/web/graphs.cfg.5 2017-01-06 02:00:06 UTC (rev 7999)
@@ -61,7 +61,7 @@
.br
GPRINT:la:MIN: \: %5.1lf (min)
.br
- GPRINT:la:AVERAGE: \: %5.1lf (avg)\n
+ GPRINT:la:AVERAGE: \: %5.1lf (avg)\\n
.sp
Here is an example of a graph that uses multiple RRD-files, determined
@@ -92,7 +92,7 @@
.br
GPRINT:p@RRDIDX@:MIN: \: %5.1lf (min)
.br
- GPRINT:p@RRDIDX@:AVERAGE: \: %5.1lf (avg)\n
+ GPRINT:p@RRDIDX@:AVERAGE: \: %5.1lf (avg)\\n
.SH ADVANCED GRAPH TITLES
Normally the title of a graph is a static text defined in
Modified: branches/4.3.28/xymond/alerts.cfg.5
===================================================================
--- branches/4.3.28/xymond/alerts.cfg.5 2017-01-06 01:52:35 UTC (rev 7998)
+++ branches/4.3.28/xymond/alerts.cfg.5 2017-01-06 02:00:06 UTC (rev 7999)
@@ -109,7 +109,7 @@
Rule excluding an alert by the time-of-day. This is specified as the DOWNTIME timespecification in the hosts.cfg file.
.sp
.BR "DURATION>time, DURATION<time"
-Rule matcing an alert if the event has lasted longer/shorter than the given duration. E.g. DURATION>1h (lasted longer than 1 hour) or DURATION<30 (only sends alerts the first 30 minutes). The duration is specified as a number, optionally followed by 'm' (minutes, default), 'h' (hours) or 'd' (days).
+Rule matching an alert if the event has lasted longer/shorter than the given duration. E.g. DURATION>1h (lasted longer than 1 hour) or DURATION<30 (only sends alerts the first 30 minutes). The duration is specified as a number, optionally followed by 'm' (minutes, default), 'h' (hours) or 'd' (days).
.sp
.BR RECOVERED
Rule matches if the alert has recovered from an alert state.
Modified: branches/4.3.28/xymond/do_alert.c
===================================================================
--- branches/4.3.28/xymond/do_alert.c 2017-01-06 01:52:35 UTC (rev 7998)
+++ branches/4.3.28/xymond/do_alert.c 2017-01-06 02:00:06 UTC (rev 7999)
@@ -420,7 +420,7 @@
if (!rpt) continue; /* Happens for e.g. M_IGNORE recipients */
/*
- * Update alertcount here, because we dont want to hit an UNMATCHED
+ * Update alertcount here, because we don't want to hit an UNMATCHED
* rule when there is actually an alert active - it is just suppressed
* for this run due to the REPEAT setting.
*/
Modified: branches/4.3.28/xymond/etcfiles/alerts.cfg.DIST
===================================================================
--- branches/4.3.28/xymond/etcfiles/alerts.cfg.DIST 2017-01-06 01:52:35 UTC (rev 7998)
+++ branches/4.3.28/xymond/etcfiles/alerts.cfg.DIST 2017-01-06 02:00:06 UTC (rev 7999)
@@ -74,7 +74,7 @@
# TIME - rule matching an alert by the time-of-day. This
# is specified as the DOWNTIME timespecification
# in the hosts.cfg file (see hosts.cfg(5)).
-# DURATION - Rule matcing an alert if the event has lasted
+# DURATION - Rule matching an alert if the event has lasted
# longer/shorter than the given duration. E.g.
# DURATION>10 (lasted longer than 10 minutes) or
# DURARION<30 (only sends alerts the first 30 minutes).
Modified: branches/4.3.28/xymond/rrd/do_beastat.c
===================================================================
--- branches/4.3.28/xymond/rrd/do_beastat.c 2017-01-06 01:52:35 UTC (rev 7998)
+++ branches/4.3.28/xymond/rrd/do_beastat.c 2017-01-06 02:00:06 UTC (rev 7999)
@@ -50,7 +50,7 @@
hostname, testname, acttrans, secact);
dbgprintf("beastat: host %s test %s TRANS: aband %ld comm %ld heur %ld total\n",
hostname, testname, trab, trcomm, trheur, trtot);
- dbgprintf("beastat: host %s test %s RB: app %ld res %ld sys %ld timout %ld total %ld\n",
+ dbgprintf("beastat: host %s test %s RB: app %ld res %ld sys %ld timeout %ld total %ld\n",
hostname, testname, trrbapp, trrbres, trrbsys, trrbto, trrb);
snprintf(rrdvalues, sizeof(rrdvalues), "%d:%ld:%ld:%ld:%ld:%ld:%ld:%ld:%ld:%ld:%ld:%ld",
(int) tstamp, acttrans, secact, trab, trcomm, trheur, trrbapp,
Modified: branches/4.3.28/xymond/rrd/do_devmon.c
===================================================================
--- branches/4.3.28/xymond/rrd/do_devmon.c 2017-01-06 01:52:35 UTC (rev 7998)
+++ branches/4.3.28/xymond/rrd/do_devmon.c 2017-01-06 02:00:06 UTC (rev 7999)
@@ -63,7 +63,7 @@
/* DS:ds0:COUNTER:600:0:U DS:ds1:COUNTER:600:0:U */
if (!strncmp(curline, "DS:",3)) {
- dbgprintf("Looking for DS defintions in %s\n",curline);
+ dbgprintf("Looking for DS definitions in %s\n",curline);
while ( numds < MAXCOLS) {
dbgprintf("Seeing if column %d that has %s is a DS\n",numds,columns[numds]);
if (strncmp(columns[numds],"DS:",3)) break;
Modified: branches/4.3.28/xymond/xymond.8
===================================================================
--- branches/4.3.28/xymond/xymond.8 2017-01-06 01:52:35 UTC (rev 7998)
+++ branches/4.3.28/xymond/xymond.8 2017-01-06 02:00:06 UTC (rev 7999)
@@ -84,9 +84,8 @@
updates from xymond_client and xymonnet.
.IP "\-\-daemon"
-xymond is normally started by
-.I xymonlaunch(8)
-. If you do not want to use xymonlaunch, you can start xymond with this option;
+xymond is normally started by \fIxymonlaunch(8)\fR.
+If you do not want to use xymonlaunch, you can start xymond with this option;
it will then detach from the terminal and continue running as a background
task.
@@ -100,8 +99,7 @@
Track the N latest status-changes for flap-detection. See the
\fB\-\-flap\-seconds\fR option also. To disable flap-checks globally,
set N to zero. To disable for a specific host, you must use the
-"noflap" option in
-.I hosts.cfg(5).
+"noflap" option in \fIhosts.cfg(5)\fR.
Default: 5
.IP "\-\-flap\-seconds=N"
@@ -116,7 +114,8 @@
flap\-count should be at least (3600/300)\-1, i.e. 11.
Default: 1800 seconds (30 minutes).
-.IP "\-\-delay\-red=N" / "\-\-delay\-yellow=N"
+.IP "\-\-delay\-red=N"
+.IP "\-\-delay\-yellow=N"
Sets the delay before a red/yellow status causes a change in the web
page display. Is usually controlled on a per-host basis via the
\fBdelayred\fR and \fBdelayyellow\fR settings in
Modified: branches/4.3.28/xymond/xymond.c
===================================================================
--- branches/4.3.28/xymond/xymond.c 2017-01-06 01:52:35 UTC (rev 7998)
+++ branches/4.3.28/xymond/xymond.c 2017-01-06 02:00:06 UTC (rev 7999)
@@ -3190,7 +3190,7 @@
break;
case FILTER_TAG:
- if (!matchontests) break; /* When processing a xymondboard, we dont want to return entries that have a test in hosts.cfg but no test result */
+ if (!matchontests) break; /* When processing a xymondboard, we don't want to return entries that have a test in hosts.cfg but no test result */
matched = 0;
val = xmh_item_walk(hinfo);
while (val) {
Modified: branches/4.3.28/xymond/xymonweb.5
===================================================================
--- branches/4.3.28/xymond/xymonweb.5 2017-01-06 01:52:35 UTC (rev 7998)
+++ branches/4.3.28/xymond/xymonweb.5 2017-01-06 02:00:06 UTC (rev 7999)
@@ -1,6 +1,6 @@
.TH XYMONWEB 5 "Version 4.3.28-rc1: 28 Dec 2016" "Xymon"
.SH NAME
-Xymon web page headers, footers and forms.
+Xymon-Web-Templates \- web page headers, footers and forms.
.SH DESCRIPTION
The Xymon webpages are somewhat customizable, by modifying the header- and
@@ -38,7 +38,7 @@
Header and footer for the Xymon \fBAll non-green view\fR webpage, generated by
.I xymongen(1)
-.IP stdcritical (DEPRECATED)
+.IP "stdcritical (DEPRECATED)"
Header and footer for the now deprecated \fBold critical\fR webpage, generated by xymongen.
You should use the newer
.I criticalview.cgi(1)
Modified: branches/4.3.28/xymonnet/xymonnet.1
===================================================================
--- branches/4.3.28/xymonnet/xymonnet.1 2017-01-06 01:52:35 UTC (rev 7998)
+++ branches/4.3.28/xymonnet/xymonnet.1 2017-01-06 02:00:06 UTC (rev 7999)
@@ -194,7 +194,7 @@
.IP \-\-checkresponse[=COLOR]
When testing well-known services (e.g. FTP, SSH, SMTP, POP-2, POP-3,
IMAP, NNTP and rsync), xymonnet will look for a valid service-specific
-"OK" response. If another reponse is seen, this will cause
+"OK" response. If another response is seen, this will cause
the test to report a warning (yellow) status. Without this
option, the response from the service is ignored.
.br
Modified: branches/4.3.28/xymonnet/xymonping.c
===================================================================
--- branches/4.3.28/xymonnet/xymonping.c 2017-01-06 01:52:35 UTC (rev 7998)
+++ branches/4.3.28/xymonnet/xymonping.c 2017-01-06 02:00:06 UTC (rev 7999)
@@ -323,7 +323,7 @@
default:
/* Shouldn't happen */
- errprintf("Got a packet that wasnt a reply - type %d\n", icmphdr->icmp_type);
+ errprintf("Got a packet that wasn't a reply - type %d\n", icmphdr->icmp_type);
break;
}
} while (n > 0);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|