diff options
author | Michael Kerrisk <mtk.manpages@gmail.com> | 2007-06-08 09:56:56 +0000 |
---|---|---|
committer | Michael Kerrisk <mtk.manpages@gmail.com> | 2007-06-08 09:56:56 +0000 |
commit | d9bfdb9c217823eec9258ab215c4b39851687c3c (patch) | |
tree | a81e59d01da2d46d259afdf639481357662e1378 /man7 | |
parent | 21be2ec1f86e8ea39abd65dec35ab8fb0a2538a6 (diff) |
Convert to American spelling conventions
Diffstat (limited to 'man7')
-rw-r--r-- | man7/arp.7 | 18 | ||||
-rw-r--r-- | man7/bootparam.7 | 6 | ||||
-rw-r--r-- | man7/environ.7 | 6 | ||||
-rw-r--r-- | man7/epoll.7 | 2 | ||||
-rw-r--r-- | man7/feature_test_macros.7 | 2 | ||||
-rw-r--r-- | man7/fifo.7 | 2 | ||||
-rw-r--r-- | man7/futex.7 | 2 | ||||
-rw-r--r-- | man7/glob.7 | 2 | ||||
-rw-r--r-- | man7/inotify.7 | 2 | ||||
-rw-r--r-- | man7/ip.7 | 2 | ||||
-rw-r--r-- | man7/locale.7 | 6 | ||||
-rw-r--r-- | man7/man-pages.7 | 2 | ||||
-rw-r--r-- | man7/netlink.7 | 4 | ||||
-rw-r--r-- | man7/posixoptions.7 | 2 | ||||
-rw-r--r-- | man7/pthreads.7 | 2 | ||||
-rw-r--r-- | man7/pty.7 | 4 | ||||
-rw-r--r-- | man7/rtnetlink.7 | 8 | ||||
-rw-r--r-- | man7/sem_overview.7 | 4 | ||||
-rw-r--r-- | man7/signal.7 | 4 | ||||
-rw-r--r-- | man7/socket.7 | 2 | ||||
-rw-r--r-- | man7/standards.7 | 4 | ||||
-rw-r--r-- | man7/suffixes.7 | 2 | ||||
-rw-r--r-- | man7/tcp.7 | 2 | ||||
-rw-r--r-- | man7/termio.7 | 2 | ||||
-rw-r--r-- | man7/udp.7 | 4 | ||||
-rw-r--r-- | man7/unix.7 | 2 | ||||
-rw-r--r-- | man7/x25.7 | 2 |
27 files changed, 50 insertions, 50 deletions
diff --git a/man7/arp.7 b/man7/arp.7 index 8bdad2e7a..15dece475 100644 --- a/man7/arp.7 +++ b/man7/arp.7 @@ -38,11 +38,11 @@ frequently used entries are garbage-collected. Entries which are marked as permanent are never deleted by the garbage-collector. The cache can -be directly manipulated by the use of ioctls and its behaviour can be +be directly manipulated by the use of ioctls and its behavior can be tuned by the sysctls defined below. When there is no positive feedback for an existing mapping after some -time (see the sysctls below) a neighbour cache entry is considered stale. +time (see the sysctls below) a neighbor cache entry is considered stale. Positive feedback can be gotten from a higher layer; for example from a successful TCP ACK. Other protocols can signal forward progress @@ -143,7 +143,7 @@ in seconds. .TP .B anycast_delay The maximum number of jiffies to delay before replying to a -IPv6 neighbour solicitation message. +IPv6 neighbor solicitation message. Anycast support is not yet implemented. Defaults to 1 second. .TP @@ -154,7 +154,7 @@ netlink before dropping back to multicast probes (see Defaults to 0. .TP .B base_reachable_time -Once a neighbour has been found, the entry is considered to be valid +Once a neighbor has been found, the entry is considered to be valid for at least a random value between .IR base_reachable_time "/2 and 3*" base_reachable_time /2. An entry's validity will be extended if it receives positive feedback @@ -162,18 +162,18 @@ from higher level protocols. Defaults to 30 seconds. .TP .B delay_first_probe_time -Delay before first probe after it has been decided that a neighbour +Delay before first probe after it has been decided that a neighbor is stale. Defaults to 5 seconds. .TP .B gc_interval -How frequently the garbage collector for neighbour entries +How frequently the garbage collector for neighbor entries should attempt to run. Defaults to 30 seconds. .TP .B gc_stale_time -Determines how often to check for stale neighbour entries. -When a neighbour entry is considered stale it is resolved again before +Determines how often to check for stale neighbor entries. +When a neighbor entry is considered stale it is resolved again before sending data to it. Defaults to 60 seconds. .TP @@ -266,7 +266,7 @@ functionality together. .PP RFC\ 826 for a description of ARP. .br -RFC\ 2461 for a description of IPv6 neighbour discovery and the base +RFC\ 2461 for a description of IPv6 neighbor discovery and the base algorithms used. .LP Linux 2.2+ IPv4 ARP uses the IPv6 algorithms when applicable. diff --git a/man7/bootparam.7 b/man7/bootparam.7 index 2f3e6391f..a1870bf53 100644 --- a/man7/bootparam.7 +++ b/man7/bootparam.7 @@ -425,7 +425,7 @@ to supply a parity value with all information exchanges. Specifying a one indicates parity checking is enabled, and a zero disables parity checking. Again, not all adapters will support selection of parity -behaviour as a boot argument. +behavior as a boot argument. .SS "`max_scsi_luns=...'" A SCSI device can have a number of `sub-devices' contained within itself. @@ -765,7 +765,7 @@ geometry parameters of the second disk. .SS "XT Disk Driver Options (`xd=')" If you are unfortunate enough to be using one of these old 8 bit cards that move data at a whopping 125kB/s then here is the scoop. -If the card is not recognised, you will have to use a boot arg of the form: +If the card is not recognized, you will have to use a boot arg of the form: .IP xd=type,irq,iobase,dma_chan .LP @@ -998,7 +998,7 @@ first two drives (default) makes the floppy driver read the physical cmos for those drives. .SS "floppy=unexpected_interrupts" Print a warning message when an unexpected interrupt is received -(default behaviour) +(default behavior) .SS "floppy=no_unexpected_interrupts or floppy=L40SX" Don't print a message when an unexpected interrupt is received. This is needed on IBM L40SX laptops in certain video modes. diff --git a/man7/environ.7 b/man7/environ.7 index 2f9edb93b..8cdbb3294 100644 --- a/man7/environ.7 +++ b/man7/environ.7 @@ -124,7 +124,7 @@ A C program can manipulate its environment using the functions and .BR unsetenv (3). -Note that the behaviour of many programs and library routines is +Note that the behavior of many programs and library routines is influenced by the presence or value of certain environment variables. A random collection: .LP @@ -143,13 +143,13 @@ and other programs, etc. .LP .BR LD_LIBRARY_PATH ", " LD_PRELOAD and other LD_* variables influence -the behaviour of the dynamic loader/linker. +the behavior of the dynamic loader/linker. .LP .B POSIXLY_CORRECT makes certain programs and library routines follow the prescriptions of POSIX. .LP -The behaviour of +The behavior of .BR malloc (3) is influenced by MALLOC_* variables. .LP diff --git a/man7/epoll.7 b/man7/epoll.7 index 7e84710f4..2d5d7edcd 100644 --- a/man7/epoll.7 +++ b/man7/epoll.7 @@ -309,7 +309,7 @@ Modify will re-read available I/O. .B Q9 Do I need to continuously read/write an fd until EAGAIN when using the .B EPOLLET -flag ( Edge Triggered behaviour ) ? +flag ( Edge Triggered behavior ) ? .TP .B A9 No you don't. diff --git a/man7/feature_test_macros.7 b/man7/feature_test_macros.7 index 15e0d79e2..5153d51dc 100644 --- a/man7/feature_test_macros.7 +++ b/man7/feature_test_macros.7 @@ -165,7 +165,7 @@ If .B _FORTIFY_SOURCE is set to 1, with compiler optimization level 1 .RI ( "gcc -O1" ) -and above, checks that shouldn't change the behaviour of +and above, checks that shouldn't change the behavior of conforming programs are performed. With .B _FORTIFY_SOURCE diff --git a/man7/fifo.7 b/man7/fifo.7 index d33b85fa4..bb6fa1efe 100644 --- a/man7/fifo.7 +++ b/man7/fifo.7 @@ -39,7 +39,7 @@ end has already been opened. Under Linux, opening a FIFO for read and write will succeed both in blocking and non-blocking mode. POSIX leaves this -behaviour undefined. +behavior undefined. This can be used to open a FIFO for writing while there are no readers available. A process diff --git a/man7/futex.7 b/man7/futex.7 index f6a6b466a..e186906aa 100644 --- a/man7/futex.7 +++ b/man7/futex.7 @@ -37,7 +37,7 @@ processes can wait for the value to become positive. Futex operation is entirely userspace for the non-contended case. The kernel is only involved to arbitrate the contended case. As any sane design will strive for non-contention, -futexes are also optimised for this situation. +futexes are also optimized for this situation. .PP In its bare form, a futex is an aligned integer which is only touched by atomic assembler instructions. diff --git a/man7/glob.7 b/man7/glob.7 index fb73b2cbe..23e51b730 100644 --- a/man7/glob.7 +++ b/man7/glob.7 @@ -104,7 +104,7 @@ unchanged when it is syntactically incorrect, or the list of matching pathnames is empty. With .I bash -one can force the classical behaviour by setting +one can force the classical behavior by setting .IR allow_null_glob_expansion=true . (Similar problems occur elsewhere. diff --git a/man7/inotify.7 b/man7/inotify.7 index 08d14b9b9..2e28047f2 100644 --- a/man7/inotify.7 +++ b/man7/inotify.7 @@ -127,7 +127,7 @@ the length of each structure is thus .IR "sizeof(inotify_event)+len" . -The behaviour when the buffer given to +The behavior when the buffer given to .BR read (2) is too small to return information about the next event depends on the kernel version: in kernels before 2.6.21, @@ -338,7 +338,7 @@ Other bits are invalid and shall be cleared. Linux sends .B IPTOS_LOWDELAY datagrams first by default, -but the exact behaviour depends on the configured queueing discipline. +but the exact behavior depends on the configured queueing discipline. .\" FIXME elaborate on this Some high priority levels may require superuser privileges (the .B CAP_NET_ADMIN diff --git a/man7/locale.7 b/man7/locale.7 index a912ad4ad..86b8ef8af 100644 --- a/man7/locale.7 +++ b/man7/locale.7 @@ -59,7 +59,7 @@ to the function, it is possible to set one of these to the desired locale: .TP .B LC_COLLATE -This is used to change the behaviour of the functions +This is used to change the behavior of the functions .BR strcoll (3) and .BR strxfrm (3), @@ -68,7 +68,7 @@ For example, the German sharp s is sorted as "ss". .TP .B LC_CTYPE -This changes the behaviour of the character handling and +This changes the behavior of the character handling and classification functions, such as .BR isupper (3) and @@ -111,7 +111,7 @@ This information can also be read with the function. .TP .B LC_TIME -changes the behaviour of the +changes the behavior of the .BR strftime (3) function to display the current time in a locally acceptable form; for example, most of Europe uses a 24\-hour clock versus the diff --git a/man7/man-pages.7 b/man7/man-pages.7 index 65d7b6d94..1647fb406 100644 --- a/man7/man-pages.7 +++ b/man7/man-pages.7 @@ -443,7 +443,7 @@ warnings when compiled with \fIcc -Wall\fP. .TP * Where possible and appropriate, example programs should allow -experimentation, by varying their behaviour based on inputs +experimentation, by varying their behavior based on inputs (ideally from command-line arguments, or alternatively, via input read by the program). .TP diff --git a/man7/netlink.7 b/man7/netlink.7 index 6eae179a6..e23232ec4 100644 --- a/man7/netlink.7 +++ b/man7/netlink.7 @@ -44,7 +44,7 @@ The currently assigned netlink families are: .B NETLINK_ROUTE Receives routing and link updates and may be used to modify the routing tables (both IPv4 and IPv6), IP addresses, link parameters, -neighbour setups, queueing disciplines, traffic classes and +neighbor setups, queueing disciplines, traffic classes and packet classifiers (see .BR rtnetlink (7)). .TP @@ -270,7 +270,7 @@ It is up to the application to detect when this happens (via the .B ENOBUFS error returned by .BR recvmsg (2)) -and resynchronise. +and resynchronize. .SS Address Formats The .I sockaddr_nl diff --git a/man7/posixoptions.7 b/man7/posixoptions.7 index c873d6095..91c3d8940 100644 --- a/man7/posixoptions.7 +++ b/man7/posixoptions.7 @@ -25,7 +25,7 @@ posixoptions \- optional parts of the POSIX standard .SH DESCRIPTION The POSIX standard (the information below is from POSIX.1-2001) -describes a set of behaviours and interfaces for a compliant system. +describes a set of behavior and interfaces for a compliant system. However, many interfaces are optional and there are feature test macros to test the availability of interfaces at compile time, and functions .BR sysconf (3), diff --git a/man7/pthreads.7 b/man7/pthreads.7 index 0ab430a6b..cb945cfbb 100644 --- a/man7/pthreads.7 +++ b/man7/pthreads.7 @@ -127,7 +127,7 @@ thread maps to a kernel scheduling entity. Both threading implementations employ the Linux .BR clone (2) system call. -In NPTL, thread synchronisation primitives (mutexes, +In NPTL, thread synchronization primitives (mutexes, thread joining, etc.) are implemented using the Linux .BR futex (2) system call. diff --git a/man7/pty.7 b/man7/pty.7 index 35f3e27b2..c447349ec 100644 --- a/man7/pty.7 +++ b/man7/pty.7 @@ -56,7 +56,7 @@ SUSv1 standardized a pseudo-terminal API based on the System V API, and this API should be employed in all new programs that use pseudo-terminals. -Linux provides both BSD-style and (standardised) System V-style +Linux provides both BSD-style and (standardized) System V-style pseudo-terminals. System V-style terminals are commonly called Unix 98 pseudo-terminals on Linux systems. @@ -70,7 +70,7 @@ An unused Unix 98 pseudo-terminal master is opened by calling .IR /dev/ptmx ; see .BR pts (4).) -After performing any program-specific initialisations, +After performing any program-specific initializations, changing the ownership and permissions of the slave device using .BR grantpt (3), and unlocking the slave using diff --git a/man7/rtnetlink.7 b/man7/rtnetlink.7 index fde6cd992..a7e42e515 100644 --- a/man7/rtnetlink.7 +++ b/man7/rtnetlink.7 @@ -26,7 +26,7 @@ Rtnetlink allows the kernel's routing tables to be read and altered. It is used within the kernel to communicate between various subsystems, though this usage is not documented here, and for communication with user-space programs. -Network routes, ip addresses, link parameters, neighbour setups, queueing +Network routes, ip addresses, link parameters, neighbor setups, queueing disciplines, traffic classes and packet classifiers may all be controlled through .B NETLINK_ROUTE @@ -321,7 +321,7 @@ RTA_CACHEINFO:: .B Fill these values in! .TP .BR RTM_NEWNEIGH ", " RTM_DELNEIGH ", " RTM_GETNEIGH -Add, remove or receive information about a neighbour table +Add, remove or receive information about a neighbor table entry (e.g. an ARP entry). The message contains an .B ndmsg @@ -383,8 +383,8 @@ field: tab(:); l l. NDA_UNSPEC:unknown type -NDA_DST:a neighbour cache n/w layer destination address -NDA_LLADDR:a neighbour cache link layer address +NDA_DST:a neighbor cache n/w layer destination address +NDA_LLADDR:a neighbor cache link layer address NDA_CACHEINFO:cache statistics. .TE diff --git a/man7/sem_overview.7 b/man7/sem_overview.7 index 1801ded3e..752d2b238 100644 --- a/man7/sem_overview.7 +++ b/man7/sem_overview.7 @@ -24,7 +24,7 @@ .SH NAME sem_overview \- Overview of POSIX semaphores .SH DESCRIPTION -POSIX semaphores allow processes and threads to synchronise their actions. +POSIX semaphores allow processes and threads to synchronize their actions. A semaphore is an integer whose value is never allowed to fall below zero. Two operations can be performed on semaphores: @@ -74,7 +74,7 @@ A process-shared semaphore must be placed in a shared memory region or a POSIX shared memory object built created using .BR shm_open (3)). -Before being used, an unnamed semaphore must be initialised using +Before being used, an unnamed semaphore must be initialized using .BR sem_init (3). It can then be operated on using .BR sem_post (3) diff --git a/man7/signal.7 b/man7/signal.7 index c9723dd85..e0cf0623a 100644 --- a/man7/signal.7 +++ b/man7/signal.7 @@ -66,7 +66,7 @@ A process can change the disposition of a signal using or (less portably) .BR signal (2). Using these system calls, a process can elect one of the -following behaviours to occur on delivery of the signal: +following behavior to occur on delivery of the signal: perform the default action; ignore the signal; or catch the signal with a .IR "signal handler" , @@ -173,7 +173,7 @@ SIGXCPU 24,24,30 Core CPU time limit exceeded (4.2BSD) SIGXFSZ 25,25,31 Core File size limit exceeded (4.2BSD) .TE -Up to and including Linux 2.2, the default behaviour for +Up to and including Linux 2.2, the default behavior for .BR SIGSYS ", " SIGXCPU ", " SIGXFSZ ", " and (on architectures other than SPARC and MIPS) .B SIGBUS diff --git a/man7/socket.7 b/man7/socket.7 index 40660608d..cb6b7f5bc 100644 --- a/man7/socket.7 +++ b/man7/socket.7 @@ -386,7 +386,7 @@ will pass the data to the protocol .RB ( SO_SNDLOWAT ) or the user on receiving .RB ( SO_RCVLOWAT ). -These two values are initialised to 1. +These two values are initialized to 1. .B SO_SNDLOWAT is not changeable on Linux .RB ( setsockopt diff --git a/man7/standards.7 b/man7/standards.7 index 80149e2dd..21c6e55c3 100644 --- a/man7/standards.7 +++ b/man7/standards.7 @@ -219,8 +219,8 @@ Specifications of commands and utilities Informative text on the other parts of the standard. .sp POSIX.1-2001 is aligned with C99, so that all of the -library functions standardised in C99 are also -standardised in POSIX.1-1001. +library functions standardized in C99 are also +standardized in POSIX.1-1001. .sp Two Technical Corrigenda (minor fixes and improvements) of the original 2001 standard have occurred: diff --git a/man7/suffixes.7 b/man7/suffixes.7 index 235d599ee..702355769 100644 --- a/man7/suffixes.7 +++ b/man7/suffixes.7 @@ -77,7 +77,7 @@ Suffix File type .am \fBautomake\fP(1) input file .arc \fBarc\fP(1) archive .arj \fBarj\fP(1) archive - .asc PGP ASCII-armoured data + .asc PGP ASCII-armored data .asm (GNU) assembler source file .au Audio sound file .aux LaTeX auxiliary file diff --git a/man7/tcp.7 b/man7/tcp.7 index 0dce758a0..915293188 100644 --- a/man7/tcp.7 +++ b/man7/tcp.7 @@ -424,7 +424,7 @@ minimum limit of 100 seconds is typically deemed too short. .TP .BR tcp_rfc1337 " (Boolean; default: disabled)" -Enable TCP behaviour conformant with RFC\ 1337. +Enable TCP behavior conformant with RFC\ 1337. When disabled, if a RST is received in TIME_WAIT state, we close the socket immediately without waiting for the end diff --git a/man7/termio.7 b/man7/termio.7 index 4c2d9514a..bb6b8131d 100644 --- a/man7/termio.7 +++ b/man7/termio.7 @@ -43,7 +43,7 @@ to replace the various operations that existed in System V. (This was done because .BR ioctl (2) -was unstandardised, and its variadic third argument +was unstandardized, and its variadic third argument does not allow argument type checking.) If you're looking for page called "termio", then you can probably diff --git a/man7/udp.7 b/man7/udp.7 index d18b01c60..5d52e3e79 100644 --- a/man7/udp.7 +++ b/man7/udp.7 @@ -99,9 +99,9 @@ This includes asynchronous errors received from the network. You may get an error for an earlier packet that was sent on the same socket. -This behaviour differs from many other BSD socket implementations +This behavior differs from many other BSD socket implementations which don't pass any errors unless the socket is connected. -Linux's behaviour is mandated by +Linux's behavior is mandated by .BR RFC\ 1122 . For compatibility with legacy code in Linux 2.0 and 2.2 diff --git a/man7/unix.7 b/man7/unix.7 index b1198213e..5f972acaa 100644 --- a/man7/unix.7 +++ b/man7/unix.7 @@ -264,7 +264,7 @@ be used in portable programs. but the implementation details differ.) .SH NOTES In the Linux implementation, sockets which are visible in the -filesystem honour the permissions of the directory they are in. +filesystem honor the permissions of the directory they are in. Their owner, group and their permissions can be changed. Creation of a new socket will fail if the process does not have write and search (execute) permission on the directory the socket is created in. diff --git a/man7/x25.7 b/man7/x25.7 index c1ad52b63..9be39627a 100644 --- a/man7/x25.7 +++ b/man7/x25.7 @@ -16,7 +16,7 @@ x25, PF_X25 \- ITU-T X.25 / ISO-8208 protocol interface. .SH DESCRIPTION X25 sockets provide an interface to the X.25 packet layer protocol. This allows applications to -communicate over a public X.25 data network as standardised by +communicate over a public X.25 data network as standardized by International Telecommunication Union's recommendation X.25 (X.25 DTE-DCE mode). X25 sockets can also be used for communication |