Commit Graph

10 Commits

Author SHA1 Message Date
Nitin Madhok
12ea8f5c52 Fixing more sphinx/docs errors and warnings 2015-05-16 19:24:04 -04:00
Piotr Kasprzyk
6789306071 Fix misspellings 2015-04-10 12:21:20 +02:00
Thomas Jackson
f268bb8b4b Whitespace cleanup 2014-12-11 07:53:20 -08:00
Colton Myers
99e97320e1 Merge branch '2014.7' into develop
Conflicts:
	doc/ref/configuration/minion.rst
	doc/ref/states/requisites.rst
	doc/topics/troubleshooting/master.rst
	doc/topics/tutorials/index.rst
	doc/topics/tutorials/intro_scale.rst
	salt/config.py
	salt/key.py
	salt/master.py
	salt/minion.py
	salt/modules/file.py
	salt/modules/hashutil.py
	salt/modules/lxc.py
	salt/modules/oracle.py
	salt/modules/tls.py
	salt/modules/win_update.py
	salt/pillar/pepa.py
	salt/pillar/s3.py
	salt/states/augeas.py
	salt/states/win_update.py
	salt/tops/ext_nodes.py
	salt/utils/master.py
2014-09-22 14:22:54 -06:00
Erik Johnson
fbce823db7 Fix sphinx build error 2014-09-17 18:00:18 -05:00
Nitin Madhok
07e219b6db Fixing more sphinx warnings and errors 2014-08-11 14:08:19 -04:00
Mike Place
c176b3b452 Spelling fix 2014-08-06 09:22:25 -06:00
Seth House
39a0b4dfc3 Fix bad global rST links for the mailing lists 2014-07-14 15:04:50 -06:00
C. R. Oldham
3b794c8450 Add full gpg public key. 2014-07-07 14:39:07 -06:00
Seth House
92ebf99a1f Added security disclosure proceedure page
Closes #2315
2014-07-03 20:32:52 -06:00