diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/Controller/TaxonomyController.php b/core/modules/taxonomy/lib/Drupal/taxonomy/Controller/TaxonomyController.php
index eb57cc5..779d9dc 100644
--- a/core/modules/taxonomy/lib/Drupal/taxonomy/Controller/TaxonomyController.php
+++ b/core/modules/taxonomy/lib/Drupal/taxonomy/Controller/TaxonomyController.php
@@ -18,7 +18,7 @@
 class TaxonomyController extends ControllerBase {
 
   /**
-   * Returns a rendered edit form to create a new term associated to the given vocabulary.
+   * Form constructor to create a new term in a given vocabulary.
    *
    * @param \Drupal\taxonomy\VocabularyInterface $taxonomy_vocabulary
    *   The vocabulary this term will be added to.
diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/Form/OverviewTerms.php b/core/modules/taxonomy/lib/Drupal/taxonomy/Form/OverviewTerms.php
index 3852ea8..5b5db77 100644
--- a/core/modules/taxonomy/lib/Drupal/taxonomy/Form/OverviewTerms.php
+++ b/core/modules/taxonomy/lib/Drupal/taxonomy/Form/OverviewTerms.php
@@ -53,8 +53,8 @@ public function getFormId() {
   /**
    * Form constructor.
    *
-   * Display a tree of all the terms in a vocabulary, with options to edit
-   * each one. The form is made drag and drop by the theme function.
+   * Display a tree of all the terms in a vocabulary, with options to edit each
+   * one. The form is made drag and drop by the theme function.
    *
    * @param array $form
    *   An associative array containing the structure of the form.
diff --git a/core/modules/taxonomy/taxonomy.js b/core/modules/taxonomy/taxonomy.js
index 19d42df..731e26d 100644
--- a/core/modules/taxonomy/taxonomy.js
+++ b/core/modules/taxonomy/taxonomy.js
@@ -3,7 +3,7 @@
 "use strict";
 
 /**
- * Move a block in the blocks table from one region to another via select list.
+ * Moves a block in the blocks table from one region to another via select list.
  *
  * This behavior is dependent on the tableDrag behavior, since it uses the
  * objects initialized in that behavior to update the row.
diff --git a/core/modules/taxonomy/taxonomy.module b/core/modules/taxonomy/taxonomy.module
index e8dd686..a3e53d0 100644
--- a/core/modules/taxonomy/taxonomy.module
+++ b/core/modules/taxonomy/taxonomy.module
@@ -32,14 +32,6 @@
 const TAXONOMY_HIERARCHY_MULTIPLE = 2;
 
 /**
- * Users can create new terms in a free-tagging vocabulary when
- * submitting a taxonomy_autocomplete_widget. We store a term object
- * whose tid is 'autocreate' as a field data item during widget
- * validation and then actually create the term if/when that field
- * data item makes it to taxonomy_field_insert/update().
- */
-
-/**
  * Implements hook_help().
  */
 function taxonomy_help($path, $arg) {
@@ -125,6 +117,12 @@ function taxonomy_entity_bundle_info() {
 
 /**
  * Entity URI callback.
+ *
+ * @param object $term
+ *   A taxonomy term object with 'tid' property.
+ *
+ * @return array
+ *   An array with 'path' as key and appropriate menu path as its value.
  */
 function taxonomy_term_uri($term) {
   return array(
@@ -165,19 +163,20 @@ function taxonomy_field_extra_fields() {
 }
 
 /**
- * Return nodes attached to a term across all field instances.
+ * Returns nodes attached to a term across all field instances.
  *
- * This function requires taxonomy module to be maintaining its own tables,
- * and will return an empty array if it is not. If using other field storage
- * methods alternatives methods for listing terms will need to be used.
+ * This function requires taxonomy module to be maintaining its own tables, and
+ * will return an empty array if it is not. If using other field storage methods
+ * alternatives methods for listing terms will need to be used.
  *
  * @param $tid
  *   The term ID.
  * @param $pager
- *   Boolean to indicate whether a pager should be used.
+ *   (optional) Boolean to indicate whether a pager should be used. Defaults to
+ *   TRUE.
  * @param $limit
- *   Integer. The maximum number of nodes to find.
- *   Set to FALSE for no limit.
+ *   (optional) An integer for the maximum number of nodes to find. Set to FALSE
+ *   for no limit. Defaults to FALSE.
  * @param $order
  *   An array of fields and directions.
  *
@@ -329,8 +328,8 @@ function taxonomy_admin_paths() {
  * Checks and updates the hierarchy flag of a vocabulary.
  *
  * Checks the current parents of all terms in a vocabulary and updates the
- * vocabulary's hierarchy setting to the lowest possible level. If no term
- * has parent terms then the vocabulary will be given a hierarchy of
+ * vocabulary's hierarchy setting to the lowest possible level. If no term has
+ * parent terms then the vocabulary will be given a hierarchy of
  * TAXONOMY_HIERARCHY_DISABLED. If any term has a single parent then the
  * vocabulary will be given a hierarchy of TAXONOMY_HIERARCHY_SINGLE. If any
  * term has multiple parents then the vocabulary will be given a hierarchy of
@@ -376,10 +375,10 @@ function taxonomy_check_vocabulary_hierarchy(VocabularyInterface $vocabulary, $c
  * @param \Drupal\taxonomy\Entity\Term $term
  *   A taxonomy term object.
  * @param string $view_mode
- *   View mode, e.g. 'full', 'teaser'...
+ *   (optional) View mode; e.g., 'full', 'teaser'. Defaults to 'full'.
  * @param string $langcode
- *   (optional) A language code to use for rendering. Defaults to the global
- *   content language of the current request.
+ *   (optional) A language code to use for rendering. Defaults to NULL, the
+ *   global content language of the current request.
  *
  * @return array
  *   A $page element suitable for use by drupal_page_render().
@@ -394,7 +393,7 @@ function taxonomy_term_view(Term $term, $view_mode = 'full', $langcode = NULL) {
  * @param array $terms
  *   An array of taxonomy terms as returned by entity_load_multiple('taxonomy_term').
  * @param string $view_mode
- *   View mode, e.g. 'full', 'teaser'...
+ *   (optional) View mode; e.g., 'full', 'teaser'. Defaults to 'full'.
  * @param string $langcode
  *   (optional) A language code to use for rendering. Defaults to the global
  *   content language of the current request.
@@ -468,6 +467,9 @@ function template_preprocess_taxonomy_term(&$variables) {
  *
  * @param \Drupal\taxonomy\Entity\Term $term
  *   A taxonomy term entity.
+ *
+ * @return bool
+ *   TRUE if the current page is for the term object; otherwise, FALSE.
  */
 function taxonomy_term_is_page(Term $term) {
   $request = \Drupal::request();
@@ -479,24 +481,25 @@ function taxonomy_term_is_page(Term $term) {
 }
 
 /**
- * Clear all static cache variables for terms.
+ * Clears all static cache variables for terms.
  */
 function taxonomy_terms_static_reset() {
   \Drupal::entityManager()->getStorageController('taxonomy_term')->resetCache();
 }
 
 /**
- * Clear all static cache variables for vocabularies.
+ * Clears all static cache variables for vocabularies.
  *
  * @param $ids
- *   An array of ids to reset in entity controller cache.
+ *   (optional) An array of IDs to reset in entity controller cache. Defaults to
+ *   NULL.
  */
 function taxonomy_vocabulary_static_reset(array $ids = NULL) {
   \Drupal::entityManager()->getStorageController('taxonomy_vocabulary')->resetCache($ids);
 }
 
 /**
- * Get names for all taxonomy vocabularies.
+ * Gets names for all taxonomy vocabularies.
  *
  * @return array
  *   A list of existing vocabulary IDs.
@@ -545,7 +548,13 @@ function taxonomy_term_load_parents($tid) {
 }
 
 /**
- * Find all ancestors of a given term ID.
+ * Finds all ancestors of a given term ID.
+ *
+ * @param int $tid
+ *   A taxonomy term ID.
+ *
+ * @return array
+ *   An array containing all ancestor term entities for the given term ID.
  */
 function taxonomy_term_load_parents_all($tid) {
   $cache = &drupal_static(__FUNCTION__, array());
@@ -575,7 +584,7 @@ function taxonomy_term_load_parents_all($tid) {
  * @param $tid
  *   A taxonomy term ID.
  * @param $vid
- *   An optional vocabulary ID to restrict the child search.
+ *   (optional) A vocabulary ID to restrict the child search.
  *
  * @return
  *   An array of term objects that are the children of the term $tid, or an
@@ -603,24 +612,25 @@ function taxonomy_term_load_children($tid, $vid = NULL) {
 }
 
 /**
- * Create a hierarchical representation of a vocabulary.
+ * Creates a hierarchical representation of a vocabulary.
  *
  * @param $vid
  *   The vocabulary ID to generate the tree for.
  * @param $parent
- *   The term ID under which to generate the tree. If 0, generate the tree
- *   for the entire vocabulary.
+ *   (optional) The term ID under which to generate the tree. If zero, generate
+ *    the tree for the entire vocabulary. Defaults to zero.
  * @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
- *   save execution time and memory consumption when listing large numbers of
- *   terms. Defaults to FALSE.
+ *   (optional) 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 save execution time and memory consumption
+ *   when listing large numbers of terms. Defaults to FALSE.
  *
  * @return
- *   An array of all term objects in the tree. Each term object is extended
- *   to have "depth" and "parents" attributes in addition to its normal ones.
+ *   An array of all term objects in the tree. Each term object is extended to
+ *   have "depth" and "parents" attributes in addition to its normal ones.
  *   Results are statically cached. Term objects will be partial or complete
  *   depending on the $load_entities parameter.
  */
@@ -721,7 +731,7 @@ function taxonomy_get_tree($vid, $parent = 0, $max_depth = NULL, $load_entities
 }
 
 /**
- * Try to map a string to an existing term, as for glossary use.
+ * Tries to map a string to an existing term, as for glossary use.
  *
  * Provides a case-insensitive and trimmed mapping, to maximize the
  * likelihood of a successful match.
@@ -729,7 +739,7 @@ function taxonomy_get_tree($vid, $parent = 0, $max_depth = NULL, $load_entities
  * @param $name
  *   Name of the term to search for.
  * @param $vocabulary
- *   (optional) Vocabulary machine name to limit the search. Defaults to NULL.
+ *   (optional) Vocabulary machine name to limit the search.
  *
  * @return
  *   An array of matching term objects.
@@ -753,11 +763,8 @@ function taxonomy_term_load_multiple_by_name($name, $vocabulary = NULL) {
  * Load multiple taxonomy terms based on certain conditions.
  *
  * This function should be used whenever you need to load more than one term
- * 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\Query\EntityQueryInterface
+ * from the database. Terms are loaded into memory and will not require database
+ * access if loaded again during the same page request.
  *
  * @deprecated use entity_load_multiple('taxonomy_term', $tids) instead.
  *
@@ -767,6 +774,9 @@ function taxonomy_term_load_multiple_by_name($name, $vocabulary = NULL) {
  * @return array
  *   An array of taxonomy term entities, indexed by tid. When no results are
  *   found, an empty array is returned.
+ *
+ * @see \Drupal\Core\Entity\EntityFieldQuery
+ * @see entity_load_multiple()
  */
 function taxonomy_term_load_multiple(array $tids = NULL) {
   return entity_load_multiple('taxonomy_term', $tids);
@@ -779,8 +789,6 @@ 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()
- *
  * @deprecated use entity_load_multiple('taxonomy_vocabulary', $vids) instead.
  *
  * @param array $vids
@@ -788,6 +796,8 @@ function taxonomy_term_load_multiple(array $tids = NULL) {
  *
  * @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);
@@ -806,7 +816,7 @@ function taxonomy_vocabulary_sort(array &$vocabularies = array()) {
 }
 
 /**
- * Return the taxonomy vocabulary entity matching a vocabulary ID.
+ * Returns the taxonomy vocabulary entity matching a vocabulary ID.
  *
  * @deprecated use entity_load('taxonomy_vocabulary', $vid) instead.
  *
@@ -822,12 +832,12 @@ function taxonomy_vocabulary_load($vid) {
 }
 
 /**
- * Return the taxonomy term entity matching a term ID.
+ * Returns the taxonomy term entity matching a term ID.
  *
  * @deprecated use entity_load('taxonomy_term', $tid) instead.
  *
  * @param $tid
- *   A term's ID
+ *   A taxonomy term ID.
  *
  * @return \Drupal\taxonomy\Entity\Term|null
  *   A taxonomy term entity, or NULL if the term was not found. Results are
@@ -852,6 +862,14 @@ function taxonomy_file_download_access($field, EntityInterface $entity, FileInte
 /**
  * Implodes a list of tags of a certain vocabulary into a string.
  *
+ * @param array $tags
+ *   An array of vocabulary term tag objects.
+ * @param int $vid
+ *   (optional) A vocabulary ID to constrain terms to.
+ *
+ * @return string
+ *   A string with a comma-delimted imploded list of tags.
+ *
  * @see drupal_explode_tags()
  */
 function taxonomy_implode_tags($tags, $vid = NULL) {
@@ -931,7 +949,8 @@ function taxonomy_options_list(FieldDefinitionInterface $field_definition, Entit
  * 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(EntityInterface $entity = NULL, FieldInterface $field, FieldInstanceInterface $instance, $langcode, $items, &$errors) {
   // Build an array of existing term IDs so they can be loaded with
@@ -1027,7 +1046,7 @@ function taxonomy_term_title(Term $term) {
 }
 
 /**
- * Form element validate handler for taxonomy term autocomplete element.
+ * Form element validation handler for taxonomy_field_widget_form().
  */
 function taxonomy_autocomplete_validate($element, &$form_state) {
   // Split the values into an array.
diff --git a/core/modules/taxonomy/taxonomy.pages.inc b/core/modules/taxonomy/taxonomy.pages.inc
index 3cf82e2..54b43ca 100644
--- a/core/modules/taxonomy/taxonomy.pages.inc
+++ b/core/modules/taxonomy/taxonomy.pages.inc
@@ -8,12 +8,17 @@
 use Drupal\taxonomy\Entity\Term;
 
 /**
- * Menu callback; displays all nodes associated with a term.
+ * Menu callback: Displays all nodes associated with a term.
  *
  * @param \Drupal\taxonomy\Entity\Term $term
  *   The taxonomy term entity.
  *
  * @deprecated Use \Drupal\taxonomy\Controller\TaxonomyController::termPage()
+ *
+ * @return array
+ *   A build array as expected by drupal_render().
+ *
+ * @see taxonomy_menu()
  */
 function taxonomy_term_page(Term $term) {
   // Assign the term name as the page title.
@@ -52,7 +57,7 @@ function taxonomy_term_page(Term $term) {
 }
 
 /**
- * Generate the content feed for a taxonomy term.
+ * Generates the content feed for a taxonomy term.
  *
  * @param \Drupal\taxonomy\Entity\Term $term
  *   The taxonomy term entity.