Commit Graph

36 Commits

Author SHA1 Message Date
rallytime
8256ae5ee5
Merge branch '2016.11' into '2017.7'
No conflicts.
2018-02-28 14:59:01 -05:00
rallytime
f5fae3dedf
Update enterprise banner
(removes 5.0 text)
2018-02-28 11:55:16 -05:00
rallytime
07ed8c7db3
Update docbanner for SaltConf18 2018-02-28 11:42:43 -05:00
rallytime
eaca3291e2
Merge branch '2016.11' into '2017.7'
Conflicts:
  - tests/unit/modules/test_state.py
2017-10-05 12:09:40 -04:00
David Boucha
8c671fd0c1
Update SaltConf banner per Rhett's request 2017-10-03 10:07:28 -06:00
Erik Johnson
f13ddeb394 Merge remote-tracking branch 'upstream/2016.11' into merge-2017.7
Conflicts:
- doc/_themes/saltstack2/layout.html
- salt/auth/__init__.py
- salt/utils/schedule.py
2017-06-28 20:27:32 -05:00
David Boucha
bff050ad52 change out salt support link to SaltConf link 2017-06-28 14:54:01 -06:00
David Boucha
570e14250d add Salt Enterprise photo 2017-02-16 11:50:28 -07:00
Jacob Hammons
9910b9c6f9 Fix incremental doc builds - OS X, postgres returner, tcp transport doc updates (#35865)
* Updates doc builds to generate build timestamp only when building for docs.saltstack.com. This re-enables incremental builds.
Adds notes to OS X page that Salt master on OS X is not officially supported
Adds note to postgres returners to cross-link modules with usage explanation (ZD #875)
Adds example showing how to enable tcp transport

* Generate copyright date
Footer updates
2016-08-31 09:51:36 -06:00
Jacob Hammons
ce027fd769 Fixes doc refresh bug on chrome mobile. 2016-06-16 12:43:33 -06:00
Jacob Hammons
a424c38f5d New doc site layout, 2016.3.0 release note known issue additions 2016-05-25 17:39:55 -06:00
rallytime
031a75ca33 Merge branch '2015.8' into '2016.3'
Conflicts:
  - Contributing.rst
  - conf/master
  - doc/index.rst
  - doc/man/salt.7
  - pkg/suse/README.suse
  - salt/client/ssh/state.py
  - salt/minion.py
  - salt/modules/zypper.py
  - salt/utils/schedule.py
  - tests/unit/modules/zypper_test.py
2016-03-02 10:26:13 -07:00
Denys Havrysh
aebc48163d Remove trailing white spaces in documentation files 2016-03-01 17:36:23 +02:00
Jacob Hammons
b192a9ba38 Doc restructuring, organization, and cleanup. Updated the doc navigation. 2016-01-31 20:10:02 -07:00
Jacob Hammons
51d28004da Updated doc site banners 2016-01-06 15:19:21 -07:00
Jacob Hammons
266023baf1 Updated doc site banners 2016-01-06 15:16:26 -07:00
Jacob Hammons
32a352120a updated spm docs 2015-12-28 14:29:02 -07:00
Jacob Hammons
234a699e41 Updated saltstack2 theme to add SaltConf16 banner 2015-10-06 17:51:30 -06:00
Jacob Hammons
3a52d3606b Updated saltstack2 theme to add SaltConf16 banner 2015-10-06 17:42:53 -06:00
Jacob Hammons
a9fdecada1 Fix css layout Refs #27389
sample typo fix in linux_acl
additional module folders listed in dynamic-modules
2015-09-25 11:25:14 -06:00
Jacob Hammons
6e323b6dd3 Update latest to 2015.8, 2015.5 is now previous
Assorted style and minor updates
2015-09-14 16:32:22 -06:00
Jacob Hammons
42eaa80997 Restored missing css 2015-09-14 16:00:06 -06:00
Jacob Hammons
9ab642295e Fixed a release notes typo and bad file rename 2015-09-14 15:51:37 -06:00
Jacob Hammons
daa3f4eee0 Updated release notes, change 2015.8 to latest release for doc site 2015-09-14 15:17:59 -06:00
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
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
f3f34ddff6 2015.5.2 release changes
Refs #24250
Refs #24457
2015-06-11 10:01:30 -06:00
Jacob Hammons
1f7a13d6f9 Salt cloud doc updates, build errors and bug fixes
Refs #24309
2015-06-04 16:42:47 -06:00
Jacob Hammons
0689815d0e Fixes for doc build errors 2015-05-27 11:40:31 -06:00
Jacob Hammons
31023c8915 Updates to sphinx saltstack2 doc theme 2015-05-19 15:54:28 -06: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