diff --git a/doc/kcontrol/kcmaccess/index.docbook b/doc/kcontrol/kcmaccess/index.docbook
index e13ce0ad6..b33726543 100644
--- a/doc/kcontrol/kcmaccess/index.docbook
+++ b/doc/kcontrol/kcmaccess/index.docbook
@@ -103,8 +103,8 @@ bell. The default value is 500ms, or half a second.
If this option is enabled, you can press and release the &Shift;,
&Alt; or &Ctrl; keys, and then press another key to get a key combo
(example: &Ctrl; &Alt;
-Del could be done with &Ctrl; then &Alt;
-then Del).
+Delete could be done with &Ctrl; then &Alt;
+then Delete).
diff --git a/doc/konqueror/filemanager.docbook b/doc/konqueror/filemanager.docbook
index 71d5f2a8f..6c90833ab 100644
--- a/doc/konqueror/filemanager.docbook
+++ b/doc/konqueror/filemanager.docbook
@@ -355,9 +355,9 @@ Trash and Delete.Move to Trash and
Delete options.
-Del will move the selected item or items to Trash.
+Delete will move the selected item or items to Trash.
-&Shift;Del
+&Shift;Delete
will really, truly and irrevocably delete the selected item or
items.
diff --git a/doc/tdm/index.docbook b/doc/tdm/index.docbook
index a80794061..510036a1d 100644
--- a/doc/tdm/index.docbook
+++ b/doc/tdm/index.docbook
@@ -18,9 +18,9 @@
The &tdm; Handbook
-
-&Oswald.Buddenhagen; &Oswald.Buddenhagen.mail;
-
-
-/sbin/halt. The Restart: command
+/sbin/halt. The Restart: command
defaults to
/sbin/reboot.When Show boot options is enabled, &tdm;
will on reboot offer you options for the lilo boot manager. For this
feature to work, you will need to supply the correct paths to your
-lilo command and to lilo's map file. Note that this
+lilo command and to lilo's map file. Note that this
option is not available on all operating systems.
@@ -658,7 +712,7 @@ option is not available on all operating systems.
login window.
You may disable the user list in &tdm; entirely in the
-Show Users section. You can choose from:
+Show Users section. You can choose from:
@@ -685,18 +739,18 @@ listed.
Independently of the users you specify by name, you can use the
System UIDs to specify a range of valid
-UIDs that are shown in the list. By default user
+UIDs that are shown in the list. By default user
id's under 1000, which are often system or daemon users, and user id's
over 65000, are not shown.You can also enable the Sort users
-checkbox, to have the user list sorted alphabetically. If this is
+checkbox, to have the user list sorted alphabetically. If this is
disabled, users will appear in the order they are listed in the
-password file. &tdm; will also autocomplete user names if you enable the
+password file. &tdm; will also autocomplete user names if you enable the
Autocompletion option.If you choose to show users, then the login window will show
-images (which you select), of a list of users. When someone is ready
+images (which you select), of a list of users. When someone is ready
to login, they may select their user name/image, enter their password,
and they are granted access.
@@ -704,12 +758,12 @@ and they are granted access.
for those images.
You can configure the admin picture here, for each user on the
-system. Depending on the order selected above, users may be able to
+system. Depending on the order selected above, users may be able to
override your selection.If you choose not to show users, then the login window will be
-more traditional. Users will need to type their username and password
-to gain entrance. This is the preferred way if you have many users on
+more traditional. Users will need to type their username and password
+to gain entrance. This is the preferred way if you have many users on
this terminal.
@@ -725,13 +779,13 @@ login or disabling passwords.
options. Every option in the Convenience tab is
well-suited to seriously compromise your system security. Practically,
these options are only to be used in a completely non-critical
-environment, ⪚ a private computer at home.
+environment, ⪚ a private computer at home.
Automatic LoginAutomatic login will give anyone access to a certain account on
-your system without doing any authentication. You can enable it using
+your system without doing any authentication. You can enable it using
the option Enable Auto-login.You can choose the account to be used for automatic login from
@@ -748,7 +802,7 @@ having to provide their password. Enable this feature using the
Below this option you'll see a list of users on the system.
Enable password-less login for specific users by checking the checkbox
-next to the login names. By default, this feature is disabled for
+next to the login names. By default, this feature is disabled for
all users.Again, this option should only be used in a safe
@@ -762,7 +816,7 @@ when &tdm; starts. The default is None, but you
can choose Previous to have &tdm; default to the
last successfully logged in user, or you can
Specify a particular user to always be selected
-from the list. You can also have &tdm; set the focus to the password
+from the list. You can also have &tdm; set the focus to the password
field, so that when you reach the &tdm; login screen, you can type the
password immediately.
@@ -793,7 +847,7 @@ allow graphical login.The fundamental thing that controls whether your computer boots to a
terminal prompt (console mode) or a graphical login prompt is the default
-runlevel. The runlevel is set by the program /sbin/init under the control of the
configuration file /etc/inittab. The default runlevels
used by different &UNIX; systems (and different &Linux; distributions) vary,
@@ -844,11 +898,11 @@ appropriate runlevel for console mode on your system.If your system uses Pluggable Authentication Modules
(PAM), which is normal with recent &Linux; and &Solaris;
systems, you should check that your PAM configuration permits
-login through the service named kde. If you previously used
+login through the service named tde. If you previously used
&xdm; successfully, you should not need to make any
changes to your PAM configuration in order to use
&tdm;. /etc/pam.conf or
-/etc/pam.d/kde. Information on configuring
+/etc/pam.d/tde. Information on configuring
PAM is beyond the scope of this handbook, but
PAM comes with comprehensive documentation (try looking in
/usr/share/doc/*pam*/html/).
@@ -860,7 +914,7 @@ command:
If you get a &tdm; login dialog and you are able to log in,
-things are going well. The main thing that can go wrong here is that
+things are going well. The main thing that can go wrong here is that
the run-time linker might not find the shared &Qt; or &tde; libraries.
If you have a binary distribution of the &tde; libraries, make sure
&tdm; is installed where the libraries believe &tde; is installed and
@@ -870,7 +924,7 @@ libraries.For example:export
-
+
export
export
@@ -892,7 +946,7 @@ replace &xdm; by &tdm;. Again, this is distribution-dependent.
line:
x:5:respawn:/usr/X11/bin/xdm -nodaemonand replace with:
-x:5:respawn:/opt/kde/bin/tdm
+x:5:respawn:/opt/tde/bin/tdmThis tells init(8) to respawn &tdm; when the
system is in run level 5. Note that &tdm; does not need the
option.
@@ -954,7 +1008,7 @@ graphical &tdm; login dialog.
If this step is unsuccessful the most likely problem is that the
environment used at boot time differs from the environment that you used for
-testing at the command line. If you are trying to get two versions of &tde;
+testing at the command line. If you are trying to get two versions of &tde;
to co-exist, be particularly careful that the settings you use for your
PATH and LD_LIBRARY_PATH environment variables
are consistent, and that the startup scripts are not over-riding them in
@@ -968,7 +1022,7 @@ some way.Supporting multiple window managers&tdm; detects most available window manager and desktop environments when
-it is run. Installing a new one should make it automatically available in
+it is run. Installing a new one should make it automatically available in
the &tdm; main dialog Session Type:.If you have a very new window manager, or something that &tdm; does
@@ -1031,9 +1085,9 @@ purposes.
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 accomplished by shadowing them with .desktop files
-containing Hidden=true. For the magic session types no .desktop files exist
+containing Hidden=true. For the magic session types no .desktop files exist
by default, but &tdm; pretends they would, so you can override them like any
-other type. I guess you already know how to add a new session type by
+other type. I guess you already know how to add a new session type by
now. ;-)
@@ -1042,20 +1096,20 @@ now. ;-)Using &tdm; for Remote Logins (&XDMCP;)&XDMCP; is the Open Group standard, the X Display Manager
-Control Protocol. This is used to set up connections between
+Control Protocol. This is used to set up connections between
remote systems over the network.&XDMCP; is useful in multiuser situations where there are users
with workstations and a more powerful server that can provide the
-resources to run multiple X sessions. For example, &XDMCP; is a good
+resources to run multiple X sessions. For example, &XDMCP; is a good
way to reuse old computers - a Pentium or even 486 computer with 16 Mb
RAM is sufficient to run X itself, and using &XDMCP; such a computer can
-run a full modern &tde; session from a server. For the server part,
+run a full modern &tde; session from a server. For the server part,
once a single &tde; (or other environment) session is running, running
another one requires very few extra resources.However, allowing another method of login to your machine
-obviously has security implications. You should run this service only
+obviously has security implications. You should run this service only
if you need to allow remote X Servers to start login sessions on your
system. Users with a single &UNIX; computer should not need to run
this.
@@ -1079,8 +1133,8 @@ addressing and security; the sockets all have the file name
rw-rw-rw- (0666). This is because some systems don't care
for the file permission of the socket files.
-There are two types of sockets: the global one (dmctl) and the
-per-display ones (dmctl-<display>).
+There are two types of sockets: the global one (tdmctl) and the
+per-display ones (tdmctl-<display>).The global one's subdir is owned by root, the subdirs of the per-display
ones' are owned by the user currently owning the session (root or the
@@ -1201,9 +1255,9 @@ are available at this timelist [all |
alllocal]
-Return a list of running sessions. By default all active sessions are
-listed. if all is specified, passive sessions are
-listed as well. If alllocal is specified, passive
+Return a list of running sessions. By default all active sessions are
+listed. if all is specified, passive sessions are
+listed as well. If alllocal is specified, passive
sessions are listed as well, but all incoming remote sessions are
skipped.Each session entry is a comma separated tuple of:
@@ -1272,14 +1326,14 @@ socket.An OS choice for the next boot may be specified from the list returned
by listbootoptionsShutdowns requested from per-display sockets are executed when the
-current sessino on that display exits. Such a request may pop up a dialog
+current sessino on that display exits. Such a request may pop up a dialog
asking for confirmation and/or authenticationstart is the time for which the shutdown is
-scheduled. If it starts with a plus-sign, the current time is added. Zero
+scheduled. If it starts with a plus-sign, the current time is added. Zero
means immediately.end is the latest time at which the shutdown
-should be performed if active sessions are still running. If it starts with
-a plus-sign, the start time is added. -1 means wait infinitely. If end is
+should be performed if active sessions are still running. If it starts with
+a plus-sign, the start time is added. -1 means wait infinitely. If end is
through and active sessions are still running, &tdm; can do one of the
following:
@@ -1288,7 +1342,7 @@ shutdownforce - shut down
nonethelessforcemy - shut down nonetheless if
-all active sessions belong to the requesting user. Only for per-display sockets.
+all active sessions belong to the requesting user. Only for per-display sockets.
start and end are
specified in seconds since the &UNIX; epoch.
@@ -1297,7 +1351,7 @@ cancel, forcenow for 0 0
force and schedule for 0
-1.
ask attempts an immediate shutdown and
-interacts with the user if active sessions are still running. Only for
+interacts with the user if active sessions are still running. Only for
per-display sockets.
@@ -1378,9 +1432,9 @@ fi
Themes
-&tdm; has limited support for desktop manager themes. You may enable them
+&tdm; has limited support for desktop manager themes. You may enable them
by adding UseTheme=true to tdmrc
-and Theme=/path/to/theme.xml.
+and Theme=/path/to/theme.xml.
-->
@@ -1405,8 +1459,8 @@ General Public License: look at the source code.
&tdm; is derived from, and includes code from,
&xdm; (C) Keith Packard, MIT X Consortium.
-&tdm; 0.1 was written by &Matthias.Ettrich;. Later versions till &tde;
-2.0.x were written by &Steffen.Hansen;. Some new features for &tde; 2.1.x and
+&tdm; 0.1 was written by &Matthias.Ettrich;. Later versions till &tde;
+2.0.x were written by &Steffen.Hansen;. Some new features for &tde; 2.1.x and
a major rewrite for &tde; 2.2.x made by &Oswald.Buddenhagen;.Other parts of the &tdm; code are copyright by the authors, and
@@ -1428,7 +1482,7 @@ Zumsteinzumstein@ssd.ethz.ch. Last update August 9,
Documentation revised for &tde; 2 by &Neal.Crook; &Neal.Crook.mail;. Last update August 6, 2000
-Documentation extended and revised for &tde; 2.2 by &Oswald.Buddenhagen; &Oswald.Buddenhagen.mail;. Last update August,
+Documentation extended and revised for &tde; 2.2 by &Oswald.Buddenhagen; &Oswald.Buddenhagen.mail;. Last update August,
2001
@@ -1457,7 +1511,7 @@ which the user sees.entropyThe entropy of a system is the measure of its
-unpredictability. This is used during the generation of random numbers.
+unpredictability. This is used during the generation of random numbers.
diff --git a/doc/tdm/tsak.png b/doc/tdm/tsak.png
new file mode 100644
index 000000000..0ccc3a34a
Binary files /dev/null and b/doc/tdm/tsak.png differ