ServiceResolver.cs: Only try to set ScopeId when the protocol is IPv6. Patch by

[catta] / man / avahi-browse.1.xml.in

diff --git a/man/avahi-browse.1.xml.in b/man/avahi-browse.1.xml.in
index 07b75579f7d83eb7e0b922dc9db6df48b8965fb4..b7dac7ace076084770e871401d51c4bb3e34c3c9 100644 (file)
--- a/man/avahi-browse.1.xml.in
+++ b/man/avahi-browse.1.xml.in
@@ -29,6 +29,7 @@
       <cmd>avahi-browse [<arg>options</arg>] <arg>service-type</arg></cmd>
       <cmd>avahi-browse [<arg>options</arg>] <opt>--all</opt></cmd>
       <cmd>avahi-browse [<arg>options</arg>] <opt>--browse-domains</opt></cmd>
+      <cmd>avahi-browse [<arg>options</arg>] <opt>--dump-db</opt></cmd>
       <cmd>avahi-browse-domains [<arg>options</arg>]</cmd>
        </synopsis>
        
@@ -41,7 +42,7 @@
 
       <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 "-".</p>
+      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>
@@ -90,11 +91,21 @@
                <optdesc><p>Don't fail if the daemon is not found running. Instead, wait until it appears. If it disconnects, try to reconnect.</p></optdesc>
          </option>
 
+         <option>
+                <p><opt>-p | --parsable</opt></p>
+               <optdesc><p>Make output easily parsable for usage in scripts. If enabled fields are seperated by semicolons (;), service names are escaped. It is recommended to combine this with <opt>--no-db-lookup</opt>.</p></optdesc>
+         </option>
+
          <option>
                <p><opt>-k | --no-db-lookup</opt></p>
                <optdesc><p>Don't lookup services types in service type database.</p></optdesc>
          </option>
 
+         <option>
+               <p><opt>-b | --dump-db</opt></p>
+               <optdesc><p>Dump the service type database (may be combined with -k)</p></optdesc>
+         </option>
+
          <option>
                <p><opt>-h | --help</opt></p>
                <optdesc><p>Show help.</p></optdesc>