Colton Myers 35425b14ad Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 ... Conflicts: doc/man/salt-api.1 doc/man/salt-call.1 doc/man/salt-cloud.1 doc/man/salt-cp.1 doc/man/salt-key.1 doc/man/salt-master.1 doc/man/salt-minion.1 doc/man/salt-run.1 doc/man/salt-ssh.1 doc/man/salt-syndic.1 doc/man/salt-unity.1 doc/man/salt.1 doc/man/salt.7 salt/modules/pip.py salt/states/user.py		2015-10-07 12:06:12 -06:00
..
_includes	Change docs for --static option with JSON - text A	2015-07-27 09:00:59 -06:00
index.rst	Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8	2015-10-07 12:06:12 -06:00
salt-api.rst	Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2	2015-04-16 10:37:38 -06:00
salt-call.rst	Refs #24235	2015-06-10 09:45:03 -06:00
salt-cloud.rst	Bug fixes and build errors	2015-06-05 17:32:35 -06:00
salt-cp.rst	Add comment attempting to explain the security shortcomings of salt-cp	2015-06-02 18:26:04 -07:00
salt-key.rst	Updates to salt-ssh and salt-key	2015-08-31 20:00:30 -06:00
salt-master.rst	Whitespace cleanup	2014-12-11 07:53:20 -08:00
salt-minion.rst	Whitespace cleanup	2014-12-11 07:53:20 -08:00
salt-proxy.rst	Added rst source for salt-proxy man page, added build and copy lines for this man page to doc/conf.py and setup.py	2015-09-01 17:09:35 -06:00
salt-run.rst	Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2	2015-04-16 10:37:38 -06:00
salt-ssh.rst	Whitespace cleanup	2014-12-11 07:53:20 -08:00
salt-syndic.rst	Whitespace cleanup	2014-12-11 07:53:20 -08:00
salt-unity.rst	Whitespace cleanup	2014-12-11 07:53:20 -08:00
salt.rst	Change docs for --static option with JSON - text B	2015-07-27 09:00:59 -06:00
spm.rst	Fixed sphinx / latex build warnings and errors	2015-09-17 09:23:24 -06:00