os/doc
3
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Properly define entities for [ OK ] and [ CANCEL ] and use these

Browse source 
entities throughout the install chapter.  These need to be defined
with   so that these buttons don't wrap across lines.

This prevents :

"Press the [
OK ] button"

from showing up in the print or HTML output.
This commit is contained in:
Murray Stokely 2001-10-18 20:48:57 +00:00
parent 229c740a31
commit f55eaf1468
Notes: svn2git 2020-12-08 03:00:23 +00:00 
svn path=/head/; revision=10987
2 changed files with 25 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

40
en_US.ISO8859-1/books/handbook/install/chapter.sgml
View file

@ -1267,12 +1267,12 @@ Mounting root from ufs:/dev/md0c
<para>A different keyboard mapping may be chosen by selecting the
menu item using up/down arrow keys and pressing <keycap>Space</keycap>.
Pressing <keycap>Space</keycap> again will unselect the item. When
finished, choose the <guibutton>[ OK ]</guibutton> using the
finished, choose the &gui.ok; using the
arrow keys and press
<keycap>Enter</keycap>.</para>
<para>Only a partial list is shown in this screen representation.
Selecting <guibutton>[Cancel]</guibutton> will use the default
Selecting &gui.cancel; will use the default
keymap and return to the Main Install Menu.</para>
<figure id="sysinstall-keymap-menu">
@ -1994,7 +1994,7 @@ Mounting root from ufs:/dev/md0c
controllers, and no disks on the slave channels.</para>
<para>You should select the disk on which you want to install FreeBSD,
and then press <guibutton>OK</guibutton>.
and then press &gui.ok;.
<application>FDisk</application> will start, with a display similar to
that shown in <xref linkend="sysinstall-fdisk1">.</para>
@ -2127,11 +2127,11 @@ Mounting root from ufs:/dev/md0c
</figure>
<para>The <keycap>Tab</keycap> key toggles between the last drive
selected, <guibutton>[ OK ]</guibutton>, and
<guibutton>[ Cancel ]</guibutton>.</para>
selected, &gui.ok;, and
&gui.cancel;.</para>
<para>Press the <keycap>Tab</keycap> once to toggle to the
<guibutton>[ OK ]</guibutton>, then
&gui.ok;, then
press <keycap>Enter</keycap>
to continue with the installation.</para>
</sect2>
@ -2402,7 +2402,7 @@ Mounting root from ufs:/dev/md0c
<keycap>Backspace</keycap>, and then type in
<userinput>64M</userinput>, as shown in
<xref linkend="sysinstall-label-add2">. Then press
<guibutton>OK</guibutton>.</para>
&gui.ok;.</para>
<figure id="sysinstall-label-add2">
<title>Edit Root Partition Size</title>
@ -2580,7 +2580,7 @@ Mounting root from ufs:/dev/md0c
<para>If satisfied with the options, select
<guimenuitem>Exit</guimenuitem> with the arrow keys, ensure that
<guibutton>[ OK ]</guibutton> is highlighted, and press
&gui.ok; is highlighted, and press
<keycap>Enter</keycap> to continue.</para>
</sect2>
@ -2591,7 +2591,7 @@ Mounting root from ufs:/dev/md0c
<para>If Installing from a CDROM, use the arrow keys to highlight
<guimenuitem>Install from a FreeBSD CD/DVD</guimenuitem>. Ensure
that <guibutton>[ OK ]</guibutton> is highlighted, then press
that &gui.ok; is highlighted, then press
<keycap>Enter</keycap> to proceed with the installation.</para>
<para>For other methods of installation, select the appropriate
@ -2927,7 +2927,7 @@ installation menus to try and retry whichever operations have failed.
</variablelist>
<para>Use <keycap>Tab</keycap> to select <guibutton>[ OK ]</guibutton>
<para>Use <keycap>Tab</keycap> to select &gui.ok;
when finished and press <keycap>Enter</keycap>.</para>
@ -3230,7 +3230,7 @@ Press [Enter] now to invoke an editor on /etc/exports
<para>Use the arrow keys to choose <guimenuitem>Medium</guimenuitem>
unless your are sure that another level is required for your needs.
With <guibutton>[ OK ]</guibutton> highlighted, press
With &gui.ok; highlighted, press
<keycap>Enter</keycap>.</para>
<para>An appropriate confirmation message will display depending on
@ -3328,7 +3328,7 @@ To change any of these settings later, edit /etc/rc.conf
</mediaobject>
</figure>
<para>The value can be changed, then select <guibutton>[ OK ]</guibutton>
<para>The value can be changed, then select &gui.ok;
and press <keycap>Enter</keycap> to return to the System Console
Configuration menu.</para>
@ -3488,7 +3488,7 @@ To change any of these settings later, edit /etc/rc.conf
<para>The mouse used in this example is a PS/2 type, so the default
<guimenuitem>Auto</guimenuitem> was
appropriate. To change protocol, use the arrow keys to select
another option. Ensure that <guibutton>[ OK ]</guibutton> is
another option. Ensure that &gui.ok; is
highlighted and press <keycap>Enter</keycap> to exit this menu.</para>
<figure id="config-mouse-port">
@ -3928,17 +3928,17 @@ when you've finished.</screen>
corner of the screen.</para>
<para>Pressing the <keycap>Tab</keycap> key will toggle between the last
selected package, <guibutton>[ OK ]</guibutton>, and
<guibutton>[ Cancel ]</guibutton>.</para>
selected package, &gui.ok;, and
&gui.cancel;.</para>
<para>When you have finished marking the packages for installation,
press <keycap>Tab</keycap> once to toggle to the
<guibutton>[ OK ]</guibutton> and press
&gui.ok; and press
<keycap>Enter</keycap> to return to the Package Selection menu.</para>
<para>The left and right arrow keys will also toggle between
<guibutton>[ OK ]</guibutton> and <guibutton>[ Cancel ]</guibutton>.
This method can also be used to select <guibutton>[ OK ]</guibutton>
&gui.ok; and &gui.cancel;.
This method can also be used to select &gui.ok;
and press <keycap>Enter</keycap> to return to the Package
Selection menu.</para>
@ -3966,7 +3966,7 @@ when you've finished.</screen>
</mediaobject>
</figure>
<para>Selecting <guibutton>[ OK ]</guibutton> and pressing
<para>Selecting &gui.ok; and pressing
<keycap>Enter</keycap> will start
the package installation. Installing messages will appear until
completed. Make note if there are any error messages.</para>
@ -4103,7 +4103,7 @@ when you've finished.</screen>
<para>The user was also added to the group "wheel" to be able to
become a superuser with root privileges.</para>
<para>When you are satisfied, press <keycap>[ OK ]</keycap> and
<para>When you are satisfied, press &gui.ok; and
the User and Group Management menu will redisplay.</para>
<figure id="add-user4">

6
share/sgml/freebsd.ent
View file

@ -1,7 +1,7 @@
<!-- -*- sgml -*-
DocBook Miscellaneous FreeBSD Entities.
$FreeBSD: doc/share/sgml/freebsd.ent,v 1.5 2001/09/27 01:08:56 murray Exp $
$FreeBSD$
-->
<!-- These will almost certainly remain the same, but are here for
@ -22,3 +22,7 @@
<!-- Number of ports in the ports tree -->
<!ENTITY os.numports "5,800">
<!-- GUI-buttons -->
<!ENTITY gui.ok "<guibutton>[&nbsp;OK&nbsp;]</guibutton>">
<!ENTITY gui.cancel "<guibutton>[&nbsp;Cancel&nbsp;]</guibutton>">