Resolving differences in core modules post-merge

lib/ansible/modules/system/cron.py

@@ -137,7 +137,7 @@ options:
   disabled:
     description:
       - If the job should be disabled (commented out) in the crontab. Only has effect if state=present
-    version_added: "1.9"
+    version_added: "2.0"
     required: false
     default: false
   env:
@@ -152,14 +152,14 @@ options:
     description:
       - Used with C(state=present) and C(env). If specified, the environment variable will be
         inserted after the declaration of specified environment variable.
-    version_added: "2"
+    version_added: "2.1"
     required: false
     default: null
   insertbefore:
     description:
       - Used with C(state=present) and C(env). If specified, the environment variable will be
         inserted before the declaration of specified environment variable.
-    version_added: "2"
+    version_added: "2.1"
     required: false
     default: null
 requirements:

lib/ansible/modules/system/setup.py

@@ -80,7 +80,7 @@ notes:
     - If the target host is Windows, you will not currently have the ability to use
       C(filter) as this is provided by a simpler implementation of the module.
     - If the target host is Windows you can now use C(fact_path). Make sure that this path 
-      exists on the target host. Files in this path MUST be PowerShell scripts (*.ps1) and 
+      exists on the target host. Files in this path MUST be PowerShell scripts (``*.ps1``) and 
       their output must be formattable in JSON (Ansible will take care of this). Test the 
       output of your scripts.
       This option was added in Ansible 2.1.

lib/ansible/modules/system/user.py

@@ -57,6 +57,7 @@ options:
         required: false
         description:
             - Optionally sets the seuser type (user_u) on selinux enabled systems.
+        version_added: "2.1"
     group:
         required: false
         description: