From be7b688eb5d9440a65fcf167f64471017863548b Mon Sep 17 00:00:00 2001 From: tobias Date: Thu, 14 Aug 2014 17:55:28 +0000 Subject: [PATCH] fixed overrid(d)en typo millert@ and jmc@ agree that "overriden" is wrong --- lib/libc/sys/Makefile.inc | 4 ++-- lib/libcrypto/dso/dso.h | 4 ++-- lib/libcrypto/x509v3.cnf | 2 +- lib/libssl/src/crypto/dso/dso.h | 4 ++-- sys/arch/aviion/stand/vdmtool/vdmtool.c | 4 ++-- sys/arch/mips64/include/cpu.h | 4 ++-- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/lib/libc/sys/Makefile.inc b/lib/libc/sys/Makefile.inc index f692d7e4bfa..a93eb967e32 100644 --- a/lib/libc/sys/Makefile.inc +++ b/lib/libc/sys/Makefile.inc @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.inc,v 1.119 2014/07/12 02:28:56 deraadt Exp $ +# $OpenBSD: Makefile.inc,v 1.120 2014/08/14 17:55:28 tobias Exp $ # $NetBSD: Makefile.inc,v 1.35 1995/10/16 23:49:07 jtc Exp $ # @(#)Makefile.inc 8.1 (Berkeley) 6/17/93 @@ -22,7 +22,7 @@ SRCS+= ftruncate.c lseek.c mquery.c mmap.c ptrace.c semctl.c truncate.c \ # stack protector helper functions SRCS+= stack_protector.c -# modules with default implementations on all architectures, unless overriden +# modules with default implementations on all architectures, unless overridden # below: ASM= __get_tcb.o __getcwd.o __semctl.o __set_tcb.o __syscall.o \ __sysctl.o __threxit.o __thrsigdivert.o __thrsleep.o \ diff --git a/lib/libcrypto/dso/dso.h b/lib/libcrypto/dso/dso.h index 7bd138bc3bf..52d391c0a49 100644 --- a/lib/libcrypto/dso/dso.h +++ b/lib/libcrypto/dso/dso.h @@ -1,4 +1,4 @@ -/* $OpenBSD: dso.h,v 1.9 2014/06/12 15:49:29 deraadt Exp $ */ +/* $OpenBSD: dso.h,v 1.10 2014/08/14 17:55:28 tobias Exp $ */ /* Written by Geoff Thorpe (geoff@geoffthorpe.net) for the OpenSSL * project 2000. */ @@ -74,7 +74,7 @@ extern "C" { * typical for the platform (more specifically the DSO_METHOD) using the * dso_name_converter function of the method. Eg. win32 will transform "blah" * into "blah.dll", and dlfcn will transform it into "libblah.so". The - * behaviour can be overriden by setting the name_converter callback in the DSO + * behaviour can be overridden by setting the name_converter callback in the DSO * object (using DSO_set_name_converter()). This callback could even utilise * the DSO_METHOD's converter too if it only wants to override behaviour for * one or two possible DSO methods. However, the following flag can be set in a diff --git a/lib/libcrypto/x509v3.cnf b/lib/libcrypto/x509v3.cnf index 8c6b775da18..d12d7328557 100644 --- a/lib/libcrypto/x509v3.cnf +++ b/lib/libcrypto/x509v3.cnf @@ -7,7 +7,7 @@ CERTFQDN = nohost.nodomain # This section should be referenced when building an x509v3 CA # Certificate. -# The default path length and the key usage can be overriden +# The default path length and the key usage can be overridden # modified by setting the CERTPATHLEN and CERTUSAGE environment # variables. [x509v3_CA] diff --git a/lib/libssl/src/crypto/dso/dso.h b/lib/libssl/src/crypto/dso/dso.h index 7bd138bc3bf..52d391c0a49 100644 --- a/lib/libssl/src/crypto/dso/dso.h +++ b/lib/libssl/src/crypto/dso/dso.h @@ -1,4 +1,4 @@ -/* $OpenBSD: dso.h,v 1.9 2014/06/12 15:49:29 deraadt Exp $ */ +/* $OpenBSD: dso.h,v 1.10 2014/08/14 17:55:28 tobias Exp $ */ /* Written by Geoff Thorpe (geoff@geoffthorpe.net) for the OpenSSL * project 2000. */ @@ -74,7 +74,7 @@ extern "C" { * typical for the platform (more specifically the DSO_METHOD) using the * dso_name_converter function of the method. Eg. win32 will transform "blah" * into "blah.dll", and dlfcn will transform it into "libblah.so". The - * behaviour can be overriden by setting the name_converter callback in the DSO + * behaviour can be overridden by setting the name_converter callback in the DSO * object (using DSO_set_name_converter()). This callback could even utilise * the DSO_METHOD's converter too if it only wants to override behaviour for * one or two possible DSO methods. However, the following flag can be set in a diff --git a/sys/arch/aviion/stand/vdmtool/vdmtool.c b/sys/arch/aviion/stand/vdmtool/vdmtool.c index d4edac3224a..d0ebbf30369 100644 --- a/sys/arch/aviion/stand/vdmtool/vdmtool.c +++ b/sys/arch/aviion/stand/vdmtool/vdmtool.c @@ -1,4 +1,4 @@ -/* $OpenBSD: vdmtool.c,v 1.4 2014/07/12 19:01:49 tedu Exp $ */ +/* $OpenBSD: vdmtool.c,v 1.5 2014/08/14 17:55:28 tobias Exp $ */ /* * Copyright (c) 2013 Miodrag Vallat. @@ -189,7 +189,7 @@ register_subdriver(uint8_t *buf) if (regid != NULL) { if (*regid != 0) - printf("WARNING: subdriver \"%s\" overriden\n", + printf("WARNING: subdriver \"%s\" overridden\n", entry.name); *regid = id; } diff --git a/sys/arch/mips64/include/cpu.h b/sys/arch/mips64/include/cpu.h index 2629528f2c7..e7fbc1e15b5 100644 --- a/sys/arch/mips64/include/cpu.h +++ b/sys/arch/mips64/include/cpu.h @@ -1,4 +1,4 @@ -/* $OpenBSD: cpu.h,v 1.102 2014/07/11 10:53:07 uebayasi Exp $ */ +/* $OpenBSD: cpu.h,v 1.103 2014/08/14 17:55:28 tobias Exp $ */ /*- * Copyright (c) 1992, 1993 @@ -477,7 +477,7 @@ void cp0_set_trapbase(register_t); u_int cp1_get_prid(void); /* - * Cache routines (may be overriden) + * Cache routines (may be overridden) */ #ifndef Mips_SyncCache -- 2.20.1