summaryrefslogtreecommitdiffstats
path: root/debian/lenny/tdelibs
diff options
context:
space:
mode:
authorCalvin Morrison <mutantturke@gmail.com>2011-11-17 10:19:05 -0500
committerCalvin Morrison <mutantturke@gmail.com>2011-11-17 10:19:05 -0500
commitdd732c3ab115248d1d3933b1a9d66e7379d19faa (patch)
tree3dfa2456365469752b252310c43fe965a6395b42 /debian/lenny/tdelibs
parent2481bbb885776059bcc0f4eb7403b59a24174d98 (diff)
parent7b559c86e36626039e08503d22a8d799f208647c (diff)
downloadtde-packaging-dd732c3ab115248d1d3933b1a9d66e7379d19faa.tar.gz
tde-packaging-dd732c3ab115248d1d3933b1a9d66e7379d19faa.zip
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tde-packaging
Diffstat (limited to 'debian/lenny/tdelibs')
-rw-r--r--debian/lenny/tdelibs/debian/man/dcop-trinity.sgml4
-rw-r--r--debian/lenny/tdelibs/debian/man/kstartupconfig-trinity.14
-rw-r--r--debian/lenny/tdelibs/debian/man/lnusertemp-trinity.sgml2
-rw-r--r--debian/lenny/tdelibs/debian/man/tdeinit-trinity.14
-rw-r--r--debian/lenny/tdelibs/debian/tdelibs4-trinity-dev.install10
5 files changed, 12 insertions, 12 deletions
diff --git a/debian/lenny/tdelibs/debian/man/dcop-trinity.sgml b/debian/lenny/tdelibs/debian/man/dcop-trinity.sgml
index 0c80c88a1..7c4342c05 100644
--- a/debian/lenny/tdelibs/debian/man/dcop-trinity.sgml
+++ b/debian/lenny/tdelibs/debian/man/dcop-trinity.sgml
@@ -141,14 +141,14 @@ manpage.1: manpage.sgml
<para><example>
<title>Return number of the current desktop, e.g. 2</title>
<blockquote><literallayout>
-dcop kwin KWinInterface currentDesktop
+dcop twin KWinInterface currentDesktop
</literallayout></blockquote>
</example></para>
<para><example>
<title>Jump to the next dektop</title>
<blockquote><literallayout>
-dcop kwin KWinInterface nextDesktop
+dcop twin KWinInterface nextDesktop
</literallayout></blockquote>
</example></para>
diff --git a/debian/lenny/tdelibs/debian/man/kstartupconfig-trinity.1 b/debian/lenny/tdelibs/debian/man/kstartupconfig-trinity.1
index dca82fb5e..57ae12c1d 100644
--- a/debian/lenny/tdelibs/debian/man/kstartupconfig-trinity.1
+++ b/debian/lenny/tdelibs/debian/man/kstartupconfig-trinity.1
@@ -8,7 +8,7 @@ kstartupconfig, kdostartupconfig
.sp 1
\fBkdostartupconfig\fP
.SH DESCRIPTION
-\fBkstartupconfig\fP loads configuration options for use in \fBstartkde\fP. It saves loading time as there is no need to launch programs linked to KDE libraries. \fBstartupconfig\fP uses a cache of some Kconfig options that are updated by \fBkdostartupconfig\fP. The cache is implemented as script file that is sourced and provides the options as shell variables.
+\fBkstartupconfig\fP loads configuration options for use in \fBstarttde\fP. It saves loading time as there is no need to launch programs linked to KDE libraries. \fBstartupconfig\fP uses a cache of some Kconfig options that are updated by \fBkdostartupconfig\fP. The cache is implemented as script file that is sourced and provides the options as shell variables.
.sp 1
The configuration options to load are stored in \fIstartupconfigkeys\fP as one option per line. They follow the format <file> <group> <key> <default>. A complete group is addressed as <file> [<group>]. The configuration options are processed in the specified order so the missing default values for groups can be specified as single options after the group option.
.sp 1
@@ -42,7 +42,7 @@ configuration options and files they belong to
.I $KDEHOME/share/config/startupconfigkeys
configuration options to load
.SH SEE ALSO
-.BR kconf_update (1),\ startkde (1)
+.BR kconf_update (1),\ starttde (1)
.SH AUTHORS
.nf
Lubos Lunak <l.lunak@kde.org>
diff --git a/debian/lenny/tdelibs/debian/man/lnusertemp-trinity.sgml b/debian/lenny/tdelibs/debian/man/lnusertemp-trinity.sgml
index c40c64520..d4a7162d1 100644
--- a/debian/lenny/tdelibs/debian/man/lnusertemp-trinity.sgml
+++ b/debian/lenny/tdelibs/debian/man/lnusertemp-trinity.sgml
@@ -105,7 +105,7 @@ manpage.1: manpage.sgml
attacks. </para>
<para><command>&dhpackage;</command> is usually called by the
- <command>startkde</command> script.</para>
+ <command>starttde</command> script.</para>
</refsect1>
<refsect1>
diff --git a/debian/lenny/tdelibs/debian/man/tdeinit-trinity.1 b/debian/lenny/tdelibs/debian/man/tdeinit-trinity.1
index 1c3861783..63c5935b6 100644
--- a/debian/lenny/tdelibs/debian/man/tdeinit-trinity.1
+++ b/debian/lenny/tdelibs/debian/man/tdeinit-trinity.1
@@ -10,7 +10,7 @@ tdeinit
.sp 1
\fBtdeinit\fP is used to start all other KDE programs. It can start binary program files as well as tdeinit loadable modules (KLMs).
.sp 1
-When \fBtdeinit\fP starts for the first time it launches \fBdcopserver\fP, \fBklauncher\fP, \fBkded\fP and some additional programs specified on its command line in the \fBstartkde\fP script (normally \fBkcminit\fP and \fBknotify\fP).
+When \fBtdeinit\fP starts for the first time it launches \fBdcopserver\fP, \fBklauncher\fP, \fBkded\fP and some additional programs specified on its command line in the \fBstarttde\fP script (normally \fBkcminit\fP and \fBknotify\fP).
.sp 1
The \fBtdeinit\fP master process can be used to start additional KDE programs via \fBtdeinit_wrapper\fP, \fBkshell\fP and \fBkwrapper\fP.
.sp 1
@@ -29,7 +29,7 @@ Terminate when no KDE applications are left running
.I /usr/lib/trinity
directory with KLMs (tdeinit loadable modules)
.SH SEE ALSO
-.BR dcopserver (1),\ kded (1),\ kcminit (1),\ tdeinit_wrapper (1),\ klauncher (1),\ kshell (1),\ kwrapper (1),\ startkde (1)
+.BR dcopserver (1),\ kded (1),\ kcminit (1),\ tdeinit_wrapper (1),\ klauncher (1),\ kshell (1),\ kwrapper (1),\ starttde (1)
.SH AUTHORS
.nf
Waldo Bastian <bastian@kde.org>
diff --git a/debian/lenny/tdelibs/debian/tdelibs4-trinity-dev.install b/debian/lenny/tdelibs/debian/tdelibs4-trinity-dev.install
index 8f84589d6..eeb111f96 100644
--- a/debian/lenny/tdelibs/debian/tdelibs4-trinity-dev.install
+++ b/debian/lenny/tdelibs/debian/tdelibs4-trinity-dev.install
@@ -232,7 +232,7 @@ debian/tmp/opt/trinity/include/tdesu/ssh.h
debian/tmp/opt/trinity/include/tdesu/stub.h
debian/tmp/opt/trinity/include/tdesu/su.h
debian/tmp/opt/trinity/include/kde_terminal_interface.h
-debian/tmp/opt/trinity/include/kdeversion.h
+debian/tmp/opt/trinity/include/tdeversion.h
debian/tmp/opt/trinity/include/kdialogbase.h
debian/tmp/opt/trinity/include/kdialog.h
debian/tmp/opt/trinity/include/kdirlister.h
@@ -668,10 +668,10 @@ debian/tmp/opt/trinity/include/kuserprofile.h
debian/tmp/opt/trinity/include/kvmallocator.h
debian/tmp/opt/trinity/include/kwallet.h
debian/tmp/opt/trinity/include/kwallettypes.h
-debian/tmp/opt/trinity/include/kwindowinfo.h
-debian/tmp/opt/trinity/include/kwindowlistmenu.h
-debian/tmp/opt/trinity/include/kwin.h
-debian/tmp/opt/trinity/include/kwinmodule.h
+debian/tmp/opt/trinity/include/twindowinfo.h
+debian/tmp/opt/trinity/include/twindowlistmenu.h
+debian/tmp/opt/trinity/include/twin.h
+debian/tmp/opt/trinity/include/twinmodule.h
debian/tmp/opt/trinity/include/kwizard.h
debian/tmp/opt/trinity/include/kwordwrap.h
debian/tmp/opt/trinity/include/kxerrorhandler.h