diff options
| author |   deraadt <deraadt@openbsd.org> | 2015-10-05 01:22:34 +0000 |
|---|---|---|
| committer | deraadt <deraadt@openbsd.org> | 2015-10-05 01:22:34 +0000 |
| commit | 050b9ef3a24d73f14f63e68ab3efe4163573ad1a (patch) | |
| tree | f349a846da9eba654437697efc504ae687913cbc | |
| parent | Ignore IPv4 TLVs in IPv6 instances and vice-versa. (diff) | |
| download | wireguard-openbsd-050b9ef3a24d73f14f63e68ab3efe4163573ad1a.tar.xz wireguard-openbsd-050b9ef3a24d73f14f63e68ab3efe4163573ad1a.zip | |
user land -> userland; from Rob Pierce
| -rw-r--r-- | share/man/man9/style.9 | 8 | ||||
| -rw-r--r-- | sys/arch/m88k/include/pcb.h | 4 | ||||
| -rw-r--r-- | sys/netinet6/in6_var.h | 4 |
3 files changed, 8 insertions, 8 deletions
diff --git a/share/man/man9/style.9 b/share/man/man9/style.9 index 52d1794f65c..f34a56144e4 100644 --- a/share/man/man9/style.9 +++ b/share/man/man9/style.9 @@ -22,9 +22,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $OpenBSD: style.9,v 1.61 2015/09/26 15:40:28 guenther Exp $ +.\" $OpenBSD: style.9,v 1.62 2015/10/05 01:22:34 deraadt Exp $ .\" -.Dd $Mdocdate: September 26 2015 $ +.Dd $Mdocdate: October 5 2015 $ .Dt STYLE 9 .Os .Sh NAME @@ -34,7 +34,7 @@ This file specifies the preferred style for kernel source files in the .Ox source tree. -It is also a guide for preferred user land code style. +It is also a guide for preferred userland code style. These guidelines should be followed for all new code. In general, code can be considered .Dq new code @@ -110,7 +110,7 @@ All functions are prototyped somewhere. .Pp Function prototypes for private functions (i.e., functions not used elsewhere) go at the top of the first source module. -In user land, functions local to one source module should be declared +In userland, functions local to one source module should be declared .Ql static . This should not be done in kernel land since it makes it impossible to use the kernel debugger. diff --git a/sys/arch/m88k/include/pcb.h b/sys/arch/m88k/include/pcb.h index 20504a9db61..26a81398185 100644 --- a/sys/arch/m88k/include/pcb.h +++ b/sys/arch/m88k/include/pcb.h @@ -1,4 +1,4 @@ -/* $OpenBSD: pcb.h,v 1.7 2015/05/05 02:13:46 guenther Exp $ */ +/* $OpenBSD: pcb.h,v 1.8 2015/10/05 01:22:34 deraadt Exp $ */ /* * Copyright (c) 1996 Nivas Madhur * Mach Operating System @@ -38,7 +38,7 @@ /* * Our PCB is the regular PCB+Save area for kernel frame. - * Upon entering kernel mode from user land, save the user context + * Upon entering kernel mode from userland, save the user context * in the saved_state area - this is passed as the exception frame. * On a context switch, only registers that need to be saved by the * C calling convention and few other regs (pc, psr etc) are saved diff --git a/sys/netinet6/in6_var.h b/sys/netinet6/in6_var.h index 65e82697ce2..fa498bd348c 100644 --- a/sys/netinet6/in6_var.h +++ b/sys/netinet6/in6_var.h @@ -1,4 +1,4 @@ -/* $OpenBSD: in6_var.h,v 1.56 2015/09/10 16:39:39 mpi Exp $ */ +/* $OpenBSD: in6_var.h,v 1.57 2015/10/05 01:22:34 deraadt Exp $ */ /* $KAME: in6_var.h,v 1.55 2001/02/16 12:49:45 itojun Exp $ */ /* @@ -275,7 +275,7 @@ struct in6_aliasreq { /* * prefix related flags passed between kernel(NDP related part) and - * user land command(ifconfig) and daemon(rtadvd). + * userland command(ifconfig) and daemon(rtadvd). */ struct prf_ra { u_int onlink : 1; |