INN commit: trunk (8 files)

INN Commit Russ_Allbery at isc.org
Fri Apr 25 20:18:25 UTC 2008


    Date: Friday, April 25, 2008 @ 13:18:24
  Author: iulius
Revision: 7788

Write "e-mail" instead of "email".
Also fix indentations.

Modified:
  trunk/doc/man/news2mail.8
  trunk/doc/pod/install.pod
  trunk/doc/pod/rc.news.pod
  trunk/innd/art.c
  trunk/lib/innconf.c
  trunk/nnrpd/commands.c
  trunk/scripts/inncheck.in
  trunk/scripts/innreport_inn.pm

--------------------------+
 doc/man/news2mail.8      |    8 ++++----
 doc/pod/install.pod      |    2 +-
 doc/pod/rc.news.pod      |    2 +-
 innd/art.c               |    2 +-
 lib/innconf.c            |    2 +-
 nnrpd/commands.c         |    2 +-
 scripts/inncheck.in      |    4 ++--
 scripts/innreport_inn.pm |    8 ++++----
 8 files changed, 15 insertions(+), 15 deletions(-)

Modified: doc/man/news2mail.8
===================================================================
--- doc/man/news2mail.8	2008-04-25 20:13:18 UTC (rev 7787)
+++ doc/man/news2mail.8	2008-04-25 20:18:24 UTC (rev 7788)
@@ -2,7 +2,7 @@
 .\" $Revision$
 .TH NEWS2MAIL 8
 .SH NAME
-news2mail \- a channel script to gateway news into email.
+news2mail \- a channel script to gateway news into e\-mail.
 .SH SYNOPSIS
 .I news2mail
 .SH DESCRIPTION
@@ -18,7 +18,7 @@
 .I <pathetc\ in\ inn.conf>/news2mail.cf
 .RE
 .PP
-to map mailing list names to email addresses.
+to map mailing list names to e\-mail addresses.
 .PP
 .I news2mail
 causes sendmail to queue the messages for later delivery (to avoid DOS attacks
@@ -28,8 +28,8 @@
 The config file format is simple: comments (start with ``#'') and blank lines
 are ignored. All other lines have two fields on them. The first is the list
 name and is what innd uses (i.e. the site field of the entry in the newsfeeds
-file). The second field is the actual email address to send the article to. In
-the email message, the ``To'' header will have the mailing list name (i.e. the
+file). The second field is the actual e\-mail address to send the article to. In
+the e\-mail message, the ``To'' header will have the mailing list name (i.e. the
 first field).
 .PP
 .RS

Modified: doc/pod/install.pod
===================================================================
--- doc/pod/install.pod	2008-04-25 20:13:18 UTC (rev 7787)
+++ doc/pod/install.pod	2008-04-25 20:18:24 UTC (rev 7788)
@@ -720,7 +720,7 @@
 Used to set the value of the X-Complaints-To: header, which is added to
 all articles posted locally.  The usual value would be something like
 C<abuse at example.com> or C<postmaster at example.com>.  If not specified, the
-newsmaster email address will be used.
+newsmaster e-mail address will be used.
 
 =item hiscachesize
 

Modified: doc/pod/rc.news.pod
===================================================================
--- doc/pod/rc.news.pod	2008-04-25 20:13:18 UTC (rev 7787)
+++ doc/pod/rc.news.pod	2008-04-25 20:18:24 UTC (rev 7788)
@@ -11,7 +11,7 @@
 B<rc.news> can be used to start or stop B<innd> and supporting programs.
 It checks to make sure INN is not already running, handles cases of
 unclean shutdown, finishes up tasks which might have been interrupted by
-the preceeding shutdown, emails certain boot-time warnings to
+the preceeding shutdown, e-mails certain boot-time warnings to
 I<newsmaster> (as set in F<inn.conf>), and is generally safer and easier
 than starting and stopping everything directly.  It needs to be run as the
 news user so that files in I<pathrun> are created with the right ownership

Modified: innd/art.c
===================================================================
--- innd/art.c	2008-04-25 20:13:18 UTC (rev 7787)
+++ innd/art.c	2008-04-25 20:18:24 UTC (rev 7788)
@@ -694,7 +694,7 @@
 **  Check Message-ID format based on RFC 822 grammar, except that (as per
 **  RFC 1036) whitespace, non-printing, and '>' characters are excluded.
 **  Based on code by Paul Eggert posted to news.software.b on 22-Nov-90
-**  in <#*tyo2'~n at twinsun.com>, with additional email discussion.
+**  in <#*tyo2'~n at twinsun.com>, with additional e-mail discussion.
 **  Thanks, Paul.
 */
 bool

Modified: lib/innconf.c
===================================================================
--- lib/innconf.c	2008-04-25 20:13:18 UTC (rev 7787)
+++ lib/innconf.c	2008-04-25 20:18:24 UTC (rev 7788)
@@ -164,7 +164,7 @@
     { K(nntplinklog),           BOOL    (false) },
     { K(noreader),              BOOL    (false) },
     { K(pathalias),             STRING  (NULL) },
-    { K(pathcluster),             STRING  (NULL) },
+    { K(pathcluster),           STRING  (NULL) },
     { K(pauseretrytime),        NUMBER  (300) },
     { K(peertimeout),           NUMBER  (3600) },
     { K(port),                  NUMBER  (119) },

Modified: nnrpd/commands.c
===================================================================
--- nnrpd/commands.c	2008-04-25 20:13:18 UTC (rev 7787)
+++ nnrpd/commands.c	2008-04-25 20:18:24 UTC (rev 7788)
@@ -471,7 +471,7 @@
 
     /* Dave's posting limiter - Limit postings to a certain rate
      * And now we support multiprocess rate limits. Questions?
-     * Email dave at jetcafe.org.
+     * E-mail <dave at jetcafe.org>.
      */
     if (BACKOFFenabled) {
 

Modified: scripts/inncheck.in
===================================================================
--- scripts/inncheck.in	2008-04-25 20:13:18 UTC (rev 7787)
+++ scripts/inncheck.in	2008-04-25 20:18:24 UTC (rev 7788)
@@ -183,7 +183,7 @@
 	    if $msg eq "default" && $act eq "doit";
 	print "$file:$line: empty from field.\n"
 	    if $from eq "";
-	print "$file:$line: bad email address.\n"
+	print "$file:$line: bad e-mail address.\n"
 	    if $from ne "*" && $from !~ /[@!]/;
 
 	##  Perhaps check for conflicting rules, or warn about the last-match
@@ -336,7 +336,7 @@
 	    print "$file:$line: missing field\n";
 	    next input;
 	}
-	print "$file:$line: not an email address\n"
+	print "$file:$line: not an e-mail address\n"
 	    if $pedantic && $v !~ /[@!]/;
 	print "$file:$line: `$v' goes to local address\n"
 	    if $pedantic && $v eq "%s";

Modified: scripts/innreport_inn.pm
===================================================================
--- scripts/innreport_inn.pm	2008-04-25 20:13:18 UTC (rev 7787)
+++ scripts/innreport_inn.pm	2008-04-25 20:18:24 UTC (rev 7788)
@@ -1721,10 +1721,10 @@
     # unmoderated, m, etc. depending on what the control message says.  It
     # can even have multiple words, which we still don't handle.
     if ($left =~ m/^control_(\S+),    # type of msg
-		  \s(?:\S+)?          # newsgroup name
-		  (\s\S+)?            # optional
-		  \s(\S+)             # email
-                  \s\S+               # email
+                  \s(?:\S+)?          # newsgroup name
+                  (\s\S+)?            # optional
+                  \s(\S+)             # e-mail
+                  \s\S+               # e-mail
                   \s\S+,              # filename
                   \s\S+,              # server
                   \s([^=,]+(?:=\S+)?),            # action



More information about the inn-committers mailing list