From owner-svn-src-all@freebsd.org  Tue Apr 26 18:54:45 2016
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@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 74A58B1CB7C;
 Tue, 26 Apr 2016 18:54:45 +0000 (UTC) (envelope-from bhd@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 45AFA1305;
 Tue, 26 Apr 2016 18:54:45 +0000 (UTC) (envelope-from bhd@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u3QIsiZX007018;
 Tue, 26 Apr 2016 18:54:44 GMT (envelope-from bhd@FreeBSD.org)
Received: (from bhd@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u3QIsilS007017;
 Tue, 26 Apr 2016 18:54:44 GMT (envelope-from bhd@FreeBSD.org)
Message-Id: <201604261854.u3QIsilS007017@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: bhd set sender to bhd@FreeBSD.org
 using -f
From: Bjoern Heidotting <bhd@FreeBSD.org>
Date: Tue, 26 Apr 2016 18:54:44 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r298658 - head/usr.sbin/etcupdate
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.21
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: <https://lists.freebsd.org/mailman/options/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: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 26 Apr 2016 18:54:45 -0000

Author: bhd (doc committer)
Date: Tue Apr 26 18:54:44 2016
New Revision: 298658
URL: https://svnweb.freebsd.org/changeset/base/298658

Log:
  Remove redundant word.
  
  Reviewed by:	 bjk, bcr
  Differential Revision:	https://reviews.freebsd.org/D6064

Modified:
  head/usr.sbin/etcupdate/etcupdate.8

Modified: head/usr.sbin/etcupdate/etcupdate.8
==============================================================================
--- head/usr.sbin/etcupdate/etcupdate.8	Tue Apr 26 18:20:41 2016	(r298657)
+++ head/usr.sbin/etcupdate/etcupdate.8	Tue Apr 26 18:54:44 2016	(r298658)
@@ -870,7 +870,7 @@ utility was written by
 Rerunning a merge does not automatically delete conflicts left over from a
 previous merge.
 Any conflicts must be resolved before the merge can be rerun.
-It it is not clear if this is a feature or a bug.
+It is not clear if this is a feature or a bug.
 .Pp
 There is no way to easily automate conflict resolution for specific files.
 For example, one can imagine a syntax along the lines of