From da26ba376093a7e710cda62469d622039294bcf1 Mon Sep 17 00:00:00 2001 From: Toshio Kuratomi Date: Mon, 23 Jul 2018 15:43:34 -0700 Subject: [PATCH] Documentatin fixes --- changelogs/fragments/drop-python-2.6-controller.yaml | 2 +- docs/docsite/rst/dev_guide/testing_units_modules.rst | 2 +- docs/docsite/rst/installation_guide/intro_installation.rst | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/changelogs/fragments/drop-python-2.6-controller.yaml b/changelogs/fragments/drop-python-2.6-controller.yaml index 5850b13ccb..254fde383a 100644 --- a/changelogs/fragments/drop-python-2.6-controller.yaml +++ b/changelogs/fragments/drop-python-2.6-controller.yaml @@ -1,6 +1,6 @@ --- major_changes: -- Support for running an Ansible controller with Python 2.6 has been dropped. +- Support for running an Ansible controller with Python-2.6 has been dropped. You can still manage machines which use Python-2.6 but you will have to manage them from a machine which has Python-2.7 or Python-3.5 or greater installed. diff --git a/docs/docsite/rst/dev_guide/testing_units_modules.rst b/docs/docsite/rst/dev_guide/testing_units_modules.rst index 880cfe3dc9..b273cc69d8 100644 --- a/docs/docsite/rst/dev_guide/testing_units_modules.rst +++ b/docs/docsite/rst/dev_guide/testing_units_modules.rst @@ -531,7 +531,7 @@ A helpful development approach to this should be to ensure that all of the tests run under Python 2.6 and that each assertion in the test cases has been checked to work by breaking the code in Ansible to trigger that failure. -.. warn:: Maintain Python-2.6 compatibility +.. warning:: Maintain Python-2.6 compatibility Please remember that modules need to maintain compatibility with Python-2.6 so the unittests for modules should also be compatible with Python-2.6. diff --git a/docs/docsite/rst/installation_guide/intro_installation.rst b/docs/docsite/rst/installation_guide/intro_installation.rst index d445a264d1..ec3fa273b2 100644 --- a/docs/docsite/rst/installation_guide/intro_installation.rst +++ b/docs/docsite/rst/installation_guide/intro_installation.rst @@ -41,7 +41,7 @@ information about running from source. It's not necessary to install the progra Control Machine Requirements ```````````````````````````` -Currently Ansible can be run from any machine with Python 2 (version 2.7) or Python 3 (versions 3.5 and higher) installed (Windows isn't supported for the control machine). +Currently Ansible can be run from any machine with Python 2 (version 2.7) or Python 3 (versions 3.5 and higher) installed. Windows isn't supported for the control machine. This includes Red Hat, Debian, CentOS, macOS, any of the BSDs, and so on.