summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--doc/syntax/miscellaneous.rdoc16
2 files changed, 21 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index c54b201a17..248540a1dc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Jan 17 10:21:05 2013 Eric Hodel <drbrain@segment7.net>
+
+ * doc/syntax/miscellaneous.rdoc: Added Ending an Expression and
+ indentation.
+
Thu Jan 17 09:30:21 2013 Eric Hodel <drbrain@segment7.net>
* lib/rubygems/installer.rb: Untaint string when checking output
diff --git a/doc/syntax/miscellaneous.rdoc b/doc/syntax/miscellaneous.rdoc
index 409afc797b..cb5865ff01 100644
--- a/doc/syntax/miscellaneous.rdoc
+++ b/doc/syntax/miscellaneous.rdoc
@@ -1,5 +1,21 @@
= Miscellaneous Syntax
+== Ending an Expression
+
+Ruby uses a newline as the end of an expression. When ending a line with an
+operator, open parentheses, comma, etc. the expression will continue.
+
+You can end an expression with a <code>;</code> (semicolon). Semicolons are
+most frequently used with <code>ruby -e</code>.
+
+== Indentation
+
+Ruby does not require any indentation. Typically ruby programs are indented
+two spaces.
+
+If you run ruby with warnings enabled and have an indentation mis-match you
+will receive a warning.
+
== +alias+
The +alias+ keyword is most frequently used to alias methods. When aliasing a