diff --git a/doc/source/upgrade.rst b/doc/source/upgrade.rst index 4947ededa7e9..cdb674ff5783 100644 --- a/doc/source/upgrade.rst +++ b/doc/source/upgrade.rst @@ -174,7 +174,7 @@ Online data migrations occur in two places: new format #. Background online migrations that are performed using ``nova-manage`` to complete transformations that will not occur - incidentially due to normal runtime activity. + incidentally due to normal runtime activity. An example of online data migrations are the flavor migrations done as part of Nova object version 1.18. This included a transient migration of flavor diff --git a/nova/conf/libvirt.py b/nova/conf/libvirt.py index 498b6f700b57..a3ac02724a6a 100644 --- a/nova/conf/libvirt.py +++ b/nova/conf/libvirt.py @@ -283,7 +283,7 @@ Related options: help=""" Schema used for live migration. -Override the default libvirt live migration scheme (which is dependant on +Override the default libvirt live migration scheme (which is dependent on virt_type). If this option is set to None, nova will automatically choose a sensible default based on the hypervisor. It is not recommended that you change this unless you are very sure that hypervisor supports a particular scheme.