13 Commits

Author	SHA1	Message	Date
Jacob Hammons	a04cebd48c	Remove internal APIs from rest_cherrypy docs. ... Refs #28540	2015-12-28 15:26:16 -07:00
Jacob Hammons	7ac98a03b6	Updated module doc index using https://github.com/saltstack/salt/pull/27203	2015-09-22 11:54:34 -06:00
Thomas Jackson	f268bb8b4b	Whitespace cleanup	2014-12-11 07:53:20 -08:00
Thomas S Hatch	6aa5b0f858	Merge branch '2014.7' into develop ... Conflicts: salt/modules/genesis.py salt/modules/parted.py salt/modules/win_service.py salt/runner.py salt/states/file.py tests/integration/netapi/rest_tornado/test_app.py	2014-11-26 09:24:24 -07:00
rallytime	73f3c0091d	Clean up doc build so it doesn't stacktrace ... Fixes #18471 - Add zmq.eventloop to mocked modules in doc/conf.py - Cleaned up rst references in rest_tornado.rst	2014-11-25 15:11:15 -07:00
pengyao	3ffa0dfc6b	Url should be '/keys'	2014-11-20 11:16:58 +08:00
Thomas Jackson	6d2fbc8715	Documentation for saltnado	2014-11-13 08:36:29 -08:00
Seth House	9da07584e4	Added missing docs for the /key rest_cherrypy entry point ... Should have been part of #16706.	2014-10-29 16:35:04 -05:00
Erik Johnson	f056c9c3fa	Fix sphinx build error	2014-09-17 18:00:18 -05:00
Thomas Jackson	c721d9d664	Seperate saltnado_websockets from the rest of the implementation.	2014-06-20 15:10:56 -07:00
Seth House	9f93aaf016	Renamed old autodoc-generated salt-api netapi module filenames	2014-06-19 13:19:24 -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