From f55eaf1468c3aa7a68ae296ecd4081959652b8a2 Mon Sep 17 00:00:00 2001 From: Murray Stokely Date: Thu, 18 Oct 2001 20:48:57 +0000 Subject: [PATCH] Properly define entities for [ OK ] and [ CANCEL ] and use these 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. --- .../books/handbook/install/chapter.sgml | 40 +++++++++---------- share/sgml/freebsd.ent | 6 ++- 2 files changed, 25 insertions(+), 21 deletions(-) diff --git a/en_US.ISO8859-1/books/handbook/install/chapter.sgml b/en_US.ISO8859-1/books/handbook/install/chapter.sgml index 74ae596e06..d78a8230c8 100644 --- a/en_US.ISO8859-1/books/handbook/install/chapter.sgml +++ b/en_US.ISO8859-1/books/handbook/install/chapter.sgml @@ -1267,12 +1267,12 @@ Mounting root from ufs:/dev/md0c A different keyboard mapping may be chosen by selecting the menu item using up/down arrow keys and pressing Space. Pressing Space again will unselect the item. When - finished, choose the [ OK ] using the + finished, choose the &gui.ok; using the arrow keys and press Enter. Only a partial list is shown in this screen representation. - Selecting [Cancel] will use the default + Selecting &gui.cancel; will use the default keymap and return to the Main Install Menu.
@@ -1994,7 +1994,7 @@ Mounting root from ufs:/dev/md0c controllers, and no disks on the slave channels. You should select the disk on which you want to install FreeBSD, - and then press OK. + and then press &gui.ok;. FDisk will start, with a display similar to that shown in . @@ -2127,11 +2127,11 @@ Mounting root from ufs:/dev/md0c
The Tab key toggles between the last drive - selected, [ OK ], and - [ Cancel ]. + selected, &gui.ok;, and + &gui.cancel;. Press the Tab once to toggle to the - [ OK ], then + &gui.ok;, then press Enter to continue with the installation. @@ -2402,7 +2402,7 @@ Mounting root from ufs:/dev/md0c Backspace, and then type in 64M, as shown in . Then press - OK. + &gui.ok;.
Edit Root Partition Size @@ -2580,7 +2580,7 @@ Mounting root from ufs:/dev/md0c If satisfied with the options, select Exit with the arrow keys, ensure that - [ OK ] is highlighted, and press + &gui.ok; is highlighted, and press Enter to continue. @@ -2591,7 +2591,7 @@ Mounting root from ufs:/dev/md0c If Installing from a CDROM, use the arrow keys to highlight Install from a FreeBSD CD/DVD. Ensure - that [ OK ] is highlighted, then press + that &gui.ok; is highlighted, then press Enter to proceed with the installation. For other methods of installation, select the appropriate @@ -2927,7 +2927,7 @@ installation menus to try and retry whichever operations have failed. - Use Tab to select [ OK ] + Use Tab to select &gui.ok; when finished and press Enter. @@ -3230,7 +3230,7 @@ Press [Enter] now to invoke an editor on /etc/exports Use the arrow keys to choose Medium unless your are sure that another level is required for your needs. - With [ OK ] highlighted, press + With &gui.ok; highlighted, press Enter. An appropriate confirmation message will display depending on @@ -3328,7 +3328,7 @@ To change any of these settings later, edit /etc/rc.conf
- The value can be changed, then select [ OK ] + The value can be changed, then select &gui.ok; and press Enter to return to the System Console Configuration menu. @@ -3488,7 +3488,7 @@ To change any of these settings later, edit /etc/rc.conf The mouse used in this example is a PS/2 type, so the default Auto was appropriate. To change protocol, use the arrow keys to select - another option. Ensure that [ OK ] is + another option. Ensure that &gui.ok; is highlighted and press Enter to exit this menu.
@@ -3928,17 +3928,17 @@ when you've finished. corner of the screen. Pressing the Tab key will toggle between the last - selected package, [ OK ], and - [ Cancel ]. + selected package, &gui.ok;, and + &gui.cancel;. When you have finished marking the packages for installation, press Tab once to toggle to the - [ OK ] and press + &gui.ok; and press Enter to return to the Package Selection menu. The left and right arrow keys will also toggle between - [ OK ] and [ Cancel ]. - This method can also be used to select [ OK ] + &gui.ok; and &gui.cancel;. + This method can also be used to select &gui.ok; and press Enter to return to the Package Selection menu. @@ -3966,7 +3966,7 @@ when you've finished.
- Selecting [ OK ] and pressing + Selecting &gui.ok; and pressing Enter will start the package installation. Installing messages will appear until completed. Make note if there are any error messages. @@ -4103,7 +4103,7 @@ when you've finished. The user was also added to the group "wheel" to be able to become a superuser with root privileges. - When you are satisfied, press [ OK ] and + When you are satisfied, press &gui.ok; and the User and Group Management menu will redisplay.
diff --git a/share/sgml/freebsd.ent b/share/sgml/freebsd.ent index c4b58cc54f..9db6cf8423 100644 --- a/share/sgml/freebsd.ent +++ b/share/sgml/freebsd.ent @@ -1,7 +1,7 @@ + + +[ OK ]"> +[ Cancel ]">