Browse Source

Fix references to user profile directory.

(cherry picked from commit a3b5ac4073)
v3.5.13-sru
Darrell Anderson 10 years ago committed by Slávek Banko
parent
commit
6d0a6c6224
  1. 4
      doc/faq/kdeapps.docbook
  2. 2
      doc/kcontrol/screensaver/index.docbook
  3. 2
      doc/kdeprint/getting-started.docbook
  4. 4
      doc/kicker/index.docbook
  5. 2
      doc/konqueror/browser.docbook
  6. 16
      doc/konqueror/faq.docbook
  7. 2
      doc/konqueror/filemanager.docbook
  8. 2
      doc/konqueror/plugins.docbook
  9. 2
      doc/konqueror/sidebar.docbook
  10. 6
      doc/ksplashml/index.docbook
  11. 32
      doc/userguide/kde-for-admins.docbook
  12. 2
      kcontrol/keys/README
  13. 2
      kcontrol/krdb/ad/README
  14. 2
      kcontrol/krdb/krdb.cpp
  15. 2
      kdebugdialog/README
  16. 2
      kioslave/trash/testtrash.cpp
  17. 2
      konqueror/client/kfmclient.cc
  18. 4
      konqueror/convert_kdelnk.sh
  19. 2
      konsole/other/README.Desktop
  20. 2
      konsole/other/README.KeyTab
  21. 2
      konsole/other/README.Schema
  22. 4
      ksmserver/README
  23. 2
      kwin/CONFIGURING
  24. 2
      libkonq/SERVICEMENUS

4
doc/faq/kdeapps.docbook

@ -73,8 +73,8 @@ 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
<filename>kppprc</filename>. Ensure the correct modem speed is
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>
</varlistentry>

2
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 &kde; text editor),

2
doc/kdeprint/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>kdeprintrc</filename>. This file is unique to
every user, and is normally installed in
<filename>$<envar>HOME</envar>/.kde/share/config/kdeprintrc</filename>.</para>
<filename>$<envar>HOME</envar>/.trinity/share/config/kdeprintrc</filename>.</para>
<warning>
<para>This file is not intended to be directly editable, and all

4
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;.

2
doc/konqueror/browser.docbook

@ -448,7 +448,7 @@ OverridenPorts=CommaSeparatedListOfAllowedPorts
</userinput></screen>
to <filename>$KDEDIR/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>

16
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 &kde; 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

2
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

2
doc/konqueror/plugins.docbook

@ -32,7 +32,7 @@ Plugins</guibutton> button or automatically each time &kde; 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 &kde; 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

2
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>

6
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>KDEDIR</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

32
doc/userguide/kde-for-admins.docbook

@ -40,7 +40,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
@ -51,7 +51,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
@ -81,7 +81,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
@ -89,7 +89,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
@ -102,7 +102,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
@ -143,13 +143,13 @@ Position=10,10
<seglistitem>
<seg><envar>KDEHOME</envar></seg>
<seg><filename class="directory">~/.kde</filename></seg>
<seg><filename class="directory">~/.trinity</filename></seg>
<seg></seg>
</seglistitem>
<seglistitem>
<seg><envar>KDEROOTHOME</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 $KDEHOME of the user after running
<command>su</command>.</seg>
@ -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/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>
@ -543,7 +543,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]
@ -568,7 +568,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]
@ -622,7 +622,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]
@ -645,7 +645,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]
@ -1166,13 +1166,13 @@ or have to install some programs to a different prefix than the rest of
</varlistentry>
<varlistentry><term><envar>$KDEHOME</envar></term><listitem><para>If
not set, &kde; uses <filename class="directory">~/.kde</filename> as
not set, &kde; uses <filename class="directory">~/.trinity</filename> as
the directory where personal data is stored.</para>
</listitem>
</varlistentry>
<varlistentry><term>$<envar>KDEROOTHOME</envar></term><listitem><para>If
not set, &kde; uses <filename class="directory">~root/.kde</filename>
not set, &kde; uses <filename class="directory">~root/.trinity</filename>
as the directory for <systemitem class="username">root</systemitem>'s
personal data. Was introduced to prevent &kde; from accidently
overwriting user data with root permissions when the user runs a &kde;
@ -1830,7 +1830,7 @@ NoDisplay=true
the directory structures in <filename
class="directory">$<envar>KDEDIR</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>
@ -1960,7 +1960,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 &kde; config directory to use as
default for multiple users.</para>

2
kcontrol/keys/README

@ -1,5 +1,5 @@
CHANGES V0.2
- Global keys stored by default in ~/.kde/share/config/kdeglobals
- Global keys stored by default in ~/.trinity/share/config/kdeglobals
[Global Keys] group
- KKeyDialog checks new key choices against exising bindings for the widget
and against entries in .kderc [Global Keys]

2
kcontrol/krdb/ad/README

@ -39,7 +39,7 @@ $(KDEDIR)/share/apps/kdisplay/app-defaults
or
$(HOME)/.kde/share/apps/kdisplay/app-defaults
$(HOME)/.trinity/share/apps/kdisplay/app-defaults
so that it is available to krdb for reading. If you want to
override a system file simply copy it to your user

2
kcontrol/krdb/krdb.cpp

