debian/patches/0003-fix_spelling_and_typo.patch: Fix some spelling errors
This commit is contained in:
parent
0b9baae4e9
commit
44b38c4ff6
3 changed files with 278 additions and 1 deletions
3
debian/changelog
vendored
3
debian/changelog
vendored
|
@ -16,8 +16,9 @@ nut (2.4.3-2) UNRELEASED; urgency=low
|
|||
* debian/nut.manpages: Install manpage nut.conf.5 (Closes: #528222)
|
||||
* debian/copyright: Fix copyright-with-old-dh-make-debian-copyright
|
||||
* Remove nut-snmp.lintian-overrides, not needed anymore
|
||||
* debian/patches/0003-fix_spelling_and_typo.patch: Fix some spelling errors
|
||||
|
||||
-- Laurent Bigonville <bigon@debian.org> Thu, 23 Dec 2010 23:02:40 +0100
|
||||
-- Laurent Bigonville <bigon@debian.org> Thu, 23 Dec 2010 23:18:27 +0100
|
||||
|
||||
nut (2.4.3-1.1) unstable; urgency=low
|
||||
|
||||
|
|
275
debian/patches/0003-fix_spelling_and_typo.patch
vendored
Normal file
275
debian/patches/0003-fix_spelling_and_typo.patch
vendored
Normal file
|
@ -0,0 +1,275 @@
|
|||
--- a/man/powercom.8
|
||||
+++ b/man/powercom.8
|
||||
@@ -46,53 +46,53 @@
|
||||
loadPercentage and validationSequence.
|
||||
|
||||
.IP "numOfBytesFromUPS=\fIvalue\fR"
|
||||
-The number of bytes in a UPS frame. The default is type dependant and
|
||||
+The number of bytes in a UPS frame. The default is type dependent and
|
||||
is given below.
|
||||
|
||||
.IP "methodOfFlowControl=\fIname\fR"
|
||||
The method of serial communication flow control that is engaged by the
|
||||
-UPS. The default is type dependant and is given below. Acceptable names
|
||||
+UPS. The default is type dependent and is given below. Acceptable names
|
||||
are dtr0rts1, dtr1 or no_flow_control.
|
||||
|
||||
.IP "shutdownArguments=\fI{{minutes,seconds},whether_minutes_should_be_used}\fR"
|
||||
The minutes and seconds that the UPS should wait between receiving the
|
||||
shutdown command and actually shutting off. The other argument should
|
||||
be set to the character \fIn\fR only when the minutes value should be
|
||||
-skipped and not sent to the UPS. The default is type dependant and is
|
||||
+skipped and not sent to the UPS. The default is type dependent and is
|
||||
given below. The braces and commas are mandatory. Note that there should
|
||||
be no white space characters.
|
||||
|
||||
.IP "voltage=\fI{coefficient1,coefficient2,coefficient3,coefficient4}\fR"
|
||||
Only for KP625AP, Trust, Egys, BNT-other
|
||||
A quad that is used convert the raw data to human readable voltage
|
||||
-reading. The default is type dependant and is given below. Do note that
|
||||
+reading. The default is type dependent and is given below. Do note that
|
||||
the braces and commas are mandatory, as well as the lack of white space
|
||||
characters.
|
||||
|
||||
.IP "frequency=\fI{coefficient1,coefficient2}\fR"
|
||||
Only for KP625AP, Trust, Egys
|
||||
A pair to convert the raw data to human readable frequency reading. The
|
||||
-default is type dependant and is given below. Do note that the braces
|
||||
+default is type dependent and is given below. Do note that the braces
|
||||
and commas are mandatory as well, as the lack of white space characters.
|
||||
|
||||
.IP "batteryPercentage=\fI{coefficient1,coefficient2,coefficient3,coefficient4,coefficient5}\fR"
|
||||
Only for KP625AP, Trust, Egys, BNT-other
|
||||
A 5 tuple to convert the raw data to human readable battery percentage
|
||||
-reading. The default is type dependant and is given below. Do note that
|
||||
+reading. The default is type dependent and is given below. Do note that
|
||||
the braces and commas are mandatory, as the lack of white space
|
||||
characters.
|
||||
|
||||
.IP "loadPercentage=\fI{coefficient1,coefficient2,coefficient3,coefficient4}\fR"
|
||||
Only for KP625AP, Trust, Egys, BNT-other
|
||||
A quad to convert the raw data to human readable load percentage
|
||||
-reading. The default is type dependant and is given below. Do note that
|
||||
+reading. The default is type dependent and is given below. Do note that
|
||||
the braces and commas are mandatory, as the lack of white space
|
||||
characters.
|
||||
|
||||
.IP "validationSequence=\fI{{index1,value1},{index2,value2},{index3,value3}}\fR"
|
||||
Only for KP625AP, Trust, Egys, BNT-other
|
||||
3 pairs to be used for validating the UPS by comparing bytes of the raw
|
||||
-data with constant values. The default is type dependant and is given
|
||||
+data with constant values. The default is type dependent and is given
|
||||
below. The braces and commas are mandatory, as the lack of white space
|
||||
characters.
|
||||
|
||||
@@ -105,7 +105,7 @@
|
||||
|
||||
.P
|
||||
The rest of the default values for the extra arguments are type
|
||||
-dependant:
|
||||
+dependent:
|
||||
|
||||
.IP "Trust"
|
||||
.RS
|
||||
--- a/man/upsc.8
|
||||
+++ b/man/upsc.8
|
||||
@@ -50,7 +50,7 @@
|
||||
To list the UPSes configured on this system, along with their descriptions:
|
||||
|
||||
.nf
|
||||
- $ upsc -L
|
||||
+ $ upsc \-L
|
||||
apc: Back-UPS 500
|
||||
ppro2: Patriot Pro II
|
||||
.fi
|
||||
@@ -59,7 +59,7 @@
|
||||
syntax:
|
||||
|
||||
.nf
|
||||
- $ for UPS in `upsc -l mybox:1234`; do
|
||||
+ $ for UPS in `upsc \-l mybox:1234`; do
|
||||
upsc $UPS ups.status
|
||||
done
|
||||
.fi
|
||||
--- a/drivers/dummy-ups.c
|
||||
+++ b/drivers/dummy-ups.c
|
||||
@@ -337,7 +337,7 @@
|
||||
/* FIXME: we need to have the full data set before
|
||||
* enforcing controls! */
|
||||
|
||||
- upsdebugx(1, "Unknown data. Commiting anyway...");
|
||||
+ upsdebugx(1, "Unknown data. Committing anyway...");
|
||||
return 1;
|
||||
/* return 0;*/
|
||||
}
|
||||
@@ -355,7 +355,7 @@
|
||||
/* FIXME: we need to have the full data set before
|
||||
* enforcing controls! */
|
||||
|
||||
- upsdebugx(1, "Unknown data. Commiting value anyway...");
|
||||
+ upsdebugx(1, "Unknown data. Committing value anyway...");
|
||||
return 1;
|
||||
/* return 0;*/
|
||||
}
|
||||
--- a/drivers/genericups.c
|
||||
+++ b/drivers/genericups.c
|
||||
@@ -142,12 +142,12 @@
|
||||
*/
|
||||
if ((v = getval("OL")) != NULL) {
|
||||
parse_input_signals(v, &upstab[upstype].line_ol, &upstab[upstype].val_ol);
|
||||
- upsdebugx(2, "parse_input_signals: OL overriden with %s\n", v);
|
||||
+ upsdebugx(2, "parse_input_signals: OL overridden with %s\n", v);
|
||||
}
|
||||
|
||||
if ((v = getval("LB")) != NULL) {
|
||||
parse_input_signals(v, &upstab[upstype].line_bl, &upstab[upstype].val_bl);
|
||||
- upsdebugx(2, "parse_input_signals: LB overriden with %s\n", v);
|
||||
+ upsdebugx(2, "parse_input_signals: LB overridden with %s\n", v);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -318,12 +318,12 @@
|
||||
*/
|
||||
if ((v = getval("CP")) != NULL) {
|
||||
parse_output_signals(v, &upstab[upstype].line_norm);
|
||||
- upsdebugx(2, "parse_output_signals: CP overriden with %s\n", v);
|
||||
+ upsdebugx(2, "parse_output_signals: CP overridden with %s\n", v);
|
||||
}
|
||||
|
||||
if ((v = getval("SD")) != NULL) {
|
||||
parse_output_signals(v, &upstab[upstype].line_sd);
|
||||
- upsdebugx(2, "parse_output_signals: SD overriden with %s\n", v);
|
||||
+ upsdebugx(2, "parse_output_signals: SD overridden with %s\n", v);
|
||||
}
|
||||
|
||||
if (ioctl(upsfd, TIOCMSET, &upstab[upstype].line_norm)) {
|
||||
--- a/man/upscode2.8
|
||||
+++ b/man/upscode2.8
|
||||
@@ -49,7 +49,7 @@
|
||||
|
||||
The driver supports the following commands for those UPSen that support them.
|
||||
The available commands are autodetected during initialization,
|
||||
-so you should check availability with \fIupscmd -l\fR.
|
||||
+so you should check availability with \fIupscmd \-l\fR.
|
||||
|
||||
test.panel.start \(hy Start UPS self test
|
||||
|
||||
--- a/man/usbhid-ups.8
|
||||
+++ b/man/usbhid-ups.8
|
||||
@@ -59,7 +59,7 @@
|
||||
than offdelay, but the driver will \fBnot\fR warn you upon startup if it
|
||||
isn't. Some UPS'es will restart no matter what, even if the power is
|
||||
(still) out at the moment this timer elapses. In that case, you could try
|
||||
-if setting 'ondelay = -1' in \fBups.conf\fR helps.
|
||||
+if setting 'ondelay = \-1' in \fBups.conf\fR helps.
|
||||
|
||||
.IP "pollfreq=\fInum\fR"
|
||||
Set polling frequency, in seconds, to reduce the USB data flow.
|
||||
@@ -148,7 +148,7 @@
|
||||
.nf
|
||||
usb 2-1: control timeout on ep0in
|
||||
usb 2-1: usbfs: USBDEVFS_CONTROL failed cmd usbhid-ups rqt 128 rq 6 len 256
|
||||
- ret -110
|
||||
+ ret \-110
|
||||
.fi
|
||||
|
||||
In this case, simply modify the general parameter "pollinterval" to a higher
|
||||
@@ -170,7 +170,7 @@
|
||||
|
||||
If you rely on the UPS to shutdown your systems in case of mains failure
|
||||
and to restart them when the power returns, you \fBmust\fR test this. You
|
||||
-can do so by running 'upsmon -c fsd'. With the mains present, this should
|
||||
+can do so by running 'upsmon \-c fsd'. With the mains present, this should
|
||||
bring your systems down and then cycle the power to restart them again.
|
||||
If you do the same without mains present, it should do the same, but in
|
||||
this case, the outputs shall remain off until mains power is applied
|
||||
--- a/drivers/metasys.c
|
||||
+++ b/drivers/metasys.c
|
||||
@@ -179,12 +179,12 @@
|
||||
/* Read data lenght byte */
|
||||
res = ser_get_char(upsfd, my_buf, 1, 0);
|
||||
if (res < 1) {
|
||||
- ser_comm_fail("Receive error (lenght): %d!!!\n", res);
|
||||
+ ser_comm_fail("Receive error (length): %d!!!\n", res);
|
||||
return -1;
|
||||
}
|
||||
packet_lenght = my_buf[0];
|
||||
if (packet_lenght < 2) {
|
||||
- ser_comm_fail("Receive error (lenght): packet lenght %d!!!\n", packet_lenght);
|
||||
+ ser_comm_fail("Receive error (length): packet length %d!!!\n", packet_lenght);
|
||||
return -1;
|
||||
}
|
||||
/* Try to read all the remainig bytes (packet_lenght) */
|
||||
--- a/drivers/snmp-ups.c
|
||||
+++ b/drivers/snmp-ups.c
|
||||
@@ -380,7 +380,7 @@
|
||||
len = snprintf(buf, buf_len, "%ld", *pdu->variables->val.integer / 100);
|
||||
break;
|
||||
default:
|
||||
- upslogx(LOG_ERR, "[%s] unhandled ASN 0x%x recieved from %s",
|
||||
+ upslogx(LOG_ERR, "[%s] unhandled ASN 0x%x received from %s",
|
||||
upsname?upsname:device_name, pdu->variables->type, OID);
|
||||
return FALSE;
|
||||
break;
|
||||
@@ -420,7 +420,7 @@
|
||||
value = *pdu->variables->val.integer / 100;
|
||||
break;
|
||||
default:
|
||||
- upslogx(LOG_ERR, "[%s] unhandled ASN 0x%x recieved from %s",
|
||||
+ upslogx(LOG_ERR, "[%s] unhandled ASN 0x%x received from %s",
|
||||
upsname?upsname:device_name, pdu->variables->type, OID);
|
||||
return FALSE;
|
||||
break;
|
||||
@@ -1319,7 +1319,7 @@
|
||||
if (ret == FALSE)
|
||||
upslogx(LOG_ERR, "su_setvar: cannot set value %s for %s", arg[4], arg[3]);
|
||||
else
|
||||
- upsdebugx(1, "su_setvar: sucessfully set %s to \"%s\"", arg[0], arg[4]);
|
||||
+ upsdebugx(1, "su_setvar: successfully set %s to \"%s\"", arg[0], arg[4]);
|
||||
|
||||
return 1;
|
||||
}
|
||||
--- a/man/dummy-ups.8
|
||||
+++ b/man/dummy-ups.8
|
||||
@@ -38,7 +38,7 @@
|
||||
|
||||
This file is generally named something.dev. It contains a list of all
|
||||
valid data and associated values, and has the same format as an upsc
|
||||
-dump (<varname>: <value>). So you can easilly create definition
|
||||
+dump (<varname>: <value>). So you can easily create definition
|
||||
files from an existing UPS using "upsc > file.dev".
|
||||
It can also be empty, in which case only a basic set of data is available:
|
||||
device.*, driver.*, ups.mfr, ups.model, ups.status
|
||||
--- a/man/genericups.8
|
||||
+++ b/man/genericups.8
|
||||
@@ -235,7 +235,7 @@
|
||||
|
||||
Alternatively, you can run genericups in debug mode \(hy
|
||||
|
||||
- genericups -DDDDD \-x upstype=n /dev/port
|
||||
+ genericups \-DDDDD \-x upstype=n /dev/port
|
||||
|
||||
In this mode it will be running in the foreground and continuously
|
||||
display the line and battery status of the UPS.
|
||||
--- a/man/metasys.8
|
||||
+++ b/man/metasys.8
|
||||
@@ -30,7 +30,7 @@
|
||||
.SH BUGS
|
||||
This driver has been tested on Meta System HF Millennium 820 and
|
||||
ally HF 1000 only.
|
||||
-Any informations about the use of the driver with the other listed
|
||||
+Any information about the use of the driver with the other listed
|
||||
ups are really welcome.
|
||||
|
||||
.SH AUTHOR
|
||||
--- a/drivers/apcsmart.c
|
||||
+++ b/drivers/apcsmart.c
|
||||
@@ -323,7 +323,7 @@
|
||||
/* This should never happen since we only call
|
||||
this if the REQ_CAPABILITIES command is supported
|
||||
*/
|
||||
- upslogx(LOG_ERR, "ERROR: APC cannot do capabilites but said it could!");
|
||||
+ upslogx(LOG_ERR, "ERROR: APC cannot do capabilities but said it could!");
|
||||
return;
|
||||
}
|
||||
|
1
debian/patches/series
vendored
1
debian/patches/series
vendored
|
@ -1,2 +1,3 @@
|
|||
0001-low_speed_usb_ups.patch
|
||||
0002-fix_udev_action.patch
|
||||
0003-fix_spelling_and_typo.patch
|
||||
|
|
Loading…
Reference in a new issue