Commit Graph

10 Commits

Author SHA1 Message Date
Colton Myers
56520f4ac9 Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2
Conflicts:
	conf/minion
	salt/modules/cron.py
	salt/modules/pip.py
	salt/modules/tls.py
2015-02-06 13:00:14 -07:00
Seth House
15936658ba Added cross-references to other ways to preseed minion keys 2015-02-05 19:15:46 -07:00
Thomas Jackson
c18e834be1 Fix trailing whitespace
Conflicts:
	doc/topics/tutorials/states_pt2.rst
2014-12-11 07:53:19 -08:00
Peter Waller
237b79ccbc Fix link to AWS credential distribution blog post
The existing link left me feeling confused and unfulfilled. I think that's possibly because it accidentally linked to the previous post in the series. I found the "correct" post by googling for it.
2014-04-30 18:03:18 +01:00
AnneTheAgile
78bc296ec0 #9356 Add cite to IAM for EC2 credential sharing. 2014-02-24 16:28:28 -05:00
Colton Myers
7b493bb024 Remove trailing whitespace from preseeding tutorial 2014-02-11 16:24:40 -07:00
Colton Myers
f1654b67a5 Fix insecure recommendations in preseed tutorial, Fix #9997 2014-02-11 16:24:15 -07:00
Erik Johnson
9c63495e04 Formatting fixes
This completes the documentation audit begun in cf365f7, using proper
backticks and :strong: tags to emphasize text, converting groups of
shell commands to bash code-block sections, etc. This also replaces the
use of \* with the easier-to-grok '*', which will hopefully reduce
confusion among new users.
2013-08-11 22:17:47 -05:00
DaveQB
6ac1fa35ac Edited for the new layout of the pki directory in version 0.11+ 2013-01-07 15:44:09 +11:00
Alec Koumjian
39e4d8d976 Added tutorial for preseeding minions with accepted keys. 2012-06-14 09:26:47 -07:00