Merge branch 'main' into actions_colorutil

openhab · Nov 19, 2023 · b2843d6 · b2843d6
2 parents 5a1a594 + b76f5e7
commit b2843d6
Show file tree

Hide file tree

Showing 3 changed files with 163 additions and 24 deletions.
diff --git a/installation/synology.md b/installation/synology.md
@@ -95,7 +95,7 @@ You can increase this in the future if you like.
    root@openhab:/openhab# chown openhab:openhab /dev/ttyACM0
    root@openhab:/openhab# chmod o+rw /dev/ttyACM0
    ```
-   
+
    To preserve the changes on container reboot see [Executing shell scripts before openHAB is started](https://github.com/openhab/openhab-docker#executing-shell-scripts-before-openhab-is-started) article.
 :::
 

diff --git a/installation/windows.md b/installation/windows.md
@@ -19,6 +19,8 @@ Please be sure you have installed the required supporting applications as descri
 
 ### Set the `JAVA_HOME` System Environment Variable in Windows
 
+Note: If you have installed Zulu Java 17 (highly recommended for OH 4.x) you may skip this step because the JAVA_HOME environment variable was created during installation.
+
 - Navigate to: Control Panel ➡️ System and Security ➡️ System ➡️ Advanced System Settings ➡️ Environment Variables ➡️ System Variables
 - Create a New System Variable named JAVA_HOME (or update the existing one) to match the installation directory of the Java Platform chosen and installed in the step [Prerequisites]({{base}}/installation/index.html#prerequisites).
 

diff --git a/package-lock.json b/package-lock.json