Merge pull request #1584 from sivel/doc-fix-ec2_vpc_dhcp_options

DOCUMENTATION and RETURN fixes for modules

cloud/amazon/ec2_vol_facts.py

@@ -55,6 +55,10 @@ EXAMPLES = '''
 
 '''
 
+# TODO: Disabled the RETURN as it was breaking docs building. Someone needs to
+# fix this
+RETURN = '''# '''
+
 try:
     import boto.ec2
     from boto.exception import BotoServerError

cloud/amazon/ec2_vpc_dhcp_options.py

@@ -26,40 +26,40 @@ description:
 author: "Joel Thompson (@joelthompson)"
 version_added: 2.1
 options:
-  - domain_name:
+  domain_name:
     description:
       - The domain name to set in the DHCP option sets
     required:
       - false
     default: ""
-  - dns_servers:
+  dns_servers:
     description:
       - A list of hosts to set the DNS servers for the VPC to. (Should be a
         list of IP addresses rather than host names.)
     required: false
     default: []
-  - ntp_servers:
+  ntp_servers:
     description:
       - List of hosts to advertise as NTP servers for the VPC.
     required: false
     default: []
-  - netbios_name_servers:
+  netbios_name_servers:
     description:
       - List of hosts to advertise as NetBIOS servers.
     required: false
     default: []
-  - netbios_node_type:
+  netbios_node_type:
     description:
       - NetBIOS node type to advertise in the DHCP options. The
         default is 2, per AWS recommendation
         http://docs.aws.amazon.com/AmazonVPC/latest/UserGuide/VPC_DHCP_Options.html
     required: false
     default: 2
-  - vpc_id:
+  vpc_id:
     description:
       - VPC ID to associate with the requested DHCP option set
     required: true
-  - delete_old:
+  delete_old:
     description:
       - Whether to delete the old VPC DHCP option set when creating a new one.
         This is primarily useful for debugging/development purposes when you
@@ -68,7 +68,7 @@ options:
         is in use by any other VPC. (Otherwise, AWS will return an error.)
     required: false
     default: true
-  - inherit_existing:
+  inherit_existing:
     description:
       - For any DHCP options not specified in these parameters, whether to
         inherit them from the options set already applied to vpc_id, or to