summaryrefslogtreecommitdiffstats
path: root/usr.sbin
diff options
context:
space:
mode:
authorbdrewery <bdrewery@FreeBSD.org>2015-09-29 17:54:01 +0000
committerbdrewery <bdrewery@FreeBSD.org>2015-09-29 17:54:01 +0000
commit73b98f0a15953e79ff825abec3a9af48b84cc797 (patch)
tree45cb75ec71bf9ed28dea7d359752210a3e238020 /usr.sbin
parent37b54e02f2f32f1cf996c5c41823bedefa001dc7 (diff)
downloadFreeBSD-src-73b98f0a15953e79ff825abec3a9af48b84cc797.zip
FreeBSD-src-73b98f0a15953e79ff825abec3a9af48b84cc797.tar.gz
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
Diffstat (limited to 'usr.sbin')
-rw-r--r--usr.sbin/mergemaster/mergemaster.813
1 files changed, 6 insertions, 7 deletions
diff --git a/usr.sbin/mergemaster/mergemaster.8 b/usr.sbin/mergemaster/mergemaster.8
index c3e22a0..d88bdd0 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
OpenPOWER on IntegriCloud