Strip out non-core changes in preperation for merging into trunk

[sojka/lightdm.git] / data / lightdm.conf

diff --git a/data/lightdm.conf b/data/lightdm.conf
index d25fa189eab960ee987bed3e15d7b15478f9a233..3934f8cfbdcc703d41f971af7b663493588b2894 100644 (file)
--- a/data/lightdm.conf
+++ b/data/lightdm.conf
@@ -43,6 +43,8 @@
 # xdmcp-manager = XDMCP manager to connect to (implies xserver-allow-tcp=true)
 # xdmcp-port = XDMCP UDP/IP port to communicate on
 # xdmcp-key = Authentication key to use for XDM-AUTHENTICATION-1 (stored in keys.conf)
+# unity-compositor-command = Unity compositor command to run (can also contain arguments e.g. unity-system-compositor -special-option)
+# unity-compositor-timeout = Number of seconds to wait for compositor to start
 # greeter-session = Session to load for greeter
 # greeter-hide-users = True to hide the user list
 # greeter-allow-guest = True if the greeter should show a guest login option
@@ -73,6 +75,8 @@
 #xdmcp-manager=
 #xdmcp-port=177
 #xdmcp-key=
+#unity-compositor-command=unity-system-compositor
+#unity-compositor-timeout=60
 #greeter-session=example-gtk-gnome
 #greeter-hide-users=false
 #greeter-allow-guest=true