Commit Graph

150 Commits

Author SHA1 Message Date
Seth House
cbc3775fbc Remove the sphinxcontrib from the import path
I swear I fixed this during the merge. Must have undone the change
somehow.
2014-06-19 12:27:31 -06:00
Seth House
295e0b9060 Temporarily commented out docs Mock decorator conditional
This worked in the smaller salt-api project but is choking somewhere in
the larger Salt project. We do need this but we need the salt-api merge
sooner. Commented out for now.
2014-06-18 23:20:27 -06:00
Seth House
8df1bbf1d1 Added missing functools import 2014-06-18 23:05:26 -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
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
Seth House
13e89c6ac6 Merge pull request #158 from pass-by-value/websocket_tornado
Websocket tornado
2014-06-17 21:07:28 -06:00
Colton Myers
51aefc9389 Add release notes for 2014.1.5 and bump docs version 2014-06-11 12:03:31 -06:00
Pedro Algarvio
506cbe4726 Make use of the bootstrap.saltstack.com URL(s) 2014-06-07 13:59:39 +01:00
Aditya Kulkarni
02d5c00358 Add docs 2014-06-05 10:12:00 -04:00
Seth House
63dc40bd06 Added entry to docs Makefile and Sphinx config to build PDF usinx XeTeX
We have a few unicode chars in the docs now. Plus this should be a good
change for future non-English builds of the docs.
2014-06-04 17:44:10 -06:00
Aditya Kulkarni
64ed4a309b Add websocket support 2014-06-03 15:04:23 -04:00
Colton Myers
db271990d2 Update docs version to 2014.1.4 2014-05-05 10:49:37 -06:00
Chris Rebert
45981a56f9 lots of copyediting 2014-04-30 12:06:27 -07:00
Seth House
7c952dd98e Moved SaltStack events and news to SaltStack-specific sidebar template 2014-04-29 17:57:27 -06:00
Seth House
04021cb233 Moved quick search to the top of the sidebar 2014-04-29 17:57:27 -06:00
Seth House
c3d4816275 Moved Salt version infos to its own sidebar template 2014-04-29 17:57:27 -06:00
Seth House
cf0b79322e Changed env var that denotes if we're building for docs.saltstack.com
This one is a bit more descriptive.
2014-04-29 17:57:27 -06:00
Pedro Algarvio
23b12283fb Update the bootstrap script tutorial doc to latest from the project.
Also ignore the bootstrap script HTTPS URL.
2014-04-27 11:48:17 +01:00
Pedro Algarvio
a1d446d1e5 Revert "Default to https instead of http"
This reverts commit 6fc260be9e.
2014-04-27 11:46:36 +01:00
Daniel Wallace
6fc260be9e Default to https instead of http
For everything that doesn't use python urllib
2014-04-26 20:20:32 -05:00
Thomas S Hatch
39afc8f067 Merge pull request #12046 from basepi/2014.1.3releasenotes
Add 2014.1.3 release notes
2014-04-22 09:47:10 -06:00
Seth House
fccd38b58b Set a variable if we're building for the live docs site or not
This is useful to customize online / offline search and whether to
include things like Google Analytics.

Fixes #9875
2014-04-17 17:40:55 -06:00
Seth House
f723c4e8dd Remove OpenSearch configuration
I don't know what this is or does.
2014-04-16 23:59:45 -06:00
Seth House
b01bf7cab0 Add environment variable check to switch search providers
Using Google's search is an opt-in. Defaults to Sphinx-native
search.
2014-04-16 23:59:40 -06:00
Seth House
2c659f033b Remove RTD check for theme selection 2014-04-16 23:58:58 -06:00
Colton Myers
f366db8816 Update doc version to 2014.1.3 2014-04-16 13:57:03 -06:00
Seth House
bcb66f160f Add Sphinx extension to generate an index for short-URLs 2014-04-15 18:01:31 -06:00
Seth House
ca028dae3c Add docs for the saltnado netapi module 2014-04-14 22:53:17 -06:00
Seth House
bc10b02d21 Mock requests for building the docs 2014-04-11 14:22:12 -06:00
Seth House
41557bf2be Remove special mocking for uppercase names
I'm not sure what this was supposed to do. But it causes the occasional
problem when mocking things that have no business being capitalized but
are anyway.
2014-03-27 20:04:49 -06:00
Colton Myers
ae8db02e5e Update released version to 2014.1.1 2014-03-25 10:14:59 -06:00
Seth House
00681d86a4 Updated the Latex docs to build with the latest logo 2014-03-21 13:51:53 -06:00
Seth House
6e1bb4bdf0 Remove unused html_logo setting 2014-03-21 13:51:53 -06:00
Seth House
e1ea6dd89b Mocked cherrypy.lib for building the docs 2014-03-10 19:50:39 -06:00
Seth House
6d0b0f24c0 Added opensearch configuration to the docs conf.py 2014-03-01 22:29:09 -07:00
Mike Place
2f5c1563df Fix GCE build errors. 2014-02-26 13:32:33 -07:00
Seth House
d0dc53b54d Added missing .0 to end of the verion in the docs conf 2014-02-22 20:27:44 -06:00
Mike Place
a485eceac9 Fix all broken links in docs. Ignore certain known-good links. Adjust many links that are returning 301.
Conflicts:
	doc/topics/installation/index.rst
2014-02-20 16:16:59 -07:00
Colton Myers
f7bded078d Wait until actual announced release to change doc version 2014-02-19 13:32:45 -07:00
Colton Myers
b3e22bdec5 Update bug fix release notes and update doc version
Conflicts:
	doc/conf.py
2014-02-19 13:29:55 -07:00
Seth House
568ece37ea Mocked salt.utils.event for building the docs 2014-01-30 11:59:47 -07:00
Colton Myers
3f8799a334 Update current release in docs 2014-01-27 10:00:26 -07:00
Seth House
fd099aaa50 Removed old/unused rST substitution 2014-01-02 15:40:57 -07:00
Seth House
9f7fab6df0 Moved LiterateCoding directives into Salt domain 2013-12-23 06:02:12 -07:00
Seth House
f2ad5b1bef Remove sidebars for formula docs 2013-12-23 06:02:11 -07:00
Seth House
5f8df81d37 Added first stab at a literate-code style documentation directive 2013-12-23 06:02:11 -07:00
Seth House
cb8ed95992 Moved custom conf cross-references into Salt domain file 2013-12-13 22:45:48 -07:00
Seth House
c0f74f95aa Added minor Salt Sphinx domain 2013-12-13 22:45:48 -07:00
Colton Myers
2ea3e3fed2 Add 0.17.4 release notes 2013-12-09 14:47:25 -07:00