Fix merge conflicts

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

diff --git a/arithmetic/arithmetic.6 b/arithmetic/arithmetic.6
index 46475b02bb2152da15383cb8bfd9896cc929ef97..07f9c83756b2f0064e1bca57a9ec9b1fe7afd665 100644 (file)
--- a/arithmetic/arithmetic.6
+++ b/arithmetic/arithmetic.6
@@ -1,4 +1,4 @@
-.\"    $NetBSD: arithmetic.6,v 1.6 1998/04/28 07:19:28 fair 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.
 .\"
@@ -38,7 +34,7 @@
 .\"
 .Dd May 31, 1993
 .Dt ARITHMETIC 6
-.Os BSD 4
+.Os
 .Sh NAME
 .Nm arithmetic
 .Nd quiz on simple arithmetic
@@ -54,7 +50,7 @@ After every 20 problems, it prints the score so far and the time taken.
 You can quit at any time by typing the interrupt or end-of-file character.
 .Pp
 The options are as follows:
-.Bl -tag -width indent 
+.Bl -tag -width indent
 .It Fl o
 By default,
 .Nm
@@ -81,8 +77,9 @@ divide by or subtract will be between 0 and
 .Ar range .
 (Of course,
 .Nm
-will not ask you to divide by 0.)  The default
-.I range
+will not ask you to divide by 0.)
+The default
+.Ar range
 is 10.
 .El
 .Pp
@@ -101,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