From f2af862d6619dba39ba056c9ffb5fc9c7e9fc59c Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Wed, 16 Nov 2005 14:06:19 +0000 Subject: update man pages git-svn-id: file:///home/lennart/svn/public/avahi/trunk@981 941a03a8-eaeb-0310-b9a0-b1bbd8fe43fe --- avahi-daemon/avahi-daemon.conf | 4 +- avahi-daemon/main.c | 8 +-- man/Makefile.am | 33 ++++++----- man/avahi-bookmarks.1.xml.in | 17 ++++-- man/avahi-browse.1.xml.in | 63 ++++++++++++++++++--- man/avahi-daemon.8.xml.in | 19 +++++-- man/avahi-daemon.conf.5.xml.in | 61 ++++++++++++++++++-- man/avahi-dnsconfd.8.xml.in | 3 - man/avahi-resolve-address.1.xml.in | 60 -------------------- man/avahi-resolve-host-name.1.xml.in | 60 -------------------- man/avahi-resolve.1.xml.in | 107 +++++++++++++++++++++++++++++++++++ 11 files changed, 263 insertions(+), 172 deletions(-) delete mode 100644 man/avahi-resolve-address.1.xml.in delete mode 100644 man/avahi-resolve-host-name.1.xml.in create mode 100644 man/avahi-resolve.1.xml.in diff --git a/avahi-daemon/avahi-daemon.conf b/avahi-daemon/avahi-daemon.conf index 14b4a0a..f2ffcc3 100644 --- a/avahi-daemon/avahi-daemon.conf +++ b/avahi-daemon/avahi-daemon.conf @@ -30,13 +30,13 @@ use-ipv6=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] +#disable-publishing=no +#disable-user-service-publishing=no #add-service-cookie=yes #publish-addresses=yes #publish-hinfo=yes diff --git a/avahi-daemon/main.c b/avahi-daemon/main.c index 12af74c..da19868 100644 --- a/avahi-daemon/main.c +++ b/avahi-daemon/main.c @@ -487,10 +487,6 @@ static int load_config_file(DaemonConfig *c) { c->server_config.use_iff_running = is_yes(p->value); else if (strcasecmp(p->key, "disallow-other-stacks") == 0) c->server_config.disallow_other_stacks = is_yes(p->value); - else if (strcasecmp(p->key, "disable-publishing") == 0) - c->server_config.disable_publishing = is_yes(p->value); - else if (strcasecmp(p->key, "disable-user-service-publishing") == 0) - c->disable_user_service_publishing = is_yes(p->value); #ifdef HAVE_DBUS else if (strcasecmp(p->key, "enable-dbus") == 0) { @@ -526,6 +522,10 @@ static int load_config_file(DaemonConfig *c) { c->server_config.publish_domain = is_yes(p->value); else if (strcasecmp(p->key, "publish-resolv-conf-dns-servers") == 0) c->publish_resolv_conf = is_yes(p->value); + else if (strcasecmp(p->key, "disable-publishing") == 0) + c->server_config.disable_publishing = is_yes(p->value); + else if (strcasecmp(p->key, "disable-user-service-publishing") == 0) + c->disable_user_service_publishing = is_yes(p->value); else if (strcasecmp(p->key, "add-service-cookie") == 0) c->server_config.add_service_cookie = is_yes(p->value); else if (strcasecmp(p->key, "publish-dns-servers") == 0) { diff --git a/man/Makefile.am b/man/Makefile.am index d80c885..4beb7cb 100644 --- a/man/Makefile.am +++ b/man/Makefile.am @@ -33,8 +33,7 @@ noinst_DATA = \ avahi-browse.1.xml \ avahi-publish-service.1.xml \ avahi-publish-address.1.xml \ - avahi-resolve-address.1.xml \ - avahi-resolve-host-name.1.xml \ + avahi-resolve.1.xml \ avahi-daemon.8.xml \ avahi-discover.1.xml \ avahi-bookmarks.1.xml \ @@ -46,18 +45,18 @@ noinst_DATA = \ CLEANFILES = \ $(noinst_DATA) -if HAVE_PYTHON if HAVE_DBUS man_MANS += \ avahi-browse.1 \ + avahi-resolve.1 + +if HAVE_PYTHON +man_MANS += \ avahi-publish-service.1 \ avahi-publish-address.1 \ - avahi-resolve-address.1 \ - avahi-resolve-host-name.1 \ avahi-discover.1 \ avahi-bookmarks.1 - endif endif @@ -73,11 +72,7 @@ avahi-publish-address.1.xml: avahi-publish-address.1.xml.in Makefile sed -e 's,@PACKAGE_BUGREPORT\@,$(PACKAGE_BUGREPORT),g' \ -e 's,@PACKAGE_URL\@,$(PACKAGE_URL),g' $< > $@ -avahi-resolve-address.1.xml: avahi-resolve-address.1.xml.in Makefile - sed -e 's,@PACKAGE_BUGREPORT\@,$(PACKAGE_BUGREPORT),g' \ - -e 's,@PACKAGE_URL\@,$(PACKAGE_URL),g' $< > $@ - -avahi-resolve-host-name.1.xml: avahi-resolve-host-name.1.xml.in Makefile +avahi-resolve.1.xml: avahi-resolve.1.xml.in Makefile sed -e 's,@PACKAGE_BUGREPORT\@,$(PACKAGE_BUGREPORT),g' \ -e 's,@PACKAGE_URL\@,$(PACKAGE_URL),g' $< > $@ @@ -130,10 +125,7 @@ avahi-publish-service.1: avahi-publish-service.1.xml Makefile avahi-publish-address.1: avahi-publish-address.1.xml Makefile xmltoman $< > $@ -avahi-resolve-address.1: avahi-resolve-address.1.xml Makefile - xmltoman $< > $@ - -avahi-resolve-host-name.1: avahi-resolve-host-name.1.xml Makefile +avahi-resolve.1: avahi-resolve.1.xml Makefile xmltoman $< > $@ avahi-daemon.8: avahi-daemon.8.xml Makefile @@ -172,8 +164,7 @@ EXTRA_DIST = \ avahi-browse.1.xml.in \ avahi-publish-service.1.xml.in \ avahi-publish-address.1.xml.in \ - avahi-resolve-address.1.xml.in \ - avahi-resolve-host-name.1.xml.in \ + avahi-resolve.1.xml.in \ avahi-daemon.8.xml.in \ avahi-discover.1.xml.in \ avahi-bookmarks.1.xml.in \ @@ -184,3 +175,11 @@ EXTRA_DIST = \ xmltoman.css \ xmltoman.xsl \ xmltoman.dtd + + +if HAVE_DBUS + +install-exec-local: + cd $(DESTDIR)/$(mandir)/man1 && rm -f avahi-resolve-host-name.1 avahi-resolve-address.1 && $(LN_S) avahi-resolve.1 avahi-resolve-host-name.1 && $(LN_S) avahi-resolve.1 avahi-resolve-address.1 + +endif diff --git a/man/avahi-bookmarks.1.xml.in b/man/avahi-bookmarks.1.xml.in index 58c791c..f43fa46 100644 --- a/man/avahi-bookmarks.1.xml.in +++ b/man/avahi-bookmarks.1.xml.in @@ -30,12 +30,12 @@ -

