Merge "Fix typos"

doc/source/devref/cephfs_native_driver.rst

@@ -16,7 +16,7 @@ http://docs.ceph.com/docs/master/cephfs/).  If you choose to use the kernel
 client rather than the FUSE client, the share size limits set in Manila
 may not be obeyed.
 
-Prerequisities
+Prerequisites
 --------------
 
 - A Ceph cluster with a filesystem configured (

manila/api/common.py

@@ -265,7 +265,7 @@ class ViewBuilder(object):
         return parse.urlunsplit(url_parts)
 
     def update_versioned_resource_dict(self, request, resource_dict, resource):
-        """Updates teh given resource dict for the given request version.
+        """Updates the given resource dict for the given request version.
 
         This method calls every method, that is applicable to the request
         version, in _detail_version_modifiers.

manila/cmd/manage.py

@@ -167,7 +167,7 @@ class ShellCommands(object):
 
     @args('--path', required=True, help='Script path')
     def script(self, path):
-        """Runs the script from the specifed path with flags set properly.
+        """Runs the script from the specified path with flags set properly.
 
         arguments: path
         """

manila/common/config.py

@@ -170,7 +170,7 @@ CONF.register_opts(global_opts)
 
 
 def verify_share_protocols():
-    """Perfom verification of 'enabled_share_protocols'."""
+    """Perform verification of 'enabled_share_protocols'."""
     msg = None
     supported_protocols = constants.SUPPORTED_SHARE_PROTOCOLS
     data = dict(supported=', '.join(supported_protocols))

manila/network/linux/ip_lib.py

@@ -415,7 +415,7 @@ class IpRouteCommand(IpDeviceCommandBase):
         return routes
 
     def delete_net_route(self, cidr, device):
-        """Deletes a route according to suplied CIDR and interface device.
+        """Deletes a route according to supplied CIDR and interface device.
 
         :param cidr: The network CIDR to be removed.
         :param device: The network interface device to be removed.

manila/share/driver.py

@@ -980,7 +980,7 @@ class ShareDriver(object):
 
             member_update_list -  a list of dictionaries containing for every
             member of the cgsnapshot. Each dict should contains values to be
-            updated for teh CGSnapshotMember in the database. This list may be
+            updated for the CGSnapshotMember in the database. This list may be
             empty or None.
         """
         raise NotImplementedError()

manila/share/drivers/cephfs/cephfs_native.py

@@ -65,7 +65,7 @@ CONF.register_opts(cephfs_native_opts)
 
 
 class CephFSNativeDriver(driver.ShareDriver,):
-    """Driver for the Ceph Filsystem.
+    """Driver for the Ceph Filesystem.
 
     This driver is 'native' in the sense that it exposes a CephFS filesystem
     for use directly by guests, with no intermediate layer like NFS.

manila/share/drivers/glusterfs/common.py

@@ -377,7 +377,7 @@ def numreduct(vers):
 def _mount_gluster_vol(execute, gluster_export, mount_path, ensure=False):
     """Mount a GlusterFS volume at the specified mount path.
 
-    :param execute: command exectution function
+    :param execute: command execution function
     :param gluster_export: GlusterFS export to mount
     :param mount_path: path to mount at
     :param ensure: boolean to allow remounting a volume with a warning
@@ -398,7 +398,7 @@ def _mount_gluster_vol(execute, gluster_export, mount_path, ensure=False):
 def _umount_gluster_vol(execute, mount_path):
     """Unmount a GlusterFS volume at the specified mount path.
 
-    :param execute: command exectution function
+    :param execute: command execution function
     :param mount_path: path where volume is mounted
     """
 

manila/share/drivers/ibm/ganesha_utils.py

@@ -15,7 +15,7 @@
 Ganesha Admin Utilities
 
 Ganesha NFS does not provide many tools for automating the process of creating
-and managing export defintions.  This module provides utilities to help parse
+and managing export definitions.  This module provides utilities to help parse
 a specified ganesha config file and return a map containing the export
 definitions and attributes.  A method republishing updated export definitions
 is also provided.  And there are methods for requesting the ganesha server

manila/tests/db/migrations/alembic/test_migration.py

@@ -149,7 +149,7 @@ class ManilaMigrationsCheckers(test_migrations.WalkVersionsMixin,
     def test_walk_versions(self):
         """Walks all version scripts for each tested database.
 
-        While walking, ensur that there are no errors in the version
+        While walking, ensure that there are no errors in the version
         scripts for each engine.
         """
         with mock.patch('manila.db.sqlalchemy.api.get_engine',