diff options
| -rw-r--r-- | doc/userguide/kde-for-admins.docbook | 10 | ||||
| -rw-r--r-- | ksmserver/main.cpp | 2 | ||||
| -rw-r--r-- | starttde | 10 |
3 files changed, 11 insertions, 11 deletions
diff --git a/doc/userguide/kde-for-admins.docbook b/doc/userguide/kde-for-admins.docbook index a31323a1d..466aba62b 100644 --- a/doc/userguide/kde-for-admins.docbook +++ b/doc/userguide/kde-for-admins.docbook @@ -834,7 +834,7 @@ script:</para> <programlisting> LD_BIND_NOW=true tdeinit +kcminit +knotify and kwrapper -ksmserver $KDEWM +ksmserver $TDEWM </programlisting> <para>The first line starts the <command>tdeinit</command> master process. @@ -1181,8 +1181,8 @@ class="username">root</systemitem>.</para> </listitem> </varlistentry> -<varlistentry><term>$<envar>KDEWM</envar></term><listitem><para>If the -<envar>KDEWM</envar> environment variable has been set, then it will +<varlistentry><term>$<envar>TDEWM</envar></term><listitem><para>If the +<envar>TDEWM</envar> environment variable has been set, then it will be used as &kde;'s window manager within the <command>starttde</command> script instead of &twin;.</para> </listitem> @@ -1254,14 +1254,14 @@ configuration cache file.</para> </listitem> </varlistentry> -<varlistentry><term>$<envar>KDETMP</envar></term><listitem><para>Allows +<varlistentry><term>$<envar>TDETMP</envar></term><listitem><para>Allows to specify another path than <filename class="directory">/tmp</filename> where &kde; stores its temporary files.</para> </listitem> </varlistentry> -<varlistentry><term>$<envar>KDEVARTMP</envar></term><listitem><para>Allows +<varlistentry><term>$<envar>TDEVARTMP</envar></term><listitem><para>Allows to specify another path than <filename class="directory">/var/tmp</filename> where &kde; stores its variable files.</para> diff --git a/ksmserver/main.cpp b/ksmserver/main.cpp index c98a1eb69..a7f8ef3d9 100644 --- a/ksmserver/main.cpp +++ b/ksmserver/main.cpp @@ -122,7 +122,7 @@ void sanity_check( int argc, char* argv[] ) } if (msg.isEmpty()) { - path = getenv("KDETMP"); + path = getenv("TDETMP"); if (path.isEmpty()) path = "/tmp"; if (!writeTest(path)) @@ -460,7 +460,7 @@ fi # - a directory /tmp/kde-$USER and links $TDEHOME/tmp-$HOSTNAME to it. # - a directory /tmp/tdesocket-$USER and links $TDEHOME/socket-$HOSTNAME to it. # - a directory /var/tmp/kdecache-$USER and links $TDEHOME/cache-$HOSTNAME to it. -# Note: temporary locations can be overriden through the KDETMP and KDEVARTMP +# Note: temporary locations can be overriden through the TDETMP and TDEVARTMP # environment variables. for resource in tmp cache socket; do if ! lnusertemp $resource >/dev/null; then @@ -567,16 +567,16 @@ fi # Finally, give the session control to the session manager. # See tdebase/ksmserver for the description of the rest of the startup sequence. -# If the KDEWM environment variable has been set, then it will be used as Trinity's +# If the TDEWM environment variable has been set, then it will be used as Trinity's # window manager instead of twin. -# If KDEWM is not set, ksmserver will ensure twin is started. +# If TDEWM is not set, ksmserver will ensure twin is started. # kwrapper is used to reduce startup time and memory usage # kwrapper does not return usefull error codes such as the exit code of ksmserver. # We only check for 255 which means that the ksmserver process could not be # started, any problems thereafter, e.g. ksmserver failing to initialize, # will remain undetected. -test -n "$KDEWM" && KDEWM="--windowmanager $KDEWM" -kwrapper ksmserver $KDEWM +test -n "$TDEWM" && TDEWM="--windowmanager $TDEWM" +kwrapper ksmserver $TDEWM if test $? -eq 255; then # Startup error echo '[starttde] Could not start ksmserver. Check your installation.' 1>&2 |