From 549c7e4d630743ae94883997fec3b8fc31e32a22 Mon Sep 17 00:00:00 2001 From: tpearson Date: Sun, 21 Aug 2011 01:43:11 +0000 Subject: 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 --- doc/faq/install.docbook | 2 +- doc/faq/kdeapps.docbook | 2 +- doc/kdm/index.docbook | 2 +- doc/konqueror/faq.docbook | 2 +- doc/userguide/kde-for-admins.docbook | 52 ++++++++++++++++++------------------ 5 files changed, 30 insertions(+), 30 deletions(-) (limited to 'doc') 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. 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 http://developer.kde.org/build/kde2-and-kde3.html. +url="http://developer.kde.org/build/kde2-and-trinity.html">http://developer.kde.org/build/kde2-and-trinity.html. However, please note that running two different versions of &kde; from source can lead to problems if you are not careful. 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. This should be the first line after <fontconfig>. For example: <fontconfig> -<dir>/usr/kde3/share/fonts</dir> +<dir>/usr/trinity/share/fonts</dir> </fontconfig> 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. When &kdm; starts up, it reads its configuration from the folder $KDEDIR/share/config/kdm/ (this may -be /etc/kde3/kdm/ or something else +be /etc/trinity/kdm/ or something else on your system). 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. Where does &konqueror; keep all its configuration data? Generally in the ~/.kde folder (this may -be ~/.kde3 on your system, depending on how &kde; 3 +be ~/.trinity on your system, depending on how &kde; 3 was installed). Don't alter these files unless you really know what you are doing. 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. One at the system level (for example /opt/kde3). +class="directory">/opt/trinity). One at the user level in the user's home directory (usually ~/.kde) @@ -53,12 +53,12 @@ linkend="user-profiles">profiles $HOME/.kde /opt/kde3. (This is +class="directory">/opt/trinity. (This is &SuSE;-specific; other distributions may use /usr or /usr/kde3) +class="directory">/usr/trinity) /etc/opt/kde3. (This was added by +class="directory">/etc/opt/trinity. (This was added by &SuSE;). @@ -83,9 +83,9 @@ the following files are searched: $HOME/.kde/share/mimelnk/text/plain.desktop /opt/kde3/share/mimelnk/text/plain.desktop +class="directory">/opt/trinity/share/mimelnk/text/plain.desktop /etc/opt/kde3/share/mimelnk/text/plain.desktop +class="directory">/etc/opt/trinity/share/mimelnk/text/plain.desktop If a user makes a change, the change is written to -/etc/opt/kde3/share/config/foobar +/etc/opt/trinity/share/config/foobar Color=blue Position=10,10 @@ -157,18 +157,18 @@ root writing to $KDEHOME of the user after running KDEDIR -/opt/kde3, /opt/trinity, /usr, /usr/kde3 +class="directory">/usr/trinity Vendor dependent. Used by &kde; 2. If not set, falls back to compiled-in default. KDEDIRS -/opt/kde3, /opt/trinity, /usr, /usr/kde3 +class="directory">/usr/trinity New in &kde;3. Can list multiple locations separated by a colon. If not set, falls back to $KDEDIR @@ -183,9 +183,9 @@ colon. If not set, falls back to $KDEDIR A staff member at a university could have the following settings: -KDEHOME='~/.kde3' -KDEROOTHOME='/root/.kde3' -KDEDIRS='/opt/kde_staff:/opt/kde3' +KDEHOME='~/.trinity' +KDEROOTHOME='/root/.trinity' +KDEDIRS='/opt/kde_staff:/opt/trinity' @@ -209,7 +209,7 @@ prefixes=/opt/kde_staff This creates a profile named staff that adds the /opt/kde_staff directory tree. (Note that &SuSE; &Linux; uses -/etc/kde3rc instead of +/etc/trinityrc instead of /etc/kderc. Now that we have a named profile it can be assigned to users. @@ -274,7 +274,7 @@ directory tree. -lib/kde3 +lib/trinity This directory contains components, plugins, and other runtime loadable objects for use by &kde; 3.x applications. @@ -550,7 +550,7 @@ contains: Color=red Shape=circle -and /etc/opt/kde3/share/config/foobar contains +and /etc/opt/trinity/share/config/foobar contains [MyGroup] Color=blue @@ -583,7 +583,7 @@ and /opt/kde_staff/share/config/foobar contains Color=purple Position=20,20 -and /etc/opt/kde3/share/config/foobar contains +and /etc/opt/trinity/share/config/foobar contains [MyGroup] Color=blue @@ -629,7 +629,7 @@ Color[$i]=blue Color=red Shape=circle -and /etc/opt/kde3/share/config/foobar contains: +and /etc/opt/trinity/share/config/foobar contains: [MyGroup][$i] Color=blue @@ -658,7 +658,7 @@ and /opt/kde_staff/share/config/foobar contains Color=purple Shape=rectangle -and /etc/opt/kde3/share/config/foobar contains +and /etc/opt/trinity/share/config/foobar contains [MyGroup][$i] Color=blue @@ -918,7 +918,7 @@ as well as kdeinit loadable modules (KLMs). KLMs work just like binary program files but can be started more efficiently. KLMs live in $KDEDIR/lib/kde3 +class="directory">$KDEDIR/lib/trinity The drawback is that programs started this way appear as kdeinit in the output of @@ -1325,7 +1325,7 @@ as well as kdeinit loadable modules (KLMs). KLMs work just like binary program files but can be started more efficiently. KLMs live in $KDEDIR/lib/kde3 +class="directory">$KDEDIR/lib/trinity The drawback is that programs started this way appear as kdeinit in the @@ -1409,7 +1409,7 @@ role="extension">.desktop file: [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/ @@ -1627,7 +1627,7 @@ merged) Distribution Specific SUSE Linux copies certain icons in startkde.theme from /opt/kde3/share/config/SuSE/default/ +class="directory">/opt/trinity/share/config/SuSE/default/ @@ -1690,9 +1690,9 @@ new menu format: /usr/share/applications/Acrobat Reader.desktop -/opt/kde3/share/applications/kde/kpresenter.desktop +/opt/trinity/share/applications/kde/kpresenter.desktop -/opt/kde3/share/applications/kde/kword.desktop +/opt/trinity/share/applications/kde/kword.desktop -- cgit v1.2.1