Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge pull request #7015 from sikachu/3-2-stable-code-style

Update coding convention from master
  • Loading branch information...
commit 45d78a3dd1a1b199d4d3a953d3cef01de47432f6 2 parents 7adc4f2 + 904eace
@fxn fxn authored
Showing with 8 additions and 8 deletions.
  1. +8 −8 railties/guides/source/contributing_to_ruby_on_rails.textile
View
16 railties/guides/source/contributing_to_ruby_on_rails.textile
@@ -307,16 +307,16 @@ h4. Follow the Coding Conventions
Rails follows a simple set of coding style conventions.
-* Two spaces, no tabs.
-* No trailing whitespace. Blank lines should not have any space.
-* Do not indent after private/protected. Private/protected should have the same indentation as the methods around.
+* Two spaces, no tabs (for indentation).
+* No trailing whitespace. Blank lines should not have any spaces.
+* Indent after private/protected.
* Prefer +&&+/+||+ over +and+/+or+.
-* Prefer class << self block over self.method for class methods.
-* +MyClass.my_method(my_arg)+ not +my_method( my_arg )+ or +my_method my_arg+.
-* a = b and not a=b.
-* Follow the conventions you see used in the source already.
+* Prefer class << self over self.method for class methods.
+* Use +MyClass.my_method(my_arg)+ not +my_method( my_arg )+ or +my_method my_arg+.
+* Use a = b and not a=b.
+* Follow the conventions in the source you see used already.
-These are some guidelines and please use your best judgment in using them.
+The above are guidelines -- please use your best judgment in using them.
h4. Sanity Check
Please sign in to comment.
Something went wrong with that request. Please try again.