[sawfish] DOCS

[Christopher Bratusek <chrisb src gnome org>]

commit 7d25a1159a947bcab289bd7ebcb519b9afc533a6
Author: Christopher Roy Bratusek <zanghar freenet de>
Date:   Thu Aug 26 19:22:48 2010 +0200

    DOCS

 ChangeLog     |    5 +++++
 OPTIONS       |   10 +++++++---
 man/news.texi |   17 ++++++++++++++++-
 3 files changed, 28 insertions(+), 4 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 46e0ed8..af042b3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-08-26  Christopher Bratusek <zanghar freenet de>
+	* lisp/sawfish/wm/ext/apps-menu.jl: more power for our fdo-menu.
+	The variable apps-menu-ignore-no-display is replaced by
+	apps-menu-show-all (check OPTIONS or NEWS) [Matthew Love]
+
 2010-08-24  Christopher Bratusek <zanghar freenet de>
 	* src/flippers.c: plug a memory-leak
 
diff --git a/OPTIONS b/OPTIONS
index 5a45771..d3f4f14 100644
--- a/OPTIONS
+++ b/OPTIONS
@@ -173,10 +173,14 @@
 ;;    "Your own applications menu entries. It is followed by auto generated
 ;:  applications menu.")
 
-;; (defvar-setq apps-menu-ignore-no-display nil
+;; (defvar-setq apps-menu-show-all nil
 ;;    "Some entries are hidden from the menu, especially GNOME Apps like
-;;  eog, nautilus or evince. If you want to have them added to your menu,
-;;  set this to non-nil.")
+;;     eog, nautilus or evince. Settings this variable to 'nil will generate
+;;     a menu that honours NoDisplay, Hidden OnlyShowIn and NotShowIn fields.
+;;     In other words it generates the same menu like GNOME or KDE.
+;;     If this variable is set to 'maybe the NoDisplay and Hidden fields are
+;;     ignored, while NotShowIn and OnlyShowIn are respected.
+;;     At last if you choose 't all four fields are ignored.")
 
 ;; (defvar-setq desktop-directory '("/usr/share/applications")
 ;;   "List of directories to look for *.desktop files")
diff --git a/man/news.texi b/man/news.texi
index 4a187c6..2a77f59 100644
--- a/man/news.texi
+++ b/man/news.texi
@@ -150,6 +150,21 @@ it adds XFCE logout/help/customization menu-entries to the root-menu
 Our freedesktop.org menu-implementation does now honor the OnlyShowIn
 and NotShowIn fields. This is done via @code{desktop-environment} set
 in sawfish.wm.integration.* on startup.
+
+Furthermore the variable @code{apps-menu-ignore-no-display} is replaced
+by the variable @code{apps-menu-show-all}. The latter is more flexible:
+
+if @code{apps-menu-show-all} is set to 'nil, then: fields @code{Hidden},
+ code{NoDisplay}, @code{NotShowIn} and	@code{OnlyShowIn} are respected
+(a menu much like GNOMEs/KDEs is then generated by Sawfish).
+
+if @code{apps-menu-show-all} is set to 'maybe, then: fields @code{Hidden}
+and @code{NoDisplay} are ignored, but fields @code{OnlyShowIn} and
+ code{NotShowIn} are respected.
+
+if @code{apps-menu-show-all} is set to 't, then: fields @code{Hidden},
+ code{NoDisplay}, @code{NotShowIn} and @code{OnlyShowIn} are ignored
+(Sawfish lists all existing menu-entries)
 @end itemize
 
 @item Miscellaneous Changes
@@ -179,7 +194,7 @@ sawfish-help menu-entries have been improved.
 All extra menu-entries for GNOME/KDE4 do now have accelerators. Entries
 for invoking @code{gnome-control-center} or @code{systemsettings} have been
 added. The way KDE4 is detected has been improved. Besides a new variable
- var{desktop-environment} has been introduced, which might be checked to
+ code{desktop-environment} has been introduced, which might be checked to
 determine which one (gnome, kde, xfce or none) is running.
 
 @item Configurator invocation without running Sawfish [Teika Kazura]