summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKeith Packard <keithp@koto.keithp.com>2007-09-10 16:56:06 +0100
committerKeith Packard <keithp@koto.keithp.com>2007-09-10 16:56:06 +0100
commit569a5eaaef9a5c8bf50f1323fe39e81347976875 (patch)
treea3aa33bb8ebb82f214425f39de5999ce9c3d2387
parent55aa9c238c5d81c9dc0f679dfd2fea00f356247b (diff)
parente906fe589a852e9b4af4aac6c72580494139a0b7 (diff)
Merge branch 'origin'
-rw-r--r--.gitignore1
-rw-r--r--Xmark.man10
-rw-r--r--x11perf.man4
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.