aboutsummaryrefslogtreecommitdiff
path: root/UPDATING
diff options
context:
space:
mode:
authorDoug Barton <dougb@FreeBSD.org>2010-03-10 05:44:57 +0000
committerDoug Barton <dougb@FreeBSD.org>2010-03-10 05:44:57 +0000
commit50e8eca6809a340b53247917056c81d949228669 (patch)
treefd7fb2aeb855dca5506c47a3cbbec05f8f7c5a7b /UPDATING
parent6b075665960b7c8b53649f5bfaf1f37a70a2fadc (diff)
downloadsrc-50e8eca6809a340b53247917056c81d949228669.tar.gz
src-50e8eca6809a340b53247917056c81d949228669.zip
Add -i to the first post-install mergemaster example to make
it consistent with the other. [1] Add a note about -U to the mergemaster footnote. Submitted by: obrien [1]
Notes
Notes: svn path=/head/; revision=204942
Diffstat (limited to 'UPDATING')
-rw-r--r--UPDATING5
1 files changed, 3 insertions, 2 deletions
diff --git a/UPDATING b/UPDATING
index fe27b4f87954..c0be9eb91a24 100644
--- a/UPDATING
+++ b/UPDATING
@@ -983,7 +983,7 @@ COMMON ITEMS:
mergemaster -p [5]
make installworld
make delete-old
- mergemaster [4]
+ mergemaster -i [4]
<reboot>
@@ -1054,7 +1054,8 @@ COMMON ITEMS:
system. Attempting to do it by hand is not recommended and those
that pursue this avenue should read this file carefully, as well
as the archives of freebsd-current and freebsd-hackers mailing lists
- for potential gotchas.
+ for potential gotchas. The -U option is also useful to consider.
+ See mergemaster(8) for more information.
[5] Usually this step is a noop. However, from time to time
you may need to do this if you get unknown user in the following