Convert remaining references to kde3 (e.g. in paths) to trinity

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1248408 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

5 files changed, 30 insertions, 30 deletions

diff --git a/doc/faq/install.docbook b/doc/faq/install.docbook
index 6ab33ef78..d428f0ae5 100644
--- a/doc/faq/install.docbook
+++ b/doc/faq/install.docbook
@@ -413,7 +413,7 @@ should take care of all dependencies.</para>
 <para>If you compile the source code yourself, you should take more care.
 Instructions for running two different versions of &kde; on the same system are
 given at <ulink
-url="http://developer.kde.org/build/kde2-and-kde3.html">http://developer.kde.org/build/kde2-and-kde3.html</ulink>.
+url="http://developer.kde.org/build/kde2-and-trinity.html">http://developer.kde.org/build/kde2-and-trinity.html</ulink>.
 However, please note that running two different versions of &kde; from source
 can lead to problems if you are not careful. </para>
 </answer>
diff --git a/doc/faq/kdeapps.docbook b/doc/faq/kdeapps.docbook
index 95ff1355b..ff11d80c2 100644
--- a/doc/faq/kdeapps.docbook
+++ b/doc/faq/kdeapps.docbook
@@ -130,7 +130,7 @@ class="directory">/etc/fonts/local.conf</filename>.  This should be
 the first line after <quote>&lt;fontconfig&gt;</quote>.  For example:
 <programlisting>
 &lt;fontconfig&gt;
-&lt;dir&gt;/usr/kde3/share/fonts&lt;/dir&gt;
+&lt;dir&gt;/usr/trinity/share/fonts&lt;/dir&gt;
 &lt;/fontconfig&gt;
 </programlisting>
 After adding the directory, run (as root):
diff --git a/doc/kdm/index.docbook b/doc/kdm/index.docbook
index 1a127a506..730eb1158 100644
--- a/doc/kdm/index.docbook
+++ b/doc/kdm/index.docbook
@@ -298,7 +298,7 @@ system, and that you simply want to change its behavior in some way.</para>
 
 <para>When &kdm; starts up, it reads its configuration from the folder
 <filename class="directory">$KDEDIR/share/config/kdm/</filename> (this may
-be <filename class="directory">/etc/kde3/kdm/</filename> or something else
+be <filename class="directory">/etc/trinity/kdm/</filename> or something else
 on your system).</para>
 
 <para>The main configuration file is &kdmrc;; all other files are
diff --git a/doc/konqueror/faq.docbook b/doc/konqueror/faq.docbook
index 5429c71e7..268655dbe 100644
--- a/doc/konqueror/faq.docbook
+++ b/doc/konqueror/faq.docbook
@@ -38,7 +38,7 @@ helps.</para></answer>
 <question><para>Where does &konqueror; keep all its configuration
 data?</para></question>
 <answer><para>Generally in the <filename>~/.kde</filename> folder (this may 
-be <filename>~/.kde3</filename> on your system, depending on how &kde; 3 
+be <filename>~/.trinity</filename> on your system, depending on how &kde; 3 
 was installed). Don't alter these files unless you really know what you are 
 doing.</para>
 
diff --git a/doc/userguide/kde-for-admins.docbook b/doc/userguide/kde-for-admins.docbook
index b3e0c9126..f5d98e019 100644
--- a/doc/userguide/kde-for-admins.docbook
+++ b/doc/userguide/kde-for-admins.docbook
@@ -37,7 +37,7 @@ stores all its files in a directory tree with a fixed structure.
 
 <itemizedlist>
 <listitem><para>One at the system level (for example <filename
-class="directory">/opt/kde3</filename>).</para></listitem>
+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>
@@ -53,12 +53,12 @@ linkend="user-profiles">profiles</link></para>
 <listitem><para><filename
 class="directory">$<envar>HOME</envar>/.kde</filename></para></listitem>
 <listitem><para><filename
-class="directory">/opt/kde3</filename>. (This is
+class="directory">/opt/trinity</filename>. (This is
 &SuSE;-specific; other distributions may use
 <filename class="directory">/usr</filename> or <filename
-class="directory">/usr/kde3</filename>)</para></listitem>
+class="directory">/usr/trinity</filename>)</para></listitem>
 <listitem><para><filename
-class="directory">/etc/opt/kde3</filename>. (This was added by
+class="directory">/etc/opt/trinity</filename>. (This was added by
 &SuSE;).</para></listitem>
 </itemizedlist>
 
@@ -83,9 +83,9 @@ the following files are searched:</para>
 <listitem><para><filename
 class="directory">$<envar>HOME</envar>/.kde/share/mimelnk/text/plain.desktop</filename></para></listitem>
 <listitem><para><filename
-class="directory">/opt/kde3/share/mimelnk/text/plain.desktop</filename></para></listitem>
+class="directory">/opt/trinity/share/mimelnk/text/plain.desktop</filename></para></listitem>
 <listitem><para><filename
-class="directory">/etc/opt/kde3/share/mimelnk/text/plain.desktop</filename></para></listitem>
+class="directory">/etc/opt/trinity/share/mimelnk/text/plain.desktop</filename></para></listitem>
 </itemizedlist>
 
 <para>If a user makes a change, the change is written to <filename
@@ -111,7 +111,7 @@ Shape=circle
 </varlistentry>
 
 <varlistentry>
-<term><filename>/etc/opt/kde3/share/config/foobar</filename></term>
+<term><filename>/etc/opt/trinity/share/config/foobar</filename></term>
 <listitem><programlisting>
 Color=blue
 Position=10,10
@@ -157,18 +157,18 @@ root writing to $KDEHOME of the user after running
 
 <seglistitem>
 <seg><envar>KDEDIR</envar></seg>
-<seg><filename class="directory">/opt/kde3</filename>, <filename
+<seg><filename class="directory">/opt/trinity</filename>, <filename
 class="directory">/usr</filename>, <filename
-class="directory">/usr/kde3</filename></seg>
+class="directory">/usr/trinity</filename></seg>
 <seg>Vendor dependent. Used by &kde; 2. If not set, falls back to
 compiled-in default.</seg>
 </seglistitem>
 
 <seglistitem>
 <seg><envar>KDEDIRS</envar></seg>
-<seg><filename class="directory">/opt/kde3</filename>, <filename
+<seg><filename class="directory">/opt/trinity</filename>, <filename
 class="directory">/usr</filename>, <filename
-class="directory">/usr/kde3</filename></seg>
+class="directory">/usr/trinity</filename></seg>
 <seg>New in &kde;3. Can list multiple locations separated by a
 colon. If not set, falls back to $<envar>KDEDIR</envar></seg>
 </seglistitem>
@@ -183,9 +183,9 @@ colon. If not set, falls back to $<envar>KDEDIR</envar></seg>
 <para>A staff member at a university could have the following
 settings:</para>
 <programlisting>
-KDEHOME='~/.kde3'
-KDEROOTHOME='/root/.kde3'
-KDEDIRS='/opt/kde_staff:/opt/kde3'
+KDEHOME='~/.trinity'
+KDEROOTHOME='/root/.trinity'
+KDEDIRS='/opt/kde_staff:/opt/trinity'
 </programlisting>
 
 </informalexample>
@@ -209,7 +209,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/kde3rc</filename> instead of
+<filename>/etc/trinityrc</filename> instead of
 <filename>/etc/kderc</filename>. Now that we have a named profile it
 can be assigned to users.</para>
 
@@ -274,7 +274,7 @@ directory tree.</para>
 </varlistentry>
 
 <varlistentry>
-<term><filename class="directory">lib/kde3</filename></term>
+<term><filename class="directory">lib/trinity</filename></term>
 <listitem><para>This directory contains components, plugins, and other
 runtime loadable objects for use by &kde; 3.<replaceable>x</replaceable>
 applications.</para></listitem> 
@@ -550,7 +550,7 @@ contains:
 Color=red
 Shape=circle
 </programlisting>
-and <filename>/etc/opt/kde3/share/config/foobar</filename> contains
+and <filename>/etc/opt/trinity/share/config/foobar</filename> contains
 <programlisting>
 [MyGroup]
 Color=blue
@@ -583,7 +583,7 @@ and <filename>/opt/kde_staff/share/config/foobar</filename> contains
 Color=purple
 Position=20,20
 </programlisting>
-and <filename>/etc/opt/kde3/share/config/foobar</filename> contains
+and <filename>/etc/opt/trinity/share/config/foobar</filename> contains
 <programlisting>
 [MyGroup]
 Color=blue
@@ -629,7 +629,7 @@ Color[$i]=blue
 Color=red
 Shape=circle
 </programlisting>
-and <filename>/etc/opt/kde3/share/config/foobar</filename> contains:
+and <filename>/etc/opt/trinity/share/config/foobar</filename> contains:
 <programlisting>
 [MyGroup][$i]
 Color=blue
@@ -658,7 +658,7 @@ and <filename>/opt/kde_staff/share/config/foobar</filename> contains
 Color=purple
 Shape=rectangle
 </programlisting>
-and <filename>/etc/opt/kde3/share/config/foobar</filename> contains
+and <filename>/etc/opt/trinity/share/config/foobar</filename> contains
 <programlisting>
 [MyGroup][$i]
 Color=blue
@@ -918,7 +918,7 @@ as well as <command>kdeinit</command> loadable modules
 (<acronym>KLM</acronym>s).  <acronym>KLM</acronym>s work just like binary
 program files but can be started more efficiently.  <acronym>KLM</acronym>s
 live in <filename
-class="directory">$<envar>KDEDIR</envar>/lib/kde3</filename></para>
+class="directory">$<envar>KDEDIR</envar>/lib/trinity</filename></para>
 
 <para>The drawback is that programs started this way appear as
 <computeroutput><command>kdeinit</command></computeroutput> in the output of
@@ -1325,7 +1325,7 @@ as well as <command>kdeinit</command> loadable modules
 (<acronym>KLM</acronym>s).  <acronym>KLM</acronym>s work just like binary
 program files but can be started more efficiently.  <acronym>KLM</acronym>s
 live in <filename
-class="directory">$<envar>KDEDIR</envar>/lib/kde3</filename></para>
+class="directory">$<envar>KDEDIR</envar>/lib/trinity</filename></para>
 
 <para>The drawback is that programs started this way appear as
 <computeroutput><command>kdeinit</command></computeroutput> in the
@@ -1409,7 +1409,7 @@ role="extension">.desktop</literal> file:
 <programlisting>
 [Desktop Entry]
 Encoding=UTF-8
-Icon=/opt/kde3/share/apps/kdesktop/pics/ksslogo.png
+Icon=/opt/trinity/share/apps/kdesktop/pics/ksslogo.png
 Type=Link
 URL=http://www.kde.org/
 </programlisting>
@@ -1627,7 +1627,7 @@ merged)</para></listitem>
 
 <listitem><para>Distribution Specific SUSE Linux copies certain icons
 in startkde.theme from <filename
-class="directory">/opt/kde3/share/config/SuSE/default/</filename></para></listitem>
+class="directory">/opt/trinity/share/config/SuSE/default/</filename></para></listitem>
 
 </itemizedlist>
 </para>
@@ -1690,9 +1690,9 @@ new menu format:
 <listitem><para><filename>/usr/share/applications/Acrobat
 Reader.desktop</filename></para></listitem>
 
-<listitem><para><filename>/opt/kde3/share/applications/kde/kpresenter.desktop</filename></para></listitem>
+<listitem><para><filename>/opt/trinity/share/applications/kde/kpresenter.desktop</filename></para></listitem>
 
-<listitem><para><filename>/opt/kde3/share/applications/kde/kword.desktop</filename></para></listitem>
+<listitem><para><filename>/opt/trinity/share/applications/kde/kword.desktop</filename></para></listitem>
 
 </itemizedlist>
 </para>