diff --git a/plugins/doc_fragments/auth_basic.py b/plugins/doc_fragments/auth_basic.py
index e05311af03..674fb1e9ab 100644
--- a/plugins/doc_fragments/auth_basic.py
+++ b/plugins/doc_fragments/auth_basic.py
@@ -28,5 +28,5 @@ options:
     description:
       - Whether or not to validate SSL certs when supplying a https endpoint.
     type: bool
-    default: yes
+    default: true
 '''
diff --git a/plugins/doc_fragments/dimensiondata.py b/plugins/doc_fragments/dimensiondata.py
index f754f9cc76..f8372431e0 100644
--- a/plugins/doc_fragments/dimensiondata.py
+++ b/plugins/doc_fragments/dimensiondata.py
@@ -47,5 +47,5 @@ options:
       - If C(false), SSL certificates will not be validated.
       - This should only be used on private instances of the CloudControl API that use self-signed certificates.
     type: bool
-    default: yes
+    default: true
 '''
diff --git a/plugins/doc_fragments/dimensiondata_wait.py b/plugins/doc_fragments/dimensiondata_wait.py
index 509f5c56fb..d371528396 100644
--- a/plugins/doc_fragments/dimensiondata_wait.py
+++ b/plugins/doc_fragments/dimensiondata_wait.py
@@ -21,7 +21,7 @@ options:
     description:
       - Should we wait for the task to complete before moving onto the next.
     type: bool
-    default: no
+    default: false
   wait_time:
     description:
       - The maximum amount of time (in seconds) to wait for the task to complete.
diff --git a/plugins/doc_fragments/influxdb.py b/plugins/doc_fragments/influxdb.py
index 133041a628..f9e08550bd 100644
--- a/plugins/doc_fragments/influxdb.py
+++ b/plugins/doc_fragments/influxdb.py
@@ -46,10 +46,10 @@ options:
     version_added: '0.2.0'
   validate_certs:
     description:
-    - If set to C(no), the SSL certificates will not be validated.
-    - This should only set to C(no) used on personally controlled sites using self-signed certificates.
+    - If set to C(false), the SSL certificates will not be validated.
+    - This should only set to C(false) used on personally controlled sites using self-signed certificates.
     type: bool
-    default: yes
+    default: true
   ssl:
     description:
     - Use https instead of http to connect to InfluxDB server.
diff --git a/plugins/doc_fragments/ipa.py b/plugins/doc_fragments/ipa.py
index d799bac184..5051c55390 100644
--- a/plugins/doc_fragments/ipa.py
+++ b/plugins/doc_fragments/ipa.py
@@ -61,10 +61,10 @@ options:
   validate_certs:
     description:
     - This only applies if C(ipa_prot) is I(https).
-    - If set to C(no), the SSL certificates will not be validated.
-    - This should only set to C(no) used on personally controlled sites using self-signed certificates.
+    - If set to C(false), the SSL certificates will not be validated.
+    - This should only set to C(false) used on personally controlled sites using self-signed certificates.
     type: bool
-    default: yes
+    default: true
   ipa_timeout:
     description:
     - Specifies idle timeout (in seconds) for the connection.
diff --git a/plugins/doc_fragments/keycloak.py b/plugins/doc_fragments/keycloak.py
index 3ef0aeb9e3..5d79fad7c0 100644
--- a/plugins/doc_fragments/keycloak.py
+++ b/plugins/doc_fragments/keycloak.py
@@ -61,7 +61,7 @@ options:
         description:
             - Verify TLS certificates (do not disable this in production).
         type: bool
-        default: yes
+        default: true
 
     connection_timeout:
         description:
diff --git a/plugins/doc_fragments/ldap.py b/plugins/doc_fragments/ldap.py
index d5c8107d35..28e9d2fdae 100644
--- a/plugins/doc_fragments/ldap.py
+++ b/plugins/doc_fragments/ldap.py
@@ -49,13 +49,13 @@ options:
     description:
       - If true, we'll use the START_TLS LDAP extension.
     type: bool
