From owner-svn-src-head@FreeBSD.ORG  Fri Jun 19 21:30:46 2015
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@hub.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 389335B0;
 Fri, 19 Jun 2015 21:30:46 +0000 (UTC) (envelope-from imp@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 2721C24C;
 Fri, 19 Jun 2015 21:30:46 +0000 (UTC) (envelope-from imp@FreeBSD.org)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5JLUklm068177;
 Fri, 19 Jun 2015 21:30:46 GMT (envelope-from imp@FreeBSD.org)
Received: (from imp@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5JLUkn7068176;
 Fri, 19 Jun 2015 21:30:46 GMT (envelope-from imp@FreeBSD.org)
Message-Id: <201506192130.t5JLUkn7068176@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: imp set sender to imp@FreeBSD.org
 using -f
From: Warner Losh <imp@FreeBSD.org>
Date: Fri, 19 Jun 2015 21:30:46 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r284608 - head/share/man/man9
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 19 Jun 2015 21:30:46 -0000

Author: imp
Date: Fri Jun 19 21:30:45 2015
New Revision: 284608
URL: https://svnweb.freebsd.org/changeset/base/284608

Log:
  Back out contested change until dispute is resolved. This proved to be
  more contentious than I expected.

Modified:
  head/share/man/man9/style.9

Modified: head/share/man/man9/style.9
==============================================================================
--- head/share/man/man9/style.9	Fri Jun 19 21:26:06 2015	(r284607)
+++ head/share/man/man9/style.9	Fri Jun 19 21:30:45 2015	(r284608)
@@ -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-obviou
 .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