Attachment 22961 Details for Bug 39695 – file.diff

[patch] file.diff

file.diff (text/plain), 9.66 KB, created by Martin Heinen on 2002-06-23 12:00:05 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Martin Heinen

Created: 2002-06-23 12:00:05 UTC

Size: 9.66 KB

patch

obsolete

>Index: book.sgml
>===================================================================
>RCS file: /u/cvs/doc/en_US.ISO8859-1/books/faq/book.sgml,v
>retrieving revision 1.450
>diff -u -r1.450 book.sgml
>--- book.sgml	20 Jun 2002 08:18:53 -0000	1.450
>+++ book.sgml	23 Jun 2002 10:44:37 -0000
>@@ -1936,7 +1936,7 @@
>             <orderedlist>
>               <listitem>
>                 <para>For FreeBSD 3.3 and later, reboot the system and hit
>-                  <literal>Enter</literal> at the <literal>Booting kernel
>+                  <keycap>Enter</keycap> at the <literal>Booting kernel
>                   in 10 seconds; hit [Enter] to interrupt</literal> prompt.
>                   This will drop you into the boot loader.</para>
> 
>@@ -1964,7 +1964,7 @@
> 
>               <listitem>
>                 <para>If using FreeBSD 3.2 or earlier, at the Boot: prompt,
>-                  enter <literal>1:wd(2,a)kernel</literal> and press Enter.
>+                  enter <literal>1:wd(2,a)kernel</literal> and press <keycap>Enter</keycap>.
>                   If the system starts, then run the command
>                   <command>echo "1:wd(2,a)kernel" &gt; /boot.config</command>
>                   to make it the default boot string.</para>
>@@ -3257,7 +3257,7 @@
>             blocksize you recorded earlier. Then, set the partition
>             bootable and turn on bad block scanning. During the actual
>             install, bad144 will run first, before any filesystems are
>-            created (you can view this with an Alt-F2).  If it has any
>+            created (you can view this with an <keycombo action="simul"><keycap>Alt</keycap><keycap>F2</keycap></keycombo>).  If it has any
>             trouble creating the badsector file, you have set too large a
>             disk geometry - reboot the system and start all over again
>             (including repartitioning and reformatting with DOS).</para>
>@@ -5435,7 +5435,7 @@
>           <para>When you are slicing up your disk, check that the disk
>             geometry displayed in the FDISK screen is correct (ie. it
>             matches the BIOS numbers); if it is wrong, use the
>-            <literal>g</literal> key to fix it. You may have to do this if
>+            <keycap>g</keycap> key to fix it. You may have to do this if
>             there is absolutely nothing on the disk, or if the disk has been
>             moved from another system. Note that this is only an issue with
>             the disk that you are going to boot from; FreeBSD will sort
>@@ -6765,7 +6765,7 @@
> 
>       <qandaentry>
>         <question id="CAD-reboot">
>-          <para>How do I keep Control-Alt-Delete from rebooting the
>+          <para>How do I keep <keycombo action="simul"><keycap>Control</keycap><keycap>Alt</keycap><keycap>Delete</keycap></keycombo> from rebooting the
>             system?</para>
>         </question>
> 
>@@ -7671,9 +7671,9 @@
>         </question>
> 
>         <answer>
>-          <para>Try turning off the Num Lock key.</para>
>+          <para>Try turning off the <keycap>Num Lock</keycap> key.</para>
> 
>-          <para>If your Num Lock key is on by default at boot-time, you
>+          <para>If your <keycap>Num Lock</keycap> key is on by default at boot-time, you
>             may add the following line in the <literal>Keyboard</literal>
>             section of the <filename>XF86Config</filename> file.</para>
> 
>@@ -7701,15 +7701,15 @@
>           <para>At some point, you will probably wish to start another
>             session, perhaps to look at documentation for a program
>             you are running or to read your mail while waiting for an
>-            FTP transfer to finish. Just do Alt-F2 (hold down the Alt
>-            key and press the F2 key), and you will find a login prompt
>+            FTP transfer to finish. Just do <keycombo action="simul"><keycap>Alt</keycap><keycap>F2</keycap></keycombo> (hold down the <keycap>Alt</keycap>
>+            key and press the <keycap>F2</keycap> key), and you will find a login prompt
>             waiting for you on the second <quote>virtual console</quote>!
>             When you want to go back to the original session, do
>-            Alt-F1.</para>
>+            <keycombo action="simul"><keycap>Alt</keycap><keycap>F1</keycap></keycombo>.</para>
> 
>           <para>The default FreeBSD installation has three virtual consoles
>-            enabled (8 starting with 3.3-RELEASE), and Alt-F1, Alt-F2, and
>-            Alt-F3 will switch between these virtual consoles.</para>
>+            enabled (8 starting with 3.3-RELEASE), and <keycombo action="simul"><keycap>Alt</keycap><keycap>F1</keycap></keycombo>, <keycombo action="simul"><keycap>Alt</keycap><keycap>F2</keycap></keycombo>, and
>+            <keycombo action="simul"><keycap>Alt</keycap><keycap>F3</keycap></keycombo> will switch between these virtual consoles.</para>
> 
>           <para>To enable more of them, edit
>             <filename>/etc/ttys</filename> (see &man.ttys.5;)
>@@ -8207,11 +8207,11 @@
> 
>             <listitem>
>               <para>116 - <trademark class="registered">Windows</trademark> key,
>-		to the right of the Alt-Gr key</para>
>+		to the right of the <keycap>AltGr</keycap> key</para>
>             </listitem>
> 
>             <listitem>
>-              <para>117 - Menu key, to the left of the right-hand Ctrl key</para>
>+              <para>117 - <keycap>Menu</keycap> key, to the left of the right-hand <keycap>Ctrl</keycap> key</para>
>             </listitem>
>           </itemizedlist>
> 
>@@ -8235,8 +8235,8 @@
> 
>           <para>to your <filename>~/.xinitrc</filename>.</para>
> 
>-	  <para>For example, you could map the 3 keys to be F13, F14, and
>-	    F15, respectively.  This would make it easy to map them to
>+	  <para>For example, you could map the 3 keys to be <keycap>F13</keycap>, <keycap>F14</keycap>, and
>+	    <keycap>F15</keycap>, respectively.  This would make it easy to map them to
> 	    useful functions within applications or your window
> 	    manager, as demonstrated further down.</para>
> 
>@@ -8249,9 +8249,9 @@
> 
> 	  <para>If you use <command>fvwm2</command>, for example, you
> 	    could map the keys
>-            so that F13 iconifies (or de-iconifies) the window the cursor
>-            is in, F14 brings the window the cursor is in to the front or,
>-            if it is already at the front, pushes it to the back, and F15
>+            so that <keycap>F13</keycap> iconifies (or de-iconifies) the window the cursor
>+            is in, <keycap>F14</keycap> brings the window the cursor is in to the front or,
>+            if it is already at the front, pushes it to the back, and <keycap>F15</keycap>
>             pops up the main Workplace (application) menu even if the
>             cursor is not on the desktop, which is useful if you do not have
>             any part of the desktop visible (and the logo on the key
>@@ -10747,12 +10747,12 @@
> 
>       <qandaentry>
>         <question id="multi-controlp">
>-          <para>Why do I have to hit CTRL+P twice to send CTRL+P
>+          <para>Why do I have to hit <keycombo action="simul"><keycap>CTRL</keycap><keycap>P</keycap></keycombo> twice to send <keycombo action="simul"><keycap>CTRL</keycap><keycap>P</keycap></keycombo>
>             once?</para>
>         </question>
> 
>         <answer>
>-          <para>CTRL+P is the default <quote>force</quote> character,
>+          <para><keycombo action="simul"><keycap>CTRL</keycap><keycap>P</keycap></keycombo> is the default <quote>force</quote> character,
>             used to tell &man.tip.1;
>             that the next character is literal data.  You can set the
>             force character to any other character with the
>@@ -10764,8 +10764,8 @@
>             <replaceable>single-char</replaceable> is any single character.
>             If you leave out <replaceable>single-char</replaceable>,
>             then the force character is the nul character, which you can
>-            get by typing CTRL+2 or CTRL+SPACE.  A pretty good value for
>-            <replaceable>single-char</replaceable> is SHIFT+CTRL+6, which
>+            get by typing <keycombo action="simul"><keycap>CTRL</keycap><keycap>2</keycap></keycombo> or <keycombo action="simul"><keycap>CTRL</keycap><keycap>SPACE</keycap></keycombo>.  A pretty good value for
>+            <replaceable>single-char</replaceable> is <keycombo action="simul"><keycap>SHIFT</keycap><keycap>CTRL</keycap><keycap>6</keycap></keycombo>, which
>             I have seen only used on some terminal servers.</para>
> 
>           <para>You can have the force character be whatever you want by
>@@ -10782,21 +10782,21 @@
>         </question>
> 
>         <answer>
>-          <para>You must have pressed CTRL+A, &man.tip.1;
>+          <para>You must have pressed <keycombo action="simul"><keycap>CTRL</keycap><keycap>A</keycap></keycombo>, &man.tip.1;
>             <quote>raise character</quote>, specially
>-            designed for people with broken caps-lock keys. Use
>+            designed for people with broken <keycap>Caps Lock</keycap> keys. Use
>             <literal>~s</literal> as above and set the variable
>             <quote>raisechar</quote> to something reasonable.  In fact,
>             you can set it to the same as the force character, if you
>             never expect to use either of these features.</para>
> 
>           <para>Here is a sample .tiprc file perfect for Emacs users who
>-            need to type CTRL+2 and CTRL+A a lot:</para>
>+            need to type <keycombo action="simul"><keycap>CTRL</keycap><keycap>2</keycap></keycombo> and <keycombo action="simul"><keycap>CTRL</keycap><keycap>A</keycap></keycombo> a lot:</para>
> 
>           <programlisting>force=^^
> raisechar=^^</programlisting>
> 
>-<para>The ^^ is SHIFT+CTRL+6.</para>
>+<para>The ^^ is <keycombo action="simul"><keycap>SHIFT</keycap><keycap>CTRL</keycap><keycap>6</keycap></keycombo>.</para>
>         </answer>
>       </qandaentry>

Actions: View | Diff

Attachments on bug 39695: 22961