Date: Tue, 14 May 2002 21:01:49 -0700 (PDT) From: Chris Pepper <pepper@rockefeller.edu> To: freebsd-gnats-submit@FreeBSD.org Subject: docs/38097: Punctuation in mergemaster.8 Message-ID: <200205150401.g4F41nLU058957@www.freebsd.org>
next in thread | raw e-mail | index | archive | help
>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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200205150401.g4F41nLU058957>