-    default: no
+    default: false
   validate_certs:
     description:
-      - If set to C(no), SSL certificates will not be validated.
+      - If set to C(false), SSL certificates will not be validated.
       - This should only be used on sites using self-signed certificates.
     type: bool
-    default: yes
+    default: true
   sasl_class:
     description:
       - The class to use for SASL authentication.
diff --git a/plugins/doc_fragments/manageiq.py b/plugins/doc_fragments/manageiq.py
index be0dd70694..030d682385 100644
--- a/plugins/doc_fragments/manageiq.py
+++ b/plugins/doc_fragments/manageiq.py
@@ -40,7 +40,7 @@ options:
         description:
           - Whether SSL certificates should be verified for HTTPS requests. defaults to True.
         type: bool
-        default: yes
+        default: true
         aliases: [ verify_ssl ]
       ca_cert:
         description:
diff --git a/plugins/doc_fragments/oneview.py b/plugins/doc_fragments/oneview.py
index 0ab50e637b..54288e51f6 100644
--- a/plugins/doc_fragments/oneview.py
+++ b/plugins/doc_fragments/oneview.py
@@ -63,7 +63,7 @@ options:
             - When the ETag Validation is enabled, the request will be conditionally processed only if the current ETag
                 for the resource matches the ETag provided in the data.
         type: bool
-        default: yes
+        default: true
 '''
 
     FACTSPARAMS = r'''
diff --git a/plugins/doc_fragments/online.py b/plugins/doc_fragments/online.py
index c0757ca6a1..d7e13765b0 100644
--- a/plugins/doc_fragments/online.py
+++ b/plugins/doc_fragments/online.py
@@ -34,7 +34,7 @@ options:
     description:
       - Validate SSL certs of the Online API.
     type: bool
