about summary refs log tree commit diff
path: root/doc
diff options
context:
space:
mode:
authorAlexander Barton <alex@barton.de>2012-11-02 14:30:19 +0100
committerAlexander Barton <alex@barton.de>2012-11-02 14:30:19 +0100
commit48326e061aacd954e24f76c53ded10448cbc28eb (patch)
tree5d42738ffc467b82d6f2e7a3dc54d8498276a4a6 /doc
parent84e9dcbab080b03b2057df8b22327172895833be (diff)
downloadngircd-48326e061aacd954e24f76c53ded10448cbc28eb.tar.gz
ngircd-48326e061aacd954e24f76c53ded10448cbc28eb.zip
Spelling fix: "nick name" -> "nickname"
Diffstat (limited to 'doc')
-rw-r--r--doc/Protocol.txt2
-rw-r--r--doc/sample-ngircd.conf.tmpl10
2 files changed, 6 insertions, 6 deletions
diff --git a/doc/Protocol.txt b/doc/Protocol.txt
index 3d2cda6c..c7fd7826 100644
--- a/doc/Protocol.txt
+++ b/doc/Protocol.txt
@@ -133,7 +133,7 @@ protocol which allows at max 15 arguments per command).
 Please see <http://www.irc.org/tech_docs/005.html> for details.
 
 The information exchanged using ISUPPORT can be used to detect configuration
-incompatibilities (different maximum nick name length, for example) and
+incompatibilities (different maximum nickname length, for example) and
 therefore to disconnect the peer prior to registering it in the network.
 
 
diff --git a/doc/sample-ngircd.conf.tmpl b/doc/sample-ngircd.conf.tmpl
index 77948af0..997a983d 100644
--- a/doc/sample-ngircd.conf.tmpl
+++ b/doc/sample-ngircd.conf.tmpl
@@ -95,9 +95,9 @@
 	# Maximum number of channels a user can be member of (0: no limit):
 	;MaxJoins = 10
 
-	# Maximum length of an user nick name (Default: 9, as in RFC 2812).
+	# Maximum length of an user nickname (Default: 9, as in RFC 2812).
 	# Please note that all servers in an IRC network MUST use the same
-	# maximum nick name length!
+	# maximum nickname length!
 	;MaxNickLength = 9
 
 	# Maximum number of channels returned in response to a /list
@@ -141,7 +141,7 @@
 	# hash is generated after each server start.
 	;CloakHostSalt = abcdefghijklmnopqrstuvwxyz
 
-	# Set every clients' user name to their nick name
+	# Set every clients' user name to their nickname
 	;CloakUserToNick = yes
 
 	# Try to connect to other IRC servers using IPv4 and IPv6, if possible.
@@ -241,7 +241,7 @@
 	# [Operator] sections are used to define IRC Operators. There may be
 	# more than one [Operator] block, one for each local operator.
 
-	# ID of the operator (may be different of the nick name)
+	# ID of the operator (may be different of the nickname)
 	;Name = TheOper
 
 	# Password of the IRC operator
@@ -304,7 +304,7 @@
 	# Connect to the remote server using TLS/SSL (Default: false)
 	;SSLConnect = yes
 
-	# Define a (case insensitive) list of masks matching nick names that
+	# Define a (case insensitive) list of masks matching nicknames that
 	# should be treated as IRC services when introduced via this remote
 	# server, separated by commas (",").
 	# REGULAR SERVERS DON'T NEED this parameter, so leave it empty