diff --git a/core/modules/poll/lib/Drupal/poll/Tests/PollTestBase.php b/core/modules/poll/lib/Drupal/poll/Tests/PollTestBase.php
index 94da1ef..df0f30a 100644
--- a/core/modules/poll/lib/Drupal/poll/Tests/PollTestBase.php
+++ b/core/modules/poll/lib/Drupal/poll/Tests/PollTestBase.php
@@ -86,16 +86,16 @@ function pollCreate($title, $choices, $preview = TRUE) {
   /**
    * Generates POST values for the poll node form, specifically poll choices.
    *
-   * @param $title
+   * @param string $title
    *   The title for the poll node.
-   * @param $choices
+   * @param array $choices
    *   An array containing poll choices, as generated by
    *   PollTestBase::_generateChoices().
-   * @param $index
+   * @param int $index
    *   (optional) The amount/number of already submitted poll choices. Defaults
    *   to 0.
    *
-   * @return
+   * @return array
    *   An indexed array containing:
    *   - The generated POST values, suitable for
    *     Drupal\simpletest\WebTestBase::drupalPost().
@@ -121,6 +121,13 @@ function _pollGenerateEdit($title, array $choices, $index = 0) {
 
   /*
    * Generates random choices for the poll.
+   *
+   * @param int $count
+   *   (optional) The number of choices to generate. Defaults to 7.
+   *
+   * @return array $choices
+   *   An array of generated choices.
+   *
    */
   function _generateChoices($count = 7) {
     $choices = array();
@@ -135,14 +142,14 @@ function _generateChoices($count = 7) {
    *
    * Verifies both the order in the DOM and in the 'weight' form elements.
    *
-   * @param $choices
+   * @param array $choices
    *   An array containing poll choices, as generated by
    *   PollTestBase::_generateChoices().
-   * @param $index
+   * @param int $index
    *   (optional) The amount/number of already submitted poll choices. Defaults
    *   to 0.
-   * @param $preview
-   *   (optional) Whether to also check the poll preview.
+   * @param bool $preview
+   *   (optional) Whether to also check the poll preview. Defaults to FALSE.
    *
    * @see PollTestBase::_pollGenerateEdit()
    */
@@ -193,6 +200,15 @@ function assertPollChoiceOrder(array $choices, $index = 0, $preview = FALSE) {
 
   /**
    * Tests updating a poll.
+   *
+   * @param int $nid
+   *   The id of the node being updated.
+   * @param string title
+   *   The title of the node being updated.
+   * @param array $edit
+   *   An associative array of form values to submit to the node edit form keyed
+   *   on the name of the form element.
+   *
    */
   function pollUpdate($nid, $title, $edit) {
     // Edit the poll node.
diff --git a/core/modules/poll/poll.module b/core/modules/poll/poll.module
index c85f121..ac9b86b 100644
--- a/core/modules/poll/poll.module
+++ b/core/modules/poll/poll.module
@@ -107,12 +107,15 @@ function poll_menu() {
 /**
  * Access callback: Determines if a node is acceptable for poll menu items.
  *
- * @param $node
+ * @param \Drupal\node\Node $node
  *   The poll node object.
- * @param $perm
+ * @param string $perm
  *   A permission the user must have to view the page.
- * @param $inspect_allowvotes
+ * @param bool $inspect_allowvotes
  *   TRUE if the user can view votes, and FALSE if the user cannot view votes.
+ *
+ * @return bool
+ *   TRUE if the current user can access the given poll node.
  */
 function _poll_menu_access($node, $perm, $inspect_allowvotes) {
   return user_access($perm) && ($node->type == 'poll') && ($node->allowvotes || !$inspect_allowvotes);
@@ -433,7 +436,7 @@ function poll_choice_js($form, $form_state) {
 }
 
 /**
- * Entity builder for node_form().
+ * Form submission handler for node_form().
  *
  * Upon preview and final submission, we need to renumber poll choices and
  * create a teaser output.
@@ -620,11 +623,14 @@ function poll_delete($node) {
 }
 
 /**
- * Returns the content for the 'latest poll' block.
+ * Returns the node object containing the content for the 'latest poll' block.
  *
- * @param Drupal\node\Node $node
+ * @param \Drupal\node\Node $node
  *   The node entity to load.
  *
+ * @return \Drupal\node\Node $node
+ *   The node object containing the content for the 'latest poll' block.
+ *
  * @see poll_view_results()
  */
 function poll_block_latest_poll_view(Node $node) {
@@ -690,10 +696,10 @@ function poll_view($node, $view_mode) {
  *
  * This is primarily used for RSS.
  *
- * @param $node
+ * @param \Drupal\node\Node $node
  *   The poll node object.
  *
- * @return
+ * @return string|NULL
  *   Poll choices in a simple teaser format.
  */
 function poll_teaser($node) {
@@ -711,11 +717,12 @@ function poll_teaser($node) {
 /**
  * Form constructor for the poll voting form.
  *
- * @param $node
+ * @param \Drupal\node\Node $node
  *   The poll node object.
- * @param $block
+ * @param bool $block
  *   (optional) TRUE if a poll should be displayed in a block. Defaults to
  *   FALSE.
+ *
  * @see phptemplate_preprocess_poll_vote()
  * @see poll_vote()
  * @ingroup forms
@@ -809,6 +816,10 @@ function poll_vote($form, &$form_state) {
 
 /**
  * Implements hook_preprocess_HOOK() for block.tpl.php.
+ *
+ * @param array $variables
+ *   An associative array containing:
+ *   - block: A block object.
  */
 function poll_preprocess_block(&$variables) {
   if ($variables['block']->module == 'poll') {
@@ -818,6 +829,11 @@ function poll_preprocess_block(&$variables) {
 
 /**
  * Implements template_preprocess_HOOK() for poll-vote.tpl.php.
+ *
+ * @param array $variables
+ *   An associative array containing:
+ *   - form: The renderable form array for the poll voting form.
+ *
  */
 function template_preprocess_poll_vote(&$variables) {
   $form = $variables['form'];
@@ -834,6 +850,17 @@ function template_preprocess_poll_vote(&$variables) {
 /**
  * Generates a graphical representation of the results of a poll.
  *
+ * @param \Drupal\node\Node $node
+ *   The poll node whose results are to be displayed.
+ * @param string $view_mode
+ *   The view mode to use when displaying the poll results.
+ * @param bool $block
+ *   (optional) TRUE if a poll should be displayed in a block. Defaults to
+ *   FALSE.
+ *
+ * @return string
+ *   The themed poll results.
+ *
  * @see poll_block_latest_poll_view()
  * @see poll_view()
  */
@@ -877,7 +904,7 @@ function poll_view_results($node, $view_mode, $block = FALSE) {
 /**
  * Returns HTML for an admin poll form for choices.
  *
- * @param $variables
+ * @param array $variables
  *   An associative array containing:
  *   - form: A render element representing the form.
  *
@@ -931,7 +958,7 @@ function theme_poll_choices($variables) {
 /**
  * Implements template_preprocess_HOOK() for poll-results.tpl.php.
  *
- * @param $variables
+ * @param array $variables
  *   An associative array containing:
  *   - raw_title: A string for the title of the poll.
  *   - results: The results of the poll.
@@ -960,7 +987,7 @@ function template_preprocess_poll_results(&$variables) {
 /**
  * Form constructor for the poll cancel form.
  *
- * @param $nid
+ * @param int $nid
  *   The poll node ID.
  *
  * @ingroup forms
diff --git a/core/modules/poll/poll.pages.inc b/core/modules/poll/poll.pages.inc
index b67d8f9..5f0f80d 100644
--- a/core/modules/poll/poll.pages.inc
+++ b/core/modules/poll/poll.pages.inc
@@ -8,7 +8,7 @@
 /**
  * Page callback: Displays a simple list of all available polls.
  *
- * @return
+ * @return string
  *   The HTML for the page that shows the available polls.
  *
  * @see poll_menu()
@@ -56,11 +56,11 @@ function poll_page() {
  *
  * This page displays a table containing each vote that has been cast.
  *
- * @param $node
+ * @param Drupal\node\Node $node
  *   The poll node object.
  *
- * @return
- *   Render array containing table with votes.
+ * @return array
+ *   A render array containing table with votes.
  *
  * @see poll_menu()
  */
@@ -110,10 +110,10 @@ function poll_votes($node) {
  *
  * This tab displays a summary of the votes that have been cast.
  *
- * @param $node
+ * @param Drupal\node\Node $node
  *   The poll node object.
  *
- * @return
+ * @return array
  *   An array suitable for use by drupal_render().
  *
  * @see poll_menu()