.\" USE WITH EXTREME CAUTION.
.\"
.\"
-.\" $DragonFly: src/bin/cpdup/cpdup.1,v 1.23 2007/05/12 21:22:10 swildner Exp $
+.\" $DragonFly: src/bin/cpdup/cpdup.1,v 1.24 2007/05/13 18:33:55 swildner Exp $
.Dd October 28, 1999
.Dt CPDUP 1
.Os
.Sh DIAGNOSTICS
The
.Nm
-utility exits 0 if no error occured and >0 if an error occured.
+utility exits 0 if no error occurred and >0 if an error occurred.
.Sh SEE ALSO
.Xr cp 1 ,
.Xr cpio 1 ,
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $DragonFly: src/bin/varsym/varsym.1,v 1.8 2007/05/12 07:21:51 swildner Exp $
+.\" $DragonFly: src/bin/varsym/varsym.1,v 1.9 2007/05/13 18:33:55 swildner Exp $
.\"
.Dd November 5, 2003
.Dt VARSYM 1
utility exits with one of the following values:
.Bl -tag -width Ds
.It 0
-No errors occured.
+No errors occurred.
.It 1
A requested variable could not be found
.It 2
# Internet protocols
#
# $FreeBSD: src/etc/protocols,v 1.13.2.3 2002/02/27 03:39:00 dd Exp $
-# $DragonFly: src/etc/protocols,v 1.5 2005/01/06 08:43:35 asmodai Exp $
+# $DragonFly: src/etc/protocols,v 1.6 2007/05/13 18:33:55 swildner Exp $
# from: @(#)protocols 5.1 (Berkeley) 4/17/89
#
# See also http://www.iana.org/assignments/protocol-numbers
sep 33 SEP # Sequential Exchange Protocol
3pc 34 3PC # Third Party Connect Protocol
idpr 35 IDPR # Inter-Domain Policy Routing Protocol
-xtp 36 XTP # Xpress Tranfer Protocol
+xtp 36 XTP # Xpress Transfer Protocol
ddp 37 DDP # Datagram Delivery Protocol
idpr-cmtp 38 IDPR-CMTP # IDPR Control Message Transport Proto
tp++ 39 TP++ # TP++ Transport Protocol
%% $FreeBSD: src/games/fortune/datfiles/limerick,v 1.3.2.1 2002/08/09 20:40:29 fanf Exp $
-%% $DragonFly: src/games/fortune/datfiles/limerick,v 1.2 2003/06/17 04:25:24 dillon Exp $
+%% $DragonFly: src/games/fortune/datfiles/limerick,v 1.3 2007/05/13 18:33:55 swildner Exp $
A bad little girl in Madrid,
A most reprehensible kid,
Told her Tante Louise
You can get up my bottom instead."
%
There was a young lady whose cunt
-Could accomodate a small punt.
+Could accommodate a small punt.
Her mother said, "Annie,
It matches your fanny,
Which never was that of a runt."
/* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
/* hack.c - version 1.0.3 */
/* $FreeBSD: src/games/hack/hack.c,v 1.4 1999/11/16 10:26:35 marcel Exp $ */
-/* $DragonFly: src/games/hack/hack.c,v 1.5 2006/08/21 19:45:32 pavalos Exp $ */
+/* $DragonFly: src/games/hack/hack.c,v 1.6 2007/05/13 18:33:55 swildner Exp $ */
#include "hack.h"
}
lift_some:
if(inv_cnt() >= 52) {
- pline("Your knapsack cannot accomodate anymore items.");
+ pline("Your knapsack cannot accommodate anymore items.");
break;
}
if(wt > -5) pline("You have a little trouble lifting");
*
* @(#)warp.c 8.1 (Berkeley) 5/31/93
* $FreeBSD: src/games/trek/warp.c,v 1.4 1999/11/30 03:49:56 billf Exp $
- * $DragonFly: src/games/trek/warp.c,v 1.3 2006/09/07 21:19:45 pavalos Exp $
+ * $DragonFly: src/games/trek/warp.c,v 1.4 2007/05/13 18:33:55 swildner Exp $
*/
# include "getpar.h"
/* test for just a lot of damage */
if (percent < 80)
lose(L_TOOFAST);
- printf("Equilibrium restored -- extreme damage occured to ship systems\n");
+ printf("Equilibrium restored -- extreme damage occurred to ship systems\n");
for (i = 0; i < NDEV; i++)
damage(i, (3.0 * (franf() + franf()) + 1.0) * Param.damfac[i]);
Ship.shldup = 0;
.\" SUCH DAMAGE.
.\"
.\" $FreeBSD: src/lib/libc/gen/dlinfo.3,v 1.3.2.1 2003/02/20 20:42:45 kan Exp $
-.\" $DragonFly: src/lib/libc/gen/dlinfo.3,v 1.9 2007/03/16 12:32:50 swildner Exp $
+.\" $DragonFly: src/lib/libc/gen/dlinfo.3,v 1.10 2007/05/13 18:33:55 swildner Exp $
.\"
.Dd February 14, 2003
.Os
.El
.Sh RETURN VALUES
.Fn dlinfo
-returns 0 on success, or -1 if error occured.
+returns 0 on success, or -1 if error occurred.
Whenever an error has been detected, a message detailing it can
be retrieved via a call to
.Fn dlerror .
.\" $NetBSD: poll.2,v 1.3 1996/09/07 21:53:08 mycroft Exp $
.\" $FreeBSD: src/lib/libc/sys/poll.2,v 1.4.2.3 2001/12/14 18:34:01 ru Exp $
-.\" $DragonFly: src/lib/libc/sys/poll.2,v 1.4 2006/05/26 19:39:37 swildner Exp $
+.\" $DragonFly: src/lib/libc/sys/poll.2,v 1.5 2007/05/13 18:33:56 swildner Exp $
.\"
.\" Copyright (c) 1996 Charles M. Hannum. All rights reserved.
.\"
.Sh RETURN VALUES
.Fn Poll
returns the number of descriptors that are ready for I/O, or -1 if an
-error occured. If the time limit expires,
+error occurred. If the time limit expires,
.Fn poll
returns 0.
If
.\" OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $DragonFly: src/lib/libc/sys/syslink.2,v 1.4 2007/04/03 03:09:28 dillon Exp $
+.\" $DragonFly: src/lib/libc/sys/syslink.2,v 1.5 2007/05/13 18:33:56 swildner Exp $
.\"
.Dd March 13, 2007
.Dt SYSLINK 2
Once you have a session prefix in hand you can allocate session and logical
ids by combining your prefix with your sequence index and global timestamp
to create session and logical ids that are good for 500 years.
-.Pp
.Sh SYSLINK PROTOCOL - REGISTRATION OF LOGICAL IDS
A logical sysid represents a particular resource and must be registered
with a registration entity along with the fully qualified name for that
originator to talk directly to the target.
.Pp
This may seem complex but it all comes down to a very simple messaging
-format and protocol. The retraining protocol also serves to validate
+format and protocol. The retraining protocol also serves to validate
communications links between entities and to allow massive changes in
mesh topology to occur without disrupting the cluster. For example, if
the physical sysid of a node changes it will set off a chain of events
size supplied in the initial message traffic by generating a PAD message
when necessary. Larger FIFO sizes are usually better since they result
in smaller PADs. I/O transactions containing data are typically broken up
-into smaller messages not only to accomodate limitations in transport
+into smaller messages not only to accommodate limitations in transport
protocols (such as UDP), but also to reduce the dead space created by PADs.
On the bright side, these requirements allow very optimal hardware and
software buffering of syslink message traffic.
A transaction can be aborted. Normally aborted transactions still
required an acknowledgement (since the abort may race completion).
If the target completes the transaction before receiving the abort
-request, it is as if the abort never occured.
+request, it is as if the abort never occurred.
.Sh ASYNCHRONOUS PUSH TRANSACTIONS
Most syslink transactions require an acknowledgement to terminate the
transaction. The acknowledgement is typically a single message in the
and detemines that read-ahead is useful, the target node can initiate the
read-ahead and push the data to the originating node in a separate
asyncnronous transaction. Read-aheads are typically not directly adjacent
-to the read that just occured in order to allow the originator to initiate
+to the read that just occurred in order to allow the originator to initiate
the next synchronous transaction without it crossing paths with the
asynchronous read-ahead push (resulting in the same data being returned to
the originator twice).
.\" OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $DragonFly: src/lib/libc/sys/tls.2,v 1.8 2007/04/13 12:12:27 corecode Exp $
+.\" $DragonFly: src/lib/libc/sys/tls.2,v 1.9 2007/05/13 18:33:56 swildner Exp $
.\"
.Dd February 21, 2005
.Dt TLS 2
representing thread local storage as specified by the
.Fa info
structure. A descriptor representing the facility is returned, or -1 if
-an error occured. The facility may be cleared by specifying a NULL pointer
+an error occurred. The facility may be cleared by specifying a NULL pointer
and an infosize of 0.
The
.Fn get_tls_area
system call retrieves the requested TLS facility. A descriptor representing
-the facility is returned, or -1 if an error occured. If you simply want the
+the facility is returned, or -1 if an error occurred. If you simply want the
descriptor you may specify a NULL pointer and an infosize of 0.
.Pp
The returned descriptor and the TLS mechanism is machine-dependant. On IA32
.Ed
.Pp
The actual implementation of the area is machine-dependant. If the kernel
-is unable to accomodate the supplied size it may create a larger area.
-If the kernel is unable to accomodate the supplied base address an error
+is unable to accommodate the supplied size it may create a larger area.
+If the kernel is unable to accommodate the supplied base address an error
will be returned.
.Sh RETURN VALUES
A return value of 0 is returned on success, -1 on error.
.\" OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $DragonFly: src/lib/libc/sys/umtx.2,v 1.7 2006/02/17 19:35:06 swildner Exp $
+.\" $DragonFly: src/lib/libc/sys/umtx.2,v 1.8 2007/05/13 18:33:56 swildner Exp $
.\"
.Dd February 21, 2005
.Dt UMTX 2
did not match
.Fa value
.It Bq Er ETIMEDOUT
-The specified timeout occured.
+The specified timeout occurred.
.It Bq Er EINTR
The
.Fn umtx_sleep
.\" SUCH DAMAGE.
.\"
.\" $FreeBSD: src/lib/libcam/cam.3,v 1.5.2.6 2001/12/17 10:08:28 ru Exp $
-.\" $DragonFly: src/lib/libcam/cam.3,v 1.2 2003/06/17 04:26:48 dillon Exp $
+.\" $DragonFly: src/lib/libcam/cam.3,v 1.3 2007/05/13 18:33:56 swildner Exp $
.\"
.Dd October 10, 1998
.Os
of the CCB failed.
.Pp
.Fn cam_send_ccb
-returns a value of -1 if an error occured, and
+returns a value of -1 if an error occurred, and
.Va errno
is set to indicate the error.
.Pp
*
* @(#)kvm_file.c 8.1 (Berkeley) 6/4/93
* $FreeBSD: src/lib/libkvm/kvm_file.c,v 1.11 2000/02/18 16:39:00 peter Exp $
- * $DragonFly: src/lib/libkvm/kvm_file.c,v 1.4 2007/04/29 01:36:04 dillon Exp $
+ * $DragonFly: src/lib/libkvm/kvm_file.c,v 1.5 2007/05/13 18:33:56 swildner Exp $
*/
/*
}
}
if (n != nfiles) {
- _kvm_err(kd, kd->program, "inconsistant nfiles");
+ _kvm_err(kd, kd->program, "inconsistent nfiles");
return (0);
}
return (nfiles);
* SUCH DAMAGE.
*
* $FreeBSD: src/lib/libstand/bzipfs.c,v 1.2.2.3 2002/04/08 13:50:09 sobomax Exp $
- * $DragonFly: src/lib/libstand/bzipfs.c,v 1.3 2005/06/30 15:55:17 corecode Exp $
+ * $DragonFly: src/lib/libstand/bzipfs.c,v 1.4 2007/05/13 18:33:56 swildner Exp $
*
*/
void
bz_internal_error(int errorcode)
{
- panic("bzipfs: critical error %d in bzip2 library occured\n", errorcode);
+ panic("bzipfs: critical error %d in bzip2 library occurred\n", errorcode);
}
last edit-date: [Wed Nov 1 15:08:03 2000]
$FreeBSD: src/share/examples/isdn/FAQ,v 1.6.2.2 2002/08/07 10:47:48 blackend Exp $
- $DragonFly: src/share/examples/isdn/FAQ,v 1.2 2003/06/17 04:36:57 dillon Exp $
+ $DragonFly: src/share/examples/isdn/FAQ,v 1.3 2007/05/13 18:33:56 swildner Exp $
--------------------------------------------------------------------------------
code... in general you can say that KPN only accepts the shortest
possible notation where it would still be clear who you want to call.
-3. numbers for incomming call recognition:
+3. numbers for incoming call recognition:
KPN always specifies incoming caller ids with city code, but without
leading 0. so 0201234567 will be displayed as 201234567
>
> i4b-L2 i4b_rxd_ack: ((N(R)-1)=35) != (UA=36) !!!
-A layer 2 error occured. These types of errors are automatically
+A layer 2 error occurred. These types of errors are automatically
corrected by the layer 2 protocol.
.\" THE POSSIBILITY OF SUCH DAMAGE.
.\"
.\" $FreeBSD: src/share/man/man4/bge.4,v 1.1.2.4 2003/02/17 21:20:39 trhodes Exp $
-.\" $DragonFly: src/share/man/man4/bge.4,v 1.7 2007/03/08 09:46:42 swildner Exp $
+.\" $DragonFly: src/share/man/man4/bge.4,v 1.8 2007/05/13 18:33:56 swildner Exp $
.\"
.Dd March 4, 2007
.Dt BGE 4
speed in TBI mode.
.Pp
Most cards also use the Broadcom BCM5401 or BCM5411 10/100/1000
-copper gigabit tranceivers,
+copper gigabit transceivers,
which support autonegotiation of 10, 100 and 1000mbps modes in
full or half duplex.
.Pp
.\" SUCH DAMAGE.
.\"
.\" $FreeBSD: src/share/man/man4/gx.4,v 1.1.2.2 2001/12/17 11:30:11 ru Exp $
-.\" $DragonFly: src/share/man/man4/Attic/gx.4,v 1.6 2007/03/15 21:41:11 swildner Exp $
+.\" $DragonFly: src/share/man/man4/Attic/gx.4,v 1.7 2007/05/13 18:33:56 swildner Exp $
.\"
.Dd October 17, 2001
.Dt GX 4
Both boards support VLAN tagging/insertion and the 82543 additionally
supports TCP/IP checksum offload.
.Pp
-The 82543-T cards use the Marvell 10/100/1000 copper gigabit tranceiver
+The 82543-T cards use the Marvell 10/100/1000 copper gigabit transceiver
chip, which supports autonegotiation of 10, 100 and 1000mbps modes in
full or half duplex, however half duplex 1000mbps is not supported.
.Pp
.\" SUCH DAMAGE.
.\"
.\" $FreeBSD: src/share/man/man4/man4.i386/ray.4,v 1.8.2.1 2001/10/23 07:25:48 ru Exp $
-.\" $DragonFly: src/share/man/man4/man4.i386/Attic/ray.4,v 1.2 2003/06/17 04:37:00 dillon Exp $
+.\" $DragonFly: src/share/man/man4/man4.i386/Attic/ray.4,v 1.3 2007/05/13 18:33:56 swildner Exp $
.\"
.Dd March 21, 2000
.Dt RAY 4 i386
.It "ray?: unknown framing type ??"
An impossible error - mail the author.
.It "ray?: could not translate packet"
-An error occured when trying to re-frame a packet for transmission.
+An error occurred when trying to re-frame a packet for transmission.
.It "ray?: ECF busy, dropping packet"
The NIC was busy just before a packet was to be transmitted.
.It "ray?: tx completed but status is fail"
.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
.\"
.\" $FreeBSD: src/share/man/man4/man4.i386/tx.4,v 1.11.2.10 2003/02/17 21:20:40 trhodes Exp $
-.\" $DragonFly: src/share/man/man4/man4.i386/tx.4,v 1.4 2007/02/25 12:03:07 swildner Exp $
+.\" $DragonFly: src/share/man/man4/man4.i386/tx.4,v 1.5 2007/05/13 18:33:56 swildner Exp $
.\"
.Dd February 8, 2001
.Dt TX 4 i386
.Xr ifconfig 8
man page on setting the interface's MTU.
.Pp
-The old ``ifconfig tx0 linkN'' method of configuration is not supported.
+The old
+.Dq ifconfig tx0 linkN
+method of configuration is not supported.
.Ss "VLAN (IEEE 802.1Q) support"
The
.Nm
-driver supports the VLAN operation (using
+driver supports the VLAN operation (using the
.Xr vlan 4
-inteface) without decreasing the MTU on the
+interface) without decreasing the MTU on the
.Xr vlan 4
interfaces.
.Sh DIAGNOSTICS
.It "tx%d: device timeout %d packets"
The device stops responding.
Device and driver reset follows this error.
-.It "tx%d: PCI fatal error occured (%s)"
-One of following errors occured: PCI Target Abort, PCI Master Abort, Data
+.It "tx%d: PCI fatal error occurred (%s)"
+One of following errors occurred: PCI Target Abort, PCI Master Abort, Data
Parity Error or Address Parity Error.
Device and driver reset follows this error.
.It "tx%d: cannot allocate mbuf header/cluster"
.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
.\"
.\" $FreeBSD: src/share/man/man4/mlx.4,v 1.3.2.5 2001/10/01 13:07:23 dd Exp $
-.\" $DragonFly: src/share/man/man4/mlx.4,v 1.3 2006/02/17 19:37:09 swildner Exp $
+.\" $DragonFly: src/share/man/man4/mlx.4,v 1.4 2007/05/13 18:33:56 swildner Exp $
.\"
.Dd April 10, 2000
.Dt MLX 4
rest of the array.
.It mlx%d: system drive installation aborted
.Pp
-Errors occured preventing one or more system drives from being configured.
+Errors occurred preventing one or more system drives from being configured.
.It mlx%d: new controller configuration found
.Pp
The controller has detected a configuration on disk which supersedes the
.\" THE POSSIBILITY OF SUCH DAMAGE.
.\"
.\" $FreeBSD: src/share/man/man4/nge.4,v 1.4.2.6 2002/08/15 16:35:37 ambrisko Exp $
-.\" $DragonFly: src/share/man/man4/nge.4,v 1.5 2007/02/25 12:03:07 swildner Exp $
+.\" $DragonFly: src/share/man/man4/nge.4,v 1.6 2007/05/13 18:33:56 swildner Exp $
.\"
.Dd May 11, 2001
.Dt NGE 4
VLAN tagging/insertion as well as a 2048-bit multicast hash filter
and up to 4 pattern match buffers.
.Pp
-Most cards also use the DP83861 10/100/1000 copper gigabit tranceiver
+Most cards also use the DP83861 10/100/1000 copper gigabit transceiver
chip, which supports autonegotiation of 10, 100 and 1000mbps modes in
full or half duplex.
.Pp
.\" $NetBSD: rtw.4,v 1.3 2005/09/09 14:11:39 drochner Exp $
.\" $OpenBSD: rtw.4,v 1.18 2005/06/09 09:03:38 jmc Exp $
-.\" $DragonFly: src/share/man/man4/rtw.4,v 1.3 2007/02/25 12:03:07 swildner Exp $
+.\" $DragonFly: src/share/man/man4/rtw.4,v 1.4 2007/05/13 18:33:56 swildner Exp $
.\"
.\" Copyright (c) 2004 Jonathan Gray <jsg@openbsd.org>
.\"
driver supports PCI/CardBus 802.11b wireless adapters based on the
Realtek RTL8180L.
.Pp
-A variety of radio tranceivers can be found in these devices, including
+A variety of radio transceivers can be found in these devices, including
the Philips SA2400A, Maxim MAX2820, and GCT GRF5101, though not all of them
are currently supported.
.Pp
.\"
.\" From: @(#)tcp.4 8.1 (Berkeley) 6/5/93
.\" $FreeBSD: src/share/man/man4/tcp.4,v 1.11.2.14 2002/12/29 16:35:38 schweikh Exp $
-.\" $DragonFly: src/share/man/man4/tcp.4,v 1.6 2006/05/26 19:39:39 swildner Exp $
+.\" $DragonFly: src/share/man/man4/tcp.4,v 1.7 2007/05/13 18:33:56 swildner Exp $
.\"
.Dd February 14, 1995
.Dt TCP 4
Adjust the retransmit timer calculation for TCP. The slop is
typically added to the raw calculation to take into account
occasional variances that the SRTT (smoothed round trip time)
-is unable to accomodate, while the minimum specifies an
+is unable to accommodate, while the minimum specifies an
absolute minimum. While a number of TCP RFCs suggest a 1
second minimum these RFCs tend to focus on streaming behavior
and fail to deal with the fact that a 1 second minimum has severe
unnecessary packets in the network. This option is recommended if you
are serving a lot of data over connections with high bandwidth-delay
products, such as modems, GigE links, and fast long-haul WANs, and/or
-you have configured your machine to accomodate large TCP windows. In such
+you have configured your machine to accommodate large TCP windows. In such
situations, without this option, you may experience high interactive
latencies or packet loss due to the overloading of intermediate routers
and switches. Note that bandwidth delay product limiting only effects
.\" OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $DragonFly: src/share/man/man9/nlookup.9,v 1.7 2006/05/26 19:39:40 swildner Exp $
+.\" $DragonFly: src/share/man/man9/nlookup.9,v 1.8 2007/05/13 18:33:56 swildner Exp $
.\"
.Dd August 6, 2005
.Os
.Fn nlookup_simple
is a simple all-in-one nlookup.
It returns a locked namecache structure or NULL if an error
-occured.
+occurred.
Note that the returned ncp
is not checked for permissions,
though
It creates the illusion of continuity in the namecache tree
by connecting the ncp related to the vnode under the mount
to the ncp related to the mount's root vnode.
-If no error occured a locked, ref'd ncp is stored in
+If no error occurred a locked, ref'd ncp is stored in
.Fa *ncpp .
.Pp
.Fn nreadsymlink
# $FreeBSD: src/share/misc/iso3166,v 1.6.2.2 2002/08/18 09:06:33 blackend Exp $
-# $DragonFly: src/share/misc/Attic/iso3166,v 1.5 2006/12/12 06:56:25 pavalos Exp $
+# $DragonFly: src/share/misc/Attic/iso3166,v 1.6 2007/05/13 18:33:56 swildner Exp $
#
# ISO 3166-1:1997 country codes + accepted revisions
# This includes many places that are not legally independent countries,
# Czechoslovakia officially deleted
#
# Newsletter III-52, 1993-07-02
-# Angola, changing information not included in this file. Offical name
+# Angola, changing information not included in this file. Official name
# change to Republic of Angola
#
# Newsletter III-53, 1993-07-12
# Official name change to Islamic State of Afghanistan
#
# Newsletter III-32, 1993-07-25 ammendment
-# Kyrgyzstan, changing information not included in this file. Offical name
+# Kyrgyzstan, changing information not included in this file. Official name
# change to Kyrgyz Republic
#
# Newsletter III-59, 1994-01-26
-# Andorra, changing information not included in this file. Offical name
+# Andorra, changing information not included in this file. Official name
# change to Pricipality of Andorra
#
# Newsletter III-60, 1994-01-26
-# Cambodia, changing information not included in this file. Offical name
+# Cambodia, changing information not included in this file. Official name
# change to Kingdom of Cambodia
#
# Thu Feb 10 1994
* SUCH DAMAGE.
*
* $FreeBSD: src/sys/cam/cam_periph.c,v 1.24.2.3 2003/01/25 19:04:40 dillon Exp $
- * $DragonFly: src/sys/bus/cam/cam_periph.c,v 1.18 2006/12/22 23:12:16 swildner Exp $
+ * $DragonFly: src/sys/bus/cam/cam_periph.c,v 1.19 2007/05/13 18:33:56 swildner Exp $
*/
#include <sys/param.h>
/* no point in decrementing the retry count */
panic("cam_periph_error: scsi status of "
"CHECK COND returned but no sense "
- "information is availible. "
+ "information is available. "
"Controller should have returned "
"CAM_AUTOSENSE_FAILED");
/* NOTREACHED */
* SUCH DAMAGE.
*
* $FreeBSD: src/sys/cam/cam_queue.c,v 1.5 1999/08/28 00:40:41 peter Exp $
- * $DragonFly: src/sys/bus/cam/cam_queue.c,v 1.8 2006/12/22 23:12:16 swildner Exp $
+ * $DragonFly: src/sys/bus/cam/cam_queue.c,v 1.9 2007/05/13 18:33:56 swildner Exp $
*/
#include <sys/param.h>
#include <sys/systm.h>
#ifdef DIAGNOSTIC
if (new_size < queue->entries)
- panic("camq_resize: New queue size can't accomodate "
+ panic("camq_resize: New queue size can't accommodate "
"queued entries.");
#endif
new_array = kmalloc(new_size * sizeof(cam_pinfo *), M_DEVBUF, M_INTWAIT);
/*
* $FreeBSD: src/sys/cam/scsi/scsi_low.c,v 1.1.2.5 2003/08/09 06:18:30 non Exp $
- * $DragonFly: src/sys/bus/cam/scsi/scsi_low.c,v 1.19 2007/05/01 00:05:12 dillon Exp $
+ * $DragonFly: src/sys/bus/cam/scsi/scsi_low.c,v 1.20 2007/05/13 18:33:56 swildner Exp $
* $NetBSD: scsi_low.c,v 1.24.10.8 2001/06/26 07:39:44 honda Exp $
*/
#ifdef SCSI_LOW_DIAGNOSTIC
if (slp->sl_Tnexus || slp->sl_Lnexus || slp->sl_Qnexus)
{
- scsi_low_info(slp, NULL, "NEXUS INCOSISTENT");
+ scsi_low_info(slp, NULL, "NEXUS INCONSISTENT");
panic("%s: inconsistent", slp->sl_xname);
}
#endif /* SCSI_LOW_DIAGNOSTIC */
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $DragonFly: src/sys/bus/firewire/fwcrom.c,v 1.9 2006/12/22 23:12:16 swildner Exp $
+ * $DragonFly: src/sys/bus/firewire/fwcrom.c,v 1.10 2007/05/13 18:33:56 swildner Exp $
*/
#ifndef __DragonFly__
len = strlen(buf);
if (len > MAX_TEXT) {
#if defined(__DragonFly__) || __FreeBSD_version < 500000
- kprintf("text(%d) trancated to %d.\n", len, MAX_TEXT);
+ kprintf("text(%d) truncated to %d.\n", len, MAX_TEXT);
#else
- kprintf("text(%d) trancated to %td.\n", len, MAX_TEXT);
+ kprintf("text(%d) truncated to %td.\n", len, MAX_TEXT);
#endif
len = MAX_TEXT;
}
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
* $FreeBSD: src/sys/pci/pci_compat.c,v 1.35.2.1 2001/10/14 21:14:14 luigi Exp $
- * $DragonFly: src/sys/bus/pci/pci_compat.c,v 1.13 2006/12/22 23:12:17 swildner Exp $
+ * $DragonFly: src/sys/bus/pci/pci_compat.c,v 1.14 2007/05/13 18:33:56 swildner Exp $
*
*/
*dvp->pd_count = unit;
if (dvp->pd_attach)
dvp->pd_attach(cfg, unit);
- device_printf(dev, "driver is using old-style compatability shims\n");
+ device_printf(dev, "driver is using old-style compatibility shims\n");
return 0;
}
-$DragonFly: src/sys/bus/usb/Attic/usbdevs,v 1.21 2007/02/10 05:43:08 sephe Exp $
+$DragonFly: src/sys/bus/usb/Attic/usbdevs,v 1.22 2007/05/13 18:33:56 swildner Exp $
/* $FreeBSD: src/sys/dev/usb/usbdevs,v 1.203 2004/09/20 04:56:13 sanpei Exp $ */
/* $NetBSD: usbdevs,v 1.387 2004/10/27 07:02:47 augustss Exp $ */
vendor LOGITECH 0x046d Logitech
vendor BTC 0x046e Behavior Tech. Computer
vendor PHILIPS 0x0471 Philips
-vendor SUN 0x0472 Sun Microsystems (offical)
+vendor SUN 0x0472 Sun Microsystems (official)
vendor SANYO 0x0474 Sanyo Electric
vendor SEAGATE 0x0477 Seagate Technology
vendor CONNECTIX 0x0478 Connectix
# as much of the source tree as it can.
#
# $FreeBSD: src/sys/i386/conf/LINT,v 1.749.2.144 2003/06/04 17:56:59 sam Exp $
-# $DragonFly: src/sys/config/LINT,v 1.109 2007/04/01 13:59:41 sephe Exp $
+# $DragonFly: src/sys/config/LINT,v 1.110 2007/05/13 18:33:56 swildner Exp $
#
# NB: You probably don't want to try running a kernel built from this
# file. Instead, you should start from GENERIC, and add options from
# adapter chip as found on devices such as the Tekram DC-390(T).
#
# The `bge' device provides support for gigabit ethernet adapters
-# based on the Broadcom BCM570x familiy of controllers, including the
+# based on the Broadcom BCM570x family of controllers, including the
# 3Com 3c996-T, the Netgear GA302T, the SysKonnect SK-9D21 and SK-9D41,
# and the embedded gigE NICs on Dell PowerEdge 2550 servers.
#
# MII bus support is required for some PCI 10/100 ethernet NICs,
# namely those which use MII-compliant transceivers or implement
-# tranceiver control interfaces that operate like an MII. Adding
+# transceiver control interfaces that operate like an MII. Adding
# "device miibus0" to the kernel config pulls in support for
# the generic miibus API and all of the PHY drivers, including a
# generic one for PHYs that aren't specifically handled by an
device iwic
#
#---------------------------------------------------------------------------
-# itjc driver for Simens ISAC / TJNet Tiger300/320 chipset
+# itjc driver for Siemens ISAC / TJNet Tiger300/320 chipset
#---------------------------------------------------------------------------
#
# Traverse Technologies NETjet-S
* SUCH DAMAGE.
*
* $FreeBSD: src/sys/contrib/dev/oltr/if_oltr.c,v 1.11.2.5 2001/10/20 04:15:21 mdodd Exp $
- * $DragonFly: src/sys/contrib/dev/oltr/Attic/if_oltr.c,v 1.25 2006/12/23 00:27:02 swildner Exp $
+ * $DragonFly: src/sys/contrib/dev/oltr/Attic/if_oltr.c,v 1.26 2007/05/13 18:33:56 swildner Exp $
*/
#include <sys/param.h>
kprintf("oltr%d: Receive CRC Errors %lu\n", sc->unit,
statistics->ReceiveCRCErrors);
if (sc->statistics.ReceiveOverflow != statistics->ReceiveOverflow)
- kprintf("oltr%d: Recieve overflows %lu\n", sc->unit,
+ kprintf("oltr%d: Receive overflows %lu\n", sc->unit,
statistics->ReceiveOverflow);
if (sc->statistics.TransmitUnderrun != statistics->TransmitUnderrun)
kprintf("oltr%d: Frequency Errors %lu\n", sc->unit,
* SUCH DAMAGE.
*
* $FreeBSD: src/sys/ddb/db_ps.c,v 1.20 1999/08/28 00:41:09 peter Exp $
- * $DragonFly: src/sys/ddb/db_ps.c,v 1.22 2007/02/19 01:14:23 corecode Exp $
+ * $DragonFly: src/sys/ddb/db_ps.c,v 1.23 2007/05/13 18:33:57 swildner Exp $
*/
#include <sys/param.h>
#include <sys/systm.h>
if (db_more(&nl) < 0)
return;
- db_printf(" INCOMMING IPIQS:");
+ db_printf(" INCOMING IPIQS:");
for (j = 0; j < ncpus; ++j) {
lwkt_ipiq_t ip = globaldata_find(j)->gd_ipiq;
if (ip != NULL) {
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
* $FreeBSD: src/sys/dev/en/midway.c,v 1.19.2.1 2003/01/23 21:06:42 sam Exp $
- * $DragonFly: src/sys/dev/atm/en/midway.c,v 1.22 2006/12/22 23:26:15 swildner Exp $
+ * $DragonFly: src/sys/dev/atm/en/midway.c,v 1.23 2007/05/13 18:33:57 swildner Exp $
*/
/*
(u_long)MID_DTQ_REG2A(EN_READ(sc, MID_DMA_WRTX)),
sc->dtq_chip, sc->dtq_us);
- kprintf(" unusal txspeeds: ");
+ kprintf(" unusual txspeeds: ");
for (cnt = 0 ; cnt < MID_N_VC ; cnt++)
if (sc->txspeed[cnt])
kprintf(" vci%d=0x%x", cnt, sc->txspeed[cnt]);
* SUCH DAMAGE.
*
* $FreeBSD: src/sys/dev/advansys/adwcam.c,v 1.7.2.2 2001/03/05 13:08:55 obrien Exp $
- * $DragonFly: src/sys/dev/disk/advansys/adwcam.c,v 1.15 2006/12/22 23:26:15 swildner Exp $
+ * $DragonFly: src/sys/dev/disk/advansys/adwcam.c,v 1.16 2007/05/13 18:33:57 swildner Exp $
*/
/*
* Ported from:
if (error != 0) {
if (error != EFBIG)
- kprintf("%s: Unexepected error 0x%x returned from "
+ kprintf("%s: Unexpected error 0x%x returned from "
"bus_dmamap_load\n", adw_name(adw), error);
if (ccb->ccb_h.status == CAM_REQ_INPROG) {
xpt_freeze_devq(ccb->ccb_h.path, /*count*/1);
* SUCH DAMAGE.
*
* $FreeBSD: src/sys/dev/aha/aha.c,v 1.34.2.1 2000/08/02 22:24:39 peter Exp $
- * $DragonFly: src/sys/dev/disk/aha/aha.c,v 1.16 2006/12/22 23:26:15 swildner Exp $
+ * $DragonFly: src/sys/dev/disk/aha/aha.c,v 1.17 2007/05/13 18:33:57 swildner Exp $
*/
#include <sys/param.h>
if (error != 0) {
if (error != EFBIG)
device_printf(aha->dev,
- "Unexepected error 0x%x returned from "
+ "Unexpected error 0x%x returned from "
"bus_dmamap_load\n", error);
if (ccb->ccb_h.status == CAM_REQ_INPROG) {
xpt_freeze_devq(ccb->ccb_h.path, /*count*/1);
* SUCH DAMAGE.
*
* $FreeBSD: src/sys/dev/ahb/ahb.c,v 1.18.2.3 2001/03/05 13:08:55 obrien Exp $
- * $DragonFly: src/sys/dev/disk/ahb/ahb.c,v 1.14 2006/12/22 23:26:15 swildner Exp $
+ * $DragonFly: src/sys/dev/disk/ahb/ahb.c,v 1.15 2007/05/13 18:33:57 swildner Exp $
*/
#include <sys/param.h>
} else if (target_id == ahb->scsi_id)
kprintf("ahb%ld: SCSI Bus Reset Delivered\n", ahb->unit);
else
- kprintf("ahb%ld: Bus Device Reset Delibered to target %d\n",
+ kprintf("ahb%ld: Bus Device Reset Delivered to target %d\n",
ahb->unit, target_id);
ahb->immed_cmd = 0;
xpt_async(AC_BUS_RESET, ahb->path, NULL);
break;
}
- kprintf("Unsupported initiator selection AEN occured\n");
+ kprintf("Unsupported initiator selection AEN occurred\n");
break;
case INTSTAT_IMMED_OK:
case INTSTAT_IMMED_ERR:
if (error != 0) {
if (error != EFBIG)
- kprintf("ahb%ld: Unexepected error 0x%x returned from "
+ kprintf("ahb%ld: Unexpected error 0x%x returned from "
"bus_dmamap_load\n", ahb->unit, error);
if (ccb->ccb_h.status == CAM_REQ_INPROG) {
xpt_freeze_devq(ccb->ccb_h.path, /*count*/1);
* $Id: //depot/aic7xxx/aic7xxx/aic7xxx.c#134 $
*
* $FreeBSD: src/sys/dev/aic7xxx/aic7xxx.c,v 1.41.2.27 2003/06/10 03:26:08 gibbs Exp $
- * $DragonFly: src/sys/dev/disk/aic7xxx/aic7xxx.c,v 1.13 2007/01/27 15:03:25 swildner Exp $
+ * $DragonFly: src/sys/dev/disk/aic7xxx/aic7xxx.c,v 1.14 2007/05/13 18:33:57 swildner Exp $
*/
#include "aic7xxx_osm.h"
static struct ahc_hard_error_entry ahc_hard_errors[] = {
{ ILLHADDR, "Illegal Host Access" },
- { ILLSADDR, "Illegal Sequencer Address referrenced" },
+ { ILLSADDR, "Illegal Sequencer Address referenced" },
{ ILLOPCODE, "Illegal Opcode in sequencer program" },
{ SQPARERR, "Sequencer Parity Error" },
{ DPARERR, "Data-path Parity Error" },
kprintf("\tCRC Value Mismatch\n");
if ((sstat2 & CRCENDERR) != 0)
kprintf("\tNo terminal CRC packet "
- "recevied\n");
+ "received\n");
if ((sstat2 & CRCREQERR) != 0)
kprintf("\tIllegal CRC packet "
"request\n");
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*********************************************************************
* $FreeBSD: src/sys/pci/amd.c,v 1.3.2.2 2001/06/02 04:32:50 nyan Exp $
- * $DragonFly: src/sys/dev/disk/amd/amd.c,v 1.12 2006/12/22 23:26:15 swildner Exp $
+ * $DragonFly: src/sys/dev/disk/amd/amd.c,v 1.13 2007/05/13 18:33:57 swildner Exp $
*/
/*
if (error != 0) {
if (error != EFBIG)
- kprintf("amd%d: Unexepected error 0x%x returned from "
+ kprintf("amd%d: Unexpected error 0x%x returned from "
"bus_dmamap_load\n", amd->unit, error);
if (ccb->ccb_h.status == CAM_REQ_INPROG) {
xpt_freeze_devq(ccb->ccb_h.path, /*count*/1);
* SUCH DAMAGE.
*
* $FreeBSD: src/sys/dev/buslogic/bt.c,v 1.25.2.1 2000/08/02 22:32:26 peter Exp $
- * $DragonFly: src/sys/dev/disk/buslogic/bt.c,v 1.15 2006/12/22 23:26:16 swildner Exp $
+ * $DragonFly: src/sys/dev/disk/buslogic/bt.c,v 1.16 2007/05/13 18:33:57 swildner Exp $
*/
/*
if (error != 0) {
if (error != EFBIG)
device_printf(bt->dev,
- "Unexepected error 0x%x returned from "
+ "Unexpected error 0x%x returned from "
"bus_dmamap_load\n", error);
if (ccb->ccb_h.status == CAM_REQ_INPROG) {
xpt_freeze_devq(ccb->ccb_h.path, /*count*/1);
case BMBI_ABORT:
case BMBI_ERROR:
if (bootverbose) {
- kprintf("bt: ccb %p - error %x occured. "
+ kprintf("bt: ccb %p - error %x occurred. "
"btstat = %x, sdstat = %x\n",
(void *)bccb, comp_code, bccb->hccb.btstat,
bccb->hccb.sdstat);
/* $FreeBSD: src/sys/dev/mpt/mpt_debug.c,v 1.2.2.1 2002/08/23 06:59:05 mjacob Exp $ */
-/* $DragonFly: src/sys/dev/disk/mpt/mpt_debug.c,v 1.5 2006/12/22 23:26:16 swildner Exp $ */
+/* $DragonFly: src/sys/dev/disk/mpt/mpt_debug.c,v 1.6 2007/05/13 18:33:57 swildner Exp $ */
/*
* Debug routines for LSI '909 FC adapters.
* FreeBSD Version.
{ MPI_IOCSTATUS_CONFIG_INVALID_DATA, "Invalid Data" },
{ MPI_IOCSTATUS_CONFIG_NO_DEFAULTS, "No Defaults" },
{ MPI_IOCSTATUS_CONFIG_CANT_COMMIT, "Can't Commit" },
-{ MPI_IOCSTATUS_SCSI_RECOVERED_ERROR, "SCSI: Recoverd Error" },
+{ MPI_IOCSTATUS_SCSI_RECOVERED_ERROR, "SCSI: Recovered Error" },
{ MPI_IOCSTATUS_SCSI_INVALID_BUS, "SCSI: Invalid Bus" },
{ MPI_IOCSTATUS_SCSI_INVALID_TARGETID, "SCSI: Invalid Target ID" },
{ MPI_IOCSTATUS_SCSI_DEVICE_NOT_THERE, "SCSI: Device Not There" },
{ MPI_IOCSTATUS_TARGET_NO_CONNECTION, "SCSI Target: No Connection" },
{ MPI_IOCSTATUS_TARGET_XFER_COUNT_MISMATCH,"SCSI Target: Transfer Count Mismatch" },
{ MPI_IOCSTATUS_TARGET_FC_ABORTED, "FC: Aborted" },
-{ MPI_IOCSTATUS_TARGET_FC_RX_ID_INVALID, "FC: Recieve ID Invalid" },
-{ MPI_IOCSTATUS_TARGET_FC_DID_INVALID, "FC: Recieve DID Invalid" },
+{ MPI_IOCSTATUS_TARGET_FC_RX_ID_INVALID, "FC: Receive ID Invalid" },
+{ MPI_IOCSTATUS_TARGET_FC_DID_INVALID, "FC: Receive DID Invalid" },
{ MPI_IOCSTATUS_TARGET_FC_NODE_LOGGED_OUT,"FC: Node Logged Out" },
{ MPI_IOCSTATUS_LAN_DEVICE_NOT_FOUND, "LAN: Device Not Found" },
{ MPI_IOCSTATUS_LAN_DEVICE_FAILURE, "LAN: Device Not Failure" },
{ MPI_IOCSTATUS_LAN_TRANSMIT_ERROR, "LAN: Transmit Error" },
{ MPI_IOCSTATUS_LAN_TRANSMIT_ABORTED, "LAN: Transmit Aborted" },
-{ MPI_IOCSTATUS_LAN_RECEIVE_ERROR, "LAN: Recieve Error" },
-{ MPI_IOCSTATUS_LAN_RECEIVE_ABORTED, "LAN: Recieve Aborted" },
+{ MPI_IOCSTATUS_LAN_RECEIVE_ERROR, "LAN: Receive Error" },
+{ MPI_IOCSTATUS_LAN_RECEIVE_ABORTED, "LAN: Receive Aborted" },
{ MPI_IOCSTATUS_LAN_PARTIAL_PACKET, "LAN: Partial Packet" },
{ MPI_IOCSTATUS_LAN_CANCELED, "LAN: Canceled" },
{ -1, 0},
{ MPI_FUNCTION_TARGET_FC_EX_SEND_LINK_SRVC, "FC: Send Extended Link Service" },
{ MPI_FUNCTION_TARGET_FC_ABORT, "FC: Abort" },
{ MPI_FUNCTION_LAN_SEND, "LAN Send" },
-{ MPI_FUNCTION_LAN_RECEIVE, "LAN Recieve" },
+{ MPI_FUNCTION_LAN_RECEIVE, "LAN Receive" },
{ MPI_FUNCTION_LAN_RESET, "LAN Reset" },
{ -1, 0},
};
* SUCH DAMAGE.
*
* $FreeBSD: src/sys/dev/ed/if_ed.c,v 1.224 2003/12/08 07:54:12 obrien Exp $
- * $DragonFly: src/sys/dev/netif/ed/if_ed.c,v 1.33 2006/12/22 23:26:19 swildner Exp $
+ * $DragonFly: src/sys/dev/netif/ed/if_ed.c,v 1.34 2007/05/13 18:33:57 swildner Exp $
*/
/*
kprintf("%s\n", (((sc->vendor == ED_VENDOR_3COM) ||
(sc->vendor == ED_VENDOR_HP)) &&
- (ifp->if_flags & IFF_ALTPHYS)) ? " tranceiver disabled" : "");
+ (ifp->if_flags & IFF_ALTPHYS)) ? " transceiver disabled" : "");
return (0);
}
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
* $FreeBSD: src/sys/dev/pdq/pdq.c,v 1.5 1999/08/28 00:42:19 peter Exp $
- * $DragonFly: src/sys/dev/netif/pdq_layer/Attic/pdq.c,v 1.7 2006/12/22 23:26:21 swildner Exp $
+ * $DragonFly: src/sys/dev/netif/pdq_layer/Attic/pdq.c,v 1.8 2007/05/13 18:33:57 swildner Exp $
*
*/
pdq->pdq_host_smt_info.rx_buffers = (void *) pdq->pdq_dbp->pdqdb_host_smt_buffers;
PDQ_PRINTF(("\nPDQ Descriptor Block = " PDQ_OS_PTR_FMT "\n", pdq->pdq_dbp));
- PDQ_PRINTF((" Recieve Queue = " PDQ_OS_PTR_FMT "\n", pdq->pdq_dbp->pdqdb_receives));
+ PDQ_PRINTF((" Receive Queue = " PDQ_OS_PTR_FMT "\n", pdq->pdq_dbp->pdqdb_receives));
PDQ_PRINTF((" Transmit Queue = " PDQ_OS_PTR_FMT "\n", pdq->pdq_dbp->pdqdb_transmits));
PDQ_PRINTF((" Host SMT Queue = " PDQ_OS_PTR_FMT "\n", pdq->pdq_dbp->pdqdb_host_smt));
PDQ_PRINTF((" Command Response Queue = " PDQ_OS_PTR_FMT "\n", pdq->pdq_dbp->pdqdb_command_responses));
* THE POSSIBILITY OF SUCH DAMAGE.
*
* $FreeBSD: src/sys/pci/if_rl.c,v 1.38.2.16 2003/03/05 18:42:33 njl Exp $
- * $DragonFly: src/sys/dev/netif/rl/if_rl.c,v 1.34 2006/10/25 20:55:58 dillon Exp $
+ * $DragonFly: src/sys/dev/netif/rl/if_rl.c,v 1.35 2007/05/13 18:33:57 swildner Exp $
*/
/*
{ PCI_VENDOR_DELTA, PCI_PRODUCT_DELTA_8139,
"Delta Electronics 8139 10/100BaseTX" },
{ PCI_VENDOR_ADDTRON, PCI_PRODUCT_ADDTRON_8139,
- "Addtron Technolgy 8139 10/100BaseTX" },
+ "Addtron Technology 8139 10/100BaseTX" },
{ PCI_VENDOR_DLINK, PCI_PRODUCT_DLINK_DFE530TXPLUS,
"D-Link DFE-530TX+ 10/100BaseTX" },
{ PCI_VENDOR_DLINK, PCI_PRODUCT_DLINK_DFE690TXD,
* SUCH DAMAGE.
*
* $FreeBSD: src/sys/dev/tx/if_tx.c,v 1.61.2.1 2002/10/29 01:43:49 semenu Exp $
- * $DragonFly: src/sys/dev/netif/tx/if_tx.c,v 1.39 2006/12/22 23:26:22 swildner Exp $
+ * $DragonFly: src/sys/dev/netif/tx/if_tx.c,v 1.40 2007/05/13 18:33:57 swildner Exp $
*/
/*
INTSTAT_APE|INTSTAT_DPE|INTSTAT_TXU|INTSTAT_RXE)) {
if (status & (INTSTAT_FATAL|INTSTAT_PMA|INTSTAT_PTA|
INTSTAT_APE|INTSTAT_DPE)) {
- if_printf(&sc->sc_if, "PCI fatal errors occured: %s%s%s%s\n",
+ if_printf(&sc->sc_if, "PCI fatal errors occurred: %s%s%s%s\n",
(status&INTSTAT_PMA)?"PMA ":"",
(status&INTSTAT_PTA)?"PTA ":"",
(status&INTSTAT_APE)?"APE ":"",
* SUCH DAMAGE.
*
* $FreeBSD: src/sys/dev/pccbb/pccbb.c,v 1.64 2002/11/23 23:09:45 imp Exp $
- * $DragonFly: src/sys/dev/pccard/pccbb/pccbb.c,v 1.19 2006/12/22 23:26:23 swildner Exp $
+ * $DragonFly: src/sys/dev/pccard/pccbb/pccbb.c,v 1.20 2007/05/13 18:33:57 swildner Exp $
*/
/*
wakeup(sc);
}
if (sockevent & CBB_SOCKET_EVENT_CSTS) {
- DPRINTF((" cstsevent occured: 0x%08x\n",
+ DPRINTF((" cstsevent occurred: 0x%08x\n",
cbb_get(sc, CBB_SOCKET_STATE)));
}
if (sockevent & CBB_SOCKET_EVENT_POWER) {
- DPRINTF((" pwrevent occured: 0x%08x\n",
+ DPRINTF((" pwrevent occurred: 0x%08x\n",
cbb_get(sc, CBB_SOCKET_STATE)));
}
/* Other bits? */
* SUCH DAMAGE.
*
* $FreeBSD: src/sys/dev/ciss/ciss.c,v 1.2.2.6 2003/02/18 22:27:41 ps Exp $
- * $DragonFly: src/sys/dev/raid/ciss/ciss.c,v 1.22 2006/12/22 23:26:23 swildner Exp $
+ * $DragonFly: src/sys/dev/raid/ciss/ciss.c,v 1.23 2007/05/13 18:33:57 swildner Exp $
*/
/*
}
default: /* we can't do this */
- debug(1, "unspported func_code = 0x%x", ccb->ccb_h.func_code);
+ debug(1, "unsupported func_code = 0x%x", ccb->ccb_h.func_code);
ccb->ccb_h.status = CAM_REQ_INVALID;
break;
}
*/
#ident "$FreeBSD: src/sys/dev/dpt/dpt_scsi.c,v 1.28.2.3 2003/01/31 02:47:10 grog Exp $"
-#ident "$DragonFly: src/sys/dev/raid/dpt/dpt_scsi.c,v 1.12 2006/12/22 23:26:23 swildner Exp $"
+#ident "$DragonFly: src/sys/dev/raid/dpt/dpt_scsi.c,v 1.13 2007/05/13 18:33:57 swildner Exp $"
#define _DPT_C_
if (error != 0) {
if (error != EFBIG)
- kprintf("dpt%d: Unexepected error 0x%x returned from "
+ kprintf("dpt%d: Unexpected error 0x%x returned from "
"bus_dmamap_load\n", dpt->unit, error);
if (ccb->ccb_h.status == CAM_REQ_INPROG) {
xpt_freeze_devq(ccb->ccb_h.path, /*count*/1);
* SUCH DAMAGE.
*
* $FreeBSD: src/sys/dev/mly/mly_cam.c,v 1.1.2.3 2001/04/21 04:09:06 msmith Exp $
- * $DragonFly: src/sys/dev/raid/mly/Attic/mly_cam.c,v 1.7 2006/12/20 18:14:40 dillon Exp $
+ * $DragonFly: src/sys/dev/raid/mly/Attic/mly_cam.c,v 1.8 2007/05/13 18:33:57 swildner Exp $
*/
/*
* CAM interface for FreeBSD
}
default: /* we can't do this */
- debug(2, "unspported func_code = 0x%x", ccb->ccb_h.func_code);
+ debug(2, "unsupported func_code = 0x%x", ccb->ccb_h.func_code);
ccb->ccb_h.status = CAM_REQ_INVALID;
break;
}
* SUCH DAMAGE.
*
* $FreeBSD$
- * $DragonFly: src/sys/dev/raid/twa/twa_globals.c,v 1.1 2004/04/16 20:13:17 drhodus Exp $
+ * $DragonFly: src/sys/dev/raid/twa/twa_globals.c,v 1.2 2007/05/13 18:33:57 swildner Exp $
*/
/*
{0x0000, "AEN queue empty"},
{0x0001, "Controller reset occurred"},
{0x0002, "Degraded unit detected"},
- {0x0003, "Controller error occured"},
+ {0x0003, "Controller error occurred"},
{0x0004, "Background rebuild failed"},
{0x0005, "Background rebuild done"},
{0x0006, "Incomplete unit detected"},
* SUCH DAMAGE.
*
* $FreeBSD: src/sys/dev/sound/pci/atiixp.c,v 1.2.2.5 2006/11/14 13:08:11 ariff Exp $
- * $DragonFly: src/sys/dev/sound/pci/atiixp.c,v 1.2 2007/01/08 01:38:02 swildner Exp $
+ * $DragonFly: src/sys/dev/sound/pci/atiixp.c,v 1.3 2007/05/13 18:33:58 swildner Exp $
*/
/*
#include <dev/sound/pci/atiixp.h>
-SND_DECLARE_FILE("$DragonFly: src/sys/dev/sound/pci/atiixp.c,v 1.2 2007/01/08 01:38:02 swildner Exp $");
+SND_DECLARE_FILE("$DragonFly: src/sys/dev/sound/pci/atiixp.c,v 1.3 2007/05/13 18:33:58 swildner Exp $");
struct atiixp_dma_op {
volatile uint32_t addr;
#if 0
if (status & ATI_REG_ISR_IN_XRUN) {
device_printf(sc->dev,
- "Recieve IN XRUN interrupt\n");
+ "Receive IN XRUN interrupt\n");
}
if (status & ATI_REG_ISR_OUT_XRUN) {
device_printf(sc->dev,
- "Recieve OUT XRUN interrupt\n");
+ "Receive OUT XRUN interrupt\n");
}
#endif
* POSSIBILITY OF SUCH DAMAGE.
*
* $FreeBSD: src/sys/pci/meteor.c,v 1.49 1999/09/25 18:24:41 phk Exp $
- * $DragonFly: src/sys/dev/video/meteor/meteor.c,v 1.21 2006/12/28 21:24:01 dillon Exp $
+ * $DragonFly: src/sys/dev/video/meteor/meteor.c,v 1.22 2007/05/13 18:33:58 swildner Exp $
*/
/* Change History:
if(mtr->base->i2c_read & SAA7116_IIC_DIRECT_TRANSFER_ABORTED){
mtr->base->i2c_read |= SAA7116_IIC_DIRECT_TRANSFER_ABORTED;
if(i2c_print_err)
- kprintf("meteor%d: 0x%x i2c %s tranfer aborted",
+ kprintf("meteor%d: 0x%x i2c %s transfer aborted",
METEOR_NUM(mtr), slave,
rw ? "read" : "write" );
err= 1;
* John S. Dyson.
*
* $FreeBSD: src/sys/kern/vfs_bio.c,v 1.242.2.20 2003/05/28 18:38:10 alc Exp $
- * $DragonFly: src/sys/kern/vfs_bio.c,v 1.90 2007/05/06 19:23:31 dillon Exp $
+ * $DragonFly: src/sys/kern/vfs_bio.c,v 1.91 2007/05/13 18:33:58 swildner Exp $
*/
/*
/*
* Sanity Checks
*/
- KASSERT(bp->b_qindex == qindex, ("getnewbuf: inconsistant queue %d bp %p", qindex, bp));
+ KASSERT(bp->b_qindex == qindex, ("getnewbuf: inconsistent queue %d bp %p", qindex, bp));
/*
* Note: we no longer distinguish between VMIO and non-VMIO
* SUCH DAMAGE.
*
* $FreeBSD: src/sys/libkern/iconv.c,v 1.1.2.1 2001/05/21 08:28:07 bp Exp $
- * $DragonFly: src/sys/libiconv/iconv.c,v 1.6 2007/03/08 16:42:34 dillon Exp $
+ * $DragonFly: src/sys/libiconv/iconv.c,v 1.7 2007/05/13 18:33:58 swildner Exp $
*/
#include <sys/param.h>
#include <sys/systm.h>
iconv_unregister_converter(struct iconv_converter_class *dcp)
{
if (dcp->refs != 1) {
- ICDEBUG("converter have %d referenses left\n", dcp->refs);
+ ICDEBUG("converter has %d references left\n", dcp->refs);
return EBUSY;
}
TAILQ_REMOVE(&iconv_converters, dcp, cc_link);
* $Id: i4b_ihfc_drv.h,v 1.7 2000/09/19 13:50:36 hm Exp $
*
* $FreeBSD: src/sys/i4b/layer1/ihfc/i4b_ihfc_drv.h,v 1.1.2.1 2001/08/10 14:08:37 obrien Exp $
- * $DragonFly: src/sys/net/i4b/layer1/ihfc/i4b_ihfc_drv.h,v 1.2 2003/06/17 04:28:40 dillon Exp $
+ * $DragonFly: src/sys/net/i4b/layer1/ihfc/i4b_ihfc_drv.h,v 1.3 2007/05/13 18:33:58 swildner Exp $
*
*---------------------------------------------------------------------------*/
#ifndef I4B_IHFC_DRV_H_
{ 0x00 ,"Deactivated" },
{ 0x01 ,"Awaiting signal" },
{ 0x01 ,"Identifying input" },
- { 0x02 ,"Syncronized" },
+ { 0x02 ,"Synchronized" },
{ 0x03 ,"Activated" },
{ 0x04 ,"Lost framing" },
{ 0xff , 0 },
*
* @(#)if.c 8.3 (Berkeley) 1/4/94
* $FreeBSD: src/sys/net/if.c,v 1.185 2004/03/13 02:35:03 brooks Exp $
- * $DragonFly: src/sys/net/if.c,v 1.50 2007/03/24 05:57:49 sephe Exp $
+ * $DragonFly: src/sys/net/if.c,v 1.51 2007/05/13 18:33:58 swildner Exp $
*/
#include "opt_compat.h"
IF_DRAIN(ifq);
break;
default:
- panic("unspported ALTQ request: %d", req);
+ panic("unsupported ALTQ request: %d", req);
}
crit_exit();
return(0);
/* $FreeBSD: src/sys/contrib/pf/net/pf_ioctl.c,v 1.12 2004/08/12 14:15:42 mlaier Exp $ */
/* $OpenBSD: pf_ioctl.c,v 1.112.2.2 2004/07/24 18:28:12 brad Exp $ */
-/* $DragonFly: src/sys/net/pf/pf_ioctl.c,v 1.11 2006/12/22 23:44:57 swildner Exp $ */
+/* $DragonFly: src/sys/net/pf/pf_ioctl.c,v 1.12 2007/05/13 18:33:58 swildner Exp $ */
/*
* Copyright (c) 2004 The DragonFly Project. All rights reserved.
error = hook_pf();
if (error) {
DPFPRINTF(PF_DEBUG_MISC,
- ("pf: pfil registeration fail\n"));
+ ("pf: pfil registration fail\n"));
break;
}
pf_status.running = 1;
if (error) {
pf_status.running = 1;
DPFPRINTF(PF_DEBUG_MISC,
- ("pf: pfil unregisteration failed\n"));
+ ("pf: pfil unregistration failed\n"));
}
pf_status.since = time_second;
DPFPRINTF(PF_DEBUG_MISC, ("pf: stopped\n"));
* XXX Due to error code ESRCH, kldunload will show
* a message like 'No such process'.
*/
- kprintf("pfil unregisteration fail\n");
+ kprintf("pfil unregistration fail\n");
return error;
}
shutdown_pf();
* Author: Archie Cobbs <archie@freebsd.org>
*
* $FreeBSD: src/sys/netgraph/ng_vjc.c,v 1.9.2.5 2002/07/02 23:44:03 archie Exp $
- * $DragonFly: src/sys/netgraph/vjc/ng_vjc.c,v 1.6 2006/08/25 22:37:08 swildner Exp $
+ * $DragonFly: src/sys/netgraph/vjc/ng_vjc.c,v 1.7 2007/05/13 18:33:58 swildner Exp $
* $Whistle: ng_vjc.c,v 1.17 1999/11/01 09:24:52 julian Exp $
*/
#if _MACHINE_ARCH == i386
#define NG_VJC_TSTATE_PTR_TYPE &ng_parse_uint32_type
#else
-#error Unspported _MACHINE_ARCH
+#error Unsupported _MACHINE_ARCH
#endif
/* Parse type for the 'cs_hdr' field in a struct cstate. Ideally we would
/* $KAME: sctp_input.c,v 1.27 2005/03/06 16:04:17 itojun Exp $ */
-/* $DragonFly: src/sys/netinet/sctp_input.c,v 1.11 2007/04/22 01:13:14 dillon Exp $ */
+/* $DragonFly: src/sys/netinet/sctp_input.c,v 1.12 2007/05/13 18:33:58 swildner Exp $ */
/*
* Copyright (C) 2002, 2003, 2004 Cisco Systems Inc,
case SCTP_ASCONF_ACK:
#ifdef SCTP_DEBUG
if (sctp_debug_on & SCTP_DEBUG_INPUT2) {
- kprintf("Strange peer, snds ASCONF but does not recongnize asconf-ack?\n");
+ kprintf("Strange peer, snds ASCONF but does not recognize asconf-ack?\n");
}
#endif
case SCTP_ASCONF:
/* $FreeBSD: src/sys/netinet6/esp_input.c,v 1.1.2.8 2003/01/23 21:06:47 sam Exp $ */
-/* $DragonFly: src/sys/netinet6/esp_input.c,v 1.14 2006/12/22 23:57:53 swildner Exp $ */
+/* $DragonFly: src/sys/netinet6/esp_input.c,v 1.15 2007/05/13 18:33:58 swildner Exp $ */
/* $KAME: esp_input.c,v 1.62 2002/01/07 11:39:57 kjc Exp $ */
/*
/* check if we have proper ivlen information */
ivlen = sav->ivlen;
if (ivlen < 0) {
- ipseclog((LOG_ERR, "inproper ivlen in IPv4 ESP input: %s %s\n",
+ ipseclog((LOG_ERR, "improper ivlen in IPv4 ESP input: %s %s\n",
ipsec4_logpacketstr(ip, spi), ipsec_logsastr(sav)));
ipsecstat.in_inval++;
goto bad;
/* check if we have proper ivlen information */
ivlen = sav->ivlen;
if (ivlen < 0) {
- ipseclog((LOG_ERR, "inproper ivlen in IPv6 ESP input: %s %s\n",
+ ipseclog((LOG_ERR, "improper ivlen in IPv6 ESP input: %s %s\n",
ipsec6_logpacketstr(ip6, spi), ipsec_logsastr(sav)));
ipsec6stat.in_badspi++;
goto bad;
/* $FreeBSD: src/sys/netipsec/key.c,v 1.3.2.1 2003/01/24 05:11:35 sam Exp $ */
-/* $DragonFly: src/sys/netproto/ipsec/key.c,v 1.24 2006/12/22 23:57:54 swildner Exp $ */
+/* $DragonFly: src/sys/netproto/ipsec/key.c,v 1.25 2007/05/13 18:33:58 swildner Exp $ */
/* $KAME: key.c,v 1.191 2001/06/27 10:46:49 sakane Exp $ */
/*
if (sp->req != NULL)
panic("key_spdacquire: called but there is request.\n");
if (sp->policy != IPSEC_POLICY_IPSEC)
- panic("key_spdacquire: policy mismathed. IPsec is expected.\n");
+ panic("key_spdacquire: policy mismatched. IPsec is expected.\n");
/* Get an entry to check whether sent message or not. */
if ((newspacq = key_getspacq(&sp->spidx)) != NULL) {
/* $FreeBSD: src/sys/netkey/key.c,v 1.16.2.13 2002/07/24 18:17:40 ume Exp $ */
-/* $DragonFly: src/sys/netproto/key/key.c,v 1.19 2006/12/22 23:57:54 swildner Exp $ */
+/* $DragonFly: src/sys/netproto/key/key.c,v 1.20 2007/05/13 18:33:58 swildner Exp $ */
/* $KAME: key.c,v 1.191 2001/06/27 10:46:49 sakane Exp $ */
/*
if (sp->req != NULL)
panic("key_spdacquire: called but there is request.\n");
if (sp->policy != IPSEC_POLICY_IPSEC)
- panic("key_spdacquire: policy mismathed. IPsec is expected.\n");
+ panic("key_spdacquire: policy mismatched. IPsec is expected.\n");
/* get a entry to check whether sent message or not. */
if ((newspacq = key_getspacq(&sp->spidx)) != NULL) {
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
* $FreeBSD: src/sys/netncp/ncp_conn.c,v 1.3.2.5 2001/02/22 08:54:11 bp Exp $
- * $DragonFly: src/sys/netproto/ncp/ncp_conn.c,v 1.14 2006/12/22 23:57:54 swildner Exp $
+ * $DragonFly: src/sys/netproto/ncp/ncp_conn.c,v 1.15 2007/05/13 18:33:58 swildner Exp $
*
* Connection tables
*/
if (error)
return error;
if (ncp->ref_cnt) {
- NCPFATAL("there are %d referenses left\n",ncp->ref_cnt);
+ NCPFATAL("there are %d references left\n",ncp->ref_cnt);
return(EBUSY);
}
* SUCH DAMAGE.
*
* $FreeBSD: src/sys/nwfs/nwfs_vfsops.c,v 1.6.2.6 2001/10/25 19:18:54 dillon Exp $
- * $DragonFly: src/sys/vfs/nwfs/nwfs_vfsops.c,v 1.28 2007/05/06 19:23:35 dillon Exp $
+ * $DragonFly: src/sys/vfs/nwfs/nwfs_vfsops.c,v 1.29 2007/05/13 18:33:58 swildner Exp $
*/
#include "opt_ncp.h"
#ifndef NCP
}
error = ncp_conn_getbyref(args.connRef,curthread,cred,NCPM_EXECUTE,&conn);
if (error) {
- nwfs_printf("invalid connection refernce %d\n",args.connRef);
+ nwfs_printf("invalid connection reference %d\n",args.connRef);
return (error);
}
error = ncp_conn_gethandle(conn, NULL, &handle);
* @(#) Copyright (c) 1985 Sun Microsystems, Inc. @(#) Copyright (c) 1976 Board of Trustees of the University of Illinois. @(#) Copyright (c) 1980, 1993 The Regents of the University of California. All rights reserved.
* @(#)indent.c 5.17 (Berkeley) 6/7/93
* $FreeBSD: src/usr.bin/indent/indent.c,v 1.5.2.6 2001/12/06 19:28:47 schweikh Exp $
- * $DragonFly: src/usr.bin/indent/indent.c,v 1.3 2005/04/10 20:55:38 drhodus Exp $
+ * $DragonFly: src/usr.bin/indent/indent.c,v 1.4 2007/05/13 18:33:58 swildner Exp $
*/
#include <sys/param.h>
*/
if (match_state[ifdef_level].tos >= 0
&& bcmp(&ps, &match_state[ifdef_level], sizeof ps))
- diag2(0, "Syntactically inconsistant #ifdef alternatives.");
+ diag2(0, "Syntactically inconsistent #ifdef alternatives.");
#endif
}
if (blanklines_around_conditional_compilation) {
* SUCH DAMAGE.
*
* $FreeBSD: src/usr.bin/ncplogin/ncplogin.c,v 1.1 1999/10/31 02:14:59 bp Exp $
- * $DragonFly: src/usr.bin/ncplogin/ncplogin.c,v 1.3 2003/10/04 20:36:49 hmp Exp $
+ * $DragonFly: src/usr.bin/ncplogin/ncplogin.c,v 1.4 2007/05/13 18:33:58 swildner Exp $
*/
#include <sys/types.h>
#include <sys/errno.h>
} while(0);
if (error)
errx(EX_DATAERR,
- "an error occured while parsing '%s'",
+ "an error occurred while parsing '%s'",
argv[argc - 1]);
}
.\"
.\" from: @(#)rwall.1 6.7 (Berkeley) 4/23/91
.\" $FreeBSD: src/usr.bin/rwall/rwall.1,v 1.7.2.4 2001/08/16 13:17:02 ru Exp $
-.\" $DragonFly: src/usr.bin/rwall/rwall.1,v 1.2 2003/06/17 04:29:31 dillon Exp $
+.\" $DragonFly: src/usr.bin/rwall/rwall.1,v 1.3 2007/05/13 18:33:59 swildner Exp $
.\"
.Dd April 23, 1991
.Dt RWALL 1
.It rwall: RPC: Port mapper failure - RPC: Timed out
The remote host is not running the portmapper (see
.Xr portmap 8 ) ,
-and cannot accomodate any RPC-based services. The host may be down.
+and cannot accommodate any RPC-based services. The host may be down.
.El
.Sh SEE ALSO
.Xr who 1 ,
* -------------
*
* $FreeBSD: src/usr.sbin/i4b/isdnd/fsm.c,v 1.6.2.2 2001/08/10 23:11:14 obrien Exp $
- * $DragonFly: src/usr.sbin/i4b/isdnd/fsm.c,v 1.2 2003/06/17 04:29:54 dillon Exp $
+ * $DragonFly: src/usr.sbin/i4b/isdnd/fsm.c,v 1.3 2007/05/13 18:33:59 swildner Exp $
*
* last edit-date: [Sat Jul 21 18:25:48 2001]
*
static void
F_TIMO(cfg_entry_t *cep)
{
- DBGL(DL_STATE, (log(LL_DBG, "F_TIMO: Timout occured!")));
+ DBGL(DL_STATE, (log(LL_DBG, "F_TIMO: Timeout occurred!")));
sendm_disconnect_req(cep, (CAUSET_I4B << 8) | CAUSE_I4B_NORMAL);
cep->cdid = CDID_UNUSED;
}
* $Id: layer3_subr.c,v 1.8 2000/02/21 15:17:17 hm Exp $
*
* $FreeBSD: src/usr.sbin/i4b/isdndecode/layer3_subr.c,v 1.6.2.2 2001/08/01 17:45:05 obrien Exp $
- * $DragonFly: src/usr.sbin/i4b/isdndecode/layer3_subr.c,v 1.2 2003/06/17 04:29:55 dillon Exp $
+ * $DragonFly: src/usr.sbin/i4b/isdndecode/layer3_subr.c,v 1.3 2007/05/13 18:33:59 swildner Exp $
*
* last edit-date: [Mon Feb 21 15:45:16 2000]
*
strcpy(buffer, "Call has returned to the ISDN");
break;
case 5:
- strcpy(buffer, "Interworking occured, Service change");
+ strcpy(buffer, "Interworking occurred, Service change");
break;
case 8:
strcpy(buffer, "In-band info or appropriate pattern now available");
* $Id: pcause_1tr6.c,v 1.6 1999/12/13 21:25:26 hm Exp $
*
* $FreeBSD: src/usr.sbin/i4b/isdntrace/pcause_1tr6.c,v 1.6.2.1 2001/08/01 17:45:08 obrien Exp $
- * $DragonFly: src/usr.sbin/i4b/isdntrace/pcause_1tr6.c,v 1.2 2003/06/17 04:29:55 dillon Exp $
+ * $DragonFly: src/usr.sbin/i4b/isdntrace/pcause_1tr6.c,v 1.3 2007/05/13 18:33:59 swildner Exp $
*
* last edit-date: [Mon Dec 13 21:56:03 1999]
*
break;
case CAUSE_1TR6_UIDL:
- e = "user info discharded locally";
+ e = "user info discarded locally";
break;
default:
- e = "UNKNOWN error occured";
+ e = "UNKNOWN error occurred";
break;
}
* ---------------------------
*
* $FreeBSD: src/usr.sbin/i4b/isdntrace/q931.c,v 1.6.2.2 2001/12/10 09:34:39 hm Exp $
- * $DragonFly: src/usr.sbin/i4b/isdntrace/q931.c,v 1.2 2003/06/17 04:29:55 dillon Exp $
+ * $DragonFly: src/usr.sbin/i4b/isdntrace/q931.c,v 1.3 2007/05/13 18:33:59 swildner Exp $
*
* last edit-date: [Mon Dec 10 10:32:33 2001]
*
sprintf((pbuf+strlen(pbuf)), "Call has returned to the ISDN");
break;
case 5:
- sprintf((pbuf+strlen(pbuf)), "Interworking occured, Service change");
+ sprintf((pbuf+strlen(pbuf)), "Interworking occurred, Service change");
break;
case 8:
sprintf((pbuf+strlen(pbuf)), "In-band info or appropriate pattern now available");
uqs's projects / games.git / commitdiff