X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=man%2Favahi.service.5.xml.in;h=6598617e2413253a989924c9cdad84202c160f07;hb=7a5b2f69af7d36d6cd4153142f125fa011784e03;hp=5260ef29017bd34999725907b4e26437df29b8bf;hpb=a52bd64a8db2c07bb2309cf2d8b888cc1a47ec56;p=catta

diff --git a/man/avahi.service.5.xml.in b/man/avahi.service.5.xml.in
index 5260ef2..6598617 100644
--- a/man/avahi.service.5.xml.in
+++ b/man/avahi.service.5.xml.in
@@ -2,21 +2,19 @@
 <!DOCTYPE manpage SYSTEM "xmltoman.dtd">
 <?xml-stylesheet type="text/xsl" href="xmltoman.xsl" ?>
 
-<!-- $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
@@ -28,16 +26,16 @@
 	<synopsis>
       <cmd>@servicedir@/*.service</cmd>
 	</synopsis>
-	
+
     <description> <p><file>@servicedir@/*.service</file> are XML
       fragments containing static DNS-SD service data. Every service
       file can contain multiple service definitions which share the
       same name. This is useful for publishing service data for
       services which implement multiple protocols. (i.e. a printer
-      implementing _ipp._tcp and _printer.tcp)</p> </description>
-	
+      implementing _ipp._tcp and _printer._tcp)</p> </description>
+
 	<section name="XML Tags">
-      
+
       <option>
         <p><opt>&lt;service-group&gt;</opt> The document tag of avahi
         service files. Should contain one <opt>&lt;name&gt;</opt> and one or more
@@ -45,7 +43,7 @@
       </option>
 
       <option>
-        <p><opt>&lt;name replace-wildcards="yes|no"/&gt;</opt> The
+        <p><opt>&lt;name replace-wildcards="yes|no"&gt;</opt> The
         service name. If <opt>replace-wildcards</opt> is "yes", any
         occurence of the string "%h" will be replaced by the local
         host name. This can be used for service names like "Remote
@@ -54,20 +52,27 @@
       </option>
 
       <option>
-        <p><opt>&lt;service&gt;</opt> Contains the service information
-        for exactly one service type. Should contain one
-        <opt>&lt;type&gt;</opt> and one <opt>&lt;port&gt;</opt>
-        element. Optionally it may contain one
+        <p><opt>&lt;service protocol="ipv4|ipv6|any"&gt;</opt>
+        Contains the service information for exactly one service
+        type. Should contain one <opt>&lt;type&gt;</opt> and one
+        <opt>&lt;port&gt;</opt> element. Optionally it may contain one
         <opt>&lt;domain-name&gt;</opt>, one
-        <opt>&lt;host-name&gt;</opt> and multiple
-        <opt>&lt;txt-record&gt;</opt> elements.</p>
+        <opt>&lt;host-name&gt;</opt>, any number of
+        <opt>&lt;subtype&gt;</opt> and any number of
+        <opt>&lt;txt-record&gt;</opt> elements. The attribute
+        <opt>protocol</opt> specifies the protocol to advertise the
+        service on. If <opt>any</opt> is used (which is the default),
+        the service will be advertised on both IPv4 and IPv6.</p>
       </option>
 
-
       <option>
         <p><opt>&lt;type&gt;</opt> Contains the DNS-SD service type for this service. e.g. "_http._tcp".</p>
       </option>
 
+      <option>
+        <p><opt>&lt;subtype&gt;</opt> Contains an additional DNS-SD service subtype for this service. e.g. "_anon._sub._ftp._tcp".</p>
+      </option>
+
       <option>
         <p><opt>&lt;domain-name&gt;</opt> The domain name this service
         should be registered. If omited defaults to the default domain
@@ -76,21 +81,20 @@
 
       <option>
         <p><opt>&lt;host-name&gt;</opt> The host name of the host that
-        provides this service. This should be a mDNS resolvable host
-        name. Please note that you need to specify a fully-qualified
-        domain name (FQDN) here, i.e. .local is not appended! The host
-        name needs not to be part of the domain specified in
-        <opt>&lt;domain-name&gt;</opt>.</p>
+        provides this service. This should be a host that is
+        resolvable by multicast or unicast DNS. Please note that you
+        need to specify a fully-qualified domain name (FQDN) here,
+        i.e. .local is not appended implicitly! The host name doesn't
+        need to be part of the domain specified in
+        <opt>&lt;domain-name&gt;</opt>. See <manref name="avahi.hosts"
+        section="5"/> for more information how to publish additional
+        host name mappings.</p>
       </option>
 
       <option>
         <p><opt>&lt;port&gt;</opt> The IP port number the service listens on.</p>
       </option>
 
-      <option>
-        <p><opt>&lt;protocol&gt;</opt> The protocol to advertise the service on, can be any of <opt>ipv4</opt>, <opt>ipv6</opt> or <opt>any</opt>.</p>
-      </option>
-
       <option>
         <p><opt>&lt;txt-record&gt;</opt> DNS-SD TXT record data.</p>
       </option>
@@ -99,20 +103,20 @@
 	</section>
 
 	<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-daemon" section="8"/>
+        <manref name="avahi-daemon" section="8"/>, <manref name="avahi.hosts" section="5"/>
 	  </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>