Spelling fix: "nick name" -> "nickname"

10 files changed, 27 insertions, 27 deletions

diff --git a/src/ngircd/client.c b/src/ngircd/client.c
index 4728c7a4..92262b5d 100644
--- a/src/ngircd/client.c
+++ b/src/ngircd/client.c
@@ -875,7 +875,7 @@ Client_Away( CLIENT *Client )
  * the appropriate error messages.
  *
  * @param	Client Client that wants to change the nickname.
- * @param	Nick New nick name.
+ * @param	Nick New nickname.
  * @returns	true if nickname is valid, false otherwise.
  */
 GLOBAL bool
@@ -897,7 +897,7 @@ Client_CheckNick(CLIENT *Client, char *Nick)
 
 	if (Client_Type(Client) != CLIENT_SERVER
 	    && Client_Type(Client) != CLIENT_SERVICE) {
-		/* Make sure that this isn't a restricted/forbidden nick name */
+		/* Make sure that this isn't a restricted/forbidden nickname */
 		if (Conf_NickIsBlocked(Nick)) {
 			IRC_WriteStrClient(Client, ERR_FORBIDDENNICKNAME_MSG,
 					   Client_ID(Client), Nick);
diff --git a/src/ngircd/client.h b/src/ngircd/client.h
index 16b2a61a..7a383af8 100644
--- a/src/ngircd/client.h
+++ b/src/ngircd/client.h
@@ -71,7 +71,7 @@ typedef POINTER CLIENT;
 typedef struct _WHOWAS
 {
 	time_t time;			/* time stamp of entry or 0 if unused */
-	char id[CLIENT_NICK_LEN];	/* client nick name */
+	char id[CLIENT_NICK_LEN];	/* client nickname */
 	char host[CLIENT_HOST_LEN];	/* hostname of the client */
 	char user[CLIENT_USER_LEN];	/* user name ("login") */
 	char info[CLIENT_INFO_LEN];	/* long user name */
diff --git a/src/ngircd/conf.c b/src/ngircd/conf.c
index 81525129..da7ff844 100644
--- a/src/ngircd/conf.c
+++ b/src/ngircd/conf.c
@@ -644,11 +644,11 @@ Conf_AddServer(const char *Name, UINT16 Port, const char *Host,
 }
 
 /**
- * Check if the given nick name is reserved for services on a particular server.
+ * Check if the given nickname is reserved for services on a particular server.
  *
  * @param ConfServer The server index to check.
- * @param Nick The nick name to check.
- * @returns true if the given nick name belongs to an "IRC service".
+ * @param Nick The nickname to check.
+ * @returns true if the given nickname belongs to an "IRC service".
  */
 GLOBAL bool
 Conf_NickIsService(int ConfServer, const char *Nick)
@@ -661,11 +661,11 @@ Conf_NickIsService(int ConfServer, const char *Nick)
 }
 
 /**
- * Check if the given nick name is blocked for "normal client" use.
+ * Check if the given nickname is blocked for "normal client" use.
  *
  * @param ConfServer The server index or NONE to check all configured servers.
- * @param Nick The nick name to check.
- * @returns true if the given nick name belongs to an "IRC service".
+ * @param Nick The nickname to check.
+ * @returns true if the given nickname belongs to an "IRC service".
  */
 GLOBAL bool
 Conf_NickIsBlocked(const char *Nick)
@@ -1074,7 +1074,7 @@ Check_ArgIsTrue(const char *Arg)
  *
  * @param Line	Line number in configuration file.
  * @raram Arg	Input string.
- * @returns	New configured maximum nick name length.
+ * @returns	New configured maximum nickname length.
  */
 static unsigned int
 Handle_MaxNickLength(int Line, const char *Arg)
diff --git a/src/ngircd/conf.h b/src/ngircd/conf.h
index 7860f019..f85a25fa 100644
--- a/src/ngircd/conf.h
+++ b/src/ngircd/conf.h
@@ -62,7 +62,7 @@ typedef struct _Conf_Server
 #ifdef SSL_SUPPORT
 	bool SSLConnect;		/**< Establish connection using SSL? */
 #endif
-	char svs_mask[CLIENT_ID_LEN];	/**< Mask of nick names that should be
+	char svs_mask[CLIENT_ID_LEN];	/**< Mask of nicknames that should be
 					     treated and counted as services */
 } CONF_SERVER;
 
@@ -175,7 +175,7 @@ GLOBAL char Conf_CloakHostModeX[CLIENT_ID_LEN];
 /** Salt for hostname hash for cloaked hostnames */
 GLOBAL char Conf_CloakHostSalt[CLIENT_ID_LEN];
 
-/** Use nick name as user name? */
+/** Use nickname as user name? */
 GLOBAL bool Conf_CloakUserToNick;
 
 /** Enable all DNS functions? */
@@ -217,7 +217,7 @@ GLOBAL int Conf_MaxJoins;
 /** Maximum number of connections per IP address */
 GLOBAL int Conf_MaxConnectionsIP;
 
-/** Maximum length of a nick name */
+/** Maximum length of a nickname */
 GLOBAL unsigned int Conf_MaxNickLength;
 
 /** Maximum number of channels returned to /list */
diff --git a/src/ngircd/defines.h b/src/ngircd/defines.h
index 345f1bed..49abf579 100644
--- a/src/ngircd/defines.h
+++ b/src/ngircd/defines.h
@@ -92,7 +92,7 @@
 /** Default nick length (including NULL), see. RFC 2812 section 1.2.1. */
 #define CLIENT_NICK_LEN_DEFAULT 10
 
-/** Maximum nick name length (including NULL). */
+/** Maximum nickname length (including NULL). */
 #define CLIENT_NICK_LEN 32
 
 /** Max. password length (including NULL). */
diff --git a/src/ngircd/irc-info.c b/src/ngircd/irc-info.c
index 31a57c6f..54f83170 100644
--- a/src/ngircd/irc-info.c
+++ b/src/ngircd/irc-info.c
@@ -1150,7 +1150,7 @@ IRC_WHOIS_SendReply(CLIENT *Client, CLIENT *from, CLIENT *c)
 				Client_ID(c)))
 		return DISCONNECTED;
 
