- Add a couple of <keycap> tags.

- Reword the part about editors of the base system and the ports.

PR:		docs/38851
Submitted by:	Marc Fonvieille <marc@blackend.org>

--- chapter.sgml.diff begins here ---
--- chapter.sgml.org	Mon Jun  3 12:38:09 2002
+++ chapter.sgml	Mon Jun  3 12:46:40 2002
@@ -1256,9 +1256,9 @@
       <command>ee</command>, all of the
       commands for manipulating the editor's functions are listed at the
       top of the display. The caret <literal>^</literal> character means
-      the control key on the keyboard, so ^e expands to pressing the
-      control key plus the letter <literal>e</literal>.  To leave
-      <application>ee</application>, hit the escape key, then choose leave
+      the <keycap>Ctrl</keycap> key on the keyboard, so <literal>^e</literal> expands to the key combination
+      <keycombo action="simul"><keycap>Ctrl</keycap><keycap>e</keycap></keycombo>.  To leave
+      <application>ee</application>, hit the <keycap>Esc</keycap> key, then choose leave
       editor.  The editor will prompt you to save any changes if the file
       has been modified.</para>

@@ -1277,9 +1277,9 @@
       <secondary><command>emacs</command></secondary>
     </indexterm>
     <para>FreeBSD also comes with more powerful text editors such as
-      <command>vi</command> as part of the base system, and
-      <command>emacs</command> and <command>vim</command>
-      as part of the FreeBSD Ports Collection.  These editors offer much
+      <command>vi</command> as part of the base system, while other editors, like
+      <command>emacs</command> and <command>vim</command>,
+      are part of the FreeBSD Ports Collection.  These editors offer much
       more functionality and power at the expense of being a little more
       complicated to learn.  However if you plan on doing a lot of text
       editing, learning a more powerful editor such as

en_US.ISO8859-1/books/handbook/basics/chapter.sgml

@@ -1256,9 +1256,9 @@ Swap: 256M Total, 38M Used, 217M Free, 15% Inuse
       <command>ee</command>, all of the
       commands for manipulating the editor's functions are listed at the
       top of the display. The caret <literal>^</literal> character means
-      the control key on the keyboard, so ^e expands to pressing the
+      the <keycap>Ctrl</keycap> key on the keyboard, so <literal>^e</literal> expands to the key combination
-      control key plus the letter <literal>e</literal>.  To leave
+      <keycombo action="simul"><keycap>Ctrl</keycap><keycap>e</keycap></keycombo>.  To leave
-      <application>ee</application>, hit the escape key, then choose leave
+      <application>ee</application>, hit the <keycap>Esc</keycap> key, then choose leave
       editor.  The editor will prompt you to save any changes if the file
       has been modified.</para>
 
@@ -1277,9 +1277,9 @@ Swap: 256M Total, 38M Used, 217M Free, 15% Inuse
       <secondary><command>emacs</command></secondary>
     </indexterm>
     <para>FreeBSD also comes with more powerful text editors such as
-      <command>vi</command> as part of the base system, and
+      <command>vi</command> as part of the base system, while other editors, like
-      <command>emacs</command> and <command>vim</command>
+      <command>emacs</command> and <command>vim</command>,
-      as part of the FreeBSD Ports Collection.  These editors offer much
+      are part of the FreeBSD Ports Collection.  These editors offer much
       more functionality and power at the expense of being a little more
       complicated to learn.  However if you plan on doing a lot of text
       editing, learning a more powerful editor such as