diff --git a/lib/ansible/modules/commands/shell.py b/lib/ansible/modules/commands/shell.py
index 2877207327..0c208bffe5 100644
--- a/lib/ansible/modules/commands/shell.py
+++ b/lib/ansible/modules/commands/shell.py
@@ -112,13 +112,13 @@ EXAMPLES = '''
     spawn ssh admin@{{ cimc_host }}
 
     expect "password:"
-    send "{{ cimc_password }}\n"
+    send "{{ cimc_password }}\\n"
 
-    expect "\n{{ cimc_name }}"
-    send "connect host\n"
+    expect "\\n{{ cimc_name }}"
+    send "connect host\\n"
 
     expect "pxeboot.n12"
-    send "\n"
+    send "\\n"
 
     exit 0
   args:
diff --git a/lib/ansible/modules/network/ordnance/ordnance_config.py b/lib/ansible/modules/network/ordnance/ordnance_config.py
index b47640994a..f2291d5c5b 100644
--- a/lib/ansible/modules/network/ordnance/ordnance_config.py
+++ b/lib/ansible/modules/network/ordnance/ordnance_config.py
@@ -146,6 +146,7 @@ options:
 """
 
 EXAMPLES = """
+---
 # Note: examples below use the following provider dict to handle
 #       transport and authentication to the node.
 vars:
@@ -155,6 +156,7 @@ vars:
     password: password
     transport: cli
 
+---
 - name: configure top level configuration
   ordnance_config:
     lines: hostname {{ inventory_hostname }}
diff --git a/lib/ansible/modules/network/ordnance/ordnance_facts.py b/lib/ansible/modules/network/ordnance/ordnance_facts.py
index 03d32fcc49..493f888ef5 100644
--- a/lib/ansible/modules/network/ordnance/ordnance_facts.py
+++ b/lib/ansible/modules/network/ordnance/ordnance_facts.py
@@ -45,6 +45,7 @@ options:
 """
 
 EXAMPLES = """
+---
 # Note: examples below use the following provider dict to handle
 #       transport and authentication to the node.
 vars:
@@ -54,6 +55,7 @@ vars:
     password: ordnance
     transport: cli
 
+---
 # Collect all facts from the device
 - ordnance_facts:
     gather_subset: all
diff --git a/lib/ansible/modules/packaging/os/swupd.py b/lib/ansible/modules/packaging/os/swupd.py
index 656fcdd034..5bb29425e4 100644
--- a/lib/ansible/modules/packaging/os/swupd.py
+++ b/lib/ansible/modules/packaging/os/swupd.py
@@ -87,7 +87,7 @@ options:
 '''
 
 EXAMPLES = '''
-- name Update the OS to the latest version
+- name: Update the OS to the latest version
   swupd:
     update: yes
 
diff --git a/lib/ansible/modules/storage/netapp/na_cdot_aggregate.py b/lib/ansible/modules/storage/netapp/na_cdot_aggregate.py
index 0e2b6882b7..c711503296 100644
--- a/lib/ansible/modules/storage/netapp/na_cdot_aggregate.py
+++ b/lib/ansible/modules/storage/netapp/na_cdot_aggregate.py
@@ -58,23 +58,22 @@ options:
 '''
 
 EXAMPLES = """
-    - name: Manage Aggregates
-          na_cdot_aggregate:
-            state: present
-            name: ansibleAggr
-            disk_count: 1
-            hostname: "{{ netapp_hostname }}"
-            username: "{{ netapp_username }}"
-            password: "{{ netapp_password }}"
-
-    - name: Manage Aggregates
-          na_cdot_aggregate:
-            state: present
-            name: ansibleAggr
-            hostname: "{{ netapp_hostname }}"
-            username: "{{ netapp_username }}"
-            password: "{{ netapp_password }}"
+- name: Manage Aggregates
+  na_cdot_aggregate:
+    state: present
+    name: ansibleAggr
+    disk_count: 1
+    hostname: "{{ netapp_hostname }}"
+    username: "{{ netapp_username }}"
+    password: "{{ netapp_password }}"
 
+- name: Manage Aggregates
+  na_cdot_aggregate:
+    state: present
+    name: ansibleAggr
+    hostname: "{{ netapp_hostname }}"
+    username: "{{ netapp_username }}"
+    password: "{{ netapp_password }}"
 """
 
 RETURN = """
diff --git a/lib/ansible/modules/storage/netapp/na_cdot_license.py b/lib/ansible/modules/storage/netapp/na_cdot_license.py
index fc58200bc8..095034e862 100644
--- a/lib/ansible/modules/storage/netapp/na_cdot_license.py
+++ b/lib/ansible/modules/storage/netapp/na_cdot_license.py
@@ -77,31 +77,30 @@ options:
 
 
 EXAMPLES = """
