Merge "Wrong usage of "an""

horizon/static/horizon/js/horizon.d3barchart.js

@@ -581,7 +581,7 @@ horizon.d3_bar_chart = {
     var svg = jquery_element.find('svg');
     svg.hide();
 
-    // Width an height of the chart will be taken from chart wrapper,
+    // Width and height of the chart will be taken from chart wrapper,
     // that can be styled by css.
     var width = jquery_element.width();
 

horizon/static/horizon/js/horizon.d3linechart.js

@@ -337,7 +337,7 @@ horizon.d3_line_chart = {
       svg.hide();
 
       /*
-        Width an height of the chart will be taken from chart wrapper,
+        Width and height of the chart will be taken from chart wrapper,
         that can be styled by css.
       */
       self.width = jquery_element.width();

openstack_dashboard/api/network_base.py

@@ -71,7 +71,7 @@ class FloatingIpManager(object):
         """Allocates a floating IP to the tenant.
 
         You must provide a pool name or id for which you would like to
-        allocate an floating IP.
+        allocate a floating IP.
         """
         pass
 

openstack_dashboard/api/rest/nova.py

@@ -241,7 +241,7 @@ class Flavors(generic.View):
         """Get a list of flavors.
 
         The listing result is an object with property "items". Each item is
-        an flavor. By default this will return the flavors for the user's
+        a flavor. By default this will return the flavors for the user's
         current project. If the user is admin, public flavors will also be
         returned.
 

openstack_dashboard/static/app/core/openstack-service-api/glance.service.js

@@ -290,7 +290,7 @@
      * http://docs.openstack.org/developer/glance/metadefs-concepts.html
      *
      * The listing result is an object with property "items". Each item is
-     * an namespace.
+     * a namespace.
      *
      * @description
      * Get a list of namespaces.