svn commit: r53920 - in head: en_US.ISO8859-1/books/handbook en_US.ISO8859-1/books/handbook/bsdinstall share/images/books/handbook/bsdinstall

[Sergio Carlavilla Delgado]

Author: carlavilla
Date: Thu Feb 20 13:18:06 2020
New Revision: 53920
URL: https://svnweb.freebsd.org/changeset/doc/53920

Log:
  Update the bsdinstall section in the handbook to reflect the new keyboard
  section
  
  Patch by:	carlavilla@
  Approved by:	bcr@(mentor)
  Differential Revision:	https://reviews.freebsd.org/D23761

Added:
  head/share/images/books/handbook/bsdinstall/bsdinstall-keymap-testing.png   (contents, props changed)
Modified:
  head/en_US.ISO8859-1/books/handbook/Makefile
  head/en_US.ISO8859-1/books/handbook/bsdinstall/chapter.xml

Modified: head/en_US.ISO8859-1/books/handbook/Makefile
==============================================================================
--- head/en_US.ISO8859-1/books/handbook/Makefile	Thu Feb 20 09:35:44 2020	(r53919)
+++ head/en_US.ISO8859-1/books/handbook/Makefile	Thu Feb 20 13:18:06 2020	(r53920)
@@ -67,6 +67,7 @@ IMAGES_EN+= bsdinstall/bsdinstall-final-modification-s
 IMAGES_EN+= bsdinstall/bsdinstall-keymap-10.png
 IMAGES_EN+= bsdinstall/bsdinstall-keymap-loading.png
 IMAGES_EN+= bsdinstall/bsdinstall-keymap-select-default.png
+IMAGES_EN+= bsdinstall/bsdinstall-keymap-testing.png
 IMAGES_EN+= bsdinstall/bsdinstall-mainexit.png
 IMAGES_EN+= bsdinstall/bsdinstall-netinstall-files.png
 IMAGES_EN+= bsdinstall/bsdinstall-netinstall-mirrorselect.png

Modified: head/en_US.ISO8859-1/books/handbook/bsdinstall/chapter.xml
==============================================================================
--- head/en_US.ISO8859-1/books/handbook/bsdinstall/chapter.xml	Thu Feb 20 09:35:44 2020	(r53919)
+++ head/en_US.ISO8859-1/books/handbook/bsdinstall/chapter.xml	Thu Feb 20 13:18:06 2020	(r53920)
@@ -947,65 +947,38 @@ Ethernet address 0:3:ba:b:92:d4, Host ID: 830b92d4.</s
 	</mediaobject>
       </figure>
 
-      <para>Depending on the system console being used,
-	<application>bsdinstall</application> may initially display
-	the menu shown in <xref
-	  linkend="bsdinstall-keymap-select-default"/>.</para>
+      <para>After the keymaps have been loaded bsdinstall displays the
+	menu shown in <xref linkend="bsdinstall-keymap-10"/>.  Use the
+	up and down arrows to select the keymap that most closely
+	represents the mapping of the keyboard attached to the system.
+	Press <keycap>Enter</keycap> to save the selection.</para>
 
-      <figure xml:id="bsdinstall-keymap-select-default">
-	<title>Keymap Selection</title>
+      <figure xml:id="bsdinstall-keymap-10">
+	<title>Keymap Selection Menu</title>
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata
-	      fileref="bsdinstall/bsdinstall-keymap-select-default"/>
+	    <imagedata fileref="bsdinstall/bsdinstall-keymap-10"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
 
-      <para>To configure the keyboard layout, press
-	<keycap>Enter</keycap> with
-	<guibutton>[ YES ]</guibutton> selected, which will
-	display the menu shown in <xref
-	  linkend="bsdinstall-config-keymap"/>.  To instead use the
-	default layout, use the arrow key to select
-	<guibutton>[ NO ]</guibutton> and press
-	<keycap>Enter</keycap> to skip this menu screen.</para>
+      <note><para>Pressing <keycap>Esc</keycap> will exit this menu
+	and use the default keymap.  If the choice of keymap is not
+	clear, <guimenuitem>United States of America
+	ISO-8859-1</guimenuitem> is also a safe option.</para></note>
 
-      <figure xml:id="bsdinstall-config-keymap">
-	<title>Selecting Keyboard Menu</title>
+      <para>In addition, when selecting a different keymap, the user
+	can try the keymap and ensure it is correct before proceeding
+	as shown in <xref linkend="bsdinstall-keymap-testing"/>.</para>
 
-	<mediaobject>
-	  <imageobject>
-	    <imagedata fileref="bsdinstall/bsdinstall-config-keymap"/>
-	  </imageobject>
-	</mediaobject>
-      </figure>
+      <figure xml:id="bsdinstall-keymap-testing">
+	<title>Keymap Testing Menu</title>
 
-      <para>When configuring the keyboard layout, use the up and down
-	arrows to select the keymap that most closely represents the
-	mapping of the keyboard attached to the system.  Press
-	<keycap>Enter</keycap> to save the selection.</para>
-
-      <note>
-	<para>Pressing <keycap>Esc</keycap> will exit this menu and
-	  use the default keymap.  If the choice of keymap is not
-	  clear, <guimenuitem>United States of America
-	    ISO-8859-1</guimenuitem> is also a safe option.</para>
-      </note>
-
-      <para>In &os; 10.0-RELEASE and later, this menu has been
-	enhanced.  The full selection of keymaps is shown, with the
-	default preselected.  In addition, when selecting a different
-	keymap, a dialog is displayed that allows the user to try the
-	keymap and ensure it is correct before proceeding.</para>
-
-      <figure xml:id="bsdinstall-keymap-10">
-	<title>Enhanced Keymap Menu</title>
-
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="bsdinstall/bsdinstall-keymap-10"/>
+	    <imagedata
+	      fileref="bsdinstall/bsdinstall-keymap-testing"/>
 	  </imageobject>
 	</mediaobject>
       </figure>

Added: head/share/images/books/handbook/bsdinstall/bsdinstall-keymap-testing.png
==============================================================================
Binary file. No diff available.