From ad01b0781ee098c41e148f48c202aeb93e077ee1 Mon Sep 17 00:00:00 2001
From: Simon Legner <Simon.Legner@gmail.com>
Date: Mon, 18 Dec 2017 16:07:58 +0100
Subject: [PATCH 1/4] Fix typo "excpae"

---
 docs/docs/reference/check/CheckHelpers.md     |  4 +--
 docs/docs/reference/check/CheckLogFile.md     |  4 +--
 docs/docs/reference/check/CheckNSCP.md        |  4 +--
 docs/docs/reference/misc/CheckNet.md          |  4 +--
 docs/docs/reference/unix/CheckSystemUnix.md   | 12 +++----
 docs/docs/reference/windows/CheckDisk.md      |  8 ++---
 docs/docs/reference/windows/CheckEventLog.md  |  4 +--
 docs/docs/reference/windows/CheckSystem.md    | 36 +++++++++----------
 docs/docs/reference/windows/CheckTaskSched.md |  4 +--
 docs/docs/reference/windows/CheckWMI.md       |  4 +--
 include/parsers/filter/cli_helper.hpp         |  4 +--
 11 files changed, 44 insertions(+), 44 deletions(-)

diff --git a/docs/docs/reference/check/CheckHelpers.md b/docs/docs/reference/check/CheckHelpers.md
index f9ea00db9..3aa1000e5 100644
--- a/docs/docs/reference/check/CheckHelpers.md
+++ b/docs/docs/reference/check/CheckHelpers.md
@@ -580,7 +580,7 @@ TODO: obj ( key: value; key: value) obj (key:valuer;key:value)
 
 Top level syntax.
 Used to format the message to return can include text as well as special keywords which will include information from the checks.
-To add a keyword to the message you can use two syntaxes either ${keyword} or %(keyword) (there is no difference between them apart from ${} can be difficult to excpae on linux).
+To add a keyword to the message you can use two syntaxes either ${keyword} or %(keyword) (there is no difference between them apart from ${} can be difficult to escape on linux).
 
 *Default Value:* `%(status): %(message) %(list)`
 
@@ -602,7 +602,7 @@ DEPRECATED! This is the syntax for when nothing matches the filter.
 Detail level syntax.
 Used to format each resulting item in the message.
 %(list) will be replaced with all the items formated by this syntax string in the top-syntax.
-To add a keyword to the message you can use two syntaxes either ${keyword} or %(keyword) (there is no difference between them apart from ${} can be difficult to excpae on linux).
+To add a keyword to the message you can use two syntaxes either ${keyword} or %(keyword) (there is no difference between them apart from ${} can be difficult to escape on linux).
 
 *Default Value:* `%(key)	%(value)	%(unit)	%(warn)	%(crit)	%(min)	%(max)
 `
diff --git a/docs/docs/reference/check/CheckLogFile.md b/docs/docs/reference/check/CheckLogFile.md
index 450c08487..083fb73c8 100644
--- a/docs/docs/reference/check/CheckLogFile.md
+++ b/docs/docs/reference/check/CheckLogFile.md
@@ -134,7 +134,7 @@ TODO: obj ( key: value; key: value) obj (key:valuer;key:value)
 
 Top level syntax.
 Used to format the message to return can include text as well as special keywords which will include information from the checks.
-To add a keyword to the message you can use two syntaxes either ${keyword} or %(keyword) (there is no difference between them apart from ${} can be difficult to excpae on linux).
+To add a keyword to the message you can use two syntaxes either ${keyword} or %(keyword) (there is no difference between them apart from ${} can be difficult to escape on linux).
 
 *Default Value:* `${count}/${total} (${problem_list})`
 
@@ -157,7 +157,7 @@ DEPRECATED! This is the syntax for when nothing matches the filter.
 Detail level syntax.
 Used to format each resulting item in the message.
 %(list) will be replaced with all the items formated by this syntax string in the top-syntax.
-To add a keyword to the message you can use two syntaxes either ${keyword} or %(keyword) (there is no difference between them apart from ${} can be difficult to excpae on linux).
+To add a keyword to the message you can use two syntaxes either ${keyword} or %(keyword) (there is no difference between them apart from ${} can be difficult to escape on linux).
 
 *Default Value:* `${column1}`
 
diff --git a/docs/docs/reference/check/CheckNSCP.md b/docs/docs/reference/check/CheckNSCP.md
index 3378b2b31..5f8c17e87 100644
--- a/docs/docs/reference/check/CheckNSCP.md
+++ b/docs/docs/reference/check/CheckNSCP.md
@@ -145,7 +145,7 @@ TODO: obj ( key: value; key: value) obj (key:valuer;key:value)
 
 Top level syntax.
 Used to format the message to return can include text as well as special keywords which will include information from the checks.
-To add a keyword to the message you can use two syntaxes either ${keyword} or %(keyword) (there is no difference between them apart from ${} can be difficult to excpae on linux).
+To add a keyword to the message you can use two syntaxes either ${keyword} or %(keyword) (there is no difference between them apart from ${} can be difficult to escape on linux).
 
 *Default Value:* `${status}: ${list}`
 
@@ -167,7 +167,7 @@ DEPRECATED! This is the syntax for when nothing matches the filter.
 Detail level syntax.
 Used to format each resulting item in the message.
 %(list) will be replaced with all the items formated by this syntax string in the top-syntax.
-To add a keyword to the message you can use two syntaxes either ${keyword} or %(keyword) (there is no difference between them apart from ${} can be difficult to excpae on linux).
+To add a keyword to the message you can use two syntaxes either ${keyword} or %(keyword) (there is no difference between them apart from ${} can be difficult to escape on linux).
 
 *Default Value:* `${version} (${date})`
 
diff --git a/docs/docs/reference/misc/CheckNet.md b/docs/docs/reference/misc/CheckNet.md
index 7ccb23029..1b85b8639 100644
--- a/docs/docs/reference/misc/CheckNet.md
+++ b/docs/docs/reference/misc/CheckNet.md
@@ -125,7 +125,7 @@ TODO: obj ( key: value; key: value) obj (key:valuer;key:value)
 
 Top level syntax.
 Used to format the message to return can include text as well as special keywords which will include information from the checks.
-To add a keyword to the message you can use two syntaxes either ${keyword} or %(keyword) (there is no difference between them apart from ${} can be difficult to excpae on linux).
+To add a keyword to the message you can use two syntaxes either ${keyword} or %(keyword) (there is no difference between them apart from ${} can be difficult to escape on linux).
 
 *Default Value:* `${status}: ${ok_count}/${count} (${problem_list})`
 
@@ -149,7 +149,7 @@ DEPRECATED! This is the syntax for when nothing matches the filter.
 Detail level syntax.
 Used to format each resulting item in the message.
 %(list) will be replaced with all the items formated by this syntax string in the top-syntax.
-To add a keyword to the message you can use two syntaxes either ${keyword} or %(keyword) (there is no difference between them apart from ${} can be difficult to excpae on linux).
+To add a keyword to the message you can use two syntaxes either ${keyword} or %(keyword) (there is no difference between them apart from ${} can be difficult to escape on linux).
 
 *Default Value:* `${ip} Packet loss = ${loss}%, RTA = ${time}ms`
 
diff --git a/docs/docs/reference/unix/CheckSystemUnix.md b/docs/docs/reference/unix/CheckSystemUnix.md
index 2c69126ea..7be554b97 100644
--- a/docs/docs/reference/unix/CheckSystemUnix.md
+++ b/docs/docs/reference/unix/CheckSystemUnix.md
@@ -194,7 +194,7 @@ TODO: obj ( key: value; key: value) obj (key:valuer;key:value)
 
 Top level syntax.
 Used to format the message to return can include text as well as special keywords which will include information from the checks.
-To add a keyword to the message you can use two syntaxes either ${keyword} or %(keyword) (there is no difference between them apart from ${} can be difficult to excpae on linux).
+To add a keyword to the message you can use two syntaxes either ${keyword} or %(keyword) (there is no difference between them apart from ${} can be difficult to escape on linux).
 
 
 *Deafult Value:* | `${status}: ${list}`
@@ -228,7 +228,7 @@ DEPRECATED! This is the syntax for when nothing matches the filter.
 Detail level syntax.
 Used to format each resulting item in the message.
 %(list) will be replaced with all the items formated by this syntax string in the top-syntax.
-To add a keyword to the message you can use two syntaxes either ${keyword} or %(keyword) (there is no difference between them apart from ${} can be difficult to excpae on linux).
+To add a keyword to the message you can use two syntaxes either ${keyword} or %(keyword) (there is no difference between them apart from ${} can be difficult to escape on linux).
 
 
 *Deafult Value:* | `${type} = ${used}`
@@ -403,7 +403,7 @@ TODO: obj ( key: value; key: value) obj (key:valuer;key:value)
 
 Top level syntax.
 Used to format the message to return can include text as well as special keywords which will include information from the checks.
-To add a keyword to the message you can use two syntaxes either ${keyword} or %(keyword) (there is no difference between them apart from ${} can be difficult to excpae on linux).
+To add a keyword to the message you can use two syntaxes either ${keyword} or %(keyword) (there is no difference between them apart from ${} can be difficult to escape on linux).
 
 
 *Deafult Value:* | `${status}: ${list}`
@@ -437,7 +437,7 @@ DEPRECATED! This is the syntax for when nothing matches the filter.
 Detail level syntax.
 Used to format each resulting item in the message.
 %(list) will be replaced with all the items formated by this syntax string in the top-syntax.
-To add a keyword to the message you can use two syntaxes either ${keyword} or %(keyword) (there is no difference between them apart from ${} can be difficult to excpae on linux).
+To add a keyword to the message you can use two syntaxes either ${keyword} or %(keyword) (there is no difference between them apart from ${} can be difficult to escape on linux).
 
 
 *Deafult Value:* | `${version} (${major}.${minor}.${build})`
@@ -615,7 +615,7 @@ TODO: obj ( key: value; key: value) obj (key:valuer;key:value)
 
 Top level syntax.
 Used to format the message to return can include text as well as special keywords which will include information from the checks.
-To add a keyword to the message you can use two syntaxes either ${keyword} or %(keyword) (there is no difference between them apart from ${} can be difficult to excpae on linux).
+To add a keyword to the message you can use two syntaxes either ${keyword} or %(keyword) (there is no difference between them apart from ${} can be difficult to escape on linux).
 
 
 *Deafult Value:* | `${status}: ${list}`
@@ -649,7 +649,7 @@ DEPRECATED! This is the syntax for when nothing matches the filter.
 Detail level syntax.
 Used to format each resulting item in the message.
 %(list) will be replaced with all the items formated by this syntax string in the top-syntax.
-To add a keyword to the message you can use two syntaxes either ${keyword} or %(keyword) (there is no difference between them apart from ${} can be difficult to excpae on linux).
+To add a keyword to the message you can use two syntaxes either ${keyword} or %(keyword) (there is no difference between them apart from ${} can be difficult to escape on linux).
 
 
 *Deafult Value:* | `uptime: ${uptime}h, boot: ${boot} (UTC)`
diff --git a/docs/docs/reference/windows/CheckDisk.md b/docs/docs/reference/windows/CheckDisk.md
index d870c9ca3..31708eb6d 100644
--- a/docs/docs/reference/windows/CheckDisk.md
+++ b/docs/docs/reference/windows/CheckDisk.md
@@ -213,7 +213,7 @@ TODO: obj ( key: value; key: value) obj (key:valuer;key:value)
 
 Top level syntax.
 Used to format the message to return can include text as well as special keywords which will include information from the checks.
-To add a keyword to the message you can use two syntaxes either ${keyword} or %(keyword) (there is no difference between them apart from ${} can be difficult to excpae on linux).
+To add a keyword to the message you can use two syntaxes either ${keyword} or %(keyword) (there is no difference between them apart from ${} can be difficult to escape on linux).
 
 *Default Value:* `${status} ${problem_list}`
 
@@ -237,7 +237,7 @@ DEPRECATED! This is the syntax for when nothing matches the filter.
 Detail level syntax.
 Used to format each resulting item in the message.
 %(list) will be replaced with all the items formated by this syntax string in the top-syntax.
-To add a keyword to the message you can use two syntaxes either ${keyword} or %(keyword) (there is no difference between them apart from ${} can be difficult to excpae on linux).
+To add a keyword to the message you can use two syntaxes either ${keyword} or %(keyword) (there is no difference between them apart from ${} can be difficult to escape on linux).
 
 *Default Value:* `${drive_or_name}: ${used}/${size} used`
 
@@ -455,7 +455,7 @@ TODO: obj ( key: value; key: value) obj (key:valuer;key:value)
 
 Top level syntax.
 Used to format the message to return can include text as well as special keywords which will include information from the checks.
-To add a keyword to the message you can use two syntaxes either ${keyword} or %(keyword) (there is no difference between them apart from ${} can be difficult to excpae on linux).
+To add a keyword to the message you can use two syntaxes either ${keyword} or %(keyword) (there is no difference between them apart from ${} can be difficult to escape on linux).
 
 *Default Value:* `${status}: ${problem_count}/${count} files (${problem_list})`
 
@@ -479,7 +479,7 @@ DEPRECATED! This is the syntax for when nothing matches the filter.
 Detail level syntax.
 Used to format each resulting item in the message.
 %(list) will be replaced with all the items formated by this syntax string in the top-syntax.
-To add a keyword to the message you can use two syntaxes either ${keyword} or %(keyword) (there is no difference between them apart from ${} can be difficult to excpae on linux).
+To add a keyword to the message you can use two syntaxes either ${keyword} or %(keyword) (there is no difference between them apart from ${} can be difficult to escape on linux).
 
 *Default Value:* `${name}`
 
diff --git a/docs/docs/reference/windows/CheckEventLog.md b/docs/docs/reference/windows/CheckEventLog.md
index c1fd3586e..463d1419d 100644
--- a/docs/docs/reference/windows/CheckEventLog.md
+++ b/docs/docs/reference/windows/CheckEventLog.md
@@ -329,7 +329,7 @@ Used to filter unique items (counted will still increase but messages will not r
 
 Top level syntax.
 Used to format the message to return can include text as well as special keywords which will include information from the checks.
-To add a keyword to the message you can use two syntaxes either ${keyword} or %(keyword) (there is no difference between them apart from ${} can be difficult to excpae on linux).
+To add a keyword to the message you can use two syntaxes either ${keyword} or %(keyword) (there is no difference between them apart from ${} can be difficult to escape on linux).
 
 *Default Value:* `${status}: ${count} message(s) ${problem_list}`
 
@@ -353,7 +353,7 @@ DEPRECATED! This is the syntax for when nothing matches the filter.
 Detail level syntax.
 Used to format each resulting item in the message.
 %(list) will be replaced with all the items formated by this syntax string in the top-syntax.
-To add a keyword to the message you can use two syntaxes either ${keyword} or %(keyword) (there is no difference between them apart from ${} can be difficult to excpae on linux).
+To add a keyword to the message you can use two syntaxes either ${keyword} or %(keyword) (there is no difference between them apart from ${} can be difficult to escape on linux).
 
 *Default Value:* `${file} ${source} (${message})`
 
diff --git a/docs/docs/reference/windows/CheckSystem.md b/docs/docs/reference/windows/CheckSystem.md
index a8b164bff..1051b68aa 100644
--- a/docs/docs/reference/windows/CheckSystem.md
+++ b/docs/docs/reference/windows/CheckSystem.md
@@ -182,7 +182,7 @@ TODO: obj ( key: value; key: value) obj (key:valuer;key:value)
 
 Top level syntax.
 Used to format the message to return can include text as well as special keywords which will include information from the checks.
-To add a keyword to the message you can use two syntaxes either ${keyword} or %(keyword) (there is no difference between them apart from ${} can be difficult to excpae on linux).
+To add a keyword to the message you can use two syntaxes either ${keyword} or %(keyword) (there is no difference between them apart from ${} can be difficult to escape on linux).
 
 *Default Value:* `${status}: ${problem_list}`
 
@@ -205,7 +205,7 @@ DEPRECATED! This is the syntax for when nothing matches the filter.
 Detail level syntax.
 Used to format each resulting item in the message.
 %(list) will be replaced with all the items formated by this syntax string in the top-syntax.
-To add a keyword to the message you can use two syntaxes either ${keyword} or %(keyword) (there is no difference between them apart from ${} can be difficult to excpae on linux).
+To add a keyword to the message you can use two syntaxes either ${keyword} or %(keyword) (there is no difference between them apart from ${} can be difficult to escape on linux).
 
 *Default Value:* `${time}: ${load}%`
 
@@ -390,7 +390,7 @@ TODO: obj ( key: value; key: value) obj (key:valuer;key:value)
 
 Top level syntax.
 Used to format the message to return can include text as well as special keywords which will include information from the checks.
-To add a keyword to the message you can use two syntaxes either ${keyword} or %(keyword) (there is no difference between them apart from ${} can be difficult to excpae on linux).
+To add a keyword to the message you can use two syntaxes either ${keyword} or %(keyword) (there is no difference between them apart from ${} can be difficult to escape on linux).
 
 *Default Value:* `${status}: ${list}`
 
@@ -412,7 +412,7 @@ DEPRECATED! This is the syntax for when nothing matches the filter.
 Detail level syntax.
 Used to format each resulting item in the message.
 %(list) will be replaced with all the items formated by this syntax string in the top-syntax.
-To add a keyword to the message you can use two syntaxes either ${keyword} or %(keyword) (there is no difference between them apart from ${} can be difficult to excpae on linux).
+To add a keyword to the message you can use two syntaxes either ${keyword} or %(keyword) (there is no difference between them apart from ${} can be difficult to escape on linux).
 
 *Default Value:* `${type} = ${used}`
 
@@ -548,7 +548,7 @@ TODO: obj ( key: value; key: value) obj (key:valuer;key:value)
 
 Top level syntax.
 Used to format the message to return can include text as well as special keywords which will include information from the checks.
-To add a keyword to the message you can use two syntaxes either ${keyword} or %(keyword) (there is no difference between them apart from ${} can be difficult to excpae on linux).
+To add a keyword to the message you can use two syntaxes either ${keyword} or %(keyword) (there is no difference between them apart from ${} can be difficult to escape on linux).
 
 *Default Value:* `${status}: ${list}`
 
@@ -571,7 +571,7 @@ DEPRECATED! This is the syntax for when nothing matches the filter.
 Detail level syntax.
 Used to format each resulting item in the message.
 %(list) will be replaced with all the items formated by this syntax string in the top-syntax.
-To add a keyword to the message you can use two syntaxes either ${keyword} or %(keyword) (there is no difference between them apart from ${} can be difficult to excpae on linux).
+To add a keyword to the message you can use two syntaxes either ${keyword} or %(keyword) (there is no difference between them apart from ${} can be difficult to escape on linux).
 
 *Default Value:* `${name} >${sent} <${received} bps`
 
@@ -737,7 +737,7 @@ TODO: obj ( key: value; key: value) obj (key:valuer;key:value)
 
 Top level syntax.
 Used to format the message to return can include text as well as special keywords which will include information from the checks.
-To add a keyword to the message you can use two syntaxes either ${keyword} or %(keyword) (there is no difference between them apart from ${} can be difficult to excpae on linux).
+To add a keyword to the message you can use two syntaxes either ${keyword} or %(keyword) (there is no difference between them apart from ${} can be difficult to escape on linux).
 
 *Default Value:* `${status}: ${list}`
 
@@ -759,7 +759,7 @@ DEPRECATED! This is the syntax for when nothing matches the filter.
 Detail level syntax.
 Used to format each resulting item in the message.
 %(list) will be replaced with all the items formated by this syntax string in the top-syntax.
-To add a keyword to the message you can use two syntaxes either ${keyword} or %(keyword) (there is no difference between them apart from ${} can be difficult to excpae on linux).
+To add a keyword to the message you can use two syntaxes either ${keyword} or %(keyword) (there is no difference between them apart from ${} can be difficult to escape on linux).
 
 *Default Value:* `${version} (${major}.${minor}.${build})`
 
@@ -940,7 +940,7 @@ TODO: obj ( key: value; key: value) obj (key:valuer;key:value)
 
 Top level syntax.
 Used to format the message to return can include text as well as special keywords which will include information from the checks.
-To add a keyword to the message you can use two syntaxes either ${keyword} or %(keyword) (there is no difference between them apart from ${} can be difficult to excpae on linux).
+To add a keyword to the message you can use two syntaxes either ${keyword} or %(keyword) (there is no difference between them apart from ${} can be difficult to escape on linux).
 
 *Default Value:* `${status}: ${list}`
 
@@ -962,7 +962,7 @@ DEPRECATED! This is the syntax for when nothing matches the filter.
 Detail level syntax.
 Used to format each resulting item in the message.
 %(list) will be replaced with all the items formated by this syntax string in the top-syntax.
-To add a keyword to the message you can use two syntaxes either ${keyword} or %(keyword) (there is no difference between them apart from ${} can be difficult to excpae on linux).
+To add a keyword to the message you can use two syntaxes either ${keyword} or %(keyword) (there is no difference between them apart from ${} can be difficult to escape on linux).
 
 *Default Value:* `${name} ${used} (${size})`
 
@@ -1187,7 +1187,7 @@ TODO: obj ( key: value; key: value) obj (key:valuer;key:value)
 
 Top level syntax.
 Used to format the message to return can include text as well as special keywords which will include information from the checks.
-To add a keyword to the message you can use two syntaxes either ${keyword} or %(keyword) (there is no difference between them apart from ${} can be difficult to excpae on linux).
+To add a keyword to the message you can use two syntaxes either ${keyword} or %(keyword) (there is no difference between them apart from ${} can be difficult to escape on linux).
 
 *Default Value:* `${status}: ${list}`
 
@@ -1209,7 +1209,7 @@ DEPRECATED! This is the syntax for when nothing matches the filter.
 Detail level syntax.
 Used to format each resulting item in the message.
 %(list) will be replaced with all the items formated by this syntax string in the top-syntax.
-To add a keyword to the message you can use two syntaxes either ${keyword} or %(keyword) (there is no difference between them apart from ${} can be difficult to excpae on linux).
+To add a keyword to the message you can use two syntaxes either ${keyword} or %(keyword) (there is no difference between them apart from ${} can be difficult to escape on linux).
 
 *Default Value:* `${alias} = ${value}`
 
@@ -1415,7 +1415,7 @@ TODO: obj ( key: value; key: value) obj (key:valuer;key:value)
 
 Top level syntax.
 Used to format the message to return can include text as well as special keywords which will include information from the checks.
-To add a keyword to the message you can use two syntaxes either ${keyword} or %(keyword) (there is no difference between them apart from ${} can be difficult to excpae on linux).
+To add a keyword to the message you can use two syntaxes either ${keyword} or %(keyword) (there is no difference between them apart from ${} can be difficult to escape on linux).
 
 *Default Value:* `${status}: ${problem_list}`
 
@@ -1439,7 +1439,7 @@ DEPRECATED! This is the syntax for when nothing matches the filter.
 Detail level syntax.
 Used to format each resulting item in the message.
 %(list) will be replaced with all the items formated by this syntax string in the top-syntax.
-To add a keyword to the message you can use two syntaxes either ${keyword} or %(keyword) (there is no difference between them apart from ${} can be difficult to excpae on linux).
+To add a keyword to the message you can use two syntaxes either ${keyword} or %(keyword) (there is no difference between them apart from ${} can be difficult to escape on linux).
 
 *Default Value:* `${exe}=${state}`
 
@@ -1690,7 +1690,7 @@ TODO: obj ( key: value; key: value) obj (key:valuer;key:value)
 
 Top level syntax.
 Used to format the message to return can include text as well as special keywords which will include information from the checks.
-To add a keyword to the message you can use two syntaxes either ${keyword} or %(keyword) (there is no difference between them apart from ${} can be difficult to excpae on linux).
+To add a keyword to the message you can use two syntaxes either ${keyword} or %(keyword) (there is no difference between them apart from ${} can be difficult to escape on linux).
 
 *Default Value:* `${status}: ${crit_list}, delayed (${warn_list})`
 
@@ -1714,7 +1714,7 @@ DEPRECATED! This is the syntax for when nothing matches the filter.
 Detail level syntax.
 Used to format each resulting item in the message.
 %(list) will be replaced with all the items formated by this syntax string in the top-syntax.
-To add a keyword to the message you can use two syntaxes either ${keyword} or %(keyword) (there is no difference between them apart from ${} can be difficult to excpae on linux).
+To add a keyword to the message you can use two syntaxes either ${keyword} or %(keyword) (there is no difference between them apart from ${} can be difficult to escape on linux).
 
 *Default Value:* `${name}=${state} (${start_type})`
 
@@ -1896,7 +1896,7 @@ TODO: obj ( key: value; key: value) obj (key:valuer;key:value)
 
 Top level syntax.
 Used to format the message to return can include text as well as special keywords which will include information from the checks.
-To add a keyword to the message you can use two syntaxes either ${keyword} or %(keyword) (there is no difference between them apart from ${} can be difficult to excpae on linux).
+To add a keyword to the message you can use two syntaxes either ${keyword} or %(keyword) (there is no difference between them apart from ${} can be difficult to escape on linux).
 
 *Default Value:* `${status}: ${list}`
 
@@ -1918,7 +1918,7 @@ DEPRECATED! This is the syntax for when nothing matches the filter.
 Detail level syntax.
 Used to format each resulting item in the message.
 %(list) will be replaced with all the items formated by this syntax string in the top-syntax.
-To add a keyword to the message you can use two syntaxes either ${keyword} or %(keyword) (there is no difference between them apart from ${} can be difficult to excpae on linux).
+To add a keyword to the message you can use two syntaxes either ${keyword} or %(keyword) (there is no difference between them apart from ${} can be difficult to escape on linux).
 
 *Default Value:* `uptime: ${uptime}h, boot: ${boot} (UTC)`
 
diff --git a/docs/docs/reference/windows/CheckTaskSched.md b/docs/docs/reference/windows/CheckTaskSched.md
index e305a8eec..123a712b3 100644
--- a/docs/docs/reference/windows/CheckTaskSched.md
+++ b/docs/docs/reference/windows/CheckTaskSched.md
@@ -147,7 +147,7 @@ TODO: obj ( key: value; key: value) obj (key:valuer;key:value)
 
 Top level syntax.
 Used to format the message to return can include text as well as special keywords which will include information from the checks.
-To add a keyword to the message you can use two syntaxes either ${keyword} or %(keyword) (there is no difference between them apart from ${} can be difficult to excpae on linux).
+To add a keyword to the message you can use two syntaxes either ${keyword} or %(keyword) (there is no difference between them apart from ${} can be difficult to escape on linux).
 
 *Default Value:* `${status}: ${problem_list}`
 
@@ -171,7 +171,7 @@ DEPRECATED! This is the syntax for when nothing matches the filter.
 Detail level syntax.
 Used to format each resulting item in the message.
 %(list) will be replaced with all the items formated by this syntax string in the top-syntax.
-To add a keyword to the message you can use two syntaxes either ${keyword} or %(keyword) (there is no difference between them apart from ${} can be difficult to excpae on linux).
+To add a keyword to the message you can use two syntaxes either ${keyword} or %(keyword) (there is no difference between them apart from ${} can be difficult to escape on linux).
 
 *Default Value:* `${folder}/${title}: ${exit_code} != 0`
 
diff --git a/docs/docs/reference/windows/CheckWMI.md b/docs/docs/reference/windows/CheckWMI.md
index 997ad24cf..a5a1f7b3c 100644
--- a/docs/docs/reference/windows/CheckWMI.md
+++ b/docs/docs/reference/windows/CheckWMI.md
@@ -183,7 +183,7 @@ TODO: obj ( key: value; key: value) obj (key:valuer;key:value)
 
 Top level syntax.
 Used to format the message to return can include text as well as special keywords which will include information from the checks.
-To add a keyword to the message you can use two syntaxes either ${keyword} or %(keyword) (there is no difference between them apart from ${} can be difficult to excpae on linux).
+To add a keyword to the message you can use two syntaxes either ${keyword} or %(keyword) (there is no difference between them apart from ${} can be difficult to escape on linux).
 
 *Default Value:* `${list}`
 
@@ -205,7 +205,7 @@ DEPRECATED! This is the syntax for when nothing matches the filter.
 Detail level syntax.
 Used to format each resulting item in the message.
 %(list) will be replaced with all the items formated by this syntax string in the top-syntax.
-To add a keyword to the message you can use two syntaxes either ${keyword} or %(keyword) (there is no difference between them apart from ${} can be difficult to excpae on linux).
+To add a keyword to the message you can use two syntaxes either ${keyword} or %(keyword) (there is no difference between them apart from ${} can be difficult to escape on linux).
 
 *Default Value:* `%(line)`
 
diff --git a/include/parsers/filter/cli_helper.hpp b/include/parsers/filter/cli_helper.hpp
index bf105a98e..4e32ce7cc 100644
--- a/include/parsers/filter/cli_helper.hpp
+++ b/include/parsers/filter/cli_helper.hpp
@@ -318,11 +318,11 @@ namespace modern_filter {
 		void add_syntax(const std::string &default_top_syntax, const std::string &default_detail_syntax, const std::string &default_perf_syntax, const std::string &default_empty_syntax, const std::string &default_ok_syntax) {
 			std::string tk = "Top level syntax.\n"
 				"Used to format the message to return can include text as well as special keywords which will include information from the checks.\n"
-				"To add a keyword to the message you can use two syntaxes either ${keyword} or %(keyword) (there is no difference between them apart from ${} can be difficult to excpae on linux).";
+				"To add a keyword to the message you can use two syntaxes either ${keyword} or %(keyword) (there is no difference between them apart from ${} can be difficult to escape on linux).";
 			std::string dk = "Detail level syntax.\n"
 				"Used to format each resulting item in the message.\n"
 				"%(list) will be replaced with all the items formated by this syntax string in the top-syntax.\n"
-				"To add a keyword to the message you can use two syntaxes either ${keyword} or %(keyword) (there is no difference between them apart from ${} can be difficult to excpae on linux).";
+				"To add a keyword to the message you can use two syntaxes either ${keyword} or %(keyword) (there is no difference between them apart from ${} can be difficult to escape on linux).";
 			std::string pk = "Performance alias syntax.\n"
 				"This is the syntax for the base names of the performance data.";
 			std::string ek = "Empty syntax.\n"

From 38f341fcb520a112b693213eeba3e6d39768ed95 Mon Sep 17 00:00:00 2001
From: Simon Legner <Simon.Legner@gmail.com>
Date: Mon, 18 Dec 2017 16:21:38 +0100
Subject: [PATCH 2/4] Fix typo "systes"

---
 docs/docs/reference/check/CheckMKClient.md | 2 +-
 docs/docs/reference/client/NRDPClient.md   | 2 +-
 docs/docs/reference/client/NRPEClient.md   | 2 +-
 docs/docs/reference/client/SMTPClient.md   | 2 +-
 docs/docs/reference/misc/WEBClient.md      | 4 ++--
 modules/CheckMKClient/module.json          | 2 +-
 modules/NRDPClient/module.json             | 2 +-
 modules/NRPEClient/module.json             | 2 +-
 modules/NSCPClient/module.json             | 2 +-
 modules/SMTPClient/module.json             | 2 +-
 10 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/docs/docs/reference/check/CheckMKClient.md b/docs/docs/reference/check/CheckMKClient.md
index cce37f489..a5e9805c4 100644
--- a/docs/docs/reference/check/CheckMKClient.md
+++ b/docs/docs/reference/check/CheckMKClient.md
@@ -1,6 +1,6 @@
 # CheckMKClient
 
-check_mk client can be used both from command line and from queries to check remote systes via check_mk
+check_mk client can be used both from command line and from queries to check remote systems via check_mk
 
 
 
diff --git a/docs/docs/reference/client/NRDPClient.md b/docs/docs/reference/client/NRDPClient.md
index 094f19eb9..89e852219 100644
--- a/docs/docs/reference/client/NRDPClient.md
+++ b/docs/docs/reference/client/NRDPClient.md
@@ -1,6 +1,6 @@
 # NRDPClient
 
-NRDP client can be used both from command line and from queries to check remote systes via NRDP
+NRDP client can be used both from command line and from queries to check remote systems via NRDP
 
 
 
diff --git a/docs/docs/reference/client/NRPEClient.md b/docs/docs/reference/client/NRPEClient.md
index 250e98878..2429567ae 100644
--- a/docs/docs/reference/client/NRPEClient.md
+++ b/docs/docs/reference/client/NRPEClient.md
@@ -1,6 +1,6 @@
 # NRPEClient
 
-NRPE client can be used both from command line and from queries to check remote systes via NRPE as well as configure the NRPE server
+NRPE client can be used both from command line and from queries to check remote systems via NRPE as well as configure the NRPE server
 
 
 
diff --git a/docs/docs/reference/client/SMTPClient.md b/docs/docs/reference/client/SMTPClient.md
index e537d7590..715e214fe 100644
--- a/docs/docs/reference/client/SMTPClient.md
+++ b/docs/docs/reference/client/SMTPClient.md
@@ -1,6 +1,6 @@
 # SMTPClient
 
-SMTP client can be used both from command line and from queries to check remote systes via SMTP
+SMTP client can be used both from command line and from queries to check remote systems via SMTP
 
 
 
diff --git a/docs/docs/reference/misc/WEBClient.md b/docs/docs/reference/misc/WEBClient.md
index 2fc5f82a8..1c2b2e150 100644
--- a/docs/docs/reference/misc/WEBClient.md
+++ b/docs/docs/reference/misc/WEBClient.md
@@ -1,10 +1,10 @@
 <dl>
   <dt>.. module :  : WEBClient</dt>
-  <dd>:synopsis: WEB client can be used both from command line and from queries to check remote systes via WEB(REST)</dd>
+  <dd>:synopsis: WEB client can be used both from command line and from queries to check remote systems via WEB(REST)</dd>
 </dl>
 # :module:`WEBClient` --- WEBClient #
 
-WEB client can be used both from command line and from queries to check remote systes via WEB(REST)
+WEB client can be used both from command line and from queries to check remote systems via WEB(REST)
 
 **Queries (Overview)**:
 
diff --git a/modules/CheckMKClient/module.json b/modules/CheckMKClient/module.json
index b1b5a1ea8..ac4000bda 100644
--- a/modules/CheckMKClient/module.json
+++ b/modules/CheckMKClient/module.json
@@ -1,7 +1,7 @@
 {
 	"module"		: {
 		"title"			: "check_mk Client",
-		"description"	: "check_mk client can be used both from command line and from queries to check remote systes via check_mk",
+		"description"	: "check_mk client can be used both from command line and from queries to check remote systems via check_mk",
 		"name"			: "CheckMKClient",
 		"alias"			: "check_mk",
 		"version"		: "auto"
diff --git a/modules/NRDPClient/module.json b/modules/NRDPClient/module.json
index 1b7cb0edb..8426eb561 100644
--- a/modules/NRDPClient/module.json
+++ b/modules/NRDPClient/module.json
@@ -1,7 +1,7 @@
 {
 	"module"		: {
 		"title"			: "NRDP Client",
-		"description"	: "NRDP client can be used both from command line and from queries to check remote systes via NRDP",
+		"description"	: "NRDP client can be used both from command line and from queries to check remote systems via NRDP",
 		"name"			: "NRDPClient",
 		"alias"			: "nrdp",
 		"version"		: "auto"
diff --git a/modules/NRPEClient/module.json b/modules/NRPEClient/module.json
index 77a8d80ca..74e024dee 100644
--- a/modules/NRPEClient/module.json
+++ b/modules/NRPEClient/module.json
@@ -1,7 +1,7 @@
 {
 	"module"		: {
 		"title"			: "NRPE Client",
-		"description"	: "NRPE client can be used both from command line and from queries to check remote systes via NRPE as well as configure the NRPE server",
+		"description"	: "NRPE client can be used both from command line and from queries to check remote systems via NRPE as well as configure the NRPE server",
 		"name"			: "NRPEClient",
 		"alias"			: "nrpe",
 		"version"		: "auto"
diff --git a/modules/NSCPClient/module.json b/modules/NSCPClient/module.json
index a17f804ac..6c9f15147 100644
--- a/modules/NSCPClient/module.json
+++ b/modules/NSCPClient/module.json
@@ -1,7 +1,7 @@
 {
 	"module"		: {
 		"title"			: "NSCP Client",
-		"description"	: "NSCP client can be used both from command line and from queries to check remote systes via NSCP (REST)",
+		"description"	: "NSCP client can be used both from command line and from queries to check remote systems via NSCP (REST)",
 		"name"			: "NSCPClient",
 		"alias"			: "nscp",
 		"version"		: "auto"
diff --git a/modules/SMTPClient/module.json b/modules/SMTPClient/module.json
index 80d597bf6..4bea48ebc 100644
--- a/modules/SMTPClient/module.json
+++ b/modules/SMTPClient/module.json
@@ -1,7 +1,7 @@
 {
 	"module"		: {
 		"title"			: "SMTP Client",
-		"description"		: "SMTP client can be used both from command line and from queries to check remote systes via SMTP",
+		"description"		: "SMTP client can be used both from command line and from queries to check remote systems via SMTP",
 		"name"			: "SMTPClient",
 		"alias"			: "smtp",
 		"version"		: "auto"

From 17ba1e2027734bb374af158b01b95de148286a09 Mon Sep 17 00:00:00 2001
From: Simon Legner <Simon.Legner@gmail.com>
Date: Mon, 18 Dec 2017 16:48:09 +0100
Subject: [PATCH 3/4] Fix various typos

---
 build/python/fetchdeps.py                     |  2 +-
 changelog                                     | 46 +++++++++----------
 docs/docs/api/plugin.md                       |  2 +-
 docs/docs/api/rest/queries.md                 |  2 +-
 docs/docs/extending/index.md                  | 46 +++++++++----------
 docs/docs/extending/python.md                 | 12 ++---
 docs/docs/getting_started.md                  |  6 +--
 docs/docs/howto/checks.md                     |  4 +-
 docs/docs/howto/counters.md                   |  2 +-
 docs/docs/index.md                            |  2 +-
 docs/docs/installing.md                       |  2 +-
 docs/docs/reference/check/CheckNSCP.md        |  6 +--
 docs/docs/reference/generic/LUAScript.md      |  2 +-
 docs/docs/reference/generic/Scheduler.md      |  2 +-
 docs/docs/reference/generic/SimpleCache.md    |  2 +-
 .../reference/generic/SimpleFileWriter.md     |  6 +--
 docs/docs/reference/misc/CauseCrashes.md      |  2 +-
 docs/docs/reference/unix/CheckSystemUnix.md   |  4 +-
 docs/docs/reference/windows/CheckSystem.md    | 18 ++++----
 docs/docs/settings.md                         |  2 +-
 docs/docs/tutorial/index.md                   |  4 +-
 docs/samples/CheckEventLog_samples.md         |  6 +--
 .../CheckSystem_check_memory_samples.md       |  2 +-
 .../CheckSystem_check_pagefile_samples.md     |  4 +-
 docs/samples/CheckSystem_check_pdh_samples.md |  2 +-
 .../CheckSystem_check_service_samples.md      |  2 +-
 modules/CauseCrashes/module.json              |  2 +-
 modules/CheckEventLog/filter.cpp              |  2 +-
 modules/CheckNSCP/module.json                 |  4 +-
 modules/CheckSystem/CheckSystem.cpp           |  2 +-
 modules/CheckSystem/module.json               |  4 +-
 modules/CheckSystemUnix/module.json           |  2 +-
 modules/SimpleCache/SimpleCache.cpp           |  2 +-
 modules/SimpleFileWriter/SimpleFileWriter.cpp |  6 +--
 scripts/lua/test_ext_script.lua               |  6 +--
 scripts/lua/test_nrpe.lua                     |  6 +--
 scripts/python/test_nrpe.py                   |  6 +--
 scripts/python/test_nsca.py                   |  6 +--
 scripts/python/test_nscp.py                   |  6 +--
 service/cli_parser.cpp                        |  2 +-
 service/logger/simple_file_logger.cpp         |  2 +-
 41 files changed, 124 insertions(+), 124 deletions(-)

diff --git a/build/python/fetchdeps.py b/build/python/fetchdeps.py
index 61c2e0e88..e5dc8cf3c 100755
--- a/build/python/fetchdeps.py
+++ b/build/python/fetchdeps.py
@@ -332,4 +332,4 @@ def write_config(config, target):
         options.cmake_config = config['build.folder']
     write_config(config, options.cmake_config)
 else:
-    print('WARN Since you did not specify --cmake-config we will not write the cmake config file so most likely this was not very usefull...')
+    print('WARN Since you did not specify --cmake-config we will not write the cmake config file so most likely this was not very useful...')
diff --git a/changelog b/changelog
index 3805cbaf6..cac5d41be 100644
--- a/changelog
+++ b/changelog
@@ -44,7 +44,7 @@ Hence forth change log can be found on github: https://github.com/mickem/nscp/re
  * Removed query from settings protobuf api as it was never used
  * CORE: Fixed listing unloaded modules by name
  * REST: Added POST of modules to upload them
- * REST: Fixed execute_nagios support for plain text putput and fixed return code
+ * REST: Fixed execute_nagios support for plain text output and fixed return code
  * REST: Fixed segv when parsing privileges
  * WEBServer: Fixed output from nscp web install
  * zip-modules: fixed loading zip-modules without extensions
@@ -76,8 +76,8 @@ Hence forth change log can be found on github: https://github.com/mickem/nscp/re
  * check_process: Fixed #494 empty status message
  * Events: Added proper event names
  * CheckEventLog added support for fetching xml
- * REST: added privelages to query controller
- * Fixed rendering issuein api docs
+ * REST: added privileges to query controller
+ * Fixed rendering issue in api docs
 
 2017-11-11 Michael Medin
  * Added skeleton docs for the Python API
@@ -154,7 +154,7 @@ Hence forth change log can be found on github: https://github.com/mickem/nscp/re
  * Added delete to CHeckExternalScritpts to delete scripts: nscp ext delete --script <alias> will delete the alias and nscp ext delete --script <script> will delete the script.
  * Added  scripts controller /api/v1/scripts/ext/scripts to add/remove(not yet) and update scripts.
  * modules rest API now by default shows loaded modules not available modules.
- * Future prooofed the mongoose wrapper a bit by adding an internal structure to userdata
+ * Future proofed the mongoose wrapper a bit by adding an internal structure to userdata
  * Added --import to import a script (copy) to the scripts folder
  * Added new commandline show to show script in external scripts module: "nscp ext show --script <alias>" will show the actual command execute and "nscp ext show --script <script>" will show the content of the script.
 
@@ -172,7 +172,7 @@ Hence forth change log can be found on github: https://github.com/mickem/nscp/re
 
 2017-09-05 Michael Medin
  * Fixed name of Windows 2016 server
- * check_os_version: Added %(suite) to show wich suite is installed.
+ * check_os_version: Added %(suite) to show which suite is installed.
 
 2017-08-29 Michael Medin
  * Added option to disable background checks in CheckSystem (this is not useful as it breaks things, so only use if you have issues)
@@ -201,7 +201,7 @@ Hence forth change log can be found on github: https://github.com/mickem/nscp/re
 2017-07-29 Michael Medin
  * Fixed error handling when checks crash
  * Added unit test for scheduler
- * python unittest helper lib: Added assert_gt and asser_lt to check values
+ * python unittest helper lib: Added assert_gt and assert_lt to check values
  * Added --show-all to nscp unit to show all results of the testcase (not just failed ones)
  * Fixed rare crash when logger shuts down
  * Fixed rare crash when scheduler shuts down
@@ -374,7 +374,7 @@ Hence forth change log can be found on github: https://github.com/mickem/nscp/re
  * NRDP: Fixed #331 token missing from NRDP
  * Settings: Fixed #227 migration only saves the root scope
  * Added aliases to settings for future use
- * Improved settings esception to give error from correct line
+ * Improved settings exception to give error from correct line
  * Moved settings and registry query to separate files to make the core more modular
  * Removed "boot settings keys" as they are not really used
 
@@ -411,7 +411,7 @@ Hence forth change log can be found on github: https://github.com/mickem/nscp/re
 
 2016-08-23 Michael Medin
 * Linux: Fixed specfile version numbers
-* TaskScheduler: Fixed folder support in tash scheduler
+* TaskScheduler: Fixed folder support in task scheduler
 * CheckWMI: Improved error in check_wmi
 * Fixed segv
 * CHeckHelpers: Fixed missing return data in check_multi
@@ -448,7 +448,7 @@ Hence forth change log can be found on github: https://github.com/mickem/nscp/re
 
 2016-05-30 Michael Medin
  * Fixed scheduler reload not resetting old schedules
- * Change so scheduler logs actual file sinstead of wrapper.
+ * Change so scheduler logs actual file instead of wrapper.
  * removed now defunct old icp protocol
  * Added matches to settings api wrapper
  * removed some compiler warning from protobuf
@@ -459,7 +459,7 @@ Hence forth change log can be found on github: https://github.com/mickem/nscp/re
  * filters: Fixed #292 Unicode support for filters
  * NSCA: Fixed #300 alias not used when sending NSCP results
  * check_nscp: Added SSl support and general fixes to check_nscp (check_remote_nscp)
- * CheckHelpers: Fixed 301: check_multi does not parse qouted commands properly (possibly breaking change)
+ * CheckHelpers: Fixed 301: check_multi does not parse quoted commands properly (possibly breaking change)
 
 2016-04-14 Michael Medin
  * NSCPClient: Added preliminary REST client
@@ -469,7 +469,7 @@ Hence forth change log can be found on github: https://github.com/mickem/nscp/re
 2016-04-11 Michael Medin
  * scripts: Added option capture output to external script to disable output capture and handled inheritance (Fixes #232)
  * WEBServer: Added support for allowed hosts to WEBServer
- * WEBServer: Updated mongoose Fixing: Busy wait when socket failes
+ * WEBServer: Updated mongoose Fixing: Busy wait when socket fails
  * all commands: Fixed #280 parsing filters with large numbers
  * updated docs
 
@@ -488,7 +488,7 @@ Hence forth change log can be found on github: https://github.com/mickem/nscp/re
 2016-04-05 Michael Medin
  * Fixed vagrant builds
  * Changed so volume name errors ends up as volume names instead of in the log #230
- * Improved #275 so next settings system is tried if the first one failes
+ * Improved #275 so next settings system is tried if the first one fails
  * Fixed settings key issue
  * Fixed various build issues
  * Fixed #272 floating point performance data
@@ -551,7 +551,7 @@ Hence forth change log can be found on github: https://github.com/mickem/nscp/re
  * Fixed realtime log file using wrong data
  * Removed tools from non w32 builds (as the only tool is the crash uploader which is windows only)
  * Removed breakpad for non windows builds (as it currently only works on windows)
- * Added support for check_drivesize exclude=c and exclude=d: to make backwards compatiblity better
+ * Added support for check_drivesize exclude=c and exclude=d: to make backwards compatibility better
 
 2016-03-09 Michael Medin
  * Improved logging on network metrics (Possibly fixed 260 )
@@ -566,14 +566,14 @@ Hence forth change log can be found on github: https://github.com/mickem/nscp/re
 2016-03-03 Michael Medin
  * First draft of check_network (not yet finished)
  * #204 Fixed message rendering for eventlog messages
- * Stopped fetching network metrics if fetching them failes on Older windows like 2003 where it is not available
+ * Stopped fetching network metrics if fetching them fails on Older windows like 2003 where it is not available
  * improved error handling for wmi queries
 
 2016-02-27 Michael Medin
  * #204 Added support for modern API to real time eventlogs
  * Improved error log in real time threads
  * #204 Fixed int to string conversion filter issue
- * Added to_string methd for realtime data (to make errors better)
+ * Added to_string method for realtime data (to make errors better)
 
 2016-02-09 Michael Medin
  * Added network metrics
@@ -635,7 +635,7 @@ Hence forth change log can be found on github: https://github.com/mickem/nscp/re
  * Fixed #185 extract_perf should now work as expected
  * Fixed #154 Added escape-html flag to all check commands and escape html option to all real time filters.
  * Added support for -a to check_nrpe command (Fixed #158 )
- * Fixed issue when parsing commandline with first otion as short
+ * Fixed issue when parsing commandline with first option as short
  * Fixed #201 negative perf data in checks
  * Renamed status to task_status as it clashes with regular status (Fixed #170)
  * Fixed issue with atomic functions missing in older boost
@@ -696,7 +696,7 @@ Hence forth change log can be found on github: https://github.com/mickem/nscp/re
  * Added build commandline options
  * Added build command option to build script (to skip configure)
  * Fixed issue with missing command help being target all modules
- * Fixed issue with default not beeing set as template
+ * Fixed issue with default not being set as template
  * Fixed issue with python scripts and script arguments
  * Fixed some socket bugs in web ui
  * Added filtering to query and module
@@ -833,7 +833,7 @@ Hence forth change log can be found on github: https://github.com/mickem/nscp/re
 
 2015-02-11 Michael Medin
  * #105 Fixed issue with parsing legacy style checkservice comamnds
- * improved error handling is service check parsing failes
+ * improved error handling is service check parsing fails
 
 2015-02-06 Michael Medin
  * #102 fixed check_os_version default filter
@@ -1044,7 +1044,7 @@ Hence forth change log can be found on github: https://github.com/mickem/nscp/re
 
 2014-11-16 MickeM
  * Added help to command line client
- * Changed so averages are used if polling failes
+ * Changed so averages are used if polling fails
  * Fixed installer issues
  * Fixed extern script command line interface
  * Fixed issue with total and check_pagefile
@@ -2103,7 +2103,7 @@ Hence forth change log can be found on github: https://github.com/mickem/nscp/re
 
 2012-01-08 MickeM
  * Fixed some issues in the NRPE decoder
- * Added support for forwarding queries (ie. xxx_forward) mainly usefull for python(?) scripts where we can now handconstruct messages for delivery
+ * Added support for forwarding queries (ie. xxx_forward) mainly useful for python(?) scripts where we can now handconstruct messages for delivery
  * Added NRPE unit tests (52 of them)
 
 2011-12-08 MickeM
@@ -2300,7 +2300,7 @@ Hence forth change log can be found on github: https://github.com/mickem/nscp/re
  * Fixed issue in the NSCP server
 
 2011-08-22 MickeM
- * Added initial NSCP protocol implenmentation (very vrude and not really usefull yet)
+ * Added initial NSCP protocol implenmentation (very vrude and not really useful yet)
  * Fixed so it builds on linux
  * Fixed so automagic plugin renaming add lib<LIB name> on *nix.
  * Fixed so it works on linux (fixed issues with timeout)
@@ -2536,7 +2536,7 @@ Hence forth change log can be found on github: https://github.com/mickem/nscp/re
 
 2009-01-17 MickeM
  + Added new command line option pdhlookup (to CheckSystem) to lookup index from names.
-   Probably not usefull to anyone but me :) Usage: "nsclient++ -noboot CheckSystem pdhlookup Antal bindningsreferenser"
+   Probably not useful to anyone but me :) Usage: "nsclient++ -noboot CheckSystem pdhlookup Antal bindningsreferenser"
  * Fixed so PDH Collectors use the same exception as the rest of the PDH stuff (might give better errors when PDH breaks, but I doubt it)
  * removed debug output from -noboot
  + Added new command line pdhmatch option to use pattern matching on PDH queries
@@ -2550,7 +2550,7 @@ Hence forth change log can be found on github: https://github.com/mickem/nscp/re
  * Fixed issue with 64-bit installer (now installs under Program Files (and not x86)
  + Brand new build enviornment based upon boost build!!!
    Use batch file to build (release-build.bat or modify to make your own)
- * Modified /about so it now shows a lot of usefull(?) info.
+ * Modified /about so it now shows a lot of useful(?) info.
 
 2008-11-13 MickeM
  + Added truncate option to checkServiceState
diff --git a/docs/docs/api/plugin.md b/docs/docs/api/plugin.md
index b1a937398..163df23c8 100644
--- a/docs/docs/api/plugin.md
+++ b/docs/docs/api/plugin.md
@@ -444,7 +444,7 @@ repeated | Request | payload |
 <a name=".Plugin.ScheduleNotificationMessage.Request"/>
 ### Request
 
-`Plugin.ScheduleNotificationMessage.Request` A request message of a schule notification
+`Plugin.ScheduleNotificationMessage.Request` A request message of a schedule notification
 
 Modifier | Type        | Key       | Description
 -------- | ----------- | --------- | -----------
diff --git a/docs/docs/api/rest/queries.md b/docs/docs/api/rest/queries.md
index 6f333f7f7..2e86e43f5 100644
--- a/docs/docs/api/rest/queries.md
+++ b/docs/docs/api/rest/queries.md
@@ -225,7 +225,7 @@ GET /api/v1/queries/:query/commands/execute_nagios
 
 ### Example
 
-An example of excuting check_cpu with a 3 minutes time interval:
+An example of executing check_cpu with a 3 minutes time interval:
 
 ```
 curl -s -k -u admin "https://localhost:8443/api/v1/queries/check_cpu/commands/execute_nagios?time=3m" | python -m json.tool
diff --git a/docs/docs/extending/index.md b/docs/docs/extending/index.md
index ca47cbbf2..c95444e00 100644
--- a/docs/docs/extending/index.md
+++ b/docs/docs/extending/index.md
@@ -1,7 +1,7 @@
 # Extending NSClient++
 
 NSClient++ can be extended in multiple ways.
-The easy choice is adding external scripts which are simply scripts which are executed as is by NSClient++ but if you do not fany easy choices you can also go hard-core and write your own custom Moules in C++. Here I will list the various options and some simple pros and cons.
+The easy choice is adding external scripts which are simply scripts which are executed as is by NSClient++ but if you do not fancy easy choices you can also go hard-core and write your own custom Modules in C++. Here I will list the various options and some simple pros and cons.
 
 
 ## External scripts
@@ -13,11 +13,11 @@ The script has to conform to the nagios plugin guidelines.
 **Pros:**
 
 - Very easy to write your own script in your favorite scripting language.
-- Powerfull in that your script can do whatever you want
+- Powerful in that your script can do whatever you want
 
 **Cons:**
 
-- Staeless, unless you implement the state your self.
+- Stateless, unless you implement the state your self.
 - Forking overhead as the script is started afress each time it is executed
 - No background threads.
 - Only supported by check_commands
@@ -29,14 +29,14 @@ These script run inside NSClient++ and can interact with NSClient++.
 
 **Pros:**
 
-- Very Powerfull in that your script can do whatever you want and you can interact with NSClient++.
-- Supports all features of NSclient++, metrics, commands, querys, passive results as well as events.
-- Statefull as the scripts run in the background
+- Very Powerful in that your script can do whatever you want and you can interact with NSClient++.
+- Supports all features of NSclient++, metrics, commands, queries, passive results as well as events.
+- Stateful as the scripts run in the background
 - No forking overhead
 
 **Cons:**
 
-- Lua might be cinsiderd a slightly arcane language in the monitor space.
+- Lua might be considered a slightly arcane language in the monitor space.
 - Adding third party modules requires compiling modules.
 - No background threads.
 
@@ -47,26 +47,26 @@ These script run inside NSClient++ and can interact with NSClient++.
 
 **Pros:**
 
-- Very Powerfull in that your script can do whatever you want and you can interact with NSClient++.
-- Supports all features of NSclient++, metrics, commands, querys, passive results as well as events.
-- Statefull as the scripts run in the background
+- Very Powerful in that your script can do whatever you want and you can interact with NSClient++.
+- Supports all features of NSclient++, metrics, commands, queries, passive results as well as events.
+- Stateful as the scripts run in the background
 - No forking overhead
 - Background threads.
 
 **Cons:**
 
-- Slightly akward to distribute third party modules.
+- Slightly awkward to distribute third party modules.
 
 ## .Net modules
 
-Just as we can write modules in C++ we can also write them in any language supported by the dot-net runtime sich as C#, Haskel and VisualBasic.
+Just as we can write modules in C++ we can also write them in any language supported by the dot-net runtime such as C#, Haskel and VisualBasic.
 These modules run inside NSClient++ and can interact with NSClient++.
 
 **Pros:**
 
-- Very Powerfull in that your script can do whatever you want and you can interact with NSClient++.
-- Supports all features of NSclient++, metrics, commands, querys, passive results as well as events.
-- Statefull as the scripts run in the background
+- Very Powerful in that your script can do whatever you want and you can interact with NSClient++.
+- Supports all features of NSclient++, metrics, commands, queries, passive results as well as events.
+- Stateful as the scripts run in the background
 - No forking overhead
 - Background threads.
 
@@ -76,13 +76,13 @@ These modules run inside NSClient++ and can interact with NSClient++.
 
 ## C/C++ modules
 
-This is how al lthe built-in functionality is written.
+This is how all the built-in functionality is written.
 
 **Pros:**
 
-- Very Powerfull in that your script can do whatever you want and you can interact with NSClient++.
-- Supports all features of NSclient++, metrics, commands, querys, passive results as well as events.
-- Statefull as the scripts run in the background
+- Very Powerful in that your script can do whatever you want and you can interact with NSClient++.
+- Supports all features of NSclient++, metrics, commands, queries, passive results as well as events.
+- Stateful as the scripts run in the background
 - No forking overhead
 - Background threads.
 
@@ -97,10 +97,10 @@ This is new in 0.5.2 and a way to package scripts and configuration inside a zip
 
 **Pros:**
 
-- Powerful: While not scripting it allows you to add both External Scrtips and python scrtips.
-- Supports all features of NSclient++, metrics, commands, querys, passive results as well as events.
-- Statefull as the scripts run in the background
-- No forking overhead (dpending on which scripting technology you use)
+- Powerful: While not scripting it allows you to add both External scripts and python scripts.
+- Supports all features of NSclient++, metrics, commands, queries, passive results as well as events.
+- Stateful as the scripts run in the background
+- No forking overhead (depending on which scripting technology you use)
 - Background threads.
 
 **Cons:**
diff --git a/docs/docs/extending/python.md b/docs/docs/extending/python.md
index 30f4f1ce4..f5b34dc60 100644
--- a/docs/docs/extending/python.md
+++ b/docs/docs/extending/python.md
@@ -268,7 +268,7 @@ The bound function should look like this:
 
 ```
 def my_function(args):
-  return (status.OK, "This is the messge", "'count'=123;200;600")
+  return (status.OK, "This is the message", "'count'=123;200;600")
 ```
 
 **Example:**
@@ -278,7 +278,7 @@ from NSCP import log, Registry, status
 
 def my_function(args):
   log('Got arguments: %s'%args)
-  return (status.OK, "This is the messge", "'count'=123;200;600")
+  return (status.OK, "This is the message", "'count'=123;200;600")
 
 def init(plugin_id, plugin_alias, script_alias):
   reg = Registry.get(plugin_id)
@@ -290,7 +290,7 @@ def init(plugin_id, plugin_alias, script_alias):
 `Registry.cmdline(command_name, function)`
 
 Bind a function to a check query. This is similar to the `Registry.simple_cmdline` function but the bound
-function uses a more powerfull syntax which requires you to parse the reques/response using the protobuf API.
+function uses a more powerful syntax which requires you to parse the request/response using the protobuf API.
 
 
 Option       | Description
@@ -340,7 +340,7 @@ The bound function should look like this:
 
 ```
 def my_function(args):
-  return (0, "This is the messge")
+  return (0, "This is the message")
 ```
 
 **Example:**
@@ -429,7 +429,7 @@ def filter_nsca(channel, source, command, status, message, perf):
     core = Core.get(g_plugin_id)
     core.simple_submit('NSCA', command, status.CRITICAL, message.encode('utf-8'), perf)
   else:
-    log("Supressing duplicte message")
+    log("Supressing duplicate message")
 
 def init(plugin_id, plugin_alias, script_alias):
   global g_plugin_id
@@ -636,7 +636,7 @@ from NSCP import Core, log
 
 def init(plugin_id, plugin_alias, script_alias):
   core = Core.get(plugin_id)
-  path = core.expand_path("${scripts}/ptython/myscript.py")
+  path = core.expand_path("${scripts}/python/myscript.py")
   log('The script path is: %s'%path)
 ```
 
diff --git a/docs/docs/getting_started.md b/docs/docs/getting_started.md
index fd7c424da..02911158d 100644
--- a/docs/docs/getting_started.md
+++ b/docs/docs/getting_started.md
@@ -84,7 +84,7 @@ They are merely a glorified way to save yourself some typing for instance `nscp
 | nrpe     | Use a NRPE client to request information from other systems via NRPE similar to standard NRPE check_nrpe command. |
 | nsca     | Use a NSCA to submit passive checks to a remote system. Similar to the send_nsca command                          |
 | python   | Execute python scripts                                                                                            |
-| sys      | Various system tools to get information about the system (generally PDH on windows curretly)                      |
+| sys      | Various system tools to get information about the system (generally PDH on windows currently)                      |
 | test     | The best way to diagnose and find errors with your configuration and setup.                                       |
 | web      | Configure the web server                                                                                          |
 | wmi      | Run WMI queries from command line                                                                                 |
@@ -231,10 +231,10 @@ commands
 check_cpu  -Check that the load of the CPU(s) are within bounds.
 check_memory    -Check free/used memory on the system.
 check_network   -Check network interface status.
-check_os_version        -Check the version of the underlaying OS.
+check_os_version        -Check the version of the underlying OS.
 check_pagefile  -Check the size of the system pagefile(s).
 check_pdh       -Check the value of a performance (PDH) counter on the local or remote system.
-The counters can also be added and polled periodcally to get average values. Performance Log Users group membership is required to check performance counters.
+The counters can also be added and polled periodically to get average values. Performance Log Users group membership is required to check performance counters.
 check_process   -Check state/metrics of one or more of the processes running on the computer.
 check_service   -Check the state of one or more of the computer services.
 check_uptime    -Check time since last server re-boot.
diff --git a/docs/docs/howto/checks.md b/docs/docs/howto/checks.md
index 56c458276..ac00e686a 100644
--- a/docs/docs/howto/checks.md
+++ b/docs/docs/howto/checks.md
@@ -99,7 +99,7 @@ check_cpu help
 
 As you can see the help is rather extensive and comprehensive.
 
-All commands are added on the form of `*keyword*=*value*`. Or in some instance *keyword* only when a value is not nessecary.
+All commands are added on the form of `*keyword*=*value*`. Or in some instance *keyword* only when a value is not necessary.
 For instance help like so: `check_cpu help`
 
 Using the normal form *keyword*=*value* it looks like this: `check_cpu filter=none`
@@ -157,7 +157,7 @@ To get a list of all keyword we can use the help option as shown above. Here is
 
 
 In our example we used the core to limit the output to only show core 0.
-Now if you run this without a filter using the extended isplay as before we get:
+Now if you run this without a filter using the extended display as before we get:
 
 ```
 check_cpu "top-syntax=${list}"
diff --git a/docs/docs/howto/counters.md b/docs/docs/howto/counters.md
index 7e55e885f..13e6bbb6d 100644
--- a/docs/docs/howto/counters.md
+++ b/docs/docs/howto/counters.md
@@ -65,7 +65,7 @@ To get help you can run: `nscp sys -- --help`
 | --password arg     | The password to login with (only meaningful if computer is specified)                                       |
 | --lookup-index arg | Lookup a numeric value in the PDH index table                                                               |
 | --lookup-name arg  | Lookup a string value in the PDH index table                                                                |
-| --expand-path arg  | Expand a counter path contaning wildcards into corresponding objects (for instance --expand-path \System\*) |
+| --expand-path arg  | Expand a counter path containing wildcards into corresponding objects (for instance --expand-path \System\*) |
 | --check            | Check that performance counters are working                                                                 |
 | --list arg         | List counters and/or instances                                                                              |
 | --validate arg     | List counters and/or instances                                                                              |
diff --git a/docs/docs/index.md b/docs/docs/index.md
index 6425c62b9..470677c83 100644
--- a/docs/docs/index.md
+++ b/docs/docs/index.md
@@ -4,7 +4,7 @@
 NSClient++ (nscp) aims to be a simple yet powerful and secure monitoring daemon.
 It was built for Nagios/Icinga/Neamon, but nothing in the daemon is Nagios/Icinga/Neamon specific and it can be used in many other scenarios where you want to receive/distribute check metrics.
 
-The deamon has some basic features:
+The daemon has some basic features:
 
 *   Allow a remote machine (monitoring server) to request commands to be run on this machine (the monitored machine) which return the status of the machine.
 *   Submit the same results to a remote (monitoring server)
diff --git a/docs/docs/installing.md b/docs/docs/installing.md
index 1f47dd232..c2305c4e2 100644
--- a/docs/docs/installing.md
+++ b/docs/docs/installing.md
@@ -16,7 +16,7 @@ For most people installing NSClient++ is simply running the MSI entering some op
 Before you start NSClient++ you need to configure it by editing the configuration. The configuration is usually in a file called nsclient.ini.
 But the configuration can be stored elsewhere as will (for instance registry is a great place on Windows).
 
-To check where the configuration is stored you can trun the following command:
+To check where the configuration is stored, you can run the following command:
 ```
 $ nscp settings --show
 INI settings: (ini://${shared-path}/nsclient.ini, C:\source\build\x64\dev/nsclient.ini)
diff --git a/docs/docs/reference/check/CheckNSCP.md b/docs/docs/reference/check/CheckNSCP.md
index 5f8c17e87..48e4801f5 100644
--- a/docs/docs/reference/check/CheckNSCP.md
+++ b/docs/docs/reference/check/CheckNSCP.md
@@ -1,6 +1,6 @@
 # CheckNSCP
 
-Use this module to check the healt and status of NSClient++ it self
+Use this module to check the health and status of NSClient++ it self
 
 
 
@@ -15,7 +15,7 @@ A list of all available queries (check commands)
 
 | Command                                   | Description                                    |
 |-------------------------------------------|------------------------------------------------|
-| [check_nscp](#check_nscp)                 | Check the internal healt of NSClient++.        |
+| [check_nscp](#check_nscp)                 | Check the internal health of NSClient++.        |
 | [check_nscp_version](#check_nscp_version) | Check the version of NSClient++ which is used. |
 
 
@@ -23,7 +23,7 @@ A list of all available queries (check commands)
 
 ### check_nscp
 
-Check the internal healt of NSClient++.
+Check the internal health of NSClient++.
 
 
 * [Command-line Arguments](#check_nscp_options)
diff --git a/docs/docs/reference/generic/LUAScript.md b/docs/docs/reference/generic/LUAScript.md
index 888ea11c2..9e40e69b2 100644
--- a/docs/docs/reference/generic/LUAScript.md
+++ b/docs/docs/reference/generic/LUAScript.md
@@ -19,7 +19,7 @@ Loads and processes internal Lua scripts
 
 ### Lua scripts <a id="/settings/lua/scripts"/>
 
-A list of scripts available to run from the LuaSCript module.
+A list of scripts available to run from the LuaScript module.
 
 
 This is a section of objects. This means that you will create objects below this point by adding sections which all look the same.
diff --git a/docs/docs/reference/generic/Scheduler.md b/docs/docs/reference/generic/Scheduler.md
index 09695897f..e401f74ce 100644
--- a/docs/docs/reference/generic/Scheduler.md
+++ b/docs/docs/reference/generic/Scheduler.md
@@ -158,7 +158,7 @@ This is a section of objects. This means that you will create objects below this
 | alias       |               | ALIAS              |
 | channel     |               | SCHEDULE CHANNEL   |
 | command     |               | SCHEDULE COMMAND   |
-| interval    |               | SCHEDULE INTERAVAL |
+| interval    |               | SCHEDULE INTERVAL  |
 | is template | false         | IS TEMPLATE        |
 | parent      | default       | PARENT             |
 | randomness  |               | RANDOMNESS         |
diff --git a/docs/docs/reference/generic/SimpleCache.md b/docs/docs/reference/generic/SimpleCache.md
index c0b7a80fa..15d9fc9ca 100644
--- a/docs/docs/reference/generic/SimpleCache.md
+++ b/docs/docs/reference/generic/SimpleCache.md
@@ -178,7 +178,7 @@ channel=CACHE
 #### PRIMARY CACHE INDEX <a id="/settings/cache/primary index"></a>
 
 Set this to the value you want to use as unique key for the cache.
-Can be any arbitrary string as well as include any of the following special keywords:${command} = The command name, ${host} the host, ${channel} the recieving channel, ${alias} the alias for the command, ${alias-or-command} = alias if set otherweise command, ${message} = the message data (no escape), ${result} = The result status (number).
+Can be any arbitrary string as well as include any of the following special keywords:${command} = The command name, ${host} the host, ${channel} the receiving channel, ${alias} the alias for the command, ${alias-or-command} = alias if set otherwise command, ${message} = the message data (no escape), ${result} = The result status (number).
 
 
 
diff --git a/docs/docs/reference/generic/SimpleFileWriter.md b/docs/docs/reference/generic/SimpleFileWriter.md
index 167e5e307..ebaa244ee 100644
--- a/docs/docs/reference/generic/SimpleFileWriter.md
+++ b/docs/docs/reference/generic/SimpleFileWriter.md
@@ -104,7 +104,7 @@ file=output.txt
 #### HOST MESSAGE SYNTAX <a id="/settings/writers/file/host-syntax"></a>
 
 The syntax of the message to write to the line.
-Can be any arbitrary string as well as include any of the following special keywords:${command} = The command name, ${host} the host, ${channel} the recieving channel, ${alias} the alias for the command, ${alias-or-command} = alias if set otherweise command, ${message} = the message data (no escape), ${result} or ${result_number} = The result status (number), ${epoch} = seconds since unix epoch, ${time} = time using time-format.
+Can be any arbitrary string as well as include any of the following special keywords:${command} = The command name, ${host} the host, ${channel} the receiving channel, ${alias} the alias for the command, ${alias-or-command} = alias if set otherwise command, ${message} = the message data (no escape), ${result} or ${result_number} = The result status (number), ${epoch} = seconds since unix epoch, ${time} = time using time-format.
 
 
 
@@ -132,7 +132,7 @@ host-syntax=
 #### SERVICE MESSAGE SYNTAX <a id="/settings/writers/file/service-syntax"></a>
 
 The syntax of the message to write to the line.
-Can be any arbitrary string as well as include any of the following special keywords:${command} = The command name, ${host} the host, ${channel} the recieving channel, ${alias} the alias for the command, ${alias-or-command} = alias if set otherweise command, ${message} = the message data (no escape), ${result} or ${result_number} = The result status (number), ${epoch} = seconds since unix epoch, ${time} = time using time-format.
+Can be any arbitrary string as well as include any of the following special keywords:${command} = The command name, ${host} the host, ${channel} the receiving channel, ${alias} the alias for the command, ${alias-or-command} = alias if set otherwise command, ${message} = the message data (no escape), ${result} or ${result_number} = The result status (number), ${epoch} = seconds since unix epoch, ${time} = time using time-format.
 
 
 
@@ -160,7 +160,7 @@ service-syntax=
 #### MESSAGE SYNTAX <a id="/settings/writers/file/syntax"></a>
 
 The syntax of the message to write to the line.
-Can be any arbitrary string as well as include any of the following special keywords:${command} = The command name, ${host} the host, ${channel} the recieving channel, ${alias} the alias for the command, ${alias-or-command} = alias if set otherweise command, ${message} = the message data (no escape), ${result} or ${result_number} = The result status (number), ${epoch} = seconds since unix epoch, ${time} = time using time-format.
+Can be any arbitrary string as well as include any of the following special keywords:${command} = The command name, ${host} the host, ${channel} the receiving channel, ${alias} the alias for the command, ${alias-or-command} = alias if set otherwise command, ${message} = the message data (no escape), ${result} or ${result_number} = The result status (number), ${epoch} = seconds since unix epoch, ${time} = time using time-format.
 
 
 
diff --git a/docs/docs/reference/misc/CauseCrashes.md b/docs/docs/reference/misc/CauseCrashes.md
index 53ad524ae..d341e56fe 100644
--- a/docs/docs/reference/misc/CauseCrashes.md
+++ b/docs/docs/reference/misc/CauseCrashes.md
@@ -1,6 +1,6 @@
 # CauseCrashes
 
-*DO NOT USE* This module is usefull except for debugging purpouses and outright dangerous as it allows someone remotley to crash your client!
+*DO NOT USE* This module is useful except for debugging purposes and outright dangerous as it allows someone remotely to crash your client!
 
 
 
diff --git a/docs/docs/reference/unix/CheckSystemUnix.md b/docs/docs/reference/unix/CheckSystemUnix.md
index 7be554b97..9e5d439d5 100644
--- a/docs/docs/reference/unix/CheckSystemUnix.md
+++ b/docs/docs/reference/unix/CheckSystemUnix.md
@@ -11,7 +11,7 @@ A list of all available queries (check commands)
 | Command                               | Description                              |
 |---------------------------------------|------------------------------------------|
 | [check_memory](#check_memory)         | Check free/used memory on the system.    |
-| [check_os_version](#check_os_version) | Check the version of the underlaying OS. |
+| [check_os_version](#check_os_version) | Check the version of the underlying OS. |
 | [check_uptime](#check_uptime)         | Check time since last server re-boot.    |
 
 
@@ -274,7 +274,7 @@ This is the syntax for the base names of the performance data.
 
 ### check_os_version
 
-Check the version of the underlaying OS.
+Check the version of the underlying OS.
 
 
 * [Command-line Arguments](#check_os_version_options)
diff --git a/docs/docs/reference/windows/CheckSystem.md b/docs/docs/reference/windows/CheckSystem.md
index 1051b68aa..54529d828 100644
--- a/docs/docs/reference/windows/CheckSystem.md
+++ b/docs/docs/reference/windows/CheckSystem.md
@@ -18,7 +18,7 @@ A list of all available queries (check commands)
 | [check_cpu](#check_cpu)                 | Check that the load of the CPU(s) are within bounds.                          |
 | [check_memory](#check_memory)           | Check free/used memory on the system.                                         |
 | [check_network](#check_network)         | Check network interface status.                                               |
-| [check_os_version](#check_os_version)   | Check the version of the underlaying OS.                                      |
+| [check_os_version](#check_os_version)   | Check the version of the underlying OS.                                      |
 | [check_pagefile](#check_pagefile)       | Check the size of the system pagefile(s).                                     |
 | [check_pdh](#check_pdh)                 | Check the value of a performance (PDH) counter on the local or remote system. |
 | [check_process](#check_process)         | Check state/metrics of one or more of the processes running on the computer.  |
@@ -613,7 +613,7 @@ This is the syntax for the base names of the performance data.
 
 ### check_os_version
 
-Check the version of the underlaying OS.
+Check the version of the underlying OS.
 
 * [Samples](#check_os_version_samples)
 
@@ -829,7 +829,7 @@ Performance data: 'total'=1G;14;19;0;23 'total %'=6%;59;79;0;100
 
 ```
 
-Getting help on avalible options::
+Getting help on available options::
 
 ```
 check_pagefile help
@@ -839,7 +839,7 @@ check_pagefile help
 					   the check.
 					   They do not denote warning or critical state but they
 					   are checked use this to filter out unwanted items.
-						   Avalible options:
+						   Available options:
 					   free          Free memory in bytes (g,m,k,b) or percentages %
 					   name          The name of the page file (location)
 					   size          Total size of pagefile
@@ -1004,7 +1004,7 @@ This is the syntax for the base names of the performance data.
 ### check_pdh
 
 Check the value of a performance (PDH) counter on the local or remote system.
-The counters can also be added and polled periodcally to get average values. Performance Log Users group membership is required to check performance counters.
+The counters can also be added and polled periodically to get average values. Performance Log Users group membership is required to check performance counters.
 
 * [Samples](#check_pdh_samples)
 
@@ -1049,7 +1049,7 @@ check_pdh "counter=\\4\\30" "warn=value > 5" "crit=value > 9999" flags=nocap100
 '\Minne\Dedikationsgräns value'=25729224704;5;9999
 ```
 
-Using real-time checks to check avergae values over time.
+Using real-time checks to check average values over time.
 
 Here we configure a counter to be checked at regular intervals and the value is added to a rrd buffer.
 The configuration from nsclient.ini::
@@ -1548,7 +1548,7 @@ AdobeActiveFileMonitor10.0: running, AdobeARMservice: running, AMD External Even
 
 **Exclude versus filter**::
 
-You can use both exclude and filter to exclude services the befnefit of exclude is that it is faster with the obvious drawback that it only works on the service name.
+You can use both exclude and filter to exclude services the benefit of exclude is that it is faster with the obvious drawback that it only works on the service name.
 The upside to filters are that they are richer in terms of functionality i.e. substring matching (as below).
 
 Regular check
@@ -1563,7 +1563,7 @@ check_service exclude=nfoo
 L        cli CRITICAL: CRITICAL: nscp=stopped (auto), nscp2=stopped (auto), ...
 ```
 
-Excluding nscp2 with substring like mathcing filter:
+Excluding nscp2 with substring like matching filter:
 ```
 check_service exclude=nfoo "filter=name not like 'nscp'"
 L        cli CRITICAL: CRITICAL: ...
@@ -1631,7 +1631,7 @@ check_service service=nscp "crit=state = 'started'" warn=none
 | [perf-syntax](#check_service_perf-syntax)     | ${name}                                         | Performance alias syntax.                                                                                                                             |
 | computer                                      |                                                 | The name of the remote computer to check                                                                                                              |
 | service                                       |                                                 | The service to check, set this to * to check all services                                                                                             |
-| exclude                                       |                                                 | A list of services to ignore (mainly usefull in combination with service=*)                                                                           |
+| exclude                                       |                                                 | A list of services to ignore (mainly useful in combination with service=*)                                                                           |
 | [type](#check_service_type)                   | service                                         | The types of services to enumerate available types are driver, file-system-driver, kernel-driver, service, service-own-process, service-share-process |
 | [state](#check_service_state)                 | all                                             | The types of services to enumerate available states are active, inactive or all                                                                       |
 | only-essential                                | N/A                                             | Set filter to classification = 'essential'                                                                                                            |
diff --git a/docs/docs/settings.md b/docs/docs/settings.md
index e9811147b..bb588d91f 100644
--- a/docs/docs/settings.md
+++ b/docs/docs/settings.md
@@ -138,7 +138,7 @@ NSClient++ has some feature to help work with settings stores.
 
 All of this is performed via the settings sub command: `nscp settings --help`
 
-Migrating settings from a ini file to the regstry can be done with the migrate-to command: `nscp settings --migrate-to registry`
+Migrating settings from a ini file to the registry can be done with the migrate-to command: `nscp settings --migrate-to registry`
 
 This will move all data from the settings file and store it in in the registry and then setup NSClient++ to use the registry instead of the ini file.
 
diff --git a/docs/docs/tutorial/index.md b/docs/docs/tutorial/index.md
index 67f438851..0677df6d1 100644
--- a/docs/docs/tutorial/index.md
+++ b/docs/docs/tutorial/index.md
@@ -44,7 +44,7 @@ But you can also extend it with custom scripts:
 
 ### Requirements
 
-To use NSClient++ you need a monitoring system deployed in your network many people use Nagios, Icinga, Neteye or Op5 but stricctly speaking NSClient++ is designed to work with any monitoring tool which can execute external scripts or support any of the standard protocols.
+To use NSClient++ you need a monitoring system deployed in your network many people use Nagios, Icinga, Neteye or Op5 but strictly speaking NSClient++ is designed to work with any monitoring tool which can execute external scripts or support any of the standard protocols.
 
 When it comes to Supported OSes NSClient++ was original design to run only on Windows but since 0.4.1 is can be used on Linux as well.
 But currently most modules are Windows only thus the benefit on other operating systems are limited.
@@ -188,7 +188,7 @@ timeout = 90
 
 ## Communication
 
-As we stated initially NSClient++ by itself is not very usefull.
+As we stated initially NSClient++ by itself is not very useful.
 Thus you need to enable some form of communication with your central server.
 
 ### Choosing a transport/protocol
diff --git a/docs/samples/CheckEventLog_samples.md b/docs/samples/CheckEventLog_samples.md
index 7b6c9eef5..815b4fef3 100644
--- a/docs/samples/CheckEventLog_samples.md
+++ b/docs/samples/CheckEventLog_samples.md
@@ -140,7 +140,7 @@ enabled = true
 Adding this will not do much since we don't have a filter yet but adding one is pretty simple as well so lets go ahead and do that.
 
 To make life simple we set the destination in this filter to "log" which means the information only ends up in the NSClient++ log file.
-Not very usefull in reality but very usefull when we are debuggning as it removes possible errors sources.
+Not very useful in reality but very useful when we are debugging as it removes possible errors sources.
 
 **configuration:**
 ```
@@ -156,7 +156,7 @@ Going through the configuration line by line we have:
 
 * `log=application` is the log we listen to.
 * `destination=log` is where the message is sent
-* `filter=level='error'` means we only want to recieve error messages.
+* `filter=level='error'` means we only want to receive error messages.
 * `maximum age=30s` sets a repeating "ok" messages every 30 seconds.
 * `debug=true` will increase the debug level for this filter
 
@@ -179,7 +179,7 @@ If we check the log we should see something similar to this:
 
 ![eventlog output](../../images/eventlog-realtime-log.png)
 
-* 1: Always makre sure there are not errors and that the parsed tree looks like you want it. If the filter has syntax issues nothign will work
+* 1: Always make sure there are not errors and that the parsed tree looks like you want it. If the filter has syntax issues nothing will work
 * 2: This is how it looks when we inject an error message, it is caught and we get the `Notification 0: Application: 1 (error: My first log)` in the log.
 * 3: This is the periodical "ok" message we get when there are not errors: `Notification 0: eventlog found no records`
 * 4: Here we can see the output when there is a message but it does not match our filter.
diff --git a/docs/samples/CheckSystem_check_memory_samples.md b/docs/samples/CheckSystem_check_memory_samples.md
index 7c710b936..b88008755 100644
--- a/docs/samples/CheckSystem_check_memory_samples.md
+++ b/docs/samples/CheckSystem_check_memory_samples.md
@@ -30,7 +30,7 @@ OK memory within bounds.|'page'=531G;3;3;0;3 'page %'=12%;79;89;0;100 'physical'
 ```
 **Overriding the unit:**
 
-Most "byte" checks such as memory have an auto scaling feature which means values wqill go from 800M to 1.2G between checks.
+Most "byte" checks such as memory have an auto scaling feature which means values will go from 800M to 1.2G between checks.
 Some graphing systems does not honor the units in performance data in which case you can get unexpected large values (such as 800G).
 To remedy this you can lock the unit by adding `perf-config=*(unit:G)`
 
diff --git a/docs/samples/CheckSystem_check_pagefile_samples.md b/docs/samples/CheckSystem_check_pagefile_samples.md
index 21872ef08..b68c47dfe 100644
--- a/docs/samples/CheckSystem_check_pagefile_samples.md
+++ b/docs/samples/CheckSystem_check_pagefile_samples.md
@@ -15,7 +15,7 @@ Performance data: 'total'=1G;14;19;0;23 'total %'=6%;59;79;0;100
 
 ```
 
-Getting help on avalible options::
+Getting help on available options::
 
 ```
 check_pagefile help
@@ -25,7 +25,7 @@ check_pagefile help
 					   the check.
 					   They do not denote warning or critical state but they
 					   are checked use this to filter out unwanted items.
-						   Avalible options:
+						   Available options:
 					   free          Free memory in bytes (g,m,k,b) or percentages %
 					   name          The name of the page file (location)
 					   size          Total size of pagefile
diff --git a/docs/samples/CheckSystem_check_pdh_samples.md b/docs/samples/CheckSystem_check_pdh_samples.md
index 772168b96..e3c2d422b 100644
--- a/docs/samples/CheckSystem_check_pdh_samples.md
+++ b/docs/samples/CheckSystem_check_pdh_samples.md
@@ -30,7 +30,7 @@ check_pdh "counter=\\4\\30" "warn=value > 5" "crit=value > 9999" flags=nocap100
 '\Minne\Dedikationsgräns value'=25729224704;5;9999
 ```
 
-Using real-time checks to check avergae values over time.
+Using real-time checks to check average values over time.
 
 Here we configure a counter to be checked at regular intervals and the value is added to a rrd buffer.
 The configuration from nsclient.ini::
diff --git a/docs/samples/CheckSystem_check_service_samples.md b/docs/samples/CheckSystem_check_service_samples.md
index f78b4c1ae..dd8e4cb44 100644
--- a/docs/samples/CheckSystem_check_service_samples.md
+++ b/docs/samples/CheckSystem_check_service_samples.md
@@ -43,7 +43,7 @@ check_service exclude=nfoo
 L        cli CRITICAL: CRITICAL: nscp=stopped (auto), nscp2=stopped (auto), ...
 ```
 
-Excluding nscp2 with substring like mathcing filter:
+Excluding nscp2 with substring like matching filter:
 ```
 check_service exclude=nfoo "filter=name not like 'nscp'"
 L        cli CRITICAL: CRITICAL: ...
diff --git a/modules/CauseCrashes/module.json b/modules/CauseCrashes/module.json
index a09930f6a..94c5179d9 100644
--- a/modules/CauseCrashes/module.json
+++ b/modules/CauseCrashes/module.json
@@ -1,7 +1,7 @@
 {
 	"module"		: {
 		"title"			: "Cause NSClient++ to crash",
-		"description"	: "*DO NOT USE* This module is usefull except for debugging purpouses and outright dangerous as it allows someone remotley to crash your client!",
+		"description"	: "*DO NOT USE* This module is useful except for debugging purposes and outright dangerous as it allows someone remotely to crash your client!",
 		"name"			: "CauseCrashes",
 		"alias"			: "crash",
 		"version"		: "auto",
diff --git a/modules/CheckEventLog/filter.cpp b/modules/CheckEventLog/filter.cpp
index 2ddba31ec..bc57947f1 100644
--- a/modules/CheckEventLog/filter.cpp
+++ b/modules/CheckEventLog/filter.cpp
@@ -412,7 +412,7 @@ namespace eventlog_filter {
 				(type_custom_type, &fun_convert_new_type)
 				;
 			registry_.add_int()
-				("level", type_custom_type, boost::bind(&filter_obj::get_el_type, _1), "Severity level (error, warning, info, success, auditSucess, auditFailure)")
+				("level", type_custom_type, boost::bind(&filter_obj::get_el_type, _1), "Severity level (error, warning, info, success, auditSuccess, auditFailure)")
 				;
 		} else {
 			registry_.add_int()
diff --git a/modules/CheckNSCP/module.json b/modules/CheckNSCP/module.json
index e2347bd53..1ca3dffd8 100644
--- a/modules/CheckNSCP/module.json
+++ b/modules/CheckNSCP/module.json
@@ -1,7 +1,7 @@
 {
 	"module"		: {
 		"title"			: "Check status of NSClient++",
-		"description"	: "Use this module to check the healt and status of NSClient++ it self",
+		"description"	: "Use this module to check the health and status of NSClient++ it self",
 		"name"			: "CheckNSCP",
 		"alias"			: "check_nscp",
 		"version"		: "auto"
@@ -13,7 +13,7 @@
 
 	"commands" : {
 		"check_nscp" : { 
-			"description" : "Check the internal healt of NSClient++."
+			"description" : "Check the internal health of NSClient++."
 			},
 		"check_nscp_version" : { 
 			"description" : "Check the version of NSClient++ which is used."
diff --git a/modules/CheckSystem/CheckSystem.cpp b/modules/CheckSystem/CheckSystem.cpp
index bd96ac4f0..ac7743257 100644
--- a/modules/CheckSystem/CheckSystem.cpp
+++ b/modules/CheckSystem/CheckSystem.cpp
@@ -776,7 +776,7 @@ void CheckSystem::check_service(const PB::Commands::QueryRequestMessage::Request
 	filter_helper.get_desc().add_options()
 		("computer", po::value<std::string>(&computer), "The name of the remote computer to check")
 		("service", po::value<std::vector<std::string>>(&services), "The service to check, set this to * to check all services")
-		("exclude", po::value<std::vector<std::string>>(&excludes), "A list of services to ignore (mainly usefull in combination with service=*)")
+		("exclude", po::value<std::vector<std::string>>(&excludes), "A list of services to ignore (mainly useful in combination with service=*)")
 		("type", po::value<std::string>(&type)->default_value("service"), "The types of services to enumerate available types are driver, file-system-driver, kernel-driver, service, service-own-process, service-share-process")
 		("state", po::value<std::string>(&state)->default_value("all"), "The types of services to enumerate available states are active, inactive or all")
 		("only-essential", po::bool_switch(&class_e), "Set filter to classification = 'essential'")
diff --git a/modules/CheckSystem/module.json b/modules/CheckSystem/module.json
index 3cb7c6871..42796b4dc 100644
--- a/modules/CheckSystem/module.json
+++ b/modules/CheckSystem/module.json
@@ -22,9 +22,9 @@
 		"check_process"		: "Check state/metrics of one or more of the processes running on the computer.",
 		"check_memory"		: "Check free/used memory on the system.",
 		"check_pdh" 		: {	"alias" : [ "check_counter" ],
-								"desc"	: "Check the value of a performance (PDH) counter on the local or remote system.\\nThe counters can also be added and polled periodcally to get average values. Performance Log Users group membership is required to check performance counters."
+								"desc"	: "Check the value of a performance (PDH) counter on the local or remote system.\\nThe counters can also be added and polled periodically to get average values. Performance Log Users group membership is required to check performance counters."
 							},
-		"check_os_version"	: "Check the version of the underlaying OS.",
+		"check_os_version"	: "Check the version of the underlying OS.",
 		"check_pagefile"	: "Check the size of the system pagefile(s).",
 		"check_network"		: "Check network interface status." ,
 		
diff --git a/modules/CheckSystemUnix/module.json b/modules/CheckSystemUnix/module.json
index b59d891a5..bc653c604 100644
--- a/modules/CheckSystemUnix/module.json
+++ b/modules/CheckSystemUnix/module.json
@@ -20,7 +20,7 @@
 	"commands" : {
 		"check_uptime"		: "Check time since last server re-boot." ,
 		"check_memory"		: "Check free/used memory on the system.",
-		"check_os_version"	: "Check the version of the underlaying OS."
+		"check_os_version"	: "Check the version of the underlying OS."
 	},
 
 	"log messages" : false
diff --git a/modules/SimpleCache/SimpleCache.cpp b/modules/SimpleCache/SimpleCache.cpp
index 0d554e9e9..f45ace239 100644
--- a/modules/SimpleCache/SimpleCache.cpp
+++ b/modules/SimpleCache/SimpleCache.cpp
@@ -125,7 +125,7 @@ bool SimpleCache::loadModuleEx(std::string alias, NSCAPI::moduleLoadMode mode) {
 	settings.alias().add_key_to_settings()
 		("primary index", sh::string_key(&primary_key, "${alias-or-command}"),
 			"PRIMARY CACHE INDEX", "Set this to the value you want to use as unique key for the cache.\nCan be any arbitrary string as well as include any of the following special keywords:"
-			"${command} = The command name, ${host} the host, ${channel} the recieving channel, ${alias} the alias for the command, ${alias-or-command} = alias if set otherweise command, ${message} = the message data (no escape), ${result} = The result status (number).")
+			"${command} = The command name, ${host} the host, ${channel} the receiving channel, ${alias} the alias for the command, ${alias-or-command} = alias if set otherwise command, ${message} = the message data (no escape), ${result} = The result status (number).")
 
 		("channel", sh::string_key(&channel, "CACHE"),
 			"CHANNEL", "The channel to listen to.")
diff --git a/modules/SimpleFileWriter/SimpleFileWriter.cpp b/modules/SimpleFileWriter/SimpleFileWriter.cpp
index 992046eee..ed8fd83aa 100644
--- a/modules/SimpleFileWriter/SimpleFileWriter.cpp
+++ b/modules/SimpleFileWriter/SimpleFileWriter.cpp
@@ -149,15 +149,15 @@ bool SimpleFileWriter::loadModuleEx(std::string alias, NSCAPI::moduleLoadMode) {
 		settings.alias().add_key_to_settings()
 			("syntax", sh::string_key(&syntax, "${alias-or-command} ${result} ${message}"),
 				"MESSAGE SYNTAX", "The syntax of the message to write to the line.\nCan be any arbitrary string as well as include any of the following special keywords:"
-				"${command} = The command name, ${host} the host, ${channel} the recieving channel, ${alias} the alias for the command, ${alias-or-command} = alias if set otherweise command, ${message} = the message data (no escape), ${result} or ${result_number} = The result status (number), ${epoch} = seconds since unix epoch, ${time} = time using time-format.")
+				"${command} = The command name, ${host} the host, ${channel} the receiving channel, ${alias} the alias for the command, ${alias-or-command} = alias if set otherwise command, ${message} = the message data (no escape), ${result} or ${result_number} = The result status (number), ${epoch} = seconds since unix epoch, ${time} = time using time-format.")
 
 			("service-syntax", sh::string_key(&syntax_service),
 				"SERVICE MESSAGE SYNTAX", "The syntax of the message to write to the line.\nCan be any arbitrary string as well as include any of the following special keywords:"
-				"${command} = The command name, ${host} the host, ${channel} the recieving channel, ${alias} the alias for the command, ${alias-or-command} = alias if set otherweise command, ${message} = the message data (no escape), ${result} or ${result_number} = The result status (number), ${epoch} = seconds since unix epoch, ${time} = time using time-format.")
+				"${command} = The command name, ${host} the host, ${channel} the receiving channel, ${alias} the alias for the command, ${alias-or-command} = alias if set otherwise command, ${message} = the message data (no escape), ${result} or ${result_number} = The result status (number), ${epoch} = seconds since unix epoch, ${time} = time using time-format.")
 
 			("host-syntax", sh::string_key(&syntax_host),
 				"HOST MESSAGE SYNTAX", "The syntax of the message to write to the line.\nCan be any arbitrary string as well as include any of the following special keywords:"
-				"${command} = The command name, ${host} the host, ${channel} the recieving channel, ${alias} the alias for the command, ${alias-or-command} = alias if set otherweise command, ${message} = the message data (no escape), ${result} or ${result_number} = The result status (number), ${epoch} = seconds since unix epoch, ${time} = time using time-format.")
+				"${command} = The command name, ${host} the host, ${channel} the receiving channel, ${alias} the alias for the command, ${alias-or-command} = alias if set otherwise command, ${message} = the message data (no escape), ${result} or ${result_number} = The result status (number), ${epoch} = seconds since unix epoch, ${time} = time using time-format.")
 
 			("file", sh::path_key(&filename_, "output.txt"),
 				"FILE TO WRITE TO", "The filename to write output to.")
diff --git a/scripts/lua/test_ext_script.lua b/scripts/lua/test_ext_script.lua
index e2dcd3cc3..d8eae8e94 100644
--- a/scripts/lua/test_ext_script.lua
+++ b/scripts/lua/test_ext_script.lua
@@ -147,8 +147,8 @@ function TestExtScript:submit_payload(tag, ssl, length, payload_length, source,
 	for i = 0,10 do
 		if (self:has_response(uid)) then
 			rmsg = self:get_response(uid)
-			--#result.add_message(rmsg.got_response, 'Testing to recieve message using %s'%tag)
-			result:add_message(rmsg.got_simple_response, 'Testing to recieve simple message using '..tag)
+			--#result.add_message(rmsg.got_response, 'Testing to receive message using %s'%tag)
+			result:add_message(rmsg.got_simple_response, 'Testing to receive simple message using '..tag)
 			result:add_message(response_message:size_payload() == 1, 'Verify that we only get one payload response for '..tag)
 			pl = response_message:get_payload(1)
 			result:assert_equals(pl:get_result(), test.status_to_int(status), 'Verify that status is sent through '..tag)
@@ -271,7 +271,7 @@ function TestExtScript:test_timeout(ssl, server_timeout, client_timeout, length)
 	for i = 0,10 do
 		if (self:has_response(uid)) then
 			rmsg = self:get_response(uid)
-			result:add_message(false, string.format('Testing to recieve message using'))
+			result:add_message(false, string.format('Testing to receive message using'))
 			self:del_response(uid)
 			found = true
 			break
diff --git a/scripts/lua/test_nrpe.lua b/scripts/lua/test_nrpe.lua
index 2bba9beef..5e086f1b1 100644
--- a/scripts/lua/test_nrpe.lua
+++ b/scripts/lua/test_nrpe.lua
@@ -159,8 +159,8 @@ function TestNRPE:submit_payload(tag, ssl, length, payload_length, source, statu
 	for i = 0,10 do
 		if (self:has_response(uid)) then
 			rmsg = self:get_response(uid)
-			--#result.add_message(rmsg.got_response, 'Testing to recieve message using %s'%tag)
-			result:add_message(rmsg.got_simple_response, 'Testing to recieve simple message using '..tag)
+			--#result.add_message(rmsg.got_response, 'Testing to receive message using %s'%tag)
+			result:add_message(rmsg.got_simple_response, 'Testing to receive simple message using '..tag)
 			result:add_message(response_message:size_payload() == 1, 'Verify that we only get one payload response for '..tag)
 			pl = response_message:get_payload(1)
 			result:assert_equals(pl:get_result(), test.status_to_int(status), 'Verify that status is sent through '..tag)
@@ -287,7 +287,7 @@ function TestNRPE:test_timeout(ssl, server_timeout, client_timeout, length)
 	for i = 0,10 do
 		if (self:has_response(uid)) then
 			rmsg = self:get_response(uid)
-			result:add_message(false, string.format('Testing to recieve message using'))
+			result:add_message(false, string.format('Testing to receive message using'))
 			self:del_response(uid)
 			found = true
 			break
diff --git a/scripts/python/test_nrpe.py b/scripts/python/test_nrpe.py
index 27c6696e5..67dad269f 100644
--- a/scripts/python/test_nrpe.py
+++ b/scripts/python/test_nrpe.py
@@ -180,8 +180,8 @@ def submit_payload(self, alias, ssl, length, source, status, msg, perf, target):
 		for i in range(0,10):
 			if self.has_response(uid):
 				rmsg = self.get_response(uid)
-				#result.add_message(rmsg.got_response, 'Testing to recieve message using %s'%alias)
-				result.add_message(rmsg.got_simple_response, 'Testing to recieve simple message using %s'%alias)
+				#result.add_message(rmsg.got_response, 'Testing to receive message using %s'%alias)
+				result.add_message(rmsg.got_simple_response, 'Testing to receive simple message using %s'%alias)
 				result.add_message(len(response_message.payload) == 1, 'Verify that we only get one payload response for %s'%alias, '%s != 1'%len(response_message.payload))
 				if len(response_message.payload) == 1 and len(response_message.payload[0].lines) == 1:
 					result.assert_equals(response_message.payload[0].result, status, 'Verify that status is sent through %s'%alias)
@@ -194,7 +194,7 @@ def submit_payload(self, alias, ssl, length, source, status, msg, perf, target):
 				log('Waiting for %s (%s/%s)'%(uid,alias,target))
 				sleep(500)
 		if not found:
-			result.add_message(False, 'Testing to recieve message using %s'%alias)
+			result.add_message(False, 'Testing to receive message using %s'%alias)
 		return result
 
 	def test_one(self, ssl=True, length=1024, state = status.UNKNOWN, tag = 'TODO'):
diff --git a/scripts/python/test_nsca.py b/scripts/python/test_nsca.py
index 39aacdd11..7832d27e7 100644
--- a/scripts/python/test_nsca.py
+++ b/scripts/python/test_nsca.py
@@ -157,7 +157,7 @@ def wait_and_validate(self, uuid, result, msg, perf, tag):
 				found = True
 				break
 		if not found:
-			result.add_message(False, 'Failed to recieve message %s using %s'%(uuid, tag))
+			result.add_message(False, 'Failed to receive message %s using %s'%(uuid, tag))
 			return False
 		
 		for i in range(0,10):
@@ -169,8 +169,8 @@ def wait_and_validate(self, uuid, result, msg, perf, tag):
 				log_debug('Got delayed response %s'%uuid)
 				break
 		
-		result.add_message(rmsg.got_response, 'Testing to recieve message using %s'%tag)
-		result.add_message(rmsg.got_simple_response, 'Testing to recieve simple message using %s'%tag)
+		result.add_message(rmsg.got_response, 'Testing to receive message using %s'%tag)
+		result.add_message(rmsg.got_simple_response, 'Testing to receive simple message using %s'%tag)
 		result.assert_equals(rmsg.command, uuid, 'Verify that command is sent through using %s'%tag)
 		result.assert_contains(rmsg.message, msg, 'Verify that message is sent through using %s'%tag)
 		
diff --git a/scripts/python/test_nscp.py b/scripts/python/test_nscp.py
index 094b06611..1577d897f 100644
--- a/scripts/python/test_nscp.py
+++ b/scripts/python/test_nscp.py
@@ -171,8 +171,8 @@ def submit_payload(self, alias, ssl, source, status, msg, perf, target):
 		for i in range(0,10):
 			if self.has_response(uid):
 				rmsg = self.get_response(uid)
-				#result.add_message(rmsg.got_response, 'Testing to recieve message using %s'%alias)
-				result.add_message(rmsg.got_simple_response, 'Testing to recieve simple message using %s'%alias)
+				#result.add_message(rmsg.got_response, 'Testing to receive message using %s'%alias)
+				result.add_message(rmsg.got_simple_response, 'Testing to receive simple message using %s'%alias)
 				result.add_message(len(response_message.payload) == 1, 'Verify that we only get one payload response for %s'%alias, '%s != 1'%len(response_message.payload))
 				result.assert_equals(response_message.payload[0].result, status, 'Verify that status is sent through %s'%alias)
 				result.assert_equals(response_message.payload[0].message, msg, 'Verify that message is sent through %s'%alias)
@@ -184,7 +184,7 @@ def submit_payload(self, alias, ssl, source, status, msg, perf, target):
 				log('Waiting for %s (%s/%s)'%(uid,alias,target))
 				sleep(500)
 		if not found:
-			result.add_message(False, 'Testing to recieve message using %s'%alias)
+			result.add_message(False, 'Testing to receive message using %s'%alias)
 		return result
 
 	def test_one(self, ssl=True, state = status.UNKNOWN, tag = 'TODO'):
diff --git a/service/cli_parser.cpp b/service/cli_parser.cpp
index 3cab6286d..7e77d6828 100644
--- a/service/cli_parser.cpp
+++ b/service/cli_parser.cpp
@@ -734,7 +734,7 @@ std::string cli_parser::get_description(std::string key) {
 	} else if (key == "wmi") {
 		return "Run WMI queries from command line";
 	} else if (key == "sys") {
-		return "Various system tools to get information about the system (generally PDH on windows curretly)";
+		return "Various system tools to get information about the system (generally PDH on windows currently)";
 	} else {
 		return "TODO: describe: " + key;
 	}
diff --git a/service/logger/simple_file_logger.cpp b/service/logger/simple_file_logger.cpp
index 613959a69..610da150e 100644
--- a/service/logger/simple_file_logger.cpp
+++ b/service/logger/simple_file_logger.cpp
@@ -140,7 +140,7 @@ namespace nsclient {
 							"Log file name", "The file to write log data to. Set this to none to disable log to file.")
 
 							("date format", sh::string_key(&ret.format, "%Y-%m-%d %H:%M:%S"),
-								"Date format", "The size of the buffer to use when getting messages this affects the speed and maximum size of messages you can recieve.")
+								"Date format", "The size of the buffer to use when getting messages this affects the speed and maximum size of messages you can receive.")
 
 						;
 

From 85a4ad83d7c8c4e3bc4ca5e401481ce9a22081b4 Mon Sep 17 00:00:00 2001
From: Michael Medin <michael@medin.name>
Date: Sat, 15 Feb 2025 11:55:38 +0100
Subject: [PATCH 4/4] generated docs

---
 docs/docs/reference/check/CheckLogFile.md    |  7 ------
 docs/docs/reference/check/CheckNSCP.md       |  2 +-
 docs/docs/reference/generic/Scheduler.md     | 26 ++++++++++----------
 docs/docs/reference/index.md                 | 16 ++++++------
 docs/docs/reference/misc/CheckDocker.md      |  4 +--
 docs/docs/reference/misc/NSCPClient.md       |  2 +-
 docs/docs/reference/windows/CheckEventLog.md |  8 +++---
 docs/docs/reference/windows/CheckSystem.md   |  8 +++---
 docs/samples/index.rst                       | 12 ++++-----
 modules/Scheduler/schedules_handler.hpp      |  4 +--
 10 files changed, 41 insertions(+), 48 deletions(-)

diff --git a/docs/docs/reference/check/CheckLogFile.md b/docs/docs/reference/check/CheckLogFile.md
index 083fb73c8..2332aff0a 100644
--- a/docs/docs/reference/check/CheckLogFile.md
+++ b/docs/docs/reference/check/CheckLogFile.md
@@ -97,8 +97,6 @@ They do not denote warning or critical state instead it defines which items are
 Filter which marks items which generates a warning state.
 If anything matches this filter the return status will be escalated to warning.
 
-*Example:* `warning="line LIKE 'WARN'"`
-
 
 
 <h5 id="check_logfile_critical">critical:</h5>
@@ -106,8 +104,6 @@ If anything matches this filter the return status will be escalated to warning.
 Filter which marks items which generates a critical state.
 If anything matches this filter the return status will be escalated to critical.
 
-*Example:* `warning="line LIKE 'ERROR'"`
-
 
 
 <h5 id="check_logfile_ok">ok:</h5>
@@ -189,9 +185,6 @@ In other words if one file contains an error the entire check will result in err
 
 
 <a name="check_logfile_filter_keys"/>
-
-The following keywords may be used to write a [filter expression](/checks/#expressions).
-
 #### Filter keywords
 
 
diff --git a/docs/docs/reference/check/CheckNSCP.md b/docs/docs/reference/check/CheckNSCP.md
index 48e4801f5..9be128109 100644
--- a/docs/docs/reference/check/CheckNSCP.md
+++ b/docs/docs/reference/check/CheckNSCP.md
@@ -15,7 +15,7 @@ A list of all available queries (check commands)
 
 | Command                                   | Description                                    |
 |-------------------------------------------|------------------------------------------------|
-| [check_nscp](#check_nscp)                 | Check the internal health of NSClient++.        |
+| [check_nscp](#check_nscp)                 | Check the internal health of NSClient++.       |
 | [check_nscp_version](#check_nscp_version) | Check the version of NSClient++ which is used. |
 
 
diff --git a/docs/docs/reference/generic/Scheduler.md b/docs/docs/reference/generic/Scheduler.md
index e401f74ce..8c1479c79 100644
--- a/docs/docs/reference/generic/Scheduler.md
+++ b/docs/docs/reference/generic/Scheduler.md
@@ -153,19 +153,19 @@ This is a section of objects. This means that you will create objects below this
 **Keys:**
 
 
-| Key         | Default Value | Description        |
-|-------------|---------------|--------------------|
-| alias       |               | ALIAS              |
-| channel     |               | SCHEDULE CHANNEL   |
-| command     |               | SCHEDULE COMMAND   |
-| interval    |               | SCHEDULE INTERVAL  |
-| is template | false         | IS TEMPLATE        |
-| parent      | default       | PARENT             |
-| randomness  |               | RANDOMNESS         |
-| report      |               | REPORT MODE        |
-| schedule    |               | SCHEDULE           |
-| source      |               | SOURCE             |
-| target      |               | TARGET             |
+| Key         | Default Value | Description       |
+|-------------|---------------|-------------------|
+| alias       |               | ALIAS             |
+| channel     |               | SCHEDULE CHANNEL  |
+| command     |               | SCHEDULE COMMAND  |
+| interval    |               | SCHEDULE INTERVAL |
+| is template | false         | IS TEMPLATE       |
+| parent      | default       | PARENT            |
+| randomness  |               | RANDOMNESS        |
+| report      |               | REPORT MODE       |
+| schedule    |               | SCHEDULE          |
+| source      |               | SOURCE            |
+| target      |               | TARGET            |
 
 
 **Sample:**
diff --git a/docs/docs/reference/index.md b/docs/docs/reference/index.md
index 0bdc37d88..71529a5b8 100644
--- a/docs/docs/reference/index.md
+++ b/docs/docs/reference/index.md
@@ -5,7 +5,7 @@
 
 | Type    | Module                                                       | Description                                                                                                                                                                                        |
 |---------|--------------------------------------------------------------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| misc    | [CauseCrashes](reference/misc/CauseCrashes)                  | *DO NOT USE* This module is usefull except for debugging purpouses and outright dangerous as it allows someone remotley to crash your client!                                                      |
+| misc    | [CauseCrashes](reference/misc/CauseCrashes)                  | *DO NOT USE* This module is useful except for debugging purposes and outright dangerous as it allows someone remotely to crash your client!                                                        |
 | windows | [CheckDisk](reference/windows/CheckDisk)                     | CheckDisk can check various file and disk related things.                                                                                                                                          |
 | misc    | [CheckDocker](reference/misc/CheckDocker)                    | Use this module to detect and monitor docker containers                                                                                                                                            |
 | windows | [CheckEventLog](reference/windows/CheckEventLog)             | Check for errors and warnings in the event log.                                                                                                                                                    |
@@ -13,7 +13,7 @@
 | check   | [CheckHelpers](reference/check/CheckHelpers)                 | Various helper function to extend other checks.                                                                                                                                                    |
 | check   | [CheckLogFile](reference/check/CheckLogFile)                 | File for checking log files and various other forms of updating text files                                                                                                                         |
 | misc    | [CheckNet](reference/misc/CheckNet)                          | Network related check such as check_ping.                                                                                                                                                          |
-| check   | [CheckNSCP](reference/check/CheckNSCP)                       | Use this module to check the healt and status of NSClient++ it self                                                                                                                                |
+| check   | [CheckNSCP](reference/check/CheckNSCP)                       | Use this module to check the health and status of NSClient++ it self                                                                                                                               |
 | windows | [CheckSystem](reference/windows/CheckSystem)                 | Various system related checks, such as CPU load, process state, service state memory usage and PDH counters.                                                                                       |
 | windows | [CheckTaskSched](reference/windows/CheckTaskSched)           | Check status of your scheduled jobs.                                                                                                                                                               |
 | windows | [CheckWMI](reference/windows/CheckWMI)                       | Check status via WMI                                                                                                                                                                               |
@@ -21,20 +21,20 @@
 | generic | [CommandClient](reference/generic/CommandClient)             | A command line client, generally not used except with "nscp test".                                                                                                                                 |
 | misc    | [ElasticClient](reference/misc/ElasticClient)                | Elastic sends metrics, events and logs to elastic search                                                                                                                                           |
 | client  | [GraphiteClient](reference/client/GraphiteClient)            | Graphite client can be used to submit graph data to a graphite graphing system                                                                                                                     |
-| client  | [NRDPClient](reference/client/NRDPClient)                    | NRDP client can be used both from command line and from queries to check remote systes via NRDP                                                                                                    |
-| client  | [NRPEClient](reference/client/NRPEClient)                    | NRPE client can be used both from command line and from queries to check remote systes via NRPE as well as configure the NRPE server                                                               |
+| client  | [NRDPClient](reference/client/NRDPClient)                    | NRDP client can be used both from command line and from queries to check remote systems via NRDP                                                                                                   |
+| client  | [NRPEClient](reference/client/NRPEClient)                    | NRPE client can be used both from command line and from queries to check remote systems via NRPE as well as configure the NRPE server                                                              |
 | client  | [NRPEServer](reference/client/NRPEServer)                    | A server that listens for incoming NRPE connection and processes incoming requests.                                                                                                                |
 | client  | [NSCAClient](reference/client/NSCAClient)                    | NSCA client can be used both from command line and from queries to submit passive checks via NSCA                                                                                                  |
 | client  | [NSCAServer](reference/client/NSCAServer)                    | A server that listens for incoming NSCA connection and processes incoming requests.                                                                                                                |
 | windows | [NSClientServer](reference/windows/NSClientServer)           | A server that listens for incoming check_nt connection and processes incoming requests.                                                                                                            |
-| misc    | [NSCPClient](reference/misc/NSCPClient)                      | NSCP client can be used both from command line and from queries to check remote systes via NSCP (REST)                                                                                             |
+| misc    | [NSCPClient](reference/misc/NSCPClient)                      | NSCP client can be used both from command line and from queries to check remote systems via NSCP (REST)                                                                                            |
 | misc    | [Op5Client](reference/misc/Op5Client)                        | Client for connecting nativly to the Op5 Nortbound API                                                                                                                                             |
 | generic | [PythonScript](reference/generic/PythonScript)               | Loads and processes internal Python scripts                                                                                                                                                        |
 | misc    | [SamplePluginSimple](reference/misc/SamplePluginSimple)      | This is a sample plugin used to demonstrate how to make plugins                                                                                                                                    |
 | generic | [Scheduler](reference/generic/Scheduler)                     | Use this to schedule check commands and jobs in conjunction with for instance passive monitoring through NSCA                                                                                      |
 | generic | [SimpleCache](reference/generic/SimpleCache)                 | Stores status updates and allows for active checks to retrieve them                                                                                                                                |
 | generic | [SimpleFileWriter](reference/generic/SimpleFileWriter)       | Write status updates to a text file (A bit like the NSCA server does)                                                                                                                              |
-| client  | [SMTPClient](reference/client/SMTPClient)                    | SMTP client can be used both from command line and from queries to check remote systes via SMTP                                                                                                    |
+| client  | [SMTPClient](reference/client/SMTPClient)                    | SMTP client can be used both from command line and from queries to check remote systems via SMTP                                                                                                   |
 | client  | [SyslogClient](reference/client/SyslogClient)                | Forward information as syslog messages to a syslog server                                                                                                                                          |
 | generic | [WEBServer](reference/generic/WEBServer)                     | A server that listens for incoming HTTP connection and processes incoming requests. It provides both a WEB UI as well as a REST API in addition to simplifying configuration of WEB Server module. |
 
@@ -192,12 +192,12 @@
 | CheckHelpers       | [xform_perf](reference/check/CheckHelpers#xform_perf)                       | Run a check and transform the performance data in various (currently one) way.      |
 | CheckLogFile       | [check_logfile](reference/check/CheckLogFile#check_logfile)                 | Check for errors in log file or generic pattern matching in text files.             |
 | CheckNet           | [check_ping](reference/misc/CheckNet#check_ping)                            | Ping another host and check the result.                                             |
-| CheckNSCP          | [check_nscp](reference/check/CheckNSCP#check_nscp)                          | Check the internal healt of NSClient++.                                             |
+| CheckNSCP          | [check_nscp](reference/check/CheckNSCP#check_nscp)                          | Check the internal health of NSClient++.                                            |
 | CheckNSCP          | [check_nscp_version](reference/check/CheckNSCP#check_nscp_version)          | Check the version of NSClient++ which is used.                                      |
 | CheckSystem        | [check_cpu](reference/windows/CheckSystem#check_cpu)                        | Check that the load of the CPU(s) are within bounds.                                |
 | CheckSystem        | [check_memory](reference/windows/CheckSystem#check_memory)                  | Check free/used memory on the system.                                               |
 | CheckSystem        | [check_network](reference/windows/CheckSystem#check_network)                | Check network interface status.                                                     |
-| CheckSystem        | [check_os_version](reference/windows/CheckSystem#check_os_version)          | Check the version of the underlaying OS.                                            |
+| CheckSystem        | [check_os_version](reference/windows/CheckSystem#check_os_version)          | Check the version of the underlying OS.                                             |
 | CheckSystem        | [check_pagefile](reference/windows/CheckSystem#check_pagefile)              | Check the size of the system pagefile(s).                                           |
 | CheckSystem        | [check_pdh](reference/windows/CheckSystem#check_pdh)                        | Check the value of a performance (PDH) counter on the local or remote system.       |
 | CheckSystem        | [check_process](reference/windows/CheckSystem#check_process)                | Check state/metrics of one or more of the processes running on the computer.        |
diff --git a/docs/docs/reference/misc/CheckDocker.md b/docs/docs/reference/misc/CheckDocker.md
index 57c119214..cfa33d779 100644
--- a/docs/docs/reference/misc/CheckDocker.md
+++ b/docs/docs/reference/misc/CheckDocker.md
@@ -119,7 +119,7 @@ TODO: obj ( key: value; key: value) obj (key:valuer;key:value)
 
 Top level syntax.
 Used to format the message to return can include text as well as special keywords which will include information from the checks.
-To add a keyword to the message you can use two syntaxes either ${keyword} or %(keyword) (there is no difference between them apart from ${} can be difficult to excpae on linux).
+To add a keyword to the message you can use two syntaxes either ${keyword} or %(keyword) (there is no difference between them apart from ${} can be difficult to escape on linux).
 
 *Default Value:* `${status}: ${list}`
 
@@ -141,7 +141,7 @@ DEPRECATED! This is the syntax for when nothing matches the filter.
 Detail level syntax.
 Used to format each resulting item in the message.
 %(list) will be replaced with all the items formated by this syntax string in the top-syntax.
-To add a keyword to the message you can use two syntaxes either ${keyword} or %(keyword) (there is no difference between them apart from ${} can be difficult to excpae on linux).
+To add a keyword to the message you can use two syntaxes either ${keyword} or %(keyword) (there is no difference between them apart from ${} can be difficult to escape on linux).
 
 *Default Value:* `${names}=${container_state}`
 
diff --git a/docs/docs/reference/misc/NSCPClient.md b/docs/docs/reference/misc/NSCPClient.md
index 255c713eb..d0484cfa7 100644
--- a/docs/docs/reference/misc/NSCPClient.md
+++ b/docs/docs/reference/misc/NSCPClient.md
@@ -1,6 +1,6 @@
 # NSCPClient
 
-NSCP client can be used both from command line and from queries to check remote systes via NSCP (REST)
+NSCP client can be used both from command line and from queries to check remote systems via NSCP (REST)
 
 
 
diff --git a/docs/docs/reference/windows/CheckEventLog.md b/docs/docs/reference/windows/CheckEventLog.md
index 463d1419d..50da937a0 100644
--- a/docs/docs/reference/windows/CheckEventLog.md
+++ b/docs/docs/reference/windows/CheckEventLog.md
@@ -151,7 +151,7 @@ enabled = true
 Adding this will not do much since we don't have a filter yet but adding one is pretty simple as well so lets go ahead and do that.
 
 To make life simple we set the destination in this filter to "log" which means the information only ends up in the NSClient++ log file.
-Not very usefull in reality but very usefull when we are debuggning as it removes possible errors sources.
+Not very useful in reality but very useful when we are debugging as it removes possible errors sources.
 
 **configuration:**
 ```
@@ -167,7 +167,7 @@ Going through the configuration line by line we have:
 
 * `log=application` is the log we listen to.
 * `destination=log` is where the message is sent
-* `filter=level='error'` means we only want to recieve error messages.
+* `filter=level='error'` means we only want to receive error messages.
 * `maximum age=30s` sets a repeating "ok" messages every 30 seconds.
 * `debug=true` will increase the debug level for this filter
 
@@ -190,7 +190,7 @@ If we check the log we should see something similar to this:
 
 ![eventlog output](../../images/eventlog-realtime-log.png)
 
-* 1: Always makre sure there are not errors and that the parsed tree looks like you want it. If the filter has syntax issues nothign will work
+* 1: Always make sure there are not errors and that the parsed tree looks like you want it. If the filter has syntax issues nothing will work
 * 2: This is how it looks when we inject an error message, it is caught and we get the `Notification 0: Application: 1 (error: My first log)` in the log.
 * 3: This is the periodical "ok" message we get when there are not errors: `Notification 0: eventlog found no records`
 * 4: Here we can see the output when there is a message but it does not match our filter.
@@ -406,7 +406,7 @@ Use bookmarks to only look for messages since last check (with the same bookmark
 | guid          | The logfile name                                                                                             |
 | id            | Eventlog id                                                                                                  |
 | keyword       | The keyword associated with this event                                                                       |
-| level         | Severity level (error, warning, info, success, auditSucess, auditFailure)                                    |
+| level         | Severity level (error, warning, info, success, auditSuccess, auditFailure)                                   |
 | list          | A list of all items which matched the filter. Common option for all checks.                                  |
 | log           | alias for file                                                                                               |
 | message       | The message rendered as a string.                                                                            |
diff --git a/docs/docs/reference/windows/CheckSystem.md b/docs/docs/reference/windows/CheckSystem.md
index 54529d828..33285c2b1 100644
--- a/docs/docs/reference/windows/CheckSystem.md
+++ b/docs/docs/reference/windows/CheckSystem.md
@@ -18,7 +18,7 @@ A list of all available queries (check commands)
 | [check_cpu](#check_cpu)                 | Check that the load of the CPU(s) are within bounds.                          |
 | [check_memory](#check_memory)           | Check free/used memory on the system.                                         |
 | [check_network](#check_network)         | Check network interface status.                                               |
-| [check_os_version](#check_os_version)   | Check the version of the underlying OS.                                      |
+| [check_os_version](#check_os_version)   | Check the version of the underlying OS.                                       |
 | [check_pagefile](#check_pagefile)       | Check the size of the system pagefile(s).                                     |
 | [check_pdh](#check_pdh)                 | Check the value of a performance (PDH) counter on the local or remote system. |
 | [check_process](#check_process)         | Check state/metrics of one or more of the processes running on the computer.  |
@@ -291,7 +291,7 @@ OK memory within bounds.|'page'=531G;3;3;0;3 'page %'=12%;79;89;0;100 'physical'
 ```
 **Overriding the unit:**
 
-Most "byte" checks such as memory have an auto scaling feature which means values wqill go from 800M to 1.2G between checks.
+Most "byte" checks such as memory have an auto scaling feature which means values will go from 800M to 1.2G between checks.
 Some graphing systems does not honor the units in performance data in which case you can get unexpected large values (such as 800G).
 To remedy this you can lock the unit by adding `perf-config=*(unit:G)`
 
@@ -1548,7 +1548,7 @@ AdobeActiveFileMonitor10.0: running, AdobeARMservice: running, AMD External Even
 
 **Exclude versus filter**::
 
-You can use both exclude and filter to exclude services the benefit of exclude is that it is faster with the obvious drawback that it only works on the service name.
+You can use both exclude and filter to exclude services the befnefit of exclude is that it is faster with the obvious drawback that it only works on the service name.
 The upside to filters are that they are richer in terms of functionality i.e. substring matching (as below).
 
 Regular check
@@ -1631,7 +1631,7 @@ check_service service=nscp "crit=state = 'started'" warn=none
 | [perf-syntax](#check_service_perf-syntax)     | ${name}                                         | Performance alias syntax.                                                                                                                             |
 | computer                                      |                                                 | The name of the remote computer to check                                                                                                              |
 | service                                       |                                                 | The service to check, set this to * to check all services                                                                                             |
-| exclude                                       |                                                 | A list of services to ignore (mainly useful in combination with service=*)                                                                           |
+| exclude                                       |                                                 | A list of services to ignore (mainly useful in combination with service=*)                                                                            |
 | [type](#check_service_type)                   | service                                         | The types of services to enumerate available types are driver, file-system-driver, kernel-driver, service, service-own-process, service-share-process |
 | [state](#check_service_state)                 | all                                             | The types of services to enumerate available states are active, inactive or all                                                                       |
 | only-essential                                | N/A                                             | Set filter to classification = 'essential'                                                                                                            |
diff --git a/docs/samples/index.rst b/docs/samples/index.rst
index 8ebcd8f72..7077ccf81 100644
--- a/docs/samples/index.rst
+++ b/docs/samples/index.rst
@@ -252,7 +252,7 @@ OK memory within bounds.|'page'=531G;3;3;0;3 'page %'=12%;79;89;0;100 'physical'
 ```
 **Overriding the unit:**
 
-Most "byte" checks such as memory have an auto scaling feature which means values wqill go from 800M to 1.2G between checks.
+Most "byte" checks such as memory have an auto scaling feature which means values will go from 800M to 1.2G between checks.
 Some graphing systems does not honor the units in performance data in which case you can get unexpected large values (such as 800G).
 To remedy this you can lock the unit by adding `perf-config=*(unit:G)`
 
@@ -266,7 +266,7 @@ page = 8.05G, physical = 7.85G
 check_os_version
 ----------------
 
-Check the version of the underlaying OS.
+Check the version of the underlying OS.
 
 .. include:: ../samples/**Default check:**
 
@@ -315,7 +315,7 @@ Performance data: 'total'=1G;14;19;0;23 'total %'=6%;59;79;0;100
 
 ```
 
-Getting help on avalible options::
+Getting help on available options::
 
 ```
 check_pagefile help
@@ -325,7 +325,7 @@ check_pagefile help
 					   the check.
 					   They do not denote warning or critical state but they
 					   are checked use this to filter out unwanted items.
-						   Avalible options:
+						   Available options:
 					   free          Free memory in bytes (g,m,k,b) or percentages %
 					   name          The name of the page file (location)
 					   size          Total size of pagefile
@@ -377,7 +377,7 @@ check_pdh "counter=\\4\\30" "warn=value > 5" "crit=value > 9999" flags=nocap100
 '\Minne\Dedikationsgräns value'=25729224704;5;9999
 ```
 
-Using real-time checks to check avergae values over time.
+Using real-time checks to check average values over time.
 
 Here we configure a counter to be checked at regular intervals and the value is added to a rrd buffer.
 The configuration from nsclient.ini::
@@ -517,7 +517,7 @@ check_service exclude=nfoo
 L        cli CRITICAL: CRITICAL: nscp=stopped (auto), nscp2=stopped (auto), ...
 ```
 
-Excluding nscp2 with substring like mathcing filter:
+Excluding nscp2 with substring like matching filter:
 ```
 check_service exclude=nfoo "filter=name not like 'nscp'"
 L        cli CRITICAL: CRITICAL: ...
diff --git a/modules/Scheduler/schedules_handler.hpp b/modules/Scheduler/schedules_handler.hpp
index 370a8e308..e1c7f1df3 100644
--- a/modules/Scheduler/schedules_handler.hpp
+++ b/modules/Scheduler/schedules_handler.hpp
@@ -144,7 +144,7 @@ namespace schedules {
 						"SCHEDULE CHANNEL", "Channel to send results on")
 
 					("interval", sh::string_fun_key(boost::bind(&schedule_object::set_duration, this, ph::_1)),
-					"SCHEDULE INTERAVAL", "Time in seconds between each check")
+					"SCHEDULE INTERVAL", "Time in seconds between each check")
 
 					("randomness", sh::string_fun_key(boost::bind(&schedule_object::set_randomness, this, ph::_1)),
 						"RANDOMNESS", "% of the interval which should be random to prevent overloading server resources")
@@ -162,7 +162,7 @@ namespace schedules {
 						"SCHEDULE CHANNEL", "Channel to send results on")
 
 					("interval", sh::string_fun_key(boost::bind(&schedule_object::set_duration, this, ph::_1)),
-						"SCHEDULE INTERAVAL", "Time in seconds between each check", true)
+						"SCHEDULE INTERVAL", "Time in seconds between each check", true)
 
 					("randomness", sh::string_fun_key(boost::bind(&schedule_object::set_randomness, this, ph::_1)),
 						"RANDOMNESS", "% of the interval which should be random to prevent overloading server resources")