Seth House 53bab586f4 Merged salt-api into Salt ... Woot! The conflicts below are intentional because they contained salt-api-isms that needed to be included into the corresponding Salt files. Conflicts: debian/changelog debian/control doc/conf.py doc/index.rst opt_requirements.txt salt/config.py salt/loader.py		2014-06-18 22:13:56 -06:00
..
_includes	Remove remaining exsel code	2014-05-29 01:32:54 +01:00
index.rst	Add links to targeting pages	2014-06-11 16:19:24 -05:00
salt-api.rst	Fixed all typos I can find	2013-10-25 16:26:57 +08:00
salt-call.rst	Match option order and add missing --master.	2013-08-10 15:37:37 +01:00
salt-cloud.rst	Moved salt-cloud documentation into main docs dir	2013-11-08 14:08:36 -07:00
salt-cp.rst	The timeout is now on a common document.	2013-08-10 15:37:37 +01:00
salt-key.rst	Update salt-key documentation	2013-11-28 12:05:37 -06:00
salt-master.rst	Common daemon options are now on a separate document.	2013-08-10 15:37:37 +01:00
salt-minion.rst	Common daemon options are now on a separate document.	2013-08-10 15:37:37 +01:00
salt-run.rst	salt-run also has the doc option.	2013-08-10 15:37:38 +01:00
salt-ssh.rst	Add two options in the salt-ssh documentation	2014-02-05 16:32:16 +02:00
salt-syndic.rst	Common daemon options are now on a separate document.	2013-08-10 15:37:37 +01:00
salt.rst	Refs #11961: Add a short note regarding --show-timeout in the salt manpage	2014-04-14 21:11:01 +02:00