Merge branch 'devel' of https://github.com/ansible/ansible into devel

library/cloud/digital_ocean_domain

@@ -59,7 +59,7 @@ EXAMPLES = '''
 
 # Create a droplet and a corresponding domain record
 
-- digital_cean_droplet: >
+- digital_ocean: >
       state=present
       name=test_droplet
       size_id=1
@@ -69,8 +69,8 @@ EXAMPLES = '''
 
 - digital_ocean_domain: >
       state=present
-      name={{ test_droplet.name }}.my.domain
-      ip={{ test_droplet.ip_address }}
+      name={{ test_droplet.droplet.name }}.my.domain
+      ip={{ test_droplet.droplet.ip_address }}
 '''
 
 import sys