diff --git a/lib/ansible/modules/cloud/amazon/_ec2_ami_search.py b/lib/ansible/modules/cloud/amazon/_ec2_ami_search.py
index 04c54db46ac..7319773a3bd 100644
--- a/lib/ansible/modules/cloud/amazon/_ec2_ami_search.py
+++ b/lib/ansible/modules/cloud/amazon/_ec2_ami_search.py
@@ -25,7 +25,7 @@ DOCUMENTATION = '''
---
module: ec2_ami_search
short_description: Retrieve AWS AMI information for a given operating system.
-deprecated: "in favor of the ec2_ami_find module"
+deprecated: "Use M(ec2_ami_find) instead."
version_added: "1.6"
description:
- Look up the most recent AMI on AWS for a given operating system.
diff --git a/lib/ansible/modules/cloud/openstack/_glance_image.py b/lib/ansible/modules/cloud/openstack/_glance_image.py
index a97255241ae..520814353f5 100644
--- a/lib/ansible/modules/cloud/openstack/_glance_image.py
+++ b/lib/ansible/modules/cloud/openstack/_glance_image.py
@@ -24,7 +24,7 @@ DOCUMENTATION = '''
---
module: glance_image
version_added: "1.2"
-deprecated: Deprecated in 1.10. Use os_image instead
+deprecated: Deprecated in 1.10. Use M(os_image) instead.
short_description: Add/Delete images from glance
description:
- Add or Remove images from the glance repository.
diff --git a/lib/ansible/modules/cloud/openstack/_keystone_user.py b/lib/ansible/modules/cloud/openstack/_keystone_user.py
index 1d48e9e130e..202adc63f6d 100644
--- a/lib/ansible/modules/cloud/openstack/_keystone_user.py
+++ b/lib/ansible/modules/cloud/openstack/_keystone_user.py
@@ -25,7 +25,7 @@ DOCUMENTATION = '''
---
module: keystone_user
version_added: "1.2"
-deprecated: Deprecated in 2.0. Use os_user instead
+deprecated: Deprecated in 2.0. Use M(os_user) instead.
short_description: Manage OpenStack Identity (keystone) users, tenants and roles
description:
- Manage users,tenants, roles from OpenStack.
diff --git a/lib/ansible/modules/cloud/openstack/_nova_compute.py b/lib/ansible/modules/cloud/openstack/_nova_compute.py
index 0bea21048f5..8edd6116443 100644
--- a/lib/ansible/modules/cloud/openstack/_nova_compute.py
+++ b/lib/ansible/modules/cloud/openstack/_nova_compute.py
@@ -38,7 +38,7 @@ DOCUMENTATION = '''
---
module: nova_compute
version_added: "1.2"
-deprecated: Deprecated in 2.0. Use os_server instead
+deprecated: Deprecated in 2.0. Use M(os_server) instead.
short_description: Create/Delete VMs from OpenStack
description:
- Create or Remove virtual machines from Openstack.
diff --git a/lib/ansible/modules/cloud/openstack/_nova_keypair.py b/lib/ansible/modules/cloud/openstack/_nova_keypair.py
index 914db91bf2f..9c210573110 100644
--- a/lib/ansible/modules/cloud/openstack/_nova_keypair.py
+++ b/lib/ansible/modules/cloud/openstack/_nova_keypair.py
@@ -36,7 +36,7 @@ version_added: "1.2"
author:
- "Benno Joy (@bennojoy)"
- "Michael DeHaan"
-deprecated: Deprecated in 2.0. Use os_keypair instead
+deprecated: Deprecated in 2.0. Use M(os_keypair) instead.
short_description: Add/Delete key pair from nova
description:
- Add or Remove key pair from nova .
diff --git a/lib/ansible/modules/cloud/openstack/_quantum_floating_ip.py b/lib/ansible/modules/cloud/openstack/_quantum_floating_ip.py
index 9c72c431d0b..6171a553ac9 100644
--- a/lib/ansible/modules/cloud/openstack/_quantum_floating_ip.py
+++ b/lib/ansible/modules/cloud/openstack/_quantum_floating_ip.py
@@ -40,7 +40,7 @@ version_added: "1.2"
author:
- "Benno Joy (@bennojoy)"
- "Brad P. Crochet (@bcrochet)"
-deprecated: Deprecated in 2.0. Use os_floating_ip instead
+deprecated: Deprecated in 2.0. Use M(os_floating_ip) instead.
short_description: Add/Remove floating IP from an instance
description:
- Add or Remove a floating IP to an instance
diff --git a/lib/ansible/modules/cloud/openstack/_quantum_floating_ip_associate.py b/lib/ansible/modules/cloud/openstack/_quantum_floating_ip_associate.py
index f7eed5fe861..55bf1c0b35d 100644
--- a/lib/ansible/modules/cloud/openstack/_quantum_floating_ip_associate.py
+++ b/lib/ansible/modules/cloud/openstack/_quantum_floating_ip_associate.py
@@ -37,7 +37,7 @@ DOCUMENTATION = '''
module: quantum_floating_ip_associate
version_added: "1.2"
author: "Benno Joy (@bennojoy)"
-deprecated: Deprecated in 2.0. Use os_floating_ip instead
+deprecated: Deprecated in 2.0. Use M(os_floating_ip) instead.
short_description: Associate or disassociate a particular floating IP with an instance
description:
- Associates or disassociates a specific floating IP with a particular instance
diff --git a/lib/ansible/modules/cloud/openstack/_quantum_network.py b/lib/ansible/modules/cloud/openstack/_quantum_network.py
index db82e90d335..9897d50aa49 100644
--- a/lib/ansible/modules/cloud/openstack/_quantum_network.py
+++ b/lib/ansible/modules/cloud/openstack/_quantum_network.py
@@ -34,7 +34,7 @@ DOCUMENTATION = '''
---
module: quantum_network
version_added: "1.4"
-deprecated: Deprecated in 2.0. Use os_network instead
+deprecated: Deprecated in 2.0. Use M(os_network) instead.
short_description: Creates/Removes networks from OpenStack
description:
- Add or Remove network from OpenStack.
diff --git a/lib/ansible/modules/cloud/openstack/_quantum_router.py b/lib/ansible/modules/cloud/openstack/_quantum_router.py
index c65f916d6b1..6726ca20a6e 100644
--- a/lib/ansible/modules/cloud/openstack/_quantum_router.py
+++ b/lib/ansible/modules/cloud/openstack/_quantum_router.py
@@ -35,7 +35,7 @@ DOCUMENTATION = '''
module: quantum_router
version_added: "1.2"
author: "Benno Joy (@bennojoy)"
-deprecated: Deprecated in 2.0. Use os_router instead
+deprecated: Deprecated in 2.0. Use M(os_router) instead.
short_description: Create or Remove router from openstack
description:
- Create or Delete routers from OpenStack
diff --git a/lib/ansible/modules/cloud/openstack/_quantum_router_gateway.py b/lib/ansible/modules/cloud/openstack/_quantum_router_gateway.py
index af6179bc62d..6d0c715090d 100644
--- a/lib/ansible/modules/cloud/openstack/_quantum_router_gateway.py
+++ b/lib/ansible/modules/cloud/openstack/_quantum_router_gateway.py
@@ -35,7 +35,7 @@ DOCUMENTATION = '''
module: quantum_router_gateway
version_added: "1.2"
author: "Benno Joy (@bennojoy)"
-deprecated: Deprecated in 2.0. Use os_router instead
+deprecated: Deprecated in 2.0. Use M(os_router) instead.
short_description: set/unset a gateway interface for the router with the specified external network
description:
- Creates/Removes a gateway interface from the router, used to associate a external network with a router to route external traffic.
diff --git a/lib/ansible/modules/cloud/openstack/_quantum_router_interface.py b/lib/ansible/modules/cloud/openstack/_quantum_router_interface.py
index b2a1784d99a..09de7dd901b 100644
--- a/lib/ansible/modules/cloud/openstack/_quantum_router_interface.py
+++ b/lib/ansible/modules/cloud/openstack/_quantum_router_interface.py
@@ -35,7 +35,7 @@ DOCUMENTATION = '''
module: quantum_router_interface
version_added: "1.2"
author: "Benno Joy (@bennojoy)"
-deprecated: Deprecated in 2.0. Use os_router instead
+deprecated: Deprecated in 2.0. Use M(os_router) instead.
short_description: Attach/Detach a subnet's interface to a router
description:
- Attach/Detach a subnet interface to a router, to provide a gateway for the subnet.
diff --git a/lib/ansible/modules/cloud/openstack/_quantum_subnet.py b/lib/ansible/modules/cloud/openstack/_quantum_subnet.py
index e03f5962295..f59919a464a 100644
--- a/lib/ansible/modules/cloud/openstack/_quantum_subnet.py
+++ b/lib/ansible/modules/cloud/openstack/_quantum_subnet.py
@@ -33,7 +33,7 @@ ANSIBLE_METADATA = {'status': ['deprecated'],
DOCUMENTATION = '''
---
module: quantum_subnet
-deprecated: Deprecated in 2.0. Use os_subnet instead
+deprecated: Deprecated in 2.0. Use M(os_subnet) instead.
version_added: "1.2"
short_description: Add/remove subnet from a network
description:
diff --git a/lib/ansible/modules/network/ios/_ios_template.py b/lib/ansible/modules/network/ios/_ios_template.py
index 62186320caa..f6ffb1fe3be 100644
--- a/lib/ansible/modules/network/ios/_ios_template.py
+++ b/lib/ansible/modules/network/ios/_ios_template.py
@@ -33,7 +33,7 @@ description:
by evaluating the current running-config and only pushing configuration
commands that are not already configured. The config source can
be a set of commands or a template.
-deprecated: Deprecated in 2.2. Use ios_config instead
+deprecated: Deprecated in 2.2. Use M(ios_config) instead.
extends_documentation_fragment: ios
options:
src:
diff --git a/lib/ansible/modules/network/iosxr/_iosxr_template.py b/lib/ansible/modules/network/iosxr/_iosxr_template.py
index 315e693c3f2..70a37f228ea 100644
--- a/lib/ansible/modules/network/iosxr/_iosxr_template.py
+++ b/lib/ansible/modules/network/iosxr/_iosxr_template.py
@@ -33,7 +33,7 @@ description:
by evaluating the current running-config and only pushing configuration
commands that are not already configured. The config source can
be a set of commands or a template.
-deprecated: Deprecated in 2.2. Use iosxr_config instead
+deprecated: Deprecated in 2.2. Use M(iosxr_config) instead.
extends_documentation_fragment: iosxr
options:
src:
diff --git a/lib/ansible/modules/network/junos/_junos_template.py b/lib/ansible/modules/network/junos/_junos_template.py
index bd0ecf371ea..448eabe45d3 100644
--- a/lib/ansible/modules/network/junos/_junos_template.py
+++ b/lib/ansible/modules/network/junos/_junos_template.py
@@ -32,7 +32,7 @@ description:
from a template file onto a remote device running Junos. The
module will return the differences in configuration if the diff
option is specified on the Ansible command line
-deprecated: Deprecated in 2.2. Use junos_config instead
+deprecated: Deprecated in 2.2. Use M(junos_config) instead.
extends_documentation_fragment: junos
options:
src:
diff --git a/lib/ansible/modules/network/nxos/_nxos_template.py b/lib/ansible/modules/network/nxos/_nxos_template.py
index a5b976aa4ce..df0f96acc0e 100644
--- a/lib/ansible/modules/network/nxos/_nxos_template.py
+++ b/lib/ansible/modules/network/nxos/_nxos_template.py
@@ -33,7 +33,7 @@ description:
by evaluating the current running-config and only pushing configuration
commands that are not already configured. The config source can
be a set of commands or a template.
-deprecated: Deprecated in 2.2. Use nxos_config instead
+deprecated: Deprecated in 2.2. Use M(nxos_config) instead.
extends_documentation_fragment: nxos
options:
src:
diff --git a/lib/ansible/modules/network/openswitch/_ops_template.py b/lib/ansible/modules/network/openswitch/_ops_template.py
index d3cb0e00d10..b6675980b94 100644
--- a/lib/ansible/modules/network/openswitch/_ops_template.py
+++ b/lib/ansible/modules/network/openswitch/_ops_template.py
@@ -33,7 +33,7 @@ description:
against a provided candidate configuration. If there are changes, the
candidate configuration is merged with the current configuration and
pushed into OpenSwitch
-deprecated: Deprecated in 2.2. Use ops_config instead
+deprecated: Deprecated in 2.2. Use M(ops_config) instead.
extends_documentation_fragment: openswitch
options:
src:
diff --git a/lib/ansible/modules/utilities/helper/_accelerate.py b/lib/ansible/modules/utilities/helper/_accelerate.py
index 5bd38931f22..ff14877a3df 100644
--- a/lib/ansible/modules/utilities/helper/_accelerate.py
+++ b/lib/ansible/modules/utilities/helper/_accelerate.py
@@ -26,7 +26,7 @@ DOCUMENTATION = '''
---
module: accelerate
short_description: Enable accelerated mode on remote node
-deprecated: "in favor of SSH with ControlPersist"
+deprecated: "Use SSH with ControlPersist instead."
description:
- This modules launches an ephemeral I(accelerate) daemon on the remote node which
Ansible can use to communicate with nodes at high speed.