From: Michael Orlitzky <michael@orlitzky.com>
Date: Tue, 24 Dec 2013 00:40:45 +0000 (-0500)
Subject: Update the man page to reflect the global configuration file change.
X-Git-Tag: 0.0.2~6
X-Git-Url: http://gitweb.michael.orlitzky.com/?p=dead%2Fhtsn.git;a=commitdiff_plain;h=b27dbdecb0a7d9517a0b41394e8d6c0ccf7e3aae

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

diff --git a/doc/man1/htsn.1 b/doc/man1/htsn.1
index a2ca93c..ee2361d 100644
--- a/doc/man1/htsn.1
+++ b/doc/man1/htsn.1
@@ -99,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.
+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
@@ -141,15 +143,15 @@ 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 look for a file named \(dq.htsnrc\(dq
-in the user's home directory; its syntax is given by examples in the
-htsnrc.example file (included with \fBhtsn\fR).
+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
-If you are using the \fI\-\-run\-as\-user\fR option, that means that
-the configuration file will need to go in that user's home directory
-(and not, for example, root's).
+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 the
+Options specified on the command-line override those in either
 configuration file.
 
 .SH BUGS