Date: Wed, 10 Mar 2010 05:44:57 +0000 (UTC) From: Doug Barton <dougb@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r204942 - head Message-ID: <201003100544.o2A5ivtG045148@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: dougb Date: Wed Mar 10 05:44:57 2010 New Revision: 204942 URL: http://svn.freebsd.org/changeset/base/204942 Log: 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] Modified: head/UPDATING Modified: head/UPDATING ============================================================================== --- head/UPDATING Wed Mar 10 05:19:14 2010 (r204941) +++ head/UPDATING Wed Mar 10 05:44:57 2010 (r204942) @@ -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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201003100544.o2A5ivtG045148>