diff --git a/core/lib/Drupal/Core/Entity/ContentEntityInterface.php b/core/lib/Drupal/Core/Entity/ContentEntityInterface.php
index 3053d23694..0ceec98989 100644
--- a/core/lib/Drupal/Core/Entity/ContentEntityInterface.php
+++ b/core/lib/Drupal/Core/Entity/ContentEntityInterface.php
@@ -2,8 +2,6 @@
 
 namespace Drupal\Core\Entity;
 
-use Drupal\Core\TypedData\TranslatableInterface;
-
 /**
  * Defines a common interface for all content entity objects.
  *
@@ -20,7 +18,7 @@
  *
  * @ingroup entity_api
  */
-interface ContentEntityInterface extends \Traversable, FieldableEntityInterface, RevisionableInterface, TranslatableInterface {
+interface ContentEntityInterface extends \Traversable, FieldableEntityInterface, TranslatableRevisionableInterface {
 
   /**
    * Determines if the current translation of the entity has unsaved changes.
@@ -30,61 +28,6 @@
    */
   public function hasTranslationChanges();
 
-  /**
-   * Marks the current revision translation as affected.
-   *
-   * Setting the revision translation affected flag through the setter or
-   * through the field directly will always enforce it, which will be used by
-   * the entity storage to determine if the flag should be recomputed or the set
-   * value should be used instead.
-   * @see \Drupal\Core\Entity\ContentEntityStorageBase::populateAffectedRevisionTranslations()
-   *
-   * @param bool|null $affected
-   *   The flag value. A NULL value can be specified to reset the current value
-   *   and make sure a new value will be computed by the system.
-   *
-   * @return $this
-   */
-  public function setRevisionTranslationAffected($affected);
-
-  /**
-   * Checks whether the current translation is affected by the current revision.
-   *
-   * @return bool
-   *   TRUE if the entity object is affected by the current revision, FALSE
-   *   otherwise.
-   */
-  public function isRevisionTranslationAffected();
-
-  /**
-   * Checks if the revision translation affected flag value has been enforced.
-   *
-   * @return bool
-   *   TRUE if revision translation affected flag is enforced, FALSE otherwise.
-   *
-   * @internal
-   */
-  public function isRevisionTranslationAffectedEnforced();
-
-  /**
-   * Enforces the revision translation affected flag value.
-   *
-   * Note that this method call will not have any influence on the storage if
-   * the value of the revision translation affected flag is NULL which is used
-   * as an indication for the storage to recompute the flag.
-   * @see \Drupal\Core\Entity\ContentEntityInterface::setRevisionTranslationAffected()
-   *
-   * @param bool $enforced
-   *   If TRUE, the value of the revision translation affected flag will be
-   *   enforced so that on entity save the entity storage will not recompute it.
-   *   Otherwise the storage will recompute it.
-   *
-   * @return $this
-   *
-   * @internal
-   */
-  public function setRevisionTranslationAffectedEnforced($enforced);
-
   /**
    * Gets the loaded Revision ID of the entity.
    *
diff --git a/core/lib/Drupal/Core/Entity/ContentEntityStorageInterface.php b/core/lib/Drupal/Core/Entity/ContentEntityStorageInterface.php
index 678937bdc0..5edb9c77dd 100644
--- a/core/lib/Drupal/Core/Entity/ContentEntityStorageInterface.php
+++ b/core/lib/Drupal/Core/Entity/ContentEntityStorageInterface.php
@@ -5,7 +5,7 @@
 /**
  * A storage that supports content entity types.
  */
-interface ContentEntityStorageInterface extends EntityStorageInterface, RevisionableStorageInterface {
+interface ContentEntityStorageInterface extends EntityStorageInterface, TranslatableRevisionableStorageInterface {
 
   /**
    * Constructs a new entity translation object, without permanently saving it.
diff --git a/core/lib/Drupal/Core/Entity/ContentEntityInterface.php b/core/lib/Drupal/Core/Entity/TranslatableRevisionableInterface.php
similarity index 57%
copy from core/lib/Drupal/Core/Entity/ContentEntityInterface.php
copy to core/lib/Drupal/Core/Entity/TranslatableRevisionableInterface.php
index 3053d23694..5cce29228c 100644
--- a/core/lib/Drupal/Core/Entity/ContentEntityInterface.php
+++ b/core/lib/Drupal/Core/Entity/TranslatableRevisionableInterface.php
@@ -5,30 +5,9 @@
 use Drupal\Core\TypedData\TranslatableInterface;
 
 /**
- * Defines a common interface for all content entity objects.
- *
- * Content entities use fields for all their entity properties and are
- * translatable and revisionable, while translations and revisions can be
- * enabled per entity type. It's best practice to always implement
- * ContentEntityInterface for content-like entities that should be stored in
- * some database, and enable/disable revisions and translations as desired.
- *
- * When implementing this interface which extends Traversable, make sure to list
- * IteratorAggregate or Iterator before this interface in the implements clause.
- *
- * @see \Drupal\Core\Entity\ContentEntityBase
- *
- * @ingroup entity_api
+ * Provides methods for an entity to support revision translation.
  */
-interface ContentEntityInterface extends \Traversable, FieldableEntityInterface, RevisionableInterface, TranslatableInterface {
-
-  /**
-   * Determines if the current translation of the entity has unsaved changes.
-   *
-   * @return bool
-   *   TRUE if the current translation of the entity has changes.
-   */
-  public function hasTranslationChanges();
+interface TranslatableRevisionableInterface extends TranslatableInterface, RevisionableInterface {
 
   /**
    * Marks the current revision translation as affected.
@@ -85,25 +64,4 @@ public function isRevisionTranslationAffectedEnforced();
    */
   public function setRevisionTranslationAffectedEnforced($enforced);
 
-  /**
-   * Gets the loaded Revision ID of the entity.
-   *
-   * @return int
-   *   The loaded Revision identifier of the entity, or NULL if the entity
-   *   does not have a revision identifier.
-   */
-  public function getLoadedRevisionId();
-
-  /**
-   * Updates the loaded Revision ID with the revision ID.
-   *
-   * This method should not be used, it could unintentionally cause the original
-   * revision ID property value to be lost.
-   *
-   * @internal
-   *
-   * @return $this
-   */
-  public function updateLoadedRevisionId();
-
 }
diff --git a/core/lib/Drupal/Core/Entity/TranslatableRevisionableStorageInterface.php b/core/lib/Drupal/Core/Entity/TranslatableRevisionableStorageInterface.php
new file mode 100644
index 0000000000..3082aaad43
--- /dev/null
+++ b/core/lib/Drupal/Core/Entity/TranslatableRevisionableStorageInterface.php
@@ -0,0 +1,9 @@
+<?php
+
+namespace Drupal\Core\Entity;
+
+/**
+ * A storage that supports translatable and revisionable entity types.
+ */
+interface TranslatableRevisionableStorageInterface extends RevisionableStorageInterface {
+}
diff --git a/core/lib/Drupal/Core/Entity/entity.api.php b/core/lib/Drupal/Core/Entity/entity.api.php
index bf4abec5c8..ea7f0cf776 100644
--- a/core/lib/Drupal/Core/Entity/entity.api.php
+++ b/core/lib/Drupal/Core/Entity/entity.api.php
@@ -68,6 +68,47 @@
  * - During many operations, static methods are called on the entity class,
  *   which implements \Drupal\Entity\EntityInterface.
  *
+ * @section entities_revisions_translations Entities, revisions and translations
+ * A content entity can have multiple stored variants: based on its definition,
+ * it can be revisionable, translatable, or both.
+ *
+ * A revisionable entity can keep track of the changes that affect its data. In
+ * fact all previous revisions of the entity are stored and available as
+ * historical information. The "default" revision is the canonical version of
+ * the entity, the one that is loaded when no specific revision is requested.
+ * Only changes to the default revision can be performed without triggering the
+ * creation of a new revision, in any other case revision data is not supposed
+ * to change. Aside from historical data, there can be "pending" revisions, that
+ * contain changes that did not make their way into the default revision.
+ * Typically these revisions contain data that is waiting for some form of
+ * approval, before being accepted as canonical. See
+ * \Drupal\Core\Entity\RevisionableInterface and
+ * \Drupal\Core\Entity\RevisionableStorageInterface for more details.
+ *
+ * A translatable entity can contain multiple translations of the same content.
+ * Content entity data is stored via fields, and each field can have one version
+ * for each enabled language. Some fields may be defined as untranslatable, that
+ * is shared among all translations. The "default" translation is the canonical
+ * version of the entity, the one whose content will be accessible in the entity
+ * field data, if no language is specified. Other translation objects can be
+ * instantiated from the default one. A translation is identified by the entity
+ * identifier and the "active language". See
+ * \Drupal\Core\TypedData\TranslatableInterface for more details.
+ *
+ * An entity that is both revisionable and translatable has all the features
+ * described above: every revision can contain one or more translations. The
+ * canonical version of the entity is the default translation of the default
+ * revision. If a translation has changes in a certain revision, the translation
+ * is considered "affected" by that revision. With the built-in UI a translation
+ * change will create a new revision (with a copy of all field data for other
+ * translations), unless the default revision is being modified (no new revision
+ * is created). In this case, multiple translations may be affected by the
+ * default revision. Pending revisions are not supposed to contain multiple
+ * affected translations, even when they are being manipulated via the API. See
+ * \Drupal\Core\Entity\TranslatableRevisionableInterface and
+ * \Drupal\Core\Entity\TranslatableRevisionableStorageInterface for more
+ * details.
+ *
  * @section create Create operations
  * To create an entity:
  * @code
@@ -84,6 +125,10 @@
  * Hooks invoked during the create operation:
  * - hook_ENTITY_TYPE_create()
  * - hook_entity_create()
+ * - When handling content entities, if a new translation is added to the entity
+ *   object:
+ *   - hook_ENTITY_TYPE_translation_create()
+ *   - hook_entity_translation_create()
  *
  * See @ref save below for the save portion of the operation.
  *
@@ -113,17 +158,6 @@
  * @endcode
  * This involves the same hooks and operations as regular entity loading.
  *
- * @section entities_revisions_translations Entities, revisions and translations
- *
- * A translation is not a revision and a revision is not necessarily a
- * translation. Revisions and translations are the two axes on the "spreadsheet"
- * of an entity. If you use the built-in UI and have revisions enabled, then a
- * new translation change would create a new revision (with a copy of all data
- * for other languages in that revision). If an entity does not use revisions or
- * the entity is being modified via the API, then multiple translations can be
- * modified in a single revision. Conceptually, the revisions are columns on the
- * spreadsheet and translations are rows.
- *
  * @section save Save operations
  * To update an existing entity, you will need to load it, change properties,
  * and then save; as described above, when creating a new entity, you will also
@@ -245,6 +279,7 @@
  * @}
  */
 
+
 /**
  * @defgroup entity_api Entity API
  * @{