DOCS: fixed typos

11 files changed, 18 insertions, 18 deletions

diff --git a/cmake/compiler.cmake b/cmake/compiler.cmake
index 71650f92b..cf74553f7 100644
--- a/cmake/compiler.cmake
+++ b/cmake/compiler.cmake
@@ -25,7 +25,7 @@ if(MSVC)
 	)
 
 	if(32_BIT)
-		# SSE2 code is generated by default, unless an explict arch is set.
+		# SSE2 code is generated by default, unless an explicit arch is set.
 		# Our 32 bit binaries should not contain any SSE2 code, so override the default.
 		add_compile_options("-arch:SSE")
 	endif()
diff --git a/scripts/mumble-version.py b/scripts/mumble-version.py
index a52ec42aa..70e1af8e6 100755
--- a/scripts/mumble-version.py
+++ b/scripts/mumble-version.py
@@ -36,7 +36,7 @@
 # running a version like 1.2.6-234-gf552ag1. This is confusing
 # simply by looking at the version numbers, but the way versioning
 # works inside the Mumble client made it worse: the client's version
-# was refered to as "1.3.0" in several places, but the actual version
+# was referred to as "1.3.0" in several places, but the actual version
 # number said 1.2.6-234-gf552ag1.
 #
 # This script is the replacement for `git describe`. It outputs the
diff --git a/src/mumble/Settings.h b/src/mumble/Settings.h
index 7dd399dc0..6d341a858 100644
--- a/src/mumble/Settings.h
+++ b/src/mumble/Settings.h
@@ -386,7 +386,7 @@ struct Settings {
 
 	/// iMaxInFlightTCPPings specifies the maximum
 	/// number of ping messages that the client has
-	/// sent, but not yet recieved a response for
+	/// sent, but not yet received a response for
 	/// from the server. This value is checked when
 	/// the client sends its next ping message. If
 	/// the maximum is reached, the connection will
diff --git a/src/murmur/Cert.cpp b/src/murmur/Cert.cpp
index c9f140564..cb6bf71bc 100644
--- a/src/murmur/Cert.cpp
+++ b/src/murmur/Cert.cpp
@@ -71,7 +71,7 @@ QSslKey Server::privateKeyFromPEM(const QByteArray &buf, const QByteArray &pass)
 void Server::initializeCert() {
 	QByteArray crt, key, pass, dhparams;
 
-	// Clear all exising SSL settings
+	// Clear all existing SSL settings
 	// for this server.
 	qscCert.clear();
 	qlIntermediates.clear();
diff --git a/src/murmur/DBus.h b/src/murmur/DBus.h
index 64d9fe7d6..210611d8a 100644
--- a/src/murmur/DBus.h
+++ b/src/murmur/DBus.h
@@ -146,11 +146,11 @@ public slots:
 	void channelRemoved(const Channel *c);
 
 public slots:
-	// Order of paremeters is IMPORTANT, or Qt will barf.
+	// Order of parameters is IMPORTANT, or Qt will barf.
 	// Needs to be:
 	// First all input parameters (non-ref or const-ref)
 	// Then const QDbusMessage ref
-	// Then output paremeters (ref)
+	// Then output parameters (ref)
 	// Unfortunately, this makes things look chaotic, but luckily it looks sane again when introspected.
 	// make SURE arguments have sane names, the argument-name will be exported in introspection xml.
 
diff --git a/src/murmur/Murmur.ice b/src/murmur/Murmur.ice
index fab0a2ed8..ce1dd1230 100644
--- a/src/murmur/Murmur.ice
+++ b/src/murmur/Murmur.ice
@@ -281,7 +281,7 @@ module Murmur
 	exception InvalidCallbackException extends MurmurException {};
 	/**  This is thrown when you supply the wrong secret in the calling context. */
 	exception InvalidSecretException extends MurmurException {};
-	/** This is thrown when the channel operation would excede the channel nesting limit */
+	/** This is thrown when the channel operation would exceed the channel nesting limit */
 	exception NestingLimitException extends MurmurException {};
 	/**  This is thrown when you ask the server to disclose something that should be secret. */
 	exception WriteOnlyException extends MurmurException {};
@@ -408,7 +408,7 @@ module Murmur
 
 		/** Map a user to a custom Texture.
 		 *  @param id User id to map.
-		 *  @return User texture or an empty texture for unknwon users or users without textures.
+		 *  @return User texture or an empty texture for unknown users or users without textures.
 		 */
 		idempotent Texture idToTexture(int id);
 	};
@@ -429,7 +429,7 @@ module Murmur
 
 		/** Unregister a user.
 		 *  @param id Userid to unregister.
-		 *  @return 1 for successfull unregistration, 0 for unsuccessfull unregistration, -1 to fall through.
+		 *  @return 1 for successful unregistration, 0 for unsuccessful unregistration, -1 to fall through.
 		 */
 		int unregisterUser(int id);
 
@@ -442,14 +442,14 @@ module Murmur
 		/** Set additional information for user registration.
 		 *  @param id Userid of registered user.
 		 *  @param info Information to set about user. This should be merged with existing information.
-		 *  @return 1 for successfull update, 0 for unsuccessfull update, -1 to fall through.
+		 *  @return 1 for successful update, 0 for unsuccessful update, -1 to fall through.
 		 */
 		idempotent int setInfo(int id, UserInfoMap info);
 
 		/** Set texture (now called avatar) of user registration.
 		 *  @param id registrationId of registered user.
 		 *  @param tex New texture.
-		 *  @return 1 for successfull update, 0 for unsuccessfull update, -1 to fall through.
+		 *  @return 1 for successful update, 0 for unsuccessful update, -1 to fall through.
 		 */
 		idempotent int setTexture(int id, Texture tex);
 	};
