From: Sascha Wildner Date: Sat, 7 May 2005 02:11:25 +0000 (+0000) Subject: Correct typo: vender -> vendor X-Git-Tag: v2.0.1~7476 X-Git-Url: https://gitweb.dragonflybsd.org/dragonfly.git/commitdiff_plain/2e46b2a9dcb4957eee73b2bf1a32eb1381257ed9 Correct typo: vender -> vendor --- diff --git a/sys/bus/firewire/fwohcireg.h b/sys/bus/firewire/fwohcireg.h index 18ab563166..7309bd4dcd 100644 --- a/sys/bus/firewire/fwohcireg.h +++ b/sys/bus/firewire/fwohcireg.h @@ -32,7 +32,7 @@ * POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/dev/firewire/fwohcireg.h,v 1.15 2004/01/06 14:24:01 simokawa Exp $ - * $DragonFly: src/sys/bus/firewire/fwohcireg.h,v 1.15 2004/07/18 12:49:15 asmodai Exp $ + * $DragonFly: src/sys/bus/firewire/fwohcireg.h,v 1.16 2005/05/07 02:11:25 swildner Exp $ * */ #define PCI_CBMEM 0x10 @@ -236,7 +236,7 @@ struct ohci_registers { fwohcireg_t config_rom; /* config ROM map 0x34 */ fwohcireg_t post_wr_lo; /* post write addr lo 0x38 */ fwohcireg_t post_wr_hi; /* post write addr hi 0x3c */ - fwohcireg_t vender; /* vender ID 0x40 */ + fwohcireg_t vendor; /* vendor ID 0x40 */ fwohcireg_t dummy1[3]; /* dummy 0x44-0x4c */ fwohcireg_t hcc_cntl_set; /* HCC control set 0x50 */ fwohcireg_t hcc_cntl_clr; /* HCC control clr 0x54 */ diff --git a/sys/dev/video/i386/vesa/vesa.c b/sys/dev/video/i386/vesa/vesa.c index f4d417870b..0d05500bd6 100644 --- a/sys/dev/video/i386/vesa/vesa.c +++ b/sys/dev/video/i386/vesa/vesa.c @@ -24,7 +24,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/i386/isa/vesa.c,v 1.32.2.1 2002/08/13 02:42:33 rwatson Exp $ - * $DragonFly: src/sys/dev/video/i386/vesa/vesa.c,v 1.7 2005/04/30 23:04:21 swildner Exp $ + * $DragonFly: src/sys/dev/video/i386/vesa/vesa.c,v 1.8 2005/05/07 02:11:25 swildner Exp $ */ #include "opt_vga.h" @@ -155,7 +155,7 @@ static int has_vesa_bios = FALSE; static struct vesa_info *vesa_adp_info = NULL; static u_int16_t *vesa_vmodetab = NULL; static char *vesa_oemstr = NULL; -static char *vesa_venderstr = NULL; +static char *vesa_vendorstr = NULL; static char *vesa_prodstr = NULL; static char *vesa_revstr = NULL; @@ -655,8 +655,8 @@ vesa_bios_init(void) is_via_cle266 = strcmp(vesa_oemstr, VESA_VIA_CLE266) == 0; if (vesa_adp_info->v_version >= 0x0200) { - vesa_venderstr = - (char *)vesa_fix_ptr(vesa_adp_info->v_venderstr, + vesa_vendorstr = + (char *)vesa_fix_ptr(vesa_adp_info->v_vendorstr, vmf.vmf_es, vmf.vmf_di, buf); vesa_prodstr = (char *)vesa_fix_ptr(vesa_adp_info->v_prodstr, @@ -1530,9 +1530,9 @@ vesa_bios_info(int level) return 0; if (vesa_adp_info->v_version >= 0x0200 && bootverbose) { - /* vender name, product name, product revision */ + /* vendor name, product name, product revision */ printf("VESA: %s %s %s\n", - (vesa_venderstr != NULL) ? vesa_venderstr : "unknown", + (vesa_vendorstr != NULL) ? vesa_vendorstr : "unknown", (vesa_prodstr != NULL) ? vesa_prodstr : "unknown", (vesa_revstr != NULL) ? vesa_revstr : "?"); } diff --git a/sys/i386/include/pc/vesa.h b/sys/i386/include/pc/vesa.h index abd7dde97c..ec5d5cd468 100644 --- a/sys/i386/include/pc/vesa.h +++ b/sys/i386/include/pc/vesa.h @@ -24,7 +24,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/i386/include/pc/vesa.h,v 1.7 1999/12/29 04:33:12 peter Exp $ - * $DragonFly: src/sys/i386/include/pc/Attic/vesa.h,v 1.2 2003/06/17 04:28:36 dillon Exp $ + * $DragonFly: src/sys/i386/include/pc/Attic/vesa.h,v 1.3 2005/05/07 02:11:25 swildner Exp $ */ #ifndef _MACHINE_PC_VESA_H @@ -44,7 +44,7 @@ struct vesa_info u_int16_t v_memsize __attribute__ ((packed)); /* in 64K */ /* 2.0 */ u_int16_t v_revision __attribute__ ((packed)); /* software rev */ - u_int32_t v_venderstr __attribute__ ((packed)); /* vender */ + u_int32_t v_vendorstr __attribute__ ((packed)); /* vendor */ u_int32_t v_prodstr __attribute__ ((packed)); /* product name */ u_int32_t v_revstr __attribute__ ((packed)); /* product rev */ }; diff --git a/sys/platform/pc32/include/pc/vesa.h b/sys/platform/pc32/include/pc/vesa.h index 7d9f52d2db..2a1d436a10 100644 --- a/sys/platform/pc32/include/pc/vesa.h +++ b/sys/platform/pc32/include/pc/vesa.h @@ -24,7 +24,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/i386/include/pc/vesa.h,v 1.7 1999/12/29 04:33:12 peter Exp $ - * $DragonFly: src/sys/platform/pc32/include/pc/vesa.h,v 1.2 2003/06/17 04:28:36 dillon Exp $ + * $DragonFly: src/sys/platform/pc32/include/pc/vesa.h,v 1.3 2005/05/07 02:11:25 swildner Exp $ */ #ifndef _MACHINE_PC_VESA_H @@ -44,7 +44,7 @@ struct vesa_info u_int16_t v_memsize __attribute__ ((packed)); /* in 64K */ /* 2.0 */ u_int16_t v_revision __attribute__ ((packed)); /* software rev */ - u_int32_t v_venderstr __attribute__ ((packed)); /* vender */ + u_int32_t v_vendorstr __attribute__ ((packed)); /* vendor */ u_int32_t v_prodstr __attribute__ ((packed)); /* product name */ u_int32_t v_revstr __attribute__ ((packed)); /* product rev */ }; diff --git a/usr.sbin/moused/moused.c b/usr.sbin/moused/moused.c index 880d9f84a7..3b0700a6c6 100644 --- a/usr.sbin/moused/moused.c +++ b/usr.sbin/moused/moused.c @@ -46,7 +46,7 @@ /* * $FreeBSD: src/usr.sbin/moused/moused.c,v 1.37.2.11 2002/04/15 00:52:08 will Exp $ - * $DragonFly: src/usr.sbin/moused/moused.c,v 1.3 2004/03/24 18:23:46 cpressey Exp $ + * $DragonFly: src/usr.sbin/moused/moused.c,v 1.4 2005/05/07 02:11:25 swildner Exp $ */ #include #include @@ -2661,7 +2661,7 @@ pnpparse(pnpid_t *id, char *buf, int len) id->revision = ((buf[1] & 0x3f) << 6) | (buf[2] & 0x3f); debug("PnP rev %d.%02d", id->revision / 100, id->revision % 100); - /* EISA vender and product ID */ + /* EISA vendor and product ID */ id->eisaid = &buf[3]; id->neisaid = 7; diff --git a/usr.sbin/pfctl/pf.conf.5 b/usr.sbin/pfctl/pf.conf.5 index 643e5ae186..c697c576e3 100644 --- a/usr.sbin/pfctl/pf.conf.5 +++ b/usr.sbin/pfctl/pf.conf.5 @@ -1,5 +1,5 @@ .\" $OpenBSD: pf.conf.5,v 1.291 2004/02/04 19:38:30 jmc Exp $ -.\" $DragonFly: src/usr.sbin/pfctl/pf.conf.5,v 1.1 2004/09/21 21:25:28 joerg Exp $ +.\" $DragonFly: src/usr.sbin/pfctl/pf.conf.5,v 1.2 2005/05/07 02:11:25 swildner Exp $ .\" .\" Copyright (c) 2002, Daniel Hartmeier .\" All rights reserved. @@ -1892,7 +1892,7 @@ upon. .Pp The fingerprints may be specified by operating system class, by version, or by subtype/patchlevel. -The class of an operating system is typically the vender or genre +The class of an operating system is typically the vendor or genre and would be OpenBSD for the .Xr pf 4 firewall itself. diff --git a/usr.sbin/pfctl/pf.os.5 b/usr.sbin/pfctl/pf.os.5 index b7e1ee0e93..2ad796ae9e 100644 --- a/usr.sbin/pfctl/pf.os.5 +++ b/usr.sbin/pfctl/pf.os.5 @@ -1,5 +1,5 @@ .\" $OpenBSD: pf.os.5,v 1.4 2003/08/28 09:41:23 jmc Exp $ -.\" $DragonFly: src/usr.sbin/pfctl/pf.os.5,v 1.1 2004/09/21 21:25:28 joerg Exp $ +.\" $DragonFly: src/usr.sbin/pfctl/pf.os.5,v 1.2 2005/05/07 02:11:25 swildner Exp $ .\" .\" Copyright (c) 2003 Mike Frantzen .\" @@ -161,7 +161,7 @@ exact same TCP options in the same order. .Pp The .Ar class -field is the class, genre or vender of the operating system. +field is the class, genre or vendor of the operating system. .Pp The .Ar version