* add LGPL blurbs to some more files shipped with avahi

* add a line pointing to the respective man pages in the configuration files
* comment most lines in the configuration file, since they're set to the defaults

git-svn-id: file:///home/lennart/svn/public/avahi/trunk@948 941a03a8-eaeb-0310-b9a0-b1bbd8fe43fe

diff --git a/avahi-daemon/AddressResolver.introspect b/avahi-daemon/AddressResolver.introspect
index 273ce8f77504da8048de25df95d479d0b39aaa8f..3550ecdf63729a8617d91f7b575db7cee2613374 100644 (file)
--- a/avahi-daemon/AddressResolver.introspect
+++ b/avahi-daemon/AddressResolver.introspect
@@ -1,9 +1,29 @@
 <?xml version="1.0" standalone='no'?><!--*-nxml-*-->
 <?xml-stylesheet type="text/xsl" href="introspect.xsl"?>
 <!DOCTYPE node SYSTEM "introspect.dtd">
+
+<!-- $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 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
+  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 USA.
+-->
+
 <node>
-  
-  <!-- $Id$ -->
 
   <interface name="org.freedesktop.DBus.Introspectable">
     <method name="Introspect">

diff --git a/avahi-daemon/DomainBrowser.introspect b/avahi-daemon/DomainBrowser.introspect
index daabdb8df8e10ac66ca8b5902b0cc35ea267cced..5840060879d3195c2bdd1a735e0cd3aee3a8a5f4 100644 (file)
--- a/avahi-daemon/DomainBrowser.introspect
+++ b/avahi-daemon/DomainBrowser.introspect
@@ -1,10 +1,30 @@
 <?xml version="1.0" standalone='no'?><!--*-nxml-*-->
 <?xml-stylesheet type="text/xsl" href="introspect.xsl"?>
 <!DOCTYPE node SYSTEM "introspect.dtd">
+
+<!-- $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 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
+  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 USA.
+-->
+
 <node>
   
-  <!-- $Id$ -->
-
   <interface name="org.freedesktop.DBus.Introspectable">
     <method name="Introspect">
       <arg name="data" type="s" direction="out" />

diff --git a/avahi-daemon/EntryGroup.introspect b/avahi-daemon/EntryGroup.introspect
index 96232eac90a7cbb9c0152ce4b6c91e821c55f675..bf2ea13ebe077552644f61ae10671a8b38be21b3 100644 (file)
--- a/avahi-daemon/EntryGroup.introspect
+++ b/avahi-daemon/EntryGroup.introspect
@@ -1,9 +1,29 @@
 <?xml version="1.0" standalone='no'?><!--*-nxml-*-->
 <?xml-stylesheet type="text/xsl" href="introspect.xsl"?>
 <!DOCTYPE node SYSTEM "introspect.dtd">
-<node>
   
-  <!-- $Id$ -->
+<!-- $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 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
+  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 USA.
+-->
+
+<node>
 
   <interface name="org.freedesktop.DBus.Introspectable">
     <method name="Introspect">

diff --git a/avahi-daemon/HostNameResolver.introspect b/avahi-daemon/HostNameResolver.introspect
index d71ed8afa220a447f3f11cdebe51a838ee2960d2..db77ae3e150c397f8df4da85ace2e10518c7a7ff 100644 (file)
--- a/avahi-daemon/HostNameResolver.introspect
+++ b/avahi-daemon/HostNameResolver.introspect
@@ -1,10 +1,30 @@
 <?xml version="1.0" standalone='no'?><!--*-nxml-*-->
 <?xml-stylesheet type="text/xsl" href="introspect.xsl"?>
 <!DOCTYPE node SYSTEM "introspect.dtd">
+
+<!-- $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 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
+  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 USA.
+-->
+
 <node>
   
-  <!-- $Id$ -->
-
   <interface name="org.freedesktop.DBus.Introspectable">
     <method name="Introspect">
       <arg name="data" type="s" direction="out" />

diff --git a/avahi-daemon/Server.introspect b/avahi-daemon/Server.introspect
index cfced9d7d8764ac651b0a2b7b30197888857b62f..f8d88e972eb87629ebb5b5a7dc719e2697ff3264 100644 (file)
--- a/avahi-daemon/Server.introspect
+++ b/avahi-daemon/Server.introspect
@@ -1,9 +1,29 @@
 <?xml version="1.0" standalone='no'?><!--*-nxml-*-->
 <?xml-stylesheet type="text/xsl" href="introspect.xsl"?>
 <!DOCTYPE node SYSTEM "introspect.dtd">
-<node>
 
-  <!-- $Id$ -->
+<!-- $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 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
+  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 USA.
+-->
+
+<node>
 
  <interface name="org.freedesktop.DBus.Introspectable">
     <method name="Introspect">

diff --git a/avahi-daemon/ServiceBrowser.introspect b/avahi-daemon/ServiceBrowser.introspect
index 9638eaa9b09ea98c876fc9d590f4b022760a17de..4a7b430b654d9fd42d74ab6d62dab40fdeb797a6 100644 (file)
--- a/avahi-daemon/ServiceBrowser.introspect
+++ b/avahi-daemon/ServiceBrowser.introspect
@@ -1,10 +1,30 @@
 <?xml version="1.0" standalone='no'?><!--*-nxml-*-->
 <?xml-stylesheet type="text/xsl" href="introspect.xsl"?>
 <!DOCTYPE node SYSTEM "introspect.dtd">
+
+<!-- $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 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
+  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 USA.
+-->
+
 <node>
   
-  <!-- $Id$ -->
-
   <interface name="org.freedesktop.DBus.Introspectable">
     <method name="Introspect">
       <arg name="data" type="s" direction="out" />

diff --git a/avahi-daemon/ServiceResolver.introspect b/avahi-daemon/ServiceResolver.introspect
index 771f179cb47a0a886b97c32129ad5fb570fa3f67..2be9347d5b617c978d93f93fbaa4ef978805daee 100644 (file)
--- a/avahi-daemon/ServiceResolver.introspect
+++ b/avahi-daemon/ServiceResolver.introspect
@@ -1,9 +1,29 @@
 <?xml version="1.0" standalone='no'?><!--*-nxml-*-->
 <?xml-stylesheet type="text/xsl" href="introspect.xsl"?>
 <!DOCTYPE node SYSTEM "introspect.dtd">
+
+<!-- $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 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
+  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 USA.
+-->
+
 <node>
-  
-  <!-- $Id$ -->
 
   <interface name="org.freedesktop.DBus.Introspectable">
     <method name="Introspect">

diff --git a/avahi-daemon/ServiceTypeBrowser.introspect b/avahi-daemon/ServiceTypeBrowser.introspect
index 04e7db92d9f67656a0da6aacfe48f544c3ddcad0..cb07f248ec2f4e55e650dfb4ffc040696ad3514e 100644 (file)
--- a/avahi-daemon/ServiceTypeBrowser.introspect
+++ b/avahi-daemon/ServiceTypeBrowser.introspect
@@ -1,10 +1,30 @@
 <?xml version="1.0" standalone='no'?><!--*-nxml-*-->
 <?xml-stylesheet type="text/xsl" href="introspect.xsl"?>
 <!DOCTYPE node SYSTEM "introspect.dtd">
+
+<!-- $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 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
+  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 USA.
+-->
+
 <node>
   
-  <!-- $Id$ -->
-
   <interface name="org.freedesktop.DBus.Introspectable">
     <method name="Introspect">
       <arg name="data" type="s" direction="out" />

diff --git a/avahi-daemon/avahi-daemon.conf b/avahi-daemon/avahi-daemon.conf
index 9572c0aea56ee62c0c6b1ce2f60446d7f2c9de86..a7ac2e5278a3b4855a98c0aad353f6c220ff45a3 100644 (file)
--- a/avahi-daemon/avahi-daemon.conf
+++ b/avahi-daemon/avahi-daemon.conf
@@ -1,31 +1,53 @@
+# $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 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 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
+# USA.
+
+# See avahi-daemon.conf(5) for more information on this configuration
+# file!
+
 [server]
 #host-name=foo
 #domain-name=local
 browse-domains=0pointer.de, zeroconf.org, dns-sd.org
 use-ipv4=yes
 use-ipv6=no
-check-response-ttl=no
-use-iff-running=no
-enable-dbus=yes
-disallow-other-stacks=no
-disable-publishing=no
-disable-user-service-publishing=no
+#check-response-ttl=no
+#use-iff-running=no
+#enable-dbus=yes
+#disallow-other-stacks=no
+#disable-publishing=no
+#disable-user-service-publishing=no
 
 [wide-area]
 enable-wide-area=yes
 
 [publish]
-add-service-cookie=yes
-publish-addresses=yes
-publish-hinfo=yes
-publish-workstation=yes
-publish-domain=yes
-#publish-dns-servers=192.168.50.1,192.168.50.2
+#add-service-cookie=yes
+#publish-addresses=yes
+#publish-hinfo=yes
+#publish-workstation=yes
+#publish-domain=yes
+#publish-dns-servers=192.168.50.1, 192.168.50.2
 #publish-resolv-conf-dns-servers=yes
 
 [reflector]
-enable-reflector=no
-reflect-ipv=no
+#enable-reflector=no
+#reflect-ipv=no
 
 [rlimits]
 #rlimit-as=

diff --git a/avahi-daemon/example.service b/avahi-daemon/example.service
index 27d8a1950a695f98dbe984e9e823be81d57fec8e..7d6c6b803fca762080f94b1bd971663a0dc29281 100644 (file)
--- a/avahi-daemon/example.service
+++ b/avahi-daemon/example.service
@@ -1,8 +1,30 @@
 <?xml version="1.0" standalone='no'?><!--*-nxml-*-->
 <!DOCTYPE service-group SYSTEM "avahi-service.dtd">
-<service-group>
 
-  <!-- $Id$ -->
+<!-- $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 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
+  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 USA.
+-->
+
+<!-- See avahi.service(5) for more information about this configuration file -->
+
+<service-group>
 
   <name replace-wildcards="yes">Printer on %h</name>
 
@@ -13,7 +35,7 @@
 
   <service>
     <type>_ipp._tcp</type>
-    <subtype>_foo._sub._ipp._tcp</subtype>
+    <subtype>_colour._sub._ipp._tcp</subtype>
     <port>631</port>
   </service>