Date: Fri, 2 Oct 2015 16:22:25 +0000 (UTC) From: Bryan Drewery <bdrewery@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r288508 - stable/9/usr.sbin/mergemaster Message-ID: <201510021622.t92GMPoR078016@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bdrewery Date: Fri Oct 2 16:22:24 2015 New Revision: 288508 URL: https://svnweb.freebsd.org/changeset/base/288508 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/9/usr.sbin/mergemaster/mergemaster.8 Directory Properties: stable/9/usr.sbin/mergemaster/ (props changed) Modified: stable/9/usr.sbin/mergemaster/mergemaster.8 ============================================================================== --- stable/9/usr.sbin/mergemaster/mergemaster.8 Fri Oct 2 16:22:21 2015 (r288507) +++ stable/9/usr.sbin/mergemaster/mergemaster.8 Fri Oct 2 16:22:24 2015 (r288508) @@ -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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201510021622.t92GMPoR078016>