INN commit: branches/2.5 (9 files)

INN Commit rra at isc.org
Mon Jan 24 21:24:23 UTC 2011


    Date: Monday, January 24, 2011 @ 13:24:23
  Author: iulius
Revision: 9167

Convert innfeed man page to POD.

Improve the help usage (notably, adding a mention of the -o flag).

Move innfeed(1) to innfeed(8).

Add a symbolic link for imapfeed(8) to innfeed(8).

Fixes during the process:

* Document the new logging (notably, "accsize", "rejsize" and the "%d/%.1f"
syntax for "deferred" were missing).

* Document the -s flag in the man page.  Thanks to Florian Schlichting
for having found it was missing and provided a wording for the documentation.

* Typos.

Added:
  branches/2.5/doc/pod/innfeed.pod
    (from rev 9166, trunk/doc/pod/innfeed.pod)
Modified:
  branches/2.5/MANIFEST
  branches/2.5/doc/man/	(properties)
  branches/2.5/doc/man/Makefile
  branches/2.5/doc/pod/Makefile
  branches/2.5/doc/pod/install.pod
  branches/2.5/innfeed/main.c
  branches/2.5/scripts/innupgrade.in
Deleted:
  branches/2.5/doc/man/innfeed.1

-----------------------+
 MANIFEST              |    3 
 doc/man/Makefile      |    6 
 doc/man/innfeed.1     |  509 ------------------------------------------------
 doc/pod/Makefile      |    4 
 doc/pod/innfeed.pod   |  468 ++++++++++++++++++++++++++++++++++++++++++++
 doc/pod/install.pod   |    2 
 innfeed/main.c        |   40 +--
 scripts/innupgrade.in |    2 
 8 files changed, 501 insertions(+), 533 deletions(-)

Modified: MANIFEST
===================================================================
--- MANIFEST	2011-01-24 21:23:26 UTC (rev 9166)
+++ MANIFEST	2011-01-24 21:24:23 UTC (rev 9167)
@@ -158,7 +158,7 @@
 doc/man/innd.8                        Manpage for innd server
 doc/man/inndcomm.3                    Manpage for part of INN library
 doc/man/inndf.8                       Manpage for inndf utility
-doc/man/innfeed.1                     Manpage for innfeed backend
+doc/man/innfeed.8                     Manpage for innfeed backend
 doc/man/innfeed.conf.5                Manpage for innfeed.conf config file
 doc/man/innmail.1                     Manpage for innmail utility
 doc/man/innreport.8                   Manpage for innreport
@@ -265,6 +265,7 @@
 doc/pod/innconfval.pod                Master file for innconfval.1
 doc/pod/innd.pod                      Master file for innd.8
 doc/pod/inndf.pod                     Master file for inndf.8
+doc/pod/innfeed.pod                   Master file for innfeed.8
 doc/pod/innmail.pod                   Master file for innmail.1
 doc/pod/innupgrade.pod                Master file for innupgrade.8
 doc/pod/innxmit.pod                   Master file for innxmit.8


Property changes on: branches/2.5/doc/man
___________________________________________________________________
Modified: svn:ignore
   - active.5
active.times.5
actsync.8
archive.8
auth_krb5.8
batcher.8
buffchan.8
buffindexed.conf.5
ckpasswd.8
cnfsheadconf.8
cnfsstat.8
control.ctl.5
convdate.1
ctlinnd.8
cvtbatch.8
cycbuff.conf.5
distrib.pats.5
distributions.5
docheckgroups.8
domain.8
expire.ctl.5
expire.8
expireover.8
expirerm.8
fastrm.1
getlist.1
grephistory.1
ident.8
incoming.conf.5
inews.1
inn.conf.5
INN__Config.3pm
innbind.8
innconfval.1
innd.8
inndf.8
innmail.1
innupgrade.8
innxmit.8
libauth.3
libinnhist.3
libstorage.3
list.3
mailpost.8
makedbz.8
makehistory.8
mod-active.8
moderators.5
motd.news.5
newsfeeds.5
news.daily.8
news2mail.8
newslog.5
newsgroups.5
ninpaths.8
nnrpd.8
nntpsend.8
nntpsend.ctl.5
ovdb.5
ovdb_init.8
ovdb_monitor.8
ovdb_server.8
ovdb_stat.8
overchan.8
passwd.nntp.5
perl-nocem.8
pgpverify.1
prunehistory.8
pullnews.1
qio.3
radius.8
radius.conf.5
rc.news.8
readers.conf.5
rnews.1
sasl.conf.5
scanlogs.8
send-uucp.8
sendinpaths.8
shlock.1
simpleftp.1
sm.1
storage.conf.5
subscriptions.5
tally.control.8
tdx-util.8
tinyleaf.8
tst.3
uwildmat.3

   + active.5
active.times.5
actsync.8
archive.8
auth_krb5.8
batcher.8
buffchan.8
buffindexed.conf.5
ckpasswd.8
cnfsheadconf.8
cnfsstat.8
control.ctl.5
convdate.1
ctlinnd.8
cvtbatch.8
cycbuff.conf.5
distrib.pats.5
distributions.5
docheckgroups.8
domain.8
expire.ctl.5
expire.8
expireover.8
expirerm.8
fastrm.1
getlist.1
grephistory.1
ident.8
incoming.conf.5
inews.1
inn.conf.5
INN__Config.3pm
innbind.8
innconfval.1
innd.8
inndf.8
innfeed.8
innmail.1
innupgrade.8
innxmit.8
libauth.3
libinnhist.3
libstorage.3
list.3
mailpost.8
makedbz.8
makehistory.8
mod-active.8
moderators.5
motd.news.5
newsfeeds.5
news.daily.8
news2mail.8
newslog.5
newsgroups.5
ninpaths.8
nnrpd.8
nntpsend.8
nntpsend.ctl.5
ovdb.5
ovdb_init.8
ovdb_monitor.8
ovdb_server.8
ovdb_stat.8
overchan.8
passwd.nntp.5
perl-nocem.8
pgpverify.1
prunehistory.8
pullnews.1
qio.3
radius.8
radius.conf.5
rc.news.8
readers.conf.5
rnews.1
sasl.conf.5
scanlogs.8
send-uucp.8
sendinpaths.8
shlock.1
simpleftp.1
sm.1
storage.conf.5
subscriptions.5
tally.control.8
tdx-util.8
tinyleaf.8
tst.3
uwildmat.3


Modified: doc/man/Makefile
===================================================================
--- doc/man/Makefile	2011-01-24 21:23:26 UTC (rev 9166)
+++ doc/man/Makefile	2011-01-24 21:24:23 UTC (rev 9167)
@@ -5,7 +5,7 @@
 top	= ../..
 
 SEC1	= convdate.1 fastrm.1 getlist.1 grephistory.1 inews.1 innconfval.1 \
