From 196f0f2b53a27c2b13c925f521d38929aaf7e8e7 Mon Sep 17 00:00:00 2001
From: Warner Losh <imp@FreeBSD.org>
Date: Fri, 19 Jun 2015 21:30:45 +0000
Subject: [PATCH] Back out contested change until dispute is resolved. This
 proved to be more contentious than I expected.

---
 share/man/man9/style.9 | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/share/man/man9/style.9 b/share/man/man9/style.9
index f53739a6df67..ed65ac67b0ad 100644
--- a/share/man/man9/style.9
+++ b/share/man/man9/style.9
@@ -26,7 +26,7 @@
 .\"	From: @(#)style	1.14 (Berkeley) 4/28/95
 .\" $FreeBSD$
 .\"
-.Dd June 17, 2015
+.Dd January 7, 2010
 .Dt STYLE 9
 .Os
 .Sh NAME
@@ -503,14 +503,13 @@ Code which is unreachable for non-obvious reasons may be marked /*
 .Pp
 Space after keywords
 .Pq Ic if , while , for , return , switch .
-Two styles of braces
+No braces
 .Ql ( \&{
 and
 .Ql \&} )
-are allowed for single line statements.
-Either they are used for all single statements, or
-they are used only where needed for clarity.
-Usage within a file should be consistent.
+are
+used for control statements with zero or only a single statement unless that
+statement is more than a single line in which case they are permitted.
 Forever loops are done with
 .Ic for Ns 's ,
 not