-    default: yes
+    default: true
 notes:
   - Also see the API documentation on U(https://console.online.net/en/api/)
   - If C(api_token) is not set within the module, the following
diff --git a/plugins/doc_fragments/opennebula.py b/plugins/doc_fragments/opennebula.py
index 91bfd09529..0fc323271a 100644
--- a/plugins/doc_fragments/opennebula.py
+++ b/plugins/doc_fragments/opennebula.py
@@ -36,7 +36,7 @@ options:
             - Whether to validate the SSL certificates or not.
             - This parameter is ignored if PYTHONHTTPSVERIFY environment variable is used.
         type: bool
-        default: yes
+        default: true
     wait_timeout:
         description:
             - Time to wait for the desired state to be reached before timeout, in seconds.
diff --git a/plugins/doc_fragments/openswitch.py b/plugins/doc_fragments/openswitch.py
index 317ec904e5..9d5f0be742 100644
--- a/plugins/doc_fragments/openswitch.py
+++ b/plugins/doc_fragments/openswitch.py
@@ -71,11 +71,11 @@ options:
     default: ssh
   use_ssl:
     description:
-      - Configures the I(transport) to use SSL if set to C(yes) only when the
+      - Configures the I(transport) to use SSL if set to C(true) only when the
         I(transport) argument is configured as rest.  If the transport
         argument is not I(rest), this value is ignored.
     type: bool
-    default: yes
+    default: true
   provider:
     description:
       - Convenience method that allows all I(openswitch) arguments to be passed as
diff --git a/plugins/doc_fragments/oracle_wait_options.py b/plugins/doc_fragments/oracle_wait_options.py
index 6ca2a8c033..ce7ea776e2 100644
--- a/plugins/doc_fragments/oracle_wait_options.py
+++ b/plugins/doc_fragments/oracle_wait_options.py
@@ -12,15 +12,15 @@ class ModuleDocFragment(object):
     options:
         wait:
             description: Whether to wait for create or delete operation to complete.
-            default: yes
+            default: true
             type: bool
         wait_timeout:
-            description: Time, in seconds, to wait when I(wait=yes).
+            description: Time, in seconds, to wait when I(wait=true).
             default: 1200
             type: int
         wait_until:
-            description: The lifecycle state to wait for the resource to transition into when I(wait=yes). By default,
-                         when I(wait=yes), we wait for the resource to get into ACTIVE/ATTACHED/AVAILABLE/PROVISIONED/
+            description: The lifecycle state to wait for the resource to transition into when I(wait=true). By default,
+                         when I(wait=true), we wait for the resource to get into ACTIVE/ATTACHED/AVAILABLE/PROVISIONED/
                          RUNNING applicable lifecycle state during create operation & to get into DELETED/DETACHED/
                          TERMINATED lifecycle state during delete operation.
             type: str
diff --git a/plugins/doc_fragments/proxmox.py b/plugins/doc_fragments/proxmox.py
index 50fe6ea0e6..e39af4f3a6 100644
--- a/plugins/doc_fragments/proxmox.py
+++ b/plugins/doc_fragments/proxmox.py
@@ -38,10 +38,10 @@ options:
     version_added: 1.3.0
   validate_certs:
     description:
-      - If C(no), SSL certificates will not be validated.
+      - If C(false), SSL certificates will not be validated.
       - This should only be used on personally controlled sites using self-signed certificates.
     type: bool
-    default: no
+    default: false
 requirements: [ "proxmoxer", "requests" ]
 '''
 
diff --git a/plugins/doc_fragments/scaleway.py b/plugins/doc_fragments/scaleway.py
index 187288fbf8..b08d11dbb0 100644
--- a/plugins/doc_fragments/scaleway.py
+++ b/plugins/doc_fragments/scaleway.py
@@ -40,7 +40,7 @@ options:
     description:
       - Validate SSL certs of the Scaleway API.
     type: bool
-    default: yes
+    default: true
 notes:
   - Also see the API documentation on U(https://developer.scaleway.com/)
   - If C(api_token) is not set within the module, the following
diff --git a/plugins/doc_fragments/utm.py b/plugins/doc_fragments/utm.py
index 6700ac5320..d8b2305d23 100644
--- a/plugins/doc_fragments/utm.py
+++ b/plugins/doc_fragments/utm.py
@@ -43,7 +43,7 @@ options:
         description:
           - Whether the REST interface's ssl certificate should be verified or not.
         type: bool
-        default: yes
+        default: true
     state:
         description:
           - The desired state of the object.
diff --git a/plugins/doc_fragments/vexata.py b/plugins/doc_fragments/vexata.py
index 31e2f24f74..ff79613eec 100644
--- a/plugins/doc_fragments/vexata.py
+++ b/plugins/doc_fragments/vexata.py
@@ -40,10 +40,10 @@ options:
   validate_certs:
     description:
       - Allows connection when SSL certificates are not valid. Set to C(false) when certificates are not trusted.
-      - If set to C(yes), please make sure Python >= 2.7.9 is installed on the given machine.
+      - If set to C(true), please make sure Python >= 2.7.9 is installed on the given machine.
     required: false
     type: bool
-    default: 'no'
+    default: false
 
 requirements:
   - Vexata VX100 storage array with VXOS >= v3.5.0 on storage array
diff --git a/plugins/doc_fragments/xenserver.py b/plugins/doc_fragments/xenserver.py
index 66522fcf4c..eaee173849 100644
--- a/plugins/doc_fragments/xenserver.py
+++ b/plugins/doc_fragments/xenserver.py
@@ -37,5 +37,5 @@ options:
     - Allows connection when SSL certificates are not valid. Set to C(false) when certificates are not trusted.
     - If the value is not specified in the task, the value of environment variable C(XENSERVER_VALIDATE_CERTS) will be used instead.
     type: bool
-    default: yes
+    default: true
 '''