diff --git a/core/lib/Drupal/Core/Entity/EntityFormBuilderInterface.php b/core/lib/Drupal/Core/Entity/EntityFormBuilderInterface.php
index 3549f4c..c23afcf 100644
--- a/core/lib/Drupal/Core/Entity/EntityFormBuilderInterface.php
+++ b/core/lib/Drupal/Core/Entity/EntityFormBuilderInterface.php
@@ -9,12 +9,20 @@
 
 /**
  * Builds entity forms.
+ *
+ * This is like \Drupal\Core\Form\FormBuilderInterface but instead of looking
+ * up the form class by class name, it looks up the form class based on the
+ * entity type and operation.
  */
 interface EntityFormBuilderInterface {
 
   /**
    * Gets the built and processed entity form for the given entity.
    *
+   * The form may also be retrieved from the cache if the form was built in a
+   * previous pageload. The form is then passed on for processing, validation,
+   * and submission if there is proper input.
+   *
    * @param \Drupal\Core\Entity\EntityInterface $entity
    *   The entity to be created or edited.
    * @param string $operation
@@ -23,7 +31,15 @@
    *   @code
    *   _entity_form: node.book_outline
    *   @endcode
-   *   where "book_outline" is the value of $operation.
+   *   where "book_outline" is the value of $operation. The class name for the
+   *   form for each operation (edit, delete, etc.) can be found in the form
+   *   section of the handlers entity annotation.For example:
+   *   @code
+   *   handlers = {
+   *     "form" = {
+   *       "delete" = "Drupal\node\Form\NodeDeleteForm",
+   *   @endcode
+   *   Alternatively, the form class can be set from hook_entity_type_build().
    * @param array $form_state_additions
    *   (optional) An associative array used to build the current state of the
    *   form. Use this to pass additional information to the form, such as the
@@ -36,6 +52,11 @@
    *
    * @return array
    *   The processed form for the given entity and operation.
+   *
+   * @see \Drupal\Core\Form\FormBuilderInterface::getForm()
+   * @see \Drupal\Core\Entity\EntityTypeInterface::getFormClass()
+   * @see \Drupal\Core\Entity\EntityTypeInterface::setFormClass()
+   * @see book_entity_type_build()
    */
   public function getForm(EntityInterface $entity, $operation = 'default', array $form_state_additions = array());
 
diff --git a/core/lib/Drupal/Core/Form/FormBuilderInterface.php b/core/lib/Drupal/Core/Form/FormBuilderInterface.php
index bbfed36..eaa3f53 100644
--- a/core/lib/Drupal/Core/Form/FormBuilderInterface.php
+++ b/core/lib/Drupal/Core/Form/FormBuilderInterface.php
@@ -70,7 +70,7 @@ public function getForm($form_arg);
    * Builds and processes a form for a given form ID.
    *
    * The form may also be retrieved from the cache if the form was built in a
-   * previous page-load. The form is then passed on for processing, validation
+   * previous pageload. The form is then passed on for processing, validation,
    * and submission if there is proper input.
    *
    * @param \Drupal\Core\Form\FormInterface|string $form_id