-	innfeed.1 innmail.1 nntpget.1 pgpverify.1 pullnews.1 rnews.1 \
+	innmail.1 nntpget.1 pgpverify.1 pullnews.1 rnews.1 \
 	shlock.1 shrinkfile.1 simpleftp.1 sm.1
 
 SEC3	= clientlib.3 dbz.3 inndcomm.3 libauth.3 libinn.3 libinnhist.3 \
@@ -24,7 +24,7 @@
 	cnfsheadconf.8 cnfsstat.8 controlchan.8 ctlinnd.8 cvtbatch.8 \
 	docheckgroups.8 domain.8 expire.8 expireover.8 expirerm.8 \
 	filechan.8 ident.8 \
-	innbind.8 inncheck.8 innd.8 inndf.8 innreport.8 innstat.8 \
+	innbind.8 inncheck.8 innd.8 inndf.8 innfeed.8 innreport.8 innstat.8 \
 	innupgrade.8 innwatch.8 innxbatch.8 innxmit.8 mailpost.8 makedbz.8 \
 	makehistory.8 mod-active.8 news.daily.8 news2mail.8 ninpaths.8 \
 	nnrpd.8 nntpsend.8 ovdb_init.8 ovdb_monitor.8 ovdb_server.8 \
@@ -80,6 +80,8 @@
 	done
 	rm -f $D$(MAN8)/actsyncd.8
 	$(LN_S) actsync.8 $D$(MAN8)/actsyncd.8
+	rm -f $D$(MAN8)/imapfeed.8
+	$(LN_S) innfeed.8 $D$(MAN8)/imapfeed.8
 	if [ x"$(KRB5_AUTH)" != x ] ; then \
 	    $(CP_MAN) auth_krb5.8 $D$(MAN8)/auth_krb5.8 ; \
 	fi

