diff --git a/core/modules/taxonomy/taxonomy-term.tpl.php b/core/modules/taxonomy/taxonomy-term.tpl.php
index 712e83c..ae2fa55 100644
--- a/core/modules/taxonomy/taxonomy-term.tpl.php
+++ b/core/modules/taxonomy/taxonomy-term.tpl.php
@@ -16,7 +16,7 @@
  *    array and printed as a string.
  *    It includes the 'class' information, which includes:
  *   - taxonomy-term: The current template type, i.e., "theming hook".
- *   - vocabulary-[vocabulary-name]: The vocabulary to which the term belongs to.
+ *   - vocabulary-[vocabulary-name]: The vocabulary to which the term belongs.
  *     For example, if the term is a "Tag" it would result in "vocabulary-tag".
  *
  * Other variables:
diff --git a/core/modules/taxonomy/taxonomy.admin.inc b/core/modules/taxonomy/taxonomy.admin.inc
index ecef0b5..8accc47 100644
--- a/core/modules/taxonomy/taxonomy.admin.inc
+++ b/core/modules/taxonomy/taxonomy.admin.inc
@@ -518,7 +518,7 @@ function theme_taxonomy_overview_terms($variables) {
 }
 
 /**
- * Returns a rendered edit form to create a new term associated to the given vocabulary.
+ * Renders an edit form to create a new term in a given vocabulary.
  */
 function taxonomy_term_add($vocabulary) {
   $term = entity_create('taxonomy_term', array('vid' => $vocabulary->vid, 'vocabulary_machine_name' => $vocabulary->machine_name));
@@ -630,9 +630,9 @@ function taxonomy_vocabulary_confirm_reset_alphabetical($form, &$form_state, $vi
 }
 
 /**
- * Submit handler to reset a vocabulary to alphabetical order after confirmation.
+ * Form submission handler for taxonomy_vocabulary_confirm_reset_alphabetical().
  *
- * @see taxonomy_vocabulary_confirm_reset_alphabetical()
+ * Resets a vocabulary to alphabetical order after confirmation.
  */
 function taxonomy_vocabulary_confirm_reset_alphabetical_submit($form, &$form_state) {
   db_update('taxonomy_term_data')
diff --git a/core/modules/taxonomy/taxonomy.module b/core/modules/taxonomy/taxonomy.module
index c28cc7b..c03f498 100644
--- a/core/modules/taxonomy/taxonomy.module
+++ b/core/modules/taxonomy/taxonomy.module
@@ -574,6 +574,7 @@ function taxonomy_term_delete_multiple(array $tids) {
  *
  * @param Drupal\taxonomy\Term $term
  *   A taxonomy term object.
+ *
  * @return array
  *   A $page element suitable for use by drupal_page_render().
  */
@@ -884,7 +885,8 @@ function taxonomy_term_load_children($tid, $vid = 0) {
  *   The term ID under which to generate the tree. If 0, generate the tree
  *   for the entire vocabulary.
  * @param $max_depth
- *   The number of levels of the tree to return. Leave NULL to return all levels.
+ *   (optional) The number of levels of the tree to return. Leave NULL to
+ *   return all levels.
  * @param $load_entities
  *   If TRUE, a full entity load will occur on the term objects. Otherwise they
  *   are partial objects queried directly from the {taxonomy_term_data} table to
@@ -1029,15 +1031,15 @@ function taxonomy_term_load_multiple_by_name($name, $vocabulary = NULL) {
  * from the database. Terms are loaded into memory and will not require
  * database access if loaded again during the same page request.
  *
- * @see entity_load_multiple()
- * @see Drupal\Core\Entity\EntityFieldQuery
- *
  * @param array $tids
  *   (optional) An array of entity IDs. If omitted, all entities are loaded.
  *
  * @return array
  *   An array of taxonomy term entities, indexed by tid. When no results are
  *   found, an empty array is returned.
+ *
+ * @see entity_load_multiple()
+ * @see Drupal\Core\Entity\EntityFieldQuery
  */
 function taxonomy_term_load_multiple(array $tids = NULL) {
   return entity_load_multiple('taxonomy_term', $tids);
@@ -1050,13 +1052,13 @@ function taxonomy_term_load_multiple(array $tids = NULL) {
  * vocabulary from the database. Terms are loaded into memory and will not
  * require database access if loaded again during the same page request.
  *
- * @see entity_load_multiple()
- *
  * @param array $vids
  *   (optional) An array of entity IDs. If omitted, all entities are loaded.
  *
  * @return array
  *  An array of vocabulary objects, indexed by vid.
+ *
+ * @see entity_load_multiple()
  */
 function taxonomy_vocabulary_load_multiple(array $vids = NULL) {
   return entity_load_multiple('taxonomy_vocabulary', $vids);
@@ -1218,7 +1220,8 @@ function taxonomy_options_list($field, $instance, $entity_type, $entity) {
  * Confirm that terms entered as values meet at least one of these conditions.
  *
  * Possible error codes:
- * - 'taxonomy_term_illegal_value': The value is not part of the list of allowed values.
+ * - taxonomy_term_illegal_value: The value is not part of the list of allowed
+ *   values.
  */
 function taxonomy_field_validate($entity_type, $entity, $field, $instance, $langcode, $items, &$errors) {
   // Build an array of existing term IDs so they can be loaded with