From a6eafb87c85560d08fa005db9813063f611ebbab Mon Sep 17 00:00:00 2001
From: Brian Coca <brian.coca+git@gmail.com>
Date: Mon, 4 May 2015 12:06:57 -0400
Subject: [PATCH] minor doc fixes

---
 cloud/openstack/_nova_compute.py | 2 +-
 cloud/openstack/os_server.py     | 6 ++----
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/cloud/openstack/_nova_compute.py b/cloud/openstack/_nova_compute.py
index 83b3efe59c2..369281bc42b 100644
--- a/cloud/openstack/_nova_compute.py
+++ b/cloud/openstack/_nova_compute.py
@@ -33,7 +33,7 @@ DOCUMENTATION = '''
 ---
 module: nova_compute
 version_added: "1.2"
-deprecated: Deprecated in 1.10. Use os_server instead
+deprecated: Deprecated in 2.0. Use os_server instead
 short_description: Create/Delete VMs from OpenStack
 description:
    - Create or Remove virtual machines from Openstack.
diff --git a/cloud/openstack/os_server.py b/cloud/openstack/os_server.py
index 8d42471a891..195d114ee46 100644
--- a/cloud/openstack/os_server.py
+++ b/cloud/openstack/os_server.py
@@ -32,7 +32,7 @@ DOCUMENTATION = '''
 module: os_server
 short_description: Create/Delete Compute Instances from OpenStack
 extends_documentation_fragment: openstack
-version_added: "1.10"
+version_added: "2.0"
 description:
    - Create or Remove compute instances from OpenStack.
 options:
@@ -40,12 +40,10 @@ options:
      description:
         - Name that has to be given to the instance
      required: true
-     default: None
    image:
      description:
         - The name or id of the base image to boot.
      required: true
-     default: None
    image_exclude:
      description:
         - Text to use to filter image names, for the case, such as HP, where
@@ -92,7 +90,7 @@ options:
      required: false
      default: 'yes'
    floating_ips:
-     decription:
+     description:
         - list of valid floating IPs that pre-exist to assign to this node
      required: false
      default: None