From owner-freebsd-bugs  Thu Jul 24 10:30:07 1997
Return-Path: <owner-freebsd-bugs>
Received: (from root@localhost)
          by hub.freebsd.org (8.8.5/8.8.5) id KAA13282
          for bugs-outgoing; Thu, 24 Jul 1997 10:30:07 -0700 (PDT)
Received: (from gnats@localhost)
          by hub.freebsd.org (8.8.5/8.8.5) id KAA13262;
          Thu, 24 Jul 1997 10:30:04 -0700 (PDT)
Resent-Date: Thu, 24 Jul 1997 10:30:04 -0700 (PDT)
Resent-Message-Id: <199707241730.KAA13262@hub.freebsd.org>
Resent-From: gnats (GNATS Management)
Resent-To: freebsd-bugs
Resent-Reply-To: FreeBSD-gnats@FreeBSD.ORG, k-horik@yk.rim.or.jp
Received: from mail.yk.rim.or.jp (root@mail.yk.rim.or.jp [202.247.130.37])
          by hub.freebsd.org (8.8.5/8.8.5) with ESMTP id KAA12984
          for <FreeBSD-gnats-submit@freebsd.org>; Thu, 24 Jul 1997 10:26:03 -0700 (PDT)
Received: from localhost (ppp092.yk.rim.or.jp [202.247.134.92]) by mail.yk.rim.or.jp (8.8.5/3.4Wbeta6-rim1.1) with ESMTP id CAA19288; Fri, 25 Jul 1997 02:25:54 +0900 (JST)
Message-Id: <199707241725.CAA19288@mail.yk.rim.or.jp>
Date: Fri, 25 Jul 1997 02:25:02 +0900
From: k-horik@yk.rim.or.jp
Reply-To: k-horik@yk.rim.or.jp
To: FreeBSD-gnats-submit@FreeBSD.ORG
X-Send-Pr-Version: 3.2
Subject: docs/4162: manpage merge.1 misses 2 roff macros (`.TP' and `.ds r ...')
Sender: owner-freebsd-bugs@FreeBSD.ORG
X-Loop: FreeBSD.org
Precedence: bulk


>Number:         4162
>Category:       docs
>Synopsis:       manpage merge.1 misses 2 roff macros (`.TP' and `.ds r ...')
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-bugs
>State:          open
>Class:          doc-bug
>Submitter-Id:   current-users
>Arrival-Date:   Thu Jul 24 10:30:03 PDT 1997
>Last-Modified:
>Originator:     Kazuo Horikawa
>Organization:
personal user
>Release:        FreeBSD 2.2.1-RELEASE i386
>Environment:

	.Id $Id: merge.1,v 1.2 1995/10/28 21:50:04 peter Exp $

>Description:

 "man merge" shows following output:
-- from here --
       -q     Quiet;  do  not  warn about conflicts.  -V Print 's
              version number.
---------------

 1) Before "-V", there should exist new-line.
 2) Before "'s", there should exist "RCS".

>How-To-Repeat:

	% man merge

>Fix:

 The corresponding roff source are followings:
-- from here --
.TP
.BI \-q
Quiet; do not warn about conflicts.
.BI \-V
Print \*r's version number.
---------------

 1) There should exist ".TP" line before ".VI \-V" line.
 2) Define "r" macore, like other RCS related manuals.
    In manpage rcs.1, The definition ".ds r \&\s-1RCS\s0" exists.
    We can use this macro for the manpage merge.1.

 Then, we can get following outpu:
-- from here --
       -q     Quiet; do not warn about conflicts.

       -V     Print RCS's version number.
---------------

 Aplly following patch:
--- merge.1.orig        Fri Jul 25 01:50:04 1997
+++ merge.1     Mon Jul 21 21:08:41 1997
@@ -3,6 +3,7 @@
 .ds Dt \\$4
 ..
 .Id $Id: merge.1,v 1.2 1995/10/28 21:50:04 peter Exp $
+.ds r \&\s-1RCS\s0
 .TH MERGE 1 \*(Dt GNU
 .SH NAME
 merge \- three-way file merge
@@ -114,6 +115,7 @@
 .TP
 .BI \-q
 Quiet; do not warn about conflicts.
+.TP
 .BI \-V
 Print \*r's version number.
 .SH DIAGNOSTICS
>Audit-Trail:
>Unformatted: