From owner-svn-src-all@FreeBSD.ORG  Tue Feb  8 23:19:41 2011
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 10C97106564A;
	Tue,  8 Feb 2011 23:19:41 +0000 (UTC)
	(envelope-from jilles@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 008DF8FC12;
	Tue,  8 Feb 2011 23:19:41 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p18NJepk063429;
	Tue, 8 Feb 2011 23:19:40 GMT (envelope-from jilles@svn.freebsd.org)
Received: (from jilles@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id p18NJevx063427;
	Tue, 8 Feb 2011 23:19:40 GMT (envelope-from jilles@svn.freebsd.org)
Message-Id: <201102082319.p18NJevx063427@svn.freebsd.org>
From: Jilles Tjoelker <jilles@FreeBSD.org>
Date: Tue, 8 Feb 2011 23:19:40 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r218467 - head/bin/sh
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 08 Feb 2011 23:19:41 -0000

Author: jilles
Date: Tue Feb  8 23:19:40 2011
New Revision: 218467
URL: http://svn.freebsd.org/changeset/base/218467

Log:
  sh(1): Update description of arithmetic.

Modified:
  head/bin/sh/sh.1

Modified: head/bin/sh/sh.1
==============================================================================
--- head/bin/sh/sh.1	Tue Feb  8 23:18:06 2011	(r218466)
+++ head/bin/sh/sh.1	Tue Feb  8 23:19:40 2011	(r218467)
@@ -32,7 +32,7 @@
 .\"	from: @(#)sh.1	8.6 (Berkeley) 5/4/95
 .\" $FreeBSD$
 .\"
-.Dd February 4, 2011
+.Dd February 8, 2011
 .Dt SH 1
 .Os
 .Sh NAME
@@ -1499,13 +1499,8 @@ and contain integer constants.
 .Li "* / % + - << >> < <= > >= == != & ^ | && ||"
 .It Assignment operators
 .Li "= += -= *= /= %= <<= >>= &= ^= |="
-.It Short-circuit evaluation
-The
-.Li &&
-and
-.Li ||
-operators always evaluate both sides.
-This is a bug.
+.It Conditional operator
+.Li "? :"
 .El
 .Pp
 The result of the expression is substituted in decimal.