summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--contrib/README2
-rwxr-xr-xcontrib/nglog.sh2
-rw-r--r--src/ngircd/conf.h2
-rw-r--r--src/ngircd/conn.c2
-rw-r--r--src/ngircd/defines.h2
-rw-r--r--src/ngircd/irc-channel.c6
-rw-r--r--src/ngircd/irc-oper.c2
-rw-r--r--src/ngircd/irc.c2
-rw-r--r--src/ngircd/login.c2
-rw-r--r--src/ngircd/parse.h2
-rw-r--r--src/portab/vsnprintf.c2
-rw-r--r--src/testsuite/README2
12 files changed, 14 insertions, 14 deletions
diff --git a/contrib/README b/contrib/README
index 4a6229a1..b956d0eb 100644
--- a/contrib/README
+++ b/contrib/README
@@ -43,7 +43,7 @@ ngircd.spec
  - RPM "spec" file.
 
 nglog.sh
- - Colorizes the log messages of ngircd(8) accoring to their log level.
+ - Colorizes the log messages of ngircd(8) according to their log level.
 
 platformtest.sh
  - Build ngIRCd and output a "result line" suitable for doc/Platforms.txt.
diff --git a/contrib/nglog.sh b/contrib/nglog.sh
index 852ee93c..cb4eb3e9 100755
--- a/contrib/nglog.sh
+++ b/contrib/nglog.sh
@@ -10,7 +10,7 @@
 # Please read the file COPYING, README and AUTHORS for more information.
 #
 # This script parses the log output of ngircd(8), and colorizes the messages
-# accoring to their log level. Example usage:
+# according to their log level. Example usage:
 # ./src/ngircd/ngircd -f $PWD/doc/sample-ngircd.conf -np | ./contrib/nglog.sh
 #
 
diff --git a/src/ngircd/conf.h b/src/ngircd/conf.h
index b964c407..a02f5e14 100644
--- a/src/ngircd/conf.h
+++ b/src/ngircd/conf.h
@@ -222,7 +222,7 @@ GLOBAL bool Conf_ConnectIPv6;
 /** Try to connect to remote systems using the IPv4 protocol (true) */
 GLOBAL bool Conf_ConnectIPv4;
 
-/** Idle timout (seconds), after which the daemon should exit */
+/** Idle timeout (seconds), after which the daemon should exit */
 GLOBAL int Conf_IdleTimeout;
 
 /** Maximum number of simultaneous connections to this server */
diff --git a/src/ngircd/conn.c b/src/ngircd/conn.c
index 1bd72776..7e7f6e65 100644
--- a/src/ngircd/conn.c
+++ b/src/ngircd/conn.c
@@ -1454,7 +1454,7 @@ New_Connection(int Sock, UNUSED bool IsSSL)
 	Account_Connection();
 
 #ifdef SSL_SUPPORT
-	/* Delay connection initalization until SSL handshake is finished */
+	/* Delay connection initialization until SSL handshake is finished */
 	if (!IsSSL)
 #endif
 		Conn_StartLogin(new_sock);
diff --git a/src/ngircd/defines.h b/src/ngircd/defines.h
index ff8cd226..c5371e87 100644
--- a/src/ngircd/defines.h
+++ b/src/ngircd/defines.h
@@ -123,7 +123,7 @@
 /** Max. host name length (including NULL). */
 #define CLIENT_HOST_LEN 64
 
-/** Max. mask lenght (including NULL). */
+/** Max. mask length (including NULL). */
 #define MASK_LEN (2 * CLIENT_HOST_LEN)
 
 /** Max. length of all client modes (including NULL). */
diff --git a/src/ngircd/irc-channel.c b/src/ngircd/irc-channel.c
index 812429bb..b9f0bdcd 100644
--- a/src/ngircd/irc-channel.c
+++ b/src/ngircd/irc-channel.c
@@ -176,7 +176,7 @@ join_set_channelmodes(CHANNEL *chan, CLIENT *target, const char *flags)
  * and MODE commands.
  *
  * @param To		Forward JOIN (and MODE) command to this peer server
- * @param Prefix	Client used to prefix the genrated commands
+ * @param Prefix	Client used to prefix the generated commands
  * @param Data		Parameters of JOIN command to forward, probably
  *			containing channel modes separated by ASCII 7.
  */
@@ -209,7 +209,7 @@ cb_join_forward(CLIENT *To, CLIENT *Prefix, void *Data)
  * This function calls cb_join_forward(), which differentiates between
  * protocol implementations (e.g. RFC 2812, RFC 1459).
  *
