From: Pierre Ossman <ossman@cendio.se>
Date: Mon, 7 Jun 2021 12:28:25 +0000 (+0200)
Subject: Include "session" in examples instead of "desktop"
X-Git-Tag: v1.11.90~45
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=04f19667cd53becaab97d888c3cfb7246338a238;p=tigervnc.git

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 faf997cb..9f53048e 100644
--- 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 0c217bfe..6981047a 100644
--- 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 98c32f60..45cd301f 100644
--- 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