summaryrefslogtreecommitdiffstats
path: root/kdecore/README.user_profiles
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-01-03 04:12:51 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-01-03 04:12:51 +0000
commit560378aaca1784ba19806a0414a32b20c744de39 (patch)
treece0dfd7c3febf2a1adc7603d1019a8be2083c415 /kdecore/README.user_profiles
parentd4d5af1cdbd3cc65d095e0afc5b1f4260091cf5d (diff)
downloadtdelibs-560378aaca1784ba19806a0414a32b20c744de39.tar.gz
tdelibs-560378aaca1784ba19806a0414a32b20c744de39.zip
Automated conversion for enhanced compatibility with TQt for Qt4 3.4.0 TP1
NOTE: This will not compile with Qt4 (yet), however it does compile with Qt3 git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdelibs@1211081 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kdecore/README.user_profiles')
-rw-r--r--kdecore/README.user_profiles4
1 files changed, 2 insertions, 2 deletions
diff --git a/kdecore/README.user_profiles b/kdecore/README.user_profiles
index 4fb43b757..243ad5ffa 100644
--- a/kdecore/README.user_profiles
+++ b/kdecore/README.user_profiles
@@ -26,7 +26,7 @@ Mapping profiles to individual users
====================================
The mapping file can contain a [Users] section for mapping profiles to
-an individual user. The [Users] section contains the user's account name
+an individual user. The [Users] section tqcontains the user's account name
followed by one or more profiles as follow:
[Users]
@@ -68,7 +68,7 @@ which profile(s) belongs to that group. This looks as follows:
For each group that a user is part of, the corresponding profile(s) are used. The
order in which the groups are listed in the "groups" entry, determines the resulting
order of all the applicable profiles. If multiple profiles are applicable to a
-particular user and a profile contains settings that conflict with settings in
+particular user and a profile tqcontains settings that conflict with settings in
another profile then the settings in the earlier listed profile take precedent.
So if, based on the example above, a user is part of the "pkgs" group then the