From e51fbc95826fcedc7dab45dc42978fda752b7221 Mon Sep 17 00:00:00 2001
From: Glen Barber <gjb@FreeBSD.org>
Date: Tue, 23 May 2017 17:54:34 +0000
Subject: [PATCH] Include the system reboot step in the upgrading quick start
 in order to match the instructions outlined in /usr/src/UPDATING.

Noticed by:	emaste
Sponsored by:	The FreeBSD Foundation
---
 .../books/handbook/cutting-edge/chapter.xml     | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.xml b/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.xml
index 8529413134..38d23905da 100644
--- a/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.xml
+++ b/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.xml
@@ -1097,6 +1097,7 @@ before running "/usr/sbin/freebsd-update install"</screen>
 &prompt.root; <userinput>cd /usr/src</userinput>          <co xml:id="updating-src-qs-cd"/>
 &prompt.root; <userinput>make -j<replaceable>4</replaceable> buildworld</userinput>  <co xml:id="updating-src-qs-buildworld"/>
 &prompt.root; <userinput>make -j<replaceable>4</replaceable> kernel</userinput>      <co xml:id="updating-src-qs-kernel"/>
+&prompt.root; <userinput>shutdown -r now</userinput>      <co xml:id="updating-src-qs-reboot"/>
 &prompt.root; <userinput>make installworld</userinput>    <co xml:id="updating-src-qs-installworld"/>
 &prompt.root; <userinput>mergemaster -Ui</userinput>      <co xml:id="updating-src-qs-mergemaster"/>
 &prompt.root; <userinput>shutdown -r now</userinput>      <co xml:id="updating-src-qs-shutdown"/></screen>
@@ -1131,6 +1132,10 @@ before running "/usr/sbin/freebsd-update install"</screen>
 		<buildtarget>installkernel</buildtarget>.</para>
 	    </callout>
 
+	    <callout arearefs="updating-src-qs-reboot">
+	      <para>Reboot the system to the new kernel.</para>
+	    </callout>
+
 	    <callout arearefs="updating-src-qs-installworld">
 	      <para>Install the world.</para>
 	    </callout>
@@ -1404,13 +1409,21 @@ Working Copy Root Path: /usr/src
 	completed, the new kernel and world are installed:</para>
 
       <screen>&prompt.root; <userinput>cd /usr/src</userinput>
-&prompt.root; <userinput>make installkernel installworld</userinput></screen>
+&prompt.root; <userinput>make installkernel</userinput>
+&prompt.root; <userinput>shutdown -r now</userinput>
+&prompt.root; <userinput>cd /usr/src</userinput>
+&prompt.root; <userinput>make installworld</userinput>
+&prompt.root; <userinput>shutdown -r now</userinput></screen>
 
       <para>If a custom kernel was built, <varname>KERNCONF</varname>
 	must also be set to use the new custom kernel:</para>
 
       <screen>&prompt.root; <userinput>cd /usr/src</userinput>
-&prompt.root; <userinput>make installkernel installworld KERNCONF=STORAGESERVER</userinput></screen>
+&prompt.root; <userinput>make installkernel KERNCONF=STORAGESERVER</userinput>
+&prompt.root; <userinput>shutdown -r now</userinput>
+&prompt.root; <userinput>cd /usr/src</userinput>
+&prompt.root; <userinput>make installworld</userinput>
+&prompt.root; <userinput>shutdown -r now</userinput></screen>
     </sect2>
 
     <sect2 xml:id="updating-src-completing">