[gentoo-commits] proj/portage:master commit in: pym/_emerge/, man/

[Alexander Berntsen]

commit:     3ff375e832d469f03dc922f7a30651726f86d3e0
Author:     Alexander Berntsen <bernalex <AT> gentoo <DOT> org>
AuthorDate: Mon Feb  1 16:37:48 2016 +0000
Commit:     Alexander Berntsen <bernalex <AT> gentoo <DOT> org>
CommitDate: Tue Feb  2 10:08:47 2016 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=3ff375e8

Make config update tools stand out (bug 543706)

Add a CONFIGURATION FILES UPDATE TOOLS header to the manpage, to make
the tools discussion stand out from the configuration files discussion
in general.

Refer to the new section in emerge's configuration file updates output.

X-Gentoo-Bug: 543706
X-Gentoo-Bug-url: https://bugs.gentoo.org/show_bug.cgi?id=543706

Suggested-by:  Julian Ospald      <hasufell <AT> gentoo.org>
Signed-off-by: Alexander Berntsen <bernalex <AT> gentoo.org>

 man/emerge.1                         | 1 +
 pym/_emerge/chk_updated_cfg_files.py | 6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/man/emerge.1 b/man/emerge.1
index 05b2a01..0f5782e 100644
--- a/man/emerge.1
+++ b/man/emerge.1
@@ -1237,6 +1237,7 @@ add this to \fBmake.conf\fR(5):
 .LP
 .I CONFIG_PROTECT_MASK="/etc/wget /etc/rc.d"
 .LP
+.SH "CONFIGURATION FILES UPDATE TOOLS"
 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.

diff --git a/pym/_emerge/chk_updated_cfg_files.py b/pym/_emerge/chk_updated_cfg_files.py
index 9f2ab6f..6903df9 100644
--- a/pym/_emerge/chk_updated_cfg_files.py
+++ b/pym/_emerge/chk_updated_cfg_files.py
@@ -36,7 +36,7 @@ def chk_updated_cfg_files(eroot, config_protect):
 
 	if result:
 		print(" " + yellow("*") + " See the " +
-			colorize("INFORM", _("CONFIGURATION FILES")) +
-			" " + _("section of the") + " " + bold("emerge"))
-		print(" " + yellow("*") + " " +
+			colorize("INFORM", _("CONFIGURATION FILES")) + " and " +
+			colorize("INFORM", _("CONFIGURATION FILES UPDATE TOOLS")))
+		print(" " + yellow("*") + " sections of the " + bold("emerge") + " " +
 			_("man page to learn how to update config files."))