diff --git a/src/NLog/Config/ConfigurationItemFactory.cs b/src/NLog/Config/ConfigurationItemFactory.cs
index a9322b78b0..202cd79bbc 100644
--- a/src/NLog/Config/ConfigurationItemFactory.cs
+++ b/src/NLog/Config/ConfigurationItemFactory.cs
@@ -199,7 +199,7 @@ public IValueFormatter ValueFormatter
         public IPropertyTypeConverter PropertyTypeConverter { get; set; } = new PropertyTypeConverter();
 
         /// <summary>
-        /// Perform mesage template parsing and formatting of LogEvent messages (True = Always, False = Never, Null = Auto Detect)
+        /// Perform message template parsing and formatting of LogEvent messages (True = Always, False = Never, Null = Auto Detect)
         /// </summary>
         /// <remarks>
         /// - Null (Auto Detect) : NLog-parser checks <see cref="LogEventInfo.Message"/> for positional parameters, and will then fallback to string.Format-rendering.
diff --git a/src/NLog/Layouts/JsonAttribute.cs b/src/NLog/Layouts/JsonAttribute.cs
index 599587eef4..c6da83d9ca 100644
--- a/src/NLog/Layouts/JsonAttribute.cs
+++ b/src/NLog/Layouts/JsonAttribute.cs
@@ -89,7 +89,7 @@ public Layout Layout
         }
 
         /// <summary>
-        /// Determines wether or not this attribute will be Json encoded.
+        /// Determines whether or not this attribute will be Json encoded.
         /// </summary>
         /// <docgen category='JSON Attribute Options' order='100' />
         public bool Encode
diff --git a/src/NLog/Layouts/XmlAttribute.cs b/src/NLog/Layouts/XmlAttribute.cs
index b4d629510d..64b3a72ee3 100644
--- a/src/NLog/Layouts/XmlAttribute.cs
+++ b/src/NLog/Layouts/XmlAttribute.cs
@@ -93,7 +93,7 @@ public Layout Layout
         }
 
         /// <summary>
-        /// Determines wether or not this attribute will be Xml encoded.
+        /// Determines whether or not this attribute will be Xml encoded.
         /// </summary>
         /// <docgen category='XML Attribute Options' order='100' />
         [DefaultValue(true)]
diff --git a/src/NLog/Layouts/XmlElement.cs b/src/NLog/Layouts/XmlElement.cs
index cb2fbeb533..1b80802b7a 100644
--- a/src/NLog/Layouts/XmlElement.cs
+++ b/src/NLog/Layouts/XmlElement.cs
@@ -77,7 +77,7 @@ public Layout Value
         }
 
         /// <summary>
-        /// Determines wether or not this attribute will be Xml encoded.
+        /// Determines whether or not this attribute will be Xml encoded.
         /// </summary>
         [DefaultValue(true)]
         public bool Encode
diff --git a/src/NLog/Layouts/XmlLayout.cs b/src/NLog/Layouts/XmlLayout.cs
index 771f84a238..b0b9093d93 100644
--- a/src/NLog/Layouts/XmlLayout.cs
+++ b/src/NLog/Layouts/XmlLayout.cs
@@ -82,7 +82,7 @@ public Layout ElementValue
         }
 
         /// <summary>
-        /// Determines wether or not this attribute will be Xml encoded.
+        /// Determines whether or not this attribute will be Xml encoded.
         /// </summary>
         /// <docgen category='XML Options' order='100' />
         [DefaultValue(true)]