Deleted: doc/man/innfeed.1
===================================================================
--- doc/man/innfeed.1	2011-01-24 21:23:26 UTC (rev 9166)
+++ doc/man/innfeed.1	2011-01-24 21:24:23 UTC (rev 9167)
@@ -1,509 +0,0 @@
-.\" -*- nroff -*-
-.\"
-.\" Author:       James A. Brister <brister at vix.com> -- berkeley-unix --
-.\" Start Date:   Sat, 20 Jan 1996 15:50:56 +1100
-.\" Project:      INN -- innfeed
-.\" File:         innfeed.1
-.\" RCSId:        $Id$
-.\" Description:  Man page for innfeed(1)
-.\"
-.TH INNFEED 1
-.\"
-.\"
-.\"
-.\"
-.\"
-.SH NAME
-innfeed \- multi-host, multi-connection, streaming NNTP feeder.
-.SH SYNOPSIS
-.B innfeed
-[
-.B \-a spool-dir
-]
-[
-.BI \-b " directory"
-]
-[
-.B \-C
-]
-[
-.BI \-c " filename"
-]
-[
-.BI \-d " num"
-]
-[
-.BI \-e " bytes"
-]
-[
-.B \-h
-]
-[
-.BI \-l " filename"
-]
-[
-.B \-m
-]
-[
-.B \-M
-]
-[
-.B \-o bytes
-]
-[
-.B \-p file
-]
-[
-.B \-S file
-]
-[
-.B \-x 
-]
-[
-.B \-y
-]
-[
-.B \-z 
-]
-[
-.B \-v
-]
-[ file ]
-.\"
-.\"
-.\"
-.\"
-.\"
-.SH DESCRIPTION
-.PP
-.I Innfeed
-implements the NNTP protocol for transferring news between computers.  It
-handles the standard IHAVE protocol as well as the CHECK/TAKETHIS
-streaming extension. Innfeed can feed any number of remote hosts at once
-and will open multiple connections to each host if configured to do so. The
-only limitations are the process limits for open file descriptors and memory.
-.PP
-As an alternative to using NNTP, INN may also be fed to an IMAP
-server.  This is done by using an executable called imapfeed, which is
-identical to innfeed except for the delivery process.  The new version
-has two types of connections: an LMTP connection to deliver regular
-messages and an IMAP connection to handle control messages.
-.\"
-.\"
-.\"
-.\"
-.\"
-.SH MODES
-.PP
-.I Innfeed
-has three modes of operation: channel, funnel-file and batch.
-.PP
-Channel mode is used when no filename is given on the command line,
-the ``input-file'' keyword is \fInot\fP given in the config file, \fIand\fP
-the ``\fI\-x\fP'' option is \fInot\fP given.
-In channel mode innfeed runs with stdin connected via a pipe to
-innd. Whenever innd closes this pipe (and it has several reasons during
-normal processing to do so), innfeed will exit. It first will try to
-finish sending all articles it was in the middle of transmitting, before
-issuing a QUIT command. This means innfeed may take a while to exit
-depending on how slow your peers are. It never (well, almost never) just
-drops the connection.
-.PP
-The recommended way to restart innfeed when run in channel mode is
-therefore to tell innd to close the pipe and spawn a new innfeed process.
-This can be done with ``ctlinnd flush <feed>'' where <feed> is the name of
-the innfeed channel feed in ``\fInewsfeeds\fP''.
-.PP
-Funnel-file mode is used when a filename is given as an argument
-or the ``input-file'' keyword is given in the config file.
-In funnel file mode it reads the specified file for the same formatted
-information as innd would give in channel mode. It is expected that innd is
-continually writing to this file, so when innfeed reaches the end of the file
-it will check periodically for new information. To prevent the funnel file
-from growing without bounds, you will need to periodically move the file to
-the side (or simply remove it) and have innd flush the file. Then, after
-the file is flushed by innd, you can send innfeed a SIGALRM, and it too
-will close the file and open the new file created by innd. Something like:
-.PP
-.RS
-.nf
-innfeed -p /var/run/news/innfeed.pid my-funnel-file &
-while true; do
-	sleep 43200
-	rm -f my-funnel-file
-	ctlinnd flush funnel-file-site
-	kill -ALRM `cat /var/run/news/innfeed.pid`
-done
-.fi
-.RE
-.PP
-Batch mode is used when the ``\fI\-x\fP'' flag is used.
-In batch mode innfeed will ignore stdin, and will simply process any
-backlog created by a previously running innfeed. This mode is not normally
-needed as innfeed will take care of backlog processing.
-.\"
-.\"
-.\"
-.\"
-.\"
-.SH CONFIGURATION
-Innfeed expects a couple of things to be able to run correctly: a directory
-where it can store backlog files and a configuration file to describe which
-peers it should handle.
-.PP
-The configuration file is described in
-.IR innfeed.conf (5).
-The ``\fI\-c\fP''
-option can be used to specify a different file.
-.PP
-For each peer (say, ``\fIfoo\fP''), innfeed manages up to 4 files in the
-backlog directory: a ``\fIfoo.lock\fP'' file, which prevents other
-instances of innfeed from interfering with this one; a ``\fIfoo.input\fP''
-file which has old article information innfeed is reading for
-re-processing; a ``\fIfoo.output\fP'' file where innfeed is writing
-information on articles that couldn't be processed (normally due to a slow
-or blocked peer); and a ``\fIfoo\fP'' file.
-.PP
-This last file (``\fIfoo\fP'') is never created by innfeed, but if innfeed
-notices it, it will rename it to ``\fIfoo.input\fP'' at the next
-opportunity and will start reading from it. This lets you create a batch
-file and put it in a place where innfeed will find it. You should never
-alter the .input or .output files of a running innfeed.
-.PP
-The format of these last three files is one of the following:
-.PP
-.RS
-.nf
-/path/to/article <message-id>
- at token@ <message-id>
-.fi
-.RE
-.PP
-This is the same as the first two fields of the lines innd feeds to
-innfeed, and the same as the first two fields of the lines of the batch
-file innd will write if innfeed is unavailable for some reason. When
-innfeed processes its own batch files it ignores everything after the first
-two whitespace separated fields, so moving the innd-created batch file to
-the appropriate spot will work, even though the lines have extra fields.
-.PP
-The first field can also be a storage API token.  The two types of lines can
-be intermingled; innfeed will use the storage manager if appropriate and
-otherwise treat the first field as a filename to read directly.
-.PP
-Innfeed writes its current status to the file ``\fIinnfeed.status\fP'' (or
-the file given by the ``\fI-S\fP'' option). This file contains details on
-the process as a whole, and on each peer this instance of innfeed is
-managing.
-.PP
-If innfeed is told to send an article to a host it is not managing, then
-the article information will be put into a file matching the pattern
-``\fIinnfeed-dropped.*\fP'', with part of the file name matching the pid of
-the innfeed process that is writing to it.  Innfeed will not process this
-file except to write to it. If nothing is written to the file then it will
-be removed if innfeed exits normally.
-.\"
-.\"
-.\"
-.\"
-.\"
-.SH SIGNALS
-.PP
-Upon receipt of a SIGALRM innfeed will close the funnel-file specified on
-the command line, and will reopen it (see funnel file description above).
-.PP
-Innfeed with catch SIGINT and will write a large debugging snapshot of the
-state of the running system.
-.PP 
-Innfeed will catch SIGHUP and will reload the config file. 
-See
-.IR innfeed.conf (5)
-for more details.
-.PP
-Innfeed will catch SIGCHLD and will close and reopen all backlog files.
-.PP 
-Innfeed will catch SIGTERM and will do an orderly shutdown.
-.PP
-Upon receipt of a SIGUSR1 innfeed will increment the debugging level by
-one; receipt of a SIGUSR2 will decrement it by one. The debugging level
-starts at zero (unless the ``-d'' option it used), in which case no debugging
-information is emitted. A larger value for the level means more debugging
-information. Numbers up to 5 are currently useful.
-.\"
-.\"
-.\"
-.\"
-.\"
-.SH SYSLOG ENTRIES
-.PP
-There are 3 different categories of syslog entries for statistics: Host,
-Connection and Global.
-.PP
-The Host statistics are generated for a given peer at regular intervals
-after the first connection is made (or, if the remote is unreachable, after
-spooling starts). The Host statistics give totals over all Connections that
-have been active during the given time frame. For example (broken here to
-fit the page, with ``vixie'' being the peer):
-.PP
-.nf
-  May 23 12:49:08 data innfeed[16015]: vixie checkpoint
-		seconds 1381 offered 2744 accepted 1286 
-		refused 1021 rejected 437 missing 0 spooled 990
-		on_close 0 unspooled 240 deferred 10 requeued 25
-		queue 42.1/100:14,35,13,4,24,10
-.fi
-.PP
-These meanings of these fields are:
-.nr XX \w'unspooled '
-.TP \n(XXu
-seconds
-The time since innfeed connected to the host or since the statistics
-were reset by a ``final'' log entry.
-.TP
-offered
-The number of IHAVE commands sent to the host if it is not in streaming mode.
-The sum of the number of TAKETHIS commands sent when no-CHECK mode
-is in effect plus the number CHECK commands sent in streaming mode (when
-no-CHECK mode is not in effect).
-.TP
-accepted
-The number of articles which were sent to the remote host and accepted
-by it.
-.TP
-refused
-The number of articles offered to the host that it it indicated it
-didn't want because it had already seen the Message-ID.  The remote
-host indicates this by sending a 435 response to an IHAVE command or
-a 438 response to a CHECK command.
-.TP
-rejected
-The number of articles transferred to the host that it did not accept
-because it determined either that it already had the article or it did
-not want it because of the article's Newsgroups: or Distribution: headers,
-etc.  The remote host indicates that it is rejecting the article by
-sending a 437 or 439 response after innfeed sent the entire article.
-.TP
-missing
-The number of articles which innfeed was told to offer to the host but
-which were not present in the article spool.  These articles were probably
-cancelled or expired before innfeed was able to offer them to the host.
-.TP
-spooled
-The number of article entries that were written to the .output backlog file
-because the articles could not either be sent to the host or be refused
-by it.  Articles are generally spooled either because new articles are
-arriving more quickly than they can be offered to the host, or because
-innfeed closed all the connections to the host and pushed all the
-articles currently in progress to the .output backlog file.
-.TP
-on_close
-The number of articles that were spooled when innfeed closed all the
-connections to the host.
-.TP
-unspooled
-The number of article entries that were read from the .input backlog
-file.
-.TP
-deferred
-The number of articles that the host told innfeed to retry later by
-sending a 431 or 436 response.  Innfeed immediately puts these articles
-back on the tail of the queue.
-.TP
-requeued
-The number of articles that were in progress on connections when innfeed
-dropped those connections and put the articles back on the queue.  These
-connections may have been broken by a network problem or became unresponsive
-causing innfeed to time them out.
-.TP
-queue
-The first number is the average (mean) queue size during the previous logging
-interval.  The second number is the maximum allowable queue size.
-The third number is the percentage of the time that the queue
-was empty.  The fourth through seventh numbers are the percentages of the
-time that the queue was >0% to 25% full, 25% to 50% full, 50% to 75%
-full, and 75% to <100% full.  The last number is the percentage of the
-time that the queue was totally full.
-.PP
-If the ``\fI\-z\fP'' option is used (see below), then when the peer stats are
-generated, each Connection will log its stats too. For example, for
-connection number zero (from a set of five):
-.PP
-.nf
-  May 23 12:49:08 data innfeed[16015]: vixie:0 checkpoint
-		seconds 1381 offered 596 accepted 274 
-		refused 225 rejected 97
-.fi
-.PP
-If you only open a maximum of one Connection to a remote, then there will
-be a close correlation between Connection numbers and Host numbers, but in
-general you can't tie the two sets of number together in any easy or very
-meaningful way. When a Connection closes it will always log its stats.
-.PP
-If all Connections for a Host get closed together, then the Host logs its
-stats as ``final'' and resets its counters. If the feed is so busy that
-there's always at least one Connection open and running, then after some
-amount of time (set via the config file), the Host stats are logged as
-final and reset. This is to make generating higher level stats from log
-files, by other programs, easier.
-.PP
-There is one log entry that is emitted for a Host just after its last
-Connection closes and innfeed is preparing to exit. This entry contains
-counts over the entire life of the process. The ``seconds'' field is from the
-first time a Connection was successfully built, or the first time spooling
-started. If a Host has been completely idle, it will have no such log entry.
-.PP
-.nf
-  May 23 12:49:08 data innfeed[16015]: decwrl global 
-		seconds 1381 offered 34 accepted 22 
-		refused 3 rejected 7 missing 0
-.fi
-.PP
-The final log entry is emitted immediately before exiting. It contains a
-summary of the statistics over the entire life of the process.
-.PP
-.nf
-  Feb 13 14:43:41 data innfeed-0.9.4[22344]: ME global
-                seconds 15742 offered 273441 accepted 45750
-                refused 222008 rejected 3334 missing 217
-.fi
-.PP
-.\"
-.\"
-.\"
-.\"
-.\"
-.SH OPTIONS
-.TP
-.B \-a
-The ``\fI\-a\fP'' flag is used to specify the top of the article spool
-tree. Innfeed does a chdir(2) to this directory, so it should probably be
-an absolute path. The default is <patharticles\ in\ inn.conf>.
-.TP
-.B \-b
-The ``\fI\-b\fP'' flag may be used to specify a different directory for backlog
-file storage and retrieval. If the path is relative then it is relative
-to <pathspool\ in\ inn.conf>. The default is ``\fIinnfeed\fP''.
-.TP
-.B \-c
-The ``\fI\-c\fP'' flag may be used to specify a different config file from the
-default value. If the path is relative then it is relative to
-<pathetc\ in\ inn.conf>. The default is ``\fIinnfeed.conf\fP''.
-.TP
-.B \-C 
-The ``\fI\-C\fP'' flag is used to have innfeed simply check the config
-file, report on any errors and then exit.
-.TP
-.B \-d 
-The ``\fI\-d\fP'' flag may be used to specify the initial logging level. All
-debugging messages go to stderr (which may not be what you want, see the
-``\fI\-l\fP'' flag below).
-.TP
-.B \-e
-The ``\fI\-e\fP'' flag may be used to specify the size limit (in bytes) for the
-\fI\%.output\fP backlog files innfeed creates. If the output file gets bigger
-than 10% more than the given number, innfeed will replace the output file
-with the tail of the original version. The default value is 0, which means
-there is no limit.
-.TP
-.B \-h
-Use the ``\fI\-h\fP'' flag to print the usage message.
-.TP
-.B \-l
-The  ``\fI\-l\fP'' flag may be used to specify a different log file from
-stderr. As innd starts innfeed with stderr attached to /dev/null, using this
-option can be useful in catching any abnormal error messages, or any
-debugging messages (all ``normal'' errors messages go to syslog).
-.TP
-.B \-M
-If innfeed has been built with mmap support, then the ``\fI\-M\fP'' flag
-turns OFF the use of mmap(); otherwise it has no effect.
-.TP
-.B \-m
-The ``\fI\-m\fP'' flag is used to turn on logging of all missing
-articles. Normally if an article is missing, innfeed keeps a count, but
-logs no further information. When this flag is used, details about
-message-id and expected pathname are logged.
-.TP
-.B \-o
-The ``\fI\-o\fP'' flag sets a value of the maximum number of bytes of article
-data innfeed is supposed to keep in memory. This doesn't work properly yet.
-.TP
-.B \-p 
-The ``\fI\-p\fP'' flag is used to specify the filename to write the pid of the
-process into. A relative path is relative to <pathrun\ in\ inn.conf>. The
-default is ``\fIinnfeed.pid\fP''.
-.TP
-.B \-S
-The ``\fI\-S\fP'' flag specifies the name of the file to write the periodic
-staus to. If the path is relative it is considered relative to
-<pathlog\ in\ inn.conf>. The default is ``\fIinnfeed.status\fP''.
-.TP
-.B \-v
-When the ``\fI\-v\fP'' flag is given, version information is printed to stderr
-and then innfeed exits.
-.TP
-.B \-x
-The ``\fI\-x\fP'' flag is used to tell innfeed not to expect any article
-information from innd but just to process any backlog files that exist and
-then exit.
-.TP
-.B \-y
-The ``\fI\-y\fP'' flag is used to allow dynamic peer binding. If this flag is
-used and article information is received from innd that specifies an
-unknown peer, then the peer name is taken to be the IP name too, and an
-association with it is created. Using this it is possible to only 
-have the global defaults in the
-.I innfeed.conf
-file, provided the peername as used by innd is the same as the ip name.
-Note that
-.I innfeed
-with ``\fI\-y\fP'' and no peer in
-.I innfeed.conf
-would cause a problem that
-.I innfeed
-drops the first article.
-.TP
-.B \-z
-The ``\fI\-z\fP'' flag is used to cause each connection, in a parallel feed
-configuration, to report statistics when the controller for the connections
-prints its statistics.
-.TP
-.\"
-.\"
-.\"
-.\"
-.\"
-.SH BUGS
-.PP
-When using the ``-x'' option, the config file entry's
-``initial-connections'' field will be the total number of connections
-created and used, no matter how many big the batch file, and no
-matter how big the ``max-connectiond'' field specifies. Thus a value
-of 0 for ``initial-connections'' means nothing will happen in ``-x''
-mode.
-.PP
-Innfeed does not automatically grab the file out of out.going--this needs
-to be prepared for it by external means.
-.PP
-Probably too many other bugs to count.
-.\"
-.\"
-.\"
-.\"
-.\"
-.SH FILES
-innfeed.conf	config file.
-.br
-innfeed		directory for backlog files.
-.\"
-.\"
-.\"
-.\"
-.\"
-.SH HISTORY
-Written by James Brister <brister at vix.com> for InterNetNews.
-.de R$
-This is revision \\$3, dated \\$4.
-..
-.R$ $Id$
-.SH SEE ALSO
-.IR innfeed.conf(5)

Modified: doc/pod/Makefile
===================================================================
--- doc/pod/Makefile	2011-01-24 21:23:26 UTC (rev 9166)
+++ doc/pod/Makefile	2011-01-24 21:24:23 UTC (rev 9167)
@@ -34,7 +34,8 @@
 	../man/ctlinnd.8 ../man/cvtbatch.8 ../man/docheckgroups.8 \
 	../man/domain.8 ../man/expire.8 ../man/expireover.8 \
 	../man/expirerm.8 ../man/ident.8 \
-	../man/innbind.8 ../man/innd.8 ../man/inndf.8 ../man/innupgrade.8 \
+	../man/innbind.8 ../man/innd.8 ../man/inndf.8 \
+	../man/innfeed.8 ../man/innupgrade.8 \
 	../man/innxmit.8 \
 	../man/makedbz.8 ../man/makehistory.8 ../man/mod-active.8 \
 	../man/news.daily.8 ../man/news2mail.8 ../man/ninpaths.8 \
@@ -127,6 +128,7 @@
 ../man/innbind.8:	innbind.pod		; $(POD2MAN) -s 8 $? > $@
 ../man/innd.8:		innd.pod		; $(POD2MAN) -s 8 $? > $@
 ../man/inndf.8:		inndf.pod		; $(POD2MAN) -s 8 $? > $@
+../man/innfeed.8:	innfeed.pod		; $(POD2MAN) -s 8 $? > $@
 ../man/innupgrade.8:	innupgrade.pod		; $(POD2MAN) -s 8 $? > $@
 ../man/innxmit.8:	innxmit.pod		; $(POD2MAN) -s 8 $? > $@
 ../man/makedbz.8:	makedbz.pod		; $(POD2MAN) -s 8 $? > $@

Copied: branches/2.5/doc/pod/innfeed.pod (from rev 9166, trunk/doc/pod/innfeed.pod)
===================================================================
--- doc/pod/innfeed.pod	                        (rev 0)
+++ doc/pod/innfeed.pod	2011-01-24 21:24:23 UTC (rev 9167)
@@ -0,0 +1,468 @@
+=head1 NAME
+
+innfeed - Multi-host, multi-connection, streaming NNTP feeder
+
+=head1 SYNOPSIS
+
+B<innfeed> [B<-ChmMvxyz>] [B<-a> I<spool-dir>] [B<-b> I<directory>]
+[B<-c> I<config-file>] [B<-d> I<log-level>] [B<-e> I<bytes>]
+[B<-l> I<logfile>] [B<-o> I<bytes>] [B<-p> I<pid-file>] [B<-s> I<command>]
+[B<-S> I<status-file>] [I<file>]
+
+=head1 DESCRIPTION
+
+B<innfeed> implements the NNTP protocol for transferring news between
+computers.  It handles the standard IHAVE protocol as well as the
+CHECK/TAKETHIS streaming extension.  B<innfeed> can feed any number of
+remote hosts at once and will open multiple connections to each host if
+configured to do so.  The only limitations are the process limits for open
+file descriptors and memory.
+
+As an alternative to using NNTP, INN may also be fed to an IMAP server.
+This is done by using an executable called B<imapfeed>, which is identical
+to B<innfeed> except for the delivery process.  The new version has two
+types of connections:  an LMTP connection to deliver regular messages and
+an IMAP connection to handle control messages.
+
+=head1 MODES
+
+B<innfeed> has three modes of operation:  channel, funnel-file and batch.
+
+Channel mode is used when no filename is given on the command line,
+the I<input-file> keyword is I<not> given in the config file, I<and>
+the B<-x> option is I<not> given.  In channel mode, B<innfeed> runs with
+stdin connected via a pipe to B<innd>.  Whenever B<innd> closes this pipe
+(and it has several reasons during normal processing to do so), B<innfeed>
+will exit.  It first will try to finish sending all articles it was in
+the middle of transmitting, before issuing a QUIT command.  This means
+B<innfeed> may take a while to exit depending on how slow your peers are.
+It never (well, almost never) just drops the connection.  The recommended
+way to restart B<innfeed> when run in channel mode is therefore to tell
+B<innd> to close the pipe and spawn a new B<innfeed> process.  This can
+be done with C<< ctlinnd flush I<feed> >> where I<feed> is the name of
+the B<innfeed> channel feed in the F<newsfeeds> file.
+
+Funnel-file mode is used when a filename is given as an argument or the
+I<input-file> keyword is given in the config file.  In funnel-file mode,
+it reads the specified file for the same formatted information as B<innd>
+would give in channel mode.  It is expected that B<innd> is continually
+writing to this file, so when B<innfeed> reaches the end of the file, it
+will check periodically for new information.  To prevent the funnel file
+from growing without bounds, you will need to periodically move the file
+to the side (or simply remove it) and have B<innd> flush the file.  Then,
+after the file is flushed by B<innd>, you can send B<innfeed> a SIGALRM,
+and it too will close the file and open the new file created by B<innd>.
+Something like:
+
+    innfeed -p <pathrun in inn.conf>/innfeed.pid my-funnel-file &
+    while true; do
+        sleep 43200
+        rm -f my-funnel-file
+        ctlinnd flush funnel-file-site
+        kill -ALRM `cat <pathrun>/innfeed.pid`
+    done
+
+Batch mode is used when the B<-x> flag is used.  In batch mode, B<innfeed>
+will ignore stdin, and will simply process any backlog created by a
+previously running B<innfeed>.  This mode is not normally needed as
+B<innfeed> will take care of backlog processing.
+
+=head1 CONFIGURATION
+
+B<innfeed> expects a couple of things to be able to run correctly:  a
+directory where it can store backlog files and a configuration file to
+describe which peers it should handle.
+
+The configuration file is described in innfeed.conf(5).  The B<-c> option
+can be used to specify a different file.  For each peer (say, C<foo>),
+B<innfeed> manages up to 4 files in the backlog directory:
+
+=over 2
+
+=item *
+
+A F<foo.lock> file, which prevents other instances of B<innfeed> from
+interfering with this one.
+
+=item *
+
+A F<foo.input> file which has old article information B<innfeed> is reading
+for re-processing.
+
+=item *
+
+A F<foo.output> file where B<innfeed> is writing information on articles
+that could not be processed (normally due to a slow or blocked peer).
+
+=item *
+
+A F<foo> file that is never created by B<innfeed>, but if B<innfeed>
+notices it, it will rename it to F<foo.input> at the next opportunity and
+will start reading from it.  This lets you create a batch file and put it
+in a place where B<innfeed> will find it.
+
+=back
+
+You should never alter the F<foo.input> or F<foo.output> files of a running
+B<innfeed>.  The format of these last three files is one of the following:
+
+    /path/to/article <message-id>
+    @token@ <message-id>
+
+This is the same as the first two fields of the lines B<innd> feeds to
+B<innfeed>, and the same as the first two fields of the lines of the batch
+file B<innd> will write if B<innfeed> is unavailable for some reason.
+When B<innfeed> processes its own batch files, it ignores everything after
+the first two whitespace separated fields, so moving the B<innd>-created
+batch file to the appropriate spot will work, even though the lines have
+extra fields.
+
+The first field can also be a storage API token.  The two types of lines
+can be intermingled; B<innfeed> will use the storage manager if appropriate,
+and otherwise treat the first field as a filename to read directly.
+
+B<innfeed> writes its current status to the file F<innfeed.status> (or
+the file given by the B<-S> option).  This file contains details on the
+process as a whole, and on each peer this instance of B<innfeed> is managing.
+
+If B<innfeed> is told to send an article to a host it is not managing,
+then the article information will be put into a file matching the pattern
+F<innfeed-dropped.*>, with part of the file name matching the pid of the
+B<innfeed> process that is writing to it.  B<innfeed> will not process
+this file except to write to it.  If nothing is written to the file,
+then it will be removed if B<innfeed> exits normally.
+
+=head1 SIGNALS
+
+Upon receipt of a SIGALRM, B<innfeed> will close the funnel file specified
+on the command line, and will reopen it (see funnel file description above).
+
+B<innfeed> with catch SIGINT and will write a large debugging snapshot of
+the state of the running system.
+
+B<innfeed> will catch SIGHUP and will reload the config file.
+See innfeed.conf(5) for more details.
+
+B<innfeed> will catch SIGCHLD and will close and reopen all backlog files.
+
+B<innfeed> will catch SIGTERM and will do an orderly shutdown.
+
+Upon receipt of a SIGUSR1, B<innfeed> will increment the debugging level
+by one; receipt of a SIGUSR2 will decrement it by one.  The debugging
+level starts at zero (unless the B<-d> option it used), in which case no
+debugging information is emitted.  A larger value for the level means more
+debugging information. Numbers up to 5 are currently useful.
+
+=head1 SYSLOG ENTRIES
+
+There are 3 different categories of syslog entries for statistics:  host,
+connection and global.
+
+The host statistics are generated for a given peer at regular intervals
+after the first connection is made (or, if the remote is unreachable, after
+spooling starts).  The host statistics give totals over all connections
+that have been active during the given time frame.  For example (broken
+here to fit the page, with C<vixie> being the peer):
+
+    May 23 12:49:08 news innfeed[16015]: vixie checkpoint
+        seconds 1381 offered 2744 accepted 1286 refused 1021 rejected 437
+        missing 0 accsize 8506220 rejsize 142129 spooled 990
+        on_close 0 unspooled 240 deferred 10/15.3 requeued 25
+        queue 42.1/100:14,35,13,4,24,10
+
+The meanings of these fields are:
+
+=over 2
+
+=item seconds
+
+The time since B<innfeed> connected to the host or since the statistics
+were reset by a C<final> log entry.
+
+=item offered
+
+The number of IHAVE commands sent to the host if it is not in streaming
+mode.  The sum of the number of TAKETHIS commands sent when no-CHECK mode
+is in effect plus the number of CHECK commands sent in streaming mode
+(when no-CHECK mode is not in effect).
+
+=item accepted
+
+The number of articles which were sent to the remote host and accepted by it.
+
+=item refused
+
+The number of articles offered to the host that it indicated it did not
+want because it had already seen the message-ID.  The remote host indicates
+this by sending a 435 response to an IHAVE command or a 438 response to
+a CHECK command.
+
+=item rejected
+
+The number of articles transferred to the host that it did not accept because
+it determined either that it already had the article or it did not want it
+because of the article's Newsgroups: or Distribution: header fields, etc.
+The remote host indicates that it is rejecting the article by sending a
+437 or 439 response after B<innfeed> sent the entire article.
+
+=item missing
+
+The number of articles which B<innfeed> was told to offer to the host but
+which were not present in the article spool.  These articles were probably
+cancelled or expired before B<innfeed> was able to offer them to the host.
+
+=item accsize
+
+The number of bytes of all accepted articles transferred to the host.
+
+=item rejsize
+
+The number of bytes of all rejected articles transferred to the host.
+
+=item spooled
+
+The number of article entries that were written to the F<.output>
+backlog file because the articles either could not be sent to the host
+or were refused by it.  Articles are generally spooled either because new
+articles are arriving more quickly than they can be offered to the host,
+or because B<innfeed> closed all the connections to the host and pushed
+all the articles currently in progress to the F<.output> backlog file.
+
+=item on_close
+
+The number of articles that were spooled when B<innfeed> closed all the
+connections to the host.
+
+=item unspooled
+
+The number of article entries that were read from the F<.input> backlog file.
+
+=item deferred
+
+The first number is the number of articles that the host told B<innfeed>
+to retry later by sending a 431 or 436 response.  B<innfeed> immediately
+puts these articles back on the tail of the queue.
+
+The second number is the average (mean) size of deferred articles during
+the previous logging interval
+
+=item requeued
+
+The number of articles that were in progress on connections when B<innfeed>
+dropped those connections and put the articles back on the queue.
+These connections may have been broken by a network problem or became
+unresponsive causing B<innfeed> to time them out.
+
+=item queue
+
+The first number is the average (mean) queue size during the previous
+logging interval.  The second number is the maximum allowable queue size.
+The third number is the percentage of the time that the queue was empty.
+The fourth through seventh numbers are the percentages of the time that
+the queue was >0% to 25% full, 25% to 50% full, 50% to 75% full, and 75%
+to <100% full.  The last number is the percentage of the time that the
+queue was totally full.
+
+=back
+
+If the B<-z> option is used (see below), then when the peer stats are
+generated, each connection will log its stats too.  For example, for
+connection number zero (from a set of five):
+
+    May 23 12:49:08 news innfeed[16015]: vixie:0 checkpoint
+        seconds 1381 offered 596 accepted 274 refused 225
+        rejected 97 accsize 773623 rejsize 86591
+
+If you only open a maximum of one connection to a remote, then there will
+be a close correlation between connection numbers and host numbers, but
+in general you cannot tie the two sets of number together in any easy or
+very meaningful way.  When a connection closes, it will always log its stats.
+
+If all connections for a host get closed together, then the host logs its
+stats as C<final> and resets its counters.  If the feed is so busy that
+there is always at least one connection open and running, then after some
+amount of time (set via the config file), the host stats are logged as final
+and reset.  This is to make generating higher level stats from log files,
+by other programs, easier.
+
+There is one log entry that is emitted for a host just after its last
+connection closes and B<innfeed> is preparing to exit.  This entry contains
+counts over the entire life of the process.  The C<seconds> field is from the
+first time a connection was successfully built, or the first time spooling
+started.  If a host has been completely idle, it will have no such log entry.
+
+    May 23 12:49:08 news innfeed[16015]: decwrl global
+        seconds 1381 offered 34 accepted 22 refused 3 rejected 7
+        missing 0 accsize 81277 rejsize 12738 spooled 0 unspooled 0
+
+The final log entry is emitted immediately before exiting.  It contains a
+summary of the statistics over the entire life of the process.
+
+    Feb 13 14:43:41 news innfeed[22344]: ME global
+        seconds 15742 offered 273441 accepted 45750 refused 222008
+        rejected 3334 missing 217 accsize 93647166 rejsize 7421839
+        spooled 10 unspooled 0
+
+=head1 OPTIONS
+
+B<innfeed> takes the following options.
+
+=over 4
+
+=item B<-a> I<spool-dir>
+
+The B<-a> flag is used to specify the top of the article spool tree.
+B<innfeed> does a chdir(2) to this directory, so it should probably be an
+absolute path.  The default is I<patharticles> as set in F<inn.conf>.
+
+=item B<-b> I<directory>
+
+The B<-b> flag may be used to specify a different directory for backlog
+file storage and retrieval, as well as for lock files.  If the path is
+relative, then it is relative to I<pathspool> as set in F<inn.conf>.
+The default is C<innfeed>.
+
+=item B<-c> I<config-file>
+
+The B<-c> flag may be used to specify a different config file from the
+default value.  If the path is relative, then it is relative to I<pathetc>
+as set in F<inn.conf>.  The default is F<innfeed.conf>.
+
+=item B<-C>
+
+The B<-C> flag is used to have B<innfeed> simply check the config file,
+report on any errors and then exit.
+
+=item B<-d> I<log-level>
+
+The B<-d> flag may be used to specify the initial logging level.
+All debugging messages go to stderr (which may not be what you want,
+see the B<-l> flag below).
+
+=item B<-e> I<bytes>
+
+The B<-e> flag may be used to specify the size limit (in bytes) for the
+F<.output> backlog files B<innfeed> creates.  If the output file gets
+bigger than 10% more than the given number, B<innfeed> will replace the
+output file with the tail of the original version.  The default value is
+C<0>, which means there is no limit.
+
+=item B<-h>
+
+Use the B<-h> flag to print the usage message.
+
+=item B<-l> I<logfile>
+
+The B<-l> flag may be used to specify a different log file from stderr.
+As B<innd> starts B<innfeed> with stderr attached to /dev/null, using
+this option can be useful in catching any abnormal error messages, or any
+debugging messages (all "normal" errors messages go to syslog).
+
+=item B<-m>
+
+The B<-m> flag is used to turn on logging of all missing articles.
+Normally, if an article is missing, B<innfeed> keeps a count, but logs no
+further information.  When this flag is used, details about message-IDs
+and expected path names are logged.
+
+=item B<-M>
+
+If B<innfeed> has been built with mmap support, then the B<-M> flag turns
+OFF the use of mmap(); otherwise, it has no effect.
+
+=item B<-o> I<bytes>
+
+The B<-o> flag sets a value of the maximum number of bytes of article data
+B<innfeed> is supposed to keep in memory.  This does not work properly yet.
+
+=item B<-p> I<pid-file>
+
+The B<-p> flag is used to specify the file name to write the pid of
+the process into.  A relative path is relative to I<pathrun> as set in
+F<inn.conf>.  The default is F<innfeed.pid>.
+
+=item B<-s> I<command>
+
+The B<-s> flag specifies the name of a command to run in a subprocess and
+read article information from.  This is similar to channel mode operation,
+only that I<command> takes the place usually occupied by B<innd>.
+
+=item B<-S> I<status-file>
+
+The B<-S> flag specifies the name of the file to write the periodic status
+to.  If the path is relative, it is considered relative to I<pathlog>
+as set in F<inn.conf>.  The default is F<innfeed.status>.
+
+=item B<-v>
+
+When the B<-v> flag is given, version information is printed to stderr
+and then B<innfeed> exits.
+
+=item B<-x>
+
+The B<-x> flag is used to tell B<innfeed> not to expect any article
+information from B<innd> but just to process any backlog files that exist
+and then exit.
+
+=item B<-y>
+
+The B<-y> flag is used to allow dynamic peer binding.  If this flag is
+used and article information is received from B<innd> that specifies an
+unknown peer, then the peer name is taken to be the IP name too, and an
+association with it is created.  Using this, it is possible to only have
+the global defaults in the F<innfeed.conf> file, provided the peer name
+as used by B<innd> is the same as the IP name.
+
+Note that B<innfeed> with B<-y> and no peer in F<innfeed.conf> would cause
+a problem that B<innfeed> drops the first article.
+
+=item B<-z>
+
+The B<-z> flag is used to cause each connection, in a parallel feed
+configuration, to report statistics when the controller for the connections
+prints its statistics.
+
+=back
+
+=head1 BUGS
+
+When using the B<-x> option, the config file entry's I<initial-connections>
+field will be the total number of connections created and used, no matter
+how many big the batch file, and no matter how big the I<max-connections>
+field specifies.  Thus a value of C<0> for I<initial-connections> means
+nothing will happen in B<-x> mode.
+
+B<innfeed> does not automatically grab the file out of I<pathoutgoing>.
+This needs to be prepared for it by external means.
+
+Probably too many other bugs to count.
+
+=head1 FILES
+
+=over 4
+
+=item I<pathbin>/innfeed
+
+The binary program itself.
+
+=item I<pathetc>/innfeed.conf
+
+The configuration file.
+
+=item I<pathspool>/innfeed
+
+The directory for backlog files.
+
+=back
+
+=head1 HISTORY
+
+Written by James Brister <brister at vix.com> for InterNetNews.  Converted to POD by Julien Elie.
+
+$Id$
+
+=head1 SEE ALSO
+
+ctlinnd(8), inn.conf(5), innfeed.conf(5), innd(8).
+
+=cut

Modified: doc/pod/install.pod
===================================================================
--- doc/pod/install.pod	2011-01-24 21:23:26 UTC (rev 9166)
+++ doc/pod/install.pod	2011-01-24 21:24:23 UTC (rev 9167)
@@ -907,7 +907,7 @@
         :!*\
         :Tc,Wnm*:<pathbin in inn.conf>/innfeed -y
 
-(adjust the path to innfeed(1) if you installed it elsewhere).  Note that
+(adjust the path to innfeed(8) if you installed it elsewhere).  Note that
 we don't feed this entry any articles directly (its newsgroup pattern is
 C<!*>).  Note also that the name of this entry ends in an exclamation
 point.  This is a standard convention for all special feeds; since the

