diff options
author | Renato Botelho <renato@netgate.com> | 2016-05-03 08:54:29 -0300 |
---|---|---|
committer | Renato Botelho <renato@netgate.com> | 2016-05-03 08:54:29 -0300 |
commit | 394097451eda898069e18b8dc01759b5ec2d19ff (patch) | |
tree | 978e78c476a93a5940d7c55d55bda811eccb7165 /sys/boot/forth | |
parent | dc2ad254d56f40487511f4b9a56bf3f58e7603b4 (diff) | |
parent | a3473a1d98b6f6af1dcc11c4f0189686a81dabbb (diff) | |
download | FreeBSD-src-394097451eda898069e18b8dc01759b5ec2d19ff.zip FreeBSD-src-394097451eda898069e18b8dc01759b5ec2d19ff.tar.gz |
Merge remote-tracking branch 'origin/master' into devel-11
Diffstat (limited to 'sys/boot/forth')
-rw-r--r-- | sys/boot/forth/delay.4th | 2 | ||||
-rw-r--r-- | sys/boot/forth/loader.4th | 4 | ||||
-rw-r--r-- | sys/boot/forth/loader.conf | 2 | ||||
-rw-r--r-- | sys/boot/forth/menu.4th | 4 | ||||
-rw-r--r-- | sys/boot/forth/support.4th | 10 |
5 files changed, 11 insertions, 11 deletions
diff --git a/sys/boot/forth/delay.4th b/sys/boot/forth/delay.4th index 56dfcf0..28cfa5c 100644 --- a/sys/boot/forth/delay.4th +++ b/sys/boot/forth/delay.4th @@ -66,7 +66,7 @@ only forth definitions also delay-processing false delay_showdots ! \ reset to zero and read from environment s" delay_showdots" getenv dup -1 <> if - 2drop \ don't need the value, just existance + 2drop \ don't need the value, just existence true delay_showdots ! else drop diff --git a/sys/boot/forth/loader.4th b/sys/boot/forth/loader.4th index ad4042e..8df8cbb 100644 --- a/sys/boot/forth/loader.4th +++ b/sys/boot/forth/loader.4th @@ -136,7 +136,7 @@ only forth definitions also support-functions \ ***** start \ \ Initializes support.4th global variables, sets loader_conf_files, -\ processes conf files, and, if any one such file was succesfully +\ processes conf files, and, if any one such file was successfully \ read to the end, loads kernel and modules. : start ( -- ) ( throws: abort & user-defined ) @@ -144,7 +144,7 @@ only forth definitions also support-functions include_conf_files include_nextboot_file \ Will *NOT* try to load kernel and modules if no configuration file - \ was succesfully loaded! + \ was successfully loaded! any_conf_read? if s" loader_delay" getenv -1 = if load_xen_throw diff --git a/sys/boot/forth/loader.conf b/sys/boot/forth/loader.conf index 9162055..a56666c 100644 --- a/sys/boot/forth/loader.conf +++ b/sys/boot/forth/loader.conf @@ -159,7 +159,7 @@ module_path="/boot/modules" # Set the module search path #kern.cam.boot_delay="10000" # Delay (in ms) of root mount for CAM bus # registration, useful for USB sticks as root #kern.cam.scsi_delay="2000" # Delay (in ms) before probing SCSI -#kern.ipc.maxsockets="" # Set the maximum number of sockets avaliable +#kern.ipc.maxsockets="" # Set the maximum number of sockets available #kern.ipc.nmbclusters="" # Set the number of mbuf clusters #kern.ipc.nsfbufs="" # Set the number of sendfile(2) bufs #net.inet.tcp.tcbhashsize="" # Set the value of TCBHASHSIZE diff --git a/sys/boot/forth/menu.4th b/sys/boot/forth/menu.4th index 1f95b66..fb4eb41 100644 --- a/sys/boot/forth/menu.4th +++ b/sys/boot/forth/menu.4th @@ -282,7 +282,7 @@ also menu-infrastructure definitions ; \ This function parses $kernels into variables that are used by the menu to -\ display wich kernel to boot when the [overloaded] `boot' word is interpreted. +\ display which kernel to boot when the [overloaded] `boot' word is interpreted. \ Used internally by menu-create, you need not (nor should you) call this \ directly. \ @@ -790,7 +790,7 @@ also menu-infrastructure definitions again ; -: menu-erase ( -- ) \ Erases menu and resets positioning variable to positon 1. +: menu-erase ( -- ) \ Erases menu and resets positioning variable to position 1. \ Clear the screen area associated with the interactive menu menuX @ menuY @ diff --git a/sys/boot/forth/support.4th b/sys/boot/forth/support.4th index 3a8e1f2..aac258d 100644 --- a/sys/boot/forth/support.4th +++ b/sys/boot/forth/support.4th @@ -56,7 +56,7 @@ \ string conf_files configuration files to be loaded \ cell modules_options pointer to first module information \ value verbose? indicates if user wants a verbose loading -\ value any_conf_read? indicates if a conf file was succesfully read +\ value any_conf_read? indicates if a conf file was successfully read \ \ Other exported words: \ note, strlen is internal @@ -960,7 +960,7 @@ only forth also support-functions definitions string current_file_name_ref \ used to print the file name -\ Indicates if any conf file was succesfully read +\ Indicates if any conf file was successfully read 0 value any_conf_read? @@ -1133,7 +1133,7 @@ string current_file_name_ref \ used to print the file name then else after_load - load_succesful_message true \ Succesful, do not retry + load_succesful_message true \ Successful, do not retry then until ; @@ -1325,7 +1325,7 @@ also builtins \ 1. /boot/path \ 2. path \ -\ The module_path variable is overridden if load is succesful, by +\ The module_path variable is overridden if load is successful, by \ prepending the successful path. : load_from_directory ( path len 1 | flags len' path len 2 -- flag ) @@ -1412,7 +1412,7 @@ also builtins \ will first be tried as a full path, and, next, search on the \ directories pointed by module_path. \ -\ The module_path variable is overridden if load is succesful, by +\ The module_path variable is overridden if load is successful, by \ prepending the successful path. : load_directory_or_file ( path len 1 | flags len' path len 2 -- flag ) |