diff options
author | Tobias Stoeckmann <tobias@cvs.openbsd.org> | 2008-11-09 12:34:48 +0000 |
---|---|---|
committer | Tobias Stoeckmann <tobias@cvs.openbsd.org> | 2008-11-09 12:34:48 +0000 |
commit | be7cd0fdfd40b4f306a204fdbb31aa7cdd7efec5 (patch) | |
tree | 4fe9d2f1e49c671b752057aab4fa2bc1244686ca | |
parent | 352034d0e7596f5f8516e2e1c106775372f16180 (diff) |
typo fixed (overriden -> overridden)
ok espie, jmc
-rw-r--r-- | lib/libedit/readline.c | 4 | ||||
-rw-r--r-- | libexec/ld.so/hppa/rtld_machine.c | 4 | ||||
-rw-r--r-- | sys/arch/mac68k/mac68k/machdep.c | 4 | ||||
-rw-r--r-- | usr.bin/make/var.c | 4 | ||||
-rw-r--r-- | usr.bin/rcs/rcsprog.c | 6 | ||||
-rw-r--r-- | usr.bin/ssh/session.c | 4 | ||||
-rw-r--r-- | usr.bin/ssh/ssh.1 | 6 | ||||
-rw-r--r-- | usr.bin/tip/acu.c | 6 | ||||
-rw-r--r-- | usr.sbin/httpd/htdocs/manual/vhosts/name-based.html | 2 | ||||
-rw-r--r-- | usr.sbin/pppd/pppd.8 | 6 | ||||
-rw-r--r-- | usr.sbin/relayd/relayd.conf.5 | 6 |
11 files changed, 26 insertions, 26 deletions
diff --git a/lib/libedit/readline.c b/lib/libedit/readline.c index 258d2bb071c..ca81df8cf75 100644 --- a/lib/libedit/readline.c +++ b/lib/libedit/readline.c @@ -1,4 +1,4 @@ -/* $OpenBSD: readline.c,v 1.4 2008/06/26 05:42:05 ray Exp $ */ +/* $OpenBSD: readline.c,v 1.5 2008/11/09 12:34:46 tobias Exp $ */ /* $NetBSD: readline.c,v 1.43 2003/11/03 03:22:55 christos Exp $ */ /*- @@ -252,7 +252,7 @@ rl_initialize(void) el_set(e, EL_SIGNAL, rl_catch_signals); /* set default mode to "emacs"-style and read setting afterwards */ - /* so this can be overriden */ + /* so this can be overridden */ el_set(e, EL_EDITOR, "emacs"); if (rl_terminal_name != NULL) el_set(e, EL_TERMINAL, rl_terminal_name); diff --git a/libexec/ld.so/hppa/rtld_machine.c b/libexec/ld.so/hppa/rtld_machine.c index 3398eb5ec82..89bc37c4e4f 100644 --- a/libexec/ld.so/hppa/rtld_machine.c +++ b/libexec/ld.so/hppa/rtld_machine.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rtld_machine.c,v 1.15 2008/04/09 21:45:26 kurt Exp $ */ +/* $OpenBSD: rtld_machine.c,v 1.16 2008/11/09 12:34:47 tobias Exp $ */ /* * Copyright (c) 2004 Michael Shalayeff @@ -142,7 +142,7 @@ _dl_md_reloc(elf_object_t *object, int rel, int relasz) /* * this is normally done by the crt0 code but we have to make * sure it's set here to allow constructors to call functions - * that are overriden in the user binary (that are un-pic) + * that are overridden in the user binary (that are un-pic) */ if (object->obj_type == OBJTYPE_EXE) _hppa_dl_set_dp(object->dyn.pltgot); diff --git a/sys/arch/mac68k/mac68k/machdep.c b/sys/arch/mac68k/mac68k/machdep.c index 4d37aaeab23..3eb2c4d2ea9 100644 --- a/sys/arch/mac68k/mac68k/machdep.c +++ b/sys/arch/mac68k/mac68k/machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: machdep.c,v 1.146 2008/06/27 17:22:14 miod Exp $ */ +/* $OpenBSD: machdep.c,v 1.147 2008/11/09 12:34:47 tobias Exp $ */ /* $NetBSD: machdep.c,v 1.207 1998/07/08 04:39:34 thorpej Exp $ */ /* @@ -1604,7 +1604,7 @@ mac68k_set_io_offsets(base) case MACH_CLASSQ: Via1Base = (volatile u_char *)base; - /* The following two may be overriden. */ + /* The following two may be overridden. */ sccA = (volatile u_char *)base + 0xc000; SCSIBase = base + 0xf000; diff --git a/usr.bin/make/var.c b/usr.bin/make/var.c index d31a34d492a..4e29d9ecfdb 100644 --- a/usr.bin/make/var.c +++ b/usr.bin/make/var.c @@ -1,5 +1,5 @@ /* $OpenPackages$ */ -/* $OpenBSD: var.c,v 1.83 2007/11/17 16:39:45 espie Exp $ */ +/* $OpenBSD: var.c,v 1.84 2008/11/09 12:34:47 tobias Exp $ */ /* $NetBSD: var.c,v 1.18 1997/03/18 19:24:46 christos Exp $ */ /* @@ -639,7 +639,7 @@ var_set_append(const char *name, const char *ename, const char *val, int ctxt, if (DEBUG(VAR)) printf("global:%s = %s\n", v->name, var_get_value(v)); } else if (DEBUG(VAR)) - printf("overriden:%s = %s\n", v->name, var_get_value(v)); + printf("overridden:%s = %s\n", v->name, var_get_value(v)); } void diff --git a/usr.bin/rcs/rcsprog.c b/usr.bin/rcs/rcsprog.c index 848f41fdb87..3a1bae11d03 100644 --- a/usr.bin/rcs/rcsprog.c +++ b/usr.bin/rcs/rcsprog.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rcsprog.c,v 1.145 2008/07/08 12:25:47 joris Exp $ */ +/* $OpenBSD: rcsprog.c,v 1.146 2008/11/09 12:34:47 tobias Exp $ */ /* * Copyright (c) 2005 Jean-Francois Brousseau <jfb@openbsd.org> * All rights reserved. @@ -229,7 +229,7 @@ rcs_main(int argc, char **argv) break; case 'L': if (lkmode == RCS_LOCK_LOOSE) - warnx("-U overriden by -L"); + warnx("-U overridden by -L"); lkmode = RCS_LOCK_STRICT; break; case 'l': @@ -267,7 +267,7 @@ rcs_main(int argc, char **argv) break; case 'U': if (lkmode == RCS_LOCK_STRICT) - warnx("-L overriden by -U"); + warnx("-L overridden by -U"); lkmode = RCS_LOCK_LOOSE; break; case 'u': diff --git a/usr.bin/ssh/session.c b/usr.bin/ssh/session.c index 893c643ba8c..b5d36435bbb 100644 --- a/usr.bin/ssh/session.c +++ b/usr.bin/ssh/session.c @@ -1,4 +1,4 @@ -/* $OpenBSD: session.c,v 1.243 2008/10/02 14:39:35 millert Exp $ */ +/* $OpenBSD: session.c,v 1.244 2008/11/09 12:34:47 tobias Exp $ */ /* * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland * All rights reserved @@ -827,7 +827,7 @@ check_quietlogin(Session *s, const char *command) /* * Sets the value of the given variable in the environment. If the variable - * already exists, its value is overriden. + * already exists, its value is overridden. */ void child_set_env(char ***envp, u_int *envsizep, const char *name, diff --git a/usr.bin/ssh/ssh.1 b/usr.bin/ssh/ssh.1 index 5f55dfe9de8..b66a1c34201 100644 --- a/usr.bin/ssh/ssh.1 +++ b/usr.bin/ssh/ssh.1 @@ -34,8 +34,8 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" $OpenBSD: ssh.1,v 1.279 2008/11/05 03:23:09 stevesk Exp $ -.Dd $Mdocdate: November 5 2008 $ +.\" $OpenBSD: ssh.1,v 1.280 2008/11/09 12:34:47 tobias Exp $ +.Dd $Mdocdate: November 9 2008 $ .Dt SSH 1 .Os .Sh NAME @@ -550,7 +550,7 @@ using an alternative syntax: .Pp By default, the listening socket on the server will be bound to the loopback interface only. -This may be overriden by specifying a +This may be overridden by specifying a .Ar bind_address . An empty .Ar bind_address , diff --git a/usr.bin/tip/acu.c b/usr.bin/tip/acu.c index b8e3858484c..896bde2b54c 100644 --- a/usr.bin/tip/acu.c +++ b/usr.bin/tip/acu.c @@ -1,4 +1,4 @@ -/* $OpenBSD: acu.c,v 1.15 2007/05/15 19:42:05 moritz Exp $ */ +/* $OpenBSD: acu.c,v 1.16 2008/11/09 12:34:47 tobias Exp $ */ /* $NetBSD: acu.c,v 1.4 1996/12/29 10:34:03 cgd Exp $ */ /* @@ -34,7 +34,7 @@ #if 0 static char sccsid[] = "@(#)acu.c 8.1 (Berkeley) 6/6/93"; #endif -static const char rcsid[] = "$OpenBSD: acu.c,v 1.15 2007/05/15 19:42:05 moritz Exp $"; +static const char rcsid[] = "$OpenBSD: acu.c,v 1.16 2008/11/09 12:34:47 tobias Exp $"; #endif /* not lint */ #include "tip.h" @@ -51,7 +51,7 @@ static jmp_buf jmpbuf; * The phone numbers are in PN, and the call unit is in CU. * * If the PN is an '@', then we consult the PHONES file for - * the phone numbers. This file is /etc/phones, unless overriden + * the phone numbers. This file is /etc/phones, unless overridden * by an exported shell variable. * * The data base files must be in the format: diff --git a/usr.sbin/httpd/htdocs/manual/vhosts/name-based.html b/usr.sbin/httpd/htdocs/manual/vhosts/name-based.html index 8940a29c191..52f9c818764 100644 --- a/usr.sbin/httpd/htdocs/manual/vhosts/name-based.html +++ b/usr.sbin/httpd/htdocs/manual/vhosts/name-based.html @@ -172,7 +172,7 @@ is allowed, check the <a href="../mod/directive-dict.html#Context">Context</a> of the directive. Configuration directives set in the <em>main server context</em> (outside any <code><VirtualHost></code> container) -will be used only if they are not overriden by the virtual host +will be used only if they are not overridden by the virtual host settings.</p> <p>Now when a request arrives, the server will first check if it is diff --git a/usr.sbin/pppd/pppd.8 b/usr.sbin/pppd/pppd.8 index aaff405bc31..5ec370ef9f5 100644 --- a/usr.sbin/pppd/pppd.8 +++ b/usr.sbin/pppd/pppd.8 @@ -1,4 +1,4 @@ -.\" $OpenBSD: pppd.8,v 1.34 2008/05/07 12:16:32 claudio Exp $ +.\" $OpenBSD: pppd.8,v 1.35 2008/11/09 12:34:47 tobias Exp $ .\" Id: pppd.8,v 1.27 1998/03/31 04:31:08 paulus Exp $ .\" .\" Copyright (c) 1993-2003 Paul Mackerras <paulus@samba.org> @@ -15,7 +15,7 @@ .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. .\" -.Dd $Mdocdate: May 7 2008 $ +.Dd $Mdocdate: November 9 2008 $ .Dt PPPD 8 .Os .Sh NAME @@ -1268,7 +1268,7 @@ Messages are sent to the .Xr syslogd 8 daemon using facility .Dv LOG_DAEMON . -(This can be overriden by recompiling +(This can be overridden by recompiling .Nm with the macro .Dv LOG_PPP diff --git a/usr.sbin/relayd/relayd.conf.5 b/usr.sbin/relayd/relayd.conf.5 index 4a6f72ab8b2..2e9047edcc9 100644 --- a/usr.sbin/relayd/relayd.conf.5 +++ b/usr.sbin/relayd/relayd.conf.5 @@ -1,4 +1,4 @@ -.\" $OpenBSD: relayd.conf.5,v 1.97 2008/10/05 20:37:52 jmc Exp $ +.\" $OpenBSD: relayd.conf.5,v 1.98 2008/11/09 12:34:47 tobias Exp $ .\" .\" Copyright (c) 2006, 2007 Reyk Floeter <reyk@openbsd.org> .\" Copyright (c) 2006, 2007 Pierre-Yves Ritschard <pyr@openbsd.org> @@ -15,7 +15,7 @@ .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. .\" -.Dd $Mdocdate: October 5 2008 $ +.Dd $Mdocdate: November 9 2008 $ .Dt RELAYD.CONF 5 .Os .Sh NAME @@ -161,7 +161,7 @@ for more information about the configuration. .Ic timeout Ar number .Xc Set the global timeout in milliseconds for checks. -This can be overriden by the timeout value in the table definitions. +This can be overridden by the timeout value in the table definitions. The default interval is 200 milliseconds and it must not exceed the global interval. Please note that the default value is optimized for checks within the |