From 1de3c21dc8499da99feb4e9a779f1009fb0e8766 Mon Sep 17 00:00:00 2001 From: Sascha Wildner Date: Sat, 29 Aug 2009 23:55:15 +0200 Subject: [PATCH] Fix some more typos in manual pages and messages. --- sbin/devfsctl/devfsctl.8 | 2 +- sbin/iscontrol/iscsi.conf.5 | 2 +- sys/dev/disk/mpt/mpt_debug.c | 8 ++++---- sys/vfs/hammer/hammer_expand.c | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/sbin/devfsctl/devfsctl.8 b/sbin/devfsctl/devfsctl.8 index afc8bda2aa..317e5a4163 100644 --- a/sbin/devfsctl/devfsctl.8 +++ b/sbin/devfsctl/devfsctl.8 @@ -77,7 +77,7 @@ Reads ruleset specified by .Fl f and then dumps its contents to stdout. The rules will not be applied. -This option cannot be used in conjuction with any other option. +This option cannot be used in conjunction with any other option. It is useful for checking the correct syntax and order of the specified ruleset and will show the final interpretation as it would be applied. .It Fl f Ar file diff --git a/sbin/iscontrol/iscsi.conf.5 b/sbin/iscontrol/iscsi.conf.5 index fc6eadfe4f..b9998625f7 100644 --- a/sbin/iscontrol/iscsi.conf.5 +++ b/sbin/iscontrol/iscsi.conf.5 @@ -205,6 +205,6 @@ ISCSI RFC 3720 .\"Sh AUTHORS .Sh BUGS Some options have not been implemented, either they were found -to be unecessary, or not understood, this can change in the future. +to be unnecessary, or not understood, this can change in the future. .br The tags opening value is difficult to calculate, use wisely. diff --git a/sys/dev/disk/mpt/mpt_debug.c b/sys/dev/disk/mpt/mpt_debug.c index ef7cf0b9e5..cead147dfc 100644 --- a/sys/dev/disk/mpt/mpt_debug.c +++ b/sys/dev/disk/mpt/mpt_debug.c @@ -119,15 +119,15 @@ static const struct Error_Map IOC_Status[] = { { 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}, diff --git a/sys/vfs/hammer/hammer_expand.c b/sys/vfs/hammer/hammer_expand.c index 927d342056..57c5cb5ce6 100644 --- a/sys/vfs/hammer/hammer_expand.c +++ b/sys/vfs/hammer/hammer_expand.c @@ -168,7 +168,7 @@ hammer_ioc_expand(hammer_transaction_t trans, hammer_inode_t ip, end: if (error) - kprintf("An error occured: %d\n", error); + kprintf("An error occurred: %d\n", error); return (error); } -- 2.41.0