From nobody@www.freebsd.org  Tue May 14 21:01:49 2002
Return-Path: <nobody@www.freebsd.org>
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
Subject: Punctuation in mergemaster.8
X-Send-Pr-Version: www-1.0

>Number:         38097
>Category:       docs
>Synopsis:       Punctuation in mergemaster.8
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    dougb
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          doc-bug
>Submitter-Id:   current-users
>Arrival-Date:   Tue May 14 21:10:01 PDT 2002
>Closed-Date:    Tue May 28 00:45:56 PDT 2002
>Last-Modified:  Tue May 28 00:45:56 PDT 2002
>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:
Responsible-Changed-From-To: freebsd-doc->dougb 
Responsible-Changed-By: roam 
Responsible-Changed-When: Wed May 15 03:25:19 PDT 2002 
Responsible-Changed-Why:  
Methinks mergemaster(8) is Doug's. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=38097 
State-Changed-From-To: open->closed 
State-Changed-By: dougb 
State-Changed-When: Tue May 28 00:41:04 PDT 2002 
State-Changed-Why:  

Thank you for the suggestions, however appropriate use of commas 
is a subjective question at best. My eighth grade english teacher 
would disagree pointedly with you. :) 


http://www.freebsd.org/cgi/query-pr.cgi?pr=38097 
>Unformatted:
