diff options
| author | Alec Warner <antarus@gentoo.org> | 2006-04-30 16:06:08 +0000 |
|---|---|---|
| committer | Alec Warner <antarus@gentoo.org> | 2006-04-30 16:06:08 +0000 |
| commit | 38102dfa40f0c32d4f455d29329655e3a75cbf86 (patch) | |
| tree | 3e9250f88cb55a3fc5916945d75ee2e01f39606d /pym/emergehelp.py | |
| parent | f7aba48db07732d7d67e4189c31ca6fbff936248 (diff) | |
| download | portage-38102dfa40f0c32d4f455d29329655e3a75cbf86.tar.gz portage-38102dfa40f0c32d4f455d29329655e3a75cbf86.tar.bz2 portage-38102dfa40f0c32d4f455d29329655e3a75cbf86.zip | |
Add cfg-update to the list of happy config file managers.
svn path=/main/trunk/; revision=3290
Diffstat (limited to 'pym/emergehelp.py')
| -rw-r--r-- | pym/emergehelp.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pym/emergehelp.py b/pym/emergehelp.py index 1abb497ab..2fd8b898a 100644 --- a/pym/emergehelp.py +++ b/pym/emergehelp.py @@ -376,9 +376,9 @@ add this to /etc/make.conf: CONFIG_PROTECT_MASK="/etc/wget /etc/rc.d" -Tools such as dispatch-conf and etc-update are also available to aid in the -merging of these files. They provide interactive merging and can auto-merge -trivial changes. +Tools such as dispatch-conf, cfg-update, and etc-update are also available to +aid in the merging of these files. They provide interactive merging and can +auto-merge trivial changes. """ print outstuff |