6 Commits

Author	SHA1	Message	Date
Seth House	13acaab80a	Revert "Revert "Merge pull request #1449 from elfixit/develop"" ... This reverts commit 6440faa4d0 but restores the salt/states/service.py from last correct version.	2012-06-18 00:31:14 -07:00
Seth House	6440faa4d0	Revert "Merge pull request #1449 from elfixit/develop" ... This reverts commit 31b093dd93, reversing changes made to edf676a23e. There was a mistake added that changed the salt/states/service.py file to a binary type. Conflicts: doc/ref/states/highstate.rst doc/ref/states/index.rst doc/ref/states/ordering.rst	2012-06-18 00:26:36 -07:00
elfixit	3574518dec	updated state docs to new style state syntax ... updated the state docs to the new state syntax from: http://salt.readthedocs.org/en/latest/topics/releases/0.9.9.html#state-syntax-update	2012-06-17 15:40:21 +02:00
Thomas S Hatch	2515033c08	Add docs on extend ... Make sure people understand that using the extend keyword twice in a single sls will cause unexpected results	2012-05-28 16:19:00 -06:00
L.C. Rees	3315dad9e7	documentation updates	2012-05-22 22:43:12 -06:00
Thomas S Hatch	608151192c	Add a doc on the extend declaration	2012-03-20 14:23:49 -06:00