Merge remote-tracking branch 'upstream/devel' into devel

This commit is contained in:
Nikolai Lifanov 2014-12-18 09:10:13 -05:00
commit 587f52085b
3 changed files with 2 additions and 2 deletions

0
windows/__init__.py Normal file
View file

View file

@ -24,7 +24,7 @@
DOCUMENTATION = '''
---
module: win_chocolatey
version_added: "1.8"
version_added: "1.9"
short_description: Installs packages using chocolatey
description:
- Installs packages using Chocolatey (http://chocolatey.org/). If Chocolatey is missing from the system, the module will install it. List of packages can be found at http://chocolatey.org/packages

View file

@ -24,7 +24,7 @@
DOCUMENTATION = '''
---
module: win_updates
version_added: "1.8"
version_added: "1.9"
short_description: Lists / Installs windows updates
description:
- Installs windows updates using PSWindowsUpdate (http://gallery.technet.microsoft.com/scriptcenter/2d191bcd-3308-4edd-9de2-88dff796b0bc).