[gentoo-commits] proj/ufed:master commit in: /

["Sven Eden" <sven.eden@gmx.de>]

commit:     fdf1955bd47e411670aacd1c67db5e0097c564e2
Author:     Sven Eden <yamakuzure <AT> gmx <DOT> net>
AuthorDate: Wed Sep 11 04:27:31 2013 +0000
Commit:     Sven Eden <sven.eden <AT> gmx <DOT> de>
CommitDate: Wed Sep 11 04:27:31 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/ufed.git;a=commit;h=fdf1955b

Updated the help text and man page to include information about the new F10 key and the change to indicate the next state via button text instead of an indicator line.

---
 ufed-curses-help.c | 26 ++++++++++++++++++++++++--
 ufed.8.in          | 26 ++++++++++++++++++++++++--
 2 files changed, 48 insertions(+), 4 deletions(-)

diff --git a/ufed-curses-help.c b/ufed-curses-help.c
index a7781c5..eddedf4 100644
--- a/ufed-curses-help.c
+++ b/ufed-curses-help.c
@@ -39,6 +39,11 @@ static void init_lines(void)
 "ufed reads the first, overrides its settings with the second, and writes "
 "changes to the second.",
 "",
+"If /etc/portage/make.conf is a directory, ufed will parse all files in this "
+"directory recursively, omitting files that begin with a '.' or end with a "
+"'~', and will read all USE flag settings that can be found. Changes are "
+"written to the last file found, overriding all others.",
+"",
 "--- What Are USE Flags? ---",
 "",
 "The USE settings system is a flexible way to enable or disable various "
@@ -121,8 +126,8 @@ static void init_lines(void)
 "End keys, or start typing the name of a flag to select it.",
 "Use the space bar to toggle the setting.",
 "",
-"You can apply various filters on the flags to display. A status line on the "
-"bottom right will show you which filters are in effect.",
+"You can apply various filters on the flags to display. The text of the bottom "
+"line buttons show, which filter the button (or key press) will switch to.",
 "",
 " F5: Toggle display of local / global / all flag descriptions.",
 "",
@@ -134,6 +139,23 @@ static void init_lines(void)
 "",
 "The default is to display all flags that are neither masked nor forced.",
 "",
+"You can change the way the descriptions are displayed. The text of the "
+"bottom line buttons show, which way the button (or key press) the display "
+"will change to.",
+"",
+" F9: Toggle the order of the affected package list and the description.",
+"",
+" F10: Toggle whether to display the full description or a stripped version. "
+"The stripped version has various wordings like \"Enables support for\" or "
+"\"Build and install the\" at the beginning of the description removed.",
+"Although somewhat crippled, the descriptions key information then needs "
+"less space and allows, with switched order of the package list and the "
+"description, to determine a flags meaning without scrolling the text in most "
+"cases; even on low resolution displays.",
+"",
+"The default is to display the full description preceeded by the list of "
+"affected packages.",
+"",
 "If ncurses is installed with the \"gpm\" use flag enabled, you can use your "
 "mouse to navigate and to toggle the settings, too.",
 "",

diff --git a/ufed.8.in b/ufed.8.in
index c916bf2..2f4d19d 100644
--- a/ufed.8.in
+++ b/ufed.8.in
@@ -15,6 +15,11 @@ If you have two make.conf files, @GENTOO_PORTAGE_EPREFIX@/etc/make.conf and
 @GENTOO_PORTAGE_EPREFIX@/etc/portage/make.conf, ufed reads the first, overrides
 its settings with the second, and writes changes to the second.
 
+If @GENTOO_PORTAGE_EPREFIX@/etc/portage/make.conf is a directory, ufed will
+parse all files in this directory recursively, omitting files that begin with a
+'.' or end with a '~', and will read all USE flag settings that can be found.
+Changes are written to the last file found, overriding all others.
+
 .B What are USE flags?
 
 The USE settings system is a flexible way to enable or disable various features
@@ -92,8 +97,8 @@ Use the Up and Down arrow keys, the Page Up and Page Down keys, the Home and
 End keys, or start typing the name of a flag to select it.
 Use the space bar to toggle the setting.
 
-You can apply various filters on the flags to display. A status line on the
-bottom right will show you which filters are in effect.
+You can apply various filters on the flags to display. The text of the bottom
+line buttons show, which filter the button (or key press) will switch to.
 
 F5: Toggle display of local / global / all flag descriptions.
 .br
@@ -105,6 +110,23 @@ neither masked nor forced / all flags.
 
 The default is to display all flags that are neither masked nor forced.
 
+You can change the way the descriptions are displayed. The text of the
+bottom line buttons show, which way the button (or key press) the display
+will change to.
+
+F9: Toggle the order of the affected package list and the description.
+.br
+F10: Toggle whether to display the full description or a stripped version.
+The stripped version has various wordings like "Enables support for" or
+"Build and install the" at the beginning of the description removed.
+Although somewhat crippled, the descriptions key information then needs
+less space and allows, with switched order of the package list and the
+description, to determine a flags meaning without scrolling the text in most
+cases; even on low resolution displays.
+
+The default is to display the full description preceeded by the list of
+affected packages.
+
 If ncurses is installed with the "gpm" use flag enabled, you can use your
 mouse to navigate and to toggle the settings, too.