aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-09-14 02:12:12 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-09-14 02:12:12 +0000
commit5d4562d985546ed162b4ed6aa422c0f29d76a725 (patch)
treecbd1ea8bbbffeb323115f1e334e2634229d54cee
parent32d5655a2ca69d2ebbf08a83a43a478bfbc12b42 (diff)
downloadruby-5d4562d985546ed162b4ed6aa422c0f29d76a725.tar.gz
Fix typo in racc english documentation [ci skip]
* lib/racc/rdoc/grammar.en.rdoc: [DOC] fix typo, "convertion" to "conversion". [Fix GH-1016] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@51854 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--lib/racc/rdoc/grammar.en.rdoc2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 7fa34d3607..c6c130351b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon Sep 14 11:12:10 2015 Anton Davydov <antondavydov.o@gmail.com>
+
+ * lib/racc/rdoc/grammar.en.rdoc: [DOC] fix typo, "convertion" to
+ "conversion". [Fix GH-1016]
+
Sun Sep 13 11:03:13 2015 Nobuyoshi Nakada <nobu@ruby-lang.org>
* include/ruby/ruby.h: prefix RUBY or RB to global symbols to get
diff --git a/lib/racc/rdoc/grammar.en.rdoc b/lib/racc/rdoc/grammar.en.rdoc
index a154246ee5..28d5129068 100644
--- a/lib/racc/rdoc/grammar.en.rdoc
+++ b/lib/racc/rdoc/grammar.en.rdoc
@@ -20,7 +20,7 @@ The class block is formed like this:
[token declarations]
[expected number of S/R conflicts]
[options]
- [semantic value convertion]
+ [semantic value conversion]
[start rule]
rule
GRAMMARS