mirror of
https://git.FreeBSD.org/src.git
synced 2024-12-28 11:57:28 +00:00
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]
This commit is contained in:
parent
6b07566596
commit
50e8eca680
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=204942
5
UPDATING
5
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
|
||||
|
Loading…
Reference in New Issue
Block a user