diff --git a/bin/nova-baremetal-deploy-helper b/bin/nova-baremetal-deploy-helper
index fa0a30d9e..f8a487d37 100755
--- a/bin/nova-baremetal-deploy-helper
+++ b/bin/nova-baremetal-deploy-helper
@@ -56,7 +56,7 @@ QUEUE = Queue.Queue()
 # They are split for stub-out.
 
 def discovery(portal_address, portal_port):
-    """Do iSCSI discovery on portal"""
+    """Do iSCSI discovery on portal."""
     utils.execute('iscsiadm',
                   '-m', 'discovery',
                   '-t', 'st',
@@ -66,7 +66,7 @@ def discovery(portal_address, portal_port):
 
 
 def login_iscsi(portal_address, portal_port, target_iqn):
-    """Login to an iSCSI target"""
+    """Login to an iSCSI target."""
     utils.execute('iscsiadm',
                   '-m', 'node',
                   '-p', '%s:%s' % (portal_address, portal_port),
@@ -79,7 +79,7 @@ def login_iscsi(portal_address, portal_port, target_iqn):
 
 
 def logout_iscsi(portal_address, portal_port, target_iqn):
-    """Logout from an iSCSI target"""
+    """Logout from an iSCSI target."""
     utils.execute('iscsiadm',
                   '-m', 'node',
                   '-p', '%s:%s' % (portal_address, portal_port),
@@ -90,7 +90,7 @@ def logout_iscsi(portal_address, portal_port, target_iqn):
 
 
 def make_partitions(dev, root_mb, swap_mb):
-    """Create partitions for root and swap on a disk device"""
+    """Create partitions for root and swap on a disk device."""
     commands = ['o,w',
                 'n,p,1,,+%dM,t,1,83,w' % root_mb,
                 'n,p,2,,+%dM,t,2,82,w' % swap_mb,
@@ -106,13 +106,13 @@ def make_partitions(dev, root_mb, swap_mb):
 
 
 def is_block_device(dev):
-    """Check whether a device is block or not"""
+    """Check whether a device is block or not."""
     s = os.stat(dev)
     return stat.S_ISBLK(s.st_mode)
 
 
 def dd(src, dst):
-    """Execute dd from src to dst"""
+    """Execute dd from src to dst."""
     utils.execute('dd',
                   'if=%s' % src,
                   'of=%s' % dst,
@@ -122,7 +122,7 @@ def dd(src, dst):
 
 
 def mkswap(dev, label='swap1'):
-    """Execute mkswap on a device"""
+    """Execute mkswap on a device."""
     utils.execute('mkswap',
                   '-L', label,
                   dev,
@@ -131,7 +131,7 @@ def mkswap(dev, label='swap1'):
 
 
 def block_uuid(dev):
-    """Get UUID of a block device"""
+    """Get UUID of a block device."""
     out, _ = utils.execute('blkid', '-s', 'UUID', '-o', 'value', dev,
                            run_as_root=True,
                            check_exit_code=[0])
@@ -219,7 +219,7 @@ def deploy(address, port, iqn, lun, image_path, pxe_config_path,
 
 
 class Worker(threading.Thread):
-    """Thread that handles requests in queue"""
+    """Thread that handles requests in queue."""
 
     def __init__(self):
         super(Worker, self).__init__()
@@ -250,7 +250,7 @@ class Worker(threading.Thread):
 
 
 class BareMetalDeploy(object):
-    """WSGI server for bare-metal deployment"""
+    """WSGI server for bare-metal deployment."""
 
     def __init__(self):
         self.worker = Worker()
diff --git a/doc/api_samples/all_extensions/extensions-get-resp.json b/doc/api_samples/all_extensions/extensions-get-resp.json
index 5f92c1366..42e86eadd 100644
--- a/doc/api_samples/all_extensions/extensions-get-resp.json
+++ b/doc/api_samples/all_extensions/extensions-get-resp.json
@@ -298,7 +298,7 @@
         },
         {
             "alias": "os-admin-networks",
-            "description": "Admin-only Network Management Extension",
+            "description": "Admin-only Network Management Extension.",
             "links": [],
             "name": "AdminNetworks",
             "namespace": "http://docs.openstack.org/compute/ext/os-admin-networks/api/v1.1",
@@ -306,7 +306,7 @@
         },
         {
             "alias": "os-networks",
-            "description": "Tenant-based Network Management Extension",
+            "description": "Tenant-based Network Management Extension.",
             "links": [],
             "name": "OSNetworks",
             "namespace": "http://docs.openstack.org/compute/ext/os-networks/api/v1.1",
diff --git a/doc/api_samples/all_extensions/extensions-get-resp.xml b/doc/api_samples/all_extensions/extensions-get-resp.xml
index 8f92b274b..ea0b45a12 100644
--- a/doc/api_samples/all_extensions/extensions-get-resp.xml
+++ b/doc/api_samples/all_extensions/extensions-get-resp.xml
@@ -126,13 +126,13 @@
     <description>Allow multiple create in the Create Server v1.1 API.</description>
   </extension>
   <extension alias="os-admin-networks" updated="2011-12-23T00:00:00+00:00" namespace="http://docs.openstack.org/compute/ext/os-admin-networks/api/v1.1" name="AdminNetworks">
-    <description>Admin-only Network Management Extension</description>
+    <description>Admin-only Network Management Extension.</description>
   </extension>
   <extension alias="os-networks-associate" updated="2012-11-19T00:00:00+00:00" namespace="http://docs.openstack.org/compute/ext/networks_associate/api/v2" name="NetworkAssociationSupport">
     <description>Network association support.</description>
   </extension>
   <extension alias="os-networks" updated="2011-12-23T00:00:00+00:00" namespace="http://docs.openstack.org/compute/ext/os-networks/api/v1.1" name="OSNetworks">
-    <description>Tenant-based Network Management Extension</description>
+    <description>Tenant-based Network Management Extension.</description>
   </extension>
   <extension alias="os-quota-class-sets" updated="2012-03-12T00:00:00+00:00" namespace="http://docs.openstack.org/compute/ext/quota-classes-sets/api/v1.1" name="QuotaClasses">
     <description>Quota classes management support.</description>
diff --git a/nova/availability_zones.py b/nova/availability_zones.py
index c08e029cf..cb5cce591 100644
--- a/nova/availability_zones.py
+++ b/nova/availability_zones.py
@@ -13,7 +13,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-""" utilities for multiple APIs"""
+"""utilities for multiple APIs."""
 
 from nova import db
 from nova.openstack.common import cfg
diff --git a/nova/tests/test_db_api.py b/nova/tests/test_db_api.py
index acc290991..7df28bfcb 100644
--- a/nova/tests/test_db_api.py
+++ b/nova/tests/test_db_api.py
@@ -540,7 +540,7 @@ class DbApiTestCase(test.TestCase):
         self.assertEqual(expected, instance_faults)
 
     def test_instance_action_start(self):
-        """Create an instance action"""
+        """Create an instance action."""
         ctxt = context.get_admin_context()
         uuid = str(stdlib_uuid.uuid4())
 
@@ -563,7 +563,7 @@ class DbApiTestCase(test.TestCase):
         self.assertEqual(ctxt.project_id, actions[0]['project_id'])
 
     def test_instance_action_finish(self):
-        """Create an instance action"""
+        """Create an instance action."""
         ctxt = context.get_admin_context()
         uuid = str(stdlib_uuid.uuid4())
 
@@ -593,7 +593,7 @@ class DbApiTestCase(test.TestCase):
         self.assertEqual(ctxt.project_id, actions[0]['project_id'])
 
     def test_instance_actions_get_by_instance(self):
-        """Ensure we can get actions by UUID"""
+        """Ensure we can get actions by UUID."""
         ctxt1 = context.get_admin_context()
         ctxt2 = context.get_admin_context()
         uuid1 = str(stdlib_uuid.uuid4())
@@ -625,7 +625,7 @@ class DbApiTestCase(test.TestCase):
         self.assertEqual('run_instance', actions[1]['action'])
 
     def test_instance_action_get_by_instance_and_action(self):
-        """Ensure we can get an action by instance UUID and action id"""
+        """Ensure we can get an action by instance UUID and action id."""
         ctxt1 = context.get_admin_context()
         ctxt2 = context.get_admin_context()
         uuid1 = str(stdlib_uuid.uuid4())
@@ -657,7 +657,7 @@ class DbApiTestCase(test.TestCase):
         self.assertEqual(ctxt1.request_id, action['request_id'])
 
     def test_instance_action_event_start(self):
-        """Create an instance action event"""
+        """Create an instance action event."""
         ctxt = context.get_admin_context()
         uuid = str(stdlib_uuid.uuid4())
 
@@ -683,7 +683,7 @@ class DbApiTestCase(test.TestCase):
         self.assertEqual(start_time, events[0]['start_time'])
 
     def test_instance_action_event_finish(self):
-        """Finish an instance action event"""
+        """Finish an instance action event."""
         ctxt = context.get_admin_context()
         uuid = str(stdlib_uuid.uuid4())
 
@@ -717,7 +717,7 @@ class DbApiTestCase(test.TestCase):
         self.assertEqual(finish_time, events[0]['finish_time'])
 
     def test_instance_action_event_get_by_id(self):
-        """Get a specific instance action event"""
+        """Get a specific instance action event."""
         ctxt1 = context.get_admin_context()
         ctxt2 = context.get_admin_context()
         uuid1 = str(stdlib_uuid.uuid4())