Branding cleanup with TDM.

4 files changed, 34 insertions, 38 deletions

diff --git a/tdm/README b/tdm/README
index 6e118fbae..2679e7ae7 100644
--- a/tdm/README
+++ b/tdm/README
@@ -1,15 +1,12 @@
-This is the K Display Manager (TDM) for KDE 3.4,
-the KDE replacement for the X Display Manager (XDM).
-
-Semi-official home page: http://devel-home.kde.org/~ossi/sw/tdm.html
-
+This is the Trinity Display Manager (TDM),
+the TDE replacement for the X Display Manager (XDM).
 
 configure options that affect TDM
 ---------------------------------
 
 --with-pam[=service]
   Compile TDM (and other parts of tdebase) with PAM support. The default
-  service is "kde". PAM is automatically used if found.
+  service is "tde". PAM is automatically used if found.
 
 --with-tdm-pam=service
   Override the PAM service used specifically by TDM. Depends on --with-pam.
@@ -32,7 +29,7 @@ configure options that affect TDM
   Compile TDM with Kerberos 5 resp. secure RPC support for X authorization
   cookies. It's pretty pointless to enable this if you don't use an X server
   that supports it.
-  
+
   If you want user authentication against a Kerberos realm, compile TDM with
   PAM support and use the appropriate module.
 
@@ -47,16 +44,16 @@ configure options that affect TDM
 TDM's file system layout
 ------------------------
 
-${kde_confdir} is usually ${prefix}/share/config
-${kde_datadir} is usually ${prefix}/share/apps
+${tde_confdir} is usually ${prefix}/share/config
+${tde_datadir} is usually ${prefix}/share/apps
 The indented locations are envisioned for a configuration shared with GDM.
 
