From owner-svn-doc-all@freebsd.org  Sun Sep 27 21:56:03 2015
Return-Path: <owner-svn-doc-all@freebsd.org>
Delivered-To: svn-doc-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 E488A9D01D8;
 Sun, 27 Sep 2015 21:56:03 +0000 (UTC)
 (envelope-from allanjude@FreeBSD.org)
Received: from repo.freebsd.org (repo.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 D5236D48;
 Sun, 27 Sep 2015 21:56:03 +0000 (UTC)
 (envelope-from allanjude@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.70])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t8RLu3if001812;
 Sun, 27 Sep 2015 21:56:03 GMT (envelope-from allanjude@FreeBSD.org)
Received: (from allanjude@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id t8RLu3fP001811;
 Sun, 27 Sep 2015 21:56:03 GMT (envelope-from allanjude@FreeBSD.org)
Message-Id: <201509272156.t8RLu3fP001811@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: allanjude set sender to
 allanjude@FreeBSD.org using -f
From: Allan Jude <allanjude@FreeBSD.org>
Date: Sun, 27 Sep 2015 21:56:03 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r47445 - head/en_US.ISO8859-1/books/handbook/disks
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-all@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the entire doc trees \(except for &quot;
 user&quot; , &quot; projects&quot; , and &quot; translations&quot;
 \)" <svn-doc-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-all/>
List-Post: <mailto:svn-doc-all@freebsd.org>
List-Help: <mailto:svn-doc-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 27 Sep 2015 21:56:04 -0000

Author: allanjude
Date: Sun Sep 27 21:56:03 2015
New Revision: 47445
URL: https://svnweb.freebsd.org/changeset/doc/47445

Log:
  Improve the instructions in the HAST section of the handbook
  
  PR:		203340
  Submitted by:	mwalker1025@gmail.com
  Approved by:	bcr (mentor)
  Sponsored by:	EuroBSDCon DevSummit

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

Modified: head/en_US.ISO8859-1/books/handbook/disks/chapter.xml
==============================================================================
--- head/en_US.ISO8859-1/books/handbook/disks/chapter.xml	Sun Sep 27 21:42:43 2015	(r47444)
+++ head/en_US.ISO8859-1/books/handbook/disks/chapter.xml	Sun Sep 27 21:56:03 2015	(r47445)
@@ -3597,8 +3597,8 @@ esac</programlisting>
 	  changes to the data.  This problem must be corrected
 	  manually by the system administrator.</para>
 
-	<para>The administrator must decide which node has more
-	  important changes or merge them manually.  Then, let
+	<para>The administrator must either decide which node has more
+	  important changes, or perform the merge manually.  Then, let
 	  <acronym>HAST</acronym> perform full synchronization of the
 	  node which has the broken data.  To do this, issue these
 	  commands on the node which needs to be