X-Git-Url: https://git.proxmox.com/?p=pve-docs.git;a=blobdiff_plain;f=datacenter.cfg.5-opts.adoc;h=8b84a3e319e2b37eee654e97dcfa6a8bcc36c6b1;hp=1c54683e8fc6c2c22f2621302ef682acc0ffe912;hb=afde3bac8c07d3b5682d1b0deb3ff221003db7a4;hpb=27a7acb285bc8968f6a4e4864e137cb62158611a

diff --git a/datacenter.cfg.5-opts.adoc b/datacenter.cfg.5-opts.adoc
index 1c54683..8b84a3e 100644
--- a/datacenter.cfg.5-opts.adoc
+++ b/datacenter.cfg.5-opts.adoc
@@ -22,9 +22,9 @@ bandwidth limit in MiB/s for moving disks
 
 bandwidth limit in MiB/s for restoring guests from backups
 
-`console`: `<applet | html5 | vv>` ::
+`console`: `<applet | html5 | vv | xtermjs>` ::
 
-Select the default Console viewer. You can either use the builtin java applet (VNC; deprecated and maps to html5), an external virt-viewer comtatible application (SPICE), or an HTML5 based viewer (noVNC).
+Select the default Console viewer. You can either use the builtin java applet (VNC; deprecated and maps to html5), an external virt-viewer comtatible application (SPICE), an HTML5 based vnc viewer (noVNC), or an HTML5 based console client (xtermjs). If the selected viewer is not available (e.g. SPICE not activated for the VM), the fallback is noVNC.
 
 `email_from`: `<string>` ::
 
@@ -36,6 +36,14 @@ Set the fencing mode of the HA cluster. Hardware mode needs a valid configuratio
 +
 WARNING: 'hardware' and 'both' are EXPERIMENTAL & WIP
 
+`ha`: `shutdown_policy=<freeze|failover|conditional>` ::
+
+Cluster wide HA settings.
+
+`shutdown_policy`=`<conditional | failover | freeze>` ('default =' `conditional`);;
+
+Describes the policy for handling HA services on poweroff or reboot of a node. Freeze will always freeze services which are still located on the node on shutdown, those services won't be recovered by the HA manager. Failover will not mark the services as frozen and thus the services will get recovered to other nodes, if the shutdown node does not come up again quickly (< 1min). 'conditional' chooses automatically depending on the type of shutdown, i.e., on a reboot the service will be frozen but on a poweroff the service will stay as is, and thus get recovered after about 2 minutes.
+
 `http_proxy`: `http://.*` ::
 
 Specify external http proxy which is used for downloads (example: 'http://username:password@host:port/')
@@ -44,7 +52,7 @@ Specify external http proxy which is used for downloads (example: 'http://userna
 
 Default keybord layout for vnc server.
 
-`language`: `<de | en>` ::
+`language`: `<ca | de | en | es | eu | fa | fr | it | ja | nb | nn | pl | pt_BR | ru | sl | sv | tr | zh_CN | zh_TW>` ::
 
 Default GUI language.