Author: pfg
Date: Sun May 1 16:38:12 2016
New Revision: 298884
URL: https://svnweb.freebsd.org/changeset/base/298884
Log:
usr.sbin/bsdconfig: minor spelling fixes on comments.
No functional change.
Modified:
head/usr.sbin/bsdconfig/share/common.subr
head/usr.sbin/bsdconfig/share/dialog.subr
head/usr.sbin/bsdconfig/share/geom.subr
head/usr.sbin/bsdconfig/share/media/tcpip.subr
head/usr.sbin/bsdconfig/share/packages/index.subr
head/usr.sbin/bsdconfig/share/packages/packages.subr
head/usr.sbin/bsdconfig/startup/share/rcconf.subr
head/usr.sbin/bsdconfig/startup/share/rcvar.subr
head/usr.sbin/bsdinstall/scripts/zfsboot
Modified: head/usr.sbin/bsdconfig/share/common.subr
==============================================================================
--- head/usr.sbin/bsdconfig/share/common.subr Sun May 1 16:36:14 2016
(r298883)
+++ head/usr.sbin/bsdconfig/share/common.subr Sun May 1 16:38:12 2016
(r298884)
@@ -167,7 +167,7 @@ f_debug_init()
[ "$debugFile" ] && { [ "${debug+set}" ] || debug=1; }
#
- # Make debugging persistant if set
+ # Make debugging persistent if set
#
[ "$debug" ] && export debug
[ "$debugFile" ] && export debugFile
@@ -175,7 +175,7 @@ f_debug_init()
#
# Truncate debug file unless requested otherwise. Note that we will
# trim a leading plus (`+') from the value of debugFile to support
- # persistant meaning that f_dprintf() should print both to standard
+ # persistent meaning that f_dprintf() should print both to standard
# output and $debugFile (minus the leading plus, of course).
#
local _debug_file="${debugFile#+}"
Modified: head/usr.sbin/bsdconfig/share/dialog.subr
==============================================================================
--- head/usr.sbin/bsdconfig/share/dialog.subr Sun May 1 16:36:14 2016
(r298883)
+++ head/usr.sbin/bsdconfig/share/dialog.subr Sun May 1 16:38:12 2016
(r298884)
@@ -105,10 +105,10 @@ DIALOG_ESC=255
#
# When manually sizing Xdialog(1) widgets such as calendar and timebox, you'll
# need to know the size of the embedded GUI objects because the height passed
-# to Xdialog(1) for these widgets has to be tall enough to accomodate them.
+# to Xdialog(1) for these widgets has to be tall enough to accommodate them.
#
# These values are helpful when manually sizing with dialog(1) too, but in a
-# different way. dialog(1) does not make you accomodate the custom items in the
+# different way. dialog(1) does not make you accommodate the custom items in
the
# height (but does for width) -- a height of 3 will display three lines and a
# full calendar, for example (whereas Xdialog will truncate the calendar if
# given a height of 3). For dialog(1), use these values for making sure that
@@ -703,7 +703,7 @@ f_dialog_buttonbox_size()
# Adjust height if desired
if [ "$__var_height" ]; then
- # Add height to accomodate the buttons
+ # Add height to accommodate the buttons
__height_bbox_size=$(( $__height_bbox_size + 2 ))
# Adjust for clipping with Xdialog(1) on Linux/GTK2
@@ -1382,7 +1382,7 @@ f_dialog_calendar_size()
__height=$( echo "$__prompt" | f_number_of_lines )
if [ "$USE_XDIALOG" ]; then
- # Add height to accomodate for embedded calendar widget
+ # Add height to accommodate for embedded calendar widget
__height=$(( $__height + $DIALOG_CALENDAR_HEIGHT - 1 ))
# Also, bump height if backtitle is enabled
Modified: head/usr.sbin/bsdconfig/share/geom.subr
==============================================================================
--- head/usr.sbin/bsdconfig/share/geom.subr Sun May 1 16:36:14 2016
(r298883)
+++ head/usr.sbin/bsdconfig/share/geom.subr Sun May 1 16:38:12 2016
(r298884)
@@ -91,7 +91,7 @@ f_struct_define GEOM_PROVIDER_CONFIG \
# f_geom_get_all
#
# Parse sysctl(8) `kern.geom.confxml' data into a series of structs. GEOM
-# classes are at the top of the heirarchy and are stored as numbered structs
+# classes are at the top of the hierarchy and are stored as numbered structs
# from 1 to $NGEOM_CLASSES (set by this function) named `geom_class_C'. GEOM
# objects within each class are stored as numbered structs from 1 to `ngeoms'
# (a property of the GEOM class struct) named `geom_class_C_geom_N' (where C
Modified: head/usr.sbin/bsdconfig/share/media/tcpip.subr
==============================================================================
--- head/usr.sbin/bsdconfig/share/media/tcpip.subr Sun May 1 16:36:14
2016 (r298883)
+++ head/usr.sbin/bsdconfig/share/media/tcpip.subr Sun May 1 16:38:12
2016 (r298884)
@@ -1129,7 +1129,7 @@ f_host_lookup()
# allows you to have a mostly non-interactive script that still
# prompts for network setup/confirmation.
#
-# After successfull execution, the following variables are set:
+# After successful execution, the following variables are set:
#
# VAR_IFCONFIG + $device (e.g., `ifconfig_em0')
# Defines the ifconfig(8) properties specific to $device.
Modified: head/usr.sbin/bsdconfig/share/packages/index.subr
==============================================================================
--- head/usr.sbin/bsdconfig/share/packages/index.subr Sun May 1 16:36:14
2016 (r298883)
+++ head/usr.sbin/bsdconfig/share/packages/index.subr Sun May 1 16:38:12
2016 (r298884)
@@ -123,7 +123,7 @@ f_index_initialize()
#
#
- # Calculate digest used to determine if the on-disk persistant cache
+ # Calculate digest used to determine if the on-disk persistent cache
# INDEX (containing this digest on the first line) is valid and can be
# used to quickly populate the environment.
#
@@ -135,7 +135,7 @@ f_index_initialize()
fi
#
- # Check to see if the persistant cache INDEX file exists
+ # Check to see if the persistent cache INDEX file exists
#
if [ -f "$PACKAGES_INDEX_CACHEFILE" ]; then
#
@@ -184,7 +184,7 @@ f_index_initialize()
) | sort )'
#
- # Attempt to create the persistant on-disk cache
+ # Attempt to create the persistent on-disk cache
#
# Create a new temporary file to write to
Modified: head/usr.sbin/bsdconfig/share/packages/packages.subr
==============================================================================
--- head/usr.sbin/bsdconfig/share/packages/packages.subr Sun May 1
16:36:14 2016 (r298883)
+++ head/usr.sbin/bsdconfig/share/packages/packages.subr Sun May 1
16:38:12 2016 (r298884)
@@ -143,7 +143,7 @@ f_package_select()
# f_package_deselect $package ...
#
-# Remove $package from teh list of tracked/selected packages. If $package is
+# Remove $package from the list of tracked/selected packages. If $package is
# not being tracked (doesn't appear in $SELECTED_PACKAGES), this function
# amounts to having no effet.
#
@@ -187,7 +187,7 @@ f_package_detect_installed()
# Also calculates the total number of installed/selected packages stored as
# $_All_ninstalled and $_All_nselected.
#
-# Calculations are peformed by checking "marks". A "mark" is stored as
+# Calculations are performed by checking "marks". A "mark" is stored as
# $_mark_$varpkg -- where $varpkg is the product of `f_str2varname $package
# varpkg'. A mark can be "X" for an installed package, `I' for a package that
# is marked for installation, "R" for a package that is marked for re-install,
Modified: head/usr.sbin/bsdconfig/startup/share/rcconf.subr
==============================================================================
--- head/usr.sbin/bsdconfig/startup/share/rcconf.subr Sun May 1 16:36:14
2016 (r298883)
+++ head/usr.sbin/bsdconfig/startup/share/rcconf.subr Sun May 1 16:38:12
2016 (r298884)
@@ -124,7 +124,7 @@ f_startup_rcconf_map()
#
#
- # Calculate digest used to determine if the on-disk global persistant
+ # Calculate digest used to determine if the on-disk global persistent
# cache file (containing this digest on the first line) is valid and
# can be used to quickly populate the cache value for immediate return.
#
@@ -132,7 +132,7 @@ f_startup_rcconf_map()
__rc_defaults_digest=$( exec 2> /dev/null; md5 < "$RC_DEFAULTS" )
#
- # Check to see if the global persistant cache file exists
+ # Check to see if the global persistent cache file exists
#
if [ -f "$STARTUP_RCCONF_MAP_CACHEFILE" ]; then
#
@@ -176,7 +176,7 @@ f_startup_rcconf_map()
#
# If we reach this point, we need to generate the data from scratch
- # (and after we do, we'll attempt to create the global persistant
+ # (and after we do, we'll attempt to create the global persistent
# cache file to speed up future executions).
#
@@ -215,7 +215,7 @@ f_startup_rcconf_map()
fi
#
- # Attempt to create the persistant global cache
+ # Attempt to create the persistent global cache
#
# Create a new temporary file to write to
Modified: head/usr.sbin/bsdconfig/startup/share/rcvar.subr
==============================================================================
--- head/usr.sbin/bsdconfig/startup/share/rcvar.subr Sun May 1 16:36:14
2016 (r298883)
+++ head/usr.sbin/bsdconfig/startup/share/rcvar.subr Sun May 1 16:38:12
2016 (r298884)
@@ -121,7 +121,7 @@ f_startup_rcvar_map()
#
# Calculate a digest given the checksums of all dependencies (scripts
# and the defaults file). This digest will be used to determine if an
- # on-disk global persistant cache file (containg this digest on the
+ # on-disk global persistent cache file (containg this digest on the
# first line) is valid and can be used to quickly populate the cache
# value for immediate return.
#
@@ -130,7 +130,7 @@ f_startup_rcvar_map()
cksum "$RC_DEFAULTS" $__rc_script_list 2> /dev/null | md5 )
#
- # Check to see if the global persistant cache file exists
+ # Check to see if the global persistent cache file exists
#
if [ -f "$STARTUP_RCVAR_MAP_CACHEFILE" ]; then
#
@@ -174,7 +174,7 @@ f_startup_rcvar_map()
#
# If we reach this point, we need to generate the data from scratch
- # (and after we do, we'll attempt to create the global persistant
+ # (and after we do, we'll attempt to create the global persistent
# cache file to speed up future executions).
#
@@ -208,7 +208,7 @@ f_startup_rcvar_map()
fi
#
- # Attempt to create/update the persistant global cache
+ # Attempt to create/update the persistent global cache
#
# Create a new temporary file to write to
Modified: head/usr.sbin/bsdinstall/scripts/zfsboot
==============================================================================
--- head/usr.sbin/bsdinstall/scripts/zfsboot Sun May 1 16:36:14 2016
(r298883)
+++ head/usr.sbin/bsdinstall/scripts/zfsboot Sun May 1 16:38:12 2016
(r298884)
@@ -1321,7 +1321,7 @@ zfs_create_boot()
# MBR boot loader touch-up
if [ "$ZFSBOOT_PARTITION_SCHEME" = "MBR" ]; then
f_dprintf "$funcname: Updating MBR boot loader on disks..."
- # Stick the ZFS boot loader in the "convienient hole" after
+ # Stick the ZFS boot loader in the "convenient hole" after
# the ZFS internal metadata
for disk in $disks; do
f_eval_catch $funcname dd "$DD_WITH_OPTIONS" \
_______________________________________________
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
