Include "session" in examples instead of "desktop"

It's almost mandatory to specify "session", but fairly rare to need to
set "desktop", so let's tweak the examples to avoid confusion and
mistakes.

diff --git a/unix/vncserver/HOWTO.md b/unix/vncserver/HOWTO.md
index faf997cb4e0ecc6e33ab0e26e7969cd292fd84df..9f53048ee4bab2ee5c951921768221f0a4e93eab 100644 (file)
--- a/unix/vncserver/HOWTO.md
+++ b/unix/vncserver/HOWTO.md
@@ -47,7 +47,6 @@ for example:
 ```
 session=gnome
 securitytypes=vncauth,tlsvnc
-desktop=sandbox
 geometry=2000x1200
 localhost
 alwaysshared

diff --git a/unix/vncserver/vncserver-config-defaults b/unix/vncserver/vncserver-config-defaults
index 0c217bfebbae0345926fec01435993293162fd13..6981047ab7cf05029a5490f69a16a224bdf04884 100644 (file)
--- a/unix/vncserver/vncserver-config-defaults
+++ b/unix/vncserver/vncserver-config-defaults
@@ -8,8 +8,8 @@
 # Several common settings are shown below. Uncomment and modify to your
 # liking.
 
+# session=gnome
 # securitytypes=vncauth,tlsvnc
-# desktop=sandbox
 # geometry=2000x1200
 # localhost
 # alwaysshared

diff --git a/unix/vncserver/vncserver-config-mandatory b/unix/vncserver/vncserver-config-mandatory
index 98c32f60928ad04245bae13728adab5936b4462e..45cd301f47af1571f044cecfbbdb91049f7b15a5 100644 (file)
--- a/unix/vncserver/vncserver-config-mandatory
+++ b/unix/vncserver/vncserver-config-mandatory
@@ -8,8 +8,8 @@
 # Several common settings are shown below. Uncomment and modify to your
 # liking.
 
+# session=gnome
 # securitytypes=vncauth,tlsvnc
-# desktop=sandbox
 # geometry=2000x1200
 # localhost
 # alwaysshared