Merge pull request #2913 from msvab/devel

Clarify get_url timeout documentation
This commit is contained in:
Brian Coca 2016-02-23 13:30:39 -05:00
commit 7162623e86

View file

@ -98,8 +98,8 @@ options:
destination file will be calculated after it is downloaded to ensure
its integrity and verify that the transfer completed successfully.
Format: <algorithm>:<checksum>, e.g.: checksum="sha256:D98291AC[...]B6DC7B97"
If you worry about portability, only the sha1 algorithm is available
on all platforms and python versions. The third party hashlib
If you worry about portability, only the sha1 algorithm is available
on all platforms and python versions. The third party hashlib
library can be installed for access to additional algorithms.
Additionaly, if a checksum is passed to this parameter, and the file exist under
the C(dest) location, the destination_checksum would be calculated, and if
@ -124,7 +124,7 @@ options:
choices: ['yes', 'no']
timeout:
description:
- Timeout for URL request
- Timeout in seconds for URL request
required: false
default: 10
version_added: '1.8'