svn commit: r220512 - head

[Doug Barton]

Author: dougb
Date: Sun Apr 10 03:53:06 2011
New Revision: 220512
URL: http://svn.freebsd.org/changeset/base/220512

Log:
  Update recommendation for mergemaster. The -a and -i options are exclusive.
  
  PR:		docs/156271
  Submitted by:	Fedor Dikarev <fedor.dikarev at gmail.com>

Modified:
  head/Makefile

Modified: head/Makefile
==============================================================================
--- head/Makefile	Sun Apr 10 03:49:53 2011	(r220511)
+++ head/Makefile	Sun Apr 10 03:53:06 2011	(r220512)
@@ -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)
 #