diff --git a/Documentation/Howto/RenderingDocs/Index.rst b/Documentation/Howto/RenderingDocs/Index.rst
index 5d9e99f..c7c22f9 100644
--- a/Documentation/Howto/RenderingDocs/Index.rst
+++ b/Documentation/Howto/RenderingDocs/Index.rst
@@ -58,96 +58,6 @@ Make sure that `Docker `__ is installed on your system.
.. include:: /_Includes/_LocalRendering.rst.txt
-.. _rendering-wysiwyg:
-
-Rendering with more WYSIWYG-feeling (automatic re-rendering)
-------------------------------------------------------------
-
-You want to write complex `reST` markup and directly see the
-rendered output, browser side-by-side with your editor? Then
-this section is for you!
-
-Often, especially in the later stages of creating documentation, you
-just edit small parts of the reST files, render the outcome manually
-and happily commit your changes.
-
-However, in cases you write larger sections of text, you may want
-to get more immediate visual feedback on your changes, but do not
-want to manually trigger the rendering time and again.
-
-To make this easier, the project `garvinhicking/typo3-documentation-browsersync
-`__
-has been created. This docker container solution provides an environment
-which permanently watches changes to any of the reST files and automatically
-triggers a re-rendering. The generated HTML output is then served with a
-local web server (vite-based) in which your browser automatically hot-reloads
-all changes and keeps the scroll position.
-
-This allows you to have a browser window next to your reST file editor
-to view progress.
-
-Since that whole environment is based on the official
-:ref:`TYPO3 documentation rendering container `
-and utilizes a docker container, it is simple to use. Also, all updates
-to the `render-guides` project are automatically merged into that
-project, so all bugfixes and new features of the PHP-based rendering always
-are in sync with this WYSIWYG-project, with a possibility of this becoming
-a regular TYPO3-documentation project (given positive feedback).
-
-The project itself has `documentation on the technical details
-`__
-but all you need is this docker/podman command:
-
-.. tabs::
-
- .. group-tab:: Linux
-
- .. code-block:: bash
-
- docker run --rm -it --pull always \
- -v "./Documentation:/project/Documentation" \
- -v "./Documentation-GENERATED-temp:/project/Documentation-GENERATED-temp" \
- -p 5173:5173 ghcr.io/garvinhicking/typo3-documentation-browsersync:latest
- xdg-open "http://localhost:5173/Documentation-GENERATED-temp/Index.html"
-
- .. group-tab:: MacOS
-
- .. code-block:: bash
-
- docker run --rm -it --pull always \
- -v "./Documentation:/project/Documentation" \
- -v "./Documentation-GENERATED-temp:/project/Documentation-GENERATED-temp" \
- -p 5173:5173 ghcr.io/garvinhicking/typo3-documentation-browsersync:latest
- open "http://localhost:5173/Documentation-GENERATED-temp/Index.html"
-
- .. group-tab:: Windows
-
- .. code-block:: powershell
-
- docker run --rm -it --pull always \
- -v "./Documentation:/project/Documentation" \
- -v "./Documentation-GENERATED-temp:/project/Documentation-GENERATED-temp" \
- -p 5173:5173 ghcr.io/garvinhicking/typo3-documentation-browsersync:latest
- start "http://localhost:5173/Documentation-GENERATED-temp/Index.html"
-
-The command above can also be added to your project's `Makefile` or
-you can create a bash alias like:
-
-.. code:: bash
-
- alias render-wysiwyg="docker run --rm -it --pull always \
- -v './Documentation:/project/Documentation' \
- -v './Documentation-GENERATED-temp:/project/Documentation-GENERATED-temp' \
- -p 5173:5173 ghcr.io/garvinhicking/typo3-documentation-browsersync:latest'"
-
-.. note::
-
- If anything on your host operating system already utilizes the TCP port
- `5173` you need to adapt that command to use another free TCP port for you,
- and adapt the port in the web-browser URL.
-
-.. _publish-documentation:
-
Publishing extension documentation to docs.typo3.org
====================================================
@@ -213,3 +123,8 @@ documentation automatically:
- mkdir -p Documentation-GENERATED-temp
- /opt/guides/entrypoint.sh --config=Documentation --no-progress --minimal-test
+.. toctree::
+ :maxdepth: 1
+ :hidden:
+
+ Watch
diff --git a/Documentation/Howto/RenderingDocs/Watch.rst b/Documentation/Howto/RenderingDocs/Watch.rst
new file mode 100644
index 0000000..cff2c53
--- /dev/null
+++ b/Documentation/Howto/RenderingDocs/Watch.rst
@@ -0,0 +1,95 @@
+:navigation-title: Live rendering (WYSIWYG)
+
+.. _rendering-wysiwyg:
+.. _live-rendering:
+
+============================================================
+Rendering with more WYSIWYG-feeling (automatic re-rendering)
+============================================================
+
+You want to write complex `reST` markup and directly see the
+rendered output, browser side-by-side with your editor? Then
+this section is for you!
+
+Often, especially in the later stages of creating documentation, you
+just edit small parts of the reST files, render the outcome manually
+and happily commit your changes.
+
+However, in cases you write larger sections of text, you may want
+to get more immediate visual feedback on your changes, but do not
+want to manually trigger the rendering time and again.
+
+To make this easier, `render-guides` can serve the rendered documentation
+via a local web-server and automatically re-render the documentation
+when changes in the source files are detected. This gives you a more
+WYSIWYG-like experience when writing documentation.
+
+This allows you to have a browser window next to your reST file editor
+to view progress.
+
+.. tabs::
+
+ .. group-tab:: Linux
+
+ .. code-block:: bash
+
+ docker run --rm -it --pull always \
+ -v "./Documentation:/project/Documentation" \
+ -v "./Documentation-GENERATED-temp:/project/Documentation-GENERATED-temp" \
+ -p 1337:1337 ghcr.io/typo3-documentation/render-guides:latest --config="Documentation" --watch
+ xdg-open "http://localhost:1337/Index.html"
+
+ .. group-tab:: MacOS
+
+ .. code-block:: bash
+
+ docker run --rm -it --pull always \
+ -v "./Documentation:/project/Documentation" \
+ -v "./Documentation-GENERATED-temp:/project/Documentation-GENERATED-temp" \
+ -p 1337:1337 ghcr.io/typo3-documentation/render-guides:latest --config="Documentation" --watch
+ xdg-open "http://localhost:1337/Index.html"
+ .. group-tab:: Windows
+
+ .. code-block:: powershell
+
+ docker run --rm -it --pull always \
+ -v "./Documentation:/project/Documentation" \
+ -v "./Documentation-GENERATED-temp:/project/Documentation-GENERATED-temp" \
+ -p 1337:1337 ghcr.io/typo3-documentation/render-guides:latest --config="Documentation" --watch
+ xdg-open "http://localhost:1337/Index.html"
+
+The command above can also be added to your project's `Makefile` or
+you can create a bash alias like:
+
+.. code:: bash
+
+ alias render-wysiwyg="docker run --rm -it --pull always \
+ -v './Documentation:/project/Documentation' \
+ -v './Documentation-GENERATED-temp:/project/Documentation-GENERATED-temp' \
+ -p 1337:1337 ghcr.io/typo3-documentation/render-guides:latest --watch"
+
+.. note::
+
+ If anything on your host operating system already utilizes the TCP port
+ `1337` you need to adapt that command to use another free TCP port for you,
+ and adapt the port in the web-browser URL.
+ You can do this by changing the :bash:`-p` parameter, e.g. to
+ :bash:`-p 8080:1337` to use TCP port `8080` on your host system.
+
+Limitations
+===========
+
+Not all changes in the source files can be detected automatically, or will
+impact the rendered output immediately. In such cases, a manual re-rendering
+is required. Examples are:
+
+* Changes in :file:`guides.xml`
+* New added files
+* Menu changes
+* Moving files
+
+.. note::
+
+ Please be aware that some editors (like e.g. `VIM`) create temporary files
+ when opening files for editing. This will not be detected as a change to the
+ actual file and thus not trigger a re-rendering.