-	/* Registered nick name? */
+	/* Registered nickname? */
 	if (Client_HasMode(c, 'R') &&
 	    !IRC_WriteStrClient(from, RPL_WHOISREGNICK_MSG,
 				Client_ID(from), Client_ID(c)))
@@ -1228,7 +1228,7 @@ IRC_WHOIS( CLIENT *Client, REQUEST *Req )
 	/* Get target server for this command */
 	if (Req->argc > 1) {
 		/* Search the target server, which can be specified as a
-		 * nick name on that server as well: */
+		 * nickname on that server as well: */
 		target = Client_Search(Req->argv[0]);
 		if (!target)
 			return IRC_WriteStrClient(from, ERR_NOSUCHSERVER_MSG,
diff --git a/src/ngircd/irc-login.c b/src/ngircd/irc-login.c
index 99cd26f4..7d6e07d0 100644
--- a/src/ngircd/irc-login.c
+++ b/src/ngircd/irc-login.c
@@ -546,10 +546,10 @@ IRC_SERVICE(CLIENT *Client, REQUEST *Req)
 	hops = atoi(Req->argv[4]);
 	info = Req->argv[5];
 
-	/* Validate service name ("nick name") */
+	/* Validate service name ("nickname") */
 	c = Client_Search(nick);
 	if(c) {
-		/* Nick name collission: disconnect (KILL) both clients! */
+		/* Nickname collission: disconnect (KILL) both clients! */
 		Log(LOG_ERR, "Server %s introduces already registered service \"%s\"!",
 		    Client_ID(Client), nick);
 		Kill_Nick(nick, "Nick collision");
@@ -900,9 +900,9 @@ IRC_PONG(CLIENT *Client, REQUEST *Req)
 
 
 /**
- * Kill all users with a specific nick name in the network.
+ * Kill all users with a specific nickname in the network.
  *
- * @param Nick		Nick name.
+ * @param Nick		Nickname.
  * @param Reason	Reason for the KILL.
  */
 static void
diff --git a/src/ngircd/lists.c b/src/ngircd/lists.c
index 5c6c52c4..6faf311a 100644
--- a/src/ngircd/lists.c
+++ b/src/ngircd/lists.c
@@ -283,7 +283,7 @@ Lists_MakeMask(const char *Pattern)
 		excl = NULL;
 
 	if (!at && !excl) {
-		/* Neither "!" nor "@" found: use string as nick name */
+		/* Neither "!" nor "@" found: use string as nickname */
 		strlcpy(TheMask, Pattern, sizeof(TheMask) - 5);
 		strlcat(TheMask, "!*@*", sizeof(TheMask));
 		return TheMask;
diff --git a/src/ngircd/numeric.c b/src/ngircd/numeric.c
index 4bce60fb..3fc8c461 100644
--- a/src/ngircd/numeric.c
+++ b/src/ngircd/numeric.c
@@ -63,7 +63,7 @@ Announce_Channel(CLIENT *Client, CHANNEL *Chan)
 		assert(cl != NULL);
 
 		if (njoin) {
-			/* RFC 2813: send NJOIN with nick names and modes
+			/* RFC 2813: send NJOIN with nicknames and modes
 			 * (if user is channel operator or has voice) */
 			if (str[strlen(str) - 1] != ':')
 				strlcat(str, ",", sizeof(str));
@@ -420,12 +420,12 @@ IRC_Num_ISUPPORT(CLIENT * Client, REQUEST * Req)
 			if ((unsigned int)atol(value) == Conf_MaxNickLength - 1)
 				continue;
 
-			/* Nick name length settings are different! */
+			/* Nickname length settings are different! */
 			Log(LOG_ERR,
-			    "Peer uses incompatible nick name length (%d/%d)! Disconnecting ...",
+			    "Peer uses incompatible nickname length (%d/%d)! Disconnecting ...",
 			    Conf_MaxNickLength - 1, atoi(value));
 			Conn_Close(Client_Conn(Client),
-				   "Incompatible nick name length",
+				   "Incompatible nickname length",
 				   NULL, false);
 			return DISCONNECTED;
 		}
diff --git a/src/ngircd/sighandlers.c b/src/ngircd/sighandlers.c
index a219105f..8f0a5a1b 100644
--- a/src/ngircd/sighandlers.c
+++ b/src/ngircd/sighandlers.c
@@ -102,7 +102,7 @@ Rehash(void)
 
 	Log( LOG_NOTICE|LOG_snotice, "Re-reading configuration NOW!" );
 
-	/* Remember old server name and nick name length */
+	/* Remember old server name and nickname length */
 	strlcpy( old_name, Conf_ServerName, sizeof old_name );
 	old_nicklen = Conf_MaxNickLength;
 
@@ -113,7 +113,7 @@ Rehash(void)
 	/* Close down all listening sockets */
 	Conn_ExitListeners( );
 
-	/* Recover old server name and nick name length: these values can't
+	/* Recover old server name and nickname length: these values can't
 	 * be changed during run-time */
 	if (strcmp(old_name, Conf_ServerName) != 0 ) {
 		strlcpy(Conf_ServerName, old_name, sizeof Conf_ServerName);