Skip to content

Commit e77f8c7

Browse files
committed
Fix typo in child name template, and a few minor documentation updates.
1 parent 9fd30bb commit e77f8c7

File tree

1 file changed

+15
-13
lines changed

1 file changed

+15
-13
lines changed

spampd.pl

+15-13
Original file line numberDiff line numberDiff line change
@@ -461,7 +461,7 @@ sub new {
461461
# default child name template
462462
child_name_templ => '%base_name: child #%child_count(%child_status) ' .
463463
'[req %req_count/%req_max, time lst/avg/ttl %(req_time_last).3f/%(req_time_avg).3f/%(req_time_ttl).3f, ham/spm %req_ham/%req_spam] ' .
464-
'[SA rules v%sa_rls_ver)]',
464+
'[SA %sa_ver/%sa_rls_ver]',
465465
},
466466
# this hash is eventually passed to SpamAssassin->new() so it must use valid SA option names. This also becomes the SA object afterwards.
467467
assassin => {
@@ -1734,7 +1734,7 @@ =head1 SYNOPSIS
17341734
--set-envelope-from Set X-Envelope-From header only.
17351735
17361736
--local-only or -L Turn off all SA network-based tests.
1737-
--homedir path Use the specified directory as SA home.
1737+
--homedir <path> Use the specified directory as SA home.
17381738
--saconfig <filename> Use the file for SA "user_prefs" configuration.
17391739
17401740
--logfile or -o <dest> Destination for logs (syslog|stderr|<filename>).
@@ -1975,8 +1975,8 @@ =head1 USAGE
19751975
[--max-servers | -mxs <n>] [--maxsize <n> ] [--[no]detach ]
19761976
[--maxrequests | -r <n>] [--local-only | -L ] [--[no]setsid ]
19771977
[--childtimeout <n>] [--tagall | -a ] [--log-rules-hit | -rh]
1978+
[ --child-name-template | -cnt [<template>] ] [--homedir <path> ]
19781979
[ [--set-envelope-headers | -seh] | [--set-envelope-from | -sef] ]
1979-
[ --child-name-template | -cnt [<string>] ]
19801980
19811981
[ --logfile | -o (syslog|stderr|<filename>) ][...]
19821982
[ --logsock | -ls <socketpath> ] [ --logident | -li <name> ]
@@ -2695,15 +2695,18 @@ =head1 EXAMPLES
26952695
=head1 CREDITS
26962696
26972697
I<spampd> is written and maintained by Maxim Paperno <[email protected]>.
2698-
See L<http://www.WorldDesign.com/index.cfm/rd/mta/spampd.htm> for latest info.
2698+
The open source code repository is located at L<https://github.com/mpaperno/spampd/>.
2699+
See L<http://www.WorldDesign.com/index.cfm/rd/mta/spampd.htm> for historical info.
26992700
2700-
I<spampd> v2 uses two Perl modules by Bennett Todd and Copyright (C) 2001 Morgan
2701-
Stanley Dean Witter. These are distributed under the GNU GPL (see
2702-
module code for more details). Both modules have been slightly modified
2703-
from the originals and are included in this file under new names.
2701+
I<spampd> v2 uses two Perl modules (I<MSDW::SMTP::Client> and I<MSDW::SMTP::Server>)
2702+
by Bennett Todd and Copyright (C) 2001 Morgan Stanley Dean Witter.
2703+
These are distributed under the GNU GPL (see module code for more details).
2704+
Both modules have been slightly modified from the originals and are included in
2705+
this file under new names (I<SpamPD::Client> and I<SpamPD::Server>, respectively).
27042706
2705-
Also thanks to Bennett Todd for the example smtpproxy script which helped create
2706-
this version of I<spampd>. See http://bent.latency.net/smtpprox/ .
2707+
Also thanks to Bennett Todd for the example I<smtpproxy> script which helped create
2708+
this version of I<spampd>. See L<http://bent.latency.net/smtpprox/> (seems to be down)
2709+
or L<https://github.com/jnorell/smtpprox>.
27072710
27082711
I<spampd> v1 was based on code by Dave Carrigan named I<assassind>. Trace
27092712
amounts of his code or documentation may still remain. Thanks to him for the
@@ -2728,8 +2731,7 @@ =head2 Code Contributors (in order of appearance):
27282731
27292732
=head1 COPYRIGHT, LICENSE, AND DISCLAIMER
27302733
2731-
I<spampd> is Copyright (c) 2002-2006, 2009-2010, 2013, 2018-2019 Maxim Paperno;
2732-
All Rights Reserved.
2734+
I<spampd> is Copyright (c) Maxim Paperno; All Rights Reserved.
27332735
27342736
Portions are Copyright (c) 2001 Morgan Stanley Dean Witter as mentioned above
27352737
in the Credits section.
@@ -2818,7 +2820,7 @@ =head1 SEE ALSO
28182820
return word.replace(word[0], word[0].toUpperCase());
28192821
}).join(' ');
28202822
};
2821-
var list = document.querySelectorAll("a[href*=podtop] h1, ul#index > li > a, h1 a.u, li.indexItem1 > a");
2823+
var list = document.querySelectorAll("a[href*=podtop] h1, ul#index > li > a, h1 a.u, body > h1[id], li.indexItem1 > a");
28222824
for (let item of list)
28232825
item.innerText = titleCase(item.innerText);
28242826
}

0 commit comments

Comments
 (0)