Update the man page to reflect the global configuration file change.

[dead/htsn.git] / doc / man1 / htsn.1

diff --git a/doc/man1/htsn.1 b/doc/man1/htsn.1
index db20cac4b14769a1709c853b5e5056414f40d9fe..ee2361d41c877bfd6d29c3ab86f3b4580b07ac5e 100644 (file)
--- a/doc/man1/htsn.1
+++ b/doc/man1/htsn.1
@@ -8,9 +8,8 @@ htsn \- Parse XML files from The Sports Network feed.
 \fBhtsn\fR [OPTIONS] [HOSTNAMES]
 
 .SH DESCRIPTION
 \fBhtsn\fR [OPTIONS] [HOSTNAMES]
 
 .SH DESCRIPTION

-

 .P
 .P

-The Sports Network <http://www.sportsnetwork.com> offers an XML feed
+The Sports Network <http://www.sportsnetwork.com/> offers an XML feed

 containing various sports news and statistics. The goal of \fBhtsn\fR
 is to watch the XML feed and parse the individual XML documents into
 files.
 containing various sports news and statistics. The goal of \fBhtsn\fR
 is to watch the XML feed and parse the individual XML documents into
 files.


@@ -26,17 +25,15 @@ If we encounter an error (say, the connection is dropped), then we
 will attempt to connect to the next host in the list after waiting
 five seconds. This process continues indefinitely.
 .P
 will attempt to connect to the next host in the list after waiting
 five seconds. This process continues indefinitely.
 .P

-The program can run either interactively (i.e. outputting to the
+The program can run either interactively (that is, outputting to the

 console), or as a daemon with the \fI\-\-daemonize\fR flag.
 
 .SH INPUT
 console), or as a daemon with the \fI\-\-daemonize\fR flag.
 
 .SH INPUT

-

 .P
 The program takes no input; a username and password must be supplied
 on the command-line or in a configuration file.
 
 .SH OUTPUT
 .P
 The program takes no input; a username and password must be supplied
 on the command-line or in a configuration file.
 
 .SH OUTPUT

-

 .P
 Output is not generated when running as a daemon; otherwise, standard
 out and standard error are fairly noisy. All traffic between htsn and
 .P
 Output is not generated when running as a daemon; otherwise, standard
 out and standard error are fairly noisy. All traffic between htsn and


@@ -57,15 +54,15 @@ Warnings will be highlighted in yellow and sent to stderr.
 Errors will be highlighted in red and sent to stderr.
 
 .SH LOGGING
 Errors will be highlighted in red and sent to stderr.
 
 .SH LOGGING

-
+.P

 Logging is done either to syslog or a file. The destination and
 Logging is done either to syslog or a file. The destination and

-verbosity are controlled by the \fI\-\-log_file\fR,
-\fI\-\-log_level\fR, and \fI\-\-syslog\fR parameters which may be
+verbosity are controlled by the \fI\-\-log\-file\fR,
+\fI\-\-log\-level\fR, and \fI\-\-syslog\fR parameters which may be

 specified either on the command line or in the configuration file.
 
 .SH OPTIONS
 
 specified either on the command line or in the configuration file.
 
 .SH OPTIONS
 

-.IP \fB\-\-daemonize\fR
+.IP \fB\-\-daemonize\fR,\ \fB\-d\fR

 Run as a daemon, in the background. When running as a daemon the
 \fI\-\-pidfile\fR, \fI\-\-run\-as\-group\fR, and
 \fI\-\-run\-as\-user\fR flags become relevant.
 Run as a daemon, in the background. When running as a daemon the
 \fI\-\-pidfile\fR, \fI\-\-run\-as\-group\fR, and
 \fI\-\-run\-as\-user\fR flags become relevant.


@@ -102,8 +99,10 @@ Default: none
 .IP \fB\-\-pidfile\fR
 (Daemon mode only) Create a PID file in the given location. This is
 used by the init system on Unix to keep track of the running daemon.
 .IP \fB\-\-pidfile\fR
 (Daemon mode only) Create a PID file in the given location. This is
 used by the init system on Unix to keep track of the running daemon.

+Its parent directory must be writable by the user/group that we will
+run as!

 
 

-Default: /run/htsn.pid
+Default: /run/htsn/htsn.pid

 
 .IP \fB\-\-run\-as\-group\fR
 (Daemon mode only) Run as the given system group. The PID file is
 
 .IP \fB\-\-run\-as\-group\fR
 (Daemon mode only) Run as the given system group. The PID file is


@@ -135,12 +134,26 @@ either on the command line or in a configuration file.
 Default: none
 
 .SH FEED HOSTS
 Default: none
 
 .SH FEED HOSTS

-
+.P

 It is possible to pass a list of feed hostnames on the command-line
 (see [HOSTNAMES] in the synopsis). By default \fBhtsn\fR will attempt
 to connect to every known TSN XML feed host in a round-robin fashion,
 so there is rarely a need to do this.
 
 It is possible to pass a list of feed hostnames on the command-line
 (see [HOSTNAMES] in the synopsis). By default \fBhtsn\fR will attempt
 to connect to every known TSN XML feed host in a round-robin fashion,
 so there is rarely a need to do this.
 

+.SH CONFIGURATION FILE
+.P
+Any of the command-line options mentioned above can be specified in a
+configuration file instead. We first look for \(dqhtsnrc\(dq in the
+system configuration directory (/etc on Unix). We then look for a file
+named \(dq.htsnrc\(dq in the user's home directory. The latter will
+override the former.
+.P
+The file's syntax is given by examples in the htsnrc.example file
+(included with \fBhtsn\fR).
+.P
+Options specified on the command-line override those in either
+configuration file.
+

 .SH BUGS
 
 .P
 .SH BUGS
 
 .P