From bf5c7e5f747f1dfc230f15e197172ec78f9dd8c2 Mon Sep 17 00:00:00 2001
From: Antonio Ospite <ospite@studenti.unina.it>
Date: Fri, 4 Nov 2011 11:22:19 -0700
Subject: [PATCH] --- yaml --- r: 273740 b: refs/heads/master c:
 b218ab0a5af943441e1daa7dc811874ecd409229 h: refs/heads/master v: v3

---
 [refs]                          | 2 +-
 trunk/Documentation/CodingStyle | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index b2d329c1acae..65489ee29c6f 100644
--- 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
index c940239d9678..2b90d328b3ba 100644
--- 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();