Merge lp:~kalgasnik/lightdm-gtk-greeter/lp-1453589-obsolete-options into lp:~lightdm-gtk-greeter-team/lightdm-gtk-greeter/trunk

[Andrew P.]

lightdm-gtk-greeter.conf: removing obsolete options, new comments.

[Sean Davis (bluesabre)]

Looks good to me.

review: Approve

=== modified file 'data/lightdm-gtk-greeter.conf'
--- data/lightdm-gtk-greeter.conf	2015-02-16 00:30:20 +0000
+++ data/lightdm-gtk-greeter.conf	2015-05-11 20:15:17 +0000
@@ -5,7 +5,7 @@
 #  theme-name = GTK+ theme to use
 #  icon-theme-name = Icon theme to use
 #  background = Background file to use, either an image path or a color (e.g. #772953)
-#  user-background = false|true ("true" by default")  Display user background (if available)
+#  user-background = false|true ("true" by default)  Display user background (if available)
 #  transition-duration = Length of time (in milliseconds) to transition between background images ("500" by default)
 #  transition-type = ease-in-out|linear|none  ("ease-in-out" by default)
 #
@@ -17,21 +17,20 @@
 #  xft-rgba = none|rgb|bgr|vrgb|vbgr  Type of subpixel antialiasing
 #
 # Login window:
-#  active-monitor = Monitor to display greeter window (name or number). Use #cursor value to display greeter at monitor with cursor.
+#  active-monitor = Monitor to display greeter window (name or number). Use #cursor value to display greeter at monitor with cursor. Can be a semicolon separated list
 #  position = x y ("50% 50%" by default)  Login window position
 #  default-user-image = Image used as default user icon, path or #icon-name
 #  hide-user-image = false|true ("false" by default)
 #
 # Panel:
 #  panel-position = top|bottom ("top" by default)
-#  show-clock = false|true ("false" by default)
 #  clock-format = strftime-format string, e.g. %H:%M
-#  show-indicators = semi-colon ";" separated list of allowed indicator modules. Built-in indicators include "~a11y", "~language", "~session", "~power". Unity indicators can be represented by short name (e.g. "sound", "power"), service file name, or absolute path
+#  indicators = semi-colon ";" separated list of allowed indicator modules. Built-in indicators include "~a11y", "~language", "~session", "~power", "~clock", "~host", "~spacer". Unity indicators can be represented by short name (e.g. "sound", "power"), service file name, or absolute path
 #
 # Accessibility:
 #  a11y-states = states of accessibility features: "name" - save state on exit, "-name" - disabled at start (default value for unlisted), "+name" - enabled at start. Allowed names: contrast, font, keyboard, reader.
 #  keyboard = command to launch on-screen keyboard (e.g. "onboard")
-#  keyboard-position = x y[;width height] ("50%,center -0;50% 25%" by default)
+#  keyboard-position = x y[;width height] ("50%,center -0;50% 25%" by default)  Works only for "onboard"
 #  reader = command to launch screen reader (e.g. "orca")
 #
 # Security:
@@ -43,9 +42,11 @@
 #  background = overrides default value
 #  user-background = overrides default value
 #  laptop = false|true ("false" by default) Marks monitor as laptop display
-# 
+#  transition-duration = overrides default value
+#
 [greeter]
 #background=
+#user-background=
 #theme-name=
 #icon-theme-name=
 #font-name=
@@ -53,8 +54,7 @@
 #xft-dpi=
 #xft-hintstyle=
 #xft-rgba=
-#show-indicators=
-#show-clock=
+#indicators=
 #clock-format=
 #keyboard=
 #reader=