From owner-freebsd-doc  Tue May 14 21:10:12 2002
Delivered-To: freebsd-doc@hub.freebsd.org
Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21])
	by hub.freebsd.org (Postfix) with ESMTP id 84D9F37B406
	for <freebsd-doc@hub.freebsd.org>; Tue, 14 May 2002 21:10:01 -0700 (PDT)
Received: (from gnats@localhost)
	by freefall.freebsd.org (8.11.6/8.11.6) id g4F4A1j43029;
	Tue, 14 May 2002 21:10:01 -0700 (PDT)
	(envelope-from gnats)
Received: from nwww.freebsd.org (www.FreeBSD.org [216.136.204.117])
	by hub.freebsd.org (Postfix) with ESMTP id 3D8B537B401
	for <freebsd-gnats-submit@FreeBSD.org>; Tue, 14 May 2002 21:01:49 -0700 (PDT)
Received: from www.freebsd.org (localhost [127.0.0.1])
	by nwww.freebsd.org (8.12.2/8.12.2) with ESMTP id g4F41nhG058958
	for <freebsd-gnats-submit@FreeBSD.org>; Tue, 14 May 2002 21:01:49 -0700 (PDT)
	(envelope-from nobody@www.freebsd.org)
Received: (from nobody@localhost)
	by www.freebsd.org (8.12.2/8.12.2/Submit) id g4F41nLU058957;
	Tue, 14 May 2002 21:01:49 -0700 (PDT)
Message-Id: <200205150401.g4F41nLU058957@www.freebsd.org>
Date: Tue, 14 May 2002 21:01:49 -0700 (PDT)
From: Chris Pepper <pepper@rockefeller.edu>
To: freebsd-gnats-submit@FreeBSD.org
X-Send-Pr-Version: www-1.0
Subject: docs/38097: Punctuation in mergemaster.8
Sender: owner-freebsd-doc@FreeBSD.ORG
Precedence: bulk
List-ID: <freebsd-doc.FreeBSD.ORG>
List-Archive: <http://docs.freebsd.org/mail/> (Web Archive)
List-Help: <mailto:majordomo@FreeBSD.ORG?subject=help> (List Instructions)
List-Subscribe: <mailto:majordomo@FreeBSD.ORG?subject=subscribe%20freebsd-doc>
List-Unsubscribe: <mailto:majordomo@FreeBSD.ORG?subject=unsubscribe%20freebsd-doc>
X-Loop: FreeBSD.org


>Number:         38097
>Category:       docs
>Synopsis:       Punctuation in mergemaster.8
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-doc
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          doc-bug
>Submitter-Id:   current-users
>Arrival-Date:   Tue May 14 21:10:01 PDT 2002
>Closed-Date:
>Last-Modified:
>Originator:     Chris Pepper
>Release:        4.5-RELEASE
>Organization:
Rockefeller University
>Environment:
FreeBSD kra.info-mac.org 4.5-RELEASE FreeBSD 4.5-RELEASE #0: Thu May  2 17:53:25 EDT 2002     root@kra.info-mac.org:/usr/src/sys/compile/KRA  i386

>Description:

>How-To-Repeat:
      
>Fix:
--- mergemaster.8       Tue May 14 22:41:47 2002
+++ mergemaster.8.fixed Tue May 14 23:56:57 2002
@@ -68,7 +68,7 @@
 to its installed counterpart.
 When the script finds a
 change in the new file, or there is no installed
-version of the new file it gives you four options to
+version of the new file, it gives you four options to
 deal with it.
 You can install the new file as is,
 delete the new file, merge the old and new
@@ -84,7 +84,7 @@
 version $Id/$FreeBSD strings for files that have them, deleting
 the temporary file if the strings match.
 If there is
-no $Id string, or if the strings are different it
+no $Id string, or if the strings are different, it
 compares the files themselves.
 You can
 also specify that the script ignore the $Id strings and

>Release-Note:
>Audit-Trail:
>Unformatted:

To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-doc" in the body of the message