Release 6.4.0.

[PR #6109/d2094669 backport][stable-6] add xorder_discovery parameter (#6110 )
add xorder_discovery parameter (#6109) * add xorder_discovery parameter * fix regex raw string * use dn logic from LdapGeneric * Update documentation. * Update changelog fragment. * Improve if. --------- Co-authored-by: Felix Fontein <felix@fontein.de> (cherry picked from commit d209466985) Co-authored-by: Reto Kupferschmid <kupferschmid@puzzle.ch>
2026-04-29 09:56:53 +00:00 · 2023-02-27 20:43:35 +01:00 · 2023-02-27 20:39:31 +01:00 · 2023-02-26 16:20:13 +01:00 · 2023-02-26 15:52:53 +01:00 · 2023-02-26 15:37:09 +01:00
906 changed files with 8182 additions and 30986 deletions
--- a/.azure-pipelines/azure-pipelines.yml
+++ b/.azure-pipelines/azure-pipelines.yml
@@ -29,14 +29,14 @@ schedules:
    always: true
    branches:
      include:
-        - stable-7
        - stable-6
+        - stable-5
  - cron: 0 11 * * 0
    displayName: Weekly (old stable branches)
    always: true
    branches:
      include:
-        - stable-5
+        - stable-4

 variables:
  - name: checkoutPath
@@ -53,7 +53,7 @@ variables:
 resources:
  containers:
    - container: default
-      image: quay.io/ansible/azure-pipelines-test-container:4.0.1
+      image: quay.io/ansible/azure-pipelines-test-container:3.0.0

 pool: Standard

@@ -73,19 +73,6 @@ stages:
            - test: 3
            - test: 4
            - test: extra
-  - stage: Sanity_2_15
-    displayName: Sanity 2.15
-    dependsOn: []
-    jobs:
-      - template: templates/matrix.yml
-        parameters:
-          nameFormat: Test {0}
-          testFormat: 2.15/sanity/{0}
-          targets:
-            - test: 1
-            - test: 2
-            - test: 3
-            - test: 4
  - stage: Sanity_2_14
    displayName: Sanity 2.14
    dependsOn: []
@@ -112,6 +99,19 @@ stages:
            - test: 2
            - test: 3
            - test: 4
+  - stage: Sanity_2_12
+    displayName: Sanity 2.12
+    dependsOn: []
+    jobs:
+      - template: templates/matrix.yml
+        parameters:
+          nameFormat: Test {0}
+          testFormat: 2.12/sanity/{0}
+          targets:
+            - test: 1
+            - test: 2
+            - test: 3
+            - test: 4
 ### Units
  - stage: Units_devel
    displayName: Units devel
@@ -123,23 +123,13 @@ stages:
          testFormat: devel/units/{0}/1
          targets:
            - test: 2.7
+            - test: 3.5
            - test: 3.6
            - test: 3.7
            - test: 3.8
            - test: 3.9
            - test: '3.10'
            - test: '3.11'
-  - stage: Units_2_15
-    displayName: Units 2.15
-    dependsOn: []
-    jobs:
-      - template: templates/matrix.yml
-        parameters:
-          nameFormat: Python {0}
-          testFormat: 2.15/units/{0}/1
-          targets:
-            - test: 3.5
-            - test: "3.10"
  - stage: Units_2_14
    displayName: Units 2.14
    dependsOn: []
@@ -149,6 +139,7 @@ stages:
          nameFormat: Python {0}
          testFormat: 2.14/units/{0}/1
          targets:
+            - test: 2.7
            - test: 3.9
  - stage: Units_2_13
    displayName: Units 2.13
@@ -161,6 +152,17 @@ stages:
          targets:
            - test: 2.7
            - test: 3.8
+  - stage: Units_2_12
+    displayName: Units 2.12
+    dependsOn: []
+    jobs:
+      - template: templates/matrix.yml
+        parameters:
+          nameFormat: Python {0}
+          testFormat: 2.12/units/{0}/1
+          targets:
+            - test: 2.6
+            - test: 3.8

 ## Remote
  - stage: Remote_devel_extra_vms
@@ -173,8 +175,10 @@ stages:
          targets:
            - name: Alpine 3.17
              test: alpine/3.17
-            # - name: Fedora 38
-            #   test: fedora/38
+            # - name: Fedora 37
+            #   test: fedora/37
+            # - name: Ubuntu 20.04
+            #   test: ubuntu/20.04
            - name: Ubuntu 22.04
              test: ubuntu/22.04
          groups:
@@ -187,36 +191,16 @@ stages:
        parameters:
          testFormat: devel/{0}
          targets:
-            - name: macOS 13.2
-              test: macos/13.2
-            - name: RHEL 9.2
-              test: rhel/9.2
-            - name: RHEL 8.8
-              test: rhel/8.8
-            - name: FreeBSD 13.2
-              test: freebsd/13.2
-            - name: FreeBSD 12.4
-              test: freebsd/12.4
-          groups:
-            - 1
-            - 2
-            - 3
-  - stage: Remote_2_15
-    displayName: Remote 2.15
-    dependsOn: []
-    jobs:
-      - template: templates/matrix.yml
-        parameters:
-          testFormat: 2.15/{0}
-          targets:
-            - name: RHEL 9.1
-              test: rhel/9.1
-            - name: RHEL 8.7
-              test: rhel/8.7
+            - name: macOS 12.0
+              test: macos/12.0
            - name: RHEL 7.9
              test: rhel/7.9
+            - name: RHEL 9.1
+              test: rhel/9.1
            - name: FreeBSD 13.1
              test: freebsd/13.1
+            - name: FreeBSD 12.4
+              test: freebsd/12.4
          groups:
            - 1
            - 2
@@ -249,6 +233,22 @@ stages:
              test: macos/12.0
            - name: RHEL 8.5
              test: rhel/8.5
+          groups:
+            - 1
+            - 2
+            - 3
+  - stage: Remote_2_12
+    displayName: Remote 2.12
+    dependsOn: []
+    jobs:
+      - template: templates/matrix.yml
+        parameters:
+          testFormat: 2.12/{0}
+          targets:
+            - name: macOS 11.1
+              test: macos/11.1
+            - name: RHEL 8.4
+              test: rhel/8.4
            - name: FreeBSD 13.0
              test: freebsd/13.0
          groups:
@@ -265,8 +265,10 @@ stages:
        parameters:
          testFormat: devel/linux/{0}
          targets:
-            - name: Fedora 38
-              test: fedora38
+            - name: CentOS 7
+              test: centos7
+            - name: Fedora 37
+              test: fedora37
            - name: openSUSE 15
              test: opensuse15
            - name: Ubuntu 20.04
@@ -279,22 +281,6 @@ stages:
            - 1
            - 2
            - 3
-  - stage: Docker_2_15
-    displayName: Docker 2.15
-    dependsOn: []
-    jobs:
-      - template: templates/matrix.yml
-        parameters:
-          testFormat: 2.15/linux/{0}
-          targets:
-            - name: Fedora 37
-              test: fedora37
-            - name: CentOS 7
-              test: centos7
-          groups:
-            - 1
-            - 2
-            - 3
  - stage: Docker_2_14
    displayName: Docker 2.14
    dependsOn: []
@@ -327,6 +313,24 @@ stages:
            - 1
            - 2
            - 3
+  - stage: Docker_2_12
+    displayName: Docker 2.12
+    dependsOn: []
+    jobs:
+      - template: templates/matrix.yml
+        parameters:
+          testFormat: 2.12/linux/{0}
+          targets:
+            - name: CentOS 6
+              test: centos6
+            - name: Fedora 34
+              test: fedora34
+            - name: Ubuntu 18.04
+              test: ubuntu1804
+          groups:
+            - 1
+            - 2
+            - 3

 ### Community Docker
  - stage: Docker_community_devel
@@ -339,10 +343,8 @@ stages:
          targets:
            - name: Debian Bullseye
              test: debian-bullseye/3.9
-            - name: Debian Bookworm
-              test: debian-bookworm/3.11
            - name: ArchLinux
-              test: archlinux/3.11
+              test: archlinux/3.10
            - name: CentOS Stream 8
              test: centos-stream8/3.9
          groups:
@@ -362,16 +364,6 @@ stages:
          targets:
            - test: 2.7
            - test: '3.11'
-  - stage: Generic_2_15
-    displayName: Generic 2.15
-    dependsOn: []
-    jobs:
-      - template: templates/matrix.yml
-        parameters:
-          nameFormat: Python {0}
-          testFormat: 2.15/generic/{0}/1
-          targets:
-            - test: 3.9
  - stage: Generic_2_14
    displayName: Generic 2.14
    dependsOn: []
@@ -392,32 +384,42 @@ stages:
          testFormat: 2.13/generic/{0}/1
          targets:
            - test: 3.9
+  - stage: Generic_2_12
+    displayName: Generic 2.12
+    dependsOn: []
+    jobs:
+      - template: templates/matrix.yml
+        parameters:
+          nameFormat: Python {0}
+          testFormat: 2.12/generic/{0}/1
+          targets:
+            - test: 3.8

  - stage: Summary
    condition: succeededOrFailed()
    dependsOn:
      - Sanity_devel
+      - Sanity_2_12
      - Sanity_2_13
      - Sanity_2_14
-      - Sanity_2_15
      - Units_devel
+      - Units_2_12
      - Units_2_13
      - Units_2_14
-      - Units_2_15
      - Remote_devel_extra_vms
      - Remote_devel
+      - Remote_2_12
      - Remote_2_13
      - Remote_2_14
-      - Remote_2_15
      - Docker_devel
+      - Docker_2_12
      - Docker_2_13
      - Docker_2_14
-      - Docker_2_15
      - Docker_community_devel
 # Right now all generic tests are disabled. Uncomment when at least one of them is re-enabled.
 #      - Generic_devel
+#      - Generic_2_12
 #      - Generic_2_13
 #      - Generic_2_14
-#      - Generic_2_15
    jobs:
      - template: templates/coverage.yml
--- a/.github/BOTMETA.yml
+++ b/.github/BOTMETA.yml
@@ -204,8 +204,6 @@ files:
    maintainers: ddelnano shinuza
  $lookups/:
    labels: lookups
-  $lookups/bitwarden_secrets_manager.py:
-    maintainers: jantari
  $lookups/bitwarden.py:
    maintainers: lungj
  $lookups/cartesian.py: {}
@@ -243,8 +241,6 @@ files:
  $lookups/manifold.py:
    labels: manifold
    maintainers: galanoff
-  $lookups/merge_variables.py:
-    maintainers: rlenferink m-a-r-k-e
  $lookups/onepass:
    labels: onepassword
    maintainers: samdoran
@@ -269,8 +265,6 @@ files:
    maintainers: delineaKrehl tylerezimmerman
  $module_utils/:
    labels: module_utils
-  $module_utils/btrfs.py:
-    maintainers: gnfzdz
  $module_utils/deps.py:
    maintainers: russoz
  $module_utils/gconftool2.py:
@@ -300,6 +294,7 @@ files:
    maintainers: $team_manageiq
  $module_utils/memset.py:
    labels: cloud memset
+    maintainers: glitchcrab
  $module_utils/mh/:
    labels: module_helper
    maintainers: russoz
@@ -335,9 +330,6 @@ files:
  $module_utils/utm_utils.py:
    labels: utm_utils
    maintainers: $team_e_spirit
-  $module_utils/vardict.py:
-    labels: vardict
-    maintainers: russoz
  $module_utils/wdc_redfish_utils.py:
    labels: wdc_redfish_utils
    maintainers: $team_wdc
@@ -402,8 +394,6 @@ files:
    maintainers: catcombo
  $modules/bower.py:
    maintainers: mwarkentin
-  $modules/btrfs_:
-    maintainers: gnfzdz
  $modules/bundler.py:
    maintainers: thoiberg
  $modules/bzr.py:
@@ -433,7 +423,7 @@ files:
    ignore: resmo
    maintainers: dmtrs
  $modules/consul:
-    ignore: colin-nolan Hakon
+    ignore: colin-nolan
    maintainers: $team_consul
  $modules/copr.py:
    maintainers: schlupov
@@ -532,15 +522,10 @@ files:
    keywords: gitlab source_control
    maintainers: $team_gitlab
    notify: jlozadad
-    ignore: dj-wasabi
  $modules/gitlab_branch.py:
    maintainers: paytroff
-  $modules/gitlab_merge_request.py:
-    maintainers: zvaraondrej
  $modules/gitlab_project_variable.py:
    maintainers: markuman
-  $modules/gitlab_instance_variable.py:
-    maintainers: benibr
  $modules/gitlab_runner.py:
    maintainers: SamyCoenen
  $modules/gitlab_user.py:
@@ -549,6 +534,8 @@ files:
    maintainers: zimbatm
  $modules/gunicorn.py:
    maintainers: agmezr
+  $modules/hana_query.py:
+    maintainers: rainerleber
  $modules/haproxy.py:
    maintainers: ravibhure Normo
  $modules/heroku_collaborator.py:
@@ -601,7 +588,7 @@ files:
    ignore: jose-delarosa
    maintainers: $team_redfish
  $modules/ilo_:
-    ignore: jose-delarosa varini-hp
+    ignore: jose-delarosa
    maintainers: $team_redfish
  $modules/imc_rest.py:
    labels: cisco
@@ -633,8 +620,6 @@ files:
    maintainers: bregman-arie
  $modules/ipa_:
    maintainers: $team_ipa
-  $modules/ipbase_info.py:
-    maintainers: dominikkukacka
  $modules/ipa_pwpolicy.py:
    maintainers: adralioh
  $modules/ipa_service.py:
@@ -682,28 +667,16 @@ files:
    ignore: DWSR
    labels: jira
    maintainers: Slezhuk tarka pertoft
-  $modules/kdeconfig.py:
-    maintainers: smeso
  $modules/kernel_blacklist.py:
    maintainers: matze
  $modules/keycloak_:
    maintainers: $team_keycloak
  $modules/keycloak_authentication.py:
    maintainers: elfelip Gaetan2907
-  $modules/keycloak_authentication_required_actions.py:
-    maintainers: Skrekulko
-  $modules/keycloak_authz_authorization_scope.py:
-    maintainers: mattock
-  $modules/keycloak_authz_permission.py:
-    maintainers: mattock
-  $modules/keycloak_authz_permission_info.py:
-    maintainers: mattock
  $modules/keycloak_client_rolemapping.py:
    maintainers: Gaetan2907
  $modules/keycloak_clientscope.py:
    maintainers: Gaetan2907
-  $modules/keycloak_clientscope_type.py:
-    maintainers: simonpahl
  $modules/keycloak_clientsecret_info.py:
    maintainers: fynncfchen johncant
  $modules/keycloak_clientsecret_regenerate.py:
@@ -718,8 +691,6 @@ files:
    maintainers: fynncfchen
  $modules/keycloak_role.py:
    maintainers: laurpaum
-  $modules/keycloak_user.py:
-    maintainers: elfelip
  $modules/keycloak_user_federation.py:
    maintainers: laurpaum
  $modules/keycloak_user_rolemapping.py:
@@ -766,8 +737,6 @@ files:
    maintainers: nerzhul
  $modules/lvg.py:
    maintainers: abulimov
-  $modules/lvg_rename.py:
-    maintainers: lszomor
  $modules/lvol.py:
    maintainers: abulimov jhoekx zigaSRC unkaputtbar112
  $modules/lxc_container.py:
@@ -816,7 +785,7 @@ files:
    labels: maven_artifact
    maintainers: tumbl3w33d turb
  $modules/memset_:
-    ignore: glitchcrab
+    maintainers: glitchcrab
  $modules/mksysb.py:
    labels: aix mksysb
    maintainers: $team_aix
@@ -949,7 +918,7 @@ files:
  $modules/pamd.py:
    maintainers: kevensen
  $modules/parted.py:
-    maintainers: ColOfAbRiX jake2184
+    maintainers: ColOfAbRiX rosowiecki jake2184
  $modules/pear.py:
    ignore: jle64
    labels: pear
@@ -996,8 +965,7 @@ files:
  $modules/proxmox:
    keywords: kvm libvirt proxmox qemu
    labels: proxmox virt
-    maintainers: $team_virt UnderGreen
-    ignore: tleguern
+    maintainers: $team_virt
  $modules/proxmox.py:
    ignore: skvidal
    maintainers: UnderGreen
@@ -1019,7 +987,7 @@ files:
    maintainers: sysadmind
  $modules/puppet.py:
    labels: puppet
-    maintainers: emonty
+    maintainers: nibalizer emonty
  $modules/pushbullet.py:
    maintainers: willybarro
  $modules/pushover.py:
@@ -1074,8 +1042,7 @@ files:
    maintainers: $team_redfish TSKushal
  $modules/redhat_subscription.py:
    labels: redhat_subscription
-    maintainers: $team_rhsm
-    ignore: barnabycourt alikins kahowell
+    maintainers: barnabycourt alikins kahowell
  $modules/redis.py:
    maintainers: slok
  $modules/redis_data.py:
@@ -1098,9 +1065,9 @@ files:
    labels: rhn_register
    maintainers: jlaska $team_rhn
  $modules/rhsm_release.py:
-    maintainers: seandst $team_rhsm
+    maintainers: seandst
  $modules/rhsm_repository.py:
-    maintainers: giovannisciortino $team_rhsm
+    maintainers: giovannisciortino
  $modules/riak.py:
    maintainers: drewkerrigan jsmartin
  $modules/rocketchat.py:
@@ -1121,6 +1088,10 @@ files:
    maintainers: nerzhul
  $modules/runit.py:
    maintainers: jsumners
+  $modules/sap_task_list_execute:
+    maintainers: rainerleber
+  $modules/sapcar_extract.py:
+    maintainers: RainerLeber
  $modules/say.py:
    maintainers: $team_ansible_core
    ignore: mpdehaan
@@ -1349,7 +1320,7 @@ files:
    labels: m:xml xml
    maintainers: dagwieers magnus919 tbielawa cmprescott sm4rk0
  $modules/yarn.py:
-    ignore: chrishoffman verkaufer
+    maintainers: chrishoffman verkaufer
  $modules/yum_versionlock.py:
    maintainers: gyptazy aminvakil
  $modules/zfs:
@@ -1410,12 +1381,12 @@ macros:
  team_cyberark_conjur: jvanderhoof ryanprior
  team_e_spirit: MatrixCrawler getjack
  team_flatpak: JayKayy oolongbrothers
-  team_gitlab: Lunik Shaps marwatk waheedi zanssa scodeman metanovii sh0shin nejch lgatellier suukit
+  team_gitlab: Lunik Shaps dj-wasabi marwatk waheedi zanssa scodeman metanovii sh0shin nejch lgatellier suukit
  team_hpux: bcoca davx8342
  team_huawei: QijunPan TommyLike edisonxiang freesky-edward hwDCN niuzhenguo xuxiaowei0512 yanzhangi zengchen1024 zhongjun2
  team_ipa: Akasurde Nosmoht fxfitz justchris1
  team_jboss: Wolfant jairojunior wbrefvem
-  team_keycloak: eikef ndclt mattock
+  team_keycloak: eikef ndclt
  team_linode: InTheCloudDan decentral1se displague rmcintosh Charliekenney23 LBGarber
  team_macos: Akasurde kyleabenson martinm82 danieljaouen indrajitr
  team_manageiq: abellotti cben gtanzillo yaacov zgalor dkorn evertmulder
@@ -1425,9 +1396,8 @@ macros:
  team_purestorage: bannaych dnix101 genegr lionmax opslounge raekins sdodsley sile16
  team_redfish: mraineri tomasg2012 xmadsen renxulei rajeevkallur bhavya06 jyundt
  team_rhn: FlossWare alikins barnabycourt vritant
-  team_rhsm: cnsnyder ptoscano
  team_scaleway: remyleone abarbare
  team_solaris: bcoca fishman jasperla jpdasma mator scathatheworm troy2914 xen0l
  team_suse: commel evrardjp lrupp toabctl AnderEnder alxgu andytom sealor
-  team_virt: joshainglis karmab Thulium-Drake Ajpantuso
+  team_virt: joshainglis karmab tleguern Thulium-Drake Ajpantuso
  team_wdc: mikemoerk
--- a/.github/ISSUE_TEMPLATE/bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -47,7 +47,7 @@ body:
    label: Component Name
    description: >-
      Write the short name of the module, plugin, task or feature below,
-      *use your best guess if unsure*. Do not include `community.general.`!
+      *use your best guess if unsure*.
    placeholder: dnf, apt, yum, pip, user etc.
  validations:
    required: true
--- a/.github/ISSUE_TEMPLATE/documentation_report.yml
+++ b/.github/ISSUE_TEMPLATE/documentation_report.yml
@@ -46,8 +46,8 @@ body:
  attributes:
    label: Component Name
    description: >-
-      Write the short name of the file, module, plugin, task or feature below,
-      *use your best guess if unsure*. Do not include `community.general.`!
+      Write the short name of the rst file, module, plugin, task or
+      feature below, *use your best guess if unsure*.
    placeholder: mysql_user
  validations:
    required: true
--- a/.github/ISSUE_TEMPLATE/feature_request.yml
+++ b/.github/ISSUE_TEMPLATE/feature_request.yml
@@ -42,8 +42,8 @@ body:
  attributes:
    label: Component Name
    description: >-
-      Write the short name of the module or plugin, or which other part(s) of the collection this feature affects.
-      *use your best guess if unsure*. Do not include `community.general.`!
+      Write the short name of the module, plugin, task or feature below,
+      *use your best guess if unsure*.
    placeholder: dnf, apt, yum, pip, user etc.
  validations:
    required: true
--- a/.github/pull_request_template.md
+++ b/.github/pull_request_template.md
@@ -1,32 +0,0 @@
-##### SUMMARY
-<!--- Describe the change below, including rationale and design decisions -->
-
-<!--- HINT: Include "Fixes #nnn" if you are fixing an existing issue -->
-
-<!--- Please do not forget to include a changelog fragment:
-      https://docs.ansible.com/ansible/devel/community/collection_development_process.html#creating-changelog-fragments
-      No need to include one for docs-only or test-only PR, and for new plugin/module PRs.
-      Read about more details in CONTRIBUTING.md.
-      -->
-
-##### ISSUE TYPE
-<!--- Pick one or more below and delete the rest.
-      'Test Pull Request' is for PRs that add/extend tests without code changes. -->
- Bugfix Pull Request
- Docs Pull Request
- Feature Pull Request
- New Module/Plugin Pull Request
- Refactoring Pull Request
- Test Pull Request
-
-##### COMPONENT NAME
-<!--- Write the SHORT NAME of the module, plugin, task or feature below. -->
-
-##### ADDITIONAL INFORMATION
-<!--- Include additional information to help people understand the change here -->
-<!--- A step-by-step reproduction of the problem is helpful if there is no related issue -->
-
-<!--- Paste verbatim command output below, e.g. before and after your change -->
-```paste below
-
-```
--- a/.github/pull_request_template.md.license
+++ b/.github/pull_request_template.md.license
@@ -1,3 +0,0 @@
-Copyright (c) Ansible Project
-GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt)
-SPDX-License-Identifier: GPL-3.0-or-later
--- a/.github/workflows/ansible-test.yml
+++ b/.github/workflows/ansible-test.yml
@@ -30,7 +30,6 @@ jobs:
      matrix:
        ansible:
          - '2.11'
-          - '2.12'
    # Ansible-test on various stable branches does not yet work well with cgroups v2.
    # Since ubuntu-latest now uses Ubuntu 22.04, we need to fall back to the ubuntu-20.04
    # image for these stable branches. The list of branches where this is necessary will
@@ -44,7 +43,7 @@ jobs:
      - name: Perform sanity testing
        uses: felixfontein/ansible-test-gh-action@main
        with:
-          ansible-core-github-repository-slug: ${{ contains(fromJson('["2.10", "2.11"]'), matrix.ansible) && 'felixfontein/ansible' || 'ansible/ansible' }}
+          ansible-core-github-repository-slug: felixfontein/ansible
          ansible-core-version: stable-${{ matrix.ansible }}
          coverage: ${{ github.event_name == 'schedule' && 'always' || 'never' }}
          pull-request-change-detection: 'true'
@@ -76,10 +75,6 @@ jobs:
            python: '2.7'
          - ansible: '2.11'
            python: '3.5'
-          - ansible: '2.12'
-            python: '2.6'
-          - ansible: '2.12'
-            python: '3.8'

    steps:
      - name: >-
@@ -87,7 +82,7 @@ jobs:
          Ansible version ${{ matrix.ansible }}
        uses: felixfontein/ansible-test-gh-action@main
        with:
-          ansible-core-github-repository-slug: ${{ contains(fromJson('["2.10", "2.11"]'), matrix.ansible) && 'felixfontein/ansible' || 'ansible/ansible' }}
+          ansible-core-github-repository-slug: felixfontein/ansible
          ansible-core-version: stable-${{ matrix.ansible }}
          coverage: ${{ github.event_name == 'schedule' && 'always' || 'never' }}
          pre-test-cmd: >-
@@ -168,49 +163,7 @@ jobs:
          # - ansible: '2.11'
          #   docker: default
          #   python: '3.5'
-          #   target: azp/generic/1/
-          # 2.12
-          - ansible: '2.12'
-            docker: centos6
-            python: ''
-            target: azp/posix/1/
-          - ansible: '2.12'
-            docker: centos6
-            python: ''
-            target: azp/posix/2/
-          - ansible: '2.12'
-            docker: centos6
-            python: ''
-            target: azp/posix/3/
-          - ansible: '2.12'
-            docker: fedora34
-            python: ''
-            target: azp/posix/1/
-          - ansible: '2.12'
-            docker: fedora34
-            python: ''
-            target: azp/posix/2/
-          - ansible: '2.12'
-            docker: fedora34
-            python: ''
-            target: azp/posix/3/
-          - ansible: '2.12'
-            docker: ubuntu1804
-            python: ''
-            target: azp/posix/1/
-          - ansible: '2.12'
-            docker: ubuntu1804
-            python: ''
-            target: azp/posix/2/
-          - ansible: '2.12'
-            docker: ubuntu1804
-            python: ''
-            target: azp/posix/3/
-          # Right now all generic tests are disabled. Uncomment when at least one of them is re-enabled.
-          # - ansible: '2.12'
-          #   docker: default
-          #   python: '3.8'
-          #   target: azp/generic/1/
+          #   target: azp/generic/2/

    steps:
      - name: >-
@@ -219,7 +172,7 @@ jobs:
          under Python ${{ matrix.python }}
        uses: felixfontein/ansible-test-gh-action@main
        with:
-          ansible-core-github-repository-slug: ${{ contains(fromJson('["2.10", "2.11"]'), matrix.ansible) && 'felixfontein/ansible' || 'ansible/ansible' }}
+          ansible-core-github-repository-slug: felixfontein/ansible
          ansible-core-version: stable-${{ matrix.ansible }}
          coverage: ${{ github.event_name == 'schedule' && 'always' || 'never' }}
          docker-image: ${{ matrix.docker }}
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -8,7 +8,6 @@ name: "Code scanning - action"
 on:
  schedule:
    - cron: '26 19 * * 1'
-  workflow_dispatch:

 permissions:
  contents: read
@@ -25,12 +24,38 @@ jobs:
    steps:
    - name: Checkout repository
      uses: actions/checkout@v3
+      with:
+        # We must fetch at least the immediate parents so that if this is
+        # a pull request then we can checkout the head.
+        fetch-depth: 2
+
+    # If this run was triggered by a pull request event, then checkout
+    # the head of the pull request instead of the merge commit.
+    - run: git checkout HEAD^2
+      if: ${{ github.event_name == 'pull_request' }}

    # Initializes the CodeQL tools for scanning.
    - name: Initialize CodeQL
      uses: github/codeql-action/init@v2
-      with:
-        languages: python
+      # Override language selection by uncommenting this and choosing your languages
+      # with:
+      #   languages: go, javascript, csharp, python, cpp, java
+
+    # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
+    # If this step fails, then you should remove it and run the build manually (see below)
+    - name: Autobuild
+      uses: github/codeql-action/autobuild@v2
+
+    # ℹ️ Command-line programs to run using the OS shell.
+    # 📚 https://git.io/JvXDl
+
+    # ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
+    #    and modify them (or add more) to build your code if your project
+    #    uses a compiled language
+
+    #- run: |
+    #   make bootstrap
+    #   make release

    - name: Perform CodeQL Analysis
      uses: github/codeql-action/analyze@v2
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -0,0 +1,23 @@
+---
+# Copyright (c) Ansible Project
+# GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt)
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+repos:
+  - repo: https://github.com/pre-commit/pre-commit-hooks
+    rev: v4.0.1
+    hooks:
+      - id: trailing-whitespace
+      - id: end-of-file-fixer
+      - id: mixed-line-ending
+        args: [--fix=lf]
+      - id: fix-encoding-pragma
+      - id: check-ast
+      - id: check-merge-conflict
+      - id: check-symlinks
+  - repo: https://github.com/pre-commit/pygrep-hooks
+    rev: v1.9.0
+    hooks:
+      - id: rst-backticks
+        types: [file]
+        files: changelogs/fragments/.*\.(yml|yaml)$
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -31,7 +31,7 @@ Also, consider taking up a valuable, reviewed, but abandoned pull request which
 * Try committing your changes with an informative but short commit message.
 * Do not squash your commits and force-push to your branch if not needed. Reviews of your pull request are much easier with individual commits to comprehend the pull request history. All commits of your pull request branch will be squashed into one commit by GitHub upon merge.
 * Do not add merge commits to your PR. The bot will complain and you will have to rebase ([instructions for rebasing](https://docs.ansible.com/ansible/latest/dev_guide/developing_rebasing.html)) to remove them before your PR can be merged. To avoid that git automatically does merges during pulls, you can configure it to do rebases instead by running `git config pull.rebase true` inside the repository checkout.
-* Make sure your PR includes a [changelog fragment](https://docs.ansible.com/ansible/devel/community/development_process.html#creating-changelog-fragments). (You must not include a fragment for new modules or new plugins. Also you shouldn't include one for docs-only changes. If you're not sure, simply don't include one, we'll tell you whether one is needed or not :) )
+* Make sure your PR includes a [changelog fragment](https://docs.ansible.com/ansible/devel/community/development_process.html#creating-changelog-fragments). (You must not include a fragment for new modules or new plugins, except for test and filter plugins. Also you shouldn't include one for docs-only changes. If you're not sure, simply don't include one, we'll tell you whether one is needed or not :) )
 * Avoid reformatting unrelated parts of the codebase in your PR. These types of changes will likely be requested for reversion, create additional work for reviewers, and may cause approval to be delayed.

 You can also read [our Quick-start development guide](https://github.com/ansible/community-docs/blob/main/create_pr_quick_start_guide.rst).
@@ -121,3 +121,19 @@ Creating new modules and plugins requires a bit more work than other Pull Reques
   listed as `maintainers` will be pinged for new issues and PRs that modify the module/plugin or its tests.

   When you add a new plugin/module, we expect that you perform maintainer duty for at least some time after contributing it.
+
+## pre-commit
+
+To help ensure high-quality contributions this repository includes a [pre-commit](https://pre-commit.com) configuration which
+corrects and tests against common issues that would otherwise cause CI to fail. To begin using these pre-commit hooks see
+the [Installation](#installation) section below.
+
+This is optional and not required to contribute to this repository.
+
+### Installation
+
+Follow the [instructions](https://pre-commit.com/#install) provided with pre-commit and run `pre-commit install` under the repository base. If for any reason you would like to disable the pre-commit hooks run `pre-commit uninstall`.
+
+This is optional to run it locally.
+
+You can trigger it locally with `pre-commit run --all-files` or even to run only for a given file `pre-commit run --files YOUR_FILE`.
--- a/README.md
+++ b/README.md
@@ -6,7 +6,7 @@ SPDX-License-Identifier: GPL-3.0-or-later

 # Community General Collection

-[![Build Status](https://dev.azure.com/ansible/community.general/_apis/build/status/CI?branchName=stable-7)](https://dev.azure.com/ansible/community.general/_build?definitionId=31)
+[![Build Status](https://dev.azure.com/ansible/community.general/_apis/build/status/CI?branchName=stable-6)](https://dev.azure.com/ansible/community.general/_build?definitionId=31)
 [![EOL CI](https://github.com/ansible-collections/community.general/workflows/EOL%20CI/badge.svg?event=push)](https://github.com/ansible-collections/community.general/actions)
 [![Codecov](https://img.shields.io/codecov/c/github/ansible-collections/community.general)](https://codecov.io/gh/ansible-collections/community.general)

@@ -24,7 +24,7 @@ If you encounter abusive behavior violating the [Ansible Code of Conduct](https:

 ## Tested with Ansible

-Tested with the current ansible-core 2.11, ansible-core 2.12, ansible-core 2.13, ansible-core 2.14, ansible-core 2.15 releases and the current development version of ansible-core. Ansible-core versions before 2.11.0 are not supported. This includes all ansible-base 2.10 and Ansible 2.9 releases.
+Tested with the current ansible-core 2.11, ansible-core 2.12, ansible-core 2.13, ansible-core 2.14 releases and the current development version of ansible-core. Ansible-core versions before 2.11.0 are not supported. This includes all ansible-base 2.10 and Ansible 2.9 releases.

 Parts of this collection will not work with ansible-core 2.11 on Python 3.12+.

@@ -73,13 +73,13 @@ We are actively accepting new contributors.

 All types of contributions are very welcome.

-You don't know how to start? Refer to our [contribution guide](https://github.com/ansible-collections/community.general/blob/stable-7/CONTRIBUTING.md)!
+You don't know how to start? Refer to our [contribution guide](https://github.com/ansible-collections/community.general/blob/stable-6/CONTRIBUTING.md)!

-The current maintainers are listed in the [commit-rights.md](https://github.com/ansible-collections/community.general/blob/stable-7/commit-rights.md#people) file. If you have questions or need help, feel free to mention them in the proposals.
+The current maintainers are listed in the [commit-rights.md](https://github.com/ansible-collections/community.general/blob/stable-6/commit-rights.md#people) file. If you have questions or need help, feel free to mention them in the proposals.

 You can find more information in the [developer guide for collections](https://docs.ansible.com/ansible/devel/dev_guide/developing_collections.html#contributing-to-collections), and in the [Ansible Community Guide](https://docs.ansible.com/ansible/latest/community/index.html).

-Also for some notes specific to this collection see [our CONTRIBUTING documentation](https://github.com/ansible-collections/community.general/blob/stable-7/CONTRIBUTING.md).
+Also for some notes specific to this collection see [our CONTRIBUTING documentation](https://github.com/ansible-collections/community.general/blob/stable-6/CONTRIBUTING.md).

 ### Running tests

@@ -89,7 +89,7 @@ See [here](https://docs.ansible.com/ansible/devel/dev_guide/developing_collectio

 To learn how to maintain / become a maintainer of this collection, refer to:

-* [Committer guidelines](https://github.com/ansible-collections/community.general/blob/stable-7/commit-rights.md).
+* [Committer guidelines](https://github.com/ansible-collections/community.general/blob/stable-6/commit-rights.md).
 * [Maintainer guidelines](https://github.com/ansible/community-docs/blob/main/maintaining.rst).

 It is necessary for maintainers of this collection to be subscribed to:
@@ -117,7 +117,7 @@ See the [Releasing guidelines](https://github.com/ansible/community-docs/blob/ma

 ## Release notes

-See the [changelog](https://github.com/ansible-collections/community.general/blob/stable-7/CHANGELOG.rst).
+See the [changelog](https://github.com/ansible-collections/community.general/blob/stable-6/CHANGELOG.rst).

 ## Roadmap

@@ -136,8 +136,8 @@ See [this issue](https://github.com/ansible-collections/community.general/issues

 This collection is primarily licensed and distributed as a whole under the GNU General Public License v3.0 or later.

-See [LICENSES/GPL-3.0-or-later.txt](https://github.com/ansible-collections/community.general/blob/stable-7/COPYING) for the full text.
+See [LICENSES/GPL-3.0-or-later.txt](https://github.com/ansible-collections/community.general/blob/stable-6/COPYING) for the full text.

-Parts of the collection are licensed under the [BSD 2-Clause license](https://github.com/ansible-collections/community.general/blob/stable-7/LICENSES/BSD-2-Clause.txt), the [MIT license](https://github.com/ansible-collections/community.general/blob/stable-7/LICENSES/MIT.txt), and the [PSF 2.0 license](https://github.com/ansible-collections/community.general/blob/stable-7/LICENSES/PSF-2.0.txt).
+Parts of the collection are licensed under the [BSD 2-Clause license](https://github.com/ansible-collections/community.general/blob/stable-6/LICENSES/BSD-2-Clause.txt), the [MIT license](https://github.com/ansible-collections/community.general/blob/stable-6/LICENSES/MIT.txt), and the [PSF 2.0 license](https://github.com/ansible-collections/community.general/blob/stable-6/LICENSES/PSF-2.0.txt).

 All files have a machine readable `SDPX-License-Identifier:` comment denoting its respective license(s) or an equivalent entry in an accompanying `.license` file. Only changelog fragments (which will not be part of a release) are covered by a blanket statement in `.reuse/dep5`. This conforms to the [REUSE specification](https://reuse.software/spec/).
--- a/changelogs/changelog.yaml
+++ b/changelogs/changelog.yaml
--- a/galaxy.yml
+++ b/galaxy.yml
@@ -5,7 +5,7 @@

 namespace: community
 name: general
-version: 7.2.0
+version: 6.4.0
 readme: README.md
 authors:
  - Ansible (https://github.com/ansible)
--- a/meta/runtime.yml
+++ b/meta/runtime.yml
@@ -22,120 +22,6 @@ plugin_routing:
    nios_next_network:
      redirect: infoblox.nios_modules.nios_next_network
  modules:
-    rax_cbs_attachments:
-      deprecation:
-        removal_version: 9.0.0
-        warning_text: This module relies on the deprecated package pyrax.
-    rax_cbs:
-      deprecation:
-        removal_version: 9.0.0
-        warning_text: This module relies on the deprecated package pyrax.
-    rax_cdb_database:
-      deprecation:
-        removal_version: 9.0.0
-        warning_text: This module relies on the deprecated package pyrax.
-    rax_cdb_user:
-      deprecation:
-        removal_version: 9.0.0
-        warning_text: This module relies on the deprecated package pyrax.
-    rax_cdb:
-      deprecation:
-        removal_version: 9.0.0
-        warning_text: This module relies on the deprecated package pyrax.
-    rax_clb_nodes:
-      deprecation:
-        removal_version: 9.0.0
-        warning_text: This module relies on the deprecated package pyrax.
-    rax_clb_ssl:
-      deprecation:
-        removal_version: 9.0.0
-        warning_text: This module relies on the deprecated package pyrax.
-    rax_clb:
-      deprecation:
-        removal_version: 9.0.0
-        warning_text: This module relies on the deprecated package pyrax.
-    rax_dns_record:
-      deprecation:
-        removal_version: 9.0.0
-        warning_text: This module relies on the deprecated package pyrax.
-    rax_dns:
-      deprecation:
-        removal_version: 9.0.0
-        warning_text: This module relies on the deprecated package pyrax.
-    rax_facts:
-      deprecation:
-        removal_version: 9.0.0
-        warning_text: This module relies on the deprecated package pyrax.
-    rax_files_objects:
-      deprecation:
-        removal_version: 9.0.0
-        warning_text: This module relies on the deprecated package pyrax.
-    rax_files:
-      deprecation:
-        removal_version: 9.0.0
-        warning_text: This module relies on the deprecated package pyrax.
-    rax_identity:
-      deprecation:
-        removal_version: 9.0.0
-        warning_text: This module relies on the deprecated package pyrax.
-    rax_keypair:
-      deprecation:
-        removal_version: 9.0.0
-        warning_text: This module relies on the deprecated package pyrax.
-    rax_meta:
-      deprecation:
-        removal_version: 9.0.0
-        warning_text: This module relies on the deprecated package pyrax.
-    rax_mon_alarm:
-      deprecation:
-        removal_version: 9.0.0
-        warning_text: This module relies on the deprecated package pyrax.
-    rax:
-      deprecation:
-        removal_version: 9.0.0
-        warning_text: This module relies on the deprecated package pyrax.
-    rax_mon_check:
-      deprecation:
-        removal_version: 9.0.0
-        warning_text: This module relies on the deprecated package pyrax.
-    rax_mon_entity:
-      deprecation:
-        removal_version: 9.0.0
-        warning_text: This module relies on the deprecated package pyrax.
-    rax_mon_notification_plan:
-      deprecation:
-        removal_version: 9.0.0
-        warning_text: This module relies on the deprecated package pyrax.
-    rax_mon_notification:
-      deprecation:
-        removal_version: 9.0.0
-        warning_text: This module relies on the deprecated package pyrax.
-    rax_network:
-      deprecation:
-        removal_version: 9.0.0
-        warning_text: This module relies on the deprecated package pyrax.
-    rax_queue:
-      deprecation:
-        removal_version: 9.0.0
-        warning_text: This module relies on the deprecated package pyrax.
-    rax_scaling_group:
-      deprecation:
-        removal_version: 9.0.0
-        warning_text: This module relies on the deprecated package pyrax.
-    rax_scaling_policy:
-      deprecation:
-        removal_version: 9.0.0
-        warning_text: This module relies on the deprecated package pyrax.
-    rhn_channel:
-      deprecation:
-        removal_version: 10.0.0
-        warning_text: RHN is EOL, please contact the community.general maintainers
-          if still using this; see the module documentation for more details.
-    rhn_register:
-      deprecation:
-        removal_version: 10.0.0
-        warning_text: RHN is EOL, please contact the community.general maintainers
-          if still using this; see the module documentation for more details.
    database.aerospike.aerospike_migrations:
      redirect: community.general.aerospike_migrations
      deprecation:
@@ -150,12 +36,6 @@ plugin_routing:
        warning_text: You are using an internal name to access the community.general.airbrake_deployment
          modules. This has never been supported or documented, and will stop working
          in community.general 9.0.0.
-    stackdriver:
-      deprecation:
-        removal_version: 9.0.0
-        warning_text: >
-          This module relies on HTTPS APIs that do not exist anymore, and any new development in the
-          direction of providing an alternative should happen in the context of the google.cloud collection.
    system.aix_devices:
      redirect: community.general.aix_devices
      deprecation:
@@ -804,10 +684,6 @@ plugin_routing:
        warning_text: You are using an internal name to access the community.general.flatpak_remote
          modules. This has never been supported or documented, and will stop working
          in community.general 9.0.0.
-    flowdock:
-      deprecation:
-        removal_version: 9.0.0
-        warning_text: This module relies on HTTPS APIs that do not exist anymore and there is no clear path to update.
    notification.flowdock:
      redirect: community.general.flowdock
      deprecation:
@@ -1096,8 +972,6 @@ plugin_routing:
        warning_text: You are using an internal name to access the community.general.heroku_collaborator
          modules. This has never been supported or documented, and will stop working
          in community.general 9.0.0.
-    hana_query:
-      redirect: community.sap_libs.sap_hdbsql
    hetzner_failover_ip:
      redirect: community.hrobot.failover_ip
    hetzner_failover_ip_info:
@@ -3515,10 +3389,6 @@ plugin_routing:
        warning_text: You are using an internal name to access the community.general.redfish_info
          modules. This has never been supported or documented, and will stop working
          in community.general 9.0.0.
-    sapcar_extract:
-      redirect: community.sap_libs.sapcar_extract
-    sap_task_list_execute:
-      redirect: community.sap_libs.sap_task_list_execute
    packaging.os.redhat_subscription:
      redirect: community.general.redhat_subscription
      deprecation:
@@ -4443,10 +4313,6 @@ plugin_routing:
        warning_text: You are using an internal name to access the community.general.wdc_redfish_info
          modules. This has never been supported or documented, and will stop working
          in community.general 9.0.0.
-    webfaction_app:
-      deprecation:
-        removal_version: 9.0.0
-        warning_text: This module relies on HTTPS APIs that do not exist anymore and there is no clear path to update.
    cloud.webfaction.webfaction_app:
      redirect: community.general.webfaction_app
      deprecation:
@@ -4454,10 +4320,6 @@ plugin_routing:
        warning_text: You are using an internal name to access the community.general.webfaction_app
          modules. This has never been supported or documented, and will stop working
          in community.general 9.0.0.
-    webfaction_db:
-      deprecation:
-        removal_version: 9.0.0
-        warning_text: This module relies on HTTPS APIs that do not exist anymore and there is no clear path to update.
    cloud.webfaction.webfaction_db:
      redirect: community.general.webfaction_db
      deprecation:
@@ -4465,10 +4327,6 @@ plugin_routing:
        warning_text: You are using an internal name to access the community.general.webfaction_db
          modules. This has never been supported or documented, and will stop working
          in community.general 9.0.0.
-    webfaction_domain:
-      deprecation:
-        removal_version: 9.0.0
-        warning_text: This module relies on HTTPS APIs that do not exist anymore and there is no clear path to update.
    cloud.webfaction.webfaction_domain:
      redirect: community.general.webfaction_domain
      deprecation:
@@ -4476,10 +4334,6 @@ plugin_routing:
        warning_text: You are using an internal name to access the community.general.webfaction_domain
          modules. This has never been supported or documented, and will stop working
          in community.general 9.0.0.
-    webfaction_mailbox:
-      deprecation:
-        removal_version: 9.0.0
-        warning_text: This module relies on HTTPS APIs that do not exist anymore and there is no clear path to update.
    cloud.webfaction.webfaction_mailbox:
      redirect: community.general.webfaction_mailbox
      deprecation:
@@ -4487,10 +4341,6 @@ plugin_routing:
        warning_text: You are using an internal name to access the community.general.webfaction_mailbox
          modules. This has never been supported or documented, and will stop working
          in community.general 9.0.0.
-    webfaction_site:
-      deprecation:
-        removal_version: 9.0.0
-        warning_text: This module relies on HTTPS APIs that do not exist anymore and there is no clear path to update.
    cloud.webfaction.webfaction_site:
      redirect: community.general.webfaction_site
      deprecation:
@@ -4643,10 +4493,6 @@ plugin_routing:
          modules. This has never been supported or documented, and will stop working
          in community.general 9.0.0.
  doc_fragments:
-    rackspace:
-      deprecation:
-        removal_version: 9.0.0
-        warning_text: This doc fragment is used by rax modules, that rely on the deprecated package pyrax.
    _gcp:
      redirect: community.google._gcp
    docker:
@@ -4662,10 +4508,6 @@ plugin_routing:
    postgresql:
      redirect: community.postgresql.postgresql
  module_utils:
-    rax:
-      deprecation:
-        removal_version: 9.0.0
-        warning_text: This module util relies on the deprecated package pyrax.
    docker.common:
      redirect: community.docker.common
    docker.swarm:
--- a/plugins/action/shutdown.py
+++ b/plugins/action/shutdown.py
@@ -6,7 +6,6 @@
 # SPDX-License-Identifier: GPL-3.0-or-later

 from __future__ import (absolute_import, division, print_function)
-
 __metaclass__ = type

 from ansible.errors import AnsibleError, AnsibleConnectionFailure
@@ -81,6 +80,13 @@ class ActionModule(ActionBase):
                    getattr(self, default_value))))
        return value

+    def get_shutdown_command_args(self, distribution):
+        args = self._get_value_from_facts('SHUTDOWN_COMMAND_ARGS', distribution, 'DEFAULT_SHUTDOWN_COMMAND_ARGS')
+        # Convert seconds to minutes. If less that 60, set it to 0.
+        delay_sec = self.delay
+        shutdown_message = self._task.args.get('msg', self.DEFAULT_SHUTDOWN_MESSAGE)
+        return args.format(delay_sec=delay_sec, delay_min=delay_sec // 60, message=shutdown_message)
+
    def get_distribution(self, task_vars):
        # FIXME: only execute the module if we don't already have the facts we need
        distribution = {}
@@ -95,8 +101,7 @@ class ActionModule(ActionBase):
                    to_native(module_output['module_stdout']).strip(),
                    to_native(module_output['module_stderr']).strip()))
            distribution['name'] = module_output['ansible_facts']['ansible_distribution'].lower()
-            distribution['version'] = to_text(
-                module_output['ansible_facts']['ansible_distribution_version'].split('.')[0])
+            distribution['version'] = to_text(module_output['ansible_facts']['ansible_distribution_version'].split('.')[0])
            distribution['family'] = to_text(module_output['ansible_facts']['ansible_os_family'].lower())
            display.debug("{action}: distribution: {dist}".format(action=self._task.action, dist=distribution))
            return distribution
@@ -104,23 +109,6 @@ class ActionModule(ActionBase):
            raise AnsibleError('Failed to get distribution information. Missing "{0}" in output.'.format(ke.args[0]))

    def get_shutdown_command(self, task_vars, distribution):
-        def find_command(command, find_search_paths):
-            display.debug('{action}: running find module looking in {paths} to get path for "{command}"'.format(
-                action=self._task.action,
-                command=command,
-                paths=find_search_paths))
-            find_result = self._execute_module(
-                task_vars=task_vars,
-                # prevent collection search by calling with ansible.legacy (still allows library/ override of find)
-                module_name='ansible.legacy.find',
-                module_args={
-                    'paths': find_search_paths,
-                    'patterns': [command],
-                    'file_type': 'any'
-                }
-            )
-            return [x['path'] for x in find_result['files']]
-
        shutdown_bin = self._get_value_from_facts('SHUTDOWN_COMMANDS', distribution, 'DEFAULT_SHUTDOWN_COMMAND')
        default_search_paths = ['/sbin', '/usr/sbin', '/usr/local/sbin']
        search_paths = self._task.args.get('search_paths', default_search_paths)
@@ -139,53 +127,45 @@ class ActionModule(ActionBase):
        except TypeError:
            raise AnsibleError(err_msg.format(search_paths))

-        full_path = find_command(shutdown_bin, search_paths)  # find the path to the shutdown command
-        if not full_path:  # if we could not find the shutdown command
-            display.vvv('Unable to find command "{0}" in search paths: {1}, will attempt a shutdown using systemd '
-                        'directly.'.format(shutdown_bin, search_paths))  # tell the user we will try with systemd
-            systemctl_search_paths = ['/bin', '/usr/bin']
-            full_path = find_command('systemctl', systemctl_search_paths)  # find the path to the systemctl command
-            if not full_path:  # if we couldn't find systemctl
-                raise AnsibleError(
-                    'Could not find command "{0}" in search paths: {1} or systemctl command in search paths: {2}, unable to shutdown.'.
-                    format(shutdown_bin, search_paths, systemctl_search_paths))  # we give up here
-            else:
-                return "{0} poweroff".format(full_path[0])  # done, since we cannot use args with systemd shutdown
+        display.debug('{action}: running find module looking in {paths} to get path for "{command}"'.format(
+            action=self._task.action,
+            command=shutdown_bin,
+            paths=search_paths))
+        find_result = self._execute_module(
+            task_vars=task_vars,
+            # prevent collection search by calling with ansible.legacy (still allows library/ override of find)
+            module_name='ansible.legacy.find',
+            module_args={
+                'paths': search_paths,
+                'patterns': [shutdown_bin],
+                'file_type': 'any'
+            }
+        )

-        # systemd case taken care of, here we add args to the command
-        args = self._get_value_from_facts('SHUTDOWN_COMMAND_ARGS', distribution, 'DEFAULT_SHUTDOWN_COMMAND_ARGS')
-        # Convert seconds to minutes. If less that 60, set it to 0.
-        delay_sec = self.delay
-        shutdown_message = self._task.args.get('msg', self.DEFAULT_SHUTDOWN_MESSAGE)
-        return '{0} {1}'. \
-            format(
-                full_path[0],
-                args.format(
-                    delay_sec=delay_sec,
-                    delay_min=delay_sec // 60,
-                    message=shutdown_message
-                )
-            )
+        full_path = [x['path'] for x in find_result['files']]
+        if not full_path:
+            raise AnsibleError('Unable to find command "{0}" in search paths: {1}'.format(shutdown_bin, search_paths))
+        self._shutdown_command = full_path[0]
+        return self._shutdown_command

    def perform_shutdown(self, task_vars, distribution):
        result = {}
        shutdown_result = {}
-        shutdown_command_exec = self.get_shutdown_command(task_vars, distribution)
+        shutdown_command = self.get_shutdown_command(task_vars, distribution)
+        shutdown_command_args = self.get_shutdown_command_args(distribution)
+        shutdown_command_exec = '{0} {1}'.format(shutdown_command, shutdown_command_args)

        self.cleanup(force=True)
        try:
            display.vvv("{action}: shutting down server...".format(action=self._task.action))
-            display.debug("{action}: shutting down server with command '{command}'".
-                          format(action=self._task.action, command=shutdown_command_exec))
+            display.debug("{action}: shutting down server with command '{command}'".format(action=self._task.action, command=shutdown_command_exec))
            if self._play_context.check_mode:
                shutdown_result['rc'] = 0
            else:
                shutdown_result = self._low_level_execute_command(shutdown_command_exec, sudoable=self.DEFAULT_SUDOABLE)
        except AnsibleConnectionFailure as e:
            # If the connection is closed too quickly due to the system being shutdown, carry on
-            display.debug(
-                '{action}: AnsibleConnectionFailure caught and handled: {error}'.format(action=self._task.action,
-                                                                                        error=to_text(e)))
+            display.debug('{action}: AnsibleConnectionFailure caught and handled: {error}'.format(action=self._task.action, error=to_text(e)))
            shutdown_result['rc'] = 0

        if shutdown_result['rc'] != 0:
--- a/plugins/become/machinectl.py
+++ b/plugins/become/machinectl.py
@@ -68,7 +68,7 @@ DOCUMENTATION = '''
              - section: machinectl_become_plugin
                key: password
    notes:
-      - When not using this plugin with user V(root), it only works correctly with a polkit rule which will alter
+      - When not using this plugin with user C(root), it only works correctly with a polkit rule which will alter
        the behaviour of machinectl. This rule must alter the prompt behaviour to ask directly for the user credentials,
        if the user is allowed to perform the action (take a look at the examples section).
        If such a rule is not present the plugin only work if it is used in context with the root user,
@@ -102,7 +102,6 @@ class BecomeModule(BecomeBase):
    prompt = 'Password: '
    fail = ('==== AUTHENTICATION FAILED ====',)
    success = ('==== AUTHENTICATION COMPLETE ====',)
-    require_tty = True  # see https://github.com/ansible-collections/community.general/issues/6932

    @staticmethod
    def remove_ansi_codes(line):
--- a/plugins/become/pfexec.py
+++ b/plugins/become/pfexec.py
@@ -82,7 +82,7 @@ DOCUMENTATION = '''
            env:
              - name: ANSIBLE_PFEXEC_WRAP_EXECUTION
    notes:
-      - This plugin ignores O(become_user) as pfexec uses it's own C(exec_attr) to figure this out.
+      - This plugin ignores I(become_user) as pfexec uses it's own C(exec_attr) to figure this out.
 '''

 from ansible.plugins.become import BecomeBase
--- a/plugins/cache/redis.py
+++ b/plugins/cache/redis.py
@@ -18,9 +18,9 @@ DOCUMENTATION = '''
      _uri:
        description:
          - A colon separated string of connection information for Redis.
-          - The format is V(host:port:db:password), for example V(localhost:6379:0:changeme).
-          - To use encryption in transit, prefix the connection with V(tls://), as in V(tls://localhost:6379:0:changeme).
-          - To use redis sentinel, use separator V(;), for example V(localhost:26379;localhost:26379;0:changeme). Requires redis>=2.9.0.
+          - The format is C(host:port:db:password), for example C(localhost:6379:0:changeme).
+          - To use encryption in transit, prefix the connection with C(tls://), as in C(tls://localhost:6379:0:changeme).
+          - To use redis sentinel, use separator C(;), for example C(localhost:26379;localhost:26379;0:changeme). Requires redis>=2.9.0.
        required: true
        env:
          - name: ANSIBLE_CACHE_PLUGIN_CONNECTION
--- a/plugins/callback/cgroup_memory_recap.py
+++ b/plugins/callback/cgroup_memory_recap.py
@@ -24,7 +24,7 @@ DOCUMENTATION = '''
    options:
      max_mem_file:
        required: true
-        description: Path to cgroups C(memory.max_usage_in_bytes) file. Example V(/sys/fs/cgroup/memory/ansible_profile/memory.max_usage_in_bytes).
+        description: Path to cgroups C(memory.max_usage_in_bytes) file. Example C(/sys/fs/cgroup/memory/ansible_profile/memory.max_usage_in_bytes).
        env:
          - name: CGROUP_MAX_MEM_FILE
        ini:
@@ -32,7 +32,7 @@ DOCUMENTATION = '''
            key: max_mem_file
      cur_mem_file:
        required: true
-        description: Path to C(memory.usage_in_bytes) file. Example V(/sys/fs/cgroup/memory/ansible_profile/memory.usage_in_bytes).
+        description: Path to C(memory.usage_in_bytes) file. Example C(/sys/fs/cgroup/memory/ansible_profile/memory.usage_in_bytes).
        env:
          - name: CGROUP_CUR_MEM_FILE
        ini:
--- a/plugins/callback/diy.py
+++ b/plugins/callback/diy.py
@@ -18,7 +18,7 @@ DOCUMENTATION = r'''
  extends_documentation_fragment:
    - default_callback
  notes:
-    - Uses the P(ansible.builtin.default#callback) callback plugin output when a custom callback V(message(msg\)) is not provided.
+    - Uses the C(default) callback plugin output when a custom callback message(C(msg)) is not provided.
    - Makes the callback event data available via the C(ansible_callback_diy) dictionary, which can be used in the templating context for the options.
      The dictionary is only available in the templating context for the options. It is not a variable that is available via the other
      various execution contexts, such as playbook, play, task etc.
@@ -40,8 +40,8 @@ DOCUMENTATION = r'''
                    if value C(is not None and not omit and length is greater than 0),
                    then the option is being used with output.
       **Effect**: render value as template and output"
-    - "Valid color values: V(black), V(bright gray), V(blue), V(white), V(green), V(bright blue), V(cyan), V(bright green), V(red), V(bright cyan),
-      V(purple), V(bright red), V(yellow), V(bright purple), V(dark gray), V(bright yellow), V(magenta), V(bright magenta), V(normal)"
+    - "Valid color values: C(black), C(bright gray), C(blue), C(white), C(green), C(bright blue), C(cyan), C(bright green), C(red), C(bright cyan),
+      C(purple), C(bright red), C(yellow), C(bright purple), C(dark gray), C(bright yellow), C(magenta), C(bright magenta), C(normal)"
  seealso:
    - name: default – default Ansible screen output
      description: The official documentation on the B(default) callback plugin.
@@ -62,7 +62,7 @@ DOCUMENTATION = r'''

    on_any_msg_color:
      description:
-        - Output color to be used for O(on_any_msg).
+        - Output color to be used for I(on_any_msg).
        - Template should render a L(valid color value,#notes).
      ini:
        - section: callback_diy
@@ -86,7 +86,7 @@ DOCUMENTATION = r'''

    runner_on_failed_msg_color:
      description:
-        - Output color to be used for O(runner_on_failed_msg).
+        - Output color to be used for I(runner_on_failed_msg).
        - Template should render a L(valid color value,#notes).
      ini:
        - section: callback_diy
@@ -110,7 +110,7 @@ DOCUMENTATION = r'''

    runner_on_ok_msg_color:
      description:
-        - Output color to be used for O(runner_on_ok_msg).
+        - Output color to be used for I(runner_on_ok_msg).
        - Template should render a L(valid color value,#notes).
      ini:
        - section: callback_diy
@@ -134,7 +134,7 @@ DOCUMENTATION = r'''

    runner_on_skipped_msg_color:
      description:
-        - Output color to be used for O(runner_on_skipped_msg).
+        - Output color to be used for I(runner_on_skipped_msg).
        - Template should render a L(valid color value,#notes).
      ini:
        - section: callback_diy
@@ -158,7 +158,7 @@ DOCUMENTATION = r'''

    runner_on_unreachable_msg_color:
      description:
-        - Output color to be used for O(runner_on_unreachable_msg).
+        - Output color to be used for I(runner_on_unreachable_msg).
        - Template should render a L(valid color value,#notes).
      ini:
        - section: callback_diy
@@ -182,7 +182,7 @@ DOCUMENTATION = r'''

    playbook_on_start_msg_color:
      description:
-        - Output color to be used for O(playbook_on_start_msg).
+        - Output color to be used for I(playbook_on_start_msg).
        - Template should render a L(valid color value,#notes).
      ini:
        - section: callback_diy
@@ -206,7 +206,7 @@ DOCUMENTATION = r'''

    playbook_on_notify_msg_color:
      description:
-        - Output color to be used for O(playbook_on_notify_msg).
+        - Output color to be used for I(playbook_on_notify_msg).
        - Template should render a L(valid color value,#notes).
      ini:
        - section: callback_diy
@@ -230,7 +230,7 @@ DOCUMENTATION = r'''

    playbook_on_no_hosts_matched_msg_color:
      description:
-        - Output color to be used for O(playbook_on_no_hosts_matched_msg).
+        - Output color to be used for I(playbook_on_no_hosts_matched_msg).
        - Template should render a L(valid color value,#notes).
      ini:
        - section: callback_diy
@@ -254,7 +254,7 @@ DOCUMENTATION = r'''

    playbook_on_no_hosts_remaining_msg_color:
      description:
-        - Output color to be used for O(playbook_on_no_hosts_remaining_msg).
+        - Output color to be used for I(playbook_on_no_hosts_remaining_msg).
        - Template should render a L(valid color value,#notes).
      ini:
        - section: callback_diy
@@ -278,7 +278,7 @@ DOCUMENTATION = r'''

    playbook_on_task_start_msg_color:
      description:
-        - Output color to be used for O(playbook_on_task_start_msg).
+        - Output color to be used for I(playbook_on_task_start_msg).
        - Template should render a L(valid color value,#notes).
      ini:
        - section: callback_diy
@@ -302,7 +302,7 @@ DOCUMENTATION = r'''

    playbook_on_handler_task_start_msg_color:
      description:
-        - Output color to be used for O(playbook_on_handler_task_start_msg).
+        - Output color to be used for I(playbook_on_handler_task_start_msg).
        - Template should render a L(valid color value,#notes).
      ini:
        - section: callback_diy
@@ -326,7 +326,7 @@ DOCUMENTATION = r'''

    playbook_on_vars_prompt_msg_color:
      description:
-        - Output color to be used for O(playbook_on_vars_prompt_msg).
+        - Output color to be used for I(playbook_on_vars_prompt_msg).
        - Template should render a L(valid color value,#notes).
      ini:
        - section: callback_diy
@@ -350,7 +350,7 @@ DOCUMENTATION = r'''

    playbook_on_play_start_msg_color:
      description:
-        - Output color to be used for O(playbook_on_play_start_msg).
+        - Output color to be used for I(playbook_on_play_start_msg).
        - Template should render a L(valid color value,#notes).
      ini:
        - section: callback_diy
@@ -374,7 +374,7 @@ DOCUMENTATION = r'''

    playbook_on_stats_msg_color:
      description:
-        - Output color to be used for O(playbook_on_stats_msg).
+        - Output color to be used for I(playbook_on_stats_msg).
        - Template should render a L(valid color value,#notes).
      ini:
        - section: callback_diy
@@ -398,7 +398,7 @@ DOCUMENTATION = r'''

    on_file_diff_msg_color:
      description:
-        - Output color to be used for O(on_file_diff_msg).
+        - Output color to be used for I(on_file_diff_msg).
        - Template should render a L(valid color value,#notes).
      ini:
        - section: callback_diy
@@ -422,7 +422,7 @@ DOCUMENTATION = r'''

    playbook_on_include_msg_color:
      description:
-        - Output color to be used for O(playbook_on_include_msg).
+        - Output color to be used for I(playbook_on_include_msg).
        - Template should render a L(valid color value,#notes).
      ini:
        - section: callback_diy
@@ -446,7 +446,7 @@ DOCUMENTATION = r'''

    runner_item_on_ok_msg_color:
      description:
-        - Output color to be used for O(runner_item_on_ok_msg).
+        - Output color to be used for I(runner_item_on_ok_msg).
        - Template should render a L(valid color value,#notes).
      ini:
        - section: callback_diy
@@ -470,7 +470,7 @@ DOCUMENTATION = r'''

    runner_item_on_failed_msg_color:
      description:
-        - Output color to be used for O(runner_item_on_failed_msg).
+        - Output color to be used for I(runner_item_on_failed_msg).
        - Template should render a L(valid color value,#notes).
      ini:
        - section: callback_diy
@@ -494,7 +494,7 @@ DOCUMENTATION = r'''

    runner_item_on_skipped_msg_color:
      description:
-        - Output color to be used for O(runner_item_on_skipped_msg).
+        - Output color to be used for I(runner_item_on_skipped_msg).
        - Template should render a L(valid color value,#notes).
      ini:
        - section: callback_diy
@@ -518,7 +518,7 @@ DOCUMENTATION = r'''

    runner_retry_msg_color:
      description:
-        - Output color to be used for O(runner_retry_msg).
+        - Output color to be used for I(runner_retry_msg).
        - Template should render a L(valid color value,#notes).
      ini:
        - section: callback_diy
@@ -542,7 +542,7 @@ DOCUMENTATION = r'''

    runner_on_start_msg_color:
      description:
-        - Output color to be used for O(runner_on_start_msg).
+        - Output color to be used for I(runner_on_start_msg).
        - Template should render a L(valid color value,#notes).
      ini:
        - section: callback_diy
@@ -566,7 +566,7 @@ DOCUMENTATION = r'''

    runner_on_no_hosts_msg_color:
      description:
-        - Output color to be used for O(runner_on_no_hosts_msg).
+        - Output color to be used for I(runner_on_no_hosts_msg).
        - Template should render a L(valid color value,#notes).
      ini:
        - section: callback_diy
@@ -590,7 +590,7 @@ DOCUMENTATION = r'''

    playbook_on_setup_msg_color:
      description:
-        - Output color to be used for O(playbook_on_setup_msg).
+        - Output color to be used for I(playbook_on_setup_msg).
        - Template should render a L(valid color value,#notes).
      ini:
        - section: callback_diy
--- a/plugins/callback/opentelemetry.py
+++ b/plugins/callback/opentelemetry.py
@@ -32,10 +32,10 @@ DOCUMENTATION = '''
      enable_from_environment:
        type: str
        description:
-          - Whether to enable this callback only if the given environment variable exists and it is set to V(true).
+          - Whether to enable this callback only if the given environment variable exists and it is set to C(true).
          - This is handy when you use Configuration as Code and want to send distributed traces
            if running in the CI rather when running Ansible locally.
-          - For such, it evaluates the given O(enable_from_environment) value as environment variable
+          - For such, it evaluates the given I(enable_from_environment) value as environment variable
            and if set to true this plugin will be enabled.
        env:
          - name: ANSIBLE_OPENTELEMETRY_ENABLE_FROM_ENVIRONMENT
@@ -73,17 +73,6 @@ DOCUMENTATION = '''
          - section: callback_opentelemetry
            key: disable_logs
        version_added: 5.8.0
-      disable_attributes_in_logs:
-        default: false
-        type: bool
-        description:
-          - Disable populating span attributes to the logs.
-        env:
-          - name: ANSIBLE_OPENTELEMETRY_DISABLE_ATTRIBUTES_IN_LOGS
-        ini:
-          - section: callback_opentelemetry
-            key: disable_attributes_in_logs
-        version_added: 7.1.0
    requirements:
      - opentelemetry-api (Python library)
      - opentelemetry-exporter-otlp (Python library)
@@ -255,7 +244,7 @@ class OpenTelemetrySource(object):
        task.dump = dump
        task.add_host(HostData(host_uuid, host_name, status, result))

-    def generate_distributed_traces(self, otel_service_name, ansible_playbook, tasks_data, status, traceparent, disable_logs, disable_attributes_in_logs):
+    def generate_distributed_traces(self, otel_service_name, ansible_playbook, tasks_data, status, traceparent, disable_logs):
        """ generate distributed traces from the collected TaskData and HostData """

        tasks = []
@@ -291,9 +280,9 @@ class OpenTelemetrySource(object):
            for task in tasks:
                for host_uuid, host_data in task.host_data.items():
                    with tracer.start_as_current_span(task.name, start_time=task.start, end_on_exit=False) as span:
-                        self.update_span_data(task, host_data, span, disable_logs, disable_attributes_in_logs)
+                        self.update_span_data(task, host_data, span, disable_logs)

-    def update_span_data(self, task_data, host_data, span, disable_logs, disable_attributes_in_logs):
+    def update_span_data(self, task_data, host_data, span, disable_logs):
        """ update the span with the given TaskData and HostData """

        name = '[%s] %s: %s' % (host_data.name, task_data.play, task_data.name)
@@ -326,47 +315,39 @@ class OpenTelemetrySource(object):
                status = Status(status_code=StatusCode.UNSET)

        span.set_status(status)
-
-        # Create the span and log attributes
-        attributes = {
-            "ansible.task.module": task_data.action,
-            "ansible.task.message": message,
-            "ansible.task.name": name,
-            "ansible.task.result": rc,
-            "ansible.task.host.name": host_data.name,
-            "ansible.task.host.status": host_data.status
-        }
        if isinstance(task_data.args, dict) and "gather_facts" not in task_data.action:
            names = tuple(self.transform_ansible_unicode_to_str(k) for k in task_data.args.keys())
            values = tuple(self.transform_ansible_unicode_to_str(k) for k in task_data.args.values())
-            attributes[("ansible.task.args.name")] = names
-            attributes[("ansible.task.args.value")] = values
-
-        self.set_span_attributes(span, attributes)
-
+            self.set_span_attribute(span, ("ansible.task.args.name"), names)
+            self.set_span_attribute(span, ("ansible.task.args.value"), values)
+        self.set_span_attribute(span, "ansible.task.module", task_data.action)
+        self.set_span_attribute(span, "ansible.task.message", message)
+        self.set_span_attribute(span, "ansible.task.name", name)
+        self.set_span_attribute(span, "ansible.task.result", rc)
+        self.set_span_attribute(span, "ansible.task.host.name", host_data.name)
+        self.set_span_attribute(span, "ansible.task.host.status", host_data.status)
        # This will allow to enrich the service map
        self.add_attributes_for_service_map_if_possible(span, task_data)
        # Send logs
        if not disable_logs:
-            # This will avoid populating span attributes to the logs
-            span.add_event(task_data.dump, attributes={} if disable_attributes_in_logs else attributes)
-            span.end(end_time=host_data.finish)
+            span.add_event(task_data.dump)
+        span.end(end_time=host_data.finish)

-    def set_span_attributes(self, span, attributes):
-        """ update the span attributes with the given attributes if not None """
+    def set_span_attribute(self, span, attributeName, attributeValue):
+        """ update the span attribute with the given attribute and value if not None """

        if span is None and self._display is not None:
            self._display.warning('span object is None. Please double check if that is expected.')
        else:
-            if attributes is not None:
-                span.set_attributes(attributes)
+            if attributeValue is not None:
+                span.set_attribute(attributeName, attributeValue)

    def add_attributes_for_service_map_if_possible(self, span, task_data):
        """Update the span attributes with the service that the task interacted with, if possible."""

        redacted_url = self.parse_and_redact_url_if_possible(task_data.args)
        if redacted_url:
-            span.set_attribute("http.url", redacted_url.geturl())
+            self.set_span_attribute(span, "http.url", redacted_url.geturl())

    @staticmethod
    def parse_and_redact_url_if_possible(args):
@@ -453,7 +434,6 @@ class CallbackModule(CallbackBase):
    def __init__(self, display=None):
        super(CallbackModule, self).__init__(display=display)
        self.hide_task_arguments = None
-        self.disable_attributes_in_logs = None
        self.disable_logs = None
        self.otel_service_name = None
        self.ansible_playbook = None
@@ -485,8 +465,6 @@ class CallbackModule(CallbackBase):

        self.hide_task_arguments = self.get_option('hide_task_arguments')

-        self.disable_attributes_in_logs = self.get_option('disable_attributes_in_logs')
-
        self.disable_logs = self.get_option('disable_logs')

        self.otel_service_name = self.get_option('otel_service_name')
@@ -584,8 +562,7 @@ class CallbackModule(CallbackBase):
            self.tasks_data,
            status,
            self.traceparent,
-            self.disable_logs,
-            self.disable_attributes_in_logs
+            self.disable_logs
        )

    def v2_runner_on_async_failed(self, result, **kwargs):
--- a/plugins/callback/splunk.py
+++ b/plugins/callback/splunk.py
@@ -36,8 +36,8 @@ DOCUMENTATION = '''
            key: authtoken
      validate_certs:
        description: Whether to validate certificates for connections to HEC. It is not recommended to set to
-                     V(false) except when you are sure that nobody can intercept the connection
-                     between this plugin and HEC, as setting it to V(false) allows man-in-the-middle attacks!
+                     C(false) except when you are sure that nobody can intercept the connection
+                     between this plugin and HEC, as setting it to C(false) allows man-in-the-middle attacks!
        env:
          - name: SPLUNK_VALIDATE_CERTS
        ini:
--- a/plugins/callback/sumologic.py
+++ b/plugins/callback/sumologic.py
@@ -6,7 +6,7 @@
 from __future__ import (absolute_import, division, print_function)
 __metaclass__ = type

-DOCUMENTATION = r'''
+DOCUMENTATION = '''
 name: sumologic
 type: notification
 short_description: Sends task result events to Sumologic
@@ -15,8 +15,8 @@ description:
  - This callback plugin will send task results as JSON formatted events to a Sumologic HTTP collector source.
 requirements:
  - Whitelisting this callback plugin
-  - 'Create a HTTP collector source in Sumologic and specify a custom timestamp format of V(yyyy-MM-dd HH:mm:ss ZZZZ) and a custom timestamp locator
-    of V("timestamp": "(.*\)")'
+  - 'Create a HTTP collector source in Sumologic and specify a custom timestamp format of C(yyyy-MM-dd HH:mm:ss ZZZZ) and a custom timestamp locator
+    of C("timestamp": "(.*)")'
 options:
  url:
    description: URL to the Sumologic HTTP collector source.
--- a/plugins/connection/chroot.py
+++ b/plugins/connection/chroot.py
@@ -48,25 +48,6 @@ DOCUMENTATION = '''
        default: chroot
 '''

-EXAMPLES = r"""
-# Static inventory file
-#
-# [chroots]
-# /path/to/debootstrap
-# /path/to/feboostrap
-# /path/to/lxc-image
-# /path/to/chroot
-
-# playbook
---
- hosts: chroots
-  connection: community.general.chroot
-  tasks:
-    - debug:
-        msg: "This is coming from chroot environment"
-
-"""
-
 import os
 import os.path
 import subprocess
--- a/plugins/connection/jail.py
+++ b/plugins/connection/jail.py
@@ -22,7 +22,6 @@ DOCUMENTATION = '''
            - Path to the jail
        default: inventory_hostname
        vars:
-            - name: inventory_hostname
            - name: ansible_host
            - name: ansible_jail_host
      remote_user:
--- a/plugins/doc_fragments/alicloud.py
+++ b/plugins/doc_fragments/alicloud.py
@@ -15,40 +15,40 @@ class ModuleDocFragment(object):
 options:
  alicloud_access_key:
    description:
-      - Alibaba Cloud access key. If not set then the value of environment variable E(ALICLOUD_ACCESS_KEY),
-        E(ALICLOUD_ACCESS_KEY_ID) will be used instead.
+      - Alibaba Cloud access key. If not set then the value of environment variable C(ALICLOUD_ACCESS_KEY),
+        C(ALICLOUD_ACCESS_KEY_ID) will be used instead.
    aliases: ['access_key_id', 'access_key']
    type: str
  alicloud_secret_key:
    description:
-      - Alibaba Cloud secret key. If not set then the value of environment variable E(ALICLOUD_SECRET_KEY),
-        E(ALICLOUD_SECRET_ACCESS_KEY) will be used instead.
+      - Alibaba Cloud secret key. If not set then the value of environment variable C(ALICLOUD_SECRET_KEY),
+        C(ALICLOUD_SECRET_ACCESS_KEY) will be used instead.
    aliases: ['secret_access_key', 'secret_key']
    type: str
  alicloud_region:
    description:
      - The Alibaba Cloud region to use. If not specified then the value of environment variable
-        E(ALICLOUD_REGION), E(ALICLOUD_REGION_ID) will be used instead.
+        C(ALICLOUD_REGION), C(ALICLOUD_REGION_ID) will be used instead.
    aliases: ['region', 'region_id']
    required: true
    type: str
  alicloud_security_token:
    description:
      - The Alibaba Cloud security token. If not specified then the value of environment variable
-        E(ALICLOUD_SECURITY_TOKEN) will be used instead.
+        C(ALICLOUD_SECURITY_TOKEN) will be used instead.
    aliases: ['security_token']
    type: str
  alicloud_assume_role:
    description:
      - If provided with a role ARN, Ansible will attempt to assume this role using the supplied credentials.
-      - The nested assume_role block supports C(alicloud_assume_role_arn), C(alicloud_assume_role_session_name),
-        C(alicloud_assume_role_session_expiration) and C(alicloud_assume_role_policy).
+      - The nested assume_role block supports I(alicloud_assume_role_arn), I(alicloud_assume_role_session_name),
+        I(alicloud_assume_role_session_expiration) and I(alicloud_assume_role_policy)
    type: dict
    aliases: ['assume_role']
  alicloud_assume_role_arn:
    description:
      - The Alibaba Cloud role_arn. The ARN of the role to assume. If ARN is set to an empty string,
-        it does not perform role switching. It supports environment variable E(ALICLOUD_ASSUME_ROLE_ARN).
+        it does not perform role switching. It supports environment variable ALICLOUD_ASSUME_ROLE_ARN.
        ansible will execute with provided credentials.
    aliases: ['assume_role_arn']
    type: str
@@ -56,14 +56,14 @@ options:
    description:
      - The Alibaba Cloud session_name. The session name to use when assuming the role. If omitted,
        'ansible' is passed to the AssumeRole call as session name. It supports environment variable
-        E(ALICLOUD_ASSUME_ROLE_SESSION_NAME).
+        ALICLOUD_ASSUME_ROLE_SESSION_NAME
    aliases: ['assume_role_session_name']
    type: str
  alicloud_assume_role_session_expiration:
    description:
      - The Alibaba Cloud session_expiration. The time after which the established session for assuming
        role expires. Valid value range 900-3600 seconds. Default to 3600 (in this case Alicloud use own default
-        value). It supports environment variable E(ALICLOUD_ASSUME_ROLE_SESSION_EXPIRATION).
+        value). It supports environment variable ALICLOUD_ASSUME_ROLE_SESSION_EXPIRATION
    aliases: ['assume_role_session_expiration']
    type: int
  ecs_role_name:
@@ -79,11 +79,11 @@ options:
  profile:
    description:
      - This is the Alicloud profile name as set in the shared credentials file. It can also be sourced from the
-        E(ALICLOUD_PROFILE) environment variable.
+        ALICLOUD_PROFILE environment variable.
    type: str
  shared_credentials_file:
    description:
-      - This is the path to the shared credentials file. It can also be sourced from the E(ALICLOUD_SHARED_CREDENTIALS_FILE)
+      - This is the path to the shared credentials file. It can also be sourced from the ALICLOUD_SHARED_CREDENTIALS_FILE
        environment variable.
      - If this is not set and a profile is specified,  ~/.aliyun/config.json will be used.
    type: str
@@ -94,16 +94,16 @@ requirements:
 notes:
  - If parameters are not set within the module, the following
    environment variables can be used in decreasing order of precedence
-    E(ALICLOUD_ACCESS_KEY) or E(ALICLOUD_ACCESS_KEY_ID),
-    E(ALICLOUD_SECRET_KEY) or E(ALICLOUD_SECRET_ACCESS_KEY),
-    E(ALICLOUD_REGION) or E(ALICLOUD_REGION_ID),
-    E(ALICLOUD_SECURITY_TOKEN),
-    E(ALICLOUD_ECS_ROLE_NAME),
-    E(ALICLOUD_SHARED_CREDENTIALS_FILE),
-    E(ALICLOUD_PROFILE),
-    E(ALICLOUD_ASSUME_ROLE_ARN),
-    E(ALICLOUD_ASSUME_ROLE_SESSION_NAME),
-    E(ALICLOUD_ASSUME_ROLE_SESSION_EXPIRATION),
-  - E(ALICLOUD_REGION) or E(ALICLOUD_REGION_ID) can be typically be used to specify the
+    C(ALICLOUD_ACCESS_KEY) or C(ALICLOUD_ACCESS_KEY_ID),
+    C(ALICLOUD_SECRET_KEY) or C(ALICLOUD_SECRET_ACCESS_KEY),
+    C(ALICLOUD_REGION) or C(ALICLOUD_REGION_ID),
+    C(ALICLOUD_SECURITY_TOKEN),
+    C(ALICLOUD_ECS_ROLE_NAME),
+    C(ALICLOUD_SHARED_CREDENTIALS_FILE),
+    C(ALICLOUD_PROFILE),
+    C(ALICLOUD_ASSUME_ROLE_ARN),
+    C(ALICLOUD_ASSUME_ROLE_SESSION_NAME),
+    C(ALICLOUD_ASSUME_ROLE_SESSION_EXPIRATION),
+  - C(ALICLOUD_REGION) or C(ALICLOUD_REGION_ID) can be typically be used to specify the
    ALICLOUD region, when required, but this can also be configured in the footmark config file
 '''
--- a/plugins/doc_fragments/bitbucket.py
+++ b/plugins/doc_fragments/bitbucket.py
@@ -16,25 +16,25 @@ options:
  client_id:
    description:
      - The OAuth consumer key.
-      - If not set the environment variable E(BITBUCKET_CLIENT_ID) will be used.
+      - If not set the environment variable C(BITBUCKET_CLIENT_ID) will be used.
    type: str
  client_secret:
    description:
      - The OAuth consumer secret.
-      - If not set the environment variable E(BITBUCKET_CLIENT_SECRET) will be used.
+      - If not set the environment variable C(BITBUCKET_CLIENT_SECRET) will be used.
    type: str
  user:
    description:
      - The username.
-      - If not set the environment variable E(BITBUCKET_USERNAME) will be used.
-      - O(ignore:username) is an alias of O(user) since community.general 6.0.0. It was an alias of O(workspace) before.
+      - If not set the environment variable C(BITBUCKET_USERNAME) will be used.
+      - I(username) is an alias of I(user) since community.genreal 6.0.0. It was an alias of I(workspace) before.
    type: str
    version_added: 4.0.0
    aliases: [ username ]
  password:
    description:
      - The App password.
-      - If not set the environment variable E(BITBUCKET_PASSWORD) will be used.
+      - If not set the environment variable C(BITBUCKET_PASSWORD) will be used.
    type: str
    version_added: 4.0.0
 notes:
--- a/plugins/doc_fragments/dimensiondata.py
+++ b/plugins/doc_fragments/dimensiondata.py
@@ -29,13 +29,13 @@ options:
  mcp_user:
    description:
      - The username used to authenticate to the CloudControl API.
-      - If not specified, will fall back to E(MCP_USER) from environment variable or C(~/.dimensiondata).
+      - If not specified, will fall back to C(MCP_USER) from environment variable or C(~/.dimensiondata).
    type: str
  mcp_password:
    description:
      - The password used to authenticate to the CloudControl API.
-      - If not specified, will fall back to E(MCP_PASSWORD) from environment variable or C(~/.dimensiondata).
-      - Required if O(mcp_user) is specified.
+      - If not specified, will fall back to C(MCP_PASSWORD) from environment variable or C(~/.dimensiondata).
+      - Required if I(mcp_user) is specified.
    type: str
  location:
    description:
@@ -44,7 +44,7 @@ options:
    required: true
  validate_certs:
    description:
-      - If V(false), SSL certificates will not be validated.
+      - If C(false), SSL certificates will not be validated.
      - This should only be used on private instances of the CloudControl API that use self-signed certificates.
    type: bool
    default: true
--- a/plugins/doc_fragments/dimensiondata_wait.py
+++ b/plugins/doc_fragments/dimensiondata_wait.py
@@ -25,13 +25,13 @@ options:
  wait_time:
    description:
      - The maximum amount of time (in seconds) to wait for the task to complete.
-      - Only applicable if O(wait=true).
+      - Only applicable if I(wait=true).
    type: int
    default: 600
  wait_poll_interval:
    description:
      - The amount of time (in seconds) to wait between checks for task completion.
-      - Only applicable if O(wait=true).
+      - Only applicable if I(wait=true).
    type: int
    default: 2
    '''
--- a/plugins/doc_fragments/hwc.py
+++ b/plugins/doc_fragments/hwc.py
@@ -51,16 +51,16 @@ options:
        type: str
 notes:
  - For authentication, you can set identity_endpoint using the
-    E(ANSIBLE_HWC_IDENTITY_ENDPOINT) env variable.
+    C(ANSIBLE_HWC_IDENTITY_ENDPOINT) env variable.
  - For authentication, you can set user using the
-    E(ANSIBLE_HWC_USER) env variable.
-  - For authentication, you can set password using the E(ANSIBLE_HWC_PASSWORD) env
+    C(ANSIBLE_HWC_USER) env variable.
+  - For authentication, you can set password using the C(ANSIBLE_HWC_PASSWORD) env
    variable.
-  - For authentication, you can set domain using the E(ANSIBLE_HWC_DOMAIN) env
+  - For authentication, you can set domain using the C(ANSIBLE_HWC_DOMAIN) env
    variable.
-  - For authentication, you can set project using the E(ANSIBLE_HWC_PROJECT) env
+  - For authentication, you can set project using the C(ANSIBLE_HWC_PROJECT) env
    variable.
-  - For authentication, you can set region using the E(ANSIBLE_HWC_REGION) env variable.
+  - For authentication, you can set region using the C(ANSIBLE_HWC_REGION) env variable.
  - Environment variables values will only be used if the playbook values are
    not set.
 '''
--- a/plugins/doc_fragments/influxdb.py
+++ b/plugins/doc_fragments/influxdb.py
@@ -22,14 +22,14 @@ options:
  username:
    description:
    - Username that will be used to authenticate against InfluxDB server.
-    - Alias O(login_username) added in Ansible 2.5.
+    - Alias C(login_username) added in Ansible 2.5.
    type: str
    default: root
    aliases: [ login_username ]
  password:
    description:
    - Password that will be used to authenticate against InfluxDB server.
-    - Alias O(login_password) added in Ansible 2.5.
+    - Alias C(login_password) added in Ansible 2.5.
    type: str
    default: root
    aliases: [ login_password ]
@@ -47,8 +47,8 @@ options:
    version_added: '0.2.0'
  validate_certs:
    description:
-    - If set to V(false), the SSL certificates will not be validated.
-    - This should only set to V(false) used on personally controlled sites using self-signed certificates.
+    - If set to C(false), the SSL certificates will not be validated.
+    - This should only set to C(false) used on personally controlled sites using self-signed certificates.
    type: bool
    default: true
  ssl:
@@ -63,7 +63,7 @@ options:
  retries:
    description:
    - Number of retries client will try before aborting.
-    - V(0) indicates try until success.
+    - C(0) indicates try until success.
    - Only available when using python-influxdb >= 4.1.0
    type: int
    default: 3
--- a/plugins/doc_fragments/ipa.py
+++ b/plugins/doc_fragments/ipa.py
@@ -16,61 +16,61 @@ options:
  ipa_port:
    description:
    - Port of FreeIPA / IPA server.
-    - If the value is not specified in the task, the value of environment variable E(IPA_PORT) will be used instead.
-    - If both the environment variable E(IPA_PORT) and the value are not specified in the task, then default value is set.
+    - If the value is not specified in the task, the value of environment variable C(IPA_PORT) will be used instead.
+    - If both the environment variable C(IPA_PORT) and the value are not specified in the task, then default value is set.
    - Environment variable fallback mechanism is added in Ansible 2.5.
    type: int
    default: 443
  ipa_host:
    description:
    - IP or hostname of IPA server.
-    - If the value is not specified in the task, the value of environment variable E(IPA_HOST) will be used instead.
-    - If both the environment variable E(IPA_HOST) and the value are not specified in the task, then DNS will be used to try to discover the FreeIPA server.
+    - If the value is not specified in the task, the value of environment variable C(IPA_HOST) will be used instead.
+    - If both the environment variable C(IPA_HOST) and the value are not specified in the task, then DNS will be used to try to discover the FreeIPA server.
    - The relevant entry needed in FreeIPA is the 'ipa-ca' entry.
-    - If neither the DNS entry, nor the environment E(IPA_HOST), nor the value are available in the task, then the default value will be used.
+    - If neither the DNS entry, nor the environment C(IPA_HOST), nor the value are available in the task, then the default value will be used.
    - Environment variable fallback mechanism is added in Ansible 2.5.
    type: str
    default: ipa.example.com
  ipa_user:
    description:
    - Administrative account used on IPA server.
-    - If the value is not specified in the task, the value of environment variable E(IPA_USER) will be used instead.
-    - If both the environment variable E(IPA_USER) and the value are not specified in the task, then default value is set.
+    - If the value is not specified in the task, the value of environment variable C(IPA_USER) will be used instead.
+    - If both the environment variable C(IPA_USER) and the value are not specified in the task, then default value is set.
    - Environment variable fallback mechanism is added in Ansible 2.5.
    type: str
    default: admin
  ipa_pass:
    description:
    - Password of administrative user.
-    - If the value is not specified in the task, the value of environment variable E(IPA_PASS) will be used instead.
-    - Note that if the C(urllib_gssapi) library is available, it is possible to use GSSAPI to authenticate to FreeIPA.
-    - If the environment variable E(KRB5CCNAME) is available, the module will use this kerberos credentials cache to authenticate to the FreeIPA server.
-    - If the environment variable E(KRB5_CLIENT_KTNAME) is available, and E(KRB5CCNAME) is not; the module will use this kerberos keytab to authenticate.
-    - If GSSAPI is not available, the usage of O(ipa_pass) is required.
+    - If the value is not specified in the task, the value of environment variable C(IPA_PASS) will be used instead.
+    - Note that if the 'urllib_gssapi' library is available, it is possible to use GSSAPI to authenticate to FreeIPA.
+    - If the environment variable C(KRB5CCNAME) is available, the module will use this kerberos credentials cache to authenticate to the FreeIPA server.
+    - If the environment variable C(KRB5_CLIENT_KTNAME) is available, and C(KRB5CCNAME) is not; the module will use this kerberos keytab to authenticate.
+    - If GSSAPI is not available, the usage of 'ipa_pass' is required.
    - Environment variable fallback mechanism is added in Ansible 2.5.
    type: str
  ipa_prot:
    description:
    - Protocol used by IPA server.
-    - If the value is not specified in the task, the value of environment variable E(IPA_PROT) will be used instead.
-    - If both the environment variable E(IPA_PROT) and the value are not specified in the task, then default value is set.
+    - If the value is not specified in the task, the value of environment variable C(IPA_PROT) will be used instead.
+    - If both the environment variable C(IPA_PROT) and the value are not specified in the task, then default value is set.
    - Environment variable fallback mechanism is added in Ansible 2.5.
    type: str
    choices: [ http, https ]
    default: https
  validate_certs:
    description:
-    - This only applies if O(ipa_prot) is V(https).
-    - If set to V(false), the SSL certificates will not be validated.
-    - This should only set to V(false) used on personally controlled sites using self-signed certificates.
+    - This only applies if C(ipa_prot) is I(https).
+    - If set to C(false), the SSL certificates will not be validated.
+    - This should only set to C(false) used on personally controlled sites using self-signed certificates.
    type: bool
    default: true
  ipa_timeout:
    description:
    - Specifies idle timeout (in seconds) for the connection.
    - For bulk operations, you may want to increase this in order to avoid timeout from IPA server.
-    - If the value is not specified in the task, the value of environment variable E(IPA_TIMEOUT) will be used instead.
-    - If both the environment variable E(IPA_TIMEOUT) and the value are not specified in the task, then default value is set.
+    - If the value is not specified in the task, the value of environment variable C(IPA_TIMEOUT) will be used instead.
+    - If both the environment variable C(IPA_TIMEOUT) and the value are not specified in the task, then default value is set.
    type: int
    default: 10
 '''
--- a/plugins/doc_fragments/keycloak.py
+++ b/plugins/doc_fragments/keycloak.py
@@ -23,7 +23,7 @@ options:

    auth_client_id:
        description:
-            - OpenID Connect C(client_id) to authenticate to the API with.
+            - OpenID Connect I(client_id) to authenticate to the API with.
        type: str
        default: admin-cli

@@ -34,7 +34,7 @@ options:

    auth_client_secret:
        description:
-            - Client Secret to use in conjunction with O(auth_client_id) (if required).
+            - Client Secret to use in conjunction with I(auth_client_id) (if required).
        type: str

    auth_username:
--- a/plugins/doc_fragments/ldap.py
+++ b/plugins/doc_fragments/ldap.py
@@ -21,26 +21,9 @@ options:
    type: str
  bind_pw:
    description:
-      - The password to use with O(bind_dn).
+      - The password to use with I(bind_dn).
    type: str
    default: ''
-  ca_path:
-    description:
-      - Set the path to PEM file with CA certs.
-    type: path
-    version_added: "6.5.0"
-  client_cert:
-    type: path
-    description:
-      - PEM formatted certificate chain file to be used for SSL client authentication.
-      - Required if O(client_key) is defined.
-    version_added: "7.1.0"
-  client_key:
-    type: path
-    description:
-      - PEM formatted file that contains your private key to be used for SSL client authentication.
-      - Required if O(client_cert) is defined.
-    version_added: "7.1.0"
  dn:
    required: true
    description:
@@ -52,12 +35,12 @@ options:
    type: str
    description:
      - Set the referrals chasing behavior.
-      - V(anonymous) follow referrals anonymously. This is the default behavior.
-      - V(disabled) disable referrals chasing. This sets C(OPT_REFERRALS) to off.
+      - C(anonymous) follow referrals anonymously. This is the default behavior.
+      - C(disabled) disable referrals chasing. This sets C(OPT_REFERRALS) to off.
    version_added: 2.0.0
  server_uri:
    description:
-      - The O(server_uri) parameter may be a comma- or whitespace-separated list of URIs containing only the schema, the host, and the port fields.
+      - The I(server_uri) parameter may be a comma- or whitespace-separated list of URIs containing only the schema, the host, and the port fields.
      - The default value lets the underlying LDAP client library look for a UNIX domain socket in its default location.
      - Note that when using multiple URIs you cannot determine to which URI your client gets connected.
      - For URIs containing additional fields, particularly when using commas, behavior is undefined.
@@ -70,13 +53,14 @@ options:
    default: false
  validate_certs:
    description:
-      - If set to V(false), SSL certificates will not be validated.
+      - If set to C(false), SSL certificates will not be validated.
      - This should only be used on sites using self-signed certificates.
    type: bool
    default: true
  sasl_class:
    description:
      - The class to use for SASL authentication.
+      - Possible choices are C(external), C(gssapi).
    type: str
    choices: ['external', 'gssapi']
    default: external
@@ -84,9 +68,10 @@ options:
  xorder_discovery:
    description:
      - Set the behavior on how to process Xordered DNs.
-      - V(enable) will perform a C(ONELEVEL) search below the superior RDN to find the matching DN.
-      - V(disable) will always use the DN unmodified (as passed by the O(dn) parameter).
-      - V(auto) will only perform a search if the first RDN does not contain an index number (C({x})).
+      - C(enable) will perform a C(ONELEVEL) search below the superior RDN to find the matching DN.
+      - C(disable) will always use the DN unmodified (as passed by the I(dn) parameter).
+      - C(auto) will only perform a search if the first RDN does not contain an index number (C({x})).
+      - Possible choices are C(enable), C(auto), C(disable).
    type: str
    choices: ['enable', 'auto', 'disable']
    default: auto
--- a/plugins/doc_fragments/manageiq.py
+++ b/plugins/doc_fragments/manageiq.py
@@ -21,30 +21,30 @@ options:
    suboptions:
      url:
        description:
-          - ManageIQ environment URL. E(MIQ_URL) environment variable if set. Otherwise, it is required to pass it.
+          - ManageIQ environment url. C(MIQ_URL) env var if set. otherwise, it is required to pass it.
        type: str
        required: false
      username:
        description:
-          - ManageIQ username. E(MIQ_USERNAME) environment variable if set. Otherwise, required if no token is passed in.
+          - ManageIQ username. C(MIQ_USERNAME) env var if set. otherwise, required if no token is passed in.
        type: str
      password:
        description:
-          - ManageIQ password. E(MIQ_PASSWORD) environment variable if set. Otherwise, required if no token is passed in.
+          - ManageIQ password. C(MIQ_PASSWORD) env var if set. otherwise, required if no token is passed in.
        type: str
      token:
        description:
-          - ManageIQ token. E(MIQ_TOKEN) environment variable if set. Otherwise, required if no username or password is passed in.
+          - ManageIQ token. C(MIQ_TOKEN) env var if set. otherwise, required if no username or password is passed in.
        type: str
      validate_certs:
        description:
-          - Whether SSL certificates should be verified for HTTPS requests.
+          - Whether SSL certificates should be verified for HTTPS requests. defaults to True.
        type: bool
        default: true
        aliases: [ verify_ssl ]
      ca_cert:
        description:
-          - The path to a CA bundle file or directory with certificates.
+          - The path to a CA bundle file or directory with certificates. defaults to None.
        type: str
        aliases: [ ca_bundle_path ]

--- a/plugins/doc_fragments/online.py
+++ b/plugins/doc_fragments/online.py
@@ -37,9 +37,9 @@ options:
    default: true
 notes:
  - Also see the API documentation on U(https://console.online.net/en/api/)
-  - If O(api_token) is not set within the module, the following
+  - If C(api_token) is not set within the module, the following
    environment variables can be used in decreasing order of precedence
-    E(ONLINE_TOKEN), E(ONLINE_API_KEY), E(ONLINE_OAUTH_TOKEN), E(ONLINE_API_TOKEN).
-  - If one wants to use a different O(api_url) one can also set the E(ONLINE_API_URL)
+    C(ONLINE_TOKEN), C(ONLINE_API_KEY), C(ONLINE_OAUTH_TOKEN), C(ONLINE_API_TOKEN)
+  - If one wants to use a different C(api_url) one can also set the C(ONLINE_API_URL)
    environment variable.
 '''
--- a/plugins/doc_fragments/opennebula.py
+++ b/plugins/doc_fragments/opennebula.py
@@ -15,26 +15,26 @@ options:
    api_url:
        description:
            - The ENDPOINT URL of the XMLRPC server.
-            - If not specified then the value of the E(ONE_URL) environment variable, if any, is used.
+            - If not specified then the value of the ONE_URL environment variable, if any, is used.
        type: str
        aliases:
            - api_endpoint
    api_username:
        description:
            - The name of the user for XMLRPC authentication.
-            - If not specified then the value of the E(ONE_USERNAME) environment variable, if any, is used.
+            - If not specified then the value of the ONE_USERNAME environment variable, if any, is used.
        type: str
    api_password:
        description:
            - The password or token for XMLRPC authentication.
-            - If not specified then the value of the E(ONE_PASSWORD) environment variable, if any, is used.
+            - If not specified then the value of the ONE_PASSWORD environment variable, if any, is used.
        type: str
        aliases:
            - api_token
    validate_certs:
        description:
-            - Whether to validate the TLS/SSL certificates or not.
-            - This parameter is ignored if E(PYTHONHTTPSVERIFY) environment variable is used.
+            - Whether to validate the SSL certificates or not.
+            - This parameter is ignored if PYTHONHTTPSVERIFY environment variable is used.
        type: bool
        default: true
    wait_timeout:
--- a/plugins/doc_fragments/openswitch.py
+++ b/plugins/doc_fragments/openswitch.py
@@ -23,7 +23,7 @@ options:
  port:
    description:
      - Specifies the port to use when building the connection to the remote
-        device.  This value applies to either O(transport=cli) or O(transport=rest).  The port
+        device.  This value applies to either I(cli) or I(rest).  The port
        value will default to the appropriate transport common port if
        none is provided in the task.  (cli=22, http=80, https=443).  Note
        this argument does not affect the SSH transport.
@@ -36,15 +36,15 @@ options:
        either the CLI login or the eAPI authentication depending on which
        transport is used. Note this argument does not affect the SSH
        transport. If the value is not specified in the task, the value of
-        environment variable E(ANSIBLE_NET_USERNAME) will be used instead.
+        environment variable C(ANSIBLE_NET_USERNAME) will be used instead.
    type: str
  password:
    description:
      - Specifies the password to use to authenticate the connection to
-        the remote device.  This is a common argument used for either O(transport=cli)
-        or O(transport=rest).  Note this argument does not affect the SSH
+        the remote device.  This is a common argument used for either I(cli)
+        or I(rest) transports.  Note this argument does not affect the SSH
        transport. If the value is not specified in the task, the value of
-        environment variable E(ANSIBLE_NET_PASSWORD) will be used instead.
+        environment variable C(ANSIBLE_NET_PASSWORD) will be used instead.
    type: str
  timeout:
    description:
@@ -56,9 +56,9 @@ options:
  ssh_keyfile:
    description:
      - Specifies the SSH key to use to authenticate the connection to
-        the remote device.  This argument is only used for O(transport=cli).
-        If the value is not specified in the task, the value of
-        environment variable E(ANSIBLE_NET_SSH_KEYFILE) will be used instead.
+        the remote device.  This argument is only used for the I(cli)
+        transports. If the value is not specified in the task, the value of
+        environment variable C(ANSIBLE_NET_SSH_KEYFILE) will be used instead.
    type: path
  transport:
    description:
@@ -71,14 +71,14 @@ options:
    default: ssh
  use_ssl:
    description:
-      - Configures the O(transport) to use SSL if set to V(true) only when the
-        O(transport) argument is configured as rest.  If the transport
-        argument is not V(rest), this value is ignored.
+      - Configures the I(transport) to use SSL if set to C(true) only when the
+        I(transport) argument is configured as rest.  If the transport
+        argument is not I(rest), this value is ignored.
    type: bool
    default: true
  provider:
    description:
-      - Convenience method that allows all C(openswitch) arguments to be passed as
+      - Convenience method that allows all I(openswitch) arguments to be passed as
        a dict object.  All constraints (required, choices, etc) must be
        met either by individual arguments or values in this dict.
    type: dict
--- a/plugins/doc_fragments/oracle.py
+++ b/plugins/doc_fragments/oracle.py
@@ -18,28 +18,28 @@ class ModuleDocFragment(object):
    options:
        config_file_location:
            description:
-                - Path to configuration file. If not set then the value of the E(OCI_CONFIG_FILE) environment variable,
+                - Path to configuration file. If not set then the value of the OCI_CONFIG_FILE environment variable,
                  if any, is used. Otherwise, defaults to ~/.oci/config.
            type: str
        config_profile_name:
            description:
-                - The profile to load from the config file referenced by O(config_file_location). If not set, then the
-                  value of the E(OCI_CONFIG_PROFILE) environment variable, if any, is used. Otherwise, defaults to the
-                  "DEFAULT" profile in O(config_file_location).
+                - The profile to load from the config file referenced by C(config_file_location). If not set, then the
+                  value of the OCI_CONFIG_PROFILE environment variable, if any, is used. Otherwise, defaults to the
+                  "DEFAULT" profile in C(config_file_location).
            default: "DEFAULT"
            type: str
        api_user:
            description:
                - The OCID of the user, on whose behalf, OCI APIs are invoked. If not set, then the
-                  value of the E(OCI_USER_OCID) environment variable, if any, is used. This option is required if the user
-                  is not specified through a configuration file (See O(config_file_location)). To get the user's OCID,
+                  value of the OCI_USER_OCID environment variable, if any, is used. This option is required if the user
+                  is not specified through a configuration file (See C(config_file_location)). To get the user's OCID,
                  please refer U(https://docs.us-phoenix-1.oraclecloud.com/Content/API/Concepts/apisigningkey.htm).
            type: str
        api_user_fingerprint:
            description:
-                - Fingerprint for the key pair being used. If not set, then the value of the E(OCI_USER_FINGERPRINT)
+                - Fingerprint for the key pair being used. If not set, then the value of the OCI_USER_FINGERPRINT
                  environment variable, if any, is used. This option is required if the key fingerprint is not
-                  specified through a configuration file (See O(config_file_location)). To get the key pair's
+                  specified through a configuration file (See C(config_file_location)). To get the key pair's
                  fingerprint value please refer
                  U(https://docs.us-phoenix-1.oraclecloud.com/Content/API/Concepts/apisigningkey.htm).
            type: str
@@ -47,21 +47,21 @@ class ModuleDocFragment(object):
            description:
                - Full path and filename of the private key (in PEM format). If not set, then the value of the
                  OCI_USER_KEY_FILE variable, if any, is used. This option is required if the private key is
-                  not specified through a configuration file (See O(config_file_location)). If the key is encrypted
-                  with a pass-phrase, the O(api_user_key_pass_phrase) option must also be provided.
+                  not specified through a configuration file (See C(config_file_location)). If the key is encrypted
+                  with a pass-phrase, the C(api_user_key_pass_phrase) option must also be provided.
            type: path
        api_user_key_pass_phrase:
            description:
-                - Passphrase used by the key referenced in O(api_user_key_file), if it is encrypted. If not set, then
+                - Passphrase used by the key referenced in C(api_user_key_file), if it is encrypted. If not set, then
                  the value of the OCI_USER_KEY_PASS_PHRASE variable, if any, is used. This option is required if the
-                  key passphrase is not specified through a configuration file (See O(config_file_location)).
+                  key passphrase is not specified through a configuration file (See C(config_file_location)).
            type: str
        auth_type:
            description:
-                - The type of authentication to use for making API requests. By default O(auth_type=api_key) based
-                  authentication is performed and the API key (see O(api_user_key_file)) in your config file will be
+                - The type of authentication to use for making API requests. By default C(auth_type="api_key") based
+                  authentication is performed and the API key (see I(api_user_key_file)) in your config file will be
                  used. If this 'auth_type' module option is not specified, the value of the OCI_ANSIBLE_AUTH_TYPE,
-                  if any, is used. Use O(auth_type=instance_principal) to use instance principal based authentication
+                  if any, is used. Use C(auth_type="instance_principal") to use instance principal based authentication
                  when running ansible playbooks within an OCI compute instance.
            choices: ['api_key', 'instance_principal']
            default: 'api_key'
@@ -70,14 +70,14 @@ class ModuleDocFragment(object):
            description:
                - OCID of your tenancy. If not set, then the value of the OCI_TENANCY variable, if any, is
                  used. This option is required if the tenancy OCID is not specified through a configuration file
-                  (See O(config_file_location)). To get the tenancy OCID, please refer
+                  (See C(config_file_location)). To get the tenancy OCID, please refer
                  U(https://docs.us-phoenix-1.oraclecloud.com/Content/API/Concepts/apisigningkey.htm)
            type: str
        region:
            description:
                - The Oracle Cloud Infrastructure region to use for all OCI API requests. If not set, then the
                  value of the OCI_REGION variable, if any, is used. This option is required if the region is
-                  not specified through a configuration file (See O(config_file_location)). Please refer to
+                  not specified through a configuration file (See C(config_file_location)). Please refer to
                  U(https://docs.us-phoenix-1.oraclecloud.com/Content/General/Concepts/regions.htm) for more information
                  on OCI regions.
            type: str
--- a/plugins/doc_fragments/oracle_creatable_resource.py
+++ b/plugins/doc_fragments/oracle_creatable_resource.py
@@ -14,13 +14,13 @@ class ModuleDocFragment(object):
            description: Whether to attempt non-idempotent creation of a resource. By default, create resource is an
                         idempotent operation, and doesn't create the resource if it already exists. Setting this option
                         to true, forcefully creates a copy of the resource, even if it already exists.This option is
-                         mutually exclusive with O(key_by).
+                         mutually exclusive with I(key_by).
            default: false
            type: bool
        key_by:
            description: The list of comma-separated attributes of this resource which should be used to uniquely
                         identify an instance of the resource. By default, all the attributes of a resource except
-                         O(freeform_tags) are used to uniquely identify a resource.
+                         I(freeform_tags) are used to uniquely identify a resource.
            type: list
            elements: str
    """
--- a/plugins/doc_fragments/oracle_display_name_option.py
+++ b/plugins/doc_fragments/oracle_display_name_option.py
@@ -11,7 +11,7 @@ class ModuleDocFragment(object):
    DOCUMENTATION = """
    options:
        display_name:
-            description: Use O(display_name) along with the other options to return only resources that match the given
+            description: Use I(display_name) along with the other options to return only resources that match the given
                         display name exactly.
            type: str
    """
--- a/plugins/doc_fragments/oracle_name_option.py
+++ b/plugins/doc_fragments/oracle_name_option.py
@@ -11,7 +11,7 @@ class ModuleDocFragment(object):
    DOCUMENTATION = """
    options:
        name:
-            description: Use O(name) along with the other options to return only resources that match the given name
+            description: Use I(name) along with the other options to return only resources that match the given name
                         exactly.
            type: str
    """
--- a/plugins/doc_fragments/oracle_wait_options.py
+++ b/plugins/doc_fragments/oracle_wait_options.py
@@ -15,12 +15,12 @@ class ModuleDocFragment(object):
            default: true
            type: bool
        wait_timeout:
-            description: Time, in seconds, to wait when O(wait=true).
+            description: Time, in seconds, to wait when I(wait=true).
            default: 1200
            type: int
        wait_until:
-            description: The lifecycle state to wait for the resource to transition into when O(wait=true). By default,
-                         when O(wait=true), we wait for the resource to get into ACTIVE/ATTACHED/AVAILABLE/PROVISIONED/
+            description: The lifecycle state to wait for the resource to transition into when I(wait=true). By default,
+                         when I(wait=true), we wait for the resource to get into ACTIVE/ATTACHED/AVAILABLE/PROVISIONED/
                         RUNNING applicable lifecycle state during create operation & to get into DELETED/DETACHED/
                         TERMINATED lifecycle state during delete operation.
            type: str
--- a/plugins/doc_fragments/pritunl.py
+++ b/plugins/doc_fragments/pritunl.py
@@ -38,7 +38,7 @@ options:
        default: true
        description:
        - If certificates should be validated or not.
-        - This should never be set to V(false), except if you are very sure that
+        - This should never be set to C(false), except if you are very sure that
          your connection to the server can not be subject to a Man In The Middle
          attack.
 """
--- a/plugins/doc_fragments/proxmox.py
+++ b/plugins/doc_fragments/proxmox.py
@@ -24,23 +24,21 @@ options:
  api_password:
    description:
      - Specify the password to authenticate with.
-      - You can use E(PROXMOX_PASSWORD) environment variable.
+      - You can use C(PROXMOX_PASSWORD) environment variable.
    type: str
  api_token_id:
    description:
      - Specify the token ID.
-      - Requires C(proxmoxer>=1.1.0) to work.
    type: str
    version_added: 1.3.0
  api_token_secret:
    description:
      - Specify the token secret.
-      - Requires C(proxmoxer>=1.1.0) to work.
    type: str
    version_added: 1.3.0
  validate_certs:
    description:
-      - If V(false), SSL certificates will not be validated.
+      - If C(false), SSL certificates will not be validated.
      - This should only be used on personally controlled sites using self-signed certificates.
    type: bool
    default: false
@@ -57,7 +55,7 @@ options:
  node:
    description:
      - Proxmox VE node on which to operate.
-      - Only required for O(state=present).
+      - Only required for I(state=present).
      - For every other states it will be autodiscovered.
    type: str
  pool:
--- a/plugins/doc_fragments/purestorage.py
+++ b/plugins/doc_fragments/purestorage.py
@@ -33,8 +33,8 @@ options:
    type: str
 notes:
  - This module requires the C(purity_fb) Python library
-  - You must set E(PUREFB_URL) and E(PUREFB_API) environment variables
-    if O(fb_url) and O(api_token) arguments are not passed to the module directly
+  - You must set C(PUREFB_URL) and C(PUREFB_API) environment variables
+    if I(fb_url) and I(api_token) arguments are not passed to the module directly
 requirements:
  - python >= 2.7
  - purity_fb >= 1.1
@@ -55,8 +55,8 @@ options:
    required: true
 notes:
  - This module requires the C(purestorage) Python library
-  - You must set E(PUREFA_URL) and E(PUREFA_API) environment variables
-    if O(fa_url) and O(api_token) arguments are not passed to the module directly
+  - You must set C(PUREFA_URL) and C(PUREFA_API) environment variables
+    if I(fa_url) and I(api_token) arguments are not passed to the module directly
 requirements:
  - python >= 2.7
  - purestorage
--- a/plugins/doc_fragments/rackspace.py
+++ b/plugins/doc_fragments/rackspace.py
@@ -15,18 +15,18 @@ class ModuleDocFragment(object):
 options:
  api_key:
    description:
-      - Rackspace API key, overrides O(credentials).
+      - Rackspace API key, overrides I(credentials).
    type: str
    aliases: [ password ]
  credentials:
    description:
-      - File to find the Rackspace credentials in. Ignored if O(api_key) and
-        O(username) are provided.
+      - File to find the Rackspace credentials in. Ignored if I(api_key) and
+        I(username) are provided.
    type: path
    aliases: [ creds_file ]
  env:
    description:
-      - Environment as configured in C(~/.pyrax.cfg),
+      - Environment as configured in I(~/.pyrax.cfg),
        see U(https://github.com/rackspace/pyrax/blob/master/docs/getting_started.md#pyrax-configuration).
    type: str
  region:
@@ -35,7 +35,7 @@ options:
    type: str
  username:
    description:
-      - Rackspace username, overrides O(credentials).
+      - Rackspace username, overrides I(credentials).
    type: str
  validate_certs:
    description:
@@ -46,12 +46,12 @@ requirements:
  - python >= 2.6
  - pyrax
 notes:
-  - The following environment variables can be used, E(RAX_USERNAME),
-    E(RAX_API_KEY), E(RAX_CREDS_FILE), E(RAX_CREDENTIALS), E(RAX_REGION).
-  - E(RAX_CREDENTIALS) and E(RAX_CREDS_FILE) point to a credentials file
+  - The following environment variables can be used, C(RAX_USERNAME),
+    C(RAX_API_KEY), C(RAX_CREDS_FILE), C(RAX_CREDENTIALS), C(RAX_REGION).
+  - C(RAX_CREDENTIALS) and C(RAX_CREDS_FILE) points to a credentials file
    appropriate for pyrax. See U(https://github.com/rackspace/pyrax/blob/master/docs/getting_started.md#authenticating)
-  - E(RAX_USERNAME) and E(RAX_API_KEY) obviate the use of a credentials file
-  - E(RAX_REGION) defines a Rackspace Public Cloud region (DFW, ORD, LON, ...)
+  - C(RAX_USERNAME) and C(RAX_API_KEY) obviate the use of a credentials file
+  - C(RAX_REGION) defines a Rackspace Public Cloud region (DFW, ORD, LON, ...)
 '''

    # Documentation fragment including attributes to enable communication
@@ -61,7 +61,7 @@ options:
  api_key:
    type: str
    description:
-      - Rackspace API key, overrides O(credentials).
+      - Rackspace API key, overrides I(credentials).
    aliases: [ password ]
  auth_endpoint:
    type: str
@@ -71,13 +71,13 @@ options:
  credentials:
    type: path
    description:
-      - File to find the Rackspace credentials in. Ignored if O(api_key) and
-        O(username) are provided.
+      - File to find the Rackspace credentials in. Ignored if I(api_key) and
+        I(username) are provided.
    aliases: [ creds_file ]
  env:
    type: str
    description:
-      - Environment as configured in C(~/.pyrax.cfg),
+      - Environment as configured in I(~/.pyrax.cfg),
        see U(https://github.com/rackspace/pyrax/blob/master/docs/getting_started.md#pyrax-configuration).
  identity_type:
    type: str
@@ -99,24 +99,20 @@ options:
  username:
    type: str
    description:
-      - Rackspace username, overrides O(credentials).
+      - Rackspace username, overrides I(credentials).
  validate_certs:
    description:
      - Whether or not to require SSL validation of API endpoints.
    type: bool
    aliases: [ verify_ssl ]
-deprecated:
-  removed_in: 9.0.0
-  why: This module relies on the deprecated package pyrax.
-  alternative: Use the Openstack modules instead.
 requirements:
  - python >= 2.6
  - pyrax
 notes:
-  - The following environment variables can be used, E(RAX_USERNAME),
-    E(RAX_API_KEY), E(RAX_CREDS_FILE), E(RAX_CREDENTIALS), E(RAX_REGION).
-  - E(RAX_CREDENTIALS) and E(RAX_CREDS_FILE) points to a credentials file
+  - The following environment variables can be used, C(RAX_USERNAME),
+    C(RAX_API_KEY), C(RAX_CREDS_FILE), C(RAX_CREDENTIALS), C(RAX_REGION).
+  - C(RAX_CREDENTIALS) and C(RAX_CREDS_FILE) points to a credentials file
    appropriate for pyrax. See U(https://github.com/rackspace/pyrax/blob/master/docs/getting_started.md#authenticating)
-  - E(RAX_USERNAME) and E(RAX_API_KEY) obviate the use of a credentials file
-  - E(RAX_REGION) defines a Rackspace Public Cloud region (DFW, ORD, LON, ...)
+  - C(RAX_USERNAME) and C(RAX_API_KEY) obviate the use of a credentials file
+  - C(RAX_REGION) defines a Rackspace Public Cloud region (DFW, ORD, LON, ...)
 '''
--- a/plugins/doc_fragments/redis.py
+++ b/plugins/doc_fragments/redis.py
@@ -46,8 +46,8 @@ options:
    default: true
  ca_certs:
    description:
-      - Path to root certificates file. If not set and O(tls) is
-        set to V(true), certifi ca-certificates will be used.
+      - Path to root certificates file. If not set and I(tls) is
+        set to C(true), certifi ca-certificates will be used.
    type: str
 requirements: [ "redis", "certifi" ]

--- a/plugins/doc_fragments/scaleway.py
+++ b/plugins/doc_fragments/scaleway.py
@@ -43,9 +43,9 @@ options:
    default: true
 notes:
  - Also see the API documentation on U(https://developer.scaleway.com/)
-  - If O(api_token) is not set within the module, the following
+  - If C(api_token) is not set within the module, the following
    environment variables can be used in decreasing order of precedence
-    E(SCW_TOKEN), E(SCW_API_KEY), E(SCW_OAUTH_TOKEN) or E(SCW_API_TOKEN).
-  - If one wants to use a different O(api_url) one can also set the E(SCW_API_URL)
+    C(SCW_TOKEN), C(SCW_API_KEY), C(SCW_OAUTH_TOKEN) or C(SCW_API_TOKEN).
+  - If one wants to use a different C(api_url) one can also set the C(SCW_API_URL)
    environment variable.
 '''
--- a/plugins/doc_fragments/utm.py
+++ b/plugins/doc_fragments/utm.py
@@ -48,8 +48,8 @@ options:
    state:
        description:
          - The desired state of the object.
-          - V(present) will create or update an object
-          - V(absent) will delete an object if it was present
+          - C(present) will create or update an object
+          - C(absent) will delete an object if it was present
        type: str
        choices: [ absent, present ]
        default: present
--- a/plugins/doc_fragments/vexata.py
+++ b/plugins/doc_fragments/vexata.py
@@ -39,8 +39,8 @@ options:
    type: str
  validate_certs:
    description:
-      - Allows connection when SSL certificates are not valid. Set to V(false) when certificates are not trusted.
-      - If set to V(true), please make sure Python >= 2.7.9 is installed on the given machine.
+      - Allows connection when SSL certificates are not valid. Set to C(false) when certificates are not trusted.
+      - If set to C(true), please make sure Python >= 2.7.9 is installed on the given machine.
    required: false
    type: bool
    default: false
--- a/plugins/doc_fragments/xenserver.py
+++ b/plugins/doc_fragments/xenserver.py
@@ -15,27 +15,27 @@ options:
  hostname:
    description:
    - The hostname or IP address of the XenServer host or XenServer pool master.
-    - If the value is not specified in the task, the value of environment variable E(XENSERVER_HOST) will be used instead.
+    - If the value is not specified in the task, the value of environment variable C(XENSERVER_HOST) will be used instead.
    type: str
    default: localhost
    aliases: [ host, pool ]
  username:
    description:
    - The username to use for connecting to XenServer.
-    - If the value is not specified in the task, the value of environment variable E(XENSERVER_USER) will be used instead.
+    - If the value is not specified in the task, the value of environment variable C(XENSERVER_USER) will be used instead.
    type: str
    default: root
    aliases: [ admin, user ]
  password:
    description:
    - The password to use for connecting to XenServer.
-    - If the value is not specified in the task, the value of environment variable E(XENSERVER_PASSWORD) will be used instead.
+    - If the value is not specified in the task, the value of environment variable C(XENSERVER_PASSWORD) will be used instead.
    type: str
    aliases: [ pass, pwd ]
  validate_certs:
    description:
-    - Allows connection when SSL certificates are not valid. Set to V(false) when certificates are not trusted.
-    - If the value is not specified in the task, the value of environment variable E(XENSERVER_VALIDATE_CERTS) will be used instead.
+    - Allows connection when SSL certificates are not valid. Set to C(false) when certificates are not trusted.
+    - If the value is not specified in the task, the value of environment variable C(XENSERVER_VALIDATE_CERTS) will be used instead.
    type: bool
    default: true
 '''
--- a/plugins/filter/from_csv.py
+++ b/plugins/filter/from_csv.py
@@ -23,7 +23,7 @@ DOCUMENTATION = '''
    dialect:
      description:
        - The CSV dialect to use when parsing the CSV file.
-        - Possible values include V(excel), V(excel-tab) or V(unix).
+        - Possible values include C(excel), C(excel-tab) or C(unix).
      type: str
      default: excel
    fieldnames:
@@ -35,19 +35,19 @@ DOCUMENTATION = '''
    delimiter:
      description:
        - A one-character string used to separate fields.
-        - When using this parameter, you change the default value used by O(dialect).
+        - When using this parameter, you change the default value used by I(dialect).
        - The default value depends on the dialect used.
      type: str
    skipinitialspace:
      description:
        - Whether to ignore any whitespaces immediately following the delimiter.
-        - When using this parameter, you change the default value used by O(dialect).
+        - When using this parameter, you change the default value used by I(dialect).
        - The default value depends on the dialect used.
      type: bool
    strict:
      description:
        - Whether to raise an exception on bad CSV input.
-        - When using this parameter, you change the default value used by O(dialect).
+        - When using this parameter, you change the default value used by I(dialect).
        - The default value depends on the dialect used.
      type: bool
 '''
--- a/plugins/filter/jc.py
+++ b/plugins/filter/jc.py
@@ -25,17 +25,17 @@ DOCUMENTATION = '''
    parser:
      description:
        - The correct parser for the input data.
-        - For example V(ifconfig).
+        - For example C(ifconfig).
        - "Note: use underscores instead of dashes (if any) in the parser module name."
        - See U(https://github.com/kellyjonbrazil/jc#parsers) for the latest list of parsers.
      type: string
      required: true
    quiet:
-      description: Set to V(false) to not suppress warnings.
+      description: Set to C(false) to not suppress warnings.
      type: boolean
      default: true
    raw:
-      description: Set to V(true) to return pre-processed JSON.
+      description: Set to C(true) to return pre-processed JSON.
      type: boolean
      default: false
  requirements:
--- a/plugins/filter/lists_mergeby.py
+++ b/plugins/filter/lists_mergeby.py
@@ -12,9 +12,9 @@ DOCUMENTATION = '''
  version_added: 2.0.0
  author: Vladimir Botka (@vbotka)
  description:
-    - Merge two or more lists by attribute O(index). Optional parameters O(recursive) and O(list_merge)
+    - Merge two or more lists by attribute I(index). Optional parameters 'recursive' and 'list_merge'
      control the merging of the lists in values. The function merge_hash from ansible.utils.vars
-      is used. To learn details on how to use the parameters O(recursive) and O(list_merge) see
+      is used. To learn details on how to use the parameters 'recursive' and 'list_merge' see
      Ansible User's Guide chapter "Using filters to manipulate data" section "Combining
      hashes/dictionaries".
  positional: another_list, index
--- a/plugins/filter/to_days.yml
+++ b/plugins/filter/to_days.yml
@@ -13,12 +13,12 @@ DOCUMENTATION:
    _input:
      description:
        - The time string to convert.
-        - Can use the units V(y) and V(year) for a year, V(mo) and V(month) for a month, V(w) and V(week) for a week,
-          V(d) and V(day) for a day, V(h) and V(hour) for a hour, V(m), V(min) and V(minute) for minutes, V(s), V(sec)
-          and V(second) for seconds, V(ms), V(msec), V(msecond) and V(millisecond) for milliseconds. The suffix V(s)
-          can be added to a unit as well, so V(seconds) is the same as V(second).
+        - Can use the units C(y) and C(year) for a year, C(mo) and C(month) for a month, C(w) and C(week) for a week,
+          C(d) and C(day) for a day, C(h) and C(hour) for a hour, C(m), C(min) and C(minute) for minutes, C(s), C(sec)
+          and C(second) for seconds, C(ms), C(msec), C(msecond) and C(millisecond) for milliseconds. The suffix C(s)
+          can be added to a unit as well, so C(seconds) is the same as C(second).
        - Valid strings are space separated combinations of an integer with an optional minus sign and a unit.
-        - Examples are V(1h), V(-5m), and V(3h -5m 6s).
+        - Examples are C(1h), C(-5m), and C(3h -5m 6s).
      type: string
      required: true
    year:
--- a/plugins/filter/to_hours.yml
+++ b/plugins/filter/to_hours.yml
@@ -13,12 +13,12 @@ DOCUMENTATION:
    _input:
      description:
        - The time string to convert.
-        - Can use the units V(y) and V(year) for a year, V(mo) and V(month) for a month, V(w) and V(week) for a week,
-          V(d) and V(day) for a day, V(h) and V(hour) for a hour, V(m), V(min) and V(minute) for minutes, V(s), V(sec)
-          and V(second) for seconds, V(ms), V(msec), V(msecond) and V(millisecond) for milliseconds. The suffix V(s)
-          can be added to a unit as well, so V(seconds) is the same as V(second).
+        - Can use the units C(y) and C(year) for a year, C(mo) and C(month) for a month, C(w) and C(week) for a week,
+          C(d) and C(day) for a day, C(h) and C(hour) for a hour, C(m), C(min) and C(minute) for minutes, C(s), C(sec)
+          and C(second) for seconds, C(ms), C(msec), C(msecond) and C(millisecond) for milliseconds. The suffix C(s)
+          can be added to a unit as well, so C(seconds) is the same as C(second).
        - Valid strings are space separated combinations of an integer with an optional minus sign and a unit.
-        - Examples are V(1h), V(-5m), and V(3h -5m 6s).
+        - Examples are C(1h), C(-5m), and C(3h -5m 6s).
      type: string
      required: true
    year:
--- a/plugins/filter/to_milliseconds.yml
+++ b/plugins/filter/to_milliseconds.yml
@@ -13,12 +13,12 @@ DOCUMENTATION:
    _input:
      description:
        - The time string to convert.
-        - Can use the units V(y) and V(year) for a year, V(mo) and V(month) for a month, V(w) and V(week) for a week,
-          V(d) and V(day) for a day, V(h) and V(hour) for a hour, V(m), V(min) and V(minute) for minutes, V(s), V(sec)
-          and V(second) for seconds, V(ms), V(msec), V(msecond) and V(millisecond) for milliseconds. The suffix V(s)
-          can be added to a unit as well, so V(seconds) is the same as V(second).
+        - Can use the units C(y) and C(year) for a year, C(mo) and C(month) for a month, C(w) and C(week) for a week,
+          C(d) and C(day) for a day, C(h) and C(hour) for a hour, C(m), C(min) and C(minute) for minutes, C(s), C(sec)
+          and C(second) for seconds, C(ms), C(msec), C(msecond) and C(millisecond) for milliseconds. The suffix C(s)
+          can be added to a unit as well, so C(seconds) is the same as C(second).
        - Valid strings are space separated combinations of an integer with an optional minus sign and a unit.
-        - Examples are V(1h), V(-5m), and V(3h -5m 6s).
+        - Examples are C(1h), C(-5m), and C(3h -5m 6s).
      type: string
      required: true
    year:
--- a/plugins/filter/to_minutes.yml
+++ b/plugins/filter/to_minutes.yml
@@ -13,12 +13,12 @@ DOCUMENTATION:
    _input:
      description:
        - The time string to convert.
-        - Can use the units V(y) and V(year) for a year, V(mo) and V(month) for a month, V(w) and V(week) for a week,
-          V(d) and V(day) for a day, V(h) and V(hour) for a hour, V(m), V(min) and V(minute) for minutes, V(s), V(sec)
-          and V(second) for seconds, V(ms), V(msec), V(msecond) and V(millisecond) for milliseconds. The suffix V(s)
-          can be added to a unit as well, so V(seconds) is the same as V(second).
+        - Can use the units C(y) and C(year) for a year, C(mo) and C(month) for a month, C(w) and C(week) for a week,
+          C(d) and C(day) for a day, C(h) and C(hour) for a hour, C(m), C(min) and C(minute) for minutes, C(s), C(sec)
+          and C(second) for seconds, C(ms), C(msec), C(msecond) and C(millisecond) for milliseconds. The suffix C(s)
+          can be added to a unit as well, so C(seconds) is the same as C(second).
        - Valid strings are space separated combinations of an integer with an optional minus sign and a unit.
-        - Examples are V(1h), V(-5m), and V(3h -5m 6s).
+        - Examples are C(1h), C(-5m), and C(3h -5m 6s).
      type: string
      required: true
    year:
--- a/plugins/filter/to_months.yml
+++ b/plugins/filter/to_months.yml
@@ -13,12 +13,12 @@ DOCUMENTATION:
    _input:
      description:
        - The time string to convert.
-        - Can use the units V(y) and V(year) for a year, V(mo) and V(month) for a month, V(w) and V(week) for a week,
-          V(d) and V(day) for a day, V(h) and V(hour) for a hour, V(m), V(min) and V(minute) for minutes, V(s), V(sec)
-          and V(second) for seconds, V(ms), V(msec), V(msecond) and V(millisecond) for milliseconds. The suffix V(s)
-          can be added to a unit as well, so V(seconds) is the same as V(second).
+        - Can use the units C(y) and C(year) for a year, C(mo) and C(month) for a month, C(w) and C(week) for a week,
+          C(d) and C(day) for a day, C(h) and C(hour) for a hour, C(m), C(min) and C(minute) for minutes, C(s), C(sec)
+          and C(second) for seconds, C(ms), C(msec), C(msecond) and C(millisecond) for milliseconds. The suffix C(s)
+          can be added to a unit as well, so C(seconds) is the same as C(second).
        - Valid strings are space separated combinations of an integer with an optional minus sign and a unit.
-        - Examples are V(1h), V(-5m), and V(3h -5m 6s).
+        - Examples are C(1h), C(-5m), and C(3h -5m 6s).
      type: string
      required: true
    year:
--- a/plugins/filter/to_seconds.yml
+++ b/plugins/filter/to_seconds.yml
@@ -13,12 +13,12 @@ DOCUMENTATION:
    _input:
      description:
        - The time string to convert.
-        - Can use the units V(y) and V(year) for a year, V(mo) and V(month) for a month, V(w) and V(week) for a week,
-          V(d) and V(day) for a day, V(h) and V(hour) for a hour, V(m), V(min) and V(minute) for minutes, V(s), V(sec)
-          and V(second) for seconds, V(ms), V(msec), V(msecond) and V(millisecond) for milliseconds. The suffix V(s)
-          can be added to a unit as well, so V(seconds) is the same as V(second).
+        - Can use the units C(y) and C(year) for a year, C(mo) and C(month) for a month, C(w) and C(week) for a week,
+          C(d) and C(day) for a day, C(h) and C(hour) for a hour, C(m), C(min) and C(minute) for minutes, C(s), C(sec)
+          and C(second) for seconds, C(ms), C(msec), C(msecond) and C(millisecond) for milliseconds. The suffix C(s)
+          can be added to a unit as well, so C(seconds) is the same as C(second).
        - Valid strings are space separated combinations of an integer with an optional minus sign and a unit.
-        - Examples are V(1h), V(-5m), and V(3h -5m 6s).
+        - Examples are C(1h), C(-5m), and C(3h -5m 6s).
      type: string
      required: true
    year:
--- a/plugins/filter/to_time_unit.yml
+++ b/plugins/filter/to_time_unit.yml
@@ -14,12 +14,12 @@ DOCUMENTATION:
    _input:
      description:
        - The time string to convert.
-        - Can use the units V(y) and V(year) for a year, V(mo) and V(month) for a month, V(w) and V(week) for a week,
-          V(d) and V(day) for a day, V(h) and V(hour) for a hour, V(m), V(min) and V(minute) for minutes, V(s), V(sec)
-          and V(second) for seconds, V(ms), V(msec), V(msecond) and V(millisecond) for milliseconds. The suffix V(s)
-          can be added to a unit as well, so V(seconds) is the same as V(second).
+        - Can use the units C(y) and C(year) for a year, C(mo) and C(month) for a month, C(w) and C(week) for a week,
+          C(d) and C(day) for a day, C(h) and C(hour) for a hour, C(m), C(min) and C(minute) for minutes, C(s), C(sec)
+          and C(second) for seconds, C(ms), C(msec), C(msecond) and C(millisecond) for milliseconds. The suffix C(s)
+          can be added to a unit as well, so C(seconds) is the same as C(second).
        - Valid strings are space separated combinations of an integer with an optional minus sign and a unit.
-        - Examples are V(1h), V(-5m), and V(3h -5m 6s).
+        - Examples are C(1h), C(-5m), and C(3h -5m 6s).
      type: string
      required: true
    unit:
--- a/plugins/filter/to_weeks.yml
+++ b/plugins/filter/to_weeks.yml
@@ -13,12 +13,12 @@ DOCUMENTATION:
    _input:
      description:
        - The time string to convert.
-        - Can use the units V(y) and V(year) for a year, V(mo) and V(month) for a month, V(w) and V(week) for a week,
-          V(d) and V(day) for a day, V(h) and V(hour) for a hour, V(m), V(min) and V(minute) for minutes, V(s), V(sec)
-          and V(second) for seconds, V(ms), V(msec), V(msecond) and V(millisecond) for milliseconds. The suffix V(s)
-          can be added to a unit as well, so V(seconds) is the same as V(second).
+        - Can use the units C(y) and C(year) for a year, C(mo) and C(month) for a month, C(w) and C(week) for a week,
+          C(d) and C(day) for a day, C(h) and C(hour) for a hour, C(m), C(min) and C(minute) for minutes, C(s), C(sec)
+          and C(second) for seconds, C(ms), C(msec), C(msecond) and C(millisecond) for milliseconds. The suffix C(s)
+          can be added to a unit as well, so C(seconds) is the same as C(second).
        - Valid strings are space separated combinations of an integer with an optional minus sign and a unit.
-        - Examples are V(1h), V(-5m), and V(3h -5m 6s).
+        - Examples are C(1h), C(-5m), and C(3h -5m 6s).
      type: string
      required: true
    year:
--- a/plugins/filter/to_years.yml
+++ b/plugins/filter/to_years.yml
@@ -13,12 +13,12 @@ DOCUMENTATION:
    _input:
      description:
        - The time string to convert.
-        - Can use the units V(y) and V(year) for a year, V(mo) and V(month) for a month, V(w) and V(week) for a week,
-          V(d) and V(day) for a day, V(h) and V(hour) for a hour, V(m), V(min) and V(minute) for minutes, V(s), V(sec)
-          and V(second) for seconds, V(ms), V(msec), V(msecond) and V(millisecond) for milliseconds. The suffix V(s)
-          can be added to a unit as well, so V(seconds) is the same as V(second).
+        - Can use the units C(y) and C(year) for a year, C(mo) and C(month) for a month, C(w) and C(week) for a week,
+          C(d) and C(day) for a day, C(h) and C(hour) for a hour, C(m), C(min) and C(minute) for minutes, C(s), C(sec)
+          and C(second) for seconds, C(ms), C(msec), C(msecond) and C(millisecond) for milliseconds. The suffix C(s)
+          can be added to a unit as well, so C(seconds) is the same as C(second).
        - Valid strings are space separated combinations of an integer with an optional minus sign and a unit.
-        - Examples are V(1h), V(-5m), and V(3h -5m 6s).
+        - Examples are C(1h), C(-5m), and C(3h -5m 6s).
      type: string
      required: true
    year:
--- a/plugins/inventory/cobbler.py
+++ b/plugins/inventory/cobbler.py
@@ -13,14 +13,12 @@ DOCUMENTATION = '''
    version_added: 1.0.0
    description:
        - Get inventory hosts from the cobbler service.
-        - "Uses a configuration file as an inventory source, it must end in C(.cobbler.yml) or C(.cobbler.yaml) and have a C(plugin: cobbler) entry."
-        - Adds the primary IP addresses to C(cobbler_ipv4_address) and C(cobbler_ipv6_address) host variables if defined in Cobbler.  The primary IP address is
-          defined as the management interface if defined, or the interface who's DNS name matches the hostname of the system, or else the first interface found.
+        - "Uses a configuration file as an inventory source, it must end in C(.cobbler.yml) or C(.cobbler.yaml) and has a C(plugin: cobbler) entry."
    extends_documentation_fragment:
        - inventory_cache
    options:
      plugin:
-        description: The name of this plugin, it should always be set to V(community.general.cobbler) for this plugin to recognize it as it's own.
+        description: The name of this plugin, it should always be set to C(community.general.cobbler) for this plugin to recognize it as it's own.
        required: true
        choices: [ 'cobbler', 'community.general.cobbler' ]
      url:
@@ -34,18 +32,18 @@ DOCUMENTATION = '''
        env:
            - name: COBBLER_USER
      password:
-        description: Cobbler authentication password.
+        description: Cobbler authentication password
        required: false
        env:
            - name: COBBLER_PASSWORD
      cache_fallback:
-        description: Fallback to cached results if connection to cobbler fails.
+        description: Fallback to cached results if connection to cobbler fails
        type: boolean
        default: false
      exclude_profiles:
        description:
          - Profiles to exclude from inventory.
-          - Ignored if O(include_profiles) is specified.
+          - Ignored if I(include_profiles) is specified.
        type: list
        default: []
        elements: str
@@ -53,42 +51,26 @@ DOCUMENTATION = '''
        description:
          - Profiles to include from inventory.
          - If specified, all other profiles will be excluded.
-          - O(exclude_profiles) is ignored if O(include_profiles) is specified.
+          - I(exclude_profiles) is ignored if I(include_profiles) is specified.
        type: list
        default: []
        elements: str
        version_added: 4.4.0
-      inventory_hostname:
-        description:
-          - What to use for the ansible inventory hostname.
-          - By default the networking hostname is used if defined, otherwise the DNS name of the management or first non-static interface.
-          - If set to V(system), the cobbler system name is used.
-        type: str
-        choices: [ 'hostname', 'system' ]
-        default: hostname
-        version_added: 7.1.0
      group_by:
-        description: Keys to group hosts by.
+        description: Keys to group hosts by
        type: list
        elements: string
        default: [ 'mgmt_classes', 'owners', 'status' ]
      group:
-        description: Group to place all hosts into.
+        description: Group to place all hosts into
        default: cobbler
      group_prefix:
-        description: Prefix to apply to cobbler groups.
+        description: Prefix to apply to cobbler groups
        default: cobbler_
      want_facts:
-        description: Toggle, if V(true) the plugin will retrieve host facts from the server.
+        description: Toggle, if C(true) the plugin will retrieve host facts from the server
        type: boolean
        default: true
-      want_ip_addresses:
-        description:
-          - Toggle, if V(true) the plugin will add a C(cobbler_ipv4_addresses) and C(cobbleer_ipv6_addresses) dictionary to the defined O(group) mapping
-            interface DNS names to IP addresses.
-        type: boolean
-        default: true
-        version_added: 7.1.0
 '''

 EXAMPLES = '''
@@ -103,8 +85,8 @@ import socket

 from ansible.errors import AnsibleError
 from ansible.module_utils.common.text.converters import to_text
+from ansible.module_utils.six import iteritems
 from ansible.plugins.inventory import BaseInventoryPlugin, Cacheable, to_safe_group_name
-from ansible.module_utils.six import text_type

 # xmlrpc
 try:
@@ -146,7 +128,7 @@ class InventoryModule(BaseInventoryPlugin, Cacheable):
            self.connection = xmlrpc_client.Server(self.cobbler_url, allow_none=True)
            self.token = None
            if self.get_option('user') is not None:
-                self.token = self.connection.login(text_type(self.get_option('user')), text_type(self.get_option('password')))
+                self.token = self.connection.login(self.get_option('user'), self.get_option('password'))
        return self.connection

    def _init_cache(self):
@@ -219,7 +201,6 @@ class InventoryModule(BaseInventoryPlugin, Cacheable):
        self.exclude_profiles = self.get_option('exclude_profiles')
        self.include_profiles = self.get_option('include_profiles')
        self.group_by = self.get_option('group_by')
-        self.inventory_hostname = self.get_option('inventory_hostname')

        for profile in self._get_profiles():
            if profile['parent']:
@@ -255,14 +236,9 @@ class InventoryModule(BaseInventoryPlugin, Cacheable):
            self.inventory.add_group(self.group)
            self.display.vvvv('Added site group %s\n' % self.group)

-        ip_addresses = {}
-        ipv6_addresses = {}
        for host in self._get_systems():
            # Get the FQDN for the host and add it to the right groups
-            if self.inventory_hostname == 'system':
-                hostname = host['name']  # None
-            else:
-                hostname = host['hostname']  # None
+            hostname = host['hostname']  # None
            interfaces = host['interfaces']

            if self._exclude_profile(host['profile']):
@@ -271,7 +247,7 @@ class InventoryModule(BaseInventoryPlugin, Cacheable):

            # hostname is often empty for non-static IP hosts
            if hostname == '':
-                for iname, ivalue in interfaces.items():
+                for (iname, ivalue) in iteritems(interfaces):
                    if ivalue['management'] or not ivalue['static']:
                        this_dns_name = ivalue.get('dns_name', None)
                        if this_dns_name is not None and this_dns_name != "":
@@ -286,11 +262,8 @@ class InventoryModule(BaseInventoryPlugin, Cacheable):
            self.display.vvvv('Added host %s hostname %s\n' % (host['name'], hostname))

            # Add host to profile group
-            if host['profile'] != '':
-                group_name = self._add_safe_group_name(host['profile'], child=hostname)
-                self.display.vvvv('Added host %s to profile group %s\n' % (hostname, group_name))
-            else:
-                self.display.warning('Host %s has an empty profile\n' % (hostname))
+            group_name = self._add_safe_group_name(host['profile'], child=hostname)
+            self.display.vvvv('Added host %s to profile group %s\n' % (hostname, group_name))

            # Add host to groups specified by group_by fields
            for group_by in self.group_by:
@@ -307,51 +280,8 @@ class InventoryModule(BaseInventoryPlugin, Cacheable):
                self.inventory.add_child(self.group, hostname)

            # Add host variables
-            ip_address = None
-            ip_address_first = None
-            ipv6_address = None
-            ipv6_address_first = None
-            for iname, ivalue in interfaces.items():
-                # Set to first interface or management interface if defined or hostname matches dns_name
-                if ivalue['ip_address'] != "":
-                    if ip_address_first is None:
-                        ip_address_first = ivalue['ip_address']
-                    if ivalue['management']:
-                        ip_address = ivalue['ip_address']
-                    elif ivalue['dns_name'] == hostname and ip_address is None:
-                        ip_address = ivalue['ip_address']
-                if ivalue['ipv6_address'] != "":
-                    if ipv6_address_first is None:
-                        ipv6_address_first = ivalue['ipv6_address']
-                    if ivalue['management']:
-                        ipv6_address = ivalue['ipv6_address']
-                    elif ivalue['dns_name'] == hostname and ipv6_address is None:
-                        ipv6_address = ivalue['ipv6_address']
-
-                # Collect all interface name mappings for adding to group vars
-                if self.get_option('want_ip_addresses'):
-                    if ivalue['dns_name'] != "":
-                        if ivalue['ip_address'] != "":
-                            ip_addresses[ivalue['dns_name']] = ivalue['ip_address']
-                        if ivalue['ipv6_address'] != "":
-                            ip_addresses[ivalue['dns_name']] = ivalue['ipv6_address']
-
-            # Add ip_address to host if defined, use first if no management or matched dns_name
-            if ip_address is None and ip_address_first is not None:
-                ip_address = ip_address_first
-            if ip_address is not None:
-                self.inventory.set_variable(hostname, 'cobbler_ipv4_address', ip_address)
-            if ipv6_address is None and ipv6_address_first is not None:
-                ipv6_address = ipv6_address_first
-            if ipv6_address is not None:
-                self.inventory.set_variable(hostname, 'cobbler_ipv6_address', ipv6_address)
-
            if self.get_option('want_facts'):
                try:
                    self.inventory.set_variable(hostname, 'cobbler', host)
                except ValueError as e:
                    self.display.warning("Could not set host info for %s: %s" % (hostname, to_text(e)))
-
-        if self.get_option('want_ip_addresses'):
-            self.inventory.set_variable(self.group, 'cobbler_ipv4_addresses', ip_addresses)
-            self.inventory.set_variable(self.group, 'cobbler_ipv6_addresses', ipv6_addresses)
--- a/plugins/inventory/icinga2.py
+++ b/plugins/inventory/icinga2.py
@@ -58,7 +58,7 @@ DOCUMENTATION = '''
        description:
          - Allows the override of the inventory name based on different attributes.
          - This allows for changing the way limits are used.
-          - The current default, V(address), is sometimes not unique or present. We recommend to use V(name) instead.
+          - The current default, C(address), is sometimes not unique or present. We recommend to use C(name) instead.
        type: string
        default: address
        choices: ['name', 'display_name', 'address']
--- a/plugins/inventory/lxd.py
+++ b/plugins/inventory/lxd.py
@@ -48,7 +48,7 @@ DOCUMENTATION = r'''
                running this module using the following command
                C(lxc config set core.trust_password <some random password>)
                See U(https://www.stgraber.org/2016/04/18/lxd-api-direct-interaction/).
-            - If O(trust_password) is set, this module send a request for authentication before sending any requests.
+            - If I(trust_password) is set, this module send a request for authentication before sending any requests.
            type: str
        state:
            description: Filter the instance according to the current status.
@@ -62,7 +62,7 @@ DOCUMENTATION = r'''
            version_added: 6.2.0
        type_filter:
            description:
-            - Filter the instances by type V(virtual-machine), V(container) or V(both).
+            - Filter the instances by type C(virtual-machine), C(container) or C(both).
            - The first version of the inventory only supported containers.
            type: str
            default: container
@@ -72,8 +72,8 @@ DOCUMENTATION = r'''
            description:
            - If an instance has multiple network interfaces, select which one is the prefered as pattern.
            - Combined with the first number that can be found e.g. 'eth' + 0.
-            - The option has been renamed from O(prefered_container_network_interface) to O(prefered_instance_network_interface)
-              in community.general 3.8.0. The old name still works as an alias.
+            - The option has been renamed from I(prefered_container_network_interface) to I(prefered_instance_network_interface) in community.general 3.8.0.
+              The old name still works as an alias.
            type: str
            default: eth
            aliases:
@@ -81,7 +81,7 @@ DOCUMENTATION = r'''
        prefered_instance_network_family:
            description:
            - If an instance has multiple network interfaces, which one is the prefered by family.
-            - Specify V(inet) for IPv4 and V(inet6) for IPv6.
+            - Specify C(inet) for IPv4 and C(inet6) for IPv6.
            type: str
            default: inet
            choices: [ 'inet', 'inet6' ]
--- a/plugins/inventory/nmap.py
+++ b/plugins/inventory/nmap.py
@@ -23,34 +23,19 @@ DOCUMENTATION = '''
            required: true
            choices: ['nmap', 'community.general.nmap']
        sudo:
-            description: Set to V(true) to execute a C(sudo nmap) plugin scan.
+            description: Set to C(true) to execute a C(sudo nmap) plugin scan.
            version_added: 4.8.0
            default: false
            type: boolean
        address:
            description: Network IP or range of IPs to scan, you can use a simple range (10.2.2.15-25) or CIDR notation.
            required: true
-            env:
-                - name: ANSIBLE_NMAP_ADDRESS
-                  version_added: 6.6.0
        exclude:
-            description:
-              - List of addresses to exclude.
-              - For example V(10.2.2.15-25) or V(10.2.2.15,10.2.2.16).
+            description: list of addresses to exclude
            type: list
            elements: string
-            env:
-                - name: ANSIBLE_NMAP_EXCLUDE
-                  version_added: 6.6.0
-        port:
-            description:
-                - Only scan specific port or port range (C(-p)).
-                - For example, you could pass V(22) for a single port, V(1-65535) for a range of ports,
-                  or V(U:53,137,T:21-25,139,8080,S:9) to check port 53 with UDP, ports 21-25 with TCP, port 9 with SCTP, and ports 137, 139, and 8080 with all.
-            type: string
-            version_added: 6.5.0
        ports:
-            description: Enable/disable scanning ports.
+            description: Enable/disable scanning for open ports
            type: boolean
            default: true
        ipv4:
@@ -64,24 +49,19 @@ DOCUMENTATION = '''
        udp_scan:
            description:
                - Scan via UDP.
-                - Depending on your system you might need O(sudo=true) for this to work.
+                - Depending on your system you might need I(sudo=true) for this to work.
            type: boolean
            default: false
            version_added: 6.1.0
        icmp_timestamp:
            description:
                - Scan via ICMP Timestamp (C(-PP)).
-                - Depending on your system you might need O(sudo=true) for this to work.
+                - Depending on your system you might need I(sudo=true) for this to work.
            type: boolean
            default: false
            version_added: 6.1.0
-        open:
-            description: Only scan for open (or possibly open) ports.
-            type: boolean
-            default: false
-            version_added: 6.5.0
        dns_resolve:
-            description: Whether to always (V(true)) or never (V(false)) do DNS resolution.
+            description: Whether to always (C(true)) or never (C(false)) do DNS resolution.
            type: boolean
            default: false
            version_added: 6.1.0
@@ -101,14 +81,6 @@ plugin: community.general.nmap
 sudo: true
 strict: false
 address: 192.168.0.0/24
-
-# an nmap scan specifying ports and classifying results to an inventory group
-plugin: community.general.nmap
-address: 192.168.0.0/24
-exclude: 192.168.0.1, web.example.com
-port: 22, 443
-groups:
-  web_servers: "ports | selectattr('port', 'equalto', '443')"
 '''

 import os
@@ -199,10 +171,6 @@ class InventoryModule(BaseInventoryPlugin, Constructable, Cacheable):
            if self._options['sudo']:
                cmd.insert(0, 'sudo')

-            if self._options['port']:
-                cmd.append('-p')
-                cmd.append(self._options['port'])
-
            if not self._options['ports']:
                cmd.append('-sP')

@@ -226,9 +194,6 @@ class InventoryModule(BaseInventoryPlugin, Constructable, Cacheable):
            if self._options['icmp_timestamp']:
                cmd.append('-PP')

-            if self._options['open']:
-                cmd.append('--open')
-
            cmd.append(self._options['address'])
            try:
                # execute
--- a/plugins/inventory/opennebula.py
+++ b/plugins/inventory/opennebula.py
@@ -17,9 +17,9 @@ DOCUMENTATION = r'''
        - constructed
    description:
        - Get inventory hosts from OpenNebula cloud.
-        - Uses an YAML configuration file ending with either C(opennebula.yml) or C(opennebula.yaml)
+        - Uses an YAML configuration file ending with either I(opennebula.yml) or I(opennebula.yaml)
          to set parameter values.
-        - Uses O(api_authfile), C(~/.one/one_auth), or E(ONE_AUTH) pointing to a OpenNebula credentials file.
+        - Uses I(api_authfile), C(~/.one/one_auth), or C(ONE_AUTH) pointing to a OpenNebula credentials file.
    options:
        plugin:
            description: Token that ensures this is a source file for the 'opennebula' plugin.
@@ -31,7 +31,7 @@ DOCUMENTATION = r'''
              - URL of the OpenNebula RPC server.
              - It is recommended to use HTTPS so that the username/password are not
                transferred over the network unencrypted.
-              - If not set then the value of the E(ONE_URL) environment variable is used.
+              - If not set then the value of the C(ONE_URL) environment variable is used.
            env:
              - name: ONE_URL
            required: true
@@ -39,29 +39,29 @@ DOCUMENTATION = r'''
        api_username:
            description:
              - Name of the user to login into the OpenNebula RPC server. If not set
-                then the value of the E(ONE_USERNAME) environment variable is used.
+                then the value of the C(ONE_USERNAME) environment variable is used.
            env:
              - name: ONE_USERNAME
            type: string
        api_password:
            description:
              - Password or a token of the user to login into OpenNebula RPC server.
-              - If not set, the value of the E(ONE_PASSWORD) environment variable is used.
+              - If not set, the value of the C(ONE_PASSWORD) environment variable is used.
            env:
              - name: ONE_PASSWORD
            required: false
            type: string
        api_authfile:
            description:
-              - If both O(api_username) or O(api_password) are not set, then it will try
+              - If both I(api_username) or I(api_password) are not set, then it will try
                authenticate with ONE auth file. Default path is C(~/.one/one_auth).
-              - Set environment variable E(ONE_AUTH) to override this path.
+              - Set environment variable C(ONE_AUTH) to override this path.
            env:
              - name: ONE_AUTH
            required: false
            type: string
        hostname:
-            description: Field to match the hostname. Note V(v4_first_ip) corresponds to the first IPv4 found on VM.
+            description: Field to match the hostname. Note C(v4_first_ip) corresponds to the first IPv4 found on VM.
            type: string
            default: v4_first_ip
            choices:
--- a/plugins/inventory/proxmox.py
+++ b/plugins/inventory/proxmox.py
@@ -25,15 +25,15 @@ DOCUMENTATION = '''
        - inventory_cache
    options:
      plugin:
-        description: The name of this plugin, it should always be set to V(community.general.proxmox) for this plugin to recognize it as it's own.
+        description: The name of this plugin, it should always be set to C(community.general.proxmox) for this plugin to recognize it as it's own.
        required: true
        choices: ['community.general.proxmox']
        type: str
      url:
        description:
          - URL to Proxmox cluster.
-          - If the value is not specified in the inventory configuration, the value of environment variable E(PROXMOX_URL) will be used instead.
-          - Since community.general 4.7.0 you can also use templating to specify the value of the O(url).
+          - If the value is not specified in the inventory configuration, the value of environment variable C(PROXMOX_URL) will be used instead.
+          - Since community.general 4.7.0 you can also use templating to specify the value of the I(url).
        default: 'http://localhost:8006'
        type: str
        env:
@@ -42,8 +42,8 @@ DOCUMENTATION = '''
      user:
        description:
          - Proxmox authentication user.
-          - If the value is not specified in the inventory configuration, the value of environment variable E(PROXMOX_USER) will be used instead.
-          - Since community.general 4.7.0 you can also use templating to specify the value of the O(user).
+          - If the value is not specified in the inventory configuration, the value of environment variable C(PROXMOX_USER) will be used instead.
+          - Since community.general 4.7.0 you can also use templating to specify the value of the I(user).
        required: true
        type: str
        env:
@@ -52,9 +52,9 @@ DOCUMENTATION = '''
      password:
        description:
          - Proxmox authentication password.
-          - If the value is not specified in the inventory configuration, the value of environment variable E(PROXMOX_PASSWORD) will be used instead.
-          - Since community.general 4.7.0 you can also use templating to specify the value of the O(password).
-          - If you do not specify a password, you must set O(token_id) and O(token_secret) instead.
+          - If the value is not specified in the inventory configuration, the value of environment variable C(PROXMOX_PASSWORD) will be used instead.
+          - Since community.general 4.7.0 you can also use templating to specify the value of the I(password).
+          - If you do not specify a password, you must set I(token_id) and I(token_secret) instead.
        type: str
        env:
          - name: PROXMOX_PASSWORD
@@ -62,8 +62,8 @@ DOCUMENTATION = '''
      token_id:
        description:
          - Proxmox authentication token ID.
-          - If the value is not specified in the inventory configuration, the value of environment variable E(PROXMOX_TOKEN_ID) will be used instead.
-          - To use token authentication, you must also specify O(token_secret). If you do not specify O(token_id) and O(token_secret),
+          - If the value is not specified in the inventory configuration, the value of environment variable C(PROXMOX_TOKEN_ID) will be used instead.
+          - To use token authentication, you must also specify I(token_secret). If you do not specify I(token_id) and I(token_secret),
            you must set a password instead.
          - Make sure to grant explicit pve permissions to the token or disable 'privilege separation' to use the users' privileges instead.
        version_added: 4.8.0
@@ -73,8 +73,8 @@ DOCUMENTATION = '''
      token_secret:
        description:
          - Proxmox authentication token secret.
-          - If the value is not specified in the inventory configuration, the value of environment variable E(PROXMOX_TOKEN_SECRET) will be used instead.
-          - To use token authentication, you must also specify O(token_id). If you do not specify O(token_id) and O(token_secret),
+          - If the value is not specified in the inventory configuration, the value of environment variable C(PROXMOX_TOKEN_SECRET) will be used instead.
+          - To use token authentication, you must also specify I(token_id). If you do not specify I(token_id) and I(token_secret),
            you must set a password instead.
        version_added: 4.8.0
        type: str
@@ -95,25 +95,25 @@ DOCUMENTATION = '''
      want_facts:
        description:
          - Gather LXC/QEMU configuration facts.
-          - When O(want_facts) is set to V(true) more details about QEMU VM status are possible, besides the running and stopped states.
+          - When I(want_facts) is set to C(true) more details about QEMU VM status are possible, besides the running and stopped states.
            Currently if the VM is running and it is suspended, the status will be running and the machine will be in C(running) group,
-            but its actual state will be paused. See O(qemu_extended_statuses) for how to retrieve the real status.
+            but its actual state will be paused. See I(qemu_extended_statuses) for how to retrieve the real status.
        default: false
        type: bool
      qemu_extended_statuses:
        description:
-          - Requires O(want_facts) to be set to V(true) to function. This will allow you to differentiate betweend C(paused) and C(prelaunch)
+          - Requires I(want_facts) to be set to C(true) to function. This will allow you to differentiate betweend C(paused) and C(prelaunch)
            statuses of the QEMU VMs.
-          - This introduces multiple groups [prefixed with O(group_prefix)] C(prelaunch) and C(paused).
+          - This introduces multiple groups [prefixed with I(group_prefix)] C(prelaunch) and C(paused).
        default: false
        type: bool
        version_added: 5.1.0
      want_proxmox_nodes_ansible_host:
        version_added: 3.0.0
        description:
-          - Whether to set C(ansible_host) for proxmox nodes.
-          - When set to V(true) (default), will use the first available interface. This can be different from what you expect.
-          - The default of this option changed from V(true) to V(false) in community.general 6.0.0.
+          - Whether to set C(ansbile_host) for proxmox nodes.
+          - When set to C(true) (default), will use the first available interface. This can be different from what you expect.
+          - The default of this option changed from C(true) to C(false) in community.general 6.0.0.
        type: bool
        default: false
      filters:
@@ -590,10 +590,6 @@ class InventoryModule(BaseInventoryPlugin, Constructable, Cacheable):
                ip = self._get_node_ip(node['node'])
                self.inventory.set_variable(node['node'], 'ansible_host', ip)

-            # Setting composite variables
-            variables = self.inventory.get_host(node['node']).get_vars()
-            self._set_composite_vars(self.get_option('compose'), variables, node['node'], strict=self.strict)
-
            # add LXC/Qemu groups for the node
            for ittype in ('lxc', 'qemu'):
                node_type_group = self._group('%s_%s' % (node['node'], ittype))
--- a/plugins/inventory/scaleway.py
+++ b/plugins/inventory/scaleway.py
@@ -37,7 +37,7 @@ DOCUMENTATION = r'''
        scw_profile:
            description:
            - The config profile to use in config file.
-            - By default uses the one specified as C(active_profile) in the config file, or falls back to V(default) if that is not defined.
+            - By default uses the one specified as C(active_profile) in the config file, or falls back to C(default) if that is not defined.
            type: string
            version_added: 4.4.0
        oauth_token:
--- a/plugins/inventory/xen_orchestra.py
+++ b/plugins/inventory/xen_orchestra.py
@@ -23,21 +23,21 @@ DOCUMENTATION = '''
        - inventory_cache
    options:
        plugin:
-            description: The name of this plugin, it should always be set to V(community.general.xen_orchestra) for this plugin to recognize it as its own.
+            description: The name of this plugin, it should always be set to C(community.general.xen_orchestra) for this plugin to recognize it as its own.
            required: true
            choices: ['community.general.xen_orchestra']
            type: str
        api_host:
            description:
                - API host to XOA API.
-                - If the value is not specified in the inventory configuration, the value of environment variable E(ANSIBLE_XO_HOST) will be used instead.
+                - If the value is not specified in the inventory configuration, the value of environment variable C(ANSIBLE_XO_HOST) will be used instead.
            type: str
            env:
                - name: ANSIBLE_XO_HOST
        user:
            description:
                - Xen Orchestra user.
-                - If the value is not specified in the inventory configuration, the value of environment variable E(ANSIBLE_XO_USER) will be used instead.
+                - If the value is not specified in the inventory configuration, the value of environment variable C(ANSIBLE_XO_USER) will be used instead.
            required: true
            type: str
            env:
@@ -45,7 +45,7 @@ DOCUMENTATION = '''
        password:
            description:
                - Xen Orchestra password.
-                - If the value is not specified in the inventory configuration, the value of environment variable E(ANSIBLE_XO_PASSWORD) will be used instead.
+                - If the value is not specified in the inventory configuration, the value of environment variable C(ANSIBLE_XO_PASSWORD) will be used instead.
            required: true
            type: str
            env:
@@ -78,7 +78,6 @@ compose:

 import json
 import ssl
-from time import sleep

 from ansible.errors import AnsibleError
 from ansible.plugins.inventory import BaseInventoryPlugin, Constructable, Cacheable
@@ -139,42 +138,21 @@ class InventoryModule(BaseInventoryPlugin, Constructable, Cacheable):
        self.conn = create_connection(
            '{0}://{1}/api/'.format(proto, xoa_api_host), sslopt=sslopt)

-    CALL_TIMEOUT = 100
-    """Number of 1/10ths of a second to wait before method call times out."""
-
-    def call(self, method, params):
-        """Calls a method on the XO server with the provided parameters."""
-        id = self.pointer
-        self.conn.send(json.dumps({
-            'id': id,
-            'jsonrpc': '2.0',
-            'method': method,
-            'params': params
-        }))
-
-        waited = 0
-        while waited < self.CALL_TIMEOUT:
-            response = json.loads(self.conn.recv())
-            if 'id' in response and response['id'] == id:
-                return response
-            else:
-                sleep(0.1)
-                waited += 1
-
-        raise AnsibleError(
-            'Method call {method} timed out after {timeout} seconds.'.format(method=method, timeout=self.CALL_TIMEOUT / 10))
-
    def login(self, user, password):
-        result = self.call('session.signIn', {
-            'username': user, 'password': password
-        })
+        payload = {'id': self.pointer, 'jsonrpc': '2.0', 'method': 'session.signIn', 'params': {
+            'username': user, 'password': password}}
+        self.conn.send(json.dumps(payload))
+        result = json.loads(self.conn.recv())

        if 'error' in result:
            raise AnsibleError(
                'Could not connect: {0}'.format(result['error']))

    def get_object(self, name):
-        answer = self.call('xo.getAllObjects', {'filter': {'type': name}})
+        payload = {'id': self.pointer, 'jsonrpc': '2.0',
+                   'method': 'xo.getAllObjects', 'params': {'filter': {'type': name}}}
+        self.conn.send(json.dumps(payload))
+        answer = json.loads(self.conn.recv())

        if 'error' in answer:
            raise AnsibleError(
--- a/plugins/lookup/bitwarden.py
+++ b/plugins/lookup/bitwarden.py
@@ -12,8 +12,6 @@ DOCUMENTATION = """
    requirements:
      - bw (command line utility)
      - be logged into bitwarden
-      - bitwarden vault unlocked
-      - E(BW_SESSION) environment variable set
    short_description: Retrieve secrets from Bitwarden
    version_added: 5.4.0
    description:
@@ -25,7 +23,7 @@ DOCUMENTATION = """
        type: list
        elements: str
      search:
-        description: Field to retrieve, for example V(name) or V(id).
+        description: Field to retrieve, for example C(name) or C(id).
        type: str
        default: name
        version_added: 5.7.0
--- a/plugins/lookup/bitwarden_secrets_manager.py
+++ b/plugins/lookup/bitwarden_secrets_manager.py
@@ -1,125 +0,0 @@
-# -*- coding: utf-8 -*-
-# Copyright (c) 2023, jantari (https://github.com/jantari)
-# GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt)
-# SPDX-License-Identifier: GPL-3.0-or-later
-from __future__ import (absolute_import, division, print_function)
-
-__metaclass__ = type
-
-DOCUMENTATION = """
-    name: bitwarden_secrets_manager
-    author:
-      - jantari (@jantari)
-    requirements:
-      - bws (command line utility)
-    short_description: Retrieve secrets from Bitwarden Secrets Manager
-    version_added: 7.2.0
-    description:
-      - Retrieve secrets from Bitwarden Secrets Manager.
-    options:
-      _terms:
-        description: Secret ID(s) to fetch values for.
-        required: true
-        type: list
-        elements: str
-      bws_access_token:
-        description: The BWS access token to use for this lookup.
-        env:
-          - name: BWS_ACCESS_TOKEN
-        required: true
-        type: str
-"""
-
-EXAMPLES = """
- name: Get a secret relying on the BWS_ACCESS_TOKEN environment variable for authentication
-  ansible.builtin.debug:
-    msg: >-
-      {{ lookup("community.general.bitwarden_secrets_manager", "2bc23e48-4932-40de-a047-5524b7ddc972") }}
-
- name: Get a secret passing an explicit access token for authentication
-  ansible.builtin.debug:
-    msg: >-
-      {{
-        lookup(
-          "community.general.bitwarden_secrets_manager",
-          "2bc23e48-4932-40de-a047-5524b7ddc972",
-          bws_access_token="9.4f570d14-4b54-42f5-bc07-60f4450b1db5.YmluYXJ5LXNvbWV0aGluZy0xMjMK:d2h5IGhlbGxvIHRoZXJlCg=="
-        )
-      }}
-
- name: Get two different secrets each using a different access token for authentication
-  ansible.builtin.debug:
-    msg:
-      - '{{ lookup("community.general.bitwarden_secrets_manager", "2bc23e48-4932-40de-a047-5524b7ddc972", bws_access_token=token1) }}'
-      - '{{ lookup("community.general.bitwarden_secrets_manager", "9d89af4c-eb5d-41f5-bb0f-4ae81215c768", bws_access_token=token2) }}'
-  vars:
-    token1: "9.4f570d14-4b54-42f5-bc07-60f4450b1db5.YmluYXJ5LXNvbWV0aGluZy0xMjMK:d2h5IGhlbGxvIHRoZXJlCg=="
-    token2: "1.69b72797-6ea9-4687-a11e-848e41a30ae6.YW5zaWJsZSBpcyBncmVhdD8K:YW5zaWJsZSBpcyBncmVhdAo="
-
- name: Get just the value of a secret
-  ansible.builtin.debug:
-    msg: >-
-      {{ lookup("community.general.bitwarden_secrets_manager", "2bc23e48-4932-40de-a047-5524b7ddc972").value }}
-"""
-
-RETURN = """
-  _raw:
-    description: List containing one or more secrets.
-    type: list
-    elements: dict
-"""
-
-from subprocess import Popen, PIPE
-
-from ansible.errors import AnsibleLookupError
-from ansible.module_utils.common.text.converters import to_text
-from ansible.parsing.ajson import AnsibleJSONDecoder
-from ansible.plugins.lookup import LookupBase
-
-
-class BitwardenSecretsManagerException(AnsibleLookupError):
-    pass
-
-
-class BitwardenSecretsManager(object):
-    def __init__(self, path='bws'):
-        self._cli_path = path
-
-    @property
-    def cli_path(self):
-        return self._cli_path
-
-    def _run(self, args, stdin=None):
-        p = Popen([self.cli_path] + args, stdout=PIPE, stderr=PIPE, stdin=PIPE)
-        out, err = p.communicate(stdin)
-        rc = p.wait()
-        return to_text(out, errors='surrogate_or_strict'), to_text(err, errors='surrogate_or_strict'), rc
-
-    def get_secret(self, secret_id, bws_access_token):
-        """Get and return the secret with the given secret_id.
-        """
-
-        # Prepare set of params for Bitwarden Secrets Manager CLI
-        # Color output was not always disabled correctly with the default 'auto' setting so explicitly disable it.
-        params = [
-            '--color', 'no',
-            '--access-token', bws_access_token,
-            'get', 'secret', secret_id
-        ]
-
-        out, err, rc = self._run(params)
-        if rc != 0:
-            raise BitwardenSecretsManagerException(to_text(err))
-
-        return AnsibleJSONDecoder().raw_decode(out)[0]
-
-
-class LookupModule(LookupBase):
-    def run(self, terms, variables=None, **kwargs):
-        self.set_options(var_options=variables, direct=kwargs)
-        bws_access_token = self.get_option('bws_access_token')
-
-        return [_bitwarden_secrets_manager.get_secret(term, bws_access_token) for term in terms]
-
-
-_bitwarden_secrets_manager = BitwardenSecretsManager()
--- a/plugins/lookup/collection_version.py
+++ b/plugins/lookup/collection_version.py
@@ -13,22 +13,22 @@ short_description: Retrieves the version of an installed collection
 description:
  - This lookup allows to query the version of an installed collection, and to determine whether a
    collection is installed at all.
-  - By default it returns V(none) for non-existing collections and V(*) for collections without a
+  - By default it returns C(none) for non-existing collections and C(*) for collections without a
    version number. The latter should only happen in development environments, or when installing
    a collection from git which has no version in its C(galaxy.yml). This behavior can be adjusted
-    by providing other values with O(result_not_found) and O(result_no_version).
+    by providing other values with I(result_not_found) and I(result_no_version).
 options:
  _terms:
    description:
      - The collections to look for.
-      - For example V(community.general).
+      - For example C(community.general).
    type: list
    elements: str
    required: true
  result_not_found:
    description:
      - The value to return when the collection could not be found.
-      - By default, V(none) is returned.
+      - By default, C(none) is returned.
    type: string
    default: ~
  result_no_version:
@@ -36,7 +36,7 @@ options:
      - The value to return when the collection has no version number.
      - This can happen for collections installed from git which do not have a version number
        in C(galaxy.yml).
-      - By default, V(*) is returned.
+      - By default, C(*) is returned.
    type: string
    default: '*'
 """
@@ -51,11 +51,11 @@ RETURN = """
  _raw:
    description:
      - The version number of the collections listed as input.
-      - If a collection can not be found, it will return the value provided in O(result_not_found).
-        By default, this is V(none).
+      - If a collection can not be found, it will return the value provided in I(result_not_found).
+        By default, this is C(none).
      - If a collection can be found, but the version not identified, it will return the value provided in
-        O(result_no_version). By default, this is V(*). This can happen for collections installed
-        from git which do not have a version number in V(galaxy.yml).
+        I(result_no_version). By default, this is C(*). This can happen for collections installed
+        from git which do not have a version number in C(galaxy.yml).
    type: list
    elements: str
 """
--- a/plugins/lookup/consul_kv.py
+++ b/plugins/lookup/consul_kv.py
@@ -38,20 +38,23 @@ DOCUMENTATION = '''
        default: localhost
        description:
          - The target to connect to, must be a resolvable address.
-          - Will be determined from E(ANSIBLE_CONSUL_URL) if that is set.
+            Will be determined from C(ANSIBLE_CONSUL_URL) if that is set.
+          - "C(ANSIBLE_CONSUL_URL) should look like this: C(https://my.consul.server:8500)"
+        env:
+          - name: ANSIBLE_CONSUL_URL
        ini:
          - section: lookup_consul
            key: host
      port:
        description:
          - The port of the target host to connect to.
-          - If you use E(ANSIBLE_CONSUL_URL) this value will be used from there.
+          - If you use C(ANSIBLE_CONSUL_URL) this value will be used from there.
        default: 8500
      scheme:
        default: http
        description:
          - Whether to use http or https.
-          - If you use E(ANSIBLE_CONSUL_URL) this value will be used from there.
+          - If you use C(ANSIBLE_CONSUL_URL) this value will be used from there.
      validate_certs:
        default: true
        description: Whether to verify the ssl connection or not.
@@ -68,9 +71,7 @@ DOCUMENTATION = '''
          - section: lookup_consul
            key: client_cert
      url:
-        description:
-          - The target to connect to.
-          - "Should look like this: V(https://my.consul.server:8500)."
+        description: "The target to connect to, should look like this: C(https://my.consul.server:8500)."
        type: str
        version_added: 1.0.0
        env:
--- a/plugins/lookup/dependent.py
+++ b/plugins/lookup/dependent.py
@@ -22,7 +22,7 @@ options:
        The name is the index that is used in the result object. The value is iterated over as described below.
      - If the value is a list, it is simply iterated over.
      - If the value is a dictionary, it is iterated over and returned as if they would be processed by the
-        P(ansible.builtin.dict2items#filter) filter.
+        R(ansible.builtin.dict2items filter,ansible_collections.ansible.builtin.dict2items_filter).
      - If the value is a string, it is evaluated as Jinja2 expressions which can access the previously chosen
        elements with C(item.<index_name>). The result must be a list or a dictionary.
    type: list
--- a/plugins/lookup/dig.py
+++ b/plugins/lookup/dig.py
@@ -21,7 +21,7 @@ DOCUMENTATION = '''
      - In addition to (default) A record, it is also possible to specify a different record type that should be queried.
        This can be done by either passing-in additional parameter of format qtype=TYPE to the dig lookup, or by appending /TYPE to the FQDN being queried.
      - If multiple values are associated with the requested record, the results will be returned as a comma-separated list.
-        In such cases you may want to pass option C(wantlist=true) to the lookup call, or alternatively use C(query) instead of C(lookup),
+        In such cases you may want to pass option I(wantlist=true) to the lookup call, or alternatively use C(query) instead of C(lookup),
        which will result in the record values being returned as a list over which you can iterate later on.
      - By default, the lookup will rely on system-wide configured DNS servers for performing the query.
        It is also possible to explicitly specify DNS servers to query using the @DNS_SERVER_1,DNS_SERVER_2,...,DNS_SERVER_N notation.
@@ -34,8 +34,8 @@ DOCUMENTATION = '''
      qtype:
        description:
            - Record type to query.
-            - V(DLV) has been removed in community.general 6.0.0.
-            - V(CAA) has been added in community.general 6.3.0.
+            - C(DLV) has been removed in community.general 6.0.0.
+            - C(CAA) has been added in community.general 6.3.0.
        type: str
        default: 'A'
        choices: [A, ALL, AAAA, CAA, CNAME, DNAME, DNSKEY, DS, HINFO, LOC, MX, NAPTR, NS, NSEC3PARAM, PTR, RP, RRSIG, SOA, SPF, SRV, SSHFP, TLSA, TXT]
@@ -51,17 +51,16 @@ DOCUMENTATION = '''
      fail_on_error:
        description:
          - Abort execution on lookup errors.
-          - The default for this option will likely change to V(true) in the future.
-            The current default, V(false), is used for backwards compatibility, and will result in empty strings
-            or the string V(NXDOMAIN) in the result in case of errors.
+          - The default for this option will likely change to C(true) in the future.
+            The current default, C(false), is used for backwards compatibility, and will result in empty strings
+            or the string C(NXDOMAIN) in the result in case of errors.
        default: false
        type: bool
        version_added: 5.4.0
      real_empty:
        description:
-          - Return empty result without empty strings, and return empty list instead of V(NXDOMAIN).
-          - The default for this option will likely change to V(true) in the future.
-          - This option will be forced to V(true) if multiple domains to be queried are specified.
+          - Return empty result without empty strings, and return empty list instead of C(NXDOMAIN).
+          - The default for this option will likely change to C(true) in the future.
        default: false
        type: bool
        version_added: 6.0.0
@@ -96,21 +95,6 @@ EXAMPLES = """
    msg: "MX record for gmail.com {{ item }}"
  with_items: "{{ lookup('community.general.dig', 'gmail.com./MX', wantlist=true) }}"

- name: Lookup multiple names at once
-  ansible.builtin.debug:
-    msg: "A record found {{ item }}"
-  loop: "{{ query('community.general.dig', 'example.org.', 'example.com.', 'gmail.com.') }}"
-
- name: Lookup multiple names at once (from list variable)
-  ansible.builtin.debug:
-    msg: "A record found {{ item }}"
-  loop: "{{ query('community.general.dig', *hosts) }}"
-  vars:
-    hosts:
-      - example.org.
-      - example.com.
-      - gmail.com.
-
 - ansible.builtin.debug:
    msg: "Reverse DNS for 192.0.2.5 is {{ lookup('community.general.dig', '192.0.2.5/PTR') }}"
 - ansible.builtin.debug:
@@ -324,7 +308,7 @@ class LookupModule(LookupBase):
        edns_size = 4096
        myres.use_edns(0, ednsflags=dns.flags.DO, payload=edns_size)

-        domains = []
+        domain = None
        qtype = self.get_option('qtype')
        flat = self.get_option('flat')
        fail_on_error = self.get_option('fail_on_error')
@@ -381,71 +365,63 @@ class LookupModule(LookupBase):
            if '/' in t:
                try:
                    domain, qtype = t.split('/')
-                    domains.append(domain)
                except Exception:
-                    domains.append(t)
+                    domain = t
            else:
-                domains.append(t)
+                domain = t

        # print "--- domain = {0} qtype={1} rdclass={2}".format(domain, qtype, rdclass)

-        if qtype.upper() == 'PTR':
-            reversed_domains = []
-            for domain in domains:
-                try:
-                    n = dns.reversename.from_address(domain)
-                    reversed_domains.append(n.to_text())
-                except dns.exception.SyntaxError:
-                    pass
-                except Exception as e:
-                    raise AnsibleError("dns.reversename unhandled exception %s" % to_native(e))
-            domains = reversed_domains
-
-        if len(domains) > 1:
-            real_empty = True
-
        ret = []

-        for domain in domains:
+        if qtype.upper() == 'PTR':
            try:
-                answers = myres.query(domain, qtype, rdclass=rdclass)
-                for rdata in answers:
-                    s = rdata.to_text()
-                    if qtype.upper() == 'TXT':
-                        s = s[1:-1]  # Strip outside quotes on TXT rdata
+                n = dns.reversename.from_address(domain)
+                domain = n.to_text()
+            except dns.exception.SyntaxError:
+                pass
+            except Exception as e:
+                raise AnsibleError("dns.reversename unhandled exception %s" % to_native(e))

-                    if flat:
-                        ret.append(s)
-                    else:
-                        try:
-                            rd = make_rdata_dict(rdata)
-                            rd['owner'] = answers.canonical_name.to_text()
-                            rd['type'] = dns.rdatatype.to_text(rdata.rdtype)
-                            rd['ttl'] = answers.rrset.ttl
-                            rd['class'] = dns.rdataclass.to_text(rdata.rdclass)
+        try:
+            answers = myres.query(domain, qtype, rdclass=rdclass)
+            for rdata in answers:
+                s = rdata.to_text()
+                if qtype.upper() == 'TXT':
+                    s = s[1:-1]  # Strip outside quotes on TXT rdata

-                            ret.append(rd)
-                        except Exception as err:
-                            if fail_on_error:
-                                raise AnsibleError("Lookup failed: %s" % str(err))
-                            ret.append(str(err))
+                if flat:
+                    ret.append(s)
+                else:
+                    try:
+                        rd = make_rdata_dict(rdata)
+                        rd['owner'] = answers.canonical_name.to_text()
+                        rd['type'] = dns.rdatatype.to_text(rdata.rdtype)
+                        rd['ttl'] = answers.rrset.ttl
+                        rd['class'] = dns.rdataclass.to_text(rdata.rdclass)

-            except dns.resolver.NXDOMAIN as err:
-                if fail_on_error:
-                    raise AnsibleError("Lookup failed: %s" % str(err))
-                if not real_empty:
-                    ret.append('NXDOMAIN')
-            except dns.resolver.NoAnswer as err:
-                if fail_on_error:
-                    raise AnsibleError("Lookup failed: %s" % str(err))
-                if not real_empty:
-                    ret.append("")
-            except dns.resolver.Timeout as err:
-                if fail_on_error:
-                    raise AnsibleError("Lookup failed: %s" % str(err))
-                if not real_empty:
-                    ret.append("")
-            except dns.exception.DNSException as err:
-                raise AnsibleError("dns.resolver unhandled exception %s" % to_native(err))
+                        ret.append(rd)
+                    except Exception as err:
+                        if fail_on_error:
+                            raise AnsibleError("Lookup failed: %s" % str(err))
+                        ret.append(str(err))
+
+        except dns.resolver.NXDOMAIN as err:
+            if fail_on_error:
+                raise AnsibleError("Lookup failed: %s" % str(err))
+            if not real_empty:
+                ret.append('NXDOMAIN')
+        except dns.resolver.NoAnswer as err:
+            if fail_on_error:
+                raise AnsibleError("Lookup failed: %s" % str(err))
+            if not real_empty:
+                ret.append("")
+        except dns.resolver.Timeout as err:
+            if fail_on_error:
+                raise AnsibleError("Lookup failed: %s" % str(err))
+            if not real_empty:
+                ret.append("")
+        except dns.exception.DNSException as err:
+            raise AnsibleError("dns.resolver unhandled exception %s" % to_native(err))

        return ret
--- a/plugins/lookup/dnstxt.py
+++ b/plugins/lookup/dnstxt.py
@@ -22,8 +22,8 @@ DOCUMENTATION = '''
        elements: string
      real_empty:
        description:
-          - Return empty result without empty strings, and return empty list instead of V(NXDOMAIN).
-          - The default for this option will likely change to V(true) in the future.
+          - Return empty result without empty strings, and return empty list instead of C(NXDOMAIN).
+          - The default for this option will likely change to C(true) in the future.
        default: false
        type: bool
        version_added: 6.0.0
--- a/plugins/lookup/dsv.py
+++ b/plugins/lookup/dsv.py
@@ -13,15 +13,15 @@ short_description: Get secrets from Thycotic DevOps Secrets Vault
 version_added: 1.0.0
 description:
    - Uses the Thycotic DevOps Secrets Vault Python SDK to get Secrets from a
-      DSV O(tenant) using a O(client_id) and O(client_secret).
+      DSV I(tenant) using a I(client_id) and I(client_secret).
 requirements:
    - python-dsv-sdk - https://pypi.org/project/python-dsv-sdk/
 options:
    _terms:
-        description: The path to the secret, for example V(/staging/servers/web1).
+        description: The path to the secret, e.g. C(/staging/servers/web1).
        required: true
    tenant:
-        description: The first format parameter in the default O(url_template).
+        description: The first format parameter in the default I(url_template).
        env:
            - name: DSV_TENANT
        ini:
@@ -31,7 +31,7 @@ options:
    tld:
        default: com
        description: The top-level domain of the tenant; the second format
-            parameter in the default O(url_template).
+            parameter in the default I(url_template).
        env:
            - name: DSV_TLD
        ini:
@@ -47,7 +47,7 @@ options:
              key: client_id
        required: true
    client_secret:
-        description: The client secret associated with the specific O(client_id).
+        description: The client secret associated with the specific I(client_id).
        env:
            - name: DSV_CLIENT_SECRET
        ini:
--- a/plugins/lookup/etcd.py
+++ b/plugins/lookup/etcd.py
@@ -24,7 +24,7 @@ DOCUMENTATION = '''
            required: true
        url:
            description:
-                - Environment variable with the URL for the etcd server
+                - Environment variable with the url for the etcd server
            default: 'http://127.0.0.1:4001'
            env:
              - name: ANSIBLE_ETCD_URL
@@ -39,10 +39,6 @@ DOCUMENTATION = '''
                - toggle checking that the ssl certificates are valid, you normally only want to turn this off with self-signed certs.
            default: true
            type: boolean
-    seealso:
-    - module: community.general.etcd3
-    - plugin: community.general.etcd3
-      plugin_type: lookup
 '''

 EXAMPLES = '''
--- a/plugins/lookup/etcd3.py
+++ b/plugins/lookup/etcd3.py
@@ -32,10 +32,10 @@ DOCUMENTATION = '''
            default: false
        endpoints:
            description:
-            - Counterpart of E(ETCDCTL_ENDPOINTS) environment variable.
-              Specify the etcd3 connection with and URL form, for example V(https://hostname:2379), or V(<host>:<port>) form.
-            - The V(host) part is overwritten by O(host) option, if defined.
-            - The V(port) part is overwritten by O(port) option, if defined.
+            - Counterpart of C(ETCDCTL_ENDPOINTS) environment variable.
+              Specify the etcd3 connection with and URL form eg. C(https://hostname:2379)  or C(<host>:<port>) form.
+            - The C(host) part is overwritten by I(host) option, if defined.
+            - The C(port) part is overwritten by I(port) option, if defined.
            env:
            - name: ETCDCTL_ENDPOINTS
            default: '127.0.0.1:2379'
@@ -43,12 +43,12 @@ DOCUMENTATION = '''
        host:
            description:
            - etcd3 listening client host.
-            - Takes precedence over O(endpoints).
+            - Takes precedence over I(endpoints).
            type: str
        port:
            description:
            - etcd3 listening client port.
-            - Takes precedence over O(endpoints).
+            - Takes precedence over I(endpoints).
            type: int
        ca_cert:
            description:
@@ -89,13 +89,13 @@ DOCUMENTATION = '''
            type: str

    notes:
-    - O(host) and O(port) options take precedence over (endpoints) option.
-    - The recommended way to connect to etcd3 server is using E(ETCDCTL_ENDPOINT)
-      environment variable and keep O(endpoints), O(host), and O(port) unused.
+    - I(host) and I(port) options take precedence over (endpoints) option.
+    - The recommended way to connect to etcd3 server is using C(ETCDCTL_ENDPOINT)
+      environment variable and keep I(endpoints), I(host), and I(port) unused.
    seealso:
    - module: community.general.etcd3
-    - plugin: community.general.etcd
-      plugin_type: lookup
+    - ref: ansible_collections.community.general.etcd_lookup
+      description: The etcd v2 lookup.

    requirements:
    - "etcd3 >= 0.10"
--- a/plugins/lookup/filetree.py
+++ b/plugins/lookup/filetree.py
@@ -65,7 +65,7 @@ RETURN = r"""
        src:
          description:
          - Full path to file.
-          - Not returned when RV(_raw[].state) is set to V(directory).
+          - Not returned when I(item.state) is set to C(directory).
          type: path
        root:
          description: Allows filtering by original location.
--- a/plugins/lookup/flattened.py
+++ b/plugins/lookup/flattened.py
@@ -19,7 +19,7 @@ DOCUMENTATION = '''
        elements: raw
        required: true
    notes:
-      - Unlike the P(ansible.builtin.items#lookup) lookup which only flattens 1 level,
+      - Unlike the R(items lookup,ansible_collections.ansible.builtin.items_lookup) which only flattens 1 level,
        this plugin will continue to flatten until it cannot find lists anymore.
      - Aka highlander plugin, there can only be one (list).
 '''
--- a/plugins/lookup/lmdb_kv.py
+++ b/plugins/lookup/lmdb_kv.py
@@ -15,7 +15,7 @@ DOCUMENTATION = '''
    description:
      - This lookup returns a list of results from an LMDB DB corresponding to a list of items given to it.
    requirements:
-      - lmdb (Python library U(https://lmdb.readthedocs.io/en/release/))
+      - lmdb (python library https://lmdb.readthedocs.io/en/release/)
    options:
      _terms:
        description: List of keys to query.
--- a/plugins/lookup/merge_variables.py
+++ b/plugins/lookup/merge_variables.py
@@ -1,212 +0,0 @@
-# -*- coding: utf-8 -*-
-# Copyright (c) 2020, Thales Netherlands
-# Copyright (c) 2021, Ansible Project
-# GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt)
-# SPDX-License-Identifier: GPL-3.0-or-later
-from __future__ import (absolute_import, division, print_function)
-__metaclass__ = type
-
-DOCUMENTATION = """
-    author:
-      - Roy Lenferink (@rlenferink)
-      - Mark Ettema (@m-a-r-k-e)
-    name: merge_variables
-    short_description: merge variables with a certain suffix
-    description:
-        - This lookup returns the merged result of all variables in scope that match the given prefixes, suffixes, or
-         regular expressions, optionally.
-    version_added: 6.5.0
-    options:
-      _terms:
-        description:
-          - Depending on the value of O(pattern_type), this is a list of prefixes, suffixes, or regular expressions
-            that will be used to match all variables that should be merged.
-        required: true
-        type: list
-        elements: str
-      pattern_type:
-        description:
-          - Change the way of searching for the specified pattern.
-        type: str
-        default: 'regex'
-        choices:
-          - prefix
-          - suffix
-          - regex
-        env:
-          - name: ANSIBLE_MERGE_VARIABLES_PATTERN_TYPE
-        ini:
-          - section: merge_variables_lookup
-            key: pattern_type
-      initial_value:
-        description:
-          - An initial value to start with.
-        type: raw
-      override:
-        description:
-          - Return an error, print a warning or ignore it when a key will be overwritten.
-          - The default behavior V(error) makes the plugin fail when a key would be overwritten.
-          - When V(warn) and V(ignore) are used, note that it is important to know that the variables
-            are sorted by name before being merged. Keys for later variables in this order will overwrite
-            keys of the same name for variables earlier in this order. To avoid potential confusion,
-            better use O(override=error) whenever possible.
-        type: str
-        default: 'error'
-        choices:
-          - error
-          - warn
-          - ignore
-        env:
-          - name: ANSIBLE_MERGE_VARIABLES_OVERRIDE
-        ini:
-          - section: merge_variables_lookup
-            key: override
-"""
-
-EXAMPLES = """
-# Some example variables, they can be defined anywhere as long as they are in scope
-test_init_list:
-  - "list init item 1"
-  - "list init item 2"
-
-testa__test_list:
-  - "test a item 1"
-
-testb__test_list:
-  - "test b item 1"
-
-testa__test_dict:
-  ports:
-    - 1
-
-testb__test_dict:
-  ports:
-    - 3
-
-
-# Merge variables that end with '__test_dict' and store the result in a variable 'example_a'
-example_a: "{{ lookup('community.general.merge_variables', '__test_dict', pattern_type='suffix') }}"
-
-# The variable example_a now contains:
-# ports:
-#   - 1
-#   - 3
-
-
-# Merge variables that match the '^.+__test_list$' regular expression, starting with an initial value and store the
-# result in a variable 'example_b'
-example_b: "{{ lookup('community.general.merge_variables', '^.+__test_list$', initial_value=test_init_list) }}"
-
-# The variable example_b now contains:
-#   - "list init item 1"
-#   - "list init item 2"
-#   - "test a item 1"
-#   - "test b item 1"
-"""
-
-RETURN = """
-  _raw:
-    description: In case the search matches list items, a list will be returned. In case the search matches dicts, a
-     dict will be returned.
-    type: raw
-    elements: raw
-"""
-
-import re
-
-from ansible.errors import AnsibleError
-from ansible.plugins.lookup import LookupBase
-from ansible.utils.display import Display
-
-display = Display()
-
-
-def _verify_and_get_type(variable):
-    if isinstance(variable, list):
-        return "list"
-    elif isinstance(variable, dict):
-        return "dict"
-    else:
-        raise AnsibleError("Not supported type detected, variable must be a list or a dict")
-
-
-class LookupModule(LookupBase):
-
-    def run(self, terms, variables=None, **kwargs):
-        self.set_options(direct=kwargs)
-        initial_value = self.get_option("initial_value", None)
-        self._override = self.get_option('override', 'error')
-        self._pattern_type = self.get_option('pattern_type', 'regex')
-
-        ret = []
-        for term in terms:
-            if not isinstance(term, str):
-                raise AnsibleError("Non-string type '{0}' passed, only 'str' types are allowed!".format(type(term)))
-
-            ret.append(self._merge_vars(term, initial_value, variables))
-
-        return ret
-
-    def _var_matches(self, key, search_pattern):
-        if self._pattern_type == "prefix":
-            return key.startswith(search_pattern)
-        elif self._pattern_type == "suffix":
-            return key.endswith(search_pattern)
-        elif self._pattern_type == "regex":
-            matcher = re.compile(search_pattern)
-            return matcher.search(key)
-
-        return False
-
-    def _merge_vars(self, search_pattern, initial_value, variables):
-        display.vvv("Merge variables with {0}: {1}".format(self._pattern_type, search_pattern))
-        var_merge_names = sorted([key for key in variables.keys() if self._var_matches(key, search_pattern)])
-        display.vvv("The following variables will be merged: {0}".format(var_merge_names))
-
-        prev_var_type = None
-        result = None
-
-        if initial_value is not None:
-            prev_var_type = _verify_and_get_type(initial_value)
-            result = initial_value
-
-        for var_name in var_merge_names:
-            var_value = self._templar.template(variables[var_name])  # Render jinja2 templates
-            var_type = _verify_and_get_type(var_value)
-
-            if prev_var_type is None:
-                prev_var_type = var_type
-            elif prev_var_type != var_type:
-                raise AnsibleError("Unable to merge, not all variables are of the same type")
-
-            if result is None:
-                result = var_value
-                continue
-
-            if var_type == "dict":
-                result = self._merge_dict(var_value, result, [var_name])
-            else:  # var_type == "list"
-                result += var_value
-
-        return result
-
-    def _merge_dict(self, src, dest, path):
-        for key, value in src.items():
-            if isinstance(value, dict):
-                node = dest.setdefault(key, {})
-                self._merge_dict(value, node, path + [key])
-            elif isinstance(value, list) and key in dest:
-                dest[key] += value
-            else:
-                if (key in dest) and dest[key] != value:
-                    msg = "The key '{0}' with value '{1}' will be overwritten with value '{2}' from '{3}.{0}'".format(
-                        key, dest[key], value, ".".join(path))
-
-                    if self._override == "error":
-                        raise AnsibleError(msg)
-                    if self._override == "warn":
-                        display.warning(msg)
-
-                dest[key] = value
-
-        return dest
--- a/plugins/lookup/onepassword.py
+++ b/plugins/lookup/onepassword.py
@@ -18,7 +18,7 @@ DOCUMENTATION = '''
      - C(op) 1Password command line utility. See U(https://support.1password.com/command-line/)
    short_description: fetch field values from 1Password
    description:
-      - P(community.general.onepassword#lookup) wraps the C(op) command line utility to fetch specific field values from 1Password.
+      - C(onepassword) wraps the C(op) command line utility to fetch specific field values from 1Password.
    options:
      _terms:
        description: identifier(s) (UUID, name, or subdomain; case-insensitive) of item(s) to retrieve.
@@ -42,19 +42,13 @@ DOCUMENTATION = '''
        description: The username used to sign in.
      secret_key:
        description: The secret key used when performing an initial sign in.
-      service_account_token:
-        description:
-          - The access key for a service account.
-          - Only works with 1Password CLI version 2 or later.
-        type: str
-        version_added: 7.1.0
      vault:
        description: Vault containing the item to retrieve (case-insensitive). If absent will search all vaults.
    notes:
      - This lookup will use an existing 1Password session if one exists. If not, and you have already
        performed an initial sign in (meaning C(~/.op/config), C(~/.config/op/config) or C(~/.config/.op/config) exists), then only the
-        C(master_password) is required. You may optionally specify O(subdomain) in this scenario, otherwise the last used subdomain will be used by C(op).
-      - This lookup can perform an initial login by providing O(subdomain), O(username), O(secret_key), and O(master_password).
+        C(master_password) is required. You may optionally specify C(subdomain) in this scenario, otherwise the last used subdomain will be used by C(op).
+      - This lookup can perform an initial login by providing C(subdomain), C(username), C(secret_key), and C(master_password).
      - Due to the B(very) sensitive nature of these credentials, it is B(highly) recommended that you only pass in the minimal credentials
        needed at any given time. Also, store these credentials in an Ansible Vault using a key that is equal to or greater in strength
        to the 1Password master password.
@@ -80,18 +74,18 @@ EXAMPLES = """

 - name: Retrieve password for HAL when not signed in to 1Password
  ansible.builtin.debug:
-    var: lookup('community.general.onepassword',
-                'HAL 9000',
-                subdomain='Discovery',
+    var: lookup('community.general.onepassword'
+                'HAL 9000'
+                subdomain='Discovery'
                master_password=vault_master_password)

 - name: Retrieve password for HAL when never signed in to 1Password
  ansible.builtin.debug:
-    var: lookup('community.general.onepassword',
-                'HAL 9000',
-                subdomain='Discovery',
-                master_password=vault_master_password,
-                username='tweety@acme.com',
+    var: lookup('community.general.onepassword'
+                'HAL 9000'
+                subdomain='Discovery'
+                master_password=vault_master_password
+                username='tweety@acme.com'
                secret_key=vault_secret_key)
 """

@@ -119,13 +113,12 @@ from ansible_collections.community.general.plugins.module_utils.onepassword impo
 class OnePassCLIBase(with_metaclass(abc.ABCMeta, object)):
    bin = "op"

-    def __init__(self, subdomain=None, domain="1password.com", username=None, secret_key=None, master_password=None, service_account_token=None):
+    def __init__(self, subdomain=None, domain="1password.com", username=None, secret_key=None, master_password=None):
        self.subdomain = subdomain
        self.domain = domain
        self.username = username
        self.master_password = master_password
        self.secret_key = secret_key
-        self.service_account_token = service_account_token

        self._path = None
        self._version = None
@@ -302,10 +295,6 @@ class OnePassCLIv1(OnePassCLIBase):
        return not bool(rc)

    def full_signin(self):
-        if self.service_account_token:
-            raise AnsibleLookupError(
-                "1Password CLI version 1 does not support Service Accounts. Please use version 2 or later.")
-
        required_params = [
            "subdomain",
            "username",
@@ -483,13 +472,6 @@ class OnePassCLIv2(OnePassCLIBase):
        return ""

    def assert_logged_in(self):
-        if self.service_account_token:
-            args = ["whoami"]
-            environment_update = {"OP_SERVICE_ACCOUNT_TOKEN": self.service_account_token}
-            rc, out, err = self._run(args, environment_update=environment_update)
-
-            return not bool(rc)
-
        args = ["account", "list"]
        if self.subdomain:
            account = "{subdomain}.{domain}".format(subdomain=self.subdomain, domain=self.domain)
@@ -535,13 +517,6 @@ class OnePassCLIv2(OnePassCLIBase):
        args = ["item", "get", item_id, "--format", "json"]
        if vault is not None:
            args += ["--vault={0}".format(vault)]
-
-        if self.service_account_token:
-            if vault is None:
-                raise AnsibleLookupError("'vault' is required with 'service_account_token'")
-            environment_update = {"OP_SERVICE_ACCOUNT_TOKEN": self.service_account_token}
-            return self._run(args, environment_update=environment_update)
-
        if token is not None:
            args += [to_bytes("--session=") + token]

@@ -558,14 +533,12 @@ class OnePassCLIv2(OnePassCLIBase):


 class OnePass(object):
-    def __init__(self, subdomain=None, domain="1password.com", username=None, secret_key=None, master_password=None,
-                 service_account_token=None):
+    def __init__(self, subdomain=None, domain="1password.com", username=None, secret_key=None, master_password=None):
        self.subdomain = subdomain
        self.domain = domain
        self.username = username
        self.secret_key = secret_key
        self.master_password = master_password
-        self.service_account_token = service_account_token

        self.logged_in = False
        self.token = None
@@ -578,7 +551,7 @@ class OnePass(object):
        for cls in OnePassCLIBase.__subclasses__():
            if cls.supports_version == version.split(".")[0]:
                try:
-                    return cls(self.subdomain, self.domain, self.username, self.secret_key, self.master_password, self.service_account_token)
+                    return cls(self.subdomain, self.domain, self.username, self.secret_key, self.master_password)
                except TypeError as e:
                    raise AnsibleLookupError(e)

@@ -641,9 +614,8 @@ class LookupModule(LookupBase):
        username = self.get_option("username")
        secret_key = self.get_option("secret_key")
        master_password = self.get_option("master_password")
-        service_account_token = self.get_option("service_account_token")

-        op = OnePass(subdomain, domain, username, secret_key, master_password, service_account_token)
+        op = OnePass(subdomain, domain, username, secret_key, master_password)
        op.assert_logged_in()

        values = []
--- a/plugins/lookup/onepassword_raw.py
+++ b/plugins/lookup/onepassword_raw.py
@@ -18,7 +18,7 @@ DOCUMENTATION = '''
      - C(op) 1Password command line utility. See U(https://support.1password.com/command-line/)
    short_description: fetch an entire item from 1Password
    description:
-      - P(community.general.onepassword_raw#lookup) wraps C(op) command line utility to fetch an entire item from 1Password.
+      - C(onepassword_raw) wraps C(op) command line utility to fetch an entire item from 1Password
    options:
      _terms:
        description: identifier(s) (UUID, name, or domain; case-insensitive) of item(s) to retrieve.
@@ -39,19 +39,13 @@ DOCUMENTATION = '''
        description: The username used to sign in.
      secret_key:
        description: The secret key used when performing an initial sign in.
-      service_account_token:
-        description:
-          - The access key for a service account.
-          - Only works with 1Password CLI version 2 or later.
-        type: string
-        version_added: 7.1.0
      vault:
        description: Vault containing the item to retrieve (case-insensitive). If absent will search all vaults.
    notes:
      - This lookup will use an existing 1Password session if one exists. If not, and you have already
-        performed an initial sign in (meaning C(~/.op/config exists)), then only the O(master_password) is required.
-        You may optionally specify O(subdomain) in this scenario, otherwise the last used subdomain will be used by C(op).
-      - This lookup can perform an initial login by providing O(subdomain), O(username), O(secret_key), and O(master_password).
+        performed an initial sign in (meaning C(~/.op/config exists)), then only the C(master_password) is required.
+        You may optionally specify C(subdomain) in this scenario, otherwise the last used subdomain will be used by C(op).
+      - This lookup can perform an initial login by providing C(subdomain), C(username), C(secret_key), and C(master_password).
      - Due to the B(very) sensitive nature of these credentials, it is B(highly) recommended that you only pass in the minimal credentials
        needed at any given time. Also, store these credentials in an Ansible Vault using a key that is equal to or greater in strength
        to the 1Password master password.
@@ -95,9 +89,8 @@ class LookupModule(LookupBase):
        username = self.get_option("username")
        secret_key = self.get_option("secret_key")
        master_password = self.get_option("master_password")
-        service_account_token = self.get_option("service_account_token")

-        op = OnePass(subdomain, domain, username, secret_key, master_password, service_account_token)
+        op = OnePass(subdomain, domain, username, secret_key, master_password)
        op.assert_logged_in()

        values = []
--- a/plugins/lookup/passwordstore.py
+++ b/plugins/lookup/passwordstore.py
@@ -16,7 +16,7 @@ DOCUMENTATION = '''
      - Enables Ansible to retrieve, create or update passwords from the passwordstore.org pass utility.
        It also retrieves YAML style keys stored as multilines in the passwordfile.
      - To avoid problems when accessing multiple secrets at once, add C(auto-expand-secmem) to
-        C(~/.gnupg/gpg-agent.conf). Where this is not possible, consider using O(lock=readwrite) instead.
+        C(~/.gnupg/gpg-agent.conf). Where this is not possible, consider using I(lock=readwrite) instead.
    options:
      _terms:
        description: query key.
@@ -24,16 +24,16 @@ DOCUMENTATION = '''
      directory:
        description:
          - The directory of the password store.
-          - If O(backend=pass), the default is V(~/.password-store) is used.
-          - If O(backend=gopass), then the default is the C(path) field in C(~/.config/gopass/config.yml),
-            falling back to V(~/.local/share/gopass/stores/root) if C(path) is not defined in the gopass config.
+          - If I(backend=pass), the default is C(~/.password-store) is used.
+          - If I(backend=gopass), then the default is the C(path) field in C(~/.config/gopass/config.yml),
+            falling back to C(~/.local/share/gopass/stores/root) if C(path) is not defined in the gopass config.
        type: path
        vars:
          - name: passwordstore
        env:
          - name: PASSWORD_STORE_DIR
      create:
-        description: Create the password if it does not already exist. Takes precedence over O(missing).
+        description: Create the password if it does not already exist. Takes precedence over C(missing).
        type: bool
        default: false
      overwrite:
@@ -43,7 +43,7 @@ DOCUMENTATION = '''
      umask:
        description:
          - Sets the umask for the created .gpg files. The first octed must be greater than 3 (user readable).
-          - Note pass' default value is V('077').
+          - Note pass' default value is C('077').
        env:
          - name: PASSWORD_STORE_UMASK
        version_added: 1.3.0
@@ -52,7 +52,7 @@ DOCUMENTATION = '''
        type: bool
        default: false
      subkey:
-        description: Return a specific subkey of the password. When set to V(password), always returns the first line.
+        description: Return a specific subkey of the password. When set to C(password), always returns the first line.
        type: str
        default: password
      userpass:
@@ -63,7 +63,7 @@ DOCUMENTATION = '''
        type: integer
        default: 16
      backup:
-        description: Used with O(overwrite=true). Backup the previous password in a subkey.
+        description: Used with C(overwrite=true). Backup the previous password in a subkey.
        type: bool
        default: false
      nosymbols:
@@ -73,10 +73,10 @@ DOCUMENTATION = '''
      missing:
        description:
          - List of preference about what to do if the password file is missing.
-          - If O(create=true), the value for this option is ignored and assumed to be V(create).
-          - If set to V(error), the lookup will error out if the passname does not exist.
-          - If set to V(create), the passname will be created with the provided length O(length) if it does not exist.
-          - If set to V(empty) or V(warn), will return a V(none) in case the passname does not exist.
+          - If I(create=true), the value for this option is ignored and assumed to be C(create).
+          - If set to C(error), the lookup will error out if the passname does not exist.
+          - If set to C(create), the passname will be created with the provided length I(length) if it does not exist.
+          - If set to C(empty) or C(warn), will return a C(none) in case the passname does not exist.
            When using C(lookup) and not C(query), this will be translated to an empty string.
        version_added: 3.1.0
        type: str
@@ -89,9 +89,9 @@ DOCUMENTATION = '''
      lock:
        description:
          - How to synchronize operations.
-          - The default of V(write) only synchronizes write operations.
-          - V(readwrite) synchronizes all operations (including read). This makes sure that gpg-agent is never called in parallel.
-          - V(none) does not do any synchronization.
+          - The default of C(write) only synchronizes write operations.
+          - C(readwrite) synchronizes all operations (including read). This makes sure that gpg-agent is never called in parallel.
+          - C(none) does not do any synchronization.
        ini:
          - section: passwordstore_lookup
            key: lock
@@ -104,8 +104,8 @@ DOCUMENTATION = '''
        version_added: 4.5.0
      locktimeout:
        description:
-          - Lock timeout applied when O(lock) is not V(none).
-          - Time with a unit suffix, V(s), V(m), V(h) for seconds, minutes, and hours, respectively. For example, V(900s) equals V(15m).
+          - Lock timeout applied when I(lock) is not C(none).
+          - Time with a unit suffix, C(s), C(m), C(h) for seconds, minutes, and hours, respectively. For example, C(900s) equals C(15m).
          - Correlates with C(pinentry-timeout) in C(~/.gnupg/gpg-agent.conf), see C(man gpg-agent) for details.
        ini:
          - section: passwordstore_lookup
@@ -116,8 +116,8 @@ DOCUMENTATION = '''
      backend:
        description:
          - Specify which backend to use.
-          - Defaults to V(pass), passwordstore.org's original pass utility.
-          - V(gopass) support is incomplete.
+          - Defaults to C(pass), passwordstore.org's original pass utility.
+          - C(gopass) support is incomplete.
        ini:
          - section: passwordstore_lookup
            key: backend
@@ -209,6 +209,7 @@ import time
 import yaml

 from ansible.errors import AnsibleError, AnsibleAssertionError
+from ansible.module_utils.common.file import FileLock
 from ansible.module_utils.common.text.converters import to_bytes, to_native, to_text
 from ansible.module_utils.parsing.convert_bool import boolean
 from ansible.utils.display import Display
@@ -216,8 +217,6 @@ from ansible.utils.encrypt import random_password
 from ansible.plugins.lookup import LookupBase
 from ansible import constants as C

-from ansible_collections.community.general.plugins.module_utils._filelock import FileLock
-
 display = Display()


--- a/plugins/lookup/random_string.py
+++ b/plugins/lookup/random_string.py
@@ -16,8 +16,6 @@ DOCUMENTATION = r"""
    version_added: '3.2.0'
    description:
      - Generates random string based upon the given constraints.
-      - Uses L(random.SystemRandom,https://docs.python.org/3/library/random.html#random.SystemRandom),
-        so should be strong enough for cryptographic purposes.
    options:
      length:
        description: The length of the string.
@@ -44,25 +42,25 @@ DOCUMENTATION = r"""
        - Special characters are taken from Python standard library C(string).
          See L(the documentation of string.punctuation,https://docs.python.org/3/library/string.html#string.punctuation)
          for which characters will be used.
-        - The choice of special characters can be changed to setting O(override_special).
+        - The choice of special characters can be changed to setting I(override_special).
        default: true
        type: bool
      min_numeric:
        description:
        - Minimum number of numeric characters in the string.
-        - If set, overrides O(numbers=false).
+        - If set, overrides I(numbers=false).
        default: 0
        type: int
      min_upper:
        description:
        - Minimum number of uppercase alphabets in the string.
-        - If set, overrides O(upper=false).
+        - If set, overrides I(upper=false).
        default: 0
        type: int
      min_lower:
        description:
        - Minimum number of lowercase alphabets in the string.
-        - If set, overrides O(lower=false).
+        - If set, overrides I(lower=false).
        default: 0
        type: int
      min_special:
@@ -73,11 +71,11 @@ DOCUMENTATION = r"""
      override_special:
        description:
        - Overide a list of special characters to use in the string.
-        - If set O(min_special) should be set to a non-default value.
+        - If set I(min_special) should be set to a non-default value.
        type: str
      override_all:
        description:
-        - Override all values of O(numbers), O(upper), O(lower), and O(special) with
+        - Override all values of I(numbers), I(upper), I(lower), and I(special) with
          the given list of characters.
        type: str
      base64:
--- a/plugins/lookup/revbitspss.py
+++ b/plugins/lookup/revbitspss.py
@@ -25,7 +25,7 @@ options:
        elements: string
    base_url:
        description:
-            - This will be the base URL of the server, for example V(https://server-url-here).
+            - This will be the base URL of the server, for example C(https://server-url-here).
        required: true
        type: string
    api_key:
--- a/plugins/lookup/tss.py
+++ b/plugins/lookup/tss.py
@@ -13,10 +13,10 @@ short_description: Get secrets from Thycotic Secret Server
 version_added: 1.0.0
 description:
    - Uses the Thycotic Secret Server Python SDK to get Secrets from Secret
-      Server using token authentication with O(username) and O(password) on
-      the REST API at O(base_url).
+      Server using token authentication with I(username) and I(password) on
+      the REST API at I(base_url).
    - When using self-signed certificates the environment variable
-      E(REQUESTS_CA_BUNDLE) can be set to a file containing the trusted certificates
+      C(REQUESTS_CA_BUNDLE) can be set to a file containing the trusted certificates
      (in C(.pem) format).
    - For example, C(export REQUESTS_CA_BUNDLE='/etc/ssl/certs/ca-bundle.trust.crt').
 requirements:
@@ -26,32 +26,8 @@ options:
        description: The integer ID of the secret.
        required: true
        type: int
-    secret_path:
-        description: Indicate a full path of secret including folder and secret name when the secret ID is set to 0.
-        required: false
-        type: str
-        version_added: 7.2.0
-    fetch_secret_ids_from_folder:
-        description:
-            - Boolean flag which indicates whether secret ids are in a folder is fetched by folder ID or not.
-            - V(true) then the terms will be considered as a folder IDs. Otherwise (default), they are considered as secret IDs.
-        required: false
-        type: bool
-        version_added: 7.1.0
-    fetch_attachments:
-        description:
-            - Boolean flag which indicates whether attached files will get downloaded or not.
-            - The download will only happen if O(file_download_path) has been provided.
-        required: false
-        type: bool
-        version_added: 7.0.0
-    file_download_path:
-        description: Indicate the file attachment download location.
-        required: false
-        type: path
-        version_added: 7.0.0
    base_url:
-        description: The base URL of the server, for example V(https://localhost/SecretServer).
+        description: The base URL of the server, e.g. C(https://localhost/SecretServer).
        env:
            - name: TSS_BASE_URL
        ini:
@@ -68,7 +44,7 @@ options:
    password:
        description:
            - The password associated with the supplied username.
-            - Required when O(token) is not provided.
+            - Required when I(token) is not provided.
        env:
            - name: TSS_PASSWORD
        ini:
@@ -78,7 +54,7 @@ options:
        default: ""
        description:
          - The domain with which to request the OAuth2 Access Grant.
-          - Optional when O(token) is not provided.
+          - Optional when I(token) is not provided.
          - Requires C(python-tss-sdk) version 1.0.0 or greater.
        env:
            - name: TSS_DOMAIN
@@ -90,7 +66,7 @@ options:
    token:
        description:
          - Existing token for Thycotic authorizer.
-          - If provided, O(username) and O(password) are not needed.
+          - If provided, I(username) and I(password) are not needed.
          - Requires C(python-tss-sdk) version 1.0.0 or greater.
        env:
            - name: TSS_TOKEN
@@ -181,101 +157,39 @@ EXAMPLES = r"""
  tasks:
      - ansible.builtin.debug:
          msg: the password is {{ secret_password }}
-
-# Private key stores into certificate file which is attached with secret.
-# If fetch_attachments=True then private key file will be download on specified path
-# and file content will display in debug message.
- hosts: localhost
-  vars:
-      secret: >-
-        {{
-            lookup(
-                'community.general.tss',
-                102,
-                fetch_attachments=True,
-                file_download_path='/home/certs',
-                base_url='https://secretserver.domain.com/SecretServer/',
-                token='thycotic_access_token'
-            )
-        }}
-  tasks:
-    - ansible.builtin.debug:
-        msg: >
-          the private key is {{
-            (secret['items']
-              | items2dict(key_name='slug',
-                           value_name='itemValue'))['private-key']
-          }}
-
-# If fetch_secret_ids_from_folder=true then secret IDs are in a folder is fetched based on folder ID
- hosts: localhost
-  vars:
-      secret: >-
-        {{
-            lookup(
-                'community.general.tss',
-                102,
-                fetch_secret_ids_from_folder=true,
-                base_url='https://secretserver.domain.com/SecretServer/',
-                token='thycotic_access_token'
-            )
-        }}
-  tasks:
-    - ansible.builtin.debug:
-        msg: >
-          the secret id's are {{
-              secret
-          }}
-
-# If secret ID is 0 and secret_path has value then secret is fetched by secret path
- hosts: localhost
-  vars:
-      secret: >-
-        {{
-            lookup(
-                'community.general.tss',
-                0,
-                secret_path='\folderName\secretName'
-                base_url='https://secretserver.domain.com/SecretServer/',
-                username='user.name',
-                password='password'
-            )
-        }}
-  tasks:
-      - ansible.builtin.debug:
-          msg: >
-            the password is {{
-              (secret['items']
-                | items2dict(key_name='slug',
-                             value_name='itemValue'))['password']
-            }}
 """

 import abc
-import os
+
 from ansible.errors import AnsibleError, AnsibleOptionsError
 from ansible.module_utils import six
 from ansible.plugins.lookup import LookupBase
 from ansible.utils.display import Display

 try:
-    from delinea.secrets.server import SecretServer, SecretServerError, PasswordGrantAuthorizer, DomainPasswordGrantAuthorizer, AccessTokenAuthorizer
+    from thycotic.secrets.server import SecretServer, SecretServerError

    HAS_TSS_SDK = True
-    HAS_DELINEA_SS_SDK = True
-    HAS_TSS_AUTHORIZER = True
 except ImportError:
    try:
-        from thycotic.secrets.server import SecretServer, SecretServerError, PasswordGrantAuthorizer, DomainPasswordGrantAuthorizer, AccessTokenAuthorizer
+        from delinea.secrets.server import SecretServer, SecretServerError

        HAS_TSS_SDK = True
-        HAS_DELINEA_SS_SDK = False
-        HAS_TSS_AUTHORIZER = True
    except ImportError:
        SecretServer = None
        SecretServerError = None
        HAS_TSS_SDK = False
-        HAS_DELINEA_SS_SDK = False
+
+try:
+    from thycotic.secrets.server import PasswordGrantAuthorizer, DomainPasswordGrantAuthorizer, AccessTokenAuthorizer
+
+    HAS_TSS_AUTHORIZER = True
+except ImportError:
+    try:
+        from delinea.secrets.server import PasswordGrantAuthorizer, DomainPasswordGrantAuthorizer, AccessTokenAuthorizer
+
+        HAS_TSS_AUTHORIZER = True
+    except ImportError:
        PasswordGrantAuthorizer = None
        DomainPasswordGrantAuthorizer = None
        AccessTokenAuthorizer = None
@@ -297,49 +211,13 @@ class TSSClient(object):
        else:
            return TSSClientV0(**server_parameters)

-    def get_secret(self, term, secret_path, fetch_file_attachments, file_download_path):
+    def get_secret(self, term):
        display.debug("tss_lookup term: %s" % term)
+
        secret_id = self._term_to_secret_id(term)
-        if secret_id == 0 and secret_path:
-            fetch_secret_by_path = True
-            display.vvv(u"Secret Server lookup of Secret with path %s" % secret_path)
-        else:
-            fetch_secret_by_path = False
-            display.vvv(u"Secret Server lookup of Secret with ID %d" % secret_id)
+        display.vvv(u"Secret Server lookup of Secret with ID %d" % secret_id)

-        if fetch_file_attachments:
-            if fetch_secret_by_path:
-                obj = self._client.get_secret_by_path(secret_path, fetch_file_attachments)
-            else:
-                obj = self._client.get_secret(secret_id, fetch_file_attachments)
-            for i in obj['items']:
-                if file_download_path and os.path.isdir(file_download_path):
-                    if i['isFile']:
-                        try:
-                            file_content = i['itemValue'].content
-                            with open(os.path.join(file_download_path, str(obj['id']) + "_" + i['slug']), "wb") as f:
-                                f.write(file_content)
-                        except ValueError:
-                            raise AnsibleOptionsError("Failed to download {0}".format(str(i['slug'])))
-                        except AttributeError:
-                            display.warning("Could not read file content for {0}".format(str(i['slug'])))
-                        finally:
-                            i['itemValue'] = "*** Not Valid For Display ***"
-                else:
-                    raise AnsibleOptionsError("File download path does not exist")
-            return obj
-        else:
-            if fetch_secret_by_path:
-                return self._client.get_secret_by_path(secret_path, False)
-            else:
-                return self._client.get_secret_json(secret_id)
-
-    def get_secret_ids_by_folderid(self, term):
-        display.debug("tss_lookup term: %s" % term)
-        folder_id = self._term_to_folder_id(term)
-        display.vvv(u"Secret Server lookup of Secret id's with Folder ID %d" % folder_id)
-
-        return self._client.get_secret_ids_by_folderid(folder_id)
+        return self._client.get_secret_json(secret_id)

    @staticmethod
    def _term_to_secret_id(term):
@@ -348,13 +226,6 @@ class TSSClient(object):
        except ValueError:
            raise AnsibleOptionsError("Secret ID must be an integer")

-    @staticmethod
-    def _term_to_folder_id(term):
-        try:
-            return int(term)
-        except ValueError:
-            raise AnsibleOptionsError("Folder ID must be an integer")
-

 class TSSClientV0(TSSClient):
    def __init__(self, **server_parameters):
@@ -423,20 +294,6 @@ class LookupModule(LookupBase):
        )

        try:
-            if self.get_option("fetch_secret_ids_from_folder"):
-                if HAS_DELINEA_SS_SDK:
-                    return [tss.get_secret_ids_by_folderid(term) for term in terms]
-                else:
-                    raise AnsibleError("latest python-tss-sdk must be installed to use this plugin")
-            else:
-                return [
-                    tss.get_secret(
-                        term,
-                        self.get_option("secret_path"),
-                        self.get_option("fetch_attachments"),
-                        self.get_option("file_download_path"),
-                    )
-                    for term in terms
-                ]
+            return [tss.get_secret(term) for term in terms]
        except SecretServerError as error:
            raise AnsibleError("Secret Server lookup failure: %s" % error.message)
--- a/plugins/module_utils/_filelock.py
+++ b/plugins/module_utils/_filelock.py
@@ -1,109 +0,0 @@
-# Copyright (c) 2018, Ansible Project
-# Simplified BSD License (see licenses/simplified_bsd.txt or https://opensource.org/licenses/BSD-2-Clause)
-# SPDX-License-Identifier: BSD-2-Clause
-
-# NOTE:
-# This has been vendored from ansible.module_utils.common.file. This code has been removed from there for ansible-core 2.16.
-
-from __future__ import (absolute_import, division, print_function)
-__metaclass__ = type
-
-import os
-import stat
-import time
-import fcntl
-import sys
-
-from contextlib import contextmanager
-
-
-class LockTimeout(Exception):
-    pass
-
-
-class FileLock:
-    '''
-    Currently FileLock is implemented via fcntl.flock on a lock file, however this
-    behaviour may change in the future. Avoid mixing lock types fcntl.flock,
-    fcntl.lockf and module_utils.common.file.FileLock as it will certainly cause
-    unwanted and/or unexpected behaviour
-    '''
-    def __init__(self):
-        self.lockfd = None
-
-    @contextmanager
-    def lock_file(self, path, tmpdir, lock_timeout=None):
-        '''
-        Context for lock acquisition
-        '''
-        try:
-            self.set_lock(path, tmpdir, lock_timeout)
-            yield
-        finally:
-            self.unlock()
-
-    def set_lock(self, path, tmpdir, lock_timeout=None):
-        '''
-        Create a lock file based on path with flock to prevent other processes
-        using given path.
-        Please note that currently file locking only works when it's executed by
-        the same user, I.E single user scenarios
-
-        :kw path: Path (file) to lock
-        :kw tmpdir: Path where to place the temporary .lock file
-        :kw lock_timeout:
-            Wait n seconds for lock acquisition, fail if timeout is reached.
-            0 = Do not wait, fail if lock cannot be acquired immediately,
-            Default is None, wait indefinitely until lock is released.
-        :returns: True
-        '''
-        lock_path = os.path.join(tmpdir, 'ansible-{0}.lock'.format(os.path.basename(path)))
-        l_wait = 0.1
-        r_exception = IOError
-        if sys.version_info[0] == 3:
-            r_exception = BlockingIOError
-
-        self.lockfd = open(lock_path, 'w')
-
-        if lock_timeout <= 0:
-            fcntl.flock(self.lockfd, fcntl.LOCK_EX | fcntl.LOCK_NB)
-            os.chmod(lock_path, stat.S_IWRITE | stat.S_IREAD)
-            return True
-
-        if lock_timeout:
-            e_secs = 0
-            while e_secs < lock_timeout:
-                try:
-                    fcntl.flock(self.lockfd, fcntl.LOCK_EX | fcntl.LOCK_NB)
-                    os.chmod(lock_path, stat.S_IWRITE | stat.S_IREAD)
-                    return True
-                except r_exception:
-                    time.sleep(l_wait)
-                    e_secs += l_wait
-                    continue
-
-            self.lockfd.close()
-            raise LockTimeout('{0} sec'.format(lock_timeout))
-
-        fcntl.flock(self.lockfd, fcntl.LOCK_EX)
-        os.chmod(lock_path, stat.S_IWRITE | stat.S_IREAD)
-
-        return True
-
-    def unlock(self):
-        '''
-        Make sure lock file is available for everyone and Unlock the file descriptor
-        locked by set_lock
-
-        :returns: True
-        '''
-        if not self.lockfd:
-            return True
-
-        try:
-            fcntl.flock(self.lockfd, fcntl.LOCK_UN)
-            self.lockfd.close()
-        except ValueError:  # file wasn't opened, let context manager fail gracefully
-            pass
-
-        return True
--- a/plugins/module_utils/_stormssh.py
+++ b/plugins/module_utils/_stormssh.py
@@ -1,258 +0,0 @@
-# -*- coding: utf-8 -*-
-# This code is part of Ansible, but is an independent component.
-# This particular file snippet, and this file snippet only, is based on
-# the config parser from here: https://github.com/emre/storm/blob/master/storm/parsers/ssh_config_parser.py
-# Copyright (C) <2013> <Emre Yilmaz>
-# SPDX-License-Identifier: MIT
-
-from __future__ import (absolute_import, division, print_function)
-import os
-import re
-import traceback
-from operator import itemgetter
-
-__metaclass__ = type
-
-try:
-    from paramiko.config import SSHConfig
-except ImportError:
-    SSHConfig = object
-    HAS_PARAMIKO = False
-    PARAMIKO_IMPORT_ERROR = traceback.format_exc()
-else:
-    HAS_PARAMIKO = True
-    PARAMIKO_IMPORT_ERROR = None
-
-
-class StormConfig(SSHConfig):
-    def parse(self, file_obj):
-        """
-        Read an OpenSSH config from the given file object.
-        @param file_obj: a file-like object to read the config file from
-        @type file_obj: file
-        """
-        order = 1
-        host = {"host": ['*'], "config": {}, }
-        for line in file_obj:
-            line = line.rstrip('\n').lstrip()
-            if line == '':
-                self._config.append({
-                    'type': 'empty_line',
-                    'value': line,
-                    'host': '',
-                    'order': order,
-                })
-                order += 1
-                continue
-
-            if line.startswith('#'):
-                self._config.append({
-                    'type': 'comment',
-                    'value': line,
-                    'host': '',
-                    'order': order,
-                })
-                order += 1
-                continue
-
-            if '=' in line:
-                # Ensure ProxyCommand gets properly split
-                if line.lower().strip().startswith('proxycommand'):
-                    proxy_re = re.compile(r"^(proxycommand)\s*=*\s*(.*)", re.I)
-                    match = proxy_re.match(line)
-                    key, value = match.group(1).lower(), match.group(2)
-                else:
-                    key, value = line.split('=', 1)
-                    key = key.strip().lower()
-            else:
-                # find first whitespace, and split there
-                i = 0
-                while (i < len(line)) and not line[i].isspace():
-                    i += 1
-                if i == len(line):
-                    raise Exception('Unparsable line: %r' % line)
-                key = line[:i].lower()
-                value = line[i:].lstrip()
-            if key == 'host':
-                self._config.append(host)
-                value = value.split()
-                host = {
-                    key: value,
-                    'config': {},
-                    'type': 'entry',
-                    'order': order
-                }
-                order += 1
-            elif key in ['identityfile', 'localforward', 'remoteforward']:
-                if key in host['config']:
-                    host['config'][key].append(value)
-                else:
-                    host['config'][key] = [value]
-            elif key not in host['config']:
-                host['config'].update({key: value})
-        self._config.append(host)
-
-
-class ConfigParser(object):
-    """
-    Config parser for ~/.ssh/config files.
-    """
-
-    def __init__(self, ssh_config_file=None):
-        if not ssh_config_file:
-            ssh_config_file = self.get_default_ssh_config_file()
-
-        self.defaults = {}
-
-        self.ssh_config_file = ssh_config_file
-
-        if not os.path.exists(self.ssh_config_file):
-            if not os.path.exists(os.path.dirname(self.ssh_config_file)):
-                os.makedirs(os.path.dirname(self.ssh_config_file))
-            open(self.ssh_config_file, 'w+').close()
-            os.chmod(self.ssh_config_file, 0o600)
-
-        self.config_data = []
-
-    def get_default_ssh_config_file(self):
-        return os.path.expanduser("~/.ssh/config")
-
-    def load(self):
-        config = StormConfig()
-
-        with open(self.ssh_config_file) as fd:
-            config.parse(fd)
-
-        for entry in config.__dict__.get("_config"):
-            if entry.get("host") == ["*"]:
-                self.defaults.update(entry.get("config"))
-
-            if entry.get("type") in ["comment", "empty_line"]:
-                self.config_data.append(entry)
-                continue
-
-            host_item = {
-                'host': entry["host"][0],
-                'options': entry.get("config"),
-                'type': 'entry',
-                'order': entry.get("order", 0),
-            }
-
-            if len(entry["host"]) > 1:
-                host_item.update({
-                    'host': " ".join(entry["host"]),
-                })
-            # minor bug in paramiko.SSHConfig that duplicates
-            # "Host *" entries.
-            if entry.get("config") and len(entry.get("config")) > 0:
-                self.config_data.append(host_item)
-
-        return self.config_data
-
-    def add_host(self, host, options):
-        self.config_data.append({
-            'host': host,
-            'options': options,
-            'order': self.get_last_index(),
-        })
-
-        return self
-
-    def update_host(self, host, options, use_regex=False):
-        for index, host_entry in enumerate(self.config_data):
-            if host_entry.get("host") == host or \
-                    (use_regex and re.match(host, host_entry.get("host"))):
-
-                if 'deleted_fields' in options:
-                    deleted_fields = options.pop("deleted_fields")
-                    for deleted_field in deleted_fields:
-                        del self.config_data[index]["options"][deleted_field]
-
-                self.config_data[index]["options"].update(options)
-
-        return self
-
-    def search_host(self, search_string):
-        results = []
-        for host_entry in self.config_data:
-            if host_entry.get("type") != 'entry':
-                continue
-            if host_entry.get("host") == "*":
-                continue
-
-            searchable_information = host_entry.get("host")
-            for key, value in host_entry.get("options").items():
-                if isinstance(value, list):
-                    value = " ".join(value)
-                if isinstance(value, int):
-                    value = str(value)
-
-                searchable_information += " " + value
-
-            if search_string in searchable_information:
-                results.append(host_entry)
-
-        return results
-
-    def delete_host(self, host):
-        found = 0
-        for index, host_entry in enumerate(self.config_data):
-            if host_entry.get("host") == host:
-                del self.config_data[index]
-                found += 1
-
-        if found == 0:
-            raise ValueError('No host found')
-        return self
-
-    def delete_all_hosts(self):
-        self.config_data = []
-        self.write_to_ssh_config()
-
-        return self
-
-    def dump(self):
-        if len(self.config_data) < 1:
-            return
-
-        file_content = ""
-        self.config_data = sorted(self.config_data, key=itemgetter("order"))
-
-        for host_item in self.config_data:
-            if host_item.get("type") in ['comment', 'empty_line']:
-                file_content += host_item.get("value") + "\n"
-                continue
-            host_item_content = "Host {0}\n".format(host_item.get("host"))
-            for key, value in host_item.get("options").items():
-                if isinstance(value, list):
-                    sub_content = ""
-                    for value_ in value:
-                        sub_content += "    {0} {1}\n".format(
-                            key, value_
-                        )
-                    host_item_content += sub_content
-                else:
-                    host_item_content += "    {0} {1}\n".format(
-                        key, value
-                    )
-            file_content += host_item_content
-
-        return file_content
-
-    def write_to_ssh_config(self):
-        with open(self.ssh_config_file, 'w+') as f:
-            data = self.dump()
-            if data:
-                f.write(data)
-        return self
-
-    def get_last_index(self):
-        last_index = 0
-        indexes = []
-        for item in self.config_data:
-            if item.get("order"):
-                indexes.append(item.get("order"))
-        if len(indexes) > 0:
-            last_index = max(indexes)
-
-        return last_index
--- a/plugins/module_utils/btrfs.py
+++ b/plugins/module_utils/btrfs.py
@@ -1,464 +0,0 @@
-# Copyright (c) 2022, Gregory Furlong <gnfzdz@fzdz.io>
-# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-from __future__ import (absolute_import, division, print_function)
-__metaclass__ = type
-
-from ansible.module_utils.common.text.converters import to_bytes
-import re
-import os
-
-
-def normalize_subvolume_path(path):
-    """
-    Normalizes btrfs subvolume paths to ensure exactly one leading slash, no trailing slashes and no consecutive slashes.
-    In addition, if the path is prefixed with a leading <FS_TREE>, this value is removed.
-    """
-    fstree_stripped = re.sub(r'^<FS_TREE>', '', path)
-    result = re.sub(r'/+$', '', re.sub(r'/+', '/', '/' + fstree_stripped))
-    return result if len(result) > 0 else '/'
-
-
-class BtrfsModuleException(Exception):
-    pass
-
-
-class BtrfsCommands(object):
-
-    """
-    Provides access to a subset of the Btrfs command line
-    """
-
-    def __init__(self, module):
-        self.__module = module
-        self.__btrfs = self.__module.get_bin_path("btrfs", required=True)
-
-    def filesystem_show(self):
-        command = "%s filesystem show -d" % (self.__btrfs)
-        result = self.__module.run_command(command, check_rc=True)
-        stdout = [x.strip() for x in result[1].splitlines()]
-        filesystems = []
-        current = None
-        for line in stdout:
-            if line.startswith('Label'):
-                current = self.__parse_filesystem(line)
-                filesystems.append(current)
-            elif line.startswith('devid'):
-                current['devices'].append(self.__parse_filesystem_device(line))
-        return filesystems
-
-    def __parse_filesystem(self, line):
-        label = re.sub(r'\s*uuid:.*$', '', re.sub(r'^Label:\s*', '', line))
-        id = re.sub(r'^.*uuid:\s*', '', line)
-
-        filesystem = {}
-        filesystem['label'] = label.strip("'") if label != 'none' else None
-        filesystem['uuid'] = id
-        filesystem['devices'] = []
-        filesystem['mountpoints'] = []
-        filesystem['subvolumes'] = []
-        filesystem['default_subvolid'] = None
-        return filesystem
-
-    def __parse_filesystem_device(self, line):
-        return re.sub(r'^.*path\s', '', line)
-
-    def subvolumes_list(self, filesystem_path):
-        command = "%s subvolume list -tap %s" % (self.__btrfs, filesystem_path)
-        result = self.__module.run_command(command, check_rc=True)
-        stdout = [x.split('\t') for x in result[1].splitlines()]
-        subvolumes = [{'id': 5, 'parent': None, 'path': '/'}]
-        if len(stdout) > 2:
-            subvolumes.extend([self.__parse_subvolume_list_record(x) for x in stdout[2:]])
-        return subvolumes
-
-    def __parse_subvolume_list_record(self, item):
-        return {
-            'id': int(item[0]),
-            'parent': int(item[2]),
-            'path': normalize_subvolume_path(item[5]),
-        }
-
-    def subvolume_get_default(self, filesystem_path):
-        command = [self.__btrfs, "subvolume", "get-default", to_bytes(filesystem_path)]
-        result = self.__module.run_command(command, check_rc=True)
-        # ID [n] ...
-        return int(result[1].strip().split()[1])
-
-    def subvolume_set_default(self, filesystem_path, subvolume_id):
-        command = [self.__btrfs, "subvolume", "set-default", str(subvolume_id), to_bytes(filesystem_path)]
-        result = self.__module.run_command(command, check_rc=True)
-
-    def subvolume_create(self, subvolume_path):
-        command = [self.__btrfs, "subvolume", "create", to_bytes(subvolume_path)]
-        result = self.__module.run_command(command, check_rc=True)
-
-    def subvolume_snapshot(self, snapshot_source, snapshot_destination):
-        command = [self.__btrfs, "subvolume", "snapshot", to_bytes(snapshot_source), to_bytes(snapshot_destination)]
-        result = self.__module.run_command(command, check_rc=True)
-
-    def subvolume_delete(self, subvolume_path):
-        command = [self.__btrfs, "subvolume", "delete", to_bytes(subvolume_path)]
-        result = self.__module.run_command(command, check_rc=True)
-
-
-class BtrfsInfoProvider(object):
-
-    """
-    Utility providing details of the currently available btrfs filesystems
-    """
-
-    def __init__(self, module):
-        self.__module = module
-        self.__btrfs_api = BtrfsCommands(module)
-        self.__findmnt_path = self.__module.get_bin_path("findmnt", required=True)
-
-    def get_filesystems(self):
-        filesystems = self.__btrfs_api.filesystem_show()
-        mountpoints = self.__find_mountpoints()
-        for filesystem in filesystems:
-            device_mountpoints = self.__filter_mountpoints_for_devices(mountpoints, filesystem['devices'])
-            filesystem['mountpoints'] = device_mountpoints
-
-            if len(device_mountpoints) > 0:
-
-                # any path within the filesystem can be used to query metadata
-                mountpoint = device_mountpoints[0]['mountpoint']
-                filesystem['subvolumes'] = self.get_subvolumes(mountpoint)
-                filesystem['default_subvolid'] = self.get_default_subvolume_id(mountpoint)
-
-        return filesystems
-
-    def get_mountpoints(self, filesystem_devices):
-        mountpoints = self.__find_mountpoints()
-        return self.__filter_mountpoints_for_devices(mountpoints, filesystem_devices)
-
-    def get_subvolumes(self, filesystem_path):
-        return self.__btrfs_api.subvolumes_list(filesystem_path)
-
-    def get_default_subvolume_id(self, filesystem_path):
-        return self.__btrfs_api.subvolume_get_default(filesystem_path)
-
-    def __filter_mountpoints_for_devices(self, mountpoints, devices):
-        return [m for m in mountpoints if (m['device'] in devices)]
-
-    def __find_mountpoints(self):
-        command = "%s -t btrfs -nvP" % self.__findmnt_path
-        result = self.__module.run_command(command)
-        mountpoints = []
-        if result[0] == 0:
-            lines = result[1].splitlines()
-            for line in lines:
-                mountpoint = self.__parse_mountpoint_pairs(line)
-                mountpoints.append(mountpoint)
-        return mountpoints
-
-    def __parse_mountpoint_pairs(self, line):
-        pattern = re.compile(r'^TARGET="(?P<target>.*)"\s+SOURCE="(?P<source>.*)"\s+FSTYPE="(?P<fstype>.*)"\s+OPTIONS="(?P<options>.*)"\s*$')
-        match = pattern.search(line)
-        if match is not None:
-            groups = match.groupdict()
-
-            return {
-                'mountpoint': groups['target'],
-                'device': groups['source'],
-                'subvolid': self.__extract_mount_subvolid(groups['options']),
-            }
-        else:
-            raise BtrfsModuleException("Failed to parse findmnt result for line: '%s'" % line)
-
-    def __extract_mount_subvolid(self, mount_options):
-        for option in mount_options.split(','):
-            if option.startswith('subvolid='):
-                return int(option[len('subvolid='):])
-        raise BtrfsModuleException("Failed to find subvolid for mountpoint in options '%s'" % mount_options)
-
-
-class BtrfsSubvolume(object):
-
-    """
-    Wrapper class providing convenience methods for inspection of a btrfs subvolume
-    """
-
-    def __init__(self, filesystem, subvolume_id):
-        self.__filesystem = filesystem
-        self.__subvolume_id = subvolume_id
-
-    def get_filesystem(self):
-        return self.__filesystem
-
-    def is_mounted(self):
-        mountpoints = self.get_mountpoints()
-        return mountpoints is not None and len(mountpoints) > 0
-
-    def is_filesystem_root(self):
-        return 5 == self.__subvolume_id
-
-    def is_filesystem_default(self):
-        return self.__filesystem.default_subvolid == self.__subvolume_id
-
-    def get_mounted_path(self):
-        mountpoints = self.get_mountpoints()
-        if mountpoints is not None and len(mountpoints) > 0:
-            return mountpoints[0]
-        elif self.parent is not None:
-            parent = self.__filesystem.get_subvolume_by_id(self.parent)
-            parent_path = parent.get_mounted_path()
-            if parent_path is not None:
-                return parent_path + os.path.sep + self.name
-        else:
-            return None
-
-    def get_mountpoints(self):
-        return self.__filesystem.get_mountpoints_by_subvolume_id(self.__subvolume_id)
-
-    def get_child_relative_path(self, absolute_child_path):
-        """
-        Get the relative path from this subvolume to the named child subvolume.
-        The provided parameter is expected to be normalized as by normalize_subvolume_path.
-        """
-        path = self.path
-        if absolute_child_path.startswith(path):
-            relative = absolute_child_path[len(path):]
-            return re.sub(r'^/*', '', relative)
-        else:
-            raise BtrfsModuleException("Path '%s' doesn't start with '%s'" % (absolute_child_path, path))
-
-    def get_parent_subvolume(self):
-        parent_id = self.parent
-        return self.__filesystem.get_subvolume_by_id(parent_id) if parent_id is not None else None
-
-    def get_child_subvolumes(self):
-        return self.__filesystem.get_subvolume_children(self.__subvolume_id)
-
-    @property
-    def __info(self):
-        return self.__filesystem.get_subvolume_info_for_id(self.__subvolume_id)
-
-    @property
-    def id(self):
-        return self.__subvolume_id
-
-    @property
-    def name(self):
-        return self.path.split('/').pop()
-
-    @property
-    def path(self):
-        return self.__info['path']
-
-    @property
-    def parent(self):
-        return self.__info['parent']
-
-
-class BtrfsFilesystem(object):
-
-    """
-    Wrapper class providing convenience methods for inspection of a btrfs filesystem
-    """
-
-    def __init__(self, info, provider, module):
-        self.__provider = provider
-
-        # constant for module execution
-        self.__uuid = info['uuid']
-        self.__label = info['label']
-        self.__devices = info['devices']
-
-        # refreshable
-        self.__default_subvolid = info['default_subvolid'] if 'default_subvolid' in info else None
-        self.__update_mountpoints(info['mountpoints'] if 'mountpoints' in info else [])
-        self.__update_subvolumes(info['subvolumes'] if 'subvolumes' in info else [])
-
-    @property
-    def uuid(self):
-        return self.__uuid
-
-    @property
-    def label(self):
-        return self.__label
-
-    @property
-    def default_subvolid(self):
-        return self.__default_subvolid
-
-    @property
-    def devices(self):
-        return list(self.__devices)
-
-    def refresh(self):
-        self.refresh_mountpoints()
-        self.refresh_subvolumes()
-        self.refresh_default_subvolume()
-
-    def refresh_mountpoints(self):
-        mountpoints = self.__provider.get_mountpoints(list(self.__devices))
-        self.__update_mountpoints(mountpoints)
-
-    def __update_mountpoints(self, mountpoints):
-        self.__mountpoints = dict()
-        for i in mountpoints:
-            subvolid = i['subvolid']
-            mountpoint = i['mountpoint']
-            if subvolid not in self.__mountpoints:
-                self.__mountpoints[subvolid] = []
-            self.__mountpoints[subvolid].append(mountpoint)
-
-    def refresh_subvolumes(self):
-        filesystem_path = self.get_any_mountpoint()
-        if filesystem_path is not None:
-            subvolumes = self.__provider.get_subvolumes(filesystem_path)
-            self.__update_subvolumes(subvolumes)
-
-    def __update_subvolumes(self, subvolumes):
-        # TODO strategy for retaining information on deleted subvolumes?
-        self.__subvolumes = dict()
-        for subvolume in subvolumes:
-            self.__subvolumes[subvolume['id']] = subvolume
-
-    def refresh_default_subvolume(self):
-        filesystem_path = self.get_any_mountpoint()
-        if filesystem_path is not None:
-            self.__default_subvolid = self.__provider.get_default_subvolume_id(filesystem_path)
-
-    def contains_device(self, device):
-        return device in self.__devices
-
-    def contains_subvolume(self, subvolume):
-        return self.get_subvolume_by_name(subvolume) is not None
-
-    def get_subvolume_by_id(self, subvolume_id):
-        return BtrfsSubvolume(self, subvolume_id) if subvolume_id in self.__subvolumes else None
-
-    def get_subvolume_info_for_id(self, subvolume_id):
-        return self.__subvolumes[subvolume_id] if subvolume_id in self.__subvolumes else None
-
-    def get_subvolume_by_name(self, subvolume):
-        for subvolume_info in self.__subvolumes.values():
-            if subvolume_info['path'] == subvolume:
-                return BtrfsSubvolume(self, subvolume_info['id'])
-        return None
-
-    def get_any_mountpoint(self):
-        for subvol_mountpoints in self.__mountpoints.values():
-            if len(subvol_mountpoints) > 0:
-                return subvol_mountpoints[0]
-        # maybe error?
-        return None
-
-    def get_any_mounted_subvolume(self):
-        for subvolid, subvol_mountpoints in self.__mountpoints.items():
-            if len(subvol_mountpoints) > 0:
-                return self.get_subvolume_by_id(subvolid)
-        return None
-
-    def get_mountpoints_by_subvolume_id(self, subvolume_id):
-        return self.__mountpoints[subvolume_id] if subvolume_id in self.__mountpoints else []
-
-    def get_nearest_subvolume(self, subvolume):
-        """Return the identified subvolume if existing, else the closest matching parent"""
-        subvolumes_by_path = self.__get_subvolumes_by_path()
-        while len(subvolume) > 1:
-            if subvolume in subvolumes_by_path:
-                return BtrfsSubvolume(self, subvolumes_by_path[subvolume]['id'])
-            else:
-                subvolume = re.sub(r'/[^/]+$', '', subvolume)
-
-        return BtrfsSubvolume(self, 5)
-
-    def get_mountpath_as_child(self, subvolume_name):
-        """Find a path to the target subvolume through a mounted ancestor"""
-        nearest = self.get_nearest_subvolume(subvolume_name)
-        if nearest.path == subvolume_name:
-            nearest = nearest.get_parent_subvolume()
-        if nearest is None or nearest.get_mounted_path() is None:
-            raise BtrfsModuleException("Failed to find a path '%s' through a mounted parent subvolume" % subvolume_name)
-        else:
-            return nearest.get_mounted_path() + os.path.sep + nearest.get_child_relative_path(subvolume_name)
-
-    def get_subvolume_children(self, subvolume_id):
-        return [BtrfsSubvolume(self, x['id']) for x in self.__subvolumes.values() if x['parent'] == subvolume_id]
-
-    def __get_subvolumes_by_path(self):
-        result = {}
-        for s in self.__subvolumes.values():
-            path = s['path']
-            result[path] = s
-        return result
-
-    def is_mounted(self):
-        return self.__mountpoints is not None and len(self.__mountpoints) > 0
-
-    def get_summary(self):
-        subvolumes = []
-        sources = self.__subvolumes.values() if self.__subvolumes is not None else []
-        for subvolume in sources:
-            id = subvolume['id']
-            subvolumes.append({
-                'id': id,
-                'path': subvolume['path'],
-                'parent': subvolume['parent'],
-                'mountpoints': self.get_mountpoints_by_subvolume_id(id),
-            })
-
-        return {
-            'default_subvolume': self.__default_subvolid,
-            'devices': self.__devices,
-            'label': self.__label,
-            'uuid': self.__uuid,
-            'subvolumes': subvolumes,
-        }
-
-
-class BtrfsFilesystemsProvider(object):
-
-    """
-    Provides methods to query available btrfs filesystems
-    """
-
-    def __init__(self, module):
-        self.__module = module
-        self.__provider = BtrfsInfoProvider(module)
-        self.__filesystems = None
-
-    def get_matching_filesystem(self, criteria):
-        if criteria['device'] is not None:
-            criteria['device'] = os.path.realpath(criteria['device'])
-
-        self.__check_init()
-        matching = [f for f in self.__filesystems.values() if self.__filesystem_matches_criteria(f, criteria)]
-        if len(matching) == 1:
-            return matching[0]
-        else:
-            raise BtrfsModuleException("Found %d filesystems matching criteria uuid=%s label=%s device=%s" % (
-                len(matching),
-                criteria['uuid'],
-                criteria['label'],
-                criteria['device']
-            ))
-
-    def __filesystem_matches_criteria(self, filesystem, criteria):
-        return ((criteria['uuid'] is None or filesystem.uuid == criteria['uuid']) and
-                (criteria['label'] is None or filesystem.label == criteria['label']) and
-                (criteria['device'] is None or filesystem.contains_device(criteria['device'])))
-
-    def get_filesystem_for_device(self, device):
-        real_device = os.path.realpath(device)
-        self.__check_init()
-        for fs in self.__filesystems.values():
-            if fs.contains_device(real_device):
-                return fs
-        return None
-
-    def get_filesystems(self):
-        self.__check_init()
-        return list(self.__filesystems.values())
-
-    def __check_init(self):
-        if self.__filesystems is None:
-            self.__filesystems = dict()
-            for f in self.__provider.get_filesystems():
-                uuid = f['uuid']
-                self.__filesystems[uuid] = BtrfsFilesystem(f, self.__provider, self.__module)
--- a/plugins/module_utils/cmd_runner.py
+++ b/plugins/module_utils/cmd_runner.py
@@ -147,11 +147,6 @@ class _Format(object):

    @staticmethod
    def as_default_type(_type, arg="", ignore_none=None):
-        #
-        # DEPRECATION: This method is deprecated and will be removed in community.general 10.0.0
-        #
-        # Instead of using the implicit formats provided here, use the explicit necessary format method.
-        #
        fmt = _Format
        if _type == "dict":
            return fmt.as_func(lambda d: ["--{0}={1}".format(*a) for a in iteritems(d)], ignore_none=ignore_none)
@@ -314,3 +309,11 @@ class _CmdRunnerContext(object):


 cmd_runner_fmt = _Format()
+
+#
+# The fmt form is deprecated and will be removed in community.general 7.0.0
+# Please use:
+#   cmd_runner_fmt
+# Or, to retain the same effect, use:
+#   from ansible_collections.community.general.plugins.module_utils.cmd_runner import cmd_runner_fmt as fmt
+fmt = cmd_runner_fmt
--- a/plugins/module_utils/csv.py
+++ b/plugins/module_utils/csv.py
@@ -55,10 +55,8 @@ def initialize_dialect(dialect, **kwargs):


 def read_csv(data, dialect, fieldnames=None):
-    BOM = to_native(u'\ufeff')
+
    data = to_native(data, errors='surrogate_or_strict')
-    if data.startswith(BOM):
-        data = data[len(BOM):]

    if PY3:
        fake_fh = StringIO(data)
--- a/plugins/module_utils/deps.py
+++ b/plugins/module_utils/deps.py
@@ -50,7 +50,7 @@ class _Dependency(object):
    def failed(self):
        return self.state == 1

-    def validate(self, module):
+    def verify(self, module):
        if self.failed:
            module.fail_json(msg=self.message, exception=self.trace)

@@ -71,28 +71,20 @@ def declare(name, *args, **kwargs):
        _deps[name] = dep


-def _select_names(spec):
+def validate(module, spec=None):
    dep_names = sorted(_deps)

-    if spec:
+    if spec is not None:
        if spec.startswith("-"):
            spec_split = spec[1:].split(":")
            for d in spec_split:
                dep_names.remove(d)
        else:
-            spec_split = spec.split(":")
+            spec_split = spec[1:].split(":")
            dep_names = []
            for d in spec_split:
                _deps[d]  # ensure it exists
                dep_names.append(d)

-    return dep_names
-
-
-def validate(module, spec=None):
-    for dep in _select_names(spec):
-        _deps[dep].validate(module)
-
-
-def failed(spec=None):
-    return any(_deps[d].failed for d in _select_names(spec))
+    for dep in dep_names:
+        _deps[dep].verify(module)
--- a/Show More
+++ b/Show More