From f127e5d535c92ee3f34864da00981d381f856877 Mon Sep 17 00:00:00 2001 From: John R Barker Date: Thu, 14 Dec 2017 17:33:27 +0000 Subject: [PATCH] Fix a few docs build issues (#33685) Noticed when doing `make webdocs` --- docs/docsite/rst/become.rst | 2 +- docs/docsite/rst/porting_guide_2.4.rst | 2 +- lib/ansible/plugins/callback/unixy.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/docsite/rst/become.rst b/docs/docsite/rst/become.rst index 392be88f07a..32b12cd5f98 100644 --- a/docs/docsite/rst/become.rst +++ b/docs/docsite/rst/become.rst @@ -280,7 +280,7 @@ If a password is required to enter enable mode this can be specified by doing on For more information about ``network_cli`` see :ref:`network-cli`. -.. _become-network_auth_and_auth_password +.. _become-network-auth-and-auth-password: authorize and auth_pass ----------------------- diff --git a/docs/docsite/rst/porting_guide_2.4.rst b/docs/docsite/rst/porting_guide_2.4.rst index d4b1edba03a..84e7c6b1053 100644 --- a/docs/docsite/rst/porting_guide_2.4.rst +++ b/docs/docsite/rst/porting_guide_2.4.rst @@ -164,7 +164,7 @@ Tests Tests succeeded/failed ----------------------- -Prior to Ansible version 2.4, a task return code of ``rc`` would override a return code of ``failed``. In version 2.4, both ``rc`` and ``failed`` are used to calculate the state of the task. Because of this, test plugins ``succeeded``/``failed``` have also been changed. This means that overriding a task failure with ``failed_when: no`` will result in ``succeeded``/``failed`` returning ``True``/``False``. For example: +Prior to Ansible version 2.4, a task return code of ``rc`` would override a return code of ``failed``. In version 2.4, both ``rc`` and ``failed`` are used to calculate the state of the task. Because of this, test plugins ``succeeded``/``failed``` have also been changed. This means that overriding a task failure with ``failed_when: no`` will result in ``succeeded``/``failed`` returning ``True``/``False``. For example:: - command: /bin/false register: result diff --git a/lib/ansible/plugins/callback/unixy.py b/lib/ansible/plugins/callback/unixy.py index 14c0e2d05ef..d5cbaea9a42 100644 --- a/lib/ansible/plugins/callback/unixy.py +++ b/lib/ansible/plugins/callback/unixy.py @@ -13,7 +13,7 @@ DOCUMENTATION = ''' short_description: condensed Ansible output version_added: 2.5 description: - - Consolidated Ansible output in the style of *NIX startup logs + - Consolidated Ansible output in the style of LINUX/UNIX startup logs. extends_documentation_fragment: - default_callback requirements: