Commit Graph

2990 Commits

Author SHA1 Message Date
Seth House
8df1bbf1d1 Added missing functools import 2014-06-18 23:05:26 -06:00
Seth House
ae413133f3 Added netapi modules to the module index 2014-06-18 23:04:45 -06:00
Seth House
7b6544c660 Added httpdomain from Sphinx-contrib 2014-06-18 22:14:17 -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
6f112d6eef Updated the netapi modules index to be more clear 2014-06-18 20:19:03 -06:00
Seth House
554a612aa4 Renamed netapis to netapi 2014-06-18 20:05:02 -06:00
Seth House
cf4b684edb Moved salt-api release notes into saltapi subdir 2014-06-18 20:03:40 -06:00
Seth House
598a1d74a3 Removed redundant docs files with Salt-core docs 2014-06-18 20:02:16 -06:00
Seth House
d01462cb28 Retain docstring if mocked object is used as a decorator
This prevents mocked objects that are used as decorators from obscuring
the docstring of the decorated function/method.
2014-06-18 15:28:20 -06:00
Seth House
de3e1d31ce Removed mocks for unused libraries
These mocks were all for legacy code.
2014-06-18 15:28:20 -06:00
Colton Myers
6cb859b6da Merge pull request #13394 from basepi/2014.1.5release
Add release notes for 2014.1.5 and bump docs version
2014-06-18 10:27:59 -06:00
Thomas S Hatch
7b1950b803 Merge pull request #13468 from techhat/db
Add sdb loader type
2014-06-18 10:04:29 -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
Erik Johnson
a1f5be53dc Remove pillar page from targeting toctree 2014-06-17 17:23:31 -05:00
Erik Johnson
5688da134d Remove pillar targeting page
There is already a section for this in the Pillar page, no need for a
dedicated page.
2014-06-17 17:21:22 -05:00
Erik Johnson
0f7c91b9e0 Add external ref target for pillar targeting 2014-06-17 17:20:50 -05:00
Erik Johnson
d7abba149a Add new targeting pages to docs index
Also, change the index pages to use external refs instead of the :doc:
role.
2014-06-17 17:20:50 -05:00
Erik Johnson
2a5698b6ab Add external ref target for batching page 2014-06-17 17:20:50 -05:00
Erik Johnson
3a61446f06 Add new pages to targeting toctree 2014-06-17 17:20:49 -05:00
Erik Johnson
40d96af27c Add new docs pages for pillar and ipcidr matchers 2014-06-17 17:20:49 -05:00
Christobot
3d4484d24a Fixed css fonts:
The path was referenced after the css macro, and the css font names have
changed as well. I update all the weights and styles and fixed some
formatting/indenting issues
2014-06-17 13:39:31 -07:00
Thomas S Hatch
b40757950c Merge pull request #13505 from s0undt3ch/hotfix/setup-raet
Differentiate ZeroMQ from RAET based installations
2014-06-17 13:53:43 -06:00
Erik Johnson
1a4e1c7944 Remove italics
These are out-of-place in the context of the other steps in this
particular section, and thus unnecessary.
2014-06-17 14:47:19 -05:00
Seth House
68904637a5 Merge pull request #13509 from bechtoldt/foreman_pillar_doc
trying to add foreman pillar module to documentation, refs #13481
2014-06-17 13:17:57 -06:00
Joseph Hall
36cf034f67 Add docs on writing SDB modules 2014-06-17 11:41:54 -06:00
Joseph Hall
b915488294 Mark SDB as experimental 2014-06-17 11:41:54 -06:00
Joseph Hall
7ec89b7658 Rename db doc dir to sdb 2014-06-17 11:41:54 -06:00
Joseph Hall
aff6e4da20 Fix typos in SDB docs 2014-06-17 11:41:54 -06:00
Joseph Hall
69f1a83dbe Initial documentation for SDB loader 2014-06-17 11:41:54 -06:00
Arnold Bechtoldt
9a5ce71286 trying to add foreman pillar module to documentation, refs #13481 2014-06-17 19:24:27 +02:00
Pedro Algarvio
4ba108a0d7 Also provide a pip example on how to pass the global variable 2014-06-17 16:01:11 +01:00
Pedro Algarvio
a2c8175181 Document the --salt-transport option 2014-06-17 15:53:29 +01:00
Pedro Algarvio
85427e73d7 Update install documentation to reflect RAET deps 2014-06-17 15:36:02 +01:00
Erik Johnson
72711727b3 remove 2nd person pronoun 2014-06-16 21:19:32 -05:00
Erik Johnson
f915de5784 Add reminder about firewall to salt-cloud troubleshooting page 2014-06-16 17:29:08 -05:00
Seth House
d80a5c4886 Added salt-cloud events to the event list 2014-06-13 23:23:55 -06:00
Seth House
28b0e1f904 Linked training graphic 2014-06-13 17:05:24 -06:00
Thomas S Hatch
bf7d7cdc61 Merge pull request #13451 from rallytime/grains_docs
Added note about grain lowercase resolution
2014-06-13 16:58:35 -06:00
Seth House
5b8a601c30 Removed links to old training classes from sidebar 2014-06-13 16:27:49 -06:00
rallytime
1612be139f Added note about grain lowercase resolution 2014-06-13 16:03:38 -06:00
Pedro Algarvio
c1a954467b Update 'doc/.tx/config' - Build #80
http://cookingwithsalt.org/job/salt/job/transifex/80/

Signed-off-by: Pedro Algarvio <pedro@algarvio.me>
2014-06-13 01:20:37 +01:00
David Boucha
b54068c57d document new windows installers 2014-06-12 15:36:05 -06:00
Erik Johnson
ee0d14d989 Add new module/state to toctree 2014-06-11 18:06:12 -05:00
Erik Johnson
5db13960b1 Add links to targeting pages 2014-06-11 16:19:24 -05:00
Colton Myers
51aefc9389 Add release notes for 2014.1.5 and bump docs version 2014-06-11 12:03:31 -06:00
rallytime
cd91d4c9cc Added expensiveTest documentation to cloud testing docs 2014-06-11 11:17:27 -06:00
Pedro Algarvio
8ae3268037 Merge pull request #13339 from rallytime/cloud_tests
Cloud tests
2014-06-10 19:16:42 +01:00
rallytime
ce43e04769 change cloud docs to reflect runtest changes 2014-06-10 10:32:38 -06:00