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

Merge Sphinx fixes from 2017.7 to 2018.3 #50599

Merged
merged 4 commits into from Nov 21, 2018

Conversation

Projects
None yet
1 participant
@terminalmage
Copy link
Contributor

commented Nov 21, 2018

This disables a custom plugin that we aren't actually using, which was causing failures when we made the docs job start using SPHINXOPTS=-W, and also gets rid of an overline that causes a Sphinx warning in newer Sphinx releases.

terminalmage and others added some commits Nov 20, 2018

Disable unused shorturls plugin
It was causing build errors when SPHINXOPTS=-W is used
Remove overline from section title
This causes a warning on newer Sphinx releases
Erik Johnson
Merge pull request #50592 from terminalmage/docs-2017.7
Disable unused shorturls plugin (backport to 2017.7)

@terminalmage terminalmage requested a review from saltstack/team-core as a code owner Nov 21, 2018

@salt-jenkins salt-jenkins requested a review from saltstack/team-suse Nov 21, 2018

@terminalmage terminalmage changed the title Merge Sphinx fixes from 2018.7 to 2018.3 Merge Sphinx fixes from 2017.7 to 2018.3 Nov 21, 2018

@terminalmage terminalmage merged commit c9531d8 into saltstack:2018.3 Nov 21, 2018

5 of 10 checks passed

jenkins/pr/py2-centos-7 running py2-centos-7...
Details
jenkins/pr/py2-windows-2016 running py2-windows-2016...
Details
jenkins/pr/py3-centos-7 running py3-centos-7...
Details
jenkins/pr/py3-ubuntu-1604 running py3-ubuntu-1604...
Details
jenkins/pr/py3-windows-2016 running py3-windows-2016...
Details
WIP Ready for review
Details
continuous-integration/jenkins/pr-merge This commit looks good
Details
jenkins/pr/docs The docs job has passed
Details
jenkins/pr/lint The lint job has passed
Details
jenkins/pr/py2-ubuntu-1604 The py2-ubuntu-1604 job has passed
Details

@terminalmage terminalmage deleted the terminalmage:merge-2018.3 branch Nov 21, 2018

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.