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

reviewable/pr18780/r1
Nikolai Lifanov 10 years ago
commit 587f52085b

@ -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

@ -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).

Loading…
Cancel
Save