10 Commits

Author	SHA1	Message	Date
Erik Johnson	94d55889d7	Resolve merge conflicts	2015-02-28 12:35:25 -06:00
Erik Johnson	4ce8a9d064	Improve salt fileserver documentation	2015-02-27 14:53:57 -07:00
Dennis Hall	478f42d9b2	Change Github to GitHub	2015-02-15 15:19:54 +01:00
Thomas Jackson	c18e834be1	Fix trailing whitespace ... Conflicts: doc/topics/tutorials/states_pt2.rst	2014-12-11 07:53:19 -08:00
Erik Johnson	83063c8d68	Fix broken links and other sphinx errors	2014-03-17 17:17:18 -05:00
Erik Johnson	a7a878fea0	Add sub-titles to other states tutorial pages	2014-03-13 21:02:33 -05:00
Seth House	86e0075fcf	Updated tutorials, highstate, and PyDSL docs from term links to ref	2014-02-27 19:43:12 -07:00
Erik Johnson	9c63495e04	Formatting fixes ... This completes the documentation audit begun in cf365f7, using proper backticks and :strong: tags to emphasize text, converting groups of shell commands to bash code-block sections, etc. This also replaces the use of \* with the easier-to-grok '*', which will hopefully reduce confusion among new users.	2013-08-11 22:17:47 -05:00
Erik Johnson	a7110e9305	Add practical example	2013-07-26 12:13:32 -05:00
Erik Johnson	49839b72aa	Add a 4th step to the states tutorial ... This adds a step showing how file roots can be used to "promote" states from dev -> QA -> prod.	2013-07-25 20:41:21 -05:00