D28062.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D28062.diff
View Options

	diff --git a/UPDATING b/UPDATING
	--- a/UPDATING
	+++ b/UPDATING
	@@ -2463,9 +2463,9 @@
	make installkernel KERNCONF=YOUR_KERNEL_HERE
	[1]
	<reboot in single user> [3]
	- mergemaster -Fp [5]
	+ etcupdate -p [5]
	make installworld
	- mergemaster -Fi [4]
	+ etcupdate -B [4]
	make delete-old [6]
	<reboot>

	@@ -2501,9 +2501,9 @@
	make installkernel KERNCONF=YOUR_KERNEL_HERE
	[1]
	<reboot in single user> [3]
	- mergemaster -Fp [5]
	+ etcupdate -p [5]
	make installworld
	- mergemaster -Fi [4]
	+ etcupdate -B [4]
	make delete-old [6]
	<reboot>

	@@ -2545,15 +2545,11 @@
	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. The -U option is also useful to consider.
	- See mergemaster(8) for more information.
	+ for potential gotchas. See etcupdate(8) for more information.

	[5] Usually this step is a no-op. However, from time to time
	you may need to do this if you get unknown user in the following
	- step. It never hurts to do it all the time. You may need to
	- install a new mergemaster (cd src/usr.sbin/mergemaster && make
	- install) after the buildworld before this step if you last updated
	- from current before 20130425 or from -stable before 20130430.
	+ step.

	[6] This only deletes old files and directories. Old libraries
	can be deleted by "make delete-old-libs", but you have to make