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 15856d26ec3ec16c7dcfd88a3b7f588453440df6..b7dac7ace076084770e871401d51c4bb3e34c3c9 100644 (file)
--- a/man/avahi-browse.1.xml.in
+++ b/man/avahi-browse.1.xml.in
@@ -42,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>
@@ -91,6 +91,11 @@
                <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>