spelling corrections; ok jmc@

5 files changed, 12 insertions, 12 deletions

diff --git a/usr.bin/cvs/cvs.1 b/usr.bin/cvs/cvs.1
index fdddeaf629c..f4b80e0a428 100644
--- a/usr.bin/cvs/cvs.1
+++ b/usr.bin/cvs/cvs.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: cvs.1,v 1.16 2004/12/14 00:12:31 jmc Exp $
+.\"	$OpenBSD: cvs.1,v 1.17 2004/12/22 00:38:25 david Exp $
 .\"
 .\" Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org>
 .\" All rights reserved.
@@ -253,7 +253,7 @@ command.
 .Pp
 The
 .Ic update
-command is used to merge any of the changes that have occured on the remote
+command is used to merge any of the changes that have occurred on the remote
 repository into the local one where the command was run.
 .Pp
 The
diff --git a/usr.bin/cvs/cvs.c b/usr.bin/cvs/cvs.c
index cd154eed34c..44ae90463f3 100644
--- a/usr.bin/cvs/cvs.c
+++ b/usr.bin/cvs/cvs.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cvs.c,v 1.28 2004/12/21 20:59:57 xsa Exp $	*/
+/*	$OpenBSD: cvs.c,v 1.29 2004/12/22 00:38:25 david Exp $	*/
 /*
  * Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org>
  * All rights reserved.
@@ -79,7 +79,7 @@ static TAILQ_HEAD(, cvs_var) cvs_variables;
  * The synopsis field should only contain the list of arguments that the
  * command supports, without the actual command's name.
  *
- * Command handlers are expected to return 0 if no error occured, or one of
+ * Command handlers are expected to return 0 if no error occurred, or one of
  * the values known in sysexits.h in case of an error.  In case the error
  * returned is EX_USAGE, the command's usage string is printed to standard
  * error before returning.
diff --git a/usr.bin/cvs/cvsd.conf.5 b/usr.bin/cvs/cvsd.conf.5
index 4fa5bf7ada6..703e1e0d05f 100644
--- a/usr.bin/cvs/cvsd.conf.5
+++ b/usr.bin/cvs/cvsd.conf.5
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: cvsd.conf.5,v 1.3 2004/12/02 22:38:30 jmc Exp $
+.\"	$OpenBSD: cvsd.conf.5,v 1.4 2004/12/22 00:38:25 david Exp $
 .\"
 .\" Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org>
 .\"
@@ -51,7 +51,7 @@ definition of variables that can later be used for interpolation throughout
 the configuration file by preceding them with the
 .Sq $
 character.
-These variables are refered to as macros throughout the rest of the document.
+These variables are referred to as macros throughout the rest of the document.
 A macro name must start with a letter and can be composed of letters, digits,
 and underscores.
 .Pp
diff --git a/usr.bin/cvs/proto.c b/usr.bin/cvs/proto.c
index ae3a078f526..8c390e18d0e 100644
--- a/usr.bin/cvs/proto.c
+++ b/usr.bin/cvs/proto.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: proto.c,v 1.36 2004/12/16 17:09:33 jfb Exp $	*/
+/*	$OpenBSD: proto.c,v 1.37 2004/12/22 00:38:25 david Exp $	*/
 /*
  * Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org>
  * All rights reserved.
@@ -166,7 +166,7 @@ u_int cvs_version_sent = 0;
 static char  cvs_proto_buf[4096];
 
 /*
- * Output files for protocol logging when the CVS_CLIENT_LOG enviroment
+ * Output files for protocol logging when the CVS_CLIENT_LOG environment
  * variable is set.
  */
 static int   cvs_server_logon = 0;
@@ -717,7 +717,7 @@ cvs_sendreq(struct cvsroot *root, u_int rid, const char *arg)
  *
  * Get a response from the server.  This call will actually read and handle
  * responses from the server until one of the response handlers returns
- * non-zero (either an error occured or the end of the response was reached).
+ * non-zero (either an error occurred or the end of the response was reached).
  * Returns the number of handled commands on success, or -1 on failure.
  */
 int
diff --git a/usr.bin/cvs/util.c b/usr.bin/cvs/util.c
index ba8ac126c90..8a564604b6d 100644
--- a/usr.bin/cvs/util.c
+++ b/usr.bin/cvs/util.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: util.c,v 1.19 2004/12/13 16:59:50 jfb Exp $	*/
+/*	$OpenBSD: util.c,v 1.20 2004/12/22 00:38:26 david Exp $	*/
 /*
  * Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org>
  * All rights reserved.
@@ -363,7 +363,7 @@ cvs_splitpath(const char *path, char *base, size_t blen, char **file)
  * Parse a line contained in <line> and generate an argument vector by
  * splitting the line on spaces and tabs.  The resulting vector is stored in
  * <argv>, which can accept up to <argvlen> entries.
- * Returns the number of arguments in the vector, or -1 if an error occured.
+ * Returns the number of arguments in the vector, or -1 if an error occurred.
  */
 int
 cvs_getargv(const char *line, char **argv, int argvlen)
@@ -439,7 +439,7 @@ cvs_getargv(const char *line, char **argv, int argvlen)
 /*
  * cvs_makeargv()
  *
- * Allocate an argument vector large enough to accomodate for all the
+ * Allocate an argument vector large enough to accommodate for all the
  * arguments found in <line> and return it.
  */