summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
authorRobert Ancell <robert.ancell@canonical.com>2013-11-27 16:48:36 +1300
committerRobert Ancell <robert.ancell@canonical.com>2013-11-27 16:48:36 +1300
commitfe72c630eb843cd84d3da86efc6e5cdd7c0c3ffa (patch)
treed3efdb83ef15ae03792b8494e21197289181e036 /data
parent874817bf119cc76a4e05b40cfca8d7ddedda640a (diff)
parentd29eaba59778be95157ff0a183f35e5a57e448ab (diff)
downloadlightdm-fe72c630eb843cd84d3da86efc6e5cdd7c0c3ffa.tar.gz
Merge with trunk
Diffstat (limited to 'data')
-rw-r--r--data/Makefile.am3
-rw-r--r--data/dm-tool.13
-rw-r--r--data/lightdm-set-defaults.152
-rw-r--r--data/lightdm.13
4 files changed, 3 insertions, 58 deletions
diff --git a/data/Makefile.am b/data/Makefile.am
index d4aead2f..b5601b94 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -25,8 +25,7 @@ dist_apparmor_profile_abstractions_DATA = \
apparmor/abstractions/lightdm_chromium-browser
dist_man1_MANS = dm-tool.1 \
- lightdm.1 \
- lightdm-set-defaults.1
+ lightdm.1
EXTRA_DIST = apparmor/lightdm-guest-session.in
CLEANFILES = lightdm-guest-session
diff --git a/data/dm-tool.1 b/data/dm-tool.1
index f4ceae23..1637f313 100644
--- a/data/dm-tool.1
+++ b/data/dm-tool.1
@@ -59,5 +59,4 @@ Connect an existing X server to the display manager.
.B add-seat TYPE [NAME=VALUE...]
Add a dynamic seat.
.SH SEE ALSO
-.BR lightdm (1),
-.BR lightdm-set-defaults (1)
+.BR lightdm (1)
diff --git a/data/lightdm-set-defaults.1 b/data/lightdm-set-defaults.1
deleted file mode 100644
index 1cc68dcb..00000000
--- a/data/lightdm-set-defaults.1
+++ /dev/null
@@ -1,52 +0,0 @@
-.TH LIGHTDM-SET-DEFAULTS 1 "7 November 2013"
-.SH NAME
-lightdm-set-defaults \- sets configuration options for lightdm
-.SH SYNOPSIS
-.B lightdm-set-defaults
-[
-.I OPTION
-]
-.SH DESCRIPTION
-.B lightdm-set-defaults
-sets configuration options for lightdm. Requires root permissions to run.
-.SH OPTIONS
-.TP
-.B \-h, \-\-help
-Show help options
-.TP
-.B \-k, \-\-keep\-old
-Only update if no default already set
-.TP
-.B \-d, \-\-debug
-Enable debugging messages
-.TP
-.B \-r, \-\-remove
-Remove default value if it's the current one
-.TP
-.B \-s, \-\-session=SESSION_NAME
-Set the default session to SESSION_NAME
-.TP
-.B \-g, \-\-greeter=GREETER_NAME
-Set the default greeter to GREETER_NAME
-.TP
-.B \-a, \-\-autologin=USERNAME
-Set the autologin user to USERNAME
-.TP
-.B \-i, \-\-hide\-users=<true|false>
-Set greeter-hide-users to true or false.
-.TP
-.B \-m, \-\-show\-manual\-login=<true|false>
-Set show-manual-login to true or false.
-.TP
-.B \-R, \-\-show\-remote\-login=<true|false>
-Set show-manual-login to true or false.
-.TP
-.B \-l, \-\-allow\-guest=<true|false>
-Set allow-guest to true or false.
-.SH FILES
-.TP
-.B /etc/lightdm/lightdm.conf
-Configuration
-.SH SEE ALSO
-.BR lightdm (1),
-.BR dm-tool (1)
diff --git a/data/lightdm.1 b/data/lightdm.1
index 27f80912..a6c90b2b 100644
--- a/data/lightdm.1
+++ b/data/lightdm.1
@@ -54,5 +54,4 @@ User list configuration (if not using Accounts Service)
.B /etc/lightdm/keys.conf
XDMCP keys
.SH SEE ALSO
-.BR dm-tool (1),
-.BR lightdm-set-defaults (1)
+.BR dm-tool (1)