From a744ec13ade7d70128cd82393862d02c1f712f6a Mon Sep 17 00:00:00 2001
From: des <des@FreeBSD.org>
Date: Thu, 28 Oct 2004 16:11:31 +0000
Subject: Resolve conflicts

---
 crypto/openssh/sshd.8 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'crypto/openssh/sshd.8')

diff --git a/crypto/openssh/sshd.8 b/crypto/openssh/sshd.8
index 2ed44cc..0402a64 100644
--- a/crypto/openssh/sshd.8
+++ b/crypto/openssh/sshd.8
@@ -34,7 +34,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $OpenBSD: sshd.8,v 1.200 2003/10/08 08:27:36 jmc Exp $
+.\" $OpenBSD: sshd.8,v 1.201 2004/05/02 11:54:31 dtucker Exp $
 .\" $FreeBSD$
 .Dd September 25, 1999
 .Dt SSHD 8
@@ -197,7 +197,7 @@ configuration file.
 .Nm
 rereads its configuration file when it receives a hangup signal,
 .Dv SIGHUP ,
-by executing itself with the name it was started as, i.e.,
+by executing itself with the name and options it was started with, e.g.,
 .Pa /usr/sbin/sshd .
 .Pp
 The options are as follows:
-- 
cgit v1.1