symfony / symfony-docs

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

* 5.1:
  Reword the introduction about using Bootstrap and Encore

* 4.4:
  Reword the introduction about using Bootstrap and Encore

… (javiereguiluz)

This PR was merged into the 4.4 branch.

Discussion
----------

Reword the introduction about using Bootstrap and Encore

Fixes #13683.

Commits
-------

0e925a0 Reword the introduction about using Bootstrap and Encore

This PR was merged into the 5.2 branch.

Discussion
----------

[Uid] Correct annotation for ULID type

Just a small typo in the ULID Doctrine type example 😸

Commits
-------

58bcabb Correct annotation for ULID type

This PR was submitted for the 5.x branch but it was merged into the 5.2 branch instead.

Discussion
----------

Remove merge conflict header

Spotted this on the Sphinx fail from my last PR

Commits
-------

63a4e50 Remove merge conflict header

This PR was merged into the 5.3-dev branch.

Discussion
----------

Fix incorrect quotation mark type

Fix incorrect quotation mark type

Commits
-------

4629dba Update setup.rst

Fix incorrect quotation mark type

* upstream/5.x:

* 5.2:
  Tweaks
  Update DSN
  Update DSN
  Support JWT v4
  Remove UuidBinary/UlidBinary usages from documentation

…tion (MrYamous)

This PR was merged into the 5.2 branch.

Discussion
----------

[Uid] Remove UuidBinary/UlidBinary usages from documentation

According to #14641

Commits
-------

7bf71ce Remove UuidBinary/UlidBinary usages from documentation

* 5.2:
  Support JWT v4

* 5.1:
  Support JWT v4

* 4.4:
  Support JWT v4

This PR was merged into the 4.4 branch.

Discussion
----------

[Mercure] Support JWT v4

This is the same change as #14670 but it should have been merged into branch 4.4 and merged up.

Commits
-------

1e1ff71 Support JWT v4

* 5.2:
  Update DSN

* 5.1:
  Update DSN

This PR was merged into the 5.1 branch.

Discussion
----------

[Notifier] Update DSN

Refs symfony/symfony#39545

Commits
-------

facf002 Update DSN

* 5.2:
  Update DSN

This PR was merged into the 5.2 branch.

Discussion
----------

[Notifier] Update DSN

Follows symfony/symfony#39548

Commits
-------

efea745 Update DSN

* 5.2:
  Fixed typo

* 5.1:
  Fixed typo

* 4.4:
  Fixed typo

This PR was merged into the 4.4 branch.

Discussion
----------

Fixed typo

<!--

If your pull request fixes a BUG, use the oldest maintained branch that contains
the bug (see https://symfony.com/releases for the list of maintained branches).

If your pull request documents a NEW FEATURE, use the same Symfony branch where
the feature was introduced (and `5.x` for features of unreleased versions).

-->

Commits
-------

2dbe568 Fixed typo

* 5.2:
  Update uid.rst

* 5.1:
  Update uid.rst

This PR was submitted for the 5.2 branch but it was merged into the 5.1 branch instead.

Discussion
----------

[Uid] Update uid.rst

Uuid::fromString(); should not be instantiated as "new".
The Ulid section is correct the uuid section contains this error.
Especially confusing when you are just starting with this newly implemented functionality.

<!--

If your pull request fixes a BUG, use the oldest maintained branch that contains
the bug (see https://symfony.com/releases for the list of maintained branches).

If your pull request documents a NEW FEATURE, use the same Symfony branch where
the feature was introduced (and `5.x` for features of unreleased versions).

-->

Commits
-------

ddd1367 Update uid.rst