diff --git a/source4/rpc_server/backupkey/dcesrv_backupkey.c b/source4/rpc_server/backupkey/dcesrv_backupkey.c
index d2c504ffa7d..bb849b544da 100644
--- a/source4/rpc_server/backupkey/dcesrv_backupkey.c
+++ b/source4/rpc_server/backupkey/dcesrv_backupkey.c
@@ -1165,7 +1165,7 @@ static WERROR bkrp_retrieve_client_wrap_key(struct dcesrv_call_state *dce_call,
 	NTSTATUS status;
 
 	/*
-	 * here we basicaly need to return our certificate
+	 * here we basically need to return our certificate
 	 * search for lsa secret BCKUPKEY_PREFERRED first
 	 */
 
diff --git a/source4/rpc_server/common/server_info.c b/source4/rpc_server/common/server_info.c
index 34228c3d889..ed09bc8a191 100644
--- a/source4/rpc_server/common/server_info.c
+++ b/source4/rpc_server/common/server_info.c
@@ -230,7 +230,7 @@ struct ldb_context *dcesrv_samdb_connect_session_info(
 
 	/*
 	 * We need to make sure every argument
-	 * stays arround for the lifetime of 'samdb',
+	 * stays around for the lifetime of 'samdb',
 	 * typically it is allocated on the scope of
 	 * an assoc group, so we can't reference dce_call->conn,
 	 * as the assoc group may stay when the current connection
diff --git a/source4/rpc_server/dnsserver/dnsdata.c b/source4/rpc_server/dnsserver/dnsdata.c
index 65f55864257..e6d35fc00fc 100644
--- a/source4/rpc_server/dnsserver/dnsdata.c
+++ b/source4/rpc_server/dnsserver/dnsdata.c
@@ -664,7 +664,7 @@ fail_nomemory:
 	return WERR_NOT_ENOUGH_MEMORY;
 }
 
-/* Intialize tree with given name as the root */
+/* Initialize tree with given name as the root */
 static struct dns_tree *dns_tree_init(TALLOC_CTX *mem_ctx, const char *name, void *data)
 {
 	struct dns_tree *tree;
diff --git a/source4/rpc_server/drsuapi/dcesrv_drsuapi.c b/source4/rpc_server/drsuapi/dcesrv_drsuapi.c
index 2db0f9a4622..377cae41dd4 100644
--- a/source4/rpc_server/drsuapi/dcesrv_drsuapi.c
+++ b/source4/rpc_server/drsuapi/dcesrv_drsuapi.c
@@ -150,7 +150,7 @@ static WERROR dcesrv_drsuapi_DsBind(struct dcesrv_call_state *dce_call, TALLOC_C
 
 	/*
 	 * The "process identifier" of the client.
-	 * According to the WSPP docs, sectin 5.35, this is
+	 * According to the WSPP docs, section 5.35, this is
 	 * for informational and debugging purposes only.
 	 * The assignment is implementation specific.
 	 */
diff --git a/source4/rpc_server/drsuapi/getncchanges.c b/source4/rpc_server/drsuapi/getncchanges.c
index 3ce2a896950..2c95b33e822 100644
--- a/source4/rpc_server/drsuapi/getncchanges.c
+++ b/source4/rpc_server/drsuapi/getncchanges.c
@@ -761,7 +761,7 @@ static WERROR get_nc_changes_add_la(TALLOC_CTX *mem_ctx,
 		v = ldb_msg_find_attr_as_string(msg, "isDeleted", "FALSE");
 		if (strncmp(v, "TRUE", 4) == 0) {
 			/*
-			  * Note: we skip the transmition of the deleted link even if the other part used to
+			  * Note: we skip the transmission of the deleted link even if the other part used to
 			  * know about it because when we transmit the deletion of the object, the link will
 			  * be deleted too due to deletion of object where link points and Windows do so.
 			  */
@@ -769,7 +769,7 @@ static WERROR get_nc_changes_add_la(TALLOC_CTX *mem_ctx,
 				v = ldb_msg_find_attr_as_string(msg, "isRecycled", "FALSE");
 				/*
 				 * On Windows 2008R2 isRecycled is always present even if FL or DL are < FL 2K8R2
-				 * if it join an existing domain with deleted objets, it firsts impose to have a
+				 * if it join an existing domain with deleted objects, it firsts impose to have a
 				 * schema with the is-Recycled object and for all deleted objects it adds the isRecycled
 				 * either during initial replication or after the getNCChanges.
 				 * Behavior of samba has been changed to always have this attribute if it's present in the schema.
@@ -1945,7 +1945,7 @@ static void dcesrv_drsuapi_update_highwatermark(const struct ldb_message *msg,
 		 *
 		 * If this object has changed lately we better
 		 * let the destination dsa refetch the change.
-		 * This is better than the risk of loosing some
+		 * This is better than the risk of losing some
 		 * objects or linked attributes.
 		 */
 		return;
diff --git a/source4/rpc_server/lsa/dcesrv_lsa.c b/source4/rpc_server/lsa/dcesrv_lsa.c
index c468ec0c780..50a6d6a84b0 100644
--- a/source4/rpc_server/lsa/dcesrv_lsa.c
+++ b/source4/rpc_server/lsa/dcesrv_lsa.c
@@ -2529,7 +2529,7 @@ static NTSTATUS dcesrv_lsa_CloseTrustedDomainEx(struct dcesrv_call_state *dce_ca
 					 struct lsa_CloseTrustedDomainEx *r)
 {
 	/* The result of a bad hair day from an IDL programmer?  Not
-	 * implmented in Win2k3.  You should always just lsa_Close
+	 * implemented in Win2k3.  You should always just lsa_Close
 	 * anyway. */
 	return NT_STATUS_NOT_IMPLEMENTED;
 }
@@ -3241,7 +3241,7 @@ static NTSTATUS dcesrv_lsa_CreateSecret(struct dcesrv_call_state *dce_call, TALL
 	case SECURITY_ADMINISTRATOR:
 		break;
 	default:
-		/* Users and annonymous are not allowed create secrets */
+		/* Users and anonymous are not allowed create secrets */
 		return NT_STATUS_ACCESS_DENIED;
 	}
 
@@ -3409,7 +3409,7 @@ static NTSTATUS dcesrv_lsa_OpenSecret(struct dcesrv_call_state *dce_call, TALLOC
 	case SECURITY_ADMINISTRATOR:
 		break;
 	default:
-		/* Users and annonymous are not allowed to access secrets */
+		/* Users and anonymous are not allowed to access secrets */
 		return NT_STATUS_ACCESS_DENIED;
 	}
 
@@ -3695,7 +3695,7 @@ static NTSTATUS dcesrv_lsa_QuerySecret(struct dcesrv_call_state *dce_call, TALLO
 	case SECURITY_ADMINISTRATOR:
 		break;
 	default:
-		/* Users and annonymous are not allowed to read secrets */
+		/* Users and anonymous are not allowed to read secrets */
 		return NT_STATUS_ACCESS_DENIED;
 	}
 
diff --git a/source4/rpc_server/lsa/lsa_lookup.c b/source4/rpc_server/lsa/lsa_lookup.c
index 61cb8a10a23..0082ad11925 100644
--- a/source4/rpc_server/lsa/lsa_lookup.c
+++ b/source4/rpc_server/lsa/lsa_lookup.c
@@ -663,7 +663,7 @@ NTSTATUS dcesrv_lsa_LookupSids2(struct dcesrv_call_state *dce_call,
 	return status;
 }
 
-/* A random hexidecimal number (honest!) */
+/* A random hexadecimal number (honest!) */
 #define LSA_SERVER_IMPLICIT_POLICY_STATE_MAGIC 0xc0c99e00
 
 /*
@@ -720,7 +720,7 @@ static NTSTATUS schannel_call_setup(struct dcesrv_call_state *dce_call,
 		/*
 		 * This will talloc_steal() policy_state onto the
 		 * connection, which has longer lifetime than the
-		 * immidiate caller requires
+		 * immediate caller requires
 		 */
 		status = dcesrv_iface_state_store_conn(dce_call,
 						       LSA_SERVER_IMPLICIT_POLICY_STATE_MAGIC,
diff --git a/source4/rpc_server/netlogon/dcerpc_netlogon.c b/source4/rpc_server/netlogon/dcerpc_netlogon.c
index 362fce13afe..d77d524cb28 100644
--- a/source4/rpc_server/netlogon/dcerpc_netlogon.c
+++ b/source4/rpc_server/netlogon/dcerpc_netlogon.c
@@ -217,7 +217,7 @@ static NTSTATUS dcesrv_netr_ServerAuthenticate3_check_downgrade(
 	reject_des_client = !allow_nt4_crypto;
 
 	/*
-	 * If weak cryto is disabled, do not announce that we support RC4.
+	 * If weak crypto is disabled, do not announce that we support RC4.
 	 */
 	if (lpcfg_weak_crypto(lp_ctx) == SAMBA_WEAK_CRYPTO_DISALLOWED) {
 		/* Without RC4 and DES we require AES */
@@ -494,7 +494,7 @@ static NTSTATUS dcesrv_netr_ServerAuthenticate3_helper(
 		       NETLOGON_NEG_AUTHENTICATED_RPC;
 
 	/*
-	 * If weak cryto is disabled, do not announce that we support RC4.
+	 * If weak crypto is disabled, do not announce that we support RC4.
 	 */
 	if (lpcfg_weak_crypto(dce_call->conn->dce_ctx->lp_ctx) ==
 	    SAMBA_WEAK_CRYPTO_DISALLOWED) {
@@ -1428,7 +1428,7 @@ static NTSTATUS dcesrv_netr_LogonSamLogon_base_call(struct dcesrv_netr_LogonSamL
 			return NT_STATUS_OK;
 		}
 
-		/* Until we get an implemetnation of these other packages */
+		/* Until we get an implementation of these other packages */
 		return NT_STATUS_INVALID_PARAMETER;
 	}
 	default:
@@ -1872,7 +1872,7 @@ static WERROR dcesrv_netr_GetDcName(struct dcesrv_call_state *dce_call, TALLOC_C
 		}
 
 		/*
-		 * TODO: Should we also varify that only valid
+		 * TODO: Should we also verify that only valid
 		 *       netbios name characters are used?
 		 */
 	}
@@ -2872,7 +2872,7 @@ static NTSTATUS dcesrv_netr_LogonGetDomainInfo(struct dcesrv_call_state *dce_cal
 
 		ZERO_STRUCTP(domain_info);
 
-		/* Informations about the local and trusted domains */
+		/* Information about the local and trusted domains */
 
 		status = fill_our_one_domain_info(mem_ctx,
 						  our_tdo,
diff --git a/source4/rpc_server/samr/dcesrv_samr.c b/source4/rpc_server/samr/dcesrv_samr.c
index f5c9dae7006..6f026ffabcd 100644
--- a/source4/rpc_server/samr/dcesrv_samr.c
+++ b/source4/rpc_server/samr/dcesrv_samr.c
@@ -1448,7 +1448,7 @@ static NTSTATUS dcesrv_samr_EnumDomainGroups(struct dcesrv_call_state *dce_call,
 
   This call uses transactions to ensure we don't get a new conflicting
   user while we are processing this, and to ensure the user either
-  completly exists, or does not.
+  completely exists, or does not.
 */
 static NTSTATUS dcesrv_samr_CreateUser2(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
 				 struct samr_CreateUser2 *r)
diff --git a/source4/rpc_server/srvsvc/srvsvc_ntvfs.c b/source4/rpc_server/srvsvc/srvsvc_ntvfs.c
index cbd0eb356c1..167e8f1ce74 100644
--- a/source4/rpc_server/srvsvc/srvsvc_ntvfs.c
+++ b/source4/rpc_server/srvsvc/srvsvc_ntvfs.c
@@ -66,7 +66,7 @@ NTSTATUS srvsvc_create_ntvfs_context(struct dcesrv_call_state *dce_call,
 		return status;
 	}
 
-#if 0 /* TODO: fix access cecking */
+#if 0 /* TODO: fix access checking */
 	if (!socket_check_access(dce_call->connection->socket, 
 				 scfg->name, 
 				 share_string_list_option(scfg, SHARE_HOSTS_ALLOW), 
@@ -107,7 +107,7 @@ NTSTATUS srvsvc_create_ntvfs_context(struct dcesrv_call_state *dce_call,
 	talloc_set_destructor(c, srvsvc_ntvfs_ctx_destructor);
 
 	/*
-	 * NOTE: we only set the addr callbacks as we're not interesseted in oplocks or in getting file handles
+	 * NOTE: we only set the addr callbacks as we're not interested in oplocks or in getting file handles
 	 */
 	local_address = dcesrv_connection_get_local_address(dce_call->conn);
 	remote_address = dcesrv_connection_get_remote_address(dce_call->conn);
diff --git a/source4/rpc_server/wkssvc/dcesrv_wkssvc.c b/source4/rpc_server/wkssvc/dcesrv_wkssvc.c
index 2c0ba816d8a..f638471824b 100644
--- a/source4/rpc_server/wkssvc/dcesrv_wkssvc.c
+++ b/source4/rpc_server/wkssvc/dcesrv_wkssvc.c
@@ -35,7 +35,7 @@ static WERROR dcesrv_wkssvc_NetWkstaGetInfo(struct dcesrv_call_state *dce_call,
 	struct dcesrv_context *dce_ctx = dce_call->conn->dce_ctx;
 	struct dcerpc_server_info *server_info = lpcfg_dcerpc_server_info(mem_ctx, dce_ctx->lp_ctx);
 
-	/* NOTE: win2k3 ignores r->in.server_name completly so we do --metze */
+	/* NOTE: win2k3 ignores r->in.server_name completely so we do --metze */
 
 	switch(r->in.level) {
 	case 100: