From 7c321f872c85f1c9ac4f673ef0361e555eb5e579 Mon Sep 17 00:00:00 2001
From: dougb <dougb@FreeBSD.org>
Date: Fri, 2 Jan 2009 22:24:12 +0000
Subject: [PATCH] Add a note to the -m option indicating that you should now
 specify src/ instead of src/etc.

---
 usr.sbin/mergemaster/mergemaster.8 | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/usr.sbin/mergemaster/mergemaster.8 b/usr.sbin/mergemaster/mergemaster.8
index 10c5ae75aad..aaf7e544083 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
-- 
2.45.0