From owner-svn-src-head@FreeBSD.ORG  Fri Nov 12 22:28:47 2010
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id A49A5106566C;
	Fri, 12 Nov 2010 22:28:47 +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 92C648FC0C;
	Fri, 12 Nov 2010 22:28:47 +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 oACMSl48025786;
	Fri, 12 Nov 2010 22:28:47 GMT (envelope-from jilles@svn.freebsd.org)
Received: (from jilles@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id oACMSlb3025784;
	Fri, 12 Nov 2010 22:28:47 GMT (envelope-from jilles@svn.freebsd.org)
Message-Id: <201011122228.oACMSlb3025784@svn.freebsd.org>
From: Jilles Tjoelker <jilles@FreeBSD.org>
Date: Fri, 12 Nov 2010 22:28:47 +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: r215209 - head/bin/sh
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
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/listinfo/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, 12 Nov 2010 22:28:47 -0000

Author: jilles
Date: Fri Nov 12 22:28:47 2010
New Revision: 215209
URL: http://svn.freebsd.org/changeset/base/215209

Log:
  sh(1): Update for r214492. "${v+"hi}there"}".
  
  The part hi}there is not a quoted string but nevertheless the closing brace
  does not terminate the expansion.

Modified:
  head/bin/sh/sh.1

Modified: head/bin/sh/sh.1
==============================================================================
--- head/bin/sh/sh.1	Fri Nov 12 22:10:19 2010	(r215208)
+++ head/bin/sh/sh.1	Fri Nov 12 22:28:47 2010	(r215209)
@@ -1268,19 +1268,22 @@ consists of all characters until the mat
 .Ql } .
 Any
 .Ql }
-escaped by a backslash or within a single-quoted string, and characters in
+escaped by a backslash or within a single-quoted or double-quoted
+string, and characters in
 embedded arithmetic expansions, command substitutions, and variable
 expansions, are not examined in determining the matching
 .Ql } .
-Except for the variants with
+If the variants with
 .Ql + ,
 .Ql - ,
 .Ql =
 or
-.Ql ?\& ,
-any
+.Ql ?\&
+occur within a double-quoted string,
+as an extension there may be unquoted parts
+(via double-quotes inside the expansion);
 .Ql }
-within a double-quoted string is also not examined in determining the matching
+within such parts are also not examined in determining the matching
 .Ql } .
 .Pp
 The simplest form for parameter expansion is: