diff options
| author | bdrewery <bdrewery@FreeBSD.org> | 2015-10-02 16:22:21 +0000 |
|---|---|---|
| committer | bdrewery <bdrewery@FreeBSD.org> | 2015-10-02 16:22:21 +0000 |
| commit | 72912c00d14d420ccd73322c30a19e9c74e87231 (patch) | |
| tree | ed4dbbdd0175525bc0109d89f16a8d773a0fd385 /usr.sbin/mergemaster | |
| parent | 3a033970959315345b54cc246d29d2dd97012645 (diff) | |
| download | FreeBSD-src-72912c00d14d420ccd73322c30a19e9c74e87231.zip FreeBSD-src-72912c00d14d420ccd73322c30a19e9c74e87231.tar.gz | |
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'.
Diffstat (limited to 'usr.sbin/mergemaster')
| -rw-r--r-- | usr.sbin/mergemaster/mergemaster.8 | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/usr.sbin/mergemaster/mergemaster.8 b/usr.sbin/mergemaster/mergemaster.8 index 1cff984..d939c41 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 |
