rallytime 7dc1e770c4 Merge branch '2018.3' into 'develop' ... Conflicts: - doc/topics/installation/freebsd.rst - salt/cloud/clouds/oneandone.py - salt/grains/core.py - salt/modules/napalm_ntp.py - salt/modules/win_update.py - salt/modules/win_wua.py - salt/modules/zabbix.py - salt/renderers/pass.py - salt/states/vault.py - tests/unit/states/test_win_update.py		2018-06-06 13:35:36 -04:00
..
_includes	Adding missing output flags to salt cli	2017-08-10 13:19:08 -07:00
index.rst	Fix all Sphinx warnings	2018-05-31 15:28:25 -05: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	Update docs to match log_level warning default	2016-06-21 09:31:59 -06:00
salt-cloud.rst	digitalocean should be one word.	2017-09-19 12:47:16 -06:00
salt-cp.rst	Merge branch '2016.11' into '2017.7'	2017-08-18 09:13:54 -04:00
salt-extend.rst	Remove doc markup references from 2016.11 branch	2016-12-19 15:14:37 -07:00
salt-key.rst	Remove ":doc:" references from a bunch of doc/* files	2016-12-15 16:09:27 -07: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	Remove doc markup references from 2016.11 branch	2016-12-19 15:14:37 -07:00
salt-ssh.rst	Add docs for ssh_priv_passwd	2018-04-24 10:48:29 +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	Merge branch '2017.7' into '2018.3'	2018-06-01 14:54:12 -04:00
spm.rst	Added note regarding missing spm exe on Debian/Ubuntu	2015-10-21 22:34:45 -06:00