Skip to content

Commit fbedea9

Browse files
committed
Fix a module name in error message (closes #34); Minor doc fixes; Rename an archived file.
1 parent 24bd323 commit fbedea9

File tree

3 files changed

+13
-11
lines changed

3 files changed

+13
-11
lines changed
File renamed without changes.

spampd.pl

+7-6
Original file line numberDiff line numberDiff line change
@@ -782,7 +782,7 @@ sub validate_main_opts {
782782
}
783783
else {
784784
eval { require IO::Socket::IP; }
785-
or push (@errs, "Error loading IO::IP::UNIX module, required for --relayhost option.\n\t$@");
785+
or push (@errs, "Error loading IO::Socket::IP module, required for --relayhost option.\n\t$@");
786786
}
787787

788788
return (@errs, @warns);
@@ -1669,7 +1669,7 @@ =head1 NAME
16691669
16701670
=head1 VERSION
16711671
1672-
Documentation for SpamPD version 2.60.
1672+
Documentation for SpamPD version 2.61.
16731673
16741674
16751675
=head1 DESCRIPTION
@@ -2185,9 +2185,10 @@ =head1 OPTIONS
21852185
spampd: child #4(D) [req 8/30, time lst/avg/ttl 0.0222/0.0256/0.2045, ham/spm 3/5, rules v1891891]
21862186
21872187
Parameters are specified like: "Value of %(my_name)s is %(my_float_value).4f", with names
2188-
in parenthesis followed by standard a C<printf()> style formatting specifier (C<s> is default),
2188+
in parenthesis followed by a standard C<printf()> style formatting specifier (C<s> is default),
21892189
or simply as "Value of %my_name is %my_value" with the default format being a string
2190-
(works for numerics also).
2190+
(works for numerics also). Keep in mind that any actual C<%> characters need to be escaped as C<%%>.
2191+
Formatting warnings will be logged as C<sprintf> errors (most likely a parameter was misspelled).
21912192
21922193
The following variables are available:
21932194
@@ -2225,12 +2226,12 @@ =head1 OPTIONS
22252226
22262227
=item *
22272228
2228-
C<syslog>: Use the system's syslogd (via Sys::Syslog). B<Default> when running as daemon.
2229+
C<syslog>: Use the system's syslogd (via Sys::Syslog). B<Default> setting.
22292230
22302231
=item *
22312232
22322233
C<stderr>: Direct all logging to stderr (if running in background mode
2233-
these may still end up in the default system log). B<Default> when not running as daemon (C<--nodetach>).
2234+
these may still end up in the default system log).
22342235
22352236
=item *
22362237

spampd.pod

+6-5
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ SpamPD - Spam Proxy Daemon
66

77
=head1 VERSION
88

9-
Documentation for SpamPD version 2.60.
9+
Documentation for SpamPD version 2.61.
1010

1111

1212
=head1 DESCRIPTION
@@ -522,9 +522,10 @@ Would produce something like:
522522
spampd: child #4(D) [req 8/30, time lst/avg/ttl 0.0222/0.0256/0.2045, ham/spm 3/5, rules v1891891]
523523

524524
Parameters are specified like: "Value of %(my_name)s is %(my_float_value).4f", with names
525-
in parenthesis followed by standard a C<printf()> style formatting specifier (C<s> is default),
525+
in parenthesis followed by a standard C<printf()> style formatting specifier (C<s> is default),
526526
or simply as "Value of %my_name is %my_value" with the default format being a string
527-
(works for numerics also).
527+
(works for numerics also). Keep in mind that any actual C<%> characters need to be escaped as C<%%>.
528+
Formatting warnings will be logged as C<sprintf> errors (most likely a parameter was misspelled).
528529

529530
The following variables are available:
530531

@@ -562,12 +563,12 @@ Logging method to use. May be one or more of:
562563

563564
=item *
564565

565-
C<syslog>: Use the system's syslogd (via Sys::Syslog). B<Default> when running as daemon.
566+
C<syslog>: Use the system's syslogd (via Sys::Syslog). B<Default> setting.
566567

567568
=item *
568569

569570
C<stderr>: Direct all logging to stderr (if running in background mode
570-
these may still end up in the default system log). B<Default> when not running as daemon (C<--nodetach>).
571+
these may still end up in the default system log).
571572

572573
=item *
573574

0 commit comments

Comments
 (0)