diff options
| -rw-r--r-- | Documentation/howto-contribute.txt | 4 | ||||
| -rw-r--r-- | NEWS | 2 | ||||
| -rw-r--r-- | disk-utils/mkfs.bfs.c | 2 | ||||
| -rw-r--r-- | lib/terminal-colors.d.5 | 2 | ||||
| -rw-r--r-- | libblkid/src/partitions/aix.c | 2 | ||||
| -rw-r--r-- | libmount/python/context.c | 4 | ||||
| -rw-r--r-- | m4/ul.m4 | 2 | ||||
| -rw-r--r-- | sys-utils/ctrlaltdel.c | 2 | ||||
| -rw-r--r-- | sys-utils/mount.8 | 28 | ||||
| -rw-r--r-- | term-utils/agetty.8 | 2 | ||||
| -rw-r--r-- | term-utils/script.c | 2 | ||||
| -rw-r--r-- | text-utils/pg.1 | 2 |
12 files changed, 27 insertions, 27 deletions
diff --git a/Documentation/howto-contribute.txt b/Documentation/howto-contribute.txt index a638a1db5..d9151d9dd 100644 --- a/Documentation/howto-contribute.txt +++ b/Documentation/howto-contribute.txt @@ -73,8 +73,8 @@ Before sending a patch * make sure that after patching source files will compile without errors. - * test that previously existed program behaviour is not - unintentionally alterred. If you alter the behaviour tell about in + * test that previously existed program behavior is not + unintentionally alterred. If you alter the behavior tell about in commit message. Coding style @@ -1197,7 +1197,7 @@ util-linux 2.9b: * split README into INSTALL and HISTORY * added a sentence to swapon.8 -* behaviour of write on non-ASCII fixed +* behavior of write on non-ASCII fixed * hwclock adapted to survive a failing mktime() util-linux 2.9a: diff --git a/disk-utils/mkfs.bfs.c b/disk-utils/mkfs.bfs.c index dcdb09850..23098e4e4 100644 --- a/disk-utils/mkfs.bfs.c +++ b/disk-utils/mkfs.bfs.c @@ -221,7 +221,7 @@ int main(int argc, char **argv) ino_blocks = (ino_bytes + BFS_BLOCKSIZE - 1) / BFS_BLOCKSIZE; data_blocks = total_blocks - ino_blocks - 1; - /* mimic the behaviour of SCO's mkfs - maybe this limit is needed */ + /* mimic the behavior of SCO's mkfs - maybe this limit is needed */ if (data_blocks < 32) errx(EXIT_FAILURE, _("not enough space, need at least %llu blocks"), diff --git a/lib/terminal-colors.d.5 b/lib/terminal-colors.d.5 index d16d7674a..ab0a34913 100644 --- a/lib/terminal-colors.d.5 +++ b/lib/terminal-colors.d.5 @@ -9,7 +9,7 @@ terminal-colors.d \- Configure output colorization for various utilities .SH "SYNOPSIS" /etc/terminal-colors\&.d/[[name][@term]\&.][type] .SH "DESCRIPTION" -Files in this directory determine the default behaviour for utilities +Files in this directory determine the default behavior for utilities when coloring output. The diff --git a/libblkid/src/partitions/aix.c b/libblkid/src/partitions/aix.c index fa64c38ad..4efdfa33d 100644 --- a/libblkid/src/partitions/aix.c +++ b/libblkid/src/partitions/aix.c @@ -40,7 +40,7 @@ static int probe_aix_pt(blkid_probe pr, * magic number at begin of the disk. * * Note, Linux kernel is tring to be smart and AIX signature is ignored when - * there is a valid DOS partitions table. We don't support such behaviour. All + * there is a valid DOS partitions table. We don't support such behavior. All * fdisk-like programs has to properly wipe the fist sector. Everything other * is a bug. */ diff --git a/libmount/python/context.c b/libmount/python/context.c index 408c8bd75..623239436 100644 --- a/libmount/python/context.c +++ b/libmount/python/context.c @@ -627,7 +627,7 @@ static int Context_set_mflags(ContextObjext *self, PyObject *value, void *closur return mnt_context_set_mflags(self->cxt, flags); } -/* returns a flags integer (behaviour differs from C API) */ +/* returns a flags integer (behavior differs from C API) */ static PyObject *Context_get_mflags(ContextObjext *self) { unsigned long flags; @@ -641,7 +641,7 @@ static PyObject *Context_get_mflags(ContextObjext *self) return result; } -/* returns a flags integer (behaviour differs from C API) */ +/* returns a flags integer (behavior differs from C API) */ static PyObject *Context_get_user_mflags(ContextObjext *self) { unsigned long flags; @@ -13,7 +13,7 @@ AC_DEFUN([UL_PKG_STATIC], [ dnl UL_CHECK_LIB(LIBRARY, FUNCTION, [VARSUFFIX = $1])) dnl -dnl The VARSUFFIX is optional and overrides the default behaviour. For example: +dnl The VARSUFFIX is optional and overrides the default behavior. For example: dnl UL_CHECK_LIB(yyy, func, xxx) generates have_xxx and HAVE_LIBXXX dnl UL_CHECK_LIB(yyy, func) generates have_yyy and HAVE_LIBYYY dnl diff --git a/sys-utils/ctrlaltdel.c b/sys-utils/ctrlaltdel.c index 074f247a9..df13d088c 100644 --- a/sys-utils/ctrlaltdel.c +++ b/sys-utils/ctrlaltdel.c @@ -53,7 +53,7 @@ int main(int argc, char **argv) if (geteuid()) errx(EXIT_FAILURE, - _("You must be root to set the Ctrl-Alt-Del behaviour")); + _("You must be root to set the Ctrl-Alt-Del behavior")); if (argc == 2 && !strcmp("hard", argv[1])) { if (my_reboot(LINUX_REBOOT_CMD_CAD_ON) < 0) diff --git a/sys-utils/mount.8 b/sys-utils/mount.8 index efa1ae8dd..d2fe2a640 100644 --- a/sys-utils/mount.8 +++ b/sys-utils/mount.8 @@ -262,7 +262,7 @@ you have to use: and then the mount options from command line will be appended to the list of options from .IR /etc/fstab . -The usual behaviour is that the last option wins if there is more duplicated +The usual behavior is that the last option wins if there is more duplicated options. When the @@ -1081,7 +1081,7 @@ but still allow userspace to override it. For more details about the default system mount options see /proc/mounts. .TP .B nostrictatime -Use the kernel's default behaviour for inode access time updates. +Use the kernel's default behavior for inode access time updates. .TP .B suid Allow set-user-identifier or set-group-identifier bits to take @@ -1365,15 +1365,15 @@ Support POSIX Access Control Lists (or not). .\" requires CONFIG_EXT2_FS_POSIX_ACL .TP .BR bsddf | minixdf -Set the behaviour for the +Set the behavior for the .I statfs system call. The .B minixdf -behaviour is to return in the +behavior is to return in the .I f_blocks field the total number of blocks of the filesystem, while the .B bsddf -behaviour (which is the default) is to subtract the overhead blocks +behavior (which is the default) is to subtract the overhead blocks used by the ext2 filesystem and not available for file storage. Thus .sp 1 % mount /k \-o minixdf; df /k; umount /k @@ -1411,7 +1411,7 @@ don't have to be supported if ext4 kernel driver is used for ext2 and ext3 files Print debugging info upon each (re)mount. .TP .BR errors= { continue | remount-ro | panic } -Define the behaviour when an error is encountered. +Define the behavior when an error is encountered. (Either ignore errors and just mark the filesystem erroneous and continue, or remount the filesystem read-only, or panic and halt the system.) The default is set in the filesystem superblock, and can be @@ -2091,7 +2091,7 @@ a volume where the option was previously specified in order to restore normal behavior. .TP .BR errors= { continue | remount-ro | panic } -Define the behaviour when an error is encountered. +Define the behavior when an error is encountered. (Either ignore errors and just mark the filesystem erroneous and continue, or remount the filesystem read-only, or panic and halt the system.) .TP @@ -2540,7 +2540,7 @@ The same filesystem type is also used by Mac OS X. .TP .BI onerror= value -Set behaviour on error: +Set behavior on error: .RS .TP .B panic @@ -2594,7 +2594,7 @@ disabled. .TP .BR shortname= { lower | win95 | winnt | mixed } -Defines the behaviour for creation and display of filenames which fit into +Defines the behavior for creation and display of filenames which fit into 8.3 characters. If a long name for a file exists, it will always be preferred display. There are four modes: : @@ -2644,12 +2644,12 @@ doing delayed allocation writeout. Valid values for this option are page size (typically 4KiB) through to 1GiB, inclusive, in power-of-2 increments. .sp -The default behaviour is for dynamic end-of-file +The default behavior is for dynamic end-of-file preallocation size, which uses a set of heuristics to optimise the preallocation size based on the current allocation patterns within the file and the access patterns to the file. Specifying a fixed allocsize value turns off -the dynamic behaviour. +the dynamic behavior. .TP .BR attr2 | noattr2 The options enable/disable an "opportunistic" improvement to @@ -2659,8 +2659,8 @@ attr2 is selected (either when setting or removing extended attributes) the on-disk superblock feature bit field will be updated to reflect this format being in use. .sp -The default behaviour is determined by the on-disk feature -bit indicating that attr2 behaviour is active. If either +The default behavior is determined by the on-disk feature +bit indicating that attr2 behavior is active. If either mount option it set, then that becomes the new default used by the filesystem. .sp @@ -2732,7 +2732,7 @@ If "largeio" specified, a filesystem that was created with a "swidth" specified will return the "swidth" value (in bytes) in st_blksize. If the filesystem does not have a "swidth" specified but does specify an "allocsize" then "allocsize" -(in bytes) will be returned instead. Otherwise the behaviour +(in bytes) will be returned instead. Otherwise the behavior is the same as if "nolargeio" was specified. .TP .B logbufs=value diff --git a/term-utils/agetty.8 b/term-utils/agetty.8 index a39d81fcd..27a0d1b86 100644 --- a/term-utils/agetty.8 +++ b/term-utils/agetty.8 @@ -92,7 +92,7 @@ Assume that the tty is 8-bit clean, hence disable parity detection. Log the specified user automatically in without asking for a login name and password. The \-f \fIusername\fP option is added to the \fB/bin/login\fP command line by default. The \-\-login-options option changes this default -behaviour and then only \\u is replaced by the \fIusername\fP and no other +behavior and then only \\u is replaced by the \fIusername\fP and no other option is added to the login command line. .TP \-c, \-\-noreset diff --git a/term-utils/script.c b/term-utils/script.c index 1ae34627f..1530e6726 100644 --- a/term-utils/script.c +++ b/term-utils/script.c @@ -525,7 +525,7 @@ doshell(void) { /* * When invoked from within /etc/csh.login, script spawns a csh shell * that spawns programs that cannot be killed with a SIGTERM. This is - * because csh has a documented behaviour wherein it disables all + * because csh has a documented behavior wherein it disables all * signals when processing the /etc/csh.* files. * * Let's restore the default behavior. diff --git a/text-utils/pg.1 b/text-utils/pg.1 index 09fd51dd9..07105b5b1 100644 --- a/text-utils/pg.1 +++ b/text-utils/pg.1 @@ -198,7 +198,7 @@ In all other situations these keys will terminate .BR pg . .SH "ENVIRONMENT VARIABLES" The following environment variables -affect the behaviour of +affect the behavior of .BR pg : .TP .B COLUMNS |