@@ -873,7 +873,7 @@ module Murmur
 		 */
 		idempotent ServerList getAllServers() throws InvalidSecretException;
 
-		/** Fetch default configuraion. This returns the configuration items that were set in the configuration file, or
+		/** Fetch default configuration. This returns the configuration items that were set in the configuration file, or
 		 * the built-in default. The individual servers will use these values unless they have been overridden in the
 		 * server specific configuration. The only special case is the port, which defaults to the value defined here +
 		 * the servers ID - 1 (so that virtual server #1 uses the defined port, server #2 uses port+1 etc).
diff --git a/src/murmur/MurmurRPC.proto b/src/murmur/MurmurRPC.proto
index 5354b94c8..f40fe53a4 100644
--- a/src/murmur/MurmurRPC.proto
+++ b/src/murmur/MurmurRPC.proto
@@ -10,7 +10,7 @@ package MurmurRPC;
 // Note about embedded messages:
 //
 // To help save bandwidth, the protocol does not always send complete embedded
-// messages (i.e. an embeddded message with all of the fields filled in). These
+// messages (i.e. an embedded message with all of the fields filled in). These
 // incomplete messages only contain enough identifying information to get more
 // information from the message's corresponding "Get" method. For example:
 //
diff --git a/src/murmur/PBKDF2.h b/src/murmur/PBKDF2.h
index 377e59823..7a6be0606 100644
--- a/src/murmur/PBKDF2.h
+++ b/src/murmur/PBKDF2.h
@@ -77,7 +77,7 @@ public:
 
 	/// Duration for hash operation the benchmark function should target
 	static const int BENCHMARK_DURATION_TARGET_IN_MS = 10;
-	/// Benchmark returns highest iteration number of N benchmark attemps
+	/// Benchmark returns highest iteration number of N benchmark attempts
 	static const size_t BENCHMARK_N = 40;
 	/// Lower bound of iteration count returned by benchmark
 	/// regardless of duration (should be divisible by 2)
diff --git a/src/murmur/Server.cpp b/src/murmur/Server.cpp
index f39a4bfef..09c9eb3bb 100644
--- a/src/murmur/Server.cpp
+++ b/src/murmur/Server.cpp
@@ -911,7 +911,7 @@ void Server::run() {
 					// Unknown peer
 					foreach (ServerUser *usr, qhHostUsers.value(ha)) {
 						if (checkDecrypt(usr, encrypt, buffer, len)) { // checkDecrypt takes the User's qrwlCrypt lock.
-							// Every time we relock, reverify users' existance.
+							// Every time we relock, reverify users' existence.
 							// The main thread might delete the user while the lock isn't held.
 							unsigned int uiSession = usr->uiSession;
 							rl.unlock();
@@ -1592,7 +1592,7 @@ void Server::sslError(const QList< QSslError > &errors) {
 		// attempt to finish the handshake.
 		//
 		// Because abort() tears down a lot of internal state
-		// of the QSslSocket, inlcuding the 'SSL *' object
+		// of the QSslSocket, including the 'SSL *' object
 		// associated with the socket, this is fatal and leads
 		// to crashes, such as attempting to derefernce a nullptr
 		// 'SSL *' object.
diff --git a/src/murmur/Server.h b/src/murmur/Server.h
index 802866f3f..eaf05d898 100644
--- a/src/murmur/Server.h
+++ b/src/murmur/Server.h
@@ -388,7 +388,7 @@ public:
 	/// of the error.
 	///
 	/// This method is equivalent to the logic that happens in
-	/// Server::msgChannelState  when a ChannelState message is recieved from
+	/// Server::msgChannelState  when a ChannelState message is received from
 	/// a user. However, this method doesn't do permissions checking.
 	///
 	/// This method is used by the gRPC implementation to perform channel
diff --git a/src/murmur/ServerUser.cpp b/src/murmur/ServerUser.cpp
index 42a9782d2..b1ee0e27f 100644
--- a/src/murmur/ServerUser.cpp
+++ b/src/murmur/ServerUser.cpp
@@ -132,7 +132,7 @@ bool LeakyBucket::ratelimit(int tokens) {
 	if (elapsedMillis < 0) {
 		if (m_timer.isValid()) {
 			// By definition of a monotinic clock, this shouldn't be possible to happen.
-			// Thus if it does happen there's somthing going very wrong which is why we
+			// Thus if it does happen there's something going very wrong which is why we
 			// emit the qFatal which at the state this line here was added, will crash
 			// the server. But at least that guarantees to give us a report on the crash
 			// instead of obscure reports about the rate limiter causing all sorts of