From 923c381dc177aa64b1da847ae6a27bff19ec817c Mon Sep 17 00:00:00 2001
From: Dana Jansens <danakj@orodu.net>
Date: Sat, 31 Aug 2002 06:15:07 +0000
Subject: sync with the 2.0 branch

---
 util/bsetbg      | 1 +
 util/bsetroot.cc | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

(limited to 'util')

diff --git a/util/bsetbg b/util/bsetbg
index fda6022d..2184618a 100644
--- a/util/bsetbg
+++ b/util/bsetbg
@@ -106,6 +106,7 @@ $me $version $copyright
   -full <file>             stretch an image to fill the desktop
   -exec <args> <file>      specify an external command to execute
   
+  -app  <app>              specify the image application to use
   -post <string>           arguments to be passed to the post-command
   -debug                   prints commands without executing them
 EOF
diff --git a/util/bsetroot.cc b/util/bsetroot.cc
index 98a5bfd4..460dc350 100644
--- a/util/bsetroot.cc
+++ b/util/bsetroot.cc
@@ -1,4 +1,4 @@
-// -*- mode++; indent-tabs-mode: nil; c-basic-offset: 2; -*-
+// -*- mode: C++; indent-tabs-mode: nil; c-basic-offset: 2; -*-
 // bsetroot.cc for Blackbox - an X11 Window manager
 // Copyright (c) 2001 - 2002 Sean 'Shaleh' Perry <shaleh at debian.org>
 // Copyright (c) 1997 - 2000, 2002 Brad Hughes <bhughes at trolltech.com>
@@ -352,7 +352,7 @@ void bsetroot::usage(int exit_code) {
 		 "%s 2.0\n\n"
 		 "Copyright (c) 1997-2000, 2002 Bradley T Hughes\n"
 		 "Copyright (c) 2001-2002 Sean 'Shaleh' Perry\n\n"
-		 "  -display <string>        display connection\n"
+		 "  -display <string>        use display connection\n"
 		 "  -mod <x> <y>             modula pattern\n"
 		 "  -foreground, -fg <color> modula foreground color\n"
 		 "  -background, -bg <color> modula background color\n\n"
-- 
cgit v1.2.3