[WIP] Backport/2.7/batch port (#45859)

Batch of docs backports:

* docs: Clarify include_task v import_tasks with conditionals (#43856)
(cherry picked from commit 6be42a2a0e)

* Add single quotes around package name (#45152)
(cherry picked from commit 0d81386144)

* prefer ansible_facts namespace and dict notation (#44980)
(cherry picked from commit 44510448b0)

* fix cherrypick conflict - scenario_guides

* Update implicit_localhost.rst (#45455)
(cherry picked from commit f68cd1acc6)

* updated fbsd install instructions (#45309)
(cherry picked from commit e9c2695ce7)

* Change "Defaulting Undefined Variables" (#41379)
(cherry picked from commit e35c4be1c1)

* adds license details to dev guide pages (#45574)
(cherry picked from commit 6e68d77f6d)

* FAQ: fix a typo, add link to 'vars' lookup (#42412)
(cherry picked from commit 95649dc793)

* Fix link and toctree (#45595)
(cherry picked from commit 6999bf318f)

* Improve the local toctree (and title) (#45590)
(cherry picked from commit afea00fa9f)

* Add undocumented configuration parameter and explain in porting guide (#36059)
(cherry picked from commit a892a6ef03)

* Simplify PPA installation for Ubuntu (#45690)
(cherry picked from commit 78e9f452a5)

* adding git+ssh uri scheme (#36025)
(cherry picked from commit 84a4257774)

* Add workaround for non-standard kerberos environments (#41465)
(cherry picked from commit 4e532e0ad9)

* Restore license agreement (#45809)
(cherry picked from commit f430f60541)

* partial cherry-pick - lenovo doc update PR 45483

docs/docsite/rst/community/committer_guidelines.rst

@@ -1,24 +1,25 @@
 .. _community_committer_guidelines:
 
-Committers Guidelines (for people with commit rights to Ansible on GitHub)
+*********************
-``````````````````````````````````````````````````````````````````````````
+Committers Guidelines
+*********************
 
-These are the guidelines for people with commit access to Ansible. Committers are essentially acting as members of the Ansible Core team, although not necessarily as an employee of Ansible and Red Hat. Please read the guidelines before you commit.
+These are the guidelines for people with commit privileges on the Ansible GitHub repository. Committers are essentially acting as members of the Ansible Core team, although not necessarily as employees of Ansible and Red Hat. Please read the guidelines before you commit.
 
 These guidelines apply to everyone. At the same time, this ISN'T a process document. So just use good judgement. You've been given commit access because we trust your judgement.
 
 That said, use the trust wisely.
 
-If you abuse the trust and break components and builds, etc., the trust level falls and you may be asked not to commit or you may lose access to do so.
+If you abuse the trust and break components and builds, etc., the trust level falls and you may be asked not to commit or you may lose your commit privileges.
 
-Features, High Level Design, and Roadmap
+Features, high-level design, and roadmap
 ========================================
 
 As a core team member, you are an integral part of the team that develops the :ref:`roadmap <roadmaps>`. Please be engaged, and push for the features and fixes that you want to see. Also keep in mind that Red Hat, as a company, will commit to certain features, fixes, APIs, etc. for various releases. Red Hat, the company, and the Ansible team must get these committed features (etc.) completed and released as scheduled. Obligations to users, the community, and customers must come first. Because of these commitments, a feature you want to develop yourself may not get into a release if it impacts a lot of other parts within Ansible.
 
 Any other new features and changes to high level design should go through the proposal process (TBD), to ensure the community and core team have had a chance to review the idea and approve it. The core team has sole responsibility for merging new features based on proposals.
 
-Our Workflow on GitHub
+Our workflow on GitHub
 ======================
 
 As a committer, you may already know this, but our workflow forms a lot of our team policies. Please ensure you're aware of the following workflow steps:
@@ -29,17 +30,17 @@ As a committer, you may already know this, but our workflow forms a lot of our t
 * Adjust code as necessary based on the Comments provided
 * Ask someone on the Core Team to do a final review and merge
 
-Addendum to workflow for Committers:
+Addendum to workflow for committers:
 ------------------------------------
 
-The Core Team is aware that this can be a difficult process at times. Sometimes, the team breaks the rules: Direct commits, merging their own PRs. This section is a set of guidelines. If you're changing a comma in a doc, or making a very minor change, you can use your best judgement. This is another trust thing. The process is critical for any major change, but for little things or getting something done quickly, use your best judgement and make sure people on the team are aware of your work.
+The Core Team is aware that this can be a difficult process at times. Sometimes, the team breaks the rules by making direct commits or merging their own PRs. This section is a set of guidelines. If you're changing a comma in a doc, or making a very minor change, you can use your best judgement. This is another trust thing. The process is critical for any major change, but for little things or getting something done quickly, use your best judgement and make sure people on the team are aware of your work.
 
 Roles on Core
 =============
-* Core Committers: Fine to do PRs for most things, but we should have a timebox. Hanging PRs may merge on the judgement of these devs.
+* Core committers: Fine to do PRs for most things, but we should have a timebox. Hanging PRs may merge on the judgement of these devs.
-* Module Owners: Module Owners own specific modules and have indirect commit access via the current module PR mechanisms.
+* :ref:`Module maintainers <maintainers>`: Module maintainers own specific modules and have indirect commit access via the current module PR mechanisms.
 
-General Rules
+General rules
 =============
 Individuals with direct commit access to ansible/ansible are entrusted with powers that allow them to do a broad variety of things--probably more than we can write down. Rather than rules, treat these as general *guidelines*, individuals with this power are expected to use their best judgement.
 
@@ -69,6 +70,7 @@ Committers are expected to continue to follow the same community and contributio
 
 People
 ======
+
 Individuals who've been asked to become a part of this group have generally been contributing in significant ways to the Ansible community for some time. Should they agree, they are requested to add their names and GitHub IDs to this file, in the section below, via a pull request. Doing so indicates that these individuals agree to act in the ways that their fellow committers trust that they will act.
 
 +---------------------+----------------------+--------------------+----------------------+

docs/docsite/rst/community/communication.rst

@@ -11,7 +11,7 @@ Code of Conduct
 
 Please read and understand the :ref:`code_of_conduct`.
 
-Mailing List Information
+Mailing list information
 ========================
 
 Ansible has several mailing lists.  Your first post to the mailing list will be moderated (to reduce spam), so please allow up to a day or so for your first post to appear.
@@ -28,12 +28,12 @@ Ansible has several mailing lists.  Your first post to the mailing list will be
 
 To subscribe to a group from a non-Google account, you can send an email to the subscription address requesting the subscription. For example: `ansible-devel+subscribe@googlegroups.com`
 
-IRC Channel
+IRC channels
-===========
+============
 
 Ansible has several IRC channels on Freenode (irc.freenode.net).
 
-General Channels
+General channels
 ----------------
 
 - ``#ansible`` - For general use questions and support.
@@ -41,8 +41,8 @@ General Channels
 - ``#ansible-meeting`` - For public community meetings. We will generally announce these on one or more of the above mailing lists. See the `meeting schedule and agenda page <https://github.com/ansible/community/blob/master/meetings/README.md>`_
 - ``#ansible-notices`` - Mostly bot output from things like GitHub, etc.
 
-Working Group
+Working groups
--------------
+--------------
 
 - ``#ansible-aws`` - For discussions on Amazon Web Services.
 - ``#ansible-community`` - Channel for discussing Ansible Community related things.
@@ -54,20 +54,20 @@ Working Group
 - ``#ansible-windows`` - For discussions on Ansible & Windows.
 
 
-Language specific channels
+Language-specific channels
 --------------------------
 
 - ``#ansible-es`` - Channel for Spanish speaking Ansible community.
 - ``#ansible-fr`` - Channel for French speaking Ansible community.
 
 
-IRC Meetings
+IRC meetings
 ------------
 
 The Ansible community holds regular IRC meetings on various topics, and anyone who is interested is invited to
 participate. For more information about Ansible meetings, consult the `meeting schedule and agenda page <https://github.com/ansible/community/blob/master/meetings/README.md>`_.
 
-Tower Support Questions
+Tower support questions
 ========================
 
 Ansible `Tower <https://www.ansible.com/products/tower>`_ is a UI, Server, and REST endpoint for Ansible.

docs/docsite/rst/community/contributor_license_agreement.rst

@@ -0,0 +1,7 @@
+.. _contributor_license_agreement:
+
+******************************
+Contributors License Agreement
+******************************
+
+By contributing you agree that these contributions are your own (or approved by your employer) and you grant a full, complete, irrevocable copyright license to all users and developers of the project, present and future, pursuant to the license of the project.

docs/docsite/rst/community/development_process.rst

@@ -1,7 +1,8 @@
 .. _community_development_process:
 
+*******************************
 The Ansible Development Process
-===============================
+*******************************
 
 .. contents:: Topics
 

docs/docsite/rst/community/github_admins.rst

@@ -1,22 +1,23 @@
+*************
 GitHub Admins
-=============
+*************
 
 .. contents:: Topics
 
-GitHub Admins have more permissions on GitHub than normal contributors.  There are
+GitHub Admins have more permissions on GitHub than normal contributors or even committers.  There are
 a few responsibilities that come with that increased power.
 
 
-Add and Remove Committers
+Adding and removing committers
--------------------------
+==============================
 
 The Ansible Team will periodically review who is actively contributing to Ansible to grant or revoke
 contributors' ability to commit on their own.  GitHub Admins are the people who have the power to
 actually manage the GitHub permissions.
 
 
-Change Branch Permissions for Release
+Changing branch permissions for releases
--------------------------------------
+========================================
 
 When we make releases we make people go through a :ref:`release_managers` to push commits to that
 branch.  The GitHub admins are responsible for setting the branch so only the Release Manager can

docs/docsite/rst/community/how_can_I_help.rst

@@ -1,5 +1,6 @@
-How To Help
+***************
-===========
+How can I help?
+***************
 
 .. contents:: Topics
 
@@ -8,7 +9,7 @@ Thanks for being interested in helping the Ansible project!
 There are many ways to help the Ansible project...but first, please read and understand the :ref:`code_of_conduct`.
 
 Become a power user
--------------------
+===================
 
 A great way to help the Ansible project is to become a power user:
 
@@ -21,21 +22,21 @@ A great way to help the Ansible project is to become a power user:
 When you become a power user, your ability and opportunities to help the Ansible project in other ways will multiply quickly.
 
 Ask and answer questions online
--------------------------------
+===============================
 
 There are many forums online where Ansible users ask and answer questions. Reach out and communicate with your fellow Ansible users.
 
 You can find the official :ref:`Ansible communication channels <communication>`.
 
 Participate in your local meetup
---------------------------------
+================================
 
 There are Ansible meetups `all over the world <https://www.meetup.com/topics/ansible/>`_. Join your local meetup. Attend regularly. Ask good questions. Volunteer to give a presentation about how you use Ansible.
 
 If there isn't a meetup near you, we'll be happy to help you `start one <https://www.ansible.com/community/events/ansible-meetups>`_.
 
 File and verify issues
-----------------------
+======================
 
 All software has bugs, and Ansible is no exception. When you find a bug, you can help tremendously by :ref:`telling us about it <reporting_bugs_and_features>`.
 
@@ -43,31 +44,31 @@ All software has bugs, and Ansible is no exception. When you find a bug, you can
 If you should discover that the bug you're trying to file already exists in an issue, you can help by verifying the behavior of the reported bug with a comment in that issue, or by reporting any additional information.
 
 Review and submit pull requests
--------------------------------
+===============================
 
 As you become more familiar with how Ansible works, you may be able to fix issues or develop new features yourself. If you think you've got a solution to a bug you've found in Ansible, or if you've got a new feature that you've written and would like to share with millions of Ansible users, read all about the :ref:`Ansible development process <community_development_process>` to learn how to get your code accepted into Ansible.
 
 Another good way to help is to review pull requests that other Ansible users have submitted. The Ansible community keeps a full list of `open pull requests by file <https://ansible.sivel.net/pr/byfile.html>`_, so if there's a particular module or plug-in that particularly interests you, you can easily keep track of all the relevant new pull requests and provide testing or feedback.
 
 Become a module maintainer
---------------------------
+==========================
 
 Once you've learned about the development process and have contributed code to a particular module, we encourage you to become a maintainer of that module. There are hundreds of different modules in Ansible, and the vast majority of them are written and maintained entirely by members of the Ansible community.
 
 To learn more about the responsibilities of being an Ansible module maintainer, please read our :ref:`module maintainer guidelines <maintainers>`.
 
 Join a working group
---------------------
+====================
 
 Working groups are a way for Ansible community members to self-organize around particular topics of interest. We have working groups around various topics. To join or create a working group, please read the `Ansible working group guidelines <https://github.com/ansible/community/blob/master/WORKING-GROUPS.md>`_.
 
 
 Teach Ansible to others
------------------------
+=======================
 
 We're working on a standardized Ansible workshop called `Lightbulb <https://github.com/ansible/lightbulb>`_ that can provide a good hands-on introduction to Ansible usage and concepts.
 
 Social media
-------------
+============
 
 If you like Ansible and just want to spread the good word, feel free to share on your social media platform of choice, and let us know by using ``@ansible`` or ``#ansible``. We'll be looking for you.

docs/docsite/rst/community/index.rst

@@ -10,19 +10,24 @@ The purpose of this guide is to teach you everything you need to know about bein
 
 To get started, please read and understand the :ref:`code_of_conduct`, and then select one of the following topics.
 
-
 .. toctree::
    :maxdepth: 2
 
    code_of_conduct
-   development_process
-   reporting_bugs_and_features
    how_can_I_help
-   maintainers
+   reporting_bugs_and_features
-   release_managers
    communication
+   development_process
+   contributor_license_agreement
+   triage_process
    other_tools_and_programs
+   ../dev_guide/style_guide/index
 
+.. toctree::
+   :caption: Guidelines for specific types of contributors
+   :maxdepth: 2
 
-
+   committer_guidelines
-
+   maintainers
+   release_managers
+   github_admins

docs/docsite/rst/community/maintainers.rst

@@ -14,7 +14,7 @@ In addition to the information below, module maintainers should be familiar with
 * Documentation on :ref:`module development <developing_modules>`
 
 
-Maintainer Responsibilities
+Maintainer responsibilities
 ===========================
 
 When you contribute a new module to the `ansible/ansible <https://github.com/ansible/ansible>`_ repository, you become the maintainer for that module once it has been merged. Maintainership empowers you with the authority to accept, reject, or request revisions to pull requests on your module -- but as they say, "with great power comes great responsibility."
@@ -27,10 +27,10 @@ Finally, following the `ansible-devel <https://groups.google.com/forum/#!forum/a
 
 The Ansible community hopes that you will find that maintaining your module is as rewarding for you as having the module is for the wider community.
 
-Pull Requests, Issues, and Workflow
+Pull requests, issues, and workflow
 ===================================
 
-Pull Requests
+Pull requests
 -------------
 
 Module pull requests are located in the `main Ansible repository <https://github.com/ansible/ansible/pulls>`_.
@@ -44,7 +44,7 @@ Issues for modules, including bug reports, documentation bug reports, and featur
 
 Issues for modules are routed to their maintainers via an automated process. This process is still being refined, and currently depends upon the issue creator to provide adequate details (specifically, providing the proper module name) in order to route it correctly. If you are a maintainer of a specific module, it is recommended that you periodically search module issues for issues which mention your module's name (or some variation on that name), as well as setting an appropriate notification process for receiving notification of mentions of your GitHub ID.
 
-PR Workflow
+PR workflow
 -----------
 
 Automated routing of pull requests is handled by a tool called `Ansibot <https://github.com/ansible/ansibullbot>`_.
@@ -58,8 +58,8 @@ Maintainers (BOTMETA.yml)
 
 The full list of maintainers is located in `BOTMETA.yml <https://github.com/ansible/ansible/blob/devel/.github/BOTMETA.yml>`_.
 
-Changing Maintainership
+Adding and removing maintainers
------------------------
+===============================
 
 Communities change over time, and no one maintains a module forever. If you'd like to propose an additional maintainer for your module, please submit a PR to ``BOTMETA.yml`` with the GitHub username of the new maintainer.
 

docs/docsite/rst/community/release_managers.rst

@@ -1,23 +1,22 @@
 .. _release_managers:
 
-
+**************************
-Release Managers
+Release manager guidelines
-================
+**************************
 
 .. contents:: Topics
 
 The release manager's purpose is to ensure a smooth release.  To achieve that goal, they need to
 coordinate between:
 
-* Developers with Commit privileges on the `Ansible github repository <https://github.com/ansible/ansible/>`_
+* Developers with commit privileges on the `Ansible GitHub repository <https://github.com/ansible/ansible/>`_
 * Contributors without commit privileges
 * The community
 * Ansible documentation team
 * Ansible Tower team
 
-
+Pre-releases: what and why
-Pre-releases: What and Why
+==========================
---------------------------
 
 Pre-releases exist to draw testers. They give people who don't feel comfortable running from source
 control a means to get an early version of the code to test and give us feedback. To ensure we get
@@ -35,18 +34,18 @@ back those changes to give people time to test between. People cannot test what
 we have to get those tarballs out there even if people feel they have to install more frequently.
 
 
-What is Beta?
+Beta releases
-~~~~~~~~~~~~~
+-------------
 
-In a Beta release, we know there are still bugs.  We will continue to accept fixes for these.
+In a beta release, we know there are still bugs.  We will continue to accept fixes for these.
 Although we review these fixes, sometimes they can be invasive or potentially destabilize other
 areas of the code.
 
 During the beta, we will no longer accept feature submissions.
 
 
-What is a Release Candidate?
+Release candidates
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+------------------
 
 In a release candidate, we've fixed all known blockers. Any remaining bugfixes are
 ones that we are willing to leave out of the release. At this point we need user testing to
@@ -74,8 +73,8 @@ The last RC should be as close to the final as possible. The following things ma
     (like the Tower Team) which would want to test the code.
 
 
-Release Process
+Ansible release process
-===============
+=======================
 
 The release process is kept in a `separate document
 <https://docs.google.com/document/d/10EWLkMesi9s_CK_GmbZlE_ZLhuQr6TBrdMLKo5dnMAI/edit#heading=h.ooo3izcel3cz>`_

docs/docsite/rst/community/reporting_bugs_and_features.rst

@@ -6,7 +6,7 @@ Reporting Bugs And Requesting Features
 
 .. contents:: Topics
 
-Reporting A Bug
+Reporting a bug
 ===============
 
 Ansible practices responsible disclosure - if this is a security related bug, email `security@ansible.com <mailto:security@ansible.com>`_ instead of filing a ticket or posting to the Google Group and you will receive a prompt response.

docs/docsite/rst/dev_guide/developing_module_utilities.rst

@@ -11,6 +11,8 @@ Ansible provides a number of module utilities that provide helper functions that
 
 The following is a list of ``module_utils`` files and a general description. The module utility source code lives in the ``./lib/ansible/module_utils`` directory under your main Ansible path - for more details on any specific module utility, please see the source code.
 
+.. include:: shared_snippets/licensing.txt
+
 - api.py - Adds shared support for generic API modules.
 - azure_rm_common.py - Definitions and utilities for Microsoft Azure Resource Manager template deployments.
 - basic.py - General definitions and helper utilities for Ansible modules.

docs/docsite/rst/dev_guide/developing_modules_checklist.rst

@@ -17,7 +17,8 @@ To contribute a module to Ansible, you must:
 * support Python 2.7 and Python 3.5 - if your module cannot support Python 2.7, explain the required minimum Python version and rationale in the requirements section in ``DOCUMENTATION``
 * use proper :ref:`Python 3 syntax <developing_python_3>`
 * follow `PEP 8 <https://www.python.org/dev/peps/pep-0008/>`_ Python style conventions - see :ref:`testing_pep8` for more information
-* license your module with GPL 3
+* license your module under the GPL license (GPLv3 or later)
+* understand the :ref:`license agreement <contributor_license_agreement>`, which applies to all contributions
 * conform to Ansible's :ref:`formatting and documentation <developing_modules_documenting>` standards
 * include comprehensive :ref:`tests <developing_testing>` for your module
 * minimize module dependencies

docs/docsite/rst/dev_guide/developing_modules_general_windows.rst

@@ -1,8 +1,8 @@
 .. _developing_modules_general_windows:
 
-**********************************************
+**************************************
-Windows Ansible module development walkthrough
+Windows module development walkthrough
-**********************************************
+**************************************
 
 In this section, we will walk through developing, testing, and debugging an
 Ansible Windows module.
@@ -12,7 +12,8 @@ Windows host, this guide differs from the usual development walkthrough guide.
 
 What's covered in this section:
 
-.. contents:: Topics
+.. contents::
+   :local:
 
 
 Windows environment setup

docs/docsite/rst/dev_guide/index.rst

@@ -35,7 +35,10 @@ Find the task that best describes what you want to do:
    * I want to :ref:`connect Ansible to a new source of inventory <developing_inventory>`.
    * I want to :ref:`deprecate an outdated module <deprecating_modules>`.
 
-* I want to :ref:`contribute my module or plugin to Ansible Core <developing_modules_checklist>`.
+* I want to contribute back to the Ansible project:
+
+  * I want to :ref:`contribute my module or plugin <developing_modules_checklist>`.
+  * I want to :ref:`understand the license agreement <contributor_license_agreement>` for contributions to Ansible.
 
 If you prefer to read the entire guide, here's a list of the pages in order.
 

docs/docsite/rst/dev_guide/style_guide/index.rst

@@ -3,24 +3,24 @@
    You can adapt this file completely to your liking, but it should at least
    contain the root `toctree` directive.
 
-====================================
+*******************
 Ansible Style Guide
-====================================
+*******************
 
-.. Welcome to Ansible Style Guide's documentation! ===============================================
+Welcome to the Ansible Style Guide
+==================================
+
+Follow these guidelines to create clear, concise, useful community contributions and documentation. This guide helps us make the content on ansible.com consistent.
 
 .. toctree::
   :maxdepth: 1
-  :numbered:
 
-  self
-  why_use
-  resources
   basic_rules
   voice_style
   trademarks
   grammar_punctuation
   spelling_word_choice
+  resources
 
 
 .. Indices and tables

docs/docsite/rst/dev_guide/style_guide/why_use.rst

@@ -1,3 +1,5 @@
+:orphan:
+
 Why Use a Style Guide?
 `````````````````````````````````
 

docs/docsite/rst/dev_guide/testing/sanity/ansible-var-precedence-check.rst

@@ -1,4 +1,4 @@
-.. orphan:
+:orphan:
 
 Sanity Tests » ansible-var-precedence-check
 ===========================================

docs/docsite/rst/dev_guide/testing/sanity/docs-build.rst

@@ -1,4 +1,4 @@
-.. orphan:
+:orphan:
 
 Sanity Tests » docs-build
 =========================

docs/docsite/rst/dev_guide/testing/sanity/no-wildcard-import.rst

@@ -1,4 +1,4 @@
-.. orphan:
+:orphan:
 
 Sanity Tests » no-wildcard-import
 =================================

docs/docsite/rst/dev_guide/testing/sanity/pylint-ansible-test.rst

@@ -1,4 +1,4 @@
-.. orphan:
+:orphan:
 
 Sanity Tests » pylint-ansible-test
 ==================================

docs/docsite/rst/dev_guide/testing_compile.rst

@@ -1,3 +1,5 @@
+:orphan:
+
 .. _testing_compile:
 
 *************

docs/docsite/rst/dev_guide/testing_documentation.rst

@@ -1,3 +1,5 @@
+:orphan:
+
 .. _testing_documentation:
 
 *********************

docs/docsite/rst/dev_guide/testing_httptester.rst

@@ -1,3 +1,5 @@
+:orphan:
+
 **********
 httptester
 **********

docs/docsite/rst/dev_guide/testing_integration.rst

@@ -1,3 +1,5 @@
+:orphan:
+
 .. _testing_integration:
 
 *****************

docs/docsite/rst/dev_guide/testing_pep8.rst

@@ -1,3 +1,5 @@
+:orphan:
+
 .. _testing_pep8:
 
 *****

docs/docsite/rst/dev_guide/testing_running_locally.rst

@@ -1,3 +1,5 @@
+:orphan:
+
 .. _testing_running_locally:
 
 ***************
@@ -84,4 +86,3 @@ Reports can be generated in several different formats:
 To clear data between test runs, use the ``ansible-test coverage erase`` command. For a full list of features see the online help::
 
    ansible-test coverage --help
-

docs/docsite/rst/dev_guide/testing_sanity.rst

@@ -1,3 +1,5 @@
+:orphan:
+
 .. _testing_sanity:
 
 ************
@@ -75,5 +77,3 @@ yamllint
 ~~~~~~~~
 
 Check YAML files for syntax and formatting issues.
-
-

docs/docsite/rst/dev_guide/testing_units.rst

@@ -1,3 +1,5 @@
+:orphan:
+
 .. _testing_units:
 
 **********
@@ -207,4 +209,3 @@ reports.
        The documentation of the earliest supported unittest framework - from Python 2.6
    `pytest: helps you write better programs <https://docs.pytest.org/en/latest/>`_
        The documentation of pytest - the framework actually used to run Ansible unit tests
-

docs/docsite/rst/dev_guide/testing_units_modules.rst

@@ -1,3 +1,5 @@
+:orphan:
+
 .. _testing_units_modules:
 
 ****************************

docs/docsite/rst/dev_guide/testing_validate-modules.rst

@@ -1,3 +1,5 @@
+:orphan:
+
 ****************
 validate-modules
 ****************

docs/docsite/rst/index.rst

@@ -47,19 +47,10 @@ Ansible releases a new major release of Ansible approximately every two months.
 
 .. toctree::
    :maxdepth: 2
+   :glob:
    :caption: Scenario Guides
 
-   scenario_guides/guide_aci
+   scenario_guides/guide_*
-   scenario_guides/guide_aws
-   scenario_guides/guide_azure
-   scenario_guides/guide_cloudstack
-   scenario_guides/guide_docker
-   scenario_guides/guide_gce
-   scenario_guides/guide_packet
-   scenario_guides/guide_rax
-   scenario_guides/guide_rolling_upgrade
-   scenario_guides/guide_vagrant
-   scenario_guides/guide_vultr
 
 .. toctree::
    :maxdepth: 2
@@ -74,7 +65,7 @@ Ansible releases a new major release of Ansible approximately every two months.
    network/index
 
 .. toctree::
-   :maxdepth: 2
+   :maxdepth: 1
    :caption: Reference & Appendices
 
    ../modules/modules_by_category
@@ -89,6 +80,8 @@ Ansible releases a new major release of Ansible approximately every two months.
    dev_guide/testing/sanity/index
    reference_appendices/faq
    reference_appendices/glossary
+   reference_appendices/module_utils
+   reference_appendices/special_variables
    reference_appendices/tower
 
 

docs/docsite/rst/installation_guide/intro_installation.rst

@@ -147,8 +147,7 @@ To configure the PPA on your machine and install ansible run these commands:
 
     $ sudo apt-get update
     $ sudo apt-get install software-properties-common
-    $ sudo apt-add-repository ppa:ansible/ansible
+    $ sudo apt-add-repository --yes --update ppa:ansible/ansible
-    $ sudo apt-get update
     $ sudo apt-get install ansible
 
 .. note:: On older Ubuntu distributions, "software-properties-common" is called "python-software-properties".
@@ -204,9 +203,19 @@ To install the newest version, you may need to unmask the ansible package prior
 Latest Releases via pkg (FreeBSD)
 +++++++++++++++++++++++++++++++++
 
+Though Ansible works with both Python 2 and 3 versions, FreeBSD has different packages for each Python version.
+So to install you can use:
+
 .. code-block:: bash
 
-    $ sudo pkg install ansible
+    $ sudo pkg install py27-ansible
+
+or:
+
+.. code-block:: bash
+
+    $ sudo pkg install py36-ansible
+
 
 You may also wish to install from ports, run:
 
@@ -214,6 +223,14 @@ You may also wish to install from ports, run:
 
     $ sudo make -C /usr/ports/sysutils/ansible install
 
+You can also choose a specific version, i.e  ``ansible25``.
+
+Older versions of FreeBSD worked with something like this (substitute for your choice of package manager):
+
+.. code-block:: bash
+
+    $ sudo pkg install ansible
+
 .. _on_macos:
 
 Latest Releases on macOS

docs/docsite/rst/inventory/implicit_localhost.rst

@@ -1,3 +1,5 @@
+:orphan:
+
 .. _implicit_localhost:
 
 Implicit 'localhost'
@@ -26,6 +28,7 @@ You can override the built-in implicit version by creating a ``localhost`` host
 
 .. note::
   - This host is not targetable via any group, however it will use vars from ``host_vars`` and from the 'all' group.
+  - The ``inventory_file`` and ``inventory_dir`` magic variables are not available for the implicit localhost as they are dependent on **each inventory host**.
   - This implicit host also gets triggered by using ``127.0.0.1`` or ``::1`` as they are the IPv4 and IPv6 representations of 'localhost'.
   - Even though there are many ways to create it, there will only ever be ONE implicit localhost, using the name first used to create it.
   - Having ``connection: local`` does NOT trigger an implicit localhost, you are just changing the connection for the ``inventory_hostname``.

docs/docsite/rst/network/user_guide/platform_cnos.rst

@@ -0,0 +1,69 @@
+.. _cnos_platform_options:
+
+***************************************
+CNOS Platform Options
+***************************************
+
+CNOS supports Enable Mode (Privilege Escalation). This page offers details on how to use Enable Mode on CNOS in Ansible. 
+
+.. contents:: Topics
+
+Connections Available
+================================================================================
+
++---------------------------+-----------------------------------------------+
+|..                         | CLI                                           |
++===========================+===============================================+
+| **Protocol**              |  SSH                                          |
++---------------------------+-----------------------------------------------+
+| | **Credentials**         | | uses SSH keys / SSH-agent if present        |
+| |                         | | accepts ``-u myuser -k`` if using password  |
++---------------------------+-----------------------------------------------+
+| **Indirect Access**       | via a bastion (jump host)                     |
++---------------------------+-----------------------------------------------+
+| | **Connection Settings** | | ``ansible_connection: network_cli``         |
+| |                         | |                                             |
+| |                         | |                                             |
++---------------------------+-----------------------------------------------+
+| | **Enable Mode**         | | supported - use ``ansible_become: yes``     |
+| | (Privilege Escalation)  | | with ``ansible_become_method: enable``      |
+| |                         | | and ``ansible_become_pass:``                |
++---------------------------+-----------------------------------------------+
+| **Returned Data Format**  | ``stdout[0].``                                |
++---------------------------+-----------------------------------------------+
+
+For legacy playbooks, CNOS still supports ``ansible_connection: local``. We recommend modernizing to use ``ansible_connection: network_cli`` as soon as possible.
+
+Using CLI in Ansible
+================================================================================
+
+Example CLI ``group_vars/cnos.yml``
+--------------------------------------------------------------------------------
+
+.. code-block:: yaml
+
+   ansible_connection: network_cli
+   ansible_network_os: cnos
+   ansible_user: myuser
+   ansible_ssh_pass: !vault...
+   ansible_become: yes
+   ansible_become_method: enable
+   ansible_become_pass: !vault...
+   ansible_ssh_common_args: '-o ProxyCommand="ssh -W %h:%p -q bastion01"'
+
+
+- If you are using SSH keys (including an ssh-agent) you can remove the ``ansible_ssh_pass`` configuration.
+- If you are accessing your host directly (not through a bastion/jump host) you can remove the ``ansible_ssh_common_args`` configuration.
+- If you are accessing your host through a bastion/jump host, you cannot include your SSH password in the ``ProxyCommand`` directive. To prevent secrets from leaking out (for example in ``ps`` output), SSH does not support providing passwords via environment variables.
+
+Example CLI Task
+----------------
+
+.. code-block:: yaml
+
+   - name: Retreive CNOS OS version
+     cnos_command:
+       commands: show version
+     when: ansible_network_os == 'cnos'
+
+.. include:: shared_snippets/SSH_warning.txt

docs/docsite/rst/network/user_guide/platform_enos.rst

@@ -0,0 +1,69 @@
+.. _enos_platform_options:
+
+***************************************
+ENOS Platform Options
+***************************************
+
+ENOS supports Enable Mode (Privilege Escalation). This page offers details on how to use Enable Mode on ENOS in Ansible. 
+
+.. contents:: Topics
+
+Connections Available
+================================================================================
+
++---------------------------+-----------------------------------------------+
+|..                         | CLI                                           |
++===========================+===============================================+
+| **Protocol**              |  SSH                                          |
++---------------------------+-----------------------------------------------+
+| | **Credentials**         | | uses SSH keys / SSH-agent if present        |
+| |                         | | accepts ``-u myuser -k`` if using password  |
++---------------------------+-----------------------------------------------+
+| **Indirect Access**       | via a bastion (jump host)                     |
++---------------------------+-----------------------------------------------+
+| | **Connection Settings** | | ``ansible_connection: network_cli``         |
+| |                         | |                                             |
+| |                         | |                                             |
++---------------------------+-----------------------------------------------+
+| | **Enable Mode**         | | supported - use ``ansible_become: yes``     |
+| | (Privilege Escalation)  | | with ``ansible_become_method: enable``      |
+| |                         | | and ``ansible_become_pass:``                |
++---------------------------+-----------------------------------------------+
+| **Returned Data Format**  | ``stdout[0].``                                |
++---------------------------+-----------------------------------------------+
+
+For legacy playbooks, ENOS still supports ``ansible_connection: local``. We recommend modernizing to use ``ansible_connection: network_cli`` as soon as possible.
+
+Using CLI in Ansible
+================================================================================
+
+Example CLI ``group_vars/enos.yml``
+--------------------------------------------------------------------------------
+
+.. code-block:: yaml
+
+   ansible_connection: network_cli
+   ansible_network_os: enos
+   ansible_user: myuser
+   ansible_ssh_pass: !vault...
+   ansible_become: yes
+   ansible_become_method: enable
+   ansible_become_pass: !vault...
+   ansible_ssh_common_args: '-o ProxyCommand="ssh -W %h:%p -q bastion01"'
+
+
+- If you are using SSH keys (including an ssh-agent) you can remove the ``ansible_ssh_pass`` configuration.
+- If you are accessing your host directly (not through a bastion/jump host) you can remove the ``ansible_ssh_common_args`` configuration.
+- If you are accessing your host through a bastion/jump host, you cannot include your SSH password in the ``ProxyCommand`` directive. To prevent secrets from leaking out (for example in ``ps`` output), SSH does not support providing passwords via environment variables.
+
+Example CLI Task
+----------------
+
+.. code-block:: yaml
+
+   - name: Retreive ENOS OS version
+     enos_command:
+       commands: show version
+     when: ansible_network_os == 'enos'
+
+.. include:: shared_snippets/SSH_warning.txt

docs/docsite/rst/network/user_guide/platform_index.rst

@@ -10,6 +10,8 @@ Some Ansible Network platforms support multiple connection types, privilege esca
    :maxdepth: 2
    :caption: Platform Options
 
+   platform_cnos
+   platform_enos
    platform_eos
    platform_exos
    platform_ios
@@ -58,6 +60,10 @@ Settings by Platform
 +-------------------+-------------------------+----------------------+----------------------+------------------+------------------+
 | Junos OS*         | ``junos``               | in v. >=2.5          | in v. >=2.5          | N/A              |  in v. >=2.4     |
 +-------------------+-------------------------+----------------------+----------------------+------------------+------------------+
+| Lenovo CNOS       | ``cnos``                | in v. >=2.5          | N/A                  | N/A              |  in v. >=2.3     |
++-------------------+-------------------------+----------------------+----------------------+------------------+------------------+
+| Lenovo ENOS       | ``enos``                | in v. >=2.5          | N/A                  | N/A              |  in v. >=2.5     |
++-------------------+-------------------------+----------------------+----------------------+------------------+------------------+
 | MikroTik RouterOS | ``routeros``            | in v. >=2.7          | N/A                  | N/A              |  N/A             |
 +-------------------+-------------------------+----------------------+----------------------+------------------+------------------+
 | Nokia SR OS       | ``sros``                | in v. >=2.5          | N/A                  | N/A              |  in v. >=2.4     |

docs/docsite/rst/porting_guides/porting_guide_2.5.rst

@@ -137,6 +137,21 @@ See :ref:`playbooks_tests` for more information.
 
 Additionally, a script was created to assist in the conversion for tests using filter syntax to proper jinja test syntax. This script has been used to convert all of the Ansible integration tests to the correct format. There are a few limitations documented, and all changes made by this script should be evaluated for correctness before executing the modified playbooks. The script can be found at `https://github.com/ansible/ansible/blob/devel/hacking/fix_test_syntax.py <https://github.com/ansible/ansible/blob/devel/hacking/fix_test_syntax.py>`_.
 
+Ansible fact namespacing
+------------------------
+
+Ansible facts, which have historically been written to names like ``ansible_*``
+in the main facts namespace, have been placed in their own new namespace,
+``ansible_facts.*`` For example, the fact ``ansible_distribution`` is now best
+queried through the variable structure ``ansible_facts.distribution``. 
+
+A new configuration variable, ``inject_facts_as_vars``, has been added to
+ansible.cfg. Its default setting, 'True', keeps the 2.4 behavior of facts
+variables being set in the old ``ansible_*`` locations (while also writing them
+to the new namespace). This variable is expected to be set to 'False' in a
+future release. When ``inject_facts_as_vars`` is set to False, you must
+refer to ansible_facts through the new ``ansible_facts.*`` namespace.
+
 Modules
 =======
 

docs/docsite/rst/reference_appendices/faq.rst

@@ -344,7 +344,7 @@ Also see dynamic_variables_.
 How do I access a group variable?
 +++++++++++++++++++++++++++++++++
 
-Techinically, you don't, Ansible does not really use groups directly. Groups are label for host selection and a way to bulk assign variables, they are not a first class entity, Ansible only cares about Hosts and Tasks.
+Technically, you don't, Ansible does not really use groups directly. Groups are label for host selection and a way to bulk assign variables, they are not a first class entity, Ansible only cares about Hosts and Tasks.
 
 That said, you could just access the variable by selecting a host that is part of that group, see first_host_in_a_group_ below for an example.
 
@@ -580,7 +580,7 @@ The above DOES NOT WORK as you expect, if you need to use a dynamic variable use
 
     {{ hostvars[inventory_hostname]['somevar_' + other_var] }}
 
-For 'non host vars' you can use the vars lookup plugin:
+For 'non host vars' you can use the :ref:`vars lookup<vars_lookup>` plugin:
 
 .. code-block:: jinja
 

docs/docsite/rst/reference_appendices/galaxy.rst

@@ -131,7 +131,7 @@ Use the following example as a guide for specifying roles in *requirements.yml*:
     - src: https://bitbucket.org/willthames/hg-ansible-galaxy
       scm: hg
 
-    # from GitLab or other git-based scm
+    # from GitLab or other git-based scm, using git+ssh
     - src: git@gitlab.company.com:mygroup/ansible-base.git
       scm: git
       version: "0.1"  # quoted, so YAML doesn't parse this as a floating-point value

docs/docsite/rst/scenario_guides/guide_azure.rst

@@ -12,7 +12,7 @@ installed on the host running Ansible.
 
 .. code-block:: bash
 
-    $ pip install ansible[azure]
+    $ pip install 'ansible[azure]'
 
 If you are running Ansible from source, you can install the dependencies from the
 root directory of the Ansible repo.

docs/docsite/rst/scenario_guides/guides.rst

@@ -1,21 +1,15 @@
-Detailed Guides
+:orphan:
-```````````````
 
-This section is new and evolving.  The idea here is to explore particular use cases in greater depth and provide a more "top down" explanation of some basic features.
+***************
+Scenario Guides
+***************
+
+The guides in this section explore particular use cases in greater depth and provide a more "top-down" explanation of some basic features.
 
 .. toctree::
+   :glob:
    :maxdepth: 1
 
-   guide_aci
+   guide_*
-   guide_aws
-   guide_azure
-   guide_rax
-   guide_gce
-   guide_cloudstack
-   guide_vagrant
-   guide_rolling_upgrade
-   guide_docker
-   guide_packet
-   guide_vultr
 
-Pending topics may include: Docker, Jenkins, Google Compute Engine, Linode/DigitalOcean, Continuous Deployment, and more.
+Pending topics may include: Jenkins, Linode/DigitalOcean, Continuous Deployment, and more.

docs/docsite/rst/user_guide/intro.rst

@@ -1,3 +1,5 @@
+:orphan:
+
 Introduction
 ============
 

docs/docsite/rst/user_guide/module_defaults_config.rst

@@ -1,7 +1,10 @@
+:orphan:
+
 .. _module_defaults_config:
 
+*****************************
 Module Defaults Configuration
-=============================
+*****************************
 
 Ansible 2.7 adds a preview-status feature to group together modules that share common sets of parameters. This makes
 it easier to author playbooks making heavy use of API-based modules such as cloud modules. By default Ansible ships

docs/docsite/rst/user_guide/playbook_pathing.rst

@@ -1,6 +1,8 @@
-=======================
+:orphan:
+
+***********************
 Search paths in Ansible
-=======================
+***********************
 
 Absolute paths are not an issue as they always have a known start, but relative paths ... well, they are relative.
 

docs/docsite/rst/user_guide/playbooks_best_practices.rst

@@ -394,11 +394,12 @@ This makes a dynamic group of hosts matching certain criteria, even if that grou
 
    ---
 
-    # talk to all hosts just so we can learn about them 
+    - name: talk to all hosts just so we can learn about them
-    - hosts: all
+      hosts: all
       tasks:
-        - group_by: 
+        - name: Classify hosts depending on their OS distribution
-            key: os_{{ ansible_distribution }}
+          group_by:
+            key: os_{{ ansible_facts['distribution'] }}
 
     # now just on the CentOS hosts...
 
@@ -426,7 +427,8 @@ Alternatively, if only variables are needed::
 
     - hosts: all
       tasks:
-        - include_vars: "os_{{ ansible_distribution }}.yml"
+        - name: Set OS distribution dependant variables
+          include_vars: "os_{{ ansible_facts['distribution'] }}.yml"
         - debug:
             var: asdf
 

docs/docsite/rst/user_guide/playbooks_blocks.rst

@@ -25,7 +25,7 @@ Blocks allow for logical grouping of tasks and in play error handling. Most of w
             name: bar
             state: started
             enabled: True
-      when: ansible_distribution == 'CentOS'
+      when: ansible_facts['distribution'] == 'CentOS'
       become: true
       become_user: root
 

docs/docsite/rst/user_guide/playbooks_conditionals.rst

@@ -22,23 +22,22 @@ Sometimes you will want to skip a particular step on a particular host.
 This could be something as simple as not installing a certain package if the operating system is a particular version,
 or it could be something like performing some cleanup steps if a filesystem is getting full.
 
-This is easy to do in Ansible with the `when` clause, which contains a raw Jinja2 expression without double curly braces (see :doc:`playbooks_variables`).
+This is easy to do in Ansible with the `when` clause, which contains a raw Jinja2 expression without double curly braces (see :ref:`group_by_module`).
 It's actually pretty simple::
 
     tasks:
       - name: "shut down Debian flavored systems"
         command: /sbin/shutdown -t now
-        when: ansible_os_family == "Debian"
+        when: ansible_facts['os_family'] == "Debian"
-        # note that Ansible facts and vars like ansible_os_family can be used
+        # note that all variables can be directly in conditionals without double curly braces
-        # directly in conditionals without double curly braces
 
 You can also use parentheses to group conditions::
 
     tasks:
       - name: "shut down CentOS 6 and Debian 7 systems"
         command: /sbin/shutdown -t now
-        when: (ansible_distribution == "CentOS" and ansible_distribution_major_version == "6") or
+        when: (ansible_facts['distribution'] == "CentOS" and ansible_facts['distribution_major_version'] == "6") or
-              (ansible_distribution == "Debian" and ansible_distribution_major_version == "7")
+              (ansible_facts['distribution'] == "Debian" and ansible_facts['distribution_major_version'] == "7")
 
 Multiple conditions that all need to be true (a logical 'and') can also be specified as a list::
 
@@ -46,8 +45,8 @@ Multiple conditions that all need to be true (a logical 'and') can also be speci
       - name: "shut down CentOS 6 systems"
         command: /sbin/shutdown -t now
         when:
-          - ansible_distribution == "CentOS"
+          - ansible_facts['distribution'] == "CentOS"
-          - ansible_distribution_major_version == "6"
+          - ansible_facts['distribution_major_version'] == "6"
 
 A number of Jinja2 "tests" and "filters" can also be used in when statements, some of which are unique
 and provided by Ansible.  Suppose we want to ignore the error of one statement and then
@@ -72,17 +71,18 @@ decide to do something conditionally based on success or failure::
 .. note:: both `success` and `succeeded` work (`fail`/`failed`, etc).
 
 
-As a reminder, to see what facts are available on a particular system, you can do the following::
+To see what facts are available on a particular system, you can do the following in a playbook::
+
+    - debug: var=ansible_facts
 
-    ansible hostname.example.com -m setup
 
 Tip: Sometimes you'll get back a variable that's a string and you'll want to do a math operation comparison on it.  You can do this like so::
 
     tasks:
       - shell: echo "only on Red Hat 6, derivatives, and later"
-        when: ansible_os_family == "RedHat" and ansible_lsb.major_release|int >= 6
+        when: ansible_facts['os_family'] == "RedHat" and ansible_facts['lsb']['major_release']|int >= 6
 
-.. note:: the above example requires the lsb_release package on the target host in order to return the ansible_lsb.major_release fact.
+.. note:: the above example requires the lsb_release package on the target host in order to return the 'lsb major_release' fact.
 
 Variables defined in the playbooks or inventory can also be used.  An example may be the execution of a task based on a variable's boolean value::
 
@@ -170,18 +170,20 @@ Or with a role::
     - hosts: webservers
       roles:
          - role: debian_stock_config
-           when: ansible_os_family == 'Debian'
+           when: ansible_facts['os_family'] == 'Debian'
 
 You will note a lot of 'skipped' output by default in Ansible when using this approach on systems that don't match the criteria.
-Read up on the 'group_by' module in the :doc:`modules` docs for a more streamlined way to accomplish the same thing.
+In many cases the ``group_by`` module (see :doc:`modules`) can be a more streamlined way to accomplish the same thing; see
+:ref:`os_variance`.
 
-When used with `include_*` tasks instead of imports, the conditional is applied _only_ to the include task itself and not any other
+When a conditional is used with ``include_*`` tasks instead of imports, it is applied `only` to the include task itself and not
-tasks within the included file(s). A common situation where this distinction is important is as follows::
+to any other tasks within the included file(s). A common situation where this distinction is important is as follows::
 
-    # include a file to define a variable when it is not already defined
+    # We wish to include a file to define a variable when it is not
+    # already defined
 
     # main.yml
-    - include_tasks: other_tasks.yml
+    - import_tasks: other_tasks.yml # note "import"
       when: x is not defined
 
     # other_tasks.yml
@@ -190,8 +192,19 @@ tasks within the included file(s). A common situation where this distinction is
     - debug:
         var: x
 
-In the above example, if ``import_tasks`` had been used instead both included tasks would have also been skipped. With ``include_tasks``
+This expands at include time to the equivalent of::
-instead, the tasks are executed as expected because the conditional is not applied to them.
+
+    - set_fact:
+        x: foo
+      when: x is not defined
+    - debug:
+        var: x
+      when: x is not defined
+
+Thus if ``x`` is initially undefined, the ``debug`` task will be skipped.  By using ``include_tasks`` instead of ``import_tasks``,
+both tasks from ``other_tasks.yml`` will be executed as expected.
+
+For more information on the differences between ``include`` v ``import`` see :ref:`playbooks_reuse`.
 
 .. _conditional_imports:
 
@@ -211,13 +224,13 @@ but it is easily handled with a minimum of syntax in an Ansible Playbook::
       remote_user: root
       vars_files:
         - "vars/common.yml"
-        - [ "vars/{{ ansible_os_family }}.yml", "vars/os_defaults.yml" ]
+        - [ "vars/{{ ansible_facts['os_family'] }}.yml", "vars/os_defaults.yml" ]
       tasks:
       - name: make sure apache is started
         service: name={{ apache }} state=started
 
 .. note::
-   The variable 'ansible_os_family' is being interpolated into
+   The variable "ansible_facts['os_family']" is being interpolated into
    the list of filenames being defined for vars_files.
 
 As a reminder, the various YAML files contain just keys and values::
@@ -254,7 +267,7 @@ The following example shows how to template out a configuration file that was ve
       loop: "{{ query('first_found', { 'files': myfiles, 'paths': mypaths}) }}"
       vars:
         myfiles:
-          - "{{ansible_distribution}}.conf"
+          - "{{ansible_facts['distribution']}}.conf"
           -  default.conf
         mypaths: ['search_location_one/somedir/', '/opt/other_location/somedir/']
 
@@ -325,10 +338,10 @@ The following Facts are frequently used in Conditionals - see above for examples
 
 .. _ansible_distribution:
 
-ansible_distribution
+ansible_facts['distribution']
---------------------
+-----------------------------
 
-Possible values::
+Possible values (sample, not complete list)::
 
     Alpine
     Altlinux
@@ -353,17 +366,17 @@ Possible values::
 
 .. _ansible_distribution_major_version:
 
-ansible_distribution_major_version
+ansible_facts['distribution_major_version']
-----------------------------------
+-------------------------------------------
 
 This will be the major version of the operating system. For example, the value will be `16` for Ubuntu 16.04.
 
 .. _ansible_os_family:
 
-ansible_os_family
+ansible_facts['os_family']
------------------
+--------------------------
 
-Possible values::
+Possible values (sample, not complete list)::
 
     AIX
     Alpine

docs/docsite/rst/user_guide/playbooks_filters.rst

@@ -89,8 +89,8 @@ Jinja2 provides a useful 'default' filter that is often a better approach to fai
 In the above example, if the variable 'some_variable' is not defined, the value used will be 5, rather than an error
 being raised.
 
-If the variable evaluates to an empty string, the second parameter of the filter should be set to
+If you want to use the default value when variables evaluate to false or an empty string you have to set the second parameter to
-`true`::
+``true``::
 
     {{ lookup('env', 'MY_USER') | default('admin', true) }}
 

docs/docsite/rst/user_guide/playbooks_reuse_roles.rst

@@ -46,9 +46,9 @@ Other YAML files may be included in certain directories. For example, it is comm
     # roles/example/tasks/main.yml
     - name: added in 2.4, previously you used 'include'
       import_tasks: redhat.yml
-      when: ansible_os_family|lower == 'redhat'
+      when: ansible_facts['os_family']|lower == 'redhat'
     - import_tasks: debian.yml
-      when: ansible_os_family|lower == 'debian'
+      when: ansible_facts['os_family']|lower == 'debian'
 
     # roles/example/tasks/redhat.yml
     - yum:
@@ -163,7 +163,7 @@ You can conditionally import a role and execute it's tasks::
       tasks:
       - include_role:
           name: some_role
-        when: "ansible_os_family == 'RedHat'"
+        when: "ansible_facts['os_family'] == 'RedHat'"
 
 
 

docs/docsite/rst/user_guide/playbooks_tests.rst

@@ -67,14 +67,14 @@ Version Comparison
 
 .. note:: In 2.5 ``version_compare`` was renamed to ``version``
 
-To compare a version number, such as checking if the ``ansible_distribution_version``
+To compare a version number, such as checking if the ``ansible_facts['distribution_version']``
 version is greater than or equal to '12.04', you can use the ``version`` test.
 
-The ``version`` test can also be used to evaluate the ``ansible_distribution_version``::
+The ``version`` test can also be used to evaluate the ``ansible_facts['distribution_version']``::
 
-    {{ ansible_distribution_version is version('12.04', '>=') }}
+    {{ ansible_facts['distribution_version'] is version('12.04', '>=') }}
 
-If ``ansible_distribution_version`` is greater than or equal to 12.04, this test returns True, otherwise False.
+If ``ansible_facts['distribution_version']`` is greater than or equal to 12.04, this test returns True, otherwise False.
 
 The ``version`` test accepts the following operators::
 

docs/docsite/rst/user_guide/playbooks_variables.rst

@@ -161,11 +161,17 @@ Information discovered from systems: Facts
 
 There are other places where variables can come from, but these are a type of variable that are discovered, not set by the user.
 
-Facts are information derived from speaking with your remote systems.
+Facts are information derived from speaking with your remote systems. You can find a complete set under the ``ansible_facts`` variable,
+most facts are also 'injected' as top level variables preserving the ``ansible_`` prefix, but some are dropped due to conflicts.
+This can be disabled via the :ref:INJECT_FACTS_AS_VARS setting.
 
 An example of this might be the IP address of the remote host, or what the operating system is.
 
-To see what information is available, try the following::
+To see what information is available, try the following in a play::
+
+    - debug: var=ansible_facts
+
+To see the 'raw' information as gathered::
 
     ansible hostname -m setup
 
@@ -406,15 +412,15 @@ This will return a large amount of variable data, which may look like this, as t
 
 In the above the model of the first harddrive may be referenced in a template or playbook as::
 
-    {{ ansible_devices.sda.model }}
+    {{ ansible_facts['devices']['sda']['model'] }}
 
 Similarly, the hostname as the system reports it is::
 
-    {{ ansible_nodename }}
+    {{ ansible_facts['nodename'] }}
 
 and the unqualified hostname shows the string before the first period(.)::
 
-    {{ ansible_hostname }}
+    {{ ansible_facts['hostname'] }}
 
 Facts are frequently used in conditionals (see :doc:`playbooks_conditionals`) and also in templates.
 
@@ -475,11 +481,11 @@ And you will see the following fact added::
 
 And this data can be accessed in a ``template/playbook`` as::
 
-     {{ ansible_local.preferences.general.asdf }}
+     {{ ansible_local['preferences']['general']['asdf'] }}
 
 The local namespace prevents any user supplied fact from overriding system facts or variables defined elsewhere in the playbook.
 
-.. note:: The key part in the key=value pairs will be converted into lowercase inside the ansible_local variable. Using the example above, if the ini file contained ``XYZ=3`` in the ``[general]`` section, then you should expect to access it as: ``{{ ansible_local.preferences.general.xyz }}`` and not ``{{ ansible_local.preferences.general.XYZ }}``. This is because Ansible uses Python's `ConfigParser`_ which passes all option names through the `optionxform`_ method and this method's default implementation converts option names to lower case.
+.. note:: The key part in the key=value pairs will be converted into lowercase inside the ansible_local variable. Using the example above, if the ini file contained ``XYZ=3`` in the ``[general]`` section, then you should expect to access it as: ``{{ ansible_local['preferences']['general']['xyz'] }}`` and not ``{{ ansible_local['preferences']['general']['XYZ'] }}``. This is because Ansible uses Python's `ConfigParser`_ which passes all option names through the `optionxform`_ method and this method's default implementation converts option names to lower case.
 
 .. _ConfigParser: https://docs.python.org/2/library/configparser.html
 .. _optionxform: https://docs.python.org/2/library/configparser.html#ConfigParser.RawConfigParser.optionxform
@@ -526,7 +532,7 @@ Fact Caching
 
 As shown elsewhere in the docs, it is possible for one server to reference variables about another, like so::
 
-    {{ hostvars['asdf.example.com']['ansible_os_family'] }}
+    {{ hostvars['asdf.example.com']['ansible_facts']['os_family'] }}
 
 With "Fact Caching" disabled, in order to do this, Ansible must have already talked to 'asdf.example.com' in the
 current play, or another play up higher in the playbook.  This is the default configuration of ansible.
@@ -615,11 +621,11 @@ We already described facts a little higher up in the documentation.
 Some provided facts, like networking information, are made available as nested data structures.  To access
 them a simple ``{{ foo }}`` is not sufficient, but it is still easy to do.   Here's how we get an IP address::
 
-    {{ ansible_eth0["ipv4"]["address"] }}
+    {{ ansible_facts["eth0"]["ipv4"]["address"] }}
 
 OR alternatively::
 
-    {{ ansible_eth0.ipv4.address }}
+    {{ ansible_facts.eth0.ipv4.address }}
 
 Similarly, this is how we access the first element of an array::
 
@@ -641,7 +647,7 @@ or set of playbooks, you can still get the variables, but you will not be able t
 If your database server wants to use the value of a 'fact' from another node, or an inventory variable
 assigned to another node, it's easy to do so within a template or even an action line::
 
-    {{ hostvars['test.example.com']['ansible_distribution'] }}
+    {{ hostvars['test.example.com']['ansible_facts']['distribution'] }}
 
 Additionally, ``group_names`` is a list (array) of all the groups the current host is in.  This can be used in templates using Jinja2 syntax to make template source files that vary based on the group membership (or role) of the host
 
@@ -666,7 +672,7 @@ A frequently used idiom is walking a group to find all IP addresses in that grou
 .. code-block:: jinja
 
    {% for host in groups['app_servers'] %}
-      {{ hostvars[host]['ansible_eth0']['ipv4']['address'] }}
+      {{ hostvars[host]['ansible_facts']['eth0']['ipv4']['address'] }}
    {% endfor %}
 
 An example of this could include pointing a frontend proxy server to all of the app servers, setting up the correct firewall rules between servers, etc.

docs/docsite/rst/user_guide/windows_dsc.rst

@@ -2,6 +2,7 @@ Desired State Configuration
 ===========================
 
 .. contents:: Topics
+   :local:
 
 What is Desired State Configuration?
 ````````````````````````````````````
@@ -387,7 +388,7 @@ Setup IIS Website
        An introduction to playbooks
    :doc:`playbooks_best_practices`
        Best practices advice
-   `List of Windows Modules :ref:`<windows_modules>`
+   :ref:`List of Windows Modules <windows_modules>`
        Windows specific module list, all implemented in PowerShell
    `User Mailing List <https://groups.google.com/group/ansible-project>`_
        Have a question?  Stop by the google group!

docs/docsite/rst/user_guide/windows_setup.rst

@@ -3,6 +3,7 @@ Setting up a Windows Host
 This document discusses the setup that is required before Ansible can communicate with a Microsoft Windows host.
 
 .. contents:: Topics
+   :local:
 
 Host Requirements
 `````````````````

docs/docsite/rst/user_guide/windows_usage.rst

@@ -6,6 +6,7 @@ when it comes to components like path separators and OS-specific tasks.
 This document covers details specific to using Ansible for Windows.
 
 .. contents:: Topics
+   :local:
 
 Use Cases
 `````````

docs/docsite/rst/user_guide/windows_winrm.rst

@@ -4,6 +4,7 @@ Unlike Linux/Unix hosts, which use SSH by default, Windows hosts are
 configured with WinRM. This topic covers how to configure and use WinRM with Ansible.
 
 .. contents:: Topics
+   :local:
 
 What is WinRM?
 ``````````````
@@ -426,6 +427,8 @@ work. To troubleshoot Kerberos issues, ensure that:
   an alias is being used. The ``krb5.conf`` file needs to be updated so that
   the fully qualified domain name is used and not an alias.
 
+* If the default kerberos tooling has been replaced or modified (some IdM solutions may do this), this may cause issues when installing or upgrading the Python Kerberos library. As of the time of this writing, this library is called ``pykerberos`` and is known to work with both MIT and Heimdal Kerberos libraries. To resolve ``pykerberos`` installation issues, ensure the system dependencies for Kerberos have been met (see: `Installing the Kerberos Library`_), remove any custom Kerberos tooling paths from the PATH environment variable, and retry the installation of Python Kerberos library package.
+
 CredSSP
 -------
 CredSSP authentication is a newer authentication protocol that allows

examples/ansible.cfg

@@ -55,6 +55,15 @@
 # environment.
 # gather_timeout = 10
 
+# Ansible facts are available inside the ansible_facts.* dictionary
+# namespace. This setting maintains the behaviour which was the default prior
+# to 2.5, duplicating these variables into the main namespace, each with a
+# prefix of 'ansible_'.
+# This variable is set to True by default for backwards compatibility. It
+# will be changed to a default of 'False' in a future release.
+# ansible_facts.
+# inject_facts_as_vars = True
+
 # additional paths to search for roles in, colon separated
 #roles_path    = /etc/ansible/roles
 

test/sanity/code-smell/docs-build.py

@@ -38,7 +38,6 @@ def main():
 
     ignore_codes = [
         'reference-target-not-found',
-        'not-in-toc-tree',
     ]
 
     used_ignore_codes = set()