From f415f37c1164f9c592e5ab527e8e3a09797f0b92 Mon Sep 17 00:00:00 2001
From: Doug Barton <dougb@FreeBSD.org>
Date: Sun, 10 Apr 2011 03:53:06 +0000
Subject: [PATCH] Update recommendation for mergemaster. The -a and -i options
 are exclusive.

PR:		docs/156271
Submitted by:	Fedor Dikarev <fedor.dikarev@gmail.com>
---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 579a4b15d938..97ca9d39a8ea 100644
--- a/Makefile
+++ b/Makefile
@@ -65,7 +65,7 @@
 #  6.  `mergemaster -p'
 #  7.  `make installworld'
 #  8.  `make delete-old'
-#  9.  `mergemaster'                         (you may wish to use -U or -ai).
+#  9.  `mergemaster'		(you may wish to use -i, along with -U or -F).
 # 10.  `reboot'
 # 11.  `make delete-old-libs' (in case no 3rd party program uses them anymore)
 #