aboutsummaryrefslogtreecommitdiff
path: root/usr.sbin/mergemaster/mergemaster.8
diff options
context:
space:
mode:
authorDoug Barton <dougb@FreeBSD.org>2009-01-02 22:24:12 +0000
committerDoug Barton <dougb@FreeBSD.org>2009-01-02 22:24:12 +0000
commit74983dbff9c65f2dc0f962c9a6e338034fff94ac (patch)
treeab6c12734a67f8762341e97274436007eb5d1611 /usr.sbin/mergemaster/mergemaster.8
parent96747dc0154eaee558a330165b9f43365d4b0dd7 (diff)
downloadsrc-74983dbff9c65f2dc0f962c9a6e338034fff94ac.tar.gz
src-74983dbff9c65f2dc0f962c9a6e338034fff94ac.zip
Add a note to the -m option indicating that you should now specify src/
instead of src/etc.
Notes
Notes: svn path=/head/; revision=186704
Diffstat (limited to 'usr.sbin/mergemaster/mergemaster.8')
-rw-r--r--usr.sbin/mergemaster/mergemaster.810
1 files changed, 9 insertions, 1 deletions
diff --git a/usr.sbin/mergemaster/mergemaster.8 b/usr.sbin/mergemaster/mergemaster.8
index 10c5ae75aadc..aaf7e544083d 100644
--- a/usr.sbin/mergemaster/mergemaster.8
+++ b/usr.sbin/mergemaster/mergemaster.8
@@ -24,7 +24,7 @@
.\"
.\" $FreeBSD$
.\"
-.Dd January 1, 2009
+.Dd January 2, 2009
.Dt MERGEMASTER 8
.Os
.Sh NAME
@@ -218,6 +218,14 @@ 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
+.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 .
+.Nm
+will convert the path for you if you use the old method.
.It Fl t Ar /path/to/temp/root
Create the temporary root environment in
.Pa /path/to/temp/root