Merge branch 'origin'

3 files changed, 7 insertions, 8 deletions

diff --git a/.gitignore b/.gitignore
index 7ea6247..94abdf7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -21,3 +21,4 @@ x11perf
 x11perf.1
 x11perfcomp
 x11perfcomp.1
+*~
diff --git a/Xmark.man b/Xmark.man
index 6e11021..4cc8430 100644
--- a/Xmark.man
+++ b/Xmark.man
@@ -32,17 +32,15 @@ following way:
 .PP
 It is possible to run the GXcopy and GXxor tests separately, as long as they
 are concatenated to the same output file:
-.PP
+.nf
 .BI "x11perf -display " display " -v1.3 -rop GXcopy -all > " datafile 
-.br
 .BI "x11perf -display " display " -v1.3 -rop GXxor -all >> " datafile 
-.PP
+.fi
 or
-.PP
+.nf
 .BI "x11perf -display " display " -v1.3 -rop GXxor -all > " datafile 
-.br
 .BI "x11perf -display " display " -v1.3 -rop GXcopy -all >> " datafile 
-.PP
+.fi
 .SH FILES
 .TP
 .B temp.$$
diff --git a/x11perf.man b/x11perf.man
index 711504a..d8f3e24 100644
--- a/x11perf.man
+++ b/x11perf.man
@@ -180,7 +180,7 @@ Runs all tests.  This may take a while.
 Runs all the tests starting from the specified name \fItest1\fP until
 the name \fItest2\fP, including both the specified tests. The testnames
 should be one of the options starting from -dot. (eg) -range line100
-will peform the tests from the 100 pixel line test, and go on till the
+will perform the tests from the 100 pixel line test, and go on till the
 last test, -range line100,dline10 will do the tests from line100 to
 dline10.
 .TP 14
@@ -223,7 +223,7 @@ StaticColor, PseudoColor, TrueColor, or DirectColor.  (default is the default
 visual).
 .TP 14
 .B \-reps <n>
-Specify the repetition count (Default is number that takes aprox. 5 seconds)
+Specify the repetition count (Default is number that takes approx. 5 seconds)
 .TP 14
 .B \-subs <s0 s1 ...>
 Specify the number of sub windows to use in the Window tests.