From 1aba2005063c83ec82ba15e4b1d7927afd53cc83 Mon Sep 17 00:00:00 2001
From: Julien Lavergne <gilir@ubuntu.com>
Date: Thu, 28 Jul 2011 23:41:58 +0200
Subject: [PATCH] * etc/xdg/lubuntu/lxdm/lxdm.conf:  - Update with version in
 lxdm 0.4.0.

---
 debian/changelog               |  4 +++-
 etc/xdg/lubuntu/lxdm/lxdm.conf | 36 +++++++++++++++++++++++++++++++++-
 2 files changed, 38 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index ca522b9..e060f65 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,8 +15,10 @@ lubuntu-default-settings (0.20) UNRELEASED; urgency=low
    - Don't autostart nm-applet, should be autostarted automaticly.
    - Use xfce4-power-manager instead of gnome-power-manager which depends now
      on gnome-settings-daemon.
+  * etc/xdg/lubuntu/lxdm/lxdm.conf:
+   - Update with version in lxdm 0.4.0. 
 
- -- Julien Lavergne <gilir@ubuntu.com>  Sun, 19 Jun 2011 13:19:13 +0200
+ -- Julien Lavergne <gilir@ubuntu.com>  Thu, 28 Jul 2011 23:36:41 +0200
 
 lubuntu-default-settings (0.19) natty; urgency=low
 
diff --git a/etc/xdg/lubuntu/lxdm/lxdm.conf b/etc/xdg/lubuntu/lxdm/lxdm.conf
index 1ee66c2..7092707 100644
--- a/etc/xdg/lubuntu/lxdm/lxdm.conf
+++ b/etc/xdg/lubuntu/lxdm/lxdm.conf
@@ -1,21 +1,55 @@
 [base]
+## uncomment and set autologin username to enable autologin
 # autologin=dgod
+
+## uncomment and set timeout to enable timeout autologin,
+## the value should >=5
+# timeout=10
+
+## default session or desktop used when no systemwide config
 session=/usr/bin/startlubuntu
+
+## uncomment and set to set numlock on your keyboard
 # numlock=0
+
+## set this if you don't want to put xauth file at ~/.Xauthority
+# xauth_path=/tmp
+
+## greeter used to welcome the user
 greeter=/usr/lib/lxdm/lxdm-greeter-gtk
 
 [server]
-# arg=/usr/bin/X -nr vt1
+## arg used to start xserver, not fully function
+# arg=/usr/bin/X -background vt1
 
 [display]
+## gtk theme used by greeter
 gtk_theme=Clearlooks
+
+## background of the greeter
+bg=/usr/share/backgrounds/default.png
+
+## if show bottom pane
 bottom_pane=1
+
+## if show language select control
 lang=1
+
+## if show keyboard layout select control
+keyboard=0
+
+## the theme of greeter
 theme=Lubuntu
 
 [input]
 
 [userlist]
+## if disable the user list control at greeter
 disable=0
+
+## whitelist user
 white=
+
+## blacklist user
 black=
+