From 99646d5dbba3a0117d0d89c6ba1ec78650f3865e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9=20Moser?= <mail@renemoser.net>
Date: Tue, 24 May 2016 13:24:04 +0200
Subject: [PATCH] fix build and doc cleanups (#2286)

---
 lib/ansible/modules/extras/.travis.yml        |  2 ++
 .../modules/extras/windows/win_package.py     | 28 ++++++++-----------
 2 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/lib/ansible/modules/extras/.travis.yml b/lib/ansible/modules/extras/.travis.yml
index 0435132fef..62c8b7174a 100644
--- a/lib/ansible/modules/extras/.travis.yml
+++ b/lib/ansible/modules/extras/.travis.yml
@@ -24,6 +24,7 @@ env:
       cloud/amazon/ec2_snapshot_facts.py
       cloud/amazon/ec2_vol_facts.py
       cloud/amazon/ec2_vpc_igw.py
+      cloud/amazon/ec2_vpc_nacl.py
       cloud/amazon/ec2_vpc_net_facts.py
       cloud/amazon/ec2_vpc_route_table_facts.py
       cloud/amazon/ec2_vpc_route_table.py
@@ -109,6 +110,7 @@ env:
       notification/mqtt.py
       notification/sns.py
       notification/typetalk.py
+      packaging/language/maven_artifact.py
       packaging/os/layman.py
       packaging/os/yum_repository.py
       source_control/gitlab_group.py
diff --git a/lib/ansible/modules/extras/windows/win_package.py b/lib/ansible/modules/extras/windows/win_package.py
index 2fc2b53c9c..633f6c6d33 100644
--- a/lib/ansible/modules/extras/windows/win_package.py
+++ b/lib/ansible/modules/extras/windows/win_package.py
@@ -28,31 +28,28 @@ version_added: "1.7"
 author: Trond Hindenes
 short_description: Installs/Uninstalls a installable package, either from local file system or url
 description:
-     - Installs or uninstalls a package.  Optionally uses a product_id to check if the package needs installing.  You can find product ids for installed programs in the windows registry either in ``HKLM:Software\Microsoft\Windows\CurrentVersion\Uninstall`` or for 32 bit programs ``HKLM:Software\Wow6432Node\Microsoft\Windows\CurrentVersion\Uninstall``
+     - Installs or uninstalls a package.
+     - 'Optionally uses a product_id to check if the package needs installing. You can find product ids for installed programs in the windows registry either in C(HKLM:Software\\Microsoft\\Windows\CurrentVersion\\Uninstall) or for 32 bit programs C(HKLM:Software\\Wow6432Node\\Microsoft\\Windows\\CurrentVersion\\Uninstall)'
 options:
   path:
     description:
       - Location of the package to be installed (either on file system, network share or url)
     required: true
-    default: null
-    aliases: []
   name:
     description:
       - name of the package. Just for logging reasons, will use the value of path if name isn't specified
     required: false
     default: null
-    aliases: []
   product_id:
     description:
       - product id of the installed package (used for checking if already installed)
     required: true
-    default: null
     aliases: [productid]
   arguments:
     description:
       - Any arguments the installer needs
     default: null
-    aliases: []
+    required: false
   state:
     description:
       - Install or Uninstall
@@ -60,28 +57,27 @@ options:
       - present
       - absent
     default: present
+    required: false
     aliases: [ensure]
   user_name:
     description:
       - Username of an account with access to the package if its located on a file share. Only needed if the winrm user doesn't have access to the package. Also specify user_password for this to function properly.
     default: null
-    aliases: []
+    required: false
   user_password:
     description:
       - Password of an account with access to the package if its located on a file share. Only needed if the winrm user doesn't have access to the package. Also specify user_name for this to function properly.
     default: null
-    aliases: []
+    required: false
 '''
 
 EXAMPLES = '''
 # Playbook example
-  - name: Install the vc thingy
-    win_package:
-      name="Microsoft Visual C thingy"
-      path="http://download.microsoft.com/download/1/6/B/16B06F60-3B20-4FF2-B699-5E9B7962F9AE/VSU_4/vcredist_x64.exe"
-      Product_Id="{CF2BEA3C-26EA-32F8-AA9B-331F7E34BA97}"
-      Arguments="/install /passive /norestart"
-
-
+- name: Install the vc thingy
+  win_package:
+    name="Microsoft Visual C thingy"
+    path="http://download.microsoft.com/download/1/6/B/16B06F60-3B20-4FF2-B699-5E9B7962F9AE/VSU_4/vcredist_x64.exe"
+    Product_Id="{CF2BEA3C-26EA-32F8-AA9B-331F7E34BA97}"
+    Arguments="/install /passive /norestart"
 '''