From e38b86607d645f8f4ecbd7caf6ee08dad58a948d Mon Sep 17 00:00:00 2001
From: Alexander Makarov <sam@rmcreative.ru>
Date: Thu, 3 May 2012 14:59:03 +0400
Subject: [PATCH] fixed unclear statements, added notes about one-line comments

---
 docs/code_style.md | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/docs/code_style.md b/docs/code_style.md
index eda58b0..2db3ee5 100644
--- a/docs/code_style.md
+++ b/docs/code_style.md
@@ -54,10 +54,10 @@ $str3 = "Hello ${username}!";
 
 ### String concatenation
 
-When concatenating strings format it like the following:
+Add spaces around dot when concatenating strings:
 
 ~~~
-$name = 'Yii' . ' ' . 'Framework';
+$name = 'Yii' . ' Framework';
 ~~~
 
 When string is long format is the following:
@@ -302,6 +302,11 @@ public function getEventHandlers($name)
 }
 ~~~
 
+#### Comments
+
+- One-line comments should be started with `//` and not `#`.
+- One-line comment should be on its own line.
+
 Yii application naming conventions
 ----------------------------------