Modified: innfeed/main.c
===================================================================
--- innfeed/main.c	2011-01-24 21:23:26 UTC (rev 9166)
+++ innfeed/main.c	2011-01-24 21:24:23 UTC (rev 9167)
@@ -491,54 +491,56 @@
   fprintf (stderr,"\t-a dir      Use the given directory as the top of the article spool\n") ;
 
   fprintf (stderr,"\t-b dir      Use the given directory as the the storage\n");
-  fprintf (stderr,"\t            place for backlog files and lock files.\n");
+  fprintf (stderr,"\t            place for backlog files and lock files\n");
 
   fprintf (stderr,"\t-c file     Use the given file as the config file instead of the\n");
   fprintf (stderr,"\t            default of %s\n",CONFIG_FILE);
 
-  fprintf (stderr,"\t-C          Check the config file and then exit.\n") ;
-  fprintf (stderr,"\t-d num      set the logging level to num (an integer).\n");
-  fprintf (stderr,"\t            Larger value means more logging. 0 means no\n");
-  fprintf (stderr,"\t            logging. The default is 0\n");
+  fprintf (stderr,"\t-C          Check the config file and then exit\n") ;
+  fprintf (stderr,"\t-d num      Set the logging level to num (an integer).\n");
+  fprintf (stderr,"\t            Larger value means more logging.  0 means no\n");
+  fprintf (stderr,"\t            logging.  The default is 0\n");
 
   fprintf (stderr,"\t-e bytes    Keep the output backlog files to no bigger\n");
   fprintf (stderr,"\t            than %.2f times this number\n",LIMIT_FUDGE);
 
