summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--doc/keywords.rdoc7
2 files changed, 12 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 167bcfa630..3c9b89f088 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon Feb 17 15:43:59 2014 Zachary Scott <e@zzak.io>
+
+ * doc/keywords.rdoc: [DOC] Add keywords doc by documenting-ruby/ruby#29
+ https://github.com/documenting-ruby/ruby/pull/29
+
Mon Feb 17 12:31:31 2014 Koichi Sasada <ko1@atdot.net>
* gc.c (get_envparam_double): fix a warning message.
diff --git a/doc/keywords.rdoc b/doc/keywords.rdoc
new file mode 100644
index 0000000000..56300a8426
--- /dev/null
+++ b/doc/keywords.rdoc
@@ -0,0 +1,7 @@
+== Keywords
+
+The following keywords are available in Ruby.
+
+ __ENCODING__ __LINE__ __FILE__ BEGIN END alias and begin break case class def
+ defined? do else elsif end ensure false for if in module next nil not or redo
+ rescue retry return self super then true undef unless until when while yield