summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJosh Soref <jsoref@users.noreply.github.com>2017-07-25 22:22:00 -0400
committerAkim Demaille <akim.demaille@gmail.com>2018-10-05 07:01:04 +0200
commit795f7e32cca83af5c241e845e360bf2cc21e693c (patch)
tree3d8d23ee1bbfe84a78fc283f8520bc3eb9b298ba
parentc721eb9e28d3749d47a9f865f5a6fc35e57af286 (diff)
downloadbison-795f7e32cca83af5c241e845e360bf2cc21e693c.tar.gz
spelling: combination
-rwxr-xr-xetc/bench.pl.in2
-rw-r--r--tests/conflicts.at2
2 files changed, 2 insertions, 2 deletions
diff --git a/etc/bench.pl.in b/etc/bench.pl.in
index b3f3b61e..6e52e762 100755
--- a/etc/bench.pl.in
+++ b/etc/bench.pl.in
@@ -53,7 +53,7 @@ will generate eight different cases.
=item B<-b>, B<--bench>
-Predefined benches, that is, combimation between a grammar and a I<directives>
+Predefined benches, that is, combination between a grammar and a I<directives>
request.
=over 4
diff --git a/tests/conflicts.at b/tests/conflicts.at
index 31eedb66..0ddccc15 100644
--- a/tests/conflicts.at
+++ b/tests/conflicts.at
@@ -1770,7 +1770,7 @@ AT_BISON_CHECK([[-Wno-conflicts-rr sr-rr.y]], [[0]], [[]],
[
# This is piece of code is rather complex for a simple task: try every
-# combinaison of (0 or 1 real SR) x (0 or 1 real RR) x (don't %expect
+# combination of (0 or 1 real SR) x (0 or 1 real RR) x (don't %expect
# or %expect 0, 1, or 2 SR) x (don't %expect-rr or %expect-rr 0, 1, or 2
# RR).