Michael DeHaan
31b63b033b
Merge conflict
2013-06-18 20:18:17 -04:00
Michael DeHaan
b4358d1300
Merge branch 'apt_key_file' of git://github.com/veeti/ansible into devel
...
Conflicts:
library/packaging/apt_key
2013-06-18 16:18:31 -04:00
Veeti Paananen
77159d21da
Add apt_key examples for file and data
2013-06-17 18:23:40 +03:00
Michael DeHaan
e128e8b563
Merge pull request #3162 from strawlab/apt-key-binary-fix
...
allow apt-key module to work with binary key
2013-06-16 20:27:10 -07:00
Michael DeHaan
613df1d649
Merge pull request #3213 from veeti/apt_key_data
...
Document the data argument for apt_key
2013-06-16 19:39:55 -07:00
Jan-Piet Mens
5c69918d53
DOCS: standardize on EXAMPLES (a.k.a. Docs-JumboPatch JetLag Edition)
...
Migrated all examples: in DOCUMENTATION=''' string to standalone EXAMPLES=''' string
Added deprecation warning to moduledev.rst and remove deprecated example from it
Fixed up a few typos and uppercased some acronyms.
add consistency to how EXAMPLES are formatted
2013-06-15 20:54:25 +02:00
Veeti Paananen
1284bfd742
Add a file argument to apt_key
2013-06-14 14:34:04 +03:00
Veeti Paananen
dcb06a2306
Document the data argument for apt_key
2013-06-14 14:32:56 +03:00
Andrew Straw
94e66ef558
allow apt-key module to work with binary key
2013-06-09 20:03:28 +00:00
Michael DeHaan
391fb98ee2
Allow modules to be categorized, and also sort them when generating the documentation.
2013-04-28 15:03:45 -04:00