From 3779e920d0618fa928176d672986a24c35344e45 Mon Sep 17 00:00:00 2001
From: Jonathan \"Duke\" Leto <jonathan@leto.net>
Date: Jun 22 2012 20:19:57 +0000
Subject: fix for trac #173; update ds-logpipe.py docs about -t option


---

diff --git a/ldap/admin/src/scripts/ds-logpipe.py b/ldap/admin/src/scripts/ds-logpipe.py
index 04cef6a..b2d8304 100644
--- a/ldap/admin/src/scripts/ds-logpipe.py
+++ b/ldap/admin/src/scripts/ds-logpipe.py
@@ -239,7 +239,7 @@ def parse_options():
     parser.add_option("-s", "--serverpidfile", type='string', dest='serverpidfile',
                       help='name of file containing the pid of the server to monitor')
     parser.add_option("-t", "--servertimeout", dest="servertimeout", type='int',
-                      help="timeout in seconds to wait for the serverpid to be alive", default=60)
+                      help="timeout in seconds to wait for the serverpid to be alive. only applies when using -s or --serverpid", default=60)
     parser.add_option("--serverpid", dest="serverpid", type='int',
                       help="process id of server to monitor", default=0)
     parser.add_option("-u", "--user", type='string', dest='user',
diff --git a/man/man1/ds-logpipe.py.1 b/man/man1/ds-logpipe.py.1
index 53093b2..e8f14b0 100644
--- a/man/man1/ds-logpipe.py.1
+++ b/man/man1/ds-logpipe.py.1
@@ -52,7 +52,7 @@ The pipe and any other files created by the script will be chown()'d to this use
 If you want the script to exit when a particular directory server exists, specify the full path to the file containing the server pid.  The default is usually something like /var/run/dirsrv/slapd-<instancename>.pid where <instancename> is usually the hostname
 .TP
 .B \-t|\-\-servertimeout=N
-Since the serverpidfile may not exist yet when the script is run, the script will wait by default 60 seconds for the pid file to exist and the server to be started.  Use this option to specify a different timeout.
+Since the serverpidfile may not exist yet when the script is run, the script will wait by default 60 seconds for the pid file to exist and the server to be started.  Use this option to specify a different timeout. The -t option only applies when using -s or --serverpid - otherwise it does nothing.
 .TP
 .B \-\-serverpid=P
 IF the server you want to track is already running, you can specify it using this argument.  If the specified pid is not valid, the script will abort.