diff --git a/README.md b/README.md index 5c251c0e28949a84a7b3f41ea500a28d74812358..1ffa1519938200eda108baa58dce4ea548ffc935 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,6 @@ # ISPConfig - Hosting Control Panel -Nightly (master): [![pipeline status](https://git.ispconfig.org/ispconfig/ispconfig3/badges/master/pipeline.svg)](https://git.ispconfig.org/ispconfig/ispconfig3/commits/master) -Stable branch: [![pipeline status](https://git.ispconfig.org/ispconfig/ispconfig3/badges/stable-3.1/pipeline.svg)](https://git.ispconfig.org/ispconfig/ispconfig3/commits/stable-3.1) +Development branch: [![pipeline status](https://git.ispconfig.org/ispconfig/ispconfig3/badges/develop/pipeline.svg)](https://git.ispconfig.org/ispconfig/ispconfig3/commits/develop) - Manage multiple servers from one control panel @@ -11,4 +10,4 @@ Stable branch: [![pipeline status](https://git.ispconfig.org/ispconfig/ispconfig - Virtualization (OpenVZ) - Administrator, reseller and client login - Configuration mirroring and clusters -- Open Source software (BSD license) \ No newline at end of file +- Open Source software (BSD license) diff --git a/server/scripts/ispconfig_update.php b/server/scripts/ispconfig_update.php index e71b501a7c11d2b9686c4543309c661f67327a11..ed416b6efa2d1e036c47ff9020ff5bba279e5f85 100644 --- a/server/scripts/ispconfig_update.php +++ b/server/scripts/ispconfig_update.php @@ -86,7 +86,7 @@ echo " _____ ___________ _____ __ _ |___/ "; echo "\n".str_repeat('-', 80)."\n"; echo "\n\n>> Update \n\n"; -echo "Please choose the update method. For production systems select 'stable'. \nWARNING: The update from GIT is only for development systems and may break your current setup. Do not use the GIT version on servers that host any live websites!\nNote: Update all slave server, before you update master server.\n\n"; +echo "Please choose the update method. For production systems select 'stable'. \nWARNING: The update from GIT is only for development systems and may break your current setup. Do not use the GIT version on servers that host any live websites!\nNote: On Multiserver systems, enable maintenance mode and update your master server first. Then update all slave servers, and disable maintenance mode when all servers are updated.\n\n"; $method = simple_query('Select update method', array('stable', 'nightly', 'git-develop'), 'stable');