diff --git a/core/modules/poll/poll.module b/core/modules/poll/poll.module
index c85f121..57e8d04 100644
--- a/core/modules/poll/poll.module
+++ b/core/modules/poll/poll.module
@@ -107,11 +107,11 @@ 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.
  */
 function _poll_menu_access($node, $perm, $inspect_allowvotes) {
@@ -620,11 +620,13 @@ 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
  *   The node entity to load.
  *
+ * @return Drupal\node\Node $node
+ *
  * @see poll_view_results()
  */
 function poll_block_latest_poll_view(Node $node) {
@@ -690,10 +692,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
  *   Poll choices in a simple teaser format.
  */
 function poll_teaser($node) {
@@ -711,11 +713,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
@@ -834,6 +837,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 +891,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 +945,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 +974,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..3b734e0 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,10 +56,10 @@ 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
+ * @return array
  *   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()