- * @param Client	Client used to prefix the genrated commands
+ * @param Client	Client used to prefix the generated commands
  * @param target	Forward JOIN (and MODE) command to this peer server
  * @param chan		Channel structure
  * @param channame	Channel name
@@ -250,7 +250,7 @@ join_forward(CLIENT *Client, CLIENT *target, CHANNEL *chan,
 /**
  * Acknowledge user JOIN request and send "channel info" numerics.
  *
- * @param Client	Client used to prefix the genrated commands
+ * @param Client	Client used to prefix the generated commands
  * @param target	Forward commands/numerics to this user
  * @param chan		Channel structure
  * @param channame	Channel name
diff --git a/src/ngircd/irc-oper.c b/src/ngircd/irc-oper.c
index ae333b10..df8e2269 100644
--- a/src/ngircd/irc-oper.c
+++ b/src/ngircd/irc-oper.c
@@ -399,7 +399,7 @@ IRC_xLINE(CLIENT *Client, REQUEST *Req)
 					  Client_ID(Client), Req->command);
 
 	if (!Conf_AllowRemoteOper && Client_Type(Client) == CLIENT_SERVER) {
-		/* Explicitely forbid remote servers to modify "x-lines" when
+		/* Explicitly forbid remote servers to modify "x-lines" when
 		 * the "AllowRemoteOper" configuration option isn't set, even
 		 * when the command seems to originate from the remote server
 		 * itself: this prevents GLINE's to become set during server
diff --git a/src/ngircd/irc.c b/src/ngircd/irc.c
index 3113a4ba..ba33e5ae 100644
--- a/src/ngircd/irc.c
+++ b/src/ngircd/irc.c
@@ -514,7 +514,7 @@ Option_String(UNUSED CONN_ID Idx)
 /**
  * Send a message to target(s).
  *
- * This function is used by IRC_{PRIVMSG|NOTICE|SQUERY} to actualy
+ * This function is used by IRC_{PRIVMSG|NOTICE|SQUERY} to actually
  * send the message(s).
  *
  * @param Client The client from which this command has been received.
diff --git a/src/ngircd/login.c b/src/ngircd/login.c
index ba9378f8..38b9a353 100644
--- a/src/ngircd/login.c
+++ b/src/ngircd/login.c
@@ -248,7 +248,7 @@ cb_Read_Auth_Result(int r_fd, UNUSED short events)
 
 	if (result == true) {
 		/* Authentication succeeded, now set the correct user name
-		 * supplied by the client (without prepended '~' for exmaple),
+		 * supplied by the client (without prepended '~' for example),
 		 * but cut it at the first '@' character: */
 		strlcpy(user, Client_OrigUser(client), sizeof(user));
 		ptr = strchr(user, '@');
diff --git a/src/ngircd/parse.h b/src/ngircd/parse.h
index 859c7ce5..48260c67 100644
--- a/src/ngircd/parse.h
+++ b/src/ngircd/parse.h
@@ -25,7 +25,7 @@ typedef struct _REQUEST
 	char *prefix;			/**< Prefix */
 	char *command;			/**< IRC command */
 	char *argv[15];			/**< Parameters, at most 15 (0..14) */
-	int argc;			/**< Number of given paramaters */
+	int argc;			/**< Number of given parameters */
 } REQUEST;
 
 /** IRC command handling structure */
diff --git a/src/portab/vsnprintf.c b/src/portab/vsnprintf.c
index 4c65db1f..d3b2a888 100644
--- a/src/portab/vsnprintf.c
+++ b/src/portab/vsnprintf.c
@@ -45,7 +45,7 @@
  *  probably requires libm on most operating systems. Don't yet
  *  support the exponent (e,E) and sigfig (g,G). Also, fmtint()
  *  was pretty badly broken, it just wasn't being exercised in ways
- *  which showed it, so that's been fixed. Also, formated the code
+ *  which showed it, so that's been fixed. Also, formatted the code
  *  to mutt conventions, and removed dead code left over from the
  *  original. Also, there is now a builtin-test, just compile with:
  *    gcc -DTEST_SNPRINTF -o snprintf snprintf.c -lm
diff --git a/src/testsuite/README b/src/testsuite/README
index 4ff5ea9f..33855fb0 100644
--- a/src/testsuite/README
+++ b/src/testsuite/README
@@ -71,7 +71,7 @@ tests.sh
 test-loop.sh [<loops> [<wait>]]
 
 	This script runs all the tests <loops> times (default: 5) and pauses
-	<wait> seconds (default: 5) betweed runs.
+	<wait> seconds (default: 5) between runs.
 	It isn't used by "make check" or "make testsuite".
 
 wait-tests.sh [<max>]