diff --git a/core/modules/comment/comment.module b/core/modules/comment/comment.module
index f8a9e30..909f543 100644
--- a/core/modules/comment/comment.module
+++ b/core/modules/comment/comment.module
@@ -1126,7 +1126,13 @@ function comment_form_node_type_form_alter(&$form, $form_state) {
 }
 
 /**
- * Comment translation settings submit handler.
+ * Form submission handler for node_type_form().
+ *
+ * This handles the comment translation settings added by
+ * comment_form_node_type_form_alter().
+ *
+ * @see comment_form_node_type_form_alter()
+ * @see node_type_form()
  */
 function comment_translation_configuration_element_submit($form, &$form_state) {
   // The comment translation settings form element is embedded into the node
diff --git a/core/modules/translation_entity/lib/Drupal/translation_entity/EntityTranslationControllerInterface.php b/core/modules/translation_entity/lib/Drupal/translation_entity/EntityTranslationControllerInterface.php
index 7a37a2a..025d550 100644
--- a/core/modules/translation_entity/lib/Drupal/translation_entity/EntityTranslationControllerInterface.php
+++ b/core/modules/translation_entity/lib/Drupal/translation_entity/EntityTranslationControllerInterface.php
@@ -23,8 +23,8 @@
  * may need to be defined, but none of them is required unless the entity path
  * is different from ENTITY_TYPE/%ENTITY_TYPE (e.g. taxonomy/term/1), in which
  * case at least the 'menu_base_path' key must be defined. This is used to
- * determine the view and edit paths if they follow the standard path patterns,
- * otherwise the 'menu_view_path' and 'menu_edit_path' key must be defined. If
+ * determine the view and edit paths if they follow the standard path patterns.
+ * Otherwise the 'menu_view_path' and 'menu_edit_path' keys must be defined. If
  * an entity type is enabled for translation and no menu path key is defined,
  * the following defaults will be assumed:
  * - menu_base_path: ENTITY_TYPE/%ENTITY_TYPE
@@ -61,10 +61,10 @@
  * This is how entity info would look for a module defining a new translatable
  * entity type:
  * @code
- *   function mymodule_entity_info_alter(array &info) {
+ *   function mymodule_entity_info_alter(array &$info) {
  *     $info['myentity'] += array(
  *       'menu_base_path' => 'mymodule/myentity/%my_entity_loader',
- *       'menu_path_widlcard' => '%my_entity_loader',
+ *       'menu_path_wildcard' => '%my_entity_loader',
  *       'translation_controller_class' => 'Drupal\mymodule\MyEntityTranslationController',
  *       'translation' => array(
  *         'translation_entity' => array(
diff --git a/core/modules/translation_entity/translation_entity.admin.inc b/core/modules/translation_entity/translation_entity.admin.inc
index b4213e4..34e3b37 100644
--- a/core/modules/translation_entity/translation_entity.admin.inc
+++ b/core/modules/translation_entity/translation_entity.admin.inc
@@ -173,7 +173,7 @@ function translation_entity_translatable_batch($translatable, $field_name, &$con
         continue;
       }
 
-      // We need a two-steps approach while updating field translations: given
+      // We need a two-step approach while updating field translations: given
       // that field-specific update functions might rely on the stored values to
       // perform their processing, see for instance file_field_update(), first
       // we need to store the new translations and only after we can remove the
diff --git a/core/modules/translation_entity/translation_entity.module b/core/modules/translation_entity/translation_entity.module
index d4a6e8f..a6dc4ce 100644
--- a/core/modules/translation_entity/translation_entity.module
+++ b/core/modules/translation_entity/translation_entity.module
@@ -32,9 +32,9 @@ function translation_entity_help($path, $arg) {
       $output .= '<dt>' . t('Translating content') . '</dt>';
       $output .= '<dd>' . t('After enabling translation you can create a new piece of content, or edit existing content and assign it a language. Then, you will see a <em>Translations</em> tab or link that will gives an overview of the translation status for the current content. From there, you can add translations and edit or delete existing translations. This process is similar for every translatable element on your site, such as taxonomy terms, comments or user accounts.') . '</dd>';
       $output .= '<dt>' . t('Changing source language') . '</dt>';
-      $output .= '<dd>' . t('When there are two or more possible source languages, selecting a <em>Source language</em> will repopulate the form using the specified source\'s values. For example,  French is much closer to Spanish than to Chinese, so changing the French translation\'s source language to Spanish can assist translators.') . '</dd>';
+      $output .= '<dd>' . t('When there are two or more possible source languages, selecting a <em>Source language</em> will repopulate the form using the specified source\'s values. For example, French is much closer to Spanish than to Chinese, so changing the French translation\'s source language to Spanish can assist translators.') . '</dd>';
       $output .= '<dt>' . t('Maintaining translations') . '</dt>';
-      $output .= '<dd>' . t('If editing content in one language requires that translated versions also be updated to reflect the change, use the Flag other translations as outdated check box to mark the translations as outdated and in need of revision.') . '</dd>';
+      $output .= '<dd>' . t('If editing content in one language requires that translated versions also be updated to reflect the change, use the <em>Flag other translations as outdated</em> check box to mark the translations as outdated and in need of revision.') . '</dd>';
       $output .= '<dt>' . t('Translation permissions') . '</dt>';
       $output .= '<dd>' . t('The Entity Translation module makes a basic set of permissions available. Additional <a href="@permissions">permissions</a> are made available after translation is enabled for each translatable element.', array('@permissions' => url('admin/people/permissions', array('fragment' => 'module-translation_entity')))) . '</dd>';
       $output .= '</dl>';
diff --git a/core/modules/user/lib/Drupal/user/ProfileTranslationController.php b/core/modules/user/lib/Drupal/user/ProfileTranslationController.php
index f10d58e..e7dcd65 100644
--- a/core/modules/user/lib/Drupal/user/ProfileTranslationController.php
+++ b/core/modules/user/lib/Drupal/user/ProfileTranslationController.php
@@ -30,7 +30,7 @@ function entityFormSave(array $form, array &$form_state) {
     if ($this->getSourceLangcode($form_state)) {
       $entity = translation_entity_form_controller($form_state)->getEntity($form_state);
       // We need a redirect here, otherwise we would get an access denied page
-      // since the curret URL would be preserved and we would try to add a
+      // since the current URL would be preserved and we would try to add a
       // translation for a language that already has a translation.
       $form_state['redirect'] = $this->getEditPath($entity);
     }