Add command line option to specify domain to bssh, prefer vncviewer over xvncviewer. Modified patch from lkundrak. Closes #197

git-svn-id: file:///home/lennart/svn/public/avahi/trunk@1758 941a03a8-eaeb-0310-b9a0-b1bbd8fe43fe

2 files changed, 56 insertions, 28 deletions

diff --git a/man/avahi-browse.1.xml.in b/man/avahi-browse.1.xml.in
index b7dac7a..90b2d35 100644
--- a/man/avahi-browse.1.xml.in
+++ b/man/avahi-browse.1.xml.in
@@ -4,19 +4,19 @@
 
 <!-- $Id$ -->
 
-<!-- 
+<!--
   This file is part of avahi.
- 
+
   avahi is free software; you can redistribute it and/or modify it
   under the terms of the GNU Lesser General Public License as
   published by the Free Software Foundation; either version 2.1 of the
   License, or (at your option) any later version.
- 
+
   avahi is distributed in the hope that it will be useful, but WITHOUT
   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
   or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General
   Public License for more details.
- 
+
   You should have received a copy of the GNU Lesser General Public
   License along with avahi; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
@@ -32,18 +32,18 @@
       <cmd>avahi-browse [<arg>options</arg>] <opt>--dump-db</opt></cmd>
       <cmd>avahi-browse-domains [<arg>options</arg>]</cmd>
 	</synopsis>
-	
+
     <description>
       <p>Browse for mDNS/DNS-SD network services and browsing domains using the Avahi daemon.</p>
-      
+
 	</description>
-	
+
 	<options>
 
       <p>Specify a DNS-SD service type (e.g. _http._tcp) to browse for
       on the command line, or <opt>-a</opt> to browse for all
       available service types. Items that appear on the network are prefixed with "+", items that disappear are prefixed with "-". If <opt>--resolve</opt> is passed items that are resolved are prefixed with "=".</p>
-	  
+
       <option>
 		<p><opt>-a | --all</opt></p>
 		<optdesc><p>Browse for all service types registered on the LAN, not just the one specified on the command line.</p></optdesc>
@@ -117,21 +117,21 @@
 	  </option>
 
 	</options>
-	
+
 	<section name="Authors">
 	  <p>The Avahi Developers &lt;@PACKAGE_BUGREPORT@&gt;; Avahi is
 	  available from <url href="@PACKAGE_URL@"/></p>
 	</section>
-	
+
 	<section name="See also">
 	  <p>
         <manref name="avahi-publish" section="1"/>, <manref name="avahi-resolve" section="1"/>, <manref name="avahi-daemon" section="8"/>
 	  </p>
 	</section>
-	
+
 	<section name="Comments">
 	  <p>This man page was written using <manref name="xml2man" section="1"
 		  href="http://masqmail.cx/xml2man/"/> by Oliver Kurth.</p>
 	</section>
-	
+
   </manpage>
diff --git a/man/bssh.1.xml.in b/man/bssh.1.xml.in
index 2ce4712..2a3fdcf 100644
--- a/man/bssh.1.xml.in
+++ b/man/bssh.1.xml.in
@@ -4,59 +4,87 @@
 
 <!-- $Id$ -->
 
-<!-- 
+<!--
   This file is part of avahi.
- 
+
   avahi is free software; you can redistribute it and/or modify it
   under the terms of the GNU Lesser General Public License as
   published by the Free Software Foundation; either version 2.1 of the
   License, or (at your option) any later version.
- 
+
   avahi is distributed in the hope that it will be useful, but WITHOUT
   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
   or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General
   Public License for more details.
- 
+
   You should have received a copy of the GNU Lesser General Public
   License along with avahi; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 -->
 
-  <manpage name="bssh/bvnc" section="1" desc="Browse for SSH/VNC servers on the local network">
+  <manpage name="bssh/bvnc/bshell" section="1" desc="Browse for SSH/VNC servers on the local network">
 
     <synopsis>
       <cmd>bssh</cmd>
       <cmd>bvnc</cmd>
+      <cmd>bshell</cmd>
     </synopsis>
-    
+
     <description>
-      <p>bssh/bvnc browses for local SSH/VNC servers on the local
+      <p>bssh/bvnc/bshell browses for SSH/VNC servers on the local
       network, shows them in a GUI for the user to select one and
-      finally calls ssh/xvncviewer after a selection was made.</p>
-    
+      finally calls ssh/vncviewer after a selection was made.</p>
+
+      <p>If the binary is called as bssh only ssh servers will be shown. If the binary is called as bvnc only VNC servers will be shown. If the binary is called as bshell both VNC and SSH servers are shown.</p>
+
     </description>
-	
+
     <options>
 
-      <p>bssh/bvnc takes no command line arguments at the moment.</p>
+      <option>
+	<p><opt>-s | --ssh</opt></p>
+	<optdesc><p>Browse for SSH servers (and only SSH servers)  regardless under which name the binary is called.</p></optdesc>
+      </option>
+
+      <option>
+	<p><opt>-v | --vnc</opt></p>
+	<optdesc><p>Browse for VNC servers (and only VNC servers) regardless under which name the binary is called.</p></optdesc>
+      </option>
+
+      <option>
+	<p><opt>-S | --shell</opt></p>
+	<optdesc><p>Browse for both VNC and SSH servers regardless under which name the binary is called.</p></optdesc>
+      </option>
+
+      <option>
+	<p><opt>-d | --domain=</opt> <arg>DOMAIN</arg></p>
+        <optdesc><p>Browse in the specified domain. If omitted
+            bssh/bvnc/bshell will browse in the default browsing domain
+            (usually .local)</p></optdesc>
+      </option>
+
+      <option>
+	<p><opt>-h | --help</opt></p>
+	<optdesc><p>Show help.</p></optdesc>
+      </option>
 
     </options>
-	
+
     <section name="Authors">
       <p>The Avahi Developers &lt;@PACKAGE_BUGREPORT@&gt;; Avahi is
       available from <url href="@PACKAGE_URL@"/></p>
     </section>
-	
+
     <section name="See also">
       <p>
-        <manref name="avahi-browse" section="1"/>, <manref name="ssh" section="1"/>, <manref name="xvncviewer" section="1"/>
+        <manref name="avahi-browse" section="1"/>, <manref name="ssh" section="1"/>, <manref name="vncviewer" section="1"/>
       </p>
     </section>
-    
+
     <section name="Comments">
       <p>This man page was written using <manref name="xml2man" section="1"
       href="http://masqmail.cx/xml2man/"/> by Oliver Kurth.</p>
     </section>
-    
+
   </manpage>