summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog7
-rw-r--r--benchmark/bm_so_meteor_contest.rb2
-rwxr-xr-xtool/bisect.sh2
-rwxr-xr-xtool/update-deps2
4 files changed, 10 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index a83ec774862..c78c755bc24 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Mon Apr 20 12:42:40 2015 SHIBATA Hiroshi <hsbt@ruby-lang.org>
+
+ * benchmark/bm_so_meteor_contest.rb: fix a typo.
+ [fix GH-876][ci skip] Patch by @davydovanton
+ * tool/bisect.sh: ditto.
+ * tool/update-deps: ditto.
+
Mon Apr 20 11:10:46 2015 Eric Wong <e@80x24.org>
* ext/socket/socket.c (sock_connect_nonblock): do not raise EISCONN
diff --git a/benchmark/bm_so_meteor_contest.rb b/benchmark/bm_so_meteor_contest.rb
index b8e93bd1504..17e9c046a82 100644
--- a/benchmark/bm_so_meteor_contest.rb
+++ b/benchmark/bm_so_meteor_contest.rb
@@ -467,7 +467,7 @@ def find_top( rotation_skip)
end
# the normail find routine, iterates through the available pieces, checks all rotations at the current location
-# and adds any boards found. depth is acheived via recursion. the overall approach is described
+# and adds any boards found. depth is achieved via recursion. the overall approach is described
# here: http://www-128.ibm.com/developerworks/java/library/j-javaopt/
# parameters:
# start_location -- where to start looking for place for the next piece at
diff --git a/tool/bisect.sh b/tool/bisect.sh
index fb22bf429be..d47bd988b46 100755
--- a/tool/bisect.sh
+++ b/tool/bisect.sh
@@ -36,7 +36,7 @@ case $1 in
echo foo bar
;;
* )
- echo unkown command "'$cmd'"
+ echo unknown command "'$cmd'"
;;
esac
exit 0
diff --git a/tool/update-deps b/tool/update-deps
index 2e7a7e7cc54..308c4b3c743 100755
--- a/tool/update-deps
+++ b/tool/update-deps
@@ -571,7 +571,7 @@ def main_actual_fix(problems)
end
else
if pre_dep_post
- puts "no addtional lines: #{makefile}"
+ puts "no additional lines: #{makefile}"
elsif content
puts "no dependencies section: #{makefile}"
else