Merge remote-tracking branch 'origin/devel' into add_dynamic_version_…

…of_block

changelogs/fragments/65710-find-include-parent.yml

@@ -0,0 +1,3 @@
+bugfixes:
+- Includes - Explicitly get the include task, and not assume it is the parent
+  (https://github.com/ansible/ansible/issues/65710)

changelogs/fragments/71824-action-fqcns.yml

@@ -0,0 +1,2 @@
+bugfixes:
+- "Adjust various hard-coded action names to also include their ``ansible.builtin.`` and ``ansible.legacy.`` prefixed version (https://github.com/ansible/ansible/issues/71817, https://github.com/ansible/ansible/issues/71818, https://github.com/ansible/ansible/pull/71824)."

changelogs/fragments/72322-wait-for-handle-errors.yml

@@ -0,0 +1,2 @@
+bugfixes:
+  - wait_for - catch and ignore errors when getting active connections with psutil (https://github.com/ansible/ansible/issues/72322)

changelogs/fragments/ansible-doc-has_action.yml

@@ -0,0 +1,2 @@
+minor_changes:
+- "ansible-doc - provide ``has_action`` field in JSON output for modules. That information is currently only available in the text view (https://github.com/ansible/ansible/pull/72359)."

changelogs/fragments/ansible-test-collection-classification.yml

@@ -0,0 +1,2 @@
+bugfixes:
+- "ansible-test - improve classification of changes to ``.gitignore``, ``COPYING``, ``LICENSE``, ``Makefile``, and all files ending with one of ``.in`, ``.md`, ``.rst``, ``.toml``, ``.txt`` in the collection root directory (https://github.com/ansible/ansible/pull/72353)."

changelogs/fragments/find_explicit.yml

@@ -0,0 +1,2 @@
+minor_changes:
+    - The find module is now more specific about the reasons it skips candidate files.

changelogs/fragments/ps-sanity-requirements.yml

@@ -0,0 +1,2 @@
+bugfixes:
+- ansible-test - Skip installing requirements if they are already installed.

changelogs/fragments/run-command-cwd.yml

@@ -0,0 +1,2 @@
+bugfixes:
+  - AnsibleModule - added arg ``ignore_invalid_cwd`` to ``AnsibleModule.run_command()``, to control its behaviour when ``cwd`` is invalid. (https://github.com/ansible/ansible/pull/72390)

changelogs/fragments/timeout_moar_clis.yml

@@ -0,0 +1,3 @@
+minor_changes:
+  - New 'timeout' feature added to adhoc and console CLIs, corresponding to the recent 'timeout' task keyword.
+  - Also added extra vars cli option to console CLI.

docs/docsite/_themes/sphinx_rtd_theme/ansible_banner.html

@@ -13,15 +13,21 @@
       // Create a banner if we're not the latest version
       current_url_path = window.location.pathname;
       if (startsWith(current_url_path, "/ansible/latest/") || startsWith(current_url_path, "/ansible/{{ latest_version }}/")) {
-       // no banner for latest release
-       /* temp banner to advertise AnsibleFest
+        document.write('<div id="banner_id" class="admonition caution">');
+        document.write('<p>You are reading the latest community version of the Ansible documentation. Red Hat subscribers, select <b>2.9</b> in the version selection to the left for the most recent Red Hat release.</p>');
+        document.write('</div>');
+
+        /* temp banner to advertise AnsibleFest
         document.write('<div id="banner_id" class="admonition important">');
         document.write('<p><a href="https://www.ansible.com/ansiblefest?sc_cid=7013a000002gyPxAAI">AnsibleFest</a> is going virtual with two days of expert speakers, live demos and hands-on labs Oct 13-14!</p>');
         document.write('</div>'); */
-
+      } else if (startsWith(current_url_path, "/ansible/2.9/")) {
+        document.write('<div id="banner_id" class="admonition caution">');
+        document.write('<p>You are reading the latest Red Hat released version of the Ansible documentation. Community users can use this, or select any version in version selection to the left, including <b>latest</b> for the most recent community version.</p>');
+        document.write('</div>');
       } else if (startsWith(current_url_path, "/ansible/devel/")) {
         document.write('<div id="banner_id" class="admonition caution">');
-        document.write('<p>You are reading the *devel* version of the Ansible documentation - this version is not guaranteed stable. Use the version selection to the left if you want the latest stable released version.</p>');
+        document.write('<p>You are reading the <b>devel</b> version of the Ansible documentation - this version is not guaranteed stable. Use the version selection to the left if you want the latest stable released version.</p>');
         document.write('</div>');
       } else {
         document.write('<div id="banner_id" class="admonition caution">');

docs/docsite/keyword_desc.yml

@@ -48,7 +48,7 @@ loop_control: |
 
 max_fail_percentage: can be used to abort the run after a given percentage of hosts in the current batch has failed.
 module_defaults: Specifies default parameter values for modules.
-name: "Identifier. Can be used for documentation, in or tasks/handlers."
+name: "Identifier. Can be used for documentation, or in tasks/handlers."
 no_log: Boolean that controls information disclosure.
 notify: "List of handlers to notify when the task returns a 'changed=True' status."
 order: Controls the sorting of hosts as they are used for executing the play. Possible values are inventory (default), sorted, reverse_sorted, reverse_inventory and shuffle.

docs/docsite/rst/dev_guide/developing_modules_general.rst

@@ -75,7 +75,7 @@ To create an info module:
 
 1. Navigate to the correct directory for your new module: ``$ cd lib/ansible/modules/``. If you are developing module using collection, ``$ cd plugins/modules/`` inside your collection development tree.
 2. Create your new module file: ``$ touch my_test_info.py``.
-3. Paste the content below into your new info module file. It includes the :ref:`required Ansible format and documentation <developing_modules_documenting>` and some example code.
+3. Paste the content below into your new info module file. It includes the :ref:`required Ansible format and documentation <developing_modules_documenting>`, a simple :ref:`argument spec for declaring the module options <argument_spec>`, and some example code.
 4. Modify and extend the code to do what you want your new info module to do. See the :ref:`programming tips <developing_modules_best_practices>` and :ref:`Python 3 compatibility <developing_python_3>` pages for pointers on writing clean and concise module code.
 
 .. literalinclude:: ../../../../examples/scripts/my_test_info.py
@@ -93,7 +93,7 @@ To create a module:
 
 1. Navigate to the correct directory for your new module: ``$ cd lib/ansible/modules/``. If you are developing a module in a :ref:`collection <developing_collections>`, ``$ cd plugins/modules/`` inside your collection development tree.
 2. Create your new module file: ``$ touch my_test.py``.
-3. Paste the content below into your new module file. It includes the :ref:`required Ansible format and documentation <developing_modules_documenting>` and some example code.
+3. Paste the content below into your new module file. It includes the :ref:`required Ansible format and documentation <developing_modules_documenting>`, a simple :ref:`argument spec for declaring the module options <argument_spec>`, and some example code.
 4. Modify and extend the code to do what you want your new module to do. See the :ref:`programming tips <developing_modules_best_practices>` and :ref:`Python 3 compatibility <developing_python_3>` pages for pointers on writing clean and concise module code.
 
 .. literalinclude:: ../../../../examples/scripts/my_test.py