From ed06b3a0319dca75edb73310a35b525c7456a035 Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@poettering.net>
Date: Mon, 22 Aug 2005 23:11:22 +0000
Subject: Make protocol an attribute instead of an element. (Sorry Lathiat, but
 you broke the DTD, and I just fixed this without forcing a specific order of
 elements.)

git-svn-id: file:///home/lennart/svn/public/avahi/trunk@401 941a03a8-eaeb-0310-b9a0-b1bbd8fe43fe
---
 man/avahi.service.5.xml.in | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

(limited to 'man')

diff --git a/man/avahi.service.5.xml.in b/man/avahi.service.5.xml.in
index 5260ef2..7580d63 100644
--- a/man/avahi.service.5.xml.in
+++ b/man/avahi.service.5.xml.in
@@ -45,7 +45,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,16 +54,19 @@
       </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;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>
@@ -87,10 +90,6 @@
         <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>
-- 
cgit