Web service showing mDNS/DNS-SD announced HTTP services using - the Avahi daemon. avahi-bookmarks opens an TCP port 8080 and - waits for incoming HTTP connections returning a dynamic web site - containing links to all services of type _http._tcp on the - LAN. Point your browser to http://localhost:8080/ to make use of - avahi-bookmarks.

+

A web service for listing HTTP services that are announced + via mDNS/DNS-SD using the Avahi daemon. avahi-bookmarks opens a + TCP socket on port 8080 and waits for incoming HTTP connections + returning a dynamic web site containing links to all services of + type _http._tcp on the LAN. Point your browser to + http://localhost:8080/ to make use of avahi-bookmarks.

 @@ -58,6 +58,11 @@ mDNS host names (e.g. nss-mdns).

+ + - + + + + + + + + + + + + + + + + + + diff --git a/man/avahi-daemon.8.xml.in b/man/avahi-daemon.8.xml.in index ce8ab81..1c949be 100644 --- a/man/avahi-daemon.8.xml.in +++ b/man/avahi-daemon.8.xml.in @@ -30,8 +30,6 @@ avahi-daemon --kill avahi-daemon --reload avahi-daemon --check - avahi-daemon --version - avahi-daemon --help @@ -88,6 +86,19 @@

Don't drop root priviliges after startup and don't require daemon to be started as root. We recommend not to use this option.

 + + + + @@ -120,10 +131,8 @@

Show version information

- -

@pkgsysconfdir@/avahi-daemon.conf: the default configuration file for avahi-daemon.

diff --git a/man/avahi-daemon.conf.5.xml.in b/man/avahi-daemon.conf.5.xml.in index 89aa38e..030d82d 100644 --- a/man/avahi-daemon.conf.5.xml.in +++ b/man/avahi-daemon.conf.5.xml.in @@ -42,9 +42,21 @@ + + + + +
+ +
+ + +
+ +
+ + + + + - -
- -