diff -u b/core/lib/Drupal/Core/Plugin/Context/ContextProviderInterface.php b/core/lib/Drupal/Core/Plugin/Context/ContextProviderInterface.php
--- b/core/lib/Drupal/Core/Plugin/Context/ContextProviderInterface.php
+++ b/core/lib/Drupal/Core/Plugin/Context/ContextProviderInterface.php
@@ -11,7 +11,7 @@
  * The fully qualified context ID then includes the service ID:
  *
  * @code
- * @{service_id}:{unqualified_context_id}.
+ * {service_id}:{unqualified_context_id}.
  * @endcode
  *
  * @see \Drupal\Core\Plugin\Context\ContextRepositoryInterface
only in patch2:
unchanged:
--- a/core/lib/Drupal/Core/Entity/EntityStorageInterface.php
+++ b/core/lib/Drupal/Core/Entity/EntityStorageInterface.php
@@ -7,9 +7,10 @@
  *
  * For common default implementations, see
  * \Drupal\Core\Entity\Sql\SqlContentEntityStorage for content entities and
- * \Drupal\Core\Config\Entity\ConfigEntityStorage for config entities. Those
- * implementations are used by default when the @ContentEntityType or
- * @ConfigEntityType annotations are used.
+ * \Drupal\Core\Config\Entity\ConfigEntityStorage for config entities.
+ *
+ * @ContentEntityType
+ *   it is used by default or can be used by providing this annotation.
  *
  * @ingroup entity_api
  */
only in patch2:
unchanged:
--- a/core/lib/Drupal/Core/Logger/LogMessageParserInterface.php
+++ b/core/lib/Drupal/Core/Logger/LogMessageParserInterface.php
@@ -13,7 +13,9 @@
    * For a value to be considered as a placeholder should be in the following
    * formats:
    *   - PSR3 format:
-   *     @see https://github.com/php-fig/fig-standards/blob/master/accepted/PSR-3-logger-interface.md#12-message
+   *     @link
+   *       https://github.com/php-fig/fig-standards/blob/master/accepted/PSR-3-logger-interface.md#12-message
+   *     @endlink
    *   - Drupal specific string placeholder format:
    *     @see \Drupal\Component\Utility\SafeMarkup::format()
    *
only in patch2:
unchanged:
--- a/core/lib/Drupal/Core/Template/Loader/FilesystemLoader.php
+++ b/core/lib/Drupal/Core/Template/Loader/FilesystemLoader.php
@@ -10,7 +10,7 @@
  *
  * This loader adds module and theme template paths as namespaces to the Twig
  * filesystem loader so that templates can be referenced by namespace, like
- * @block/block.html.twig or @mytheme/page.html.twig.
+ * block.html.twig or page.html.twig.
  */
 class FilesystemLoader extends \Twig_Loader_Filesystem {