Fix up the limits documentation

Change-Id: I924cda5ae570c69db9100acc4c897fcbfb29f4fb

doc/source/users/resources/compute/index.rst

@@ -8,8 +8,7 @@ Compute Resources
    v2/flavor
    v2/image
    v2/keypair
-   v2/limits_absolute
-   v2/limits_rate
+   v2/limits
    v2/server
    v2/server_interface
    v2/server_ip

doc/source/users/resources/compute/v2/limits.rst

@@ -0,0 +1,28 @@
+openstack.compute.v2.limits
+===========================
+
+.. automodule:: openstack.compute.v2.limits
+
+The Limits Class
+----------------
+
+The ``Limits`` class inherits from :class:`~openstack.resource.Resource`.
+
+.. autoclass:: openstack.compute.v2.limits.Limits
+   :members:
+
+The AbsoluteLimits Class
+------------------------
+
+The ``AbsoluteLimits`` class inherits from :class:`~openstack.resource.Resource`.
+
+.. autoclass:: openstack.compute.v2.limits.AbsoluteLimits
+   :members:
+
+The RateLimits Class
+--------------------
+
+The ``RateLimits`` class inherits from :class:`~openstack.resource.Resource`.
+
+.. autoclass:: openstack.compute.v2.limits.RateLimits
+   :members:

doc/source/users/resources/compute/v2/limits_absolute.rst

@@ -1,12 +0,0 @@
-openstack.compute.v2.limits_absolute
-====================================
-
-.. automodule:: openstack.compute.v2.limits_absolute
-
-The LimitsAbsolute Class
-------------------------
-
-The ``LimitsAbsolute`` class inherits from :class:`~openstack.resource.Resource`.
-
-.. autoclass:: openstack.compute.v2.limits_absolute.LimitsAbsolute
-   :members:

doc/source/users/resources/compute/v2/limits_rate.rst

@@ -1,12 +0,0 @@
-openstack.compute.v2.limits_rate
-================================
-
-.. automodule:: openstack.compute.v2.limits_rate
-
-The LimitsRate Class
---------------------
-
-The ``LimitsRate`` class inherits from :class:`~openstack.resource.Resource`.
-
-.. autoclass:: openstack.compute.v2.limits_rate.LimitsRate
-   :members:

openstack/compute/v2/limits.py

@@ -16,7 +16,7 @@ from openstack import resource
 
 class AbsoluteLimits(resource.Resource):
 
-    #: The maximum amount of key-value pairs to be set as image metadata.
+    #: The number of key-value pairs that can be set as image metadata.
     image_meta = resource.prop("maxImageMeta")
     #: The maximum number of personality contents that can be supplied.
     personality = resource.prop("maxPersonality")
@@ -28,7 +28,7 @@ class AbsoluteLimits(resource.Resource):
     security_groups = resource.prop("maxSecurityGroups")
     #: The amount of security groups currently in use.
     security_groups_used = resource.prop("totalSecurityGroupsUsed")
-    #: The maximum amount of key-value pairs to be set as sever metadata.
+    #: The number of key-value pairs that can be set as sever metadata.
     server_meta = resource.prop("maxServerMeta")
     #: The maximum amount of cores.
     total_cores = resource.prop("maxTotalCores")