From owner-svn-doc-head@freebsd.org  Tue Apr  4 13:16:45 2017
Return-Path: <owner-svn-doc-head@freebsd.org>
Delivered-To: svn-doc-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 92684D2D2ED;
 Tue,  4 Apr 2017 13:16:45 +0000 (UTC)
 (envelope-from sevan@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::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 5F0DF9B1;
 Tue,  4 Apr 2017 13:16:45 +0000 (UTC)
 (envelope-from sevan@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v34DGiB1085425;
 Tue, 4 Apr 2017 13:16:44 GMT (envelope-from sevan@FreeBSD.org)
Received: (from sevan@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v34DGiQ6085424;
 Tue, 4 Apr 2017 13:16:44 GMT (envelope-from sevan@FreeBSD.org)
Message-Id: <201704041316.v34DGiQ6085424@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: sevan set sender to
 sevan@FreeBSD.org using -f
From: Sevan Janiyan <sevan@FreeBSD.org>
Date: Tue, 4 Apr 2017 13:16:44 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r50128 - head/en_US.ISO8859-1/books/handbook/cutting-edge
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.23
Precedence: list
List-Id: SVN commit messages for the doc tree for head
 <svn-doc-head.freebsd.org>
List-Unsubscribe: <https://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: <https://lists.freebsd.org/mailman/listinfo/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 04 Apr 2017 13:16:45 -0000

Author: sevan
Date: Tue Apr  4 13:16:44 2017
New Revision: 50128
URL: https://svnweb.freebsd.org/changeset/doc/50128

Log:
  Reword sentences to improve readability.
  
  PR:		218072
  Submitted by:	Samuel Breese <samuel AT chame co>
  Approved by:	bcr (mentor)
  Differential Revision:	https://reviews.freebsd.org/D10261

Modified:
  head/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.xml

Modified: head/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.xml
==============================================================================
--- head/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.xml	Tue Apr  4 13:13:10 2017	(r50127)
+++ head/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.xml	Tue Apr  4 13:16:44 2017	(r50128)
@@ -1704,9 +1704,9 @@ Script started, output file is /var/tmp/
 	replace the current file with the new one.  For most
 	unmodified files, this is the best option.</para>
 
-      <para>Choosing to merge the file will present a text editor, and
-	the contents of both files.  The files can be merged by
-	reviewing both files side by side on the screen, and choosing
+      <para>Choosing to merge the file will present a text editor with
+	the contents of both files open.  The files can be merged by
+	reviewing both files side by side on the screen and choosing
 	parts from both to create a finished product.  When the files
 	are compared side by side, <keycap>l</keycap> selects the left
 	contents and <keycap>r</keycap> selects contents from the