From 88a99a094e561b6c87404f4999e61e7b9ed754f6 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Sun, 7 Aug 2005 19:24:44 +0000 Subject: [PATCH] add man page for avahi-daemon.conf git-svn-id: file:///home/lennart/svn/public/avahi/trunk@260 941a03a8-eaeb-0310-b9a0-b1bbd8fe43fe --- avahi-daemon/introspect.xsl | 2 +- man/Makefile.am | 15 ++- man/avahi-daemon.8.xml.in | 22 +++- man/avahi-daemon.conf.5.xml.in | 192 +++++++++++++++++++++++++++++++++ 4 files changed, 223 insertions(+), 8 deletions(-) create mode 100644 man/avahi-daemon.conf.5.xml.in diff --git a/avahi-daemon/introspect.xsl b/avahi-daemon/introspect.xsl index 206de57..38b443c 100644 --- a/avahi-daemon/introspect.xsl +++ b/avahi-daemon/introspect.xsl @@ -18,7 +18,7 @@ .keyword { font-style: italic } .type { font-weight: bold } .symbol { font-family: monospace } - .interface { background: #efefef; padding: 10px; margin: 10px } + .interface { padding: 10px; margin: 10px } diff --git a/man/Makefile.am b/man/Makefile.am index 39ebcd9..946a15f 100644 --- a/man/Makefile.am +++ b/man/Makefile.am @@ -22,7 +22,8 @@ servicedir=$(pkgsysconfdir)/services man_MANS = \ avahi-daemon.8 \ - avahi-dnsconfd.8 + avahi-dnsconfd.8 \ + avahi-daemon.conf.5 if HAVE_PYTHON @@ -46,7 +47,8 @@ noinst_DATA = \ avahi-daemon.8.xml \ avahi-discover.1.xml \ avahi-bookmarks.1.xml \ - avahi-dnsconfd.8.xml + avahi-dnsconfd.8.xml \ + avahi-daemon.conf.5.xml EXTRA_DIST = \ $(man_MANS) \ @@ -59,6 +61,7 @@ EXTRA_DIST = \ avahi-discover.1.xml.in \ avahi-bookmarks.1.xml.in \ avahi-dnsconfd.8.xml.in \ + avahi-daemon.5.conf.xml.in \ xmltoman.css \ xmltoman.xsl \ xmltoman.dtd @@ -105,6 +108,11 @@ avahi-dnsconfd.8.xml: avahi-dnsconfd.8.xml.in Makefile -e 's,@PACKAGE_BUGREPORT\@,$(PACKAGE_BUGREPORT),g' \ -e 's,@PACKAGE_URL\@,$(PACKAGE_URL),g' $< > $@ +avahi-daemon.conf.5.xml: avahi-daemon.conf.5.xml.in Makefile + sed -e 's,@pkgsysconfdir\@,$(pkgsysconfdir),g' \ + -e 's,@PACKAGE_BUGREPORT\@,$(PACKAGE_BUGREPORT),g' \ + -e 's,@PACKAGE_URL\@,$(PACKAGE_URL),g' $< > $@ + if USE_XMLTOMAN @@ -137,4 +145,7 @@ avahi-bookmarks.1: avahi-bookmarks.1.xml Makefile avahi-dnsconfd.8: avahi-dnsconfd.8.xml Makefile xmltoman $< > $@ +avahi-daemon.conf.5: avahi-daemon.conf.5.xml Makefile + xmltoman $< > $@ + endif diff --git a/man/avahi-daemon.8.xml.in b/man/avahi-daemon.8.xml.in index a701340..87853ec 100644 --- a/man/avahi-daemon.8.xml.in +++ b/man/avahi-daemon.8.xml.in @@ -48,9 +48,12 @@ oriented interface to DBUS enabled applications.

Upon startup avahi-daemon interprets its configuration file - @pkgsysconfdir@/avahi-daemon.conf and reads XML fragments from - @servicedir@/*.service which may define static DNS-SD - services.

+ @pkgsysconfdir@/avahi-daemon.conf and reads XML + fragments from @servicedir@/*.service which may + define static DNS-SD services. If you enable + publish-resolv-conf-dns-servers in + avahi-daemon.conf the file + /etc/resolv.conf will be read, too.

@@ -72,7 +75,14 @@