Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix incremental doc builds - OS X, postgres returner, tcp transport doc updates #35865

Merged
merged 2 commits into from
Aug 31, 2016

Conversation

jacobhammons
Copy link
Contributor

Updates doc builds to generate build timestamp only when building for docs.saltstack.com. This re-enables incremental builds.
Adds note 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

… 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 saltstack#875)
Adds example showing how to enable tcp transport
@@ -207,6 +207,9 @@ def inner(fn, *iargs, **ikwargs):

# -- General Configuration -----------------------------------------------------

# Set a var if we're building docs for the live site or not
on_saltstack = 'SALT_ON_SALTSTACK' in os.environ

project = 'Salt'
copyright = '2016 SaltStack, Inc.'
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It would be nice if we could dynamically update the year using the same technique as we do for the today variable below.

@cachedout cachedout added the Pending-Discussion The issue or pull request needs more discussion before it can be closed or merged label Aug 30, 2016
Footer updates
@jacobhammons
Copy link
Contributor Author

@cachedout great idea to generate the year, I've made another commit to add this.

@rallytime rallytime merged commit 9910b9c into saltstack:2016.3 Aug 31, 2016
@jacobhammons jacobhammons deleted the doc-updates branch August 31, 2016 20:32
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Pending-Discussion The issue or pull request needs more discussion before it can be closed or merged
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants