diff --git a/MPF.md b/MPF.md
index b862b75dfc..bf7534eead 100644
--- a/MPF.md
+++ b/MPF.md
@@ -798,6 +798,8 @@ This setting can be customized via Augments, for example:
 }
 ```
 
+**See also:** [`mailmaxlines`][cf-execd#mailmaxlines]
+
 ### domain
 
 The domain the host is configured for. Defaults to domain configured on system, e.g. the output from ```hostname -d```. This setting influences `sys.domain` and `mailfrom` if not customized.
@@ -819,8 +821,6 @@ This setting can be customized via Augments, for example:
 
 * Added in CFEngine 3.22.0, 3.21.1, 3.18.4
 
-**See also:** [`mailmaxlines`][cf-execd#mailmaxlines]
-
 ### Configure subject for emails sent by cf-execd
 
 When enabled `cf-execd` emails output that differs from previous executions. The subject of the email can be configured by setting `mailsubject` in `body executor control`. This will use the value of `default:def.control_executor_mailsubject` if it is a non-empty string.
@@ -881,6 +881,27 @@ control` are stripped before sending. The MPF will use the value of
 
 * Added in 3.22.0, 3.21.2
 
+### Configure maximum number of lines of output in emails sent by cf-execd
+
+When enabled `cf-execd` emails output that differs from previous executions.
+The number of lines from the output sent via email can be configured by setting
+`mailmaxlines` in `body executor control`. Setting it to `0` disables sending emails.
+The MPF will use the value of `default:def.control_executor_mailmaxlines`.
+
+```json
+{
+  "variables": {
+    "default:def.control_executor_mailmaxlines": {
+        "value": 0
+    }
+  }
+}
+```
+
+**History:**
+
+* Added in 3.22.0, 3.21.2, 3.18.5
+
 ### acl
 
 `def.acl` is a list of of network ranges that should be allowed to connect to cf-serverd. It is also used in the default access promises to allow hosts access to policy and modules that should be distributed.
diff --git a/controls/cf_execd.cf b/controls/cf_execd.cf
index 84564fc2f9..361c84bcc1 100644
--- a/controls/cf_execd.cf
+++ b/controls/cf_execd.cf
@@ -8,7 +8,7 @@
 
 body executor control
 # @brief Settings that determine the behavior of `cf-execd`
-# @variable `default:def.control_executor_maxmaillines` - The maximumm number of lines of output that `cf-execd` will email.
+# @variable `default:def.control_executor_mailmaxlines` - The maximum number of lines of output that `cf-execd` will email.
 {
 
     any::
diff --git a/services/autorun/README.md b/services/autorun/README.md
index b0520dfb62..5273a06ac0 100644
--- a/services/autorun/README.md
+++ b/services/autorun/README.md
@@ -29,9 +29,9 @@ allow policy files to be dynamically loaded or tagged bundles to be run
 independently of each-other. If you have an automatically loaded policy file in
 `services/autorun` which loads additional policy dynamically, `cf-promises` may
 not be able to resolve syntax errors. Use
-[`mpf_extra_autorun_inputs`][mpf_extra_autorun_inputs]
+[`mpf_extra_autorun_inputs`][Masterfiles Policy Framework#Add additional policy files for update (inputs)]
 and or
-[`control_common_bundlesequence_classification`][mpf-classification-bundles]
+[`control_common_bundlesequence_classification`][Masterfiles Policy Framework#Classification bundles before autorun]
 to work around this limitation.
 
 **History:**
@@ -77,7 +77,7 @@ Example definition of ```services_autorun_bundles``` using [Augments (def.json)]
 
 #### Additional automatically loaded inputs
 
-When `def.mpf_extra_autorun_inputs` is defined (and services_autorun is defined), the policy files (`*.cf`) in those directories will be added to inputs. If a directory is specified but is not a directory, it will be skipped.
+When `def.mpf_extra_autorun_inputs` is defined (and `services_autorun` is defined), the policy files (`*.cf`) in those directories will be added to inputs. If a directory is specified but is not a directory, it will be skipped.
 
 ```json
 {