---

yaml --- r: 273740 b: refs/heads/master c: b218ab0 h: refs/heads/master v: v3
git-mirror · Nov 4, 2011 · bf5c7e5 · bf5c7e5
1 parent 1e3efd0
commit bf5c7e5
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d83fe6b6c54749a9b2d3198d62ec981024459425
+refs/heads/master: b218ab0a5af943441e1daa7dc811874ecd409229
diff --git a/trunk/Documentation/CodingStyle b/trunk/Documentation/CodingStyle
@@ -166,8 +166,8 @@ if (condition)
 else
 	do_that();
 
-This does not apply if one branch of a conditional statement is a single
-statement. Use braces in both branches.
+This does not apply if only one branch of a conditional statement is a single
+statement; in the latter case use braces in both branches:
 
 if (condition) {
 	do_this();