Commit Graph

1020 Commits

Author SHA1 Message Date
Thomas S Hatch
1577bf0fad Merge pull request #14178 from khrisrichardson/spelling
add sphinx spelling extension. enforce en_US
2014-07-14 15:43:33 -06:00
Seth House
caa54c0d28 Merge pull request #14197 from rallytime/requisite_docs
Requisite documentation
2014-07-14 14:52:51 -06:00
Colton Myers
08d7847e44 Add configuration file location for minion (and FreeBSD for master) 2014-07-14 12:22:27 -06:00
rallytime
f295b9b60b Fix requisite documentation links 2014-07-14 10:33:02 -06:00
rallytime
29c6171af5 Fix "here" link on requisites doc 2014-07-14 10:13:27 -06:00
Khris Richardson
1acd82f3f1 add sphinx spelling extension. enforce en_us 2014-07-13 13:43:33 -05:00
Erik Johnson
2849950bce Docs cleanup
Fixes double-colons by making them code-block directives, so they do not
erroneously show up as "PYTHON" blocks. Also corrects a few instances of
2nd person pronoun usage.
2014-07-13 11:02:33 -05:00
David Boucha
a04e3d4a0b make sure twilio_notify shows up in the docs 2014-07-13 00:12:23 -06:00
Ryan Lane
0306ed00b8 Combine requisites and alterting_states into a global state arguments document 2014-07-10 14:59:12 -07:00
btibi
851ce0fde4 Add syslog_ng execution module. 2014-07-09 22:42:36 +02:00
btibi
f69977d3e5 Add syslog_ng state module. 2014-07-09 22:04:13 +02:00
rallytime
f0d9db2497 Removed the term "Hydrogen" from versionadded notation 2014-07-01 15:01:12 -06:00
Seth House
918f12a376 Added roster modules to the documentation 2014-06-30 14:01:48 -06:00
Seth House
7725350416 Merge pull request #13811 from lyft/doc-additions
Add docs for boto_elasticache and apache_module
2014-06-27 17:10:10 -06:00
Thomas Jackson
c721d9d664 Seperate saltnado_websockets from the rest of the implementation. 2014-06-20 15:10:56 -07:00
Seth House
acb203c735 Added salt-api to CLI TOC 2014-06-20 10:20:58 -06:00
Seth House
9f93aaf016 Renamed old autodoc-generated salt-api netapi module filenames 2014-06-19 13:19:24 -06:00
Seth House
ae413133f3 Added netapi modules to the module index 2014-06-18 23:04:45 -06:00
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
Seth House
1d4057fadf Updated all saltapi import paths to salt.netapi 2014-06-18 20:56:16 -06:00
Seth House
554a612aa4 Renamed netapis to netapi 2014-06-18 20:05:02 -06:00
Seth House
704c889066 Added local TOC for the rest_cherrypy URL list 2014-06-17 21:38:13 -06:00
Seth House
13e89c6ac6 Merge pull request #158 from pass-by-value/websocket_tornado
Websocket tornado
2014-06-17 21:07:28 -06:00
Arnold Bechtoldt
9a5ce71286 trying to add foreman pillar module to documentation, refs #13481 2014-06-17 19:24:27 +02:00
Ryan Lane
bffc4f1fb4 Add missing generated rst 2014-06-11 18:18:31 -07:00
Erik Johnson
ee0d14d989 Add new module/state to toctree 2014-06-11 18:06:12 -05:00
Ryan Lane
16c83d24bf Add docs for boto_elasticache and apache_module 2014-06-11 15:52:31 -07:00
Erik Johnson
5db13960b1 Add links to targeting pages 2014-06-11 16:19:24 -05:00
Seth House
679f74198e Added link target for the module sync system 2014-06-09 19:31:38 -06:00
Erik Johnson
38c1690310 Remove reference to nonexistant page 2014-06-09 11:06:06 -05:00
Erik Johnson
a61812ce6f Clean up new master_type feature docs 2014-06-09 11:05:10 -05:00
Erik Johnson
50bc3f7a2c Add aliyun to toctree 2014-06-09 11:04:31 -05:00
Colton Myers
426ebcbc4d More requisite doc cleanup 2014-06-05 16:24:59 -06:00
Thomas S Hatch
fb5924070f Merge pull request #13143 from felskrone/minion_failover_master
Minion failover master
2014-06-05 14:41:27 -06:00
Aditya Kulkarni
02d5c00358 Add docs 2014-06-05 10:12:00 -04:00
Colton Myers
5938016c85 Small clarification fix 2014-06-04 16:11:29 -06:00
Colton Myers
cd6617107e Revamp the `watch` requisite docs 2014-06-04 16:01:28 -06:00
Colton Myers
43c26360ee Use correct case for requisites (even in titles) 2014-06-04 15:48:00 -06:00
Aditya Kulkarni
64ed4a309b Add websocket support 2014-06-03 15:04:23 -04:00
Thomas S Hatch
4979ae7b1d Merge pull request #13167 from terminalmage/varnish-cleanup
Cleanup new varnish module and add to docs
2014-06-03 11:00:03 -06:00
Erik Johnson
2c3789c394 Add varnish module to docs 2014-06-02 11:27:09 -05:00
Joseph Hall
e0b2428f5a Add new postfix module 2014-06-02 10:20:58 -06:00
vs
4661938dd7 add shuffling to the minions master_type=failover functionality 2014-06-02 01:01:16 -07:00
vs
16269130e6 Merge remote-tracking branch 'upstream/develop' into minion_failover_master
Conflicts:
	doc/ref/configuration/master.rst
2014-05-30 12:14:19 -07:00
Thomas S Hatch
b8897a5b0d rename the sls renderer to the yamlex renderer 2014-05-30 09:28:20 -06:00
Thomas S Hatch
185eae31cd Merge branch 'serializers-migration' of https://github.com/johnnoone/salt into johnnoone-serializers-migration
Conflicts:
	salt/pillar/__init__.py
2014-05-30 09:16:21 -06:00
vs
f007cfecd5 add missing 's' 2014-05-30 08:04:08 -07:00
vs
f5009f06fa reworked master_type section
added master being a list of servers

added master_type: failover
2014-05-30 08:00:28 -07:00
vs
22d590a9cc added max_minions setting 2014-05-30 07:58:01 -07:00
Joseph Hall
b13f8ad2d3 Merge pull request #13131 from felskrone/minions_present_docu
added section for 'presence_events'
2014-05-30 08:29:54 -06:00