diff options
author | Timothy Pearson <[email protected]> | 2012-01-22 00:13:14 -0600 |
---|---|---|
committer | Timothy Pearson <[email protected]> | 2012-01-22 00:13:14 -0600 |
commit | 80e4199df2ac852cfb22848698cabe9ba28e5a67 (patch) | |
tree | d581467b4a60992a84df31cb33471695182246a2 /ubuntu/maverick/tdebase/debian/local | |
parent | ec880882c231baf5c4d02ed1657765b9c3b406cb (diff) | |
download | tde-packaging-80e4199df2ac852cfb22848698cabe9ba28e5a67.tar.gz tde-packaging-80e4199df2ac852cfb22848698cabe9ba28e5a67.zip |
Part 1 of 2 of kdm rename
Diffstat (limited to 'ubuntu/maverick/tdebase/debian/local')
-rw-r--r-- | ubuntu/maverick/tdebase/debian/local/kdm.options | 6 | ||||
-rw-r--r-- | ubuntu/maverick/tdebase/debian/local/kdm.options.5 | 50 |
2 files changed, 28 insertions, 28 deletions
diff --git a/ubuntu/maverick/tdebase/debian/local/kdm.options b/ubuntu/maverick/tdebase/debian/local/kdm.options index 61e4c04a0..05725ae34 100644 --- a/ubuntu/maverick/tdebase/debian/local/kdm.options +++ b/ubuntu/maverick/tdebase/debian/local/kdm.options @@ -1,7 +1,7 @@ -# /etc/trinity/kdm/kdm.options +# /etc/trinity/tdm/tdm.options # -# configuration options for kdm -# See kdm.options(5) for an explanation of the available options. +# configuration options for tdm +# See tdm.options(5) for an explanation of the available options. no-ignore-nologin no-restart-on-upgrade diff --git a/ubuntu/maverick/tdebase/debian/local/kdm.options.5 b/ubuntu/maverick/tdebase/debian/local/kdm.options.5 index e1ccaef2f..446271273 100644 --- a/ubuntu/maverick/tdebase/debian/local/kdm.options.5 +++ b/ubuntu/maverick/tdebase/debian/local/kdm.options.5 @@ -1,4 +1,4 @@ -.\" $Id: kdm.options.5,v 1.2 2004/02/27 22:45:20 ccheney Exp $ +.\" $Id: tdm.options.5,v 1.2 2004/02/27 22:45:20 ccheney Exp $ .\" .\" Copyright 1998, 2002, 2003 Branden Robinson <[email protected]>. .\" @@ -15,16 +15,16 @@ .\" the Debian operating system, in /usr/share/common-licenses/GPL; if .\" not, write to the Free Software Foundation, Inc., 59 Temple Place, .\" Suite 330, Boston, MA 02111-1307 USA -.TH kdm.options 5 "2003\-09\-18" "Debian Project" +.TH tdm.options 5 "2003\-09\-18" "Debian Project" .SH NAME -kdm.options \- configuration options for X display manager +tdm.options \- configuration options for X display manager .SH DESCRIPTION -.I /etc/trinity/kdm/kdm.options +.I /etc/trinity/tdm/tdm.options contains a set of flags that determine some of the behavior of the X display manager -.BR kdm (1). +.BR tdm (1). .PP -.I /etc/trinity/kdm/kdm.options +.I /etc/trinity/tdm/tdm.options may contain comments, which begin with a hash mark and end at the next newline, just like comments in shell scripts. The rest of the file consists of options which are expressed as words separated by hyphens, with @@ -38,50 +38,50 @@ Normally, the contents of the /etc/nologin file will be displayed using .BR xmessage (1x) (if .B xmessage -is available), and the user will be returned to the kdm login screen after -the xmessage is dismissed. If this option is enabled, kdm starts a session +is available), and the user will be returned to the tdm login screen after +the xmessage is dismissed. If this option is enabled, tdm starts a session as usual (after the xmessage is dismissed, if xmessage is available). .TP .B restart\-on\-upgrade Enable this option with caution on \(oqproduction\(cq machines; it causes -the kdm daemon to be stopped and restarted on upgrade, even if the process +the tdm daemon to be stopped and restarted on upgrade, even if the process has children (which means it is managing X sessions). Typically when a package that contains a daemon is being installed or upgraded, its maintainer scripts stop a running daemon process before installing the new -binary, and restart it after the new binary is installed. Stopping kdm +binary, and restart it after the new binary is installed. Stopping tdm causes immediate termination of any sessions it manages; in some situations -this could be an unwelcome surprise (for instance, for remote kdm users who +this could be an unwelcome surprise (for instance, for remote tdm users who had no idea the administrator was performing system maintenance). On the other hand, for machines that stay up for long periods of time, leaving the old daemon running can be a bad idea if the new version has, for instance, -a fix for a security vulnerability (overwriting kdm's executable on the -file system has no effect on the copy of kdm in memory). The kdm -pre\-removal script checks to see if the kdm process has any children; if +a fix for a security vulnerability (overwriting tdm's executable on the +file system has no effect on the copy of tdm in memory). The tdm +pre\-removal script checks to see if the tdm process has any children; if it does, it is possible that someone's session would be killed by stopping -kdm, so a warning is issued and an opportunity to abort the upgrade of kdm -is provided. If this option is disabled (the Debian default), kdm will be +tdm, so a warning is issued and an opportunity to abort the upgrade of tdm +is provided. If this option is disabled (the Debian default), tdm will be not be stopped or started during an install or upgrade; the administrator -will have to do so by hand (with \(oq/etc/init.d/kdm restart\(cq, or by -rebooting the system) before the newly installed kdm binary is used. +will have to do so by hand (with \(oq/etc/init.d/tdm restart\(cq, or by +rebooting the system) before the newly installed tdm binary is used. .TP .B use\-sessreg If this option is enabled (the Debian default), the sessreg program will be -invoked to register X sessions managed by kdm in the utmp and wtmp files. +invoked to register X sessions managed by tdm in the utmp and wtmp files. Otherwise, it is not, and the utmp and wtmp files will have no record of -kdm sessions. +tdm sessions. .PP Users of older versions of the Debian system should note that the \(oqrun\-xconsole\(cq option has been removed. Shell scripts named -.I /etc/trinity/kdm/Xsetup +.I /etc/trinity/tdm/Xsetup and -.I /etc/trinity/kdm/Xreset -can be edited to disable or modify the running of xconsole on the kdm +.I /etc/trinity/tdm/Xreset +can be edited to disable or modify the running of xconsole on the tdm greeter screen; see the -.B kdm +.B tdm manual page for more information. .SH AUTHOR This manpage was written by Branden Robinson for the Debian Project. .SH SEE ALSO .BR sessreg (1x), .BR xmessage (1x), -.BR kdm (1x) +.BR tdm (1x) |