Merge branch 'master' of https://github.com/designcreateplay/NodeBB

11 years ago · 4961becd1d
parent 809db61b8a e5d33a57d9
commit 4961becd1d
1 changed files with 2 additions and 2 deletions
--- a/docs/contributing/style-guide.rst
+++ b/docs/contributing/style-guide.rst
@ -23,7 +23,7 @@ NodeBB uses tabbed indentation. Bracing should follow the `One True Brace Style
        // otherwise ...
    }
-Put conditionals and statements on separate lines and wrap with curly braces even if they it's just one line:
+Put conditionals and statements on separate lines and wrap with curly braces even if it's just one line:
 .. code:: javascript
@ -73,4 +73,4 @@ CamelCase if at all possible:
 .. code:: javascript
-	functionNamesLikeThis, variableNamesLikeThis, ClassNamesLikeThis, EnumNamesLikeThis, methodNamesLikeThis, CONSTANT_VALUES_LIKE_THIS, foo.namespaceNamesLikeThis.bar, and filenameslikethis.js.
+	functionNamesLikeThis, variableNamesLikeThis, ClassNamesLikeThis, EnumNamesLikeThis, methodNamesLikeThis, CONSTANT_VALUES_LIKE_THIS, foo.namespaceNamesLikeThis.bar, and filenameslikethis.js.