-  fprintf (stderr,"\t-h          print this message\n");
+  fprintf (stderr,"\t-h          Print this message\n");
 
-  fprintf (stderr,"\t-l file     redirect stderr and stdout to the given file.\n");
-  fprintf (stderr,"\t            When run under INN they normally are redirected to\n");
-  fprintf (stderr,"\t            /dev/null. This is needed if using '-d'.\n");
+  fprintf (stderr,"\t-l file     Redirect stderr and stdout to the given file.\n");
+  fprintf (stderr,"\t            When run under INN, they normally are redirected to\n");
+  fprintf (stderr,"\t            /dev/null.  This is needed if using '-d'\n");
 
   fprintf (stderr,"\t-m          Log information on all missing articles\n");
 
   fprintf (stderr,"\t-M          Turn *off* use of mmap\n") ;
 #if ! defined (HAVE_MMAP)
-  fprintf (stderr,"\t            (a no-op as this excutable has been built without mmap support\n") ;
+  fprintf (stderr,"\t            (a no-op as this excutable has been built without mmap support)\n") ;
 #endif
+  fprintf (stderr,"\t-o bytes    Set a limit for the maximum number of bytes of article\n");
+  fprintf (stderr,"\t            data innfeed is supposed to keep in memory\n");
 
   fprintf (stderr,"\t-p file     Write the process id to the given file\n") ;
