Jacob Hammons
2a85d71c25
doc site css fix for tiny fonts that appeared in code or pre tags in headings
2015-08-19 14:32:55 -06:00
Colton Myers
1502a39779
Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8
...
Conflicts:
conf/minion
salt/client/__init__.py
salt/states/dockerio.py
salt/utils/event.py
tests/unit/utils/event_test.py
2015-08-11 18:12:21 -06:00
Colton Myers
32f5345d7d
Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.5
...
Conflicts:
conf/minion
doc/conf.py
salt/modules/file.py
2015-08-10 10:56:40 -06:00
Jacob Hammons
d220c83f77
master_finger configuration docs
...
switch a script to use https:// instead of http://
Refs #25751
2015-08-06 20:23:22 -06:00
Colton Myers
2a144b954a
Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8
...
Conflicts:
doc/ref/states/requisites.rst
doc/topics/tutorials/states_pt5.rst
salt/cloud/clouds/ec2.py
salt/config.py
salt/minion.py
salt/modules/cp.py
salt/pillar/__init__.py
salt/states/file.py
2015-07-14 10:57:36 -06:00
Jacob Hammons
88f5fcf58d
Latest help theme updates
2015-07-10 09:52:01 -06:00
Jacob Hammons
f6561289af
bug fix for module function display in help
2015-07-09 14:13:29 -06:00
Jacob Hammons
f88f344a28
sphinx html theme updates
2015-06-26 11:13:56 -06:00
Jacob Hammons
30a907576c
rebuilt man pages, versioned html theme css
2015-06-26 11:06:21 -06:00
Jacob Hammons
8be40d9d40
sphinx html theme updates - additional fix, updated index file
2015-06-26 08:35:20 -06:00
Jacob Hammons
01e96bca11
sphinx html theme updates - color changes for warning on development branch
2015-06-26 08:23:58 -06:00
Colton Myers
725e5c689f
Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop
2015-06-11 13:15:38 -06:00
Jacob Hammons
f3f34ddff6
2015.5.2 release changes
...
Refs #24250
Refs #24457
2015-06-11 10:01:30 -06:00
Colton Myers
6d503c12ea
Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop
...
Conflicts:
doc/ref/modules/all/salt.modules.ipmi.rst
doc/ref/modules/all/salt.modules.system_profiler.rst
salt/fileclient.py
salt/loader.py
salt/modules/tls.py
salt/modules/win_path.py
salt/states/pkg.py
salt/utils/event.py
salt/utils/pagerduty.py
tests/unit/modules/seed_test.py
2015-06-05 13:03:48 -06:00
Jacob Hammons
1f7a13d6f9
Salt cloud doc updates, build errors and bug fixes
...
Refs #24309
2015-06-04 16:42:47 -06:00
Colton Myers
c4f5e231fa
Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop2
...
Conflicts:
doc/_themes/saltstack2/layout.html
doc/conf.py
doc/index.rst
doc/ref/modules/all/salt.modules.hipchat.rst
doc/topics/releases/index.rst
salt/client/ssh/client.py
salt/cloud/clouds/vsphere.py
salt/modules/boto_dynamodb.py
salt/modules/boto_route53.py
salt/modules/data.py
salt/modules/http.py
salt/modules/tls.py
salt/output/compact.py
salt/states/boto_elb.py
salt/states/linux_acl.py
salt/states/rabbitmq_user.py
salt/states/win_servermanager.py
salt/utils/dictupdate.py
salt/wheel/config.py
2015-05-29 15:10:13 -06:00
rallytime
d8daa9dcd7
Merge #24185 with a couple of fixes
...
Refs #24185
2015-05-27 15:25:27 -06:00
Jacob Hammons
0689815d0e
Fixes for doc build errors
2015-05-27 11:40:31 -06:00
Jacob Hammons
1e1eb2b3ea
added custom search for each branch, fixed style issues
2015-05-22 11:53:33 -06:00
Colton Myers
9dbafcc051
Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop
...
Conflicts:
salt/cloud/clouds/digital_ocean_v2.py
salt/modules/tls.py
2015-05-20 11:59:59 -06:00
Jacob Hammons
31023c8915
Updates to sphinx saltstack2 doc theme
2015-05-19 15:54:28 -06:00
Jacob Hammons
81ed9c9f59
sphinx saltstack2 doc theme
2015-05-19 13:36:57 -06:00
Colton Myers
a87b057137
Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop
...
Conflicts:
doc/ref/modules/all/salt.modules.slack_notify.rst
2015-05-19 09:53:58 -06:00
Nitin Madhok
9dc1e0b3ae
Fixing sphinx errors and warnings
2015-05-18 12:12:07 -04:00
Jacob Hammons
46eb2655ee
saltstack2 sphinx theme updates
2015-05-17 20:39:24 -06:00
Jacob Hammons
ee3c1bd4a7
missed one
2015-05-15 16:26:47 -06:00
Jacob Hammons
3872921dd0
More updates to sphinx2 theme
2015-05-15 16:26:11 -06:00
Jacob Hammons
8c32152be0
removed TOC numbering, additional tweaks to layout.html
2015-05-13 21:18:00 -06:00
Jacob Hammons
16d8a753ad
saltstack2 sphinx theme and build settings
2015-05-11 17:29:12 -06:00
Dennis Hall
478f42d9b2
Change Github to GitHub
2015-02-15 15:19:54 +01: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
Seth House
872e3286c0
Swap out SaltConf15 sidebar image for one with better scaled fonts
2014-10-22 16:26:26 -06:00
Seth House
fc28d00056
Added SaltConf15 banner and links to sidebar
2014-10-14 19:44:36 -05:00
Seth House
b86e44bbd8
Updated training image
2014-07-21 17:56:55 -06:00
Christobot
a7d62f5b8f
Add a fix for long lines. Fixes #13724
2014-06-25 12:57:09 -07:00
christobot
9786fe45d6
Add new styles for code blocks - addresses #13215
2014-06-24 22:30:09 -07: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
Seth House
978e505b5f
Updated Google Analytics tracking code
2014-05-22 16:56:02 -06:00
Seth House
7d484dc86a
Restore trackalyzer stuff; opt-in within on_saltstack conditional
2014-05-19 18:29:09 -06:00
Seth House
d6b522a7f1
Add CSS styles to scroll content horizontally
2014-05-13 12:55:00 -06:00
Seth House
321d601022
Removed unused css file
2014-05-13 12:12:55 -06:00
Seth House
7c952dd98e
Moved SaltStack events and news to SaltStack-specific sidebar template
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
Seth House
7c59da6dce
Added training graphic
2014-04-18 13:02:23 -06:00
Seth House
a58f122d3d
Added training links to the sidebar
2014-04-18 12:52:25 -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
d971b379a0
Replaced Lanyrd embed with link to events page
2014-03-27 10:54:12 -06:00
Pedro Algarvio
ef6bd18784
Update with proper perms
2014-03-23 18:05:05 +00:00