diff --git a/src/NLog/MessageTemplates/Template.cs b/src/NLog/MessageTemplates/Template.cs
index 9eb6637a2f..73048c8869 100644
--- a/src/NLog/MessageTemplates/Template.cs
+++ b/src/NLog/MessageTemplates/Template.cs
@@ -38,7 +38,7 @@
 namespace NLog.MessageTemplates
 {
     /// <summary>
-    /// A mesage template
+    /// A message template
     /// </summary>
     internal class Template
     {
diff --git a/src/NLog/Targets/DatabaseParameterInfo.cs b/src/NLog/Targets/DatabaseParameterInfo.cs
index 155b30f358..486e178cf4 100644
--- a/src/NLog/Targets/DatabaseParameterInfo.cs
+++ b/src/NLog/Targets/DatabaseParameterInfo.cs
@@ -78,7 +78,7 @@ public DatabaseParameterInfo(string parameterName, Layout parameterLayout)
         public string Name { get; set; }
 
         /// <summary>
-        /// Gets or sets the layout that should be use to calcuate the value for the parameter.
+        /// Gets or sets the layout that should be use to calculate the value for the parameter.
         /// </summary>
         /// <docgen category='Parameter Options' order='1' />
         [RequiredParameter]
diff --git a/src/NLog/Targets/FileTarget.cs b/src/NLog/Targets/FileTarget.cs
index 4e1a371700..3326bc18ab 100644
--- a/src/NLog/Targets/FileTarget.cs
+++ b/src/NLog/Targets/FileTarget.cs
@@ -709,7 +709,7 @@ public bool EnableArchiveFileCompression
 
 #if SupportsMutex
         /// <summary>
-        /// Gets or sets a value indicationg whether file creation calls should be synchronized by a system global mutex.
+        /// Gets or sets a value indicating whether file creation calls should be synchronized by a system global mutex.
         /// </summary>
         /// <docgen category='Output Options' order='10' />
         [DefaultValue(false)]
diff --git a/src/NLog/Targets/NLogViewerParameterInfo.cs b/src/NLog/Targets/NLogViewerParameterInfo.cs
index d4a5fe1335..fb82df55eb 100644
--- a/src/NLog/Targets/NLogViewerParameterInfo.cs
+++ b/src/NLog/Targets/NLogViewerParameterInfo.cs
@@ -60,7 +60,7 @@ public NLogViewerParameterInfo()
         public string Name { get; set; }
 
         /// <summary>
-        /// Gets or sets the layout that should be use to calcuate the value for the parameter.
+        /// Gets or sets the layout that should be use to calculate the value for the parameter.
         /// </summary>
         /// <docgen category='Parameter Options' order='10' />
         [RequiredParameter]
diff --git a/src/NLog/Targets/NetworkTargetConnectionsOverflowAction.cs b/src/NLog/Targets/NetworkTargetConnectionsOverflowAction.cs
index 249753f396..32228481fc 100644
--- a/src/NLog/Targets/NetworkTargetConnectionsOverflowAction.cs
+++ b/src/NLog/Targets/NetworkTargetConnectionsOverflowAction.cs
@@ -45,7 +45,7 @@ public enum NetworkTargetConnectionsOverflowAction
         /// <summary>
         /// Just allow it.
         /// </summary>
-        AllowNewConnnection,
+        AllowNewConnnection, //TODO Nlog 5 - fix typo and obsolete this one
 
         /// <summary>
         /// Discard the connection item.
diff --git a/tools/MakeNLogXSD/TemplateXSD.xml b/tools/MakeNLogXSD/TemplateXSD.xml
index 713dc6dfa0..62eee0c0c0 100644
--- a/tools/MakeNLogXSD/TemplateXSD.xml
+++ b/tools/MakeNLogXSD/TemplateXSD.xml
@@ -78,7 +78,7 @@
     </xs:attribute>
     <xs:attribute name="parseMessageTemplates" type="xs:boolean">
       <xs:annotation>
-        <xs:documentation>Perform mesage template parsing and formatting of LogEvent messages (true = Always, false = Never, empty = Auto Detect). Default value is: empty.</xs:documentation>
+        <xs:documentation>Perform message template parsing and formatting of LogEvent messages (true = Always, false = Never, empty = Auto Detect). Default value is: empty.</xs:documentation>
       </xs:annotation>
     </xs:attribute>
   </xs:complexType>