-  fprintf (stderr,"\t            instead of the default of %s\n",PID_FILE);
-  fprintf (stderr,"\t            A relative path is relative to %s\n", innconf->pathrun) ;
+  fprintf (stderr,"\t            instead of the default of %s;\n",PID_FILE);
+  fprintf (stderr,"\t            a relative path is relative to %s\n", innconf->pathrun) ;
 
-  fprintf (stderr,"\t-s command  run the given command in a subprocess and use\n");
+  fprintf (stderr,"\t-s command  Run the given command in a subprocess and use\n");
   fprintf (stderr,"\t            its output as article information instead of\n");
   fprintf (stderr,"\t            running under innd\n");
 
-  fprintf (stderr,"\t-S file     Use the give filename instead of innfeed.status\n") ;
-  fprintf (stderr,"\t            relative pathnames start from %s\n", innconf->pathlog) ;
+  fprintf (stderr,"\t-S file     Use the given filename instead of innfeed.status;\n") ;
+  fprintf (stderr,"\t            relative path names start from %s\n", innconf->pathlog) ;
 
-  fprintf (stderr,"\t-v          print version information\n");
+  fprintf (stderr,"\t-v          Print version information\n");
 
   fprintf (stderr,"\t-x          Do not read any article information off stdin,\n");
   fprintf (stderr,"\t            but simply process backlog files and then exit\n");
   fprintf (stderr,"\t            when done\n");
 
-  fprintf (stderr,"\t-y          Add peers dynamically. If an unrecognized peername\n");
+  fprintf (stderr,"\t-y          Add peers dynamically.  If an unrecognized peer name\n");
   fprintf (stderr,"\t            is received from innd, then it is presumed to also\n");
-  fprintf (stderr,"\t            be the ip name and a new peer binding is set up\n");
+  fprintf (stderr,"\t            be the IP name and a new peer binding is set up\n");
 
-  fprintf (stderr,"\t-z          have each of the connections issue their own stats\n");
+  fprintf (stderr,"\t-z          Have each of the connections issue their own stats\n");
   fprintf (stderr,"\t            whenever they close, or whenever their controller\n");
   fprintf (stderr,"\t            issues its own stats\n");
 

Modified: scripts/innupgrade.in
===================================================================
--- scripts/innupgrade.in	2011-01-24 21:23:26 UTC (rev 9166)
+++ scripts/innupgrade.in	2011-01-24 21:24:23 UTC (rev 9167)
@@ -60,6 +60,8 @@
            'README.readers.conf' => '',              # -- it is external-auth.
            'sm.8'             => '',                 # -- it is sm(1).
 
+           'innfeed.1'        => '',                 # It is innfeed(8) in INN 2.5.3.
+
            'hook-tcl'         => 'hook-tcl.OLD',     # Obsolete Tcl hooks in INN 2.5.0.
            'filter.tcl'       => 'filter.tcl.OLD',
            'startup.tcl'      => 'startup.tcl.OLD',




More information about the inn-committers mailing list