diff --git a/heat/engine/resources/openstack/heat/resource_group.py b/heat/engine/resources/openstack/heat/resource_group.py
index a00bd33e3a..61fbbf9fd5 100644
--- a/heat/engine/resources/openstack/heat/resource_group.py
+++ b/heat/engine/resources/openstack/heat/resource_group.py
@@ -196,12 +196,12 @@ class ResourceGroup(stack_resource.StackResource):
 
     attributes_schema = {
         REFS: attributes.Schema(
-            _("A list of resource IDs for the resources in the group"),
+            _("A list of resource IDs for the resources in the group."),
             type=attributes.Schema.LIST
         ),
         ATTR_ATTRIBUTES: attributes.Schema(
             _("A map of resource names to the specified attribute of each "
-              "individual resource.  "
+              "individual resource. "
               "Requires heat_template_version: 2014-10-16."),
             support_status=support.SupportStatus(version='2014.2'),
             type=attributes.Schema.MAP
diff --git a/heat/engine/resources/openstack/heat/software_deployment.py b/heat/engine/resources/openstack/heat/software_deployment.py
index 69f204dfbf..6a790a694c 100644
--- a/heat/engine/resources/openstack/heat/software_deployment.py
+++ b/heat/engine/resources/openstack/heat/software_deployment.py
@@ -180,7 +180,7 @@ class SoftwareDeployment(signal_responder.SignalResponder):
             type=attributes.Schema.STRING
         ),
         STATUS_CODE: attributes.Schema(
-            _("Returned status code from the configuration execution"),
+            _("Returned status code from the configuration execution."),
             type=attributes.Schema.STRING
         ),
     }
diff --git a/heat/engine/resources/openstack/heat/swiftsignal.py b/heat/engine/resources/openstack/heat/swiftsignal.py
index 8e80ea01d4..6728bfd6de 100644
--- a/heat/engine/resources/openstack/heat/swiftsignal.py
+++ b/heat/engine/resources/openstack/heat/swiftsignal.py
@@ -73,24 +73,24 @@ class SwiftSignalHandle(resource.Resource):
 
     attributes_schema = {
         TOKEN: attributes.Schema(
-            _('Tokens are not needed for Swift TempURLs.  This attribute is '
+            _('Tokens are not needed for Swift TempURLs. This attribute is '
               'being kept for compatibility with the '
-              'OS::Heat::WaitConditionHandle resource'),
+              'OS::Heat::WaitConditionHandle resource.'),
             cache_mode=attributes.Schema.CACHE_NONE,
             type=attributes.Schema.STRING
         ),
         ENDPOINT: attributes.Schema(
-            _('Endpoint/url which can be used for signalling handle'),
+            _('Endpoint/url which can be used for signalling handle.'),
             cache_mode=attributes.Schema.CACHE_NONE,
             type=attributes.Schema.STRING
         ),
         CURL_CLI: attributes.Schema(
             _('Convenience attribute, provides curl CLI command '
               'prefix, which can be used for signalling handle completion or '
-              'failure.  You can signal success by adding '
+              'failure. You can signal success by adding '
               '--data-binary \'{"status": "SUCCESS"}\' '
               ', or signal failure by adding '
-              '--data-binary \'{"status": "FAILURE"}\''),
+              '--data-binary \'{"status": "FAILURE"}\'.'),
             cache_mode=attributes.Schema.CACHE_NONE,
             type=attributes.Schema.STRING
         ),
diff --git a/heat/engine/resources/openstack/heat/wait_condition_handle.py b/heat/engine/resources/openstack/heat/wait_condition_handle.py
index 556156b544..7a93657a22 100644
--- a/heat/engine/resources/openstack/heat/wait_condition_handle.py
+++ b/heat/engine/resources/openstack/heat/wait_condition_handle.py
@@ -103,8 +103,8 @@ class HeatWaitConditionHandle(wc_base.BaseWaitConditionHandle):
         CURL_CLI: attributes.Schema(
             _('Convenience attribute, provides curl CLI command '
               'prefix, which can be used for signalling handle completion or '
-              'failure when signal_transport is set to TOKEN_SIGNAL.  You '
-              ' can signal success by adding '
+              'failure when signal_transport is set to TOKEN_SIGNAL. You '
+              'can signal success by adding '
               '--data-binary \'{"status": "SUCCESS"}\' '
               ', or signal failure by adding '
               '--data-binary \'{"status": "FAILURE"}\'. '
diff --git a/tools/custom_guidelines.py b/tools/custom_guidelines.py
index 4b7861a373..21dd50bbc4 100644
--- a/tools/custom_guidelines.py
+++ b/tools/custom_guidelines.py
@@ -58,8 +58,8 @@ class HeatCustomGuidelines(object):
             self._check_resource_schemas(cls, cls.properties_schema,
                                          'property')
             # check attributes' descriptions
-            #self._check_resource_schemas(cls, cls.attributes_schema,
-            #                             'attribute')
+            self._check_resource_schemas(cls, cls.attributes_schema,
+                                         'attribute')
             # check methods descriptions
             #self._check_resource_methods(cls)