diff --git a/lib/ansible/modules/cloud/azure/azure_rm_postgresqldatabase.py b/lib/ansible/modules/cloud/azure/azure_rm_postgresqldatabase.py
index 5d76184e630..2d734807e97 100644
--- a/lib/ansible/modules/cloud/azure/azure_rm_postgresqldatabase.py
+++ b/lib/ansible/modules/cloud/azure/azure_rm_postgresqldatabase.py
@@ -17,7 +17,7 @@ DOCUMENTATION = '''
 ---
 module: azure_rm_postgresqldatabase
 version_added: "2.5"
-short_description: Manage PostgreSQL Database instance.
+short_description: Manage PostgreSQL Database instance
 description:
     - Create, update and delete instance of PostgreSQL Database.
 
@@ -37,21 +37,17 @@ options:
     charset:
         description:
             - The charset of the database. Check PostgreSQL documentation for possible values.
-            - This is only set on creation, use I(force_update) to recreate a database if the
-              values don't match.
+            - This is only set on creation, use I(force_update) to recreate a database if the values don't match.
     collation:
         description:
             - The collation of the database. Check PostgreSQL documentation for possible values.
-            - This is only set on creation, use I(force_update) to recreate a database if the
-              values don't match.
+            - This is only set on creation, use I(force_update) to recreate a database if the values don't match.
     force_update:
-      description:
-          - When set to C(true), will delete and recreate the existing PostgreSQL database if any
-            of the properties don't match what is set.
-          - When set to C(false), no change will occur to the database even if any
-            of the properties do not match.
-      type: bool
-      default: 'no'
+        description:
+            - When set to C(true), will delete and recreate the existing PostgreSQL database if any of the properties don't match what is set.
+            - When set to C(false), no change will occur to the database even if any of the properties do not match.
+        type: bool
+        default: 'no'
     state:
         description:
             - Assert the state of the PostgreSQL database. Use C(present) to create or update a database and C(absent) to delete it.
@@ -64,7 +60,7 @@ extends_documentation_fragment:
     - azure
 
 author:
-    - "Zim Kalinowski (@zikalino)"
+    - Zim Kalinowski (@zikalino)
 
 '''
 
@@ -79,7 +75,7 @@ EXAMPLES = '''
 RETURN = '''
 id:
     description:
-        - Resource ID
+        - Resource ID.
     returned: always
     type: str
     sample: "/subscriptions/xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx/resourceGroups/myResourceGroups/providers/Microsoft.DBforPostgreSQL/servers/testserve
diff --git a/lib/ansible/modules/cloud/azure/azure_rm_postgresqldatabase_facts.py b/lib/ansible/modules/cloud/azure/azure_rm_postgresqldatabase_facts.py
index 96c5f13e3dc..e22e713caa9 100644
--- a/lib/ansible/modules/cloud/azure/azure_rm_postgresqldatabase_facts.py
+++ b/lib/ansible/modules/cloud/azure/azure_rm_postgresqldatabase_facts.py
@@ -17,7 +17,7 @@ DOCUMENTATION = '''
 ---
 module: azure_rm_postgresqldatabase_facts
 version_added: "2.7"
-short_description: Get Azure PostgreSQL Database facts.
+short_description: Get Azure PostgreSQL Database facts
 description:
     - Get facts of PostgreSQL Database.
 
@@ -38,7 +38,7 @@ extends_documentation_fragment:
     - azure
 
 author:
-    - "Zim Kalinowski (@zikalino)"
+    - Zim Kalinowski (@zikalino)
 
 '''
 
@@ -57,13 +57,14 @@ EXAMPLES = '''
 
 RETURN = '''
 databases:
-    description: A list of dict results where the key is the name of the PostgreSQL Database and the values are the facts for that PostgreSQL Database.
+    description:
+        - A list of dict results where the key is the name of the PostgreSQL Database and the values are the facts for that PostgreSQL Database.
     returned: always
     type: complex
     contains:
         id:
             description:
-                - Resource ID
+                - Resource ID.
             returned: always
             type: str
             sample: "/subscriptions/xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx/resourceGroups/myResourceGroup/providers/Microsoft.DBforPostgreSQL/servers/testser