-${kde_confdir}/tdm/{tdmrc,Xservers,Xaccess,Xwilling,...}
-${kde_datadir}/tdm/sessions/*.desktop
+${tde_confdir}/tdm/{tdmrc,Xservers,Xaccess,Xwilling,...}
+${tde_datadir}/tdm/sessions/*.desktop
   /etc/X11/sessions/,/usr/share/xsessions/
-${kde_datadir}/tdm/pics/users/
-${kde_datadir}/tdm/pics/
-${kde_datadir}/tdm/faces/*.face{,.icon}
+${tde_datadir}/tdm/pics/users/
+${tde_datadir}/tdm/pics/
+${tde_datadir}/tdm/faces/*.face{,.icon}
   /usr/share/faces/
 /var/run/xauth/A*
 /var/run/xdmctl/xdmctl*
@@ -70,7 +67,7 @@ $HOME/.dmrc
 How to setup TDM
 ----------------
 
-TDM's config files are all located in ${kde_confdir}/tdm.
+TDM's config files are all located in ${tde_confdir}/tdm.
 "make install" will create a probably working configuration, either by
 deriving it from an already present TDM/XDM installation or by using
 defaults if no previous installation is found.
@@ -85,7 +82,6 @@ system uses PAM.
 Configuring session types
 -------------------------
 
-The way session types are configured changed drastically in KDE 3.2.
 Session types are now represented by .desktop files in appropriate locations.
 The format of the .desktop files is (not yet) defined in the FreeDesktop.org
 desktop entry spec. Differences to "standard" .desktop files are:
@@ -101,15 +97,15 @@ that's what will be saved to ~/.dmrc and what DESKTOP_SESSION will be set to.
 For every magic Exec constant a session type of the same name exists.
 
 Unless your system is configured differently already, you should create a
-directory ${kde_confdir}/tdm/sessions and add this to tdmrc:
+directory ${tde_confdir}/tdm/sessions and add this to tdmrc:
 
 [X-*-Core]
-SessionsDirs=${kde_confdir}/tdm/sessions,${kde_datadir}/tdm/sessions
+SessionsDirs=${tde_confdir}/tdm/sessions,${tde_datadir}/tdm/sessions
 
 (Note that you must use actual paths instead of variables, see the section
 about TDM's file system layout.)
 Do any changes only in the config directory - any changes in the data
-directory will be lost after the next KDE update.
+directory will be lost after the next TDE update.
 
 To override a session type, copy the .desktop file from the data dir to the
 config dir and edit it at will. Removing the shipped session types can be
@@ -135,9 +131,9 @@ modifying the XDM init script shipped by your distribution.
 
    Replace it with:
 
-       x:5:respawn:/opt/kde/bin/tdm
+       x:5:respawn:/opt/trinity/bin/tdm
 
-   This tells init(8) to respawn TDM, the KDE display manager, when
+   This tells init(8) to respawn TDM, the TDE display manager, when
    the system is in run level 5.
    Note that TDM does not need the -nodaemon option.
 
@@ -154,7 +150,7 @@ modifying the XDM init script shipped by your distribution.
 
    If you do the latter step, then every time your system boots
    successfully it will go into run level 5 and run TDM,
-   presenting you the exceedingly cute KDE login screen.
+   presenting you the exceedingly cute TDE login screen.
 
 
 The command sockets
@@ -300,7 +296,7 @@ Commands for all sockets:
    - Numeric user ID of the requesting user, -1 for the global socket.
    - The next boot OS choice or "-" for none.
    - New fields might be added later.
- 
+
 There are two ways of using the sockets:
 - Connecting them directly. FifoDir is exported as $DM_CONTROL; the name
   of per-display sockets can be derived from $DISPLAY.
@@ -448,7 +444,7 @@ BasysKom for sponsoring my (ossi's) work on the conversation plugin stuff.
 ... and _many_ others ...
 
 
--- 
+--
 Have fun with it (and feel free to comment),
 
 	Oswald Buddenhagen <ossi@kde.org>
diff --git a/tdm/config.def b/tdm/config.def
index a7ec59076..936147eb1 100644
--- a/tdm/config.def
+++ b/tdm/config.def
@@ -94,7 +94,7 @@
  _
  Please note: Settings in this file are sometimes ignored (overridden).
  The default TDM startup script /etc/init.d/tdm looks in /etc/default/tdm.d
- for theme-related settings which, if found, take precedence. The possibly 
+ for theme-related settings which, if found, take precedence. The possibly
  overridden settings are: UseBackground, BackgroundCfg, UseTheme, Theme.
  See /usr/share/doc/tdm/README.Debian for details
  _
@@ -222,7 +222,7 @@ display class (which can be ignored in most cases).</para>
 make up a section class.</para>
 
 <para>You can use the wildcard <literal>*</literal> (match any) for
-<replaceable>host</replaceable>, <replaceable>number</replaceable>, 
+<replaceable>host</replaceable>, <replaceable>number</replaceable>,
 and <replaceable>class</replaceable>. You may omit trailing components;
 they are assumed to be <literal>*</literal> then. The host part may be a
 domain specification like <replaceable>.inf.tu-dresden.de</replaceable>
@@ -324,7 +324,7 @@ kcontrol frontend.</para></note>
 display which should constantly be
 managed and which is not using &XDMCP;. This method is typically used only for
 local &X-Server;s that are started by &tdm;, but &tdm; can manage externally
-started (<quote>foreign</quote>) &X-Server;s as well, may they run on the 
+started (<quote>foreign</quote>) &X-Server;s as well, may they run on the
 local machine or rather remotely.</para>
 
 <para>The formal syntax of a specification is
@@ -459,7 +459,7 @@ permanently assigned range of multicast addresses for &XDMCP;. The
 identifier, such as 1 for Node-Local, 2 for Link-Local, 5 for Site-Local, and
 so on (see IETF RFC 2373 or its replacement for further details and scope
 definitions). &tdm; defaults to listening on the Link-Local scope address
-ff02:0:0:0:0:0:0:12b to most closely match the IPv4 subnet broadcast behavior. 
+ff02:0:0:0:0:0:0:12b to most closely match the IPv4 subnet broadcast behavior.
 If no <literal>LISTEN</literal> lines are given, &tdm; listens on all
 interfaces and joins the default &XDMCP; IPv6 multicast group (when
 compiled with IPv6 support).
@@ -668,7 +668,7 @@ the following environment variables are passed:</para>
 <para>Symmetrical with <filename>Xstartup</filename>, the
 <filename>Xreset</filename> program is run after the user session has
 terminated. Run as <systemitem class="username">root</systemitem>, it should
-contain commands that undo the effects of commands in 
+contain commands that undo the effects of commands in
 <filename>Xstartup</filename>, removing entries from <filename>utmp</filename>
 or unmounting directories from file servers.</para>
 
@@ -1563,12 +1563,12 @@ Update: cp_resources
 Merge: xdm
 Comment:
  Specify a file with X-resources for the greeter, chooser and background.
- The KDE frontend does not use this file, so you do not need it unless you
+ The TDE frontend does not use this file, so you do not need it unless you
  use another background generator than krootimage.
 Description:
  This option specifies the name of the file to be loaded by
  <command>xrdb</command> as the resource database onto the root window
- of screen 0 of the display. KDE programs generally do not use
+ of screen 0 of the display. TDE programs generally do not use
  X-resources, so this option is only needed if the <option>Setup</option>
  program needs some X-resources.
 
@@ -1717,7 +1717,7 @@ Merge: xdm
 Comment:
  The default system shell.
 Description:
- The <envar>SHELL</envar> environment variable for all programs but the 
+ The <envar>SHELL</envar> environment variable for all programs but the
  <option>Session</option>.
 
 Key: UserAuthDir
@@ -1744,7 +1744,7 @@ Merge: xdm
 Comment:
  Whether to automatically restart sessions after &X-Server; crashes.
  Note that enabling this makes circumventing screen lockers other than
- KDE's built-in one possible!
+ TDE's built-in one possible!
 Description:
  If enabled, &tdm; will automatically restart a session after an &X-Server;
  crash (or if it is killed by Alt-Ctrl-BackSpace). Note that enabling this
@@ -1924,7 +1924,7 @@ Instance: #:0/!
 Comment: &
 Description:
  Immediately lock the automatically started session. This works only with
- KDE sessions.
+ TDE sessions.
 
 Key: SessionsDirs
 Type: list
@@ -2247,7 +2247,7 @@ Description: !
  which are prefixed with <literal>@</literal> represent all users in the
  user group named by that item.
  Finally, the user list will be sorted alphabetically, if
- <option>SortUsers</option> is enabled. 
+ <option>SortUsers</option> is enabled.
 
 Key: SelectedUsers
 Type: list
@@ -2466,7 +2466,7 @@ Description:
  keyboard grabbed, or possibly if the network latencies are very high. You
  should be cautious when raising the timeout, as a user can be spoofed by
  a look-alike window on the display. If a grab fails, &tdm; kills and
- restarts the &X-Server; (if possible) and the session. 
+ restarts the &X-Server; (if possible) and the session.
 
 Key: AuthComplain
 Type: bool
diff --git a/tdm/kfrontend/tdm_greet.c b/tdm/kfrontend/tdm_greet.c
index f74c2410d..c90ebc1c9 100644
--- a/tdm/kfrontend/tdm_greet.c
+++ b/tdm/kfrontend/tdm_greet.c
@@ -1,6 +1,6 @@
 /*
 
-KDE Greeter module for xdm
+TDE Greeter module for xdm
 
 Copyright (C) 2001-2003 Oswald Buddenhagen <ossi@kde.org>
 
diff --git a/tdm/kfrontend/tdm_greet.h b/tdm/kfrontend/tdm_greet.h
index 9f7e3bd6a..67fda9dfa 100644
--- a/tdm/kfrontend/tdm_greet.h
+++ b/tdm/kfrontend/tdm_greet.h
@@ -1,6 +1,6 @@
 /*
 
-KDE Greeter module for xdm
+TDE Greeter module for xdm
 
 Copyright (C) 2001-2003 Oswald Buddenhagen <ossi@kde.org>