svn commit: r288381 - head/usr.sbin/mergemaster
Bryan Drewery
bdrewery at FreeBSD.org
Tue Sep 29 17:54:02 UTC 2015
Author: bdrewery
Date: Tue Sep 29 17:54:01 2015
New Revision: 288381
URL: https://svnweb.freebsd.org/changeset/base/288381
Log:
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
Modified:
head/usr.sbin/mergemaster/mergemaster.8
Modified: head/usr.sbin/mergemaster/mergemaster.8
==============================================================================
--- head/usr.sbin/mergemaster/mergemaster.8 Tue Sep 29 17:49:59 2015 (r288380)
+++ head/usr.sbin/mergemaster/mergemaster.8 Tue Sep 29 17:54:01 2015 (r288381)
@@ -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
.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
More information about the svn-src-head
mailing list