28 Commits

Author	SHA1	Message	Date
Thomas Jackson	c18e834be1	Fix trailing whitespace ... Conflicts: doc/topics/tutorials/states_pt2.rst	2014-12-11 07:53:19 -08:00
Colton Myers	f625c21d77	Merge branch '2014.7' into mergeforward ... Conflicts: salt/cloud/clouds/ec2.py salt/daemons/flo/worker.flo salt/master.py salt/minion.py salt/modules/lxc.py salt/states/win_update.py salt/states/zk_concurrency.py	2014-10-30 17:42:36 -06:00
Thomas Jackson	9f7dac0674	Spelling fixes for docs	2014-10-28 08:12:27 -07:00
Erik Johnson	00bd8477dd	Fix sphinx build error ... There is no 'math' lexer in sphinx.	2014-10-15 22:43:37 -05:00
Colton Myers	99e97320e1	Merge branch '2014.7' into develop ... Conflicts: doc/ref/configuration/minion.rst doc/ref/states/requisites.rst doc/topics/troubleshooting/master.rst doc/topics/tutorials/index.rst doc/topics/tutorials/intro_scale.rst salt/config.py salt/key.py salt/master.py salt/minion.py salt/modules/file.py salt/modules/hashutil.py salt/modules/lxc.py salt/modules/oracle.py salt/modules/tls.py salt/modules/win_update.py salt/pillar/pepa.py salt/pillar/s3.py salt/states/augeas.py salt/states/win_update.py salt/tops/ext_nodes.py salt/utils/master.py	2014-09-22 14:22:54 -06:00
Erik Johnson	c094f8bd68	Fix sphinx build error	2014-09-17 18:00:18 -05:00
Nitin Madhok	41712eab04	Fixing more sphinx warnings and errors	2014-08-11 12:33:55 -04:00
rallytime	8dcedf684d	Change more affected docs from Helium to 2014.7.0	2014-07-15 17:02:19 -06:00
Khris Richardson	1acd82f3f1	add sphinx spelling extension. enforce en_us	2014-07-13 13:43:33 -05:00
Chris Rebert	a016a30508	fix typos in doc/topics/tutorials/intro_scale.rst	2014-07-11 15:46:54 -07:00
Thomas Jackson	71f97b9ee7	Update to the salt @ scale doc	2014-07-09 11:06:24 -07:00
Volker Schwicking	4c2949a267	formatting improvements, little text rework	2014-07-02 14:32:19 +02:00
Volker Schwicking	4099a9d5fc	formatting improvements, little text rework	2014-07-02 14:31:49 +02:00
Volker Schwicking	14a0441dec	formatting improvements, little text rework	2014-07-02 14:29:35 +02:00
Volker Schwicking	06baca4cf5	formatting codeblocks etc.	2014-07-02 13:51:47 +02:00
Volker Schwicking	e7838c3641	formatting and text reworks	2014-07-02 13:44:50 +02:00
Volker Schwicking	2e8e00f879	fix note to display as note	2014-07-02 12:44:52 +02:00
Volker Schwicking	b086f8d2c7	fixed to 80 chars in width	2014-07-02 12:39:58 +02:00
vs	db3b5207cb	rewrite a few sentences, re-ordering, etc.	2014-06-06 23:55:25 -07:00
vs	d28a4bc9d5	fix link	2014-06-05 06:04:56 -07:00
vs	864262b1a5	remove all you's and rewrite some sentences	2014-06-05 06:02:58 -07:00
vs	0ebaccb996	highlight topics	2014-06-05 04:00:29 -07:00
vs	c864203bc7	put infos into a note box	2014-06-05 03:54:10 -07:00
vs	bf3ba5cf4d	added links to two auth-loop issues	2014-06-05 02:00:31 -07:00
vs	45ab2130f5	link test2	2014-06-05 01:58:01 -07:00
vs	66ac607597	url test2	2014-06-05 01:53:49 -07:00
vs	2c51909d7b	url test	2014-06-05 01:45:34 -07:00
vs	328e6478aa	"using salt at scale" tutorial for the docs	2014-06-05 01:36:46 -07:00