Fix merge conflicts

[bsdgames-darwin.git] / arithmetic / arithmetic.6

diff --git a/arithmetic/arithmetic.6 b/arithmetic/arithmetic.6
index 4040d671027563a78b8b8a834b3851b090cf11c6..07f9c83756b2f0064e1bca57a9ec9b1fe7afd665 100644 (file)
--- a/arithmetic/arithmetic.6
+++ b/arithmetic/arithmetic.6
@@ -1,4 +1,4 @@
-.\"    $NetBSD: arithmetic.6,v 1.9 2002/09/26 18:31:58 wiz Exp $
+.\"    $NetBSD: arithmetic.6,v 1.12 2009/03/11 13:00:37 joerg Exp $
 .\"
 .\" Copyright (c) 1989, 1993
 .\"    The Regents of the University of California.  All rights reserved.
@@ -14,11 +14,7 @@
 .\" 2. Redistributions in binary form must reproduce the above copyright
 .\"    notice, this list of conditions and the following disclaimer in the
 .\"    documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\"    must display the following acknowledgement:
-.\"    This product includes software developed by the University of
-.\"    California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
 .\"    may be used to endorse or promote products derived from this software
 .\"    without specific prior written permission.
 .\"
@@ -83,7 +79,7 @@ divide by or subtract will be between 0 and
 .Nm
 will not ask you to divide by 0.)
 The default
-.I range
+.Ar range
 is 10.
 .El
 .Pp
@@ -102,7 +98,9 @@ if you get a question wrong.
 .Dq Right!
 if you get it right.
 .Dq Please type a number.
-if arithmetic doesn't understand what you typed.
+if
+.Nm
+doesn't understand what you typed.
 .Sh SEE ALSO
 .Xr bc 1 ,
 .Xr dc 1