From owner-svn-doc-head@FreeBSD.ORG  Wed Jun  4 15:34:42 2014
Return-Path: <owner-svn-doc-head@FreeBSD.ORG>
Delivered-To: svn-doc-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id C1671EDB;
 Wed,  4 Jun 2014 15:34:42 +0000 (UTC)
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 AEB822F6B;
 Wed,  4 Jun 2014 15:34:42 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s54FYgvg063228;
 Wed, 4 Jun 2014 15:34:42 GMT (envelope-from gjb@svn.freebsd.org)
Received: (from gjb@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s54FYgx9063227;
 Wed, 4 Jun 2014 15:34:42 GMT (envelope-from gjb@svn.freebsd.org)
Message-Id: <201406041534.s54FYgx9063227@svn.freebsd.org>
From: Glen Barber <gjb@FreeBSD.org>
Date: Wed, 4 Jun 2014 15:34:42 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r45008 - head/en_US.ISO8859-1/articles/committers-guide
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-head@freebsd.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: SVN commit messages for the doc tree for head
 <svn-doc-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-head/>
List-Post: <mailto:svn-doc-head@freebsd.org>
List-Help: <mailto:svn-doc-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 04 Jun 2014 15:34:42 -0000

Author: gjb
Date: Wed Jun  4 15:34:42 2014
New Revision: 45008
URL: http://svnweb.freebsd.org/changeset/doc/45008

Log:
  Document that zsh users should escape '^' when using the '^/head'
  subversion syntax for merging.
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  head/en_US.ISO8859-1/articles/committers-guide/article.xml

Modified: head/en_US.ISO8859-1/articles/committers-guide/article.xml
==============================================================================
--- head/en_US.ISO8859-1/articles/committers-guide/article.xml	Wed Jun  4 14:08:04 2014	(r45007)
+++ head/en_US.ISO8859-1/articles/committers-guide/article.xml	Wed Jun  4 15:34:42 2014	(r45008)
@@ -1870,6 +1870,14 @@ U    stable/9/share/man/man4/netmap.4
 	      repository path.</para>
 	  </tip>
 
+	  <note>
+	    <para>If using the <application>Zsh</application> shell,
+	      the <literal>^</literal> must be escaped with
+	      <literal>\</literal>.  This means
+	      <literal>^/head</literal> should be
+	      <literal>\^/head</literal>.</para>
+	  </note>
+
 	  <para>It is necessary to resolve any merge conflicts.
 	    This process is the same in <acronym>SVN</acronym> as in
 	    <acronym>CVS</acronym>.</para>