@ -330,7 +330,7 @@ static TQString color( const TQColor& col )
static void createGtkrc( bool exportColors, const TQColorGroup& cg, int version )
{
// lukas: why does it create in ~/.kde/share/config ???
// lukas: why does it create in ~/.trinity/share/config ???
// pfeiffer: so that we don't overwrite the user's gtkrc.
// it is found via the GTK_RC_FILES environment variable.
KSaveFile saveFile( locateLocal( "config", 2==version?"gtkrc-2.0":"gtkrc" ) );

2
kdebugdialog/README

@ -8,5 +8,5 @@ to it and never clearing it. So don't forget to empty it once in a
while!
Your configuration will of course be stored in
$HOME/.kde/share/config/kdebugrc
$HOME/.trinity/share/config/kdebugrc

2
kioslave/trash/testtrash.cpp

@ -95,7 +95,7 @@ int main(int argc, char *argv[])
TQString TestTrash::homeTmpDir() const
{
return TQDir::homeDirPath() + "/.kde/testtrash/";
return TQDir::homeDirPath() + "/.trinity/testtrash/";
}
TQString TestTrash::readOnlyDirPath() const

2
konqueror/client/kfmclient.cc

@ -96,7 +96,7 @@ extern "C" KDE_EXPORT int kdemain( int argc, char **argv )
puts(i18n(" kfmclient openProfile 'profile' ['url']\n"
" # Opens a window using the given profile.\n"
" # 'profile' is a file under ~/.kde/share/apps/konqueror/profiles.\n"
" # 'profile' is a file under ~/.trinity/share/apps/konqueror/profiles.\n"
" # 'url' is an optional URL to open.\n\n").local8Bit());
puts(i18n(" kfmclient openProperties 'url'\n"

4
konqueror/convert_kdelnk.sh

@ -3,7 +3,7 @@
# Converts all user's .kdelnk files to .desktop
# Necessary to avoid duplication when saving a mimetype or an applnk
find ~/.kde/share/mimelnk ~/.kde/share/applnk -name "*.kdelnk" -print |
find ~/.trinity/share/mimelnk ~/.trinity/share/applnk -name "*.kdelnk" -print |
while read k; do
d=`echo $k|sed -e 's/\.kdelnk/\.desktop/'`
echo "Renaming $k to $d"
@ -11,7 +11,7 @@ find ~/.kde/share/mimelnk ~/.kde/share/applnk -name "*.kdelnk" -print |
done
# Convert user's bookmarks to .desktop and to remove .xpm from icons
find ~/.kde/share/apps/kfm/bookmarks -type f -print |
find ~/.trinity/share/apps/kfm/bookmarks -type f -print |
while read k; do
if echo $k | grep -q kdelnk; then # kdelnk file
d=`echo $k|sed -e 's/\.kdelnk/\.desktop/'`

2
konsole/other/README.Desktop

@ -3,4 +3,4 @@
The session offered to be created in the File menu are
taken from from configurations files with a *.desktop
pattern either located in $KDEDIR/share/apps/konsole
or ~/.kde/share/apps/konsole.
or ~/.trinity/share/apps/konsole.

2
konsole/other/README.KeyTab

@ -3,7 +3,7 @@
The keytabs offered in the Options/Keyboard menu are
taken from from configurations files with a *.keytab
pattern either located in $KDEDIR/share/apps/konsole
or ~/.kde/share/apps/konsole.
or ~/.trinity/share/apps/konsole.
Keytabs allow to configure the behavior of konsole
on keyboard events, especially for functions keys.

2
konsole/other/README.Schema

@ -3,7 +3,7 @@
The schemata offered in the Options/Schema menu are
taken from from configurations files with a *.schema
pattern either located in $KDEDIR/share/apps/konsole
or ~/.kde/share/apps/konsole.
or ~/.trinity/share/apps/konsole.
Schemata allow to configure the color set that konsole
uses, together with some more information on rendition

4
ksmserver/README

@ -122,7 +122,7 @@ desparately trying to connect to something, try setting it to some
bogus value.
In addition, ksmserver propagates both its network address and its
process id in ~/.kde/socket-$HOSTNAME/KSMserver-$DISPLAY. A
process id in ~/.trinity/socket-$HOSTNAME/KSMserver-$DISPLAY. A
utility function KApplication::propagateSessionManager() reads this
setting and sets SESSION_MANAGER accordingly, so that child processes
can pick it up. The function is called by clients that are started
@ -172,6 +172,6 @@ Troubleshooting
If you experience trouble like 'logout does not work anymore' or 'I
cannot start new applications', as a result of a previous crash,
ensure that ksmserver is indeed not running anymore and remove the
file ~/.kde/socket-$HOSTNAME/KSMserver-$DISPLAY. Shouldn't be necessry,
file ~/.trinity/socket-$HOSTNAME/KSMserver-$DISPLAY. Shouldn't be necessry,
but one never knows.

2
kwin/CONFIGURING

@ -36,7 +36,7 @@ To create such window-specific setting automatically without a need of doing
it manually for every user (for example when doing a large deployment), follow
these steps:
- Back up your $KDEHOME/share/config/kwinrulesrc ($KDEHOME usually being $HOME/.kde)
- Back up your $KDEHOME/share/config/kwinrulesrc ($KDEHOME usually being $HOME/.trinity)
and remove it
- Run 'dcop kwin default reconfigure'
- Create manually all window-specific settings that should be included (see above)

2
libkonq/SERVICEMENUS

@ -12,7 +12,7 @@ associate it with the relevant file types.
How
===
Create a file ~/.kde/share/apps/konqueror/servicemenus/something.desktop
Create a file ~/.trinity/share/apps/konqueror/servicemenus/something.desktop
and write into it something like (without the comments) :
[Desktop Entry]

Loading…
Cancel
Save