Use correct yaml in examples
add socket.timeout to external_ip exceptions catch
Merge pull request #9709 from makinacorpus/fix_to

add socket.timeout to external_ip exceptions catch
No `{}` in string format calls!
Merge pull request #9710 from s0undt3ch/hotfix/lint

No `{}` in string format calls!
Merge remote branch 'upstream/develop' into develop
Updated the salt bootstrap tutorial with an example to download the latest stable release with curl moved the wget example so it is right below the curl example to ensure users get the stable as opposed to the develop on accident. Fixed a weird wording issue, and some line lengths, though several still remain.