svn commit: r220609 - stable/7
Doug Barton
dougb at FreeBSD.org
Wed Apr 13 19:55:59 UTC 2011
Author: dougb
Date: Wed Apr 13 19:55:58 2011
New Revision: 220609
URL: http://svn.freebsd.org/changeset/base/220609
Log:
MFC r220512:
Update recommendation for mergemaster. The -a and -i options are exclusive.
Modified:
stable/7/Makefile (contents, props changed)
Modified: stable/7/Makefile
==============================================================================
--- stable/7/Makefile Wed Apr 13 19:54:54 2011 (r220608)
+++ stable/7/Makefile Wed Apr 13 19:55:58 2011 (r220609)
@@ -57,7 +57,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)
#
More information about the svn-src-stable-7
mailing list