Author: bdrewery
Date: Fri Oct 2 16:22:21 2015
New Revision: 288507
URL: https://svnweb.freebsd.org/changeset/base/288507
Log:
MFC r288381:
All supported releases have the -m support from r186678, so remove the
mention of it and reword this a bit to remove 'you'.
Modified:
stable/10/usr.sbin/mergemaster/mergemaster.8
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/usr.sbin/mergemaster/mergemaster.8
==============================================================================
--- stable/10/usr.sbin/mergemaster/mergemaster.8 Fri Oct 2 16:21:25
2015 (r288506)
+++ stable/10/usr.sbin/mergemaster/mergemaster.8 Fri Oct 2 16:22:21
2015 (r288507)
@@ -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
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
