Merge branch '5.2' into 5.x

* 5.2:
  Remove merge conflict header
  Correct annotation for ULID type
  Reword the introduction about using Bootstrap and Encore

Author: wouterj

components/uid.rst

@@ -287,7 +287,7 @@ entity primary keys::
     {
         /**
          * @ORM\Id
-         * @ORM\Column(type="uuid", unique=true)
+         * @ORM\Column(type="ulid", unique=true)
          * @ORM\GeneratedValue(strategy="CUSTOM")
          * @ORM\CustomIdGenerator(class=UlidGenerator::class)
          */

frontend/encore/bootstrap.rst

@@ -1,9 +1,9 @@
 Using Bootstrap CSS & JS
 ========================
 
-Want to use Bootstrap (or something similar) in your project? No problem!
-First, install it. To be able to customize things further, we'll install
-``bootstrap``:
+This article explains how to install and integrate the `Bootstrap CSS framework`_
+in your Symfony application using :doc:`Webpack Encore </frontend>`.
+First, to be able to customize things further, we'll install ``bootstrap``:
 
 .. code-block:: terminal
 
@@ -79,3 +79,5 @@ and CSS like normal:
     // require 2 CSS files needed
     require('bootstrap-star-rating/css/star-rating.css');
     require('bootstrap-star-rating/themes/krajee-svg/theme.css');
+
+.. _`Bootstrap CSS framework`: https://getbootstrap.com/