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 6bf8103bb71863c33f8a7d0a614b19af752c8622..b7dac7ace076084770e871401d51c4bb3e34c3c9 100644 (file)
--- a/man/avahi-browse.1.xml.in
+++ b/man/avahi-browse.1.xml.in
@@ -29,6 +29,8 @@
       <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>
        
     <description>
@@ -40,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>
@@ -49,7 +51,7 @@
 
       <option>
         <p><opt>-D | --browse-domains</opt></p>
-        <optdesc><p>Browse for browsing domains instead for services.</p></optdesc>
+        <optdesc><p>Browse for browsing domains instead for services. avahi-browse-domains is equivalent to avahi-browse --browse-domains</p></optdesc>
       </option>
 
          <option>
@@ -79,11 +81,6 @@
         <optdesc><p>Ignore local services, show only remote services.</p></optdesc>
       </option>
 
-         <option>
-               <p><opt>-h | --help</opt></p>
-               <optdesc><p>Show help.</p></optdesc>
-         </option>
-
          <option>
                <p><opt>-r | --resolve</opt></p>
                <optdesc><p>Automatically resolve services found.</p></optdesc>
@@ -91,7 +88,12 @@
 
          <option>
                <p><opt>-f | --no-fail</opt></p>
-               <optdesc><p>Don't fail if the service is not found running. Instead, wait until it appears. If it disconnects, try to reconnect.</p></optdesc>
+               <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>
@@ -99,6 +101,16 @@
                <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>
+         </option>
+
          <option>
                <p><opt>-V | --version</opt></p>
                <optdesc><p>Show version information.</p></optdesc>
@@ -107,13 +119,13 @@
        </options>
        
        <section name="Authors">
-         <p>The avahi developers &lt;@PACKAGE_BUGREPORT@&gt;; avahi is
+         <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-service" section="1"/>, <manref name="avahi-daemon" section="8"/>
+        <manref name="avahi-publish" section="1"/>, <manref name="avahi-resolve" section="1"/>, <manref name="avahi-daemon" section="8"/>
          </p>
        </section>