svn commit: r47445 - head/en_US.ISO8859-1/books/handbook/disks

Allan Jude <[email protected]>
Newsgroups gmane.os.freebsd.devel.cvs.doc
Message-ID <[email protected]>
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:	[email protected]
  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
_______________________________________________
[email protected] mailing list
https://lists.freebsd.org/mailman/listinfo/svn-doc-all
To unsubscribe, send any mail to "[email protected]"
lmpx.com only provides a reader for public news (NNTP) servers. It is not affiliated with the servers or forums shown here and is not responsible for the content of articles, which is written by their respective authors.