Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tdebase

11 files changed, 36 insertions, 36 deletions

diff --git a/doc/faq/tdeapps.docbook b/doc/faq/tdeapps.docbook
index 6f20acc69..441759054 100644
--- a/doc/faq/tdeapps.docbook
+++ b/doc/faq/tdeapps.docbook
@@ -69,7 +69,7 @@ for a dialup connection. Try changing it to a smaller value like
 <userinput>296</userinput>
 or <userinput>576</userinput>.</para></listitem>
 <listitem><para>Check in your <filename
-class="directory">$<envar>HOME</envar>/.kde/share/config</filename> for the
+class="directory">$<envar>HOME</envar>/.trinity/share/config</filename> for the
 <filename>kppprc</filename>. Ensure the correct modem speed is
 actually defined there.</para></listitem>
 </itemizedlist></listitem>
diff --git a/doc/kcontrol/screensaver/index.docbook b/doc/kcontrol/screensaver/index.docbook
index e52173649..3d7d43cb5 100644
--- a/doc/kcontrol/screensaver/index.docbook
+++ b/doc/kcontrol/screensaver/index.docbook
@@ -169,7 +169,7 @@ no grace period.</para>
 <para>To alter the grace period setting, you need to manually edit the 
 configuration file.  To do so:</para>
 <para>
-<prompt>$</prompt> <command>cd <filename>~/.kde/share/config</filename>
+<prompt>$</prompt> <command>cd <filename>~/.trinity/share/config</filename>
 </command>
 </para>
 <para>Now, using a text editor (the example uses &kate;, the &tde; text editor), 
diff --git a/doc/kicker/index.docbook b/doc/kicker/index.docbook
index a4fe79ace..3645669d2 100644
--- a/doc/kicker/index.docbook
+++ b/doc/kicker/index.docbook
@@ -2328,8 +2328,8 @@ another picture?
 </question>
 <answer>
 <para>
-Look for <filename>$HOME/.kde/share/apps/kicker/pics/go.png</filename>
-and <filename>$HOME/.kde/share/apps/kicker/pics/mini/go.png</filename>
+Look for <filename>$HOME/.trinity/share/apps/kicker/pics/go.png</filename>
+and <filename>$HOME/.trinity/share/apps/kicker/pics/mini/go.png</filename>
 and replace them. Do not forget to flatten the replacements to one
 layer, or else you will not see anything.  Create the folders if
 they do not already exist. Then restart &kicker;.
diff --git a/doc/konqueror/browser.docbook b/doc/konqueror/browser.docbook
index 02bb39a04..2c1e0fa17 100644
--- a/doc/konqueror/browser.docbook
+++ b/doc/konqueror/browser.docbook
@@ -448,7 +448,7 @@ OverridenPorts=CommaSeparatedListOfAllowedPorts
 </userinput></screen>
 to <filename>$TDEDIR/share/config/kio_httprc
 </filename> or 
-<filename>~/.kde/share/config/kio_httprc</filename>.</para>
+<filename>~/.trinity/share/config/kio_httprc</filename>.</para>
 <para>For example
 <screen><userinput>OverridenPorts=23,15
 </userinput></screen> 
diff --git a/doc/konqueror/faq.docbook b/doc/konqueror/faq.docbook
index 7d964b93a..0d7ce4ec2 100644
--- a/doc/konqueror/faq.docbook
+++ b/doc/konqueror/faq.docbook
@@ -37,7 +37,7 @@ helps.</para></answer>
 <qandaentry>
 <question><para>Where does &konqueror; keep all its configuration
 data?</para></question>
-<answer><para>Generally in the <filename>~/.kde</filename> folder (this may 
+<answer><para>Generally in the <filename>~/.trinity</filename> folder (this may 
 be <filename>~/.trinity</filename> on your system, depending on how &tde; 3 
 was installed). Don't alter these files unless you really know what you are 
 doing.</para>
@@ -45,30 +45,30 @@ doing.</para>
 <itemizedlist>
 
 <listitem><para>The <filename
-class="directory">~/.kde/share/apps/konqueror/profiles</filename> folder
+class="directory">~/.trinity/share/apps/konqueror/profiles</filename> folder
 holds individual files containing settings for each of your <link
 linkend="save-settings">profiles.  </link></para></listitem>
 
 <listitem><para>Your bookmarks are held in <filename
-class="directory">~/.kde/share/apps/konqueror/bookmarks.xml</filename></para></listitem>
+class="directory">~/.trinity/share/apps/konqueror/bookmarks.xml</filename></para></listitem>
 <listitem><para>Cookies are held in <filename
-class="directory">~/.kde/share/apps/kcookiejar/cookies</filename></para></listitem>
+class="directory">~/.trinity/share/apps/kcookiejar/cookies</filename></para></listitem>
 <listitem><para>Your history, as used for the auto-completion feature,  is in
-<filename>~/.kde/share/config/konq_history</filename></para></listitem>
+<filename>~/.trinity/share/config/konq_history</filename></para></listitem>
 
 <listitem><para>In the folder <filename
-class="directory">~/.kde/share/config/</filename> the files
+class="directory">~/.trinity/share/config/</filename> the files
 <filename>konqiconviewrc</filename>, <filename>konqlistviewrc</filename> and
 <filename>konquerorrc</filename> hold a whole lot of general configuration
 settings.</para></listitem>
 
 <listitem><para>The folder
-<filename class="directory">~/.kde/share/cache/http/</filename> 
+<filename class="directory">~/.trinity/share/cache/http/</filename> 
 contains the browser cache.</para></listitem>
 
 <listitem><para>The Navigation Panel uses the files and subfolders in
 <filename
-class="directory">~/.kde/share/apps/konqsidebartng</filename></para></listitem>
+class="directory">~/.trinity/share/apps/konqsidebartng</filename></para></listitem>
 </itemizedlist>
 
 <para>Any folder specific view settings are put into <literal
diff --git a/doc/konqueror/filemanager.docbook b/doc/konqueror/filemanager.docbook
index 705dea28c..a1ef9eb4f 100644
--- a/doc/konqueror/filemanager.docbook
+++ b/doc/konqueror/filemanager.docbook
@@ -654,7 +654,7 @@ folder. You can get there in &konqueror; by choosing
 <menuchoice><guimenu>Go</guimenu>
 <guimenuitem>Applications</guimenuitem></menuchoice>. Then create a single icon
 on your desktop to open your Applications folder, which is usually in
-<filename class="directory">~/.kde/share/applnk</filename>.</para>
+<filename class="directory">~/.trinity/share/applnk</filename>.</para>
 
 <para>To put an application link icon into the panel, first create it in the
 Applications folder then drag the icon onto a clear area of the
diff --git a/doc/konqueror/plugins.docbook b/doc/konqueror/plugins.docbook
index fa933d36c..4cb56795d 100644
--- a/doc/konqueror/plugins.docbook
+++ b/doc/konqueror/plugins.docbook
@@ -32,7 +32,7 @@ Plugins</guibutton> button or automatically each time &tde; starts up.</para>
 role="extension">.so</literal> files containing plugin code. It examines every
 such file to find out which <acronym>MIME</acronym> types the plugin
 supports. It then creates <acronym>MIME</acronym> type definitions for &tde; in
-the user's <filename class="directory"> ~/.kde/share/mimelnk</filename>
+the user's <filename class="directory"> ~/.trinity/share/mimelnk</filename>
 folder to make other applications aware of them.</para>
 
 <para>The <guilabel>Plugins</guilabel> page shows you the &Netscape; plugins
diff --git a/doc/konqueror/sidebar.docbook b/doc/konqueror/sidebar.docbook
index e428c1f32..14e82bcd9 100644
--- a/doc/konqueror/sidebar.docbook
+++ b/doc/konqueror/sidebar.docbook
@@ -82,7 +82,7 @@ main view or <mousebutton>right</mousebutton> click to bring up a menu with
 a wider range of possibilities.</para>
 <para>The folders shown in the <guilabel>Network</guilabel> page are held in 
 the folder <filename class="directory">
-~/.kde/share/apps/konqsidebartng/virtual_folders/remote/</filename>, and you can make 
+~/.trinity/share/apps/konqsidebartng/virtual_folders/remote/</filename>, and you can make 
 new ones just as you would make any other subfolder. The items within 
 these folders are held as <literal role="extension">.desktop</literal> files 
 and can be created with &konqueror;'s <menuchoice><guisubmenu>Create New</guisubmenu>
diff --git a/doc/ksplashml/index.docbook b/doc/ksplashml/index.docbook
index ebef5fea5..b461e26c7 100644
--- a/doc/ksplashml/index.docbook
+++ b/doc/ksplashml/index.docbook
@@ -86,7 +86,7 @@ your tastes, you can learn how to customize the appearance of
 
 <para>To use themes from <ulink
 url="http://www.kde-look.org">KDE-Look</ulink>, extract them to
-<filename>~/.kde/share/apps/ksplash/Themes/</filename> for a single user, or
+<filename>~/.trinity/share/apps/ksplash/Themes/</filename> for a single user, or
 to
 <filename>$<envar>TDEDIR</envar>/share/apps/ksplash/Themes/</filename>
 to make them available to all users of your system.</para>
@@ -146,7 +146,7 @@ it.</para>
 the theme to be recognized by &ksplash;, it should be stored in a
 folder called <filename class="directory">MyCoolTheme</filename>
 under <filename
-class="directory">~/.kde/apps/ksplash/Themes/</filename>. It should
+class="directory">~/.trinity/apps/ksplash/Themes/</filename>. It should
 have a file called <filename>Theme.rc</filename>, containing the
 settings of the theme. You can specify large numbers of special things
 to theme, change the plugin engine to use, and so on. You do not have
@@ -178,7 +178,7 @@ by assigning key-value pairs as in the example file above.</para>
 
 <important>
 <para>Ensure that the name of the directory that contains the theme files
-(<filename class="directory">~/.kde/apps/ksplash/Themes/MyCoolTheme</filename>
+(<filename class="directory">~/.trinity/apps/ksplash/Themes/MyCoolTheme</filename>
 in this example) and the identifier (<literal>[KSplash Theme:
 MyCoolTheme]</literal> in this example) of the theme in the
 <filename>Theme.rc</filename> file are identical. Otherwise, &ksplash; will not
diff --git a/doc/tdeprint/getting-started.docbook b/doc/tdeprint/getting-started.docbook
index 9ac3dec25..2e306c0d7 100644
--- a/doc/tdeprint/getting-started.docbook
+++ b/doc/tdeprint/getting-started.docbook
@@ -80,7 +80,7 @@ users may have different print subsystems in use, if those do exist on
 the computer and are compliant with each other.  Their settings are
 stored in the <filename>tdeprintrc</filename>.  This file is unique to
 every user, and is normally installed in
-<filename>$<envar>HOME</envar>/.kde/share/config/tdeprintrc</filename>.</para>
+<filename>$<envar>HOME</envar>/.trinity/share/config/tdeprintrc</filename>.</para>
 
 <warning>
 <para>This file is not intended to be directly editable, and all
diff --git a/doc/userguide/tde-for-admins.docbook b/doc/userguide/tde-for-admins.docbook
index 691ae691d..6a49a129a 100644
--- a/doc/userguide/tde-for-admins.docbook
+++ b/doc/userguide/tde-for-admins.docbook
@@ -25,7 +25,7 @@ stores all its files in a directory tree with a fixed structure.
 class="directory">/opt/trinity</filename>).</para></listitem>
 <listitem><para>One at the user level in the user's home directory
 (usually <filename class="directory">
-~/.kde</filename>)</para></listitem>
+~/.trinity</filename>)</para></listitem>
 </itemizedlist>
 
 <para>As a system administrator you can create additional trees. Such
@@ -36,7 +36,7 @@ linkend="user-profiles">profiles</link></para>
 
 <itemizedlist>
 <listitem><para><filename
-class="directory">$<envar>HOME</envar>/.kde</filename></para></listitem>
+class="directory">$<envar>HOME</envar>/.trinity</filename></para></listitem>
 <listitem><para><filename
 class="directory">/opt/trinity</filename>. (This is
 &SuSE;-specific; other distributions may use
@@ -66,7 +66,7 @@ the following files are searched:</para>
 
 <itemizedlist>
 <listitem><para><filename
-class="directory">$<envar>HOME</envar>/.kde/share/mimelnk/text/plain.desktop</filename></para></listitem>
+class="directory">$<envar>HOME</envar>/.trinity/share/mimelnk/text/plain.desktop</filename></para></listitem>
 <listitem><para><filename
 class="directory">/opt/trinity/share/mimelnk/text/plain.desktop</filename></para></listitem>
 <listitem><para><filename
@@ -74,7 +74,7 @@ class="directory">/etc/opt/trinity/share/mimelnk/text/plain.desktop</filename></
 </itemizedlist>
 
 <para>If a user makes a change, the change is written to <filename
-class="directory">$<envar>HOME</envar>/.kde/share/mimelnk/text/plain.desktop</filename></para>
+class="directory">$<envar>HOME</envar>/.trinity/share/mimelnk/text/plain.desktop</filename></para>
 </informalexample>
 
 <para>For configuration files the story is slightly different. If
@@ -87,7 +87,7 @@ which value is used for the key.</para>
 <informalexample><para>
 For example, if the following two files exist, with these contents:</para>
 <variablelist>
-<varlistentry><term><filename>$<envar>HOME</envar>/.kde/share/config/foobar</filename></term>
+<varlistentry><term><filename>$<envar>HOME</envar>/.trinity/share/config/foobar</filename></term>
 <listitem><programlisting>
 Color=red
 Shape=circle
@@ -128,13 +128,13 @@ Position=10,10
 
 <seglistitem>
 <seg><envar>TDEHOME</envar></seg>
-<seg><filename class="directory">~/.kde</filename></seg>
+<seg><filename class="directory">~/.trinity</filename></seg>
 <seg></seg>
 </seglistitem>
 
 <seglistitem>
 <seg><envar>TDEROOTHOME</envar></seg>
-<seg><filename class="directory">/root/.kde</filename></seg>
+<seg><filename class="directory">/root/.trinity</filename></seg>
 <seg>Different variable to prevent
 root writing to $TDEHOME of the user after running
 <command>su</command>.</seg>
@@ -194,7 +194,7 @@ prefixes=/opt/kde_staff
 <para>This creates a profile named <quote>staff</quote> that adds the
 <filename class="directory">/opt/kde_staff</filename> directory
 tree. (Note that &SuSE; &Linux; uses
-<filename>/etc/trinityrc</filename> instead of
+<filename>/etc/kde3rc</filename> instead of
 <filename>/etc/kderc</filename>. Now that we have a named profile it
 can be assigned to users.</para>
 
@@ -528,7 +528,7 @@ precedence.  If a key in a certain group is defined multiple times in a
 single file, the value of the last entry is used.</para>
 
 <informalexample>
-<para>If <filename>$<envar>HOME</envar>/.kde/share/config/foobar</filename>
+<para>If <filename>$<envar>HOME</envar>/.trinity/share/config/foobar</filename>
 contains:
 <programlisting>
 [MyGroup]
@@ -553,7 +553,7 @@ Position=10,10
 
 <informalexample>
 <para>If
-	<filename>$<envar>HOME</envar>/.kde/share/config/foobar</filename>
+	<filename>$<envar>HOME</envar>/.trinity/share/config/foobar</filename>
 	contains
 <programlisting>
 [MyGroup]
@@ -607,7 +607,7 @@ Color[$i]=blue
 
 <informalexample>
 <para>If
-	<filename>$<envar>HOME</envar>/.kde/share/config/foobar</filename>
+	<filename>$<envar>HOME</envar>/.trinity/share/config/foobar</filename>
 	contains:
 <programlisting>
 [MyGroup]
@@ -630,7 +630,7 @@ Position=10,10
 </informalexample>
 
 <informalexample><para>If
-	<filename>$<envar>HOME</envar>/.kde/share/config/foobar</filename>
+	<filename>$<envar>HOME</envar>/.trinity/share/config/foobar</filename>
 	contains:
 <programlisting>
 [MyGroup]
@@ -1151,13 +1151,13 @@ or have to install some programs to a different prefix than the rest of
 </varlistentry>
 
 <varlistentry><term><envar>$TDEHOME</envar></term><listitem><para>If
-not set, &tde; uses <filename class="directory">~/.kde</filename> as
+not set, &tde; uses <filename class="directory">~/.trinity</filename> as
 the directory where personal data is stored.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry><term>$<envar>TDEROOTHOME</envar></term><listitem><para>If
-not set, &tde; uses <filename class="directory">~root/.kde</filename>
+not set, &tde; uses <filename class="directory">~root/.trinity</filename>
 as the directory for <systemitem class="username">root</systemitem>'s
 personal data. Was introduced to prevent &tde; from accidently
 overwriting user data with root permissions when the user runs a &tde;
@@ -1815,7 +1815,7 @@ NoDisplay=true
 the directory structures in <filename
 class="directory">$<envar>TDEDIR</envar>/share/applnk</filename>
 (system wide) and <filename
-class="directory">$<envar>HOME</envar>/.kde/share/applnk</filename>
+class="directory">$<envar>HOME</envar>/.trinity/share/applnk</filename>
 (user specific). This is observed unless the <literal role="extension">.desktop</literal> file has a  <varname>Categories</varname>= line. In that case the categories determine the location in the menu.</para>
 </sect2>
 
@@ -1945,7 +1945,7 @@ role="extension">.gif</literal> files.
 
 <para>A user can change file association in the
 &kcontrolcenter;. These changes are stored in
-<filename>$<envar>HOME</envar>/.kde/share/config/profilerc</filename>.
+<filename>$<envar>HOME</envar>/.trinity/share/config/profilerc</filename>.
 To use the same settings for multiple users, store these settings in
 user profile directory or the global &tde; config directory to use as
 default for multiple users.</para>