From: bdrewery <bdrewery@FreeBSD.org>
Date: Tue, 29 Sep 2015 17:54:01 +0000 (+0000)
Subject: All supported releases have the -m support from r186678, so remove
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=73b98f0a15953e79ff825abec3a9af48b84cc797;p=people%2Fjulieng%2Ffreebsd.git

All supported releases have the -m support from r186678, so remove
the mention of it and reword this a bit to remove 'you'.

MFC after:	3 days
---

diff --git a/usr.sbin/mergemaster/mergemaster.8 b/usr.sbin/mergemaster/mergemaster.8
index c3e22a055961..d88bdd012110 100644
--- a/usr.sbin/mergemaster/mergemaster.8
+++ b/usr.sbin/mergemaster/mergemaster.8
@@ -24,7 +24,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd November 1, 2011
+.Dd September 29, 2015
 .Dt MERGEMASTER 8
 .Os
 .Sh NAME
@@ -257,14 +257,13 @@ Specify the path to the directory where you want to do the
 .Xr make 1 .
 (In other words, where your sources are, but -s was already
 taken.)
-In previous versions of
+In older versions of
 .Nm
-you needed to specify the path all the way to
-.Pa src/etc .
-Starting with r186678 you only need to specify the path to
-.Pa src .
+the path to
+.Pa src/etc
+was required.
 .Nm
-will convert the path for you if you use the old method.
+will convert the path if this older method is used.
 .It Fl t Ar /path/to/temp/root
 Create the temporary root environment in
 .Pa /path/to/temp/root