+- name: Add licenses
+  na_cdot_license:
+    hostname: "{{ netapp_hostname }}"
+    username: "{{ netapp_username }}"
+    password: "{{ netapp_password }}"
+    serial_number: #################
+    licenses:
+      nfs: #################
+      cifs: #################
+      iscsi: #################
+      fcp: #################
+      snaprestore: #################
+      flexclone: #################
 
-    - name: Add licenses
-          na_cdot_license:
-            hostname: "{{ netapp_hostname }}"
-            username: "{{ netapp_username }}"
-            password: "{{ netapp_password }}"
-            serial_number: #################
-            licenses:
-              nfs: #################
-              cifs: #################
-              iscsi: #################
-              fcp: #################
-              snaprestore: #################
-              flexclone: #################
-
-    - name: Remove licenses
-          na_cdot_license:
-            hostname: "{{ netapp_hostname }}"
-            username: "{{ netapp_username }}"
-            password: "{{ netapp_password }}"
-            remove_unused: false
-            remove_expired: true
-            serial_number: #################
-            licenses:
-              nfs: remove
+- name: Remove licenses
+  na_cdot_license:
+    hostname: "{{ netapp_hostname }}"
+    username: "{{ netapp_username }}"
+    password: "{{ netapp_password }}"
+    remove_unused: false
+    remove_expired: true
+    serial_number: #################
+    licenses:
+      nfs: remove
 """
 
 RETURN = """
diff --git a/lib/ansible/modules/storage/netapp/na_cdot_lun.py b/lib/ansible/modules/storage/netapp/na_cdot_lun.py
index 113f0d6dee..d468fe672a 100644
--- a/lib/ansible/modules/storage/netapp/na_cdot_lun.py
+++ b/lib/ansible/modules/storage/netapp/na_cdot_lun.py
@@ -89,32 +89,30 @@ options:
 '''
 
 EXAMPLES = """
+- name: Create LUN
+  na_cdot_lun:
+    state: present
+    name: ansibleLUN
+    flexvol_name: ansibleVolume
+    vserver: ansibleVServer
+    size: 5
+    size_unit: mb
+    hostname: "{{ netapp_hostname }}"
+    username: "{{ netapp_username }}"
+    password: "{{ netapp_password }}"
 
-    - name: Create LUN
-          na_cdot_lun:
-            state: present
-            name: ansibleLUN
-            flexvol_name: ansibleVolume
-            vserver: ansibleVServer
-            size: 5
-            size_unit: mb
-            hostname: "{{ netapp_hostname }}"
-            username: "{{ netapp_username }}"
-            password: "{{ netapp_password }}"
-
-    - name: Resize Lun
-          na_cdot_lun:
-            state: present
-            name: ansibleLUN
-            force_resize: True
-            flexvol_name: ansibleVolume
-            vserver: ansibleVServer
-            size: 5
-            size_unit: gb
-            hostname: "{{ netapp_hostname }}"
-            username: "{{ netapp_username }}"
-            password: "{{ netapp_password }}"
-
+- name: Resize Lun
+  na_cdot_lun:
+    state: present
+    name: ansibleLUN
+    force_resize: True
+    flexvol_name: ansibleVolume
+    vserver: ansibleVServer
+    size: 5
+    size_unit: gb
+    hostname: "{{ netapp_hostname }}"
+    username: "{{ netapp_username }}"
+    password: "{{ netapp_password }}"
 """
 
 RETURN = """
diff --git a/lib/ansible/modules/storage/netapp/na_cdot_qtree.py b/lib/ansible/modules/storage/netapp/na_cdot_qtree.py
index 2fbabc6866..348c8dce3c 100644
--- a/lib/ansible/modules/storage/netapp/na_cdot_qtree.py
+++ b/lib/ansible/modules/storage/netapp/na_cdot_qtree.py
@@ -60,27 +60,25 @@ options:
 '''
 
 EXAMPLES = """
+- name: Create QTree
+  na_cdot_qtree:
+    state: present
+    name: ansibleQTree
+    flexvol_name: ansibleVolume
+    vserver: ansibleVServer
+    hostname: "{{ netapp_hostname }}"
+    username: "{{ netapp_username }}"
+    password: "{{ netapp_password }}"
 
-    - name: Create QTree
-          na_cdot_qtree:
-            state: present
-            name: ansibleQTree
-            flexvol_name: ansibleVolume
-            vserver: ansibleVServer
-            hostname: "{{ netapp_hostname }}"
-            username: "{{ netapp_username }}"
-            password: "{{ netapp_password }}"
-
-    - name: Rename QTree
-          na_cdot_qtree:
-            state: present
-            name: ansibleQTree
-            flexvol_name: ansibleVolume
-            vserver: ansibleVServer
-            hostname: "{{ netapp_hostname }}"
-            username: "{{ netapp_username }}"
-            password: "{{ netapp_password }}"
-
+- name: Rename QTree
+  na_cdot_qtree:
+    state: present
+    name: ansibleQTree
+    flexvol_name: ansibleVolume
+    vserver: ansibleVServer
+    hostname: "{{ netapp_hostname }}"
+    username: "{{ netapp_username }}"
+    password: "{{ netapp_password }}"
 """
 
 RETURN = """
diff --git a/lib/ansible/modules/storage/netapp/sf_account_manager.py b/lib/ansible/modules/storage/netapp/sf_account_manager.py
index 6b35d010af..8266225758 100755
--- a/lib/ansible/modules/storage/netapp/sf_account_manager.py
+++ b/lib/ansible/modules/storage/netapp/sf_account_manager.py
@@ -85,30 +85,30 @@ options:
 '''
 
 EXAMPLES = """
-    - name: Create Account
-      sf_account_manager:
-       hostname: "{{ solidfire_hostname }}"
-       username: "{{ solidfire_username }}"
-       password: "{{ solidfire_password }}"
-       state: present
-       name: TenantA
+- name: Create Account
+  sf_account_manager:
+    hostname: "{{ solidfire_hostname }}"
+    username: "{{ solidfire_username }}"
+    password: "{{ solidfire_password }}"
+    state: present
+    name: TenantA
 
-    - name: Modify Account
-     sf_account_manager:
-       hostname: "{{ solidfire_hostname }}"
-       username: "{{ solidfire_username }}"
-       password: "{{ solidfire_password }}"
-       state: present
-       name: TenantA
-       new_name: TenantA-Renamed
+- name: Modify Account
+  sf_account_manager:
+    hostname: "{{ solidfire_hostname }}"
+    username: "{{ solidfire_username }}"
+    password: "{{ solidfire_password }}"
+    state: present
+    name: TenantA
+    new_name: TenantA-Renamed
 
-    - name: Delete Account
-     sf_account_manager:
-       hostname: "{{ solidfire_hostname }}"
-       username: "{{ solidfire_username }}"
-       password: "{{ solidfire_password }}"
-       state: absent
-       name: TenantA-Renamed
+- name: Delete Account
+  sf_account_manager:
+    hostname: "{{ solidfire_hostname }}"
+    username: "{{ solidfire_username }}"
+    password: "{{ solidfire_password }}"
+    state: absent
+    name: TenantA-Renamed
 """
 
 RETURN = """