[gentoo-portage-dev] [PATCH] Make config update tools stand out (bug 543706)

[gentoo-portage-dev] [PATCH] Make config update tools stand out (bug 543706)

[Alexander Berntsen]

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@gentoo.org>
Signed-off-by: Alexander Berntsen <bernalex@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."))
-- 
2.4.10

Re: [gentoo-portage-dev] [PATCH] Make config update tools stand out (bug 543706)

[Brian Dolbec]

On Mon,  1 Feb 2016 17:37:48 +0100
Alexander Berntsen <bernalex@gentoo.org> wrote:

> 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@gentoo.org>
> Signed-off-by: Alexander Berntsen <bernalex@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."))

Looks great :)

-- 
Brian Dolbec <dolsen>

Re: [gentoo-portage-dev] [PATCH] Make config update tools stand out (bug 543706)

[Alexander Berntsen]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512

Pushed as 3ff375e832d469f03dc922f7a30651726f86d3e0.
- -- 
Alexander
bernalex@gentoo.org
https://secure.plaimi.net/~alexander
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2

iQIcBAEBCgAGBQJWsICZAAoJENQqWdRUGk8BCV0P/iFNv3D6mla1LfycaLoraBNf
ZBFFXswjJTe+EkERpOq1xTpTn8oZwji6htwDY4MvYTCPALESvSPI4ghz5as8v4mD
59MrYMq4PSgHf6Nt2IHyRj3W6YBD55zchGz0APMi/v3c4wQKMlZL09H9iTT+u07h
RTzNq4QyAZOT05uPLXHqbdKjIVv16gENWr4599SbUgKRiWyKWztAgvltl9B1V9Tv
H8sW267qyymCnKs4Pd5Nuv8enP9tredudMFsvuR5CP2A9VS8MY417IAs3yrCfDNt
bTeH2NSOXAxKhz19W1kNJbbhUYRx+0nuilAtBUbDgOYWdlpCMHrpBt9F8/T1zrHt
bAYJCEUxBUtaDJY0/VBQmeb3qarAwbFxjXldFF+PhF3TdJCQfZYAHYshOW0MPbhL
9rgYXFLjURUkTa/6Ed8UQ8MbjT75WNa5jDGKkv7iCfx2eIB/LRYANnF6MkRGWnLM
aMi0nF/HjWc7Bp9kRB0/CxQz4GoP/5JZ124FnAa9Bt7f8bU636uJVM3aAsnKQTik
K64aUyHDhkaiGZh52RPrAXOGqmkULcBXAsjnx8g5ydGwBpivPE5J6Ad76JU3oEqI
OHUDMmzwcgnMsQxbKBurVmFwltDF2gLlw0iAnBoB/6QDMGjPGYa8gKNc/8NcVH0l
MJpp6/DgZ6Mv0Cfa5u2S
=Eub9
-----END PGP SIGNATURE-----