From 642db14e397297c8c64983c8e9bd585702bf559c Mon Sep 17 00:00:00 2001
From: Alexander Schranz <alexander@sulu.io>
Date: Tue, 7 May 2024 10:59:00 +0200
Subject: [PATCH 1/3] Simplify global blocks example to ref (#798)

* Simplify global blocks example to ref

* Update book/templates.rst

---------

Co-authored-by: Prokyonn <daniel.mathis@sector8.eu>
---
 book/templates.rst | 22 +++++++---------------
 1 file changed, 7 insertions(+), 15 deletions(-)

diff --git a/book/templates.rst b/book/templates.rst
index 2d783700..dba2848b 100644
--- a/book/templates.rst
+++ b/book/templates.rst
@@ -382,7 +382,7 @@ from within a block.
 
 .. note::
 
-    Because the ``&`` character needs to be escaped inside of XML files, you have to use ``AND`` instead of ``&&`` 
+    Because the ``&`` character needs to be escaped inside of XML files, you have to use ``AND`` instead of ``&&``
     if you want to connect conditions using a logical and. Additionally, you can use ``OR`` instead of ``||``.
 
 Language Independent Properties
@@ -942,23 +942,15 @@ node and the ``ref`` attribute:
     <block name="blocks" default-type="text_block" minOccurs="0">
         <types>
             <type ref="text_block" />
-            <type name="editor">
-                <meta>
-                    <title lang="en">Editor</title>
-                    <title lang="de">Editor</title>
-                </meta>
-                <properties>
-                    <property name="text_editor" type="text_editor">
-                        <meta>
-                            <title lang="en">Text Editor</title>
-                            <title lang="de">Texteditor</title>
-                        </meta>
-                    </property>
-                </properties>
-            </type>
         </types>
     </block>
 
+.. note::
+
+    Mixing global and local block types is supported, but it is recommended to keep your block type names unique
+    to avoid confusion. This approach also simplifies the transition to global blocks in the future, eliminating the need
+    for data migrations.
+
 Caching
 -------
 

From f94fb664fd68fa37fdb198482aeedbe97b5f62af Mon Sep 17 00:00:00 2001
From: Alexander Schranz <alexander@sulu.io>
Date: Tue, 21 May 2024 16:46:22 +0200
Subject: [PATCH 2/3] Fix refernce bundle paragraph spaces (#801)

---
 bundles/reference.rst | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/bundles/reference.rst b/bundles/reference.rst
index 0be97526..6bcc6c5e 100644
--- a/bundles/reference.rst
+++ b/bundles/reference.rst
@@ -7,15 +7,11 @@ and location in which an entity is utilized. Presently, the ReferenceBundle is c
 Media within PHPCR entities such as `pages` and `snippets`. These references are managed distinctly for the draft
 state within the `admin context` and the live state within the `website context`.
 
-|
-
 The main reason we need this bundle is that, unlike traditional database references, our content management system
 operates on an unstructured data model. Therefore, we cannot rely solely on database references, which are usually preferred.
 It is essential to note that the ReferenceBundle should only be used for unstructured data, where database relations are
 not feasible.
 
-|
-
 Content maintainers are able to see the references to a specific entity in the `Insights` tab of an entity like `Snippet`.
 
 .. figure:: ../img/snippet-insights.png
@@ -34,7 +30,6 @@ references by executing the `bin/console sulu:references:refresh` command. This
 
     bin/console sulu:references:refresh <resource-key>
 
-
 .. note::
 
     Please note that references are only refreshed for the current context. To refresh the references for both the
@@ -47,8 +42,6 @@ To integrate the ReferenceBundle for custom content-types, you need to implement
 content-type class. The interface requires you to implement the `getReferences` method. The method already receives the
 `ReferenceCollector` which you can use to add references to the collector.
 
-|
-
 Example implementation for a custom content-type:
 
 .. code-block:: php
@@ -65,4 +58,4 @@ Example implementation for a custom content-type:
                 (string) $data['id'],
                 $propertyPrefix . $property->getName()
             );
-    }
\ No newline at end of file
+    }

From f751ceb2a1d4519ca4b43eb5743bc24737a7a169 Mon Sep 17 00:00:00 2001
From: lubomirfiala <77013402+lubomirfiala@users.noreply.github.com>
Date: Wed, 22 May 2024 12:12:09 +0200
Subject: [PATCH 3/3] update: upgrading node version for admin build

---
 cookbook/build-admin-frontend.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cookbook/build-admin-frontend.rst b/cookbook/build-admin-frontend.rst
index 2872e452..783f328c 100644
--- a/cookbook/build-admin-frontend.rst
+++ b/cookbook/build-admin-frontend.rst
@@ -31,7 +31,7 @@ Solution 2: Build manually with docker
 
 .. code-block:: bash
 
-    docker run --rm --interactive --tty --volume ${PWD}:/var/project node:14.16.0 /bin/bash
+    docker run --rm --interactive --tty --volume ${PWD}:/var/project node:20-alpine3.18 /bin/sh
 
     # for completion: using another node version is possible by adjusting the tag of the node image
     # docker run --rm --interactive --tty --volume ${PWD}:/var/project node:12.21.0 /bin/bash