summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--doc/syntax/control_expressions.rdoc2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 8dd72ad3d5..4068d7ab65 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Jan 17 06:59:51 2013 Eric Hodel <drbrain@segment7.net>
+
+ * doc/syntax/control_expressions.rdoc (if Expressions): Fixed markup
+ error. Fixes #235 on github by FlyingFoX.
+
Thu Jan 17 06:53:58 2013 Eric Hodel <drbrain@segment7.net>
* doc/syntax/literals.rdoc (Strings): Fixed typo. Fixes #236 on
diff --git a/doc/syntax/control_expressions.rdoc b/doc/syntax/control_expressions.rdoc
index b25f6936eb..18dd40b676 100644
--- a/doc/syntax/control_expressions.rdoc
+++ b/doc/syntax/control_expressions.rdoc
@@ -54,7 +54,7 @@ You may add an arbitrary number of extra tests to an if expression using
puts "a is some other value"
end
-This will print "a is one" as <code>1<code> is not equal to <code>0</code>.
+This will print "a is one" as <code>1</code> is not equal to <code>0</code>.
Since +else+ is only executed when there are no matching conditions.
Once a condition matches, either the +if+ condition or any +elsif+ condition,