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

[2.9] Improve config.rst formatting #72488

Merged
merged 1 commit into from
Nov 13, 2020

Conversation

felixfontein
Copy link
Contributor

SUMMARY

Backport of #72354 to stable-2.9.

ISSUE TYPE
  • Docs Pull Request
COMPONENT NAME

docs/templates/config.rst.j2
lib/ansible/config/base.yml

* Indent Jinja2 directives.

* Show version_added and deprecations for ini settings and environment variables.

* Make default conditional, add choices. Copied from ansible#55474.

* Add Ansible variables. Copied from ansible#55474.

* Turn ini keys and environment variables into lists. Copied from ansible#55474.

* Improve formatting. Copied from ansible#55474.

(cherry picked from commit 569d937)
@ansibot ansibot added affects_2.9 This issue/PR affects Ansible v2.9 backport This PR does not target the devel branch. core_review In order to be merged, this PR must follow the core review workflow. docs This issue/PR relates to or includes documentation. needs_triage Needs a first human triage before being processed. support:core This issue/PR relates to code supported by the Ansible Engineering Team. labels Nov 4, 2020
@felixfontein
Copy link
Contributor Author

/rebuild_failed

@ansibot ansibot added needs_revision This PR fails CI tests or a maintainer has requested a review/revision of the PR. and removed core_review In order to be merged, this PR must follow the core review workflow. labels Nov 4, 2020
@felixfontein
Copy link
Contributor Author

/rebuild_failed

@ansibot ansibot added core_review In order to be merged, this PR must follow the core review workflow. needs_revision This PR fails CI tests or a maintainer has requested a review/revision of the PR. and removed needs_revision This PR fails CI tests or a maintainer has requested a review/revision of the PR. core_review In order to be merged, this PR must follow the core review workflow. labels Nov 5, 2020
@felixfontein
Copy link
Contributor Author

/rebuild_failed

1 similar comment
@felixfontein
Copy link
Contributor Author

/rebuild_failed

@ansibot ansibot added core_review In order to be merged, this PR must follow the core review workflow. and removed needs_revision This PR fails CI tests or a maintainer has requested a review/revision of the PR. labels Nov 6, 2020
@acozine acozine removed the needs_triage Needs a first human triage before being processed. label Nov 13, 2020
@acozine acozine merged commit 1837711 into ansible:stable-2.9 Nov 13, 2020
@felixfontein felixfontein deleted the backport/2.9/72354 branch November 14, 2020 11:53
@felixfontein
Copy link
Contributor Author

@acozine thanks!

@ansible ansible locked and limited conversation to collaborators Dec 11, 2020
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
affects_2.9 This issue/PR affects Ansible v2.9 backport This PR does not target the devel branch. core_review In order to be merged, this PR must follow the core review workflow. docs This issue/PR relates to or includes documentation. support:core This issue/PR relates to code supported by the Ansible Engineering Team.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants