svn commit: r220608 - stable/8

[Doug Barton]

Author: dougb
Date: Wed Apr 13 19:54:54 2011
New Revision: 220608
URL: http://svn.freebsd.org/changeset/base/220608

Log:
  MFC r220512:
  
  Update recommendation for mergemaster. The -a and -i options are exclusive.

Modified:
  stable/8/Makefile   (contents, props changed)

Modified: stable/8/Makefile
==============================================================================
--- stable/8/Makefile	Wed Apr 13 19:34:58 2011	(r220607)
+++ stable/8/Makefile	Wed Apr 13 19:54:54 2011	(r220608)
@@ -58,7 +58,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)
 #