diff --git a/docs/modules/ROOT/pages/documentation/extensions/notifiers/snmp-notifier.adoc b/docs/modules/ROOT/pages/documentation/extensions/notifiers/snmp-notifier.adoc
index b795254d..13b173f0 100644
--- a/docs/modules/ROOT/pages/documentation/extensions/notifiers/snmp-notifier.adoc
+++ b/docs/modules/ROOT/pages/documentation/extensions/notifiers/snmp-notifier.adoc
@@ -150,7 +150,7 @@ To configure the Notification Service from the command line, use the
 
 [source, shell]
 ----
-asadmin> set-snmp-notifier-configuration --enabled=true --dynamic=true --hostname=localhost --port=162 --community=public --oid=".1.3.6.1.2.1.1.8" --version=v2c
+asadmin> set-snmp-notifier-configuration --enabled=true --dynamic=true --hostname=localhost --snmpport=162 --community=public --oid=".1.3.6.1.2.1.1.8" --version=v2c
 ----
 
 You can use the `--enabled` and `--dynamic` options to enable or disable
@@ -169,7 +169,7 @@ below for an example:
 
 [source, shell]
 ----
-Enabled  Noisy  Community  OID                Version  Host       Port
+Enabled  Noisy  Community  OID                Version  Host       SNMP Port
 true     false  example    .1.3.6.1.2.1.1.8   v2c      127.0.0.1  162
 ----
 
diff --git a/docs/modules/ROOT/pages/documentation/extensions/notifiers/xmpp-notifier.adoc b/docs/modules/ROOT/pages/documentation/extensions/notifiers/xmpp-notifier.adoc
index b58ddd87..5e014b7b 100644
--- a/docs/modules/ROOT/pages/documentation/extensions/notifiers/xmpp-notifier.adoc
+++ b/docs/modules/ROOT/pages/documentation/extensions/notifiers/xmpp-notifier.adoc
@@ -192,7 +192,7 @@ configuration options like this:
 
 [source, shell]
 ----
-asadmin> set-xmpp-notifier-configuration --enabled=true --dynamic=true --hostname="172.28.128.3" --port=5222 --username="payara_notifier" --password="******" --securityDisabled=false --roomid=server
+asadmin> set-xmpp-notifier-configuration --enabled=true --dynamic=true --hostname="172.28.128.3" --xmppport=5222 --username="payara_notifier" --password="******" --securityDisabled=false --roomid=server
 ----
 
 You can use the `--enabled` and `--dynamic` options to enable or disable
@@ -205,8 +205,8 @@ using the `get-xmpp-notifier-configuration` asadmin command like this:
 ----
 asadmin > get-xmpp-notifier-configuration
 
-Enabled  Noisy  Host          Port  Service Name            Username         Password  Security Disabled  Room ID
-true     false  172.28.128.3  5222  conference.payara.fish  payara_notifier  payara    true               server
+Enabled  Noisy  Host          XMPP Port  Service Name            Username         Password  Security Disabled  Room ID
+true     false  172.28.128.3  5222       conference.payara.fish  payara_notifier  payara    true               server
 ----
 
 [[on-the-domain.xml-configuration-file]]
diff --git a/docs/modules/ROOT/pages/documentation/payara-server/admin-console/auditing-service.adoc b/docs/modules/ROOT/pages/documentation/payara-server/admin-console/auditing-service.adoc
index d6552484..8ed285a4 100644
--- a/docs/modules/ROOT/pages/documentation/payara-server/admin-console/auditing-service.adoc
+++ b/docs/modules/ROOT/pages/documentation/payara-server/admin-console/auditing-service.adoc
@@ -70,7 +70,7 @@ This command can be used to set the configuration settings of the service.
 [cols=",,a,,",options="header",]
 |=======================================================================
 |Option      |Type    |Description                     |Default |Mandatory
-|`--enabled` |Boolean |Enables or disables the service |false   |Yes
+|`--enabled` |Boolean |Enables or disables the service |false   |No
 |`--dynamic` |Boolean |Whether to apply changes immediately of after a domain restart. |false |No
 |`--auditLevel` |String | Sets the auditing level. One of: 
 
diff --git a/docs/modules/ROOT/pages/documentation/payara-server/health-check-service/asadmin-commands.adoc b/docs/modules/ROOT/pages/documentation/payara-server/health-check-service/asadmin-commands.adoc
index 372aa03f..0b58b23e 100644
--- a/docs/modules/ROOT/pages/documentation/payara-server/health-check-service/asadmin-commands.adoc
+++ b/docs/modules/ROOT/pages/documentation/payara-server/health-check-service/asadmin-commands.adoc
@@ -50,7 +50,7 @@ Enables and disables the HealthCheck service. This includes configuration for tr
 |Boolean
 |Whether to enable or disable the service
 |N/A
-|yes
+|no
 
 |`--historic-trace-enabled`
 |Boolean