From a9e118b82c39b12695575229934af435058668a5 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Sun, 7 Aug 2005 12:57:13 +0000 Subject: [PATCH] add dnsconfd man page git-svn-id: file:///home/lennart/svn/public/avahi/trunk@259 941a03a8-eaeb-0310-b9a0-b1bbd8fe43fe --- avahi-dnsconfd/main.c | 12 ++-- man/Makefile.am | 16 +++++- man/avahi-daemon.8.xml.in | 12 ++-- man/avahi-dnsconfd.8.xml.in | 107 ++++++++++++++++++++++++++++++++++++ 4 files changed, 133 insertions(+), 14 deletions(-) create mode 100644 man/avahi-dnsconfd.8.xml.in diff --git a/avahi-dnsconfd/main.c b/avahi-dnsconfd/main.c index 959f177..db807da 100644 --- a/avahi-dnsconfd/main.c +++ b/avahi-dnsconfd/main.c @@ -60,7 +60,7 @@ static gboolean quit = FALSE; static enum { DAEMON_RUN, DAEMON_KILL, - DAEMON_RELOAD, + DAEMON_REFRESH, DAEMON_VERSION, DAEMON_HELP, DAEMON_CHECK @@ -343,7 +343,7 @@ static void help(FILE *f, const gchar *argv0) { " -h --help Show this help\n" " -D --daemonize Daemonize after startup\n" " -k --kill Kill a running daemon\n" - " -r --reload Request a running daemon to reload static services\n" + " -r --refresh Request a running daemon to refresh DNS server data\n" " -c --check Return 0 if a daemon is already running\n" " -V --version Show version\n", argv0); @@ -357,7 +357,7 @@ static gint parse_command_line(int argc, char *argv[]) { { "daemonize", no_argument, NULL, 'D' }, { "kill", no_argument, NULL, 'k' }, { "version", no_argument, NULL, 'V' }, - { "reload", no_argument, NULL, 'r' }, + { "refresh", no_argument, NULL, 'r' }, { "check", no_argument, NULL, 'c' }, }; @@ -378,7 +378,7 @@ static gint parse_command_line(int argc, char *argv[]) { command = DAEMON_VERSION; break; case 'r': - command = DAEMON_RELOAD; + command = DAEMON_REFRESH; break; case 'c': command = DAEMON_CHECK; @@ -454,7 +454,7 @@ static int run_daemon(void) { break; case SIGHUP: - daemon_log(LOG_INFO, "Rrefreshing DNS Server list"); + daemon_log(LOG_INFO, "Refreshing DNS Server list"); close(fd); free_dns_server_info_list(); @@ -597,7 +597,7 @@ gint main(gint argc, gchar *argv[]) { } r = 0; - } else if (command == DAEMON_RELOAD) { + } else if (command == DAEMON_REFRESH) { if (daemon_pid_file_kill(SIGHUP) < 0) { daemon_log(LOG_WARNING, "Failed to kill daemon: %s", strerror(errno)); goto finish; diff --git a/man/Makefile.am b/man/Makefile.am index 885f9d8..39ebcd9 100644 --- a/man/Makefile.am +++ b/man/Makefile.am @@ -21,7 +21,8 @@ pkgsysconfdir=$(sysconfdir)/avahi servicedir=$(pkgsysconfdir)/services man_MANS = \ - avahi-daemon.8 + avahi-daemon.8 \ + avahi-dnsconfd.8 if HAVE_PYTHON @@ -44,7 +45,8 @@ noinst_DATA = \ avahi-resolve-host-name.1.xml \ avahi-daemon.8.xml \ avahi-discover.1.xml \ - avahi-bookmarks.1.xml + avahi-bookmarks.1.xml \ + avahi-dnsconfd.8.xml EXTRA_DIST = \ $(man_MANS) \ @@ -56,6 +58,7 @@ EXTRA_DIST = \ avahi-daemon.8.xml.in \ avahi-discover.1.xml.in \ avahi-bookmarks.1.xml.in \ + avahi-dnsconfd.8.xml.in \ xmltoman.css \ xmltoman.xsl \ xmltoman.dtd @@ -97,6 +100,12 @@ avahi-bookmarks.1.xml: avahi-bookmarks.1.xml.in Makefile sed -e 's,@PACKAGE_BUGREPORT\@,$(PACKAGE_BUGREPORT),g' \ -e 's,@PACKAGE_URL\@,$(PACKAGE_URL),g' $< > $@ +avahi-dnsconfd.8.xml: avahi-dnsconfd.8.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 CLEANFILES += $(man_MANS) @@ -125,4 +134,7 @@ avahi-discover.1: avahi-discover.1.xml Makefile avahi-bookmarks.1: avahi-bookmarks.1.xml Makefile xmltoman $< > $@ +avahi-dnsconfd.8: avahi-dnsconfd.8.xml Makefile + xmltoman $< > $@ + endif diff --git a/man/avahi-daemon.8.xml.in b/man/avahi-daemon.8.xml.in index 3e461ac..a701340 100644 --- a/man/avahi-daemon.8.xml.in +++ b/man/avahi-daemon.8.xml.in @@ -47,9 +47,9 @@ there is the DBUS interface which provides a rich object oriented interface to DBUS enabled applications.

-

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

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.

@@ -62,7 +62,7 @@