diff --git a/core/includes/entity.inc b/core/includes/entity.inc
index 73118c6..1fab3d5 100644
--- a/core/includes/entity.inc
+++ b/core/includes/entity.inc
@@ -460,15 +460,18 @@ function entity_form_state_defaults(EntityInterface $entity, $operation = 'defau
 /**
  * Retrieves, populates, and processes an entity form.
  *
- * @param EntityInterface $entity
+ * @param \Drupal\Core\Entity\EntityInterface $entity
  *   The entity to be created or edited.
- * @param $operation
- *   (optional) The operation identifying the form to be submitted.
- * @param $form_state
- *   (optional) A keyed array containing the current state of the form.
- *
- * @return
- *   A $form_state array already filled with the entity form controller.
+ * @param string $operation
+ *   (optional) The operation identifying the form to be submitted. Defaults to
+ *   'default'.
+ * @param array $form_state
+ *   (optional) An associative array containing the current state of the form.
+ *   Defaults to an empty array.
+ * @param ...
+ *   Any additional arguments are passed on to the
+ *   \Drupal\Core\Entity\EntityFormControllerInterface::build() method, in
+ *   addition to the entity itself.
  */
 function entity_form_submit(EntityInterface $entity, $operation = 'default', &$form_state = array()) {
   $form_state += entity_form_state_defaults($entity, $operation);
@@ -481,14 +484,20 @@ function entity_form_submit(EntityInterface $entity, $operation = 'default', &$f
 /**
  * Returns the built and processed entity form for the given entity.
  *
- * @param EntityInterface $entity
+ * @param \Drupal\Core\Entity\EntityInterface $entity
  *   The entity to be created or edited.
- * @param $operation
+ * @param string $operation
  *   (optional) The operation identifying the form variation to be returned.
+ *   Defaults to 'default'.
  * @param array $form_state
  *   (optional) An associative array containing the current state of the form.
+ *   Defaults to an empty array.
+ * @param ...
+ *   Any additional arguments are passed on to the
+ *   \Drupal\Core\Entity\EntityFormControllerInterface::build() method, in
+ *   addition to the entity itself.
  *
- * @return
+ * @return array
  *   The processed form for the given entity and operation.
  */
 function entity_get_form(EntityInterface $entity, $operation = 'default', array $form_state = array()) {