rallytime 80fcdfb9d8 Merge branch '2015.8' into '2016.3' ... Conflicts: - doc/topics/targeting/grains.rst - salt/cli/daemons.py - salt/exceptions.py - salt/minion.py - salt/modules/schedule.py - salt/scripts.py - salt/states/archive.py		2016-04-26 12:07:42 -06:00
..
conventions	Merge branch '2015.8' into '2016.3'	2016-03-25 11:47:16 -06:00
git	Whitespace cleanup	2014-12-11 07:53:19 -08:00
raet	Fixes for doc build errors	2015-05-27 11:40:31 -06:00
tests	Add some "best practices" information to test documentation	2016-03-28 14:23:42 -06:00
architecture.rst	Fix typo an deamon -> daemon	2015-11-04 11:06:16 +01:00
contributing.rst	Add mentioned of Salt's Coding Style docs to the Contributing docs	2016-03-03 11:41:46 -07:00
deprecations.rst	Add mention of Periodic Table naming scheme to deprecation docs	2015-10-12 13:08:50 -06:00
dunder_dictionaries.rst	Merge pull request #32127 from rallytime/dunder-docs	2016-03-25 09:54:02 -06:00
external_pillars.rst	Updates documentation for external_pillar - Fixes Bash Example	2015-07-14 14:26:00 -07:00
hacking.rst	Remove trailing white spaces in documentation files	2016-03-01 17:36:23 +02:00
index.rst	Doc restructuring, organization, and cleanup. Updated the doc navigation.	2016-01-31 20:10:02 -07:00
labels.rst	Merge branch '2015.5' into '2015.8'	2016-04-25 15:45:17 -06:00
logging.rst	Updates to salt-ssh and salt-key	2015-08-31 20:00:30 -06:00
modular_systems.rst	Remove overstate documentation	2015-06-12 13:00:08 -06:00
package_providers.rst	Whitespace cleanup	2014-12-11 07:53:19 -08:00
reporting_bugs.rst	Remove trailing white spaces in documentation files	2016-03-01 17:36:23 +02:00
salt_projects.rst	Whitespace cleanup	2014-12-11 07:53:19 -08:00
topology.rst	Whitespace cleanup	2014-12-11 07:53:19 -08:00
translating.rst	Whitespace cleanup	2014-12-11 07:53:19 -08:00
tutorial.rst	Doc restructuring, organization, and cleanup. Updated the doc navigation.	2016-01-31 20:10:02 -07:00