From b59779facaa64e00286478d5417ae98ce6981664 Mon Sep 17 00:00:00 2001 From: Ted Percival Date: Fri, 28 Sep 2007 14:51:54 +0000 Subject: [PATCH] Spelling/grammar corrections (all trivial) git-svn-id: file:///home/lennart/svn/public/avahi/trunk@1544 941a03a8-eaeb-0310-b9a0-b1bbd8fe43fe --- avahi-autoipd/main.c | 6 +++--- avahi-core/iface.c | 2 +- avahi-core/socket.c | 4 ++-- avahi-core/wide-area.c | 4 ++-- docs/NEWS | 6 +++--- man/avahi-autoipd.8.xml.in | 2 +- man/avahi-daemon.8.xml.in | 2 +- 7 files changed, 13 insertions(+), 13 deletions(-) diff --git a/avahi-autoipd/main.c b/avahi-autoipd/main.c index 4a51dc3..8cab9f5 100644 --- a/avahi-autoipd/main.c +++ b/avahi-autoipd/main.c @@ -1216,13 +1216,13 @@ static int loop(int iface, uint32_t addr) { if (info.sender_ip_address == addr) { /* Normal conflict */ conflict = 1; - daemon_log(LOG_INFO, "Recieved conflicting normal ARP packet."); + daemon_log(LOG_INFO, "Received conflicting normal ARP packet."); } else if (state == STATE_WAITING_PROBE || state == STATE_PROBING || state == STATE_WAITING_ANNOUNCE) { /* Probe conflict */ conflict = info.target_ip_address == addr && memcmp(hw_address, info.sender_hw_address, ETHER_ADDRLEN); if (conflict) - daemon_log(LOG_INFO, "Recieved conflicting probe ARP packet."); + daemon_log(LOG_INFO, "Received conflicting probe ARP packet."); } if (conflict) { @@ -1426,7 +1426,7 @@ static void help(FILE *f, const char *a0) { " -D --daemonize Daemonize after startup\n" " -s --syslog Write log messages to syslog(3) instead of STDERR\n" " -k --kill Kill a running daemon\n" - " -r --refresh Request a running daemon to refresh it's IP address\n" + " -r --refresh Request a running daemon refresh its IP address\n" " -c --check Return 0 if a daemon is already running\n" " -V --version Show version\n" " -S --start=ADDRESS Start with this address from the IPv4LL range\n" diff --git a/avahi-core/iface.c b/avahi-core/iface.c index f90a61a..8098de4 100644 --- a/avahi-core/iface.c +++ b/avahi-core/iface.c @@ -799,7 +799,7 @@ AvahiIfIndex avahi_find_interface_for_address(AvahiInterfaceMonitor *m, const Av assert(m); /* Some stupid OS don't support passing the interface index when a - * packet is recieved. We have to work around that limitation by + * packet is received. We have to work around that limitation by * looking for an interface that has the incoming address * attached. This is sometimes ambiguous, but we have to live with * it. */ diff --git a/avahi-core/socket.c b/avahi-core/socket.c index 61b5eb4..ddd1482 100644 --- a/avahi-core/socket.c +++ b/avahi-core/socket.c @@ -670,7 +670,7 @@ AvahiDnsPacket *avahi_recv_dns_packet_ipv4( if ((l = recvmsg(fd, &msg, 0)) < 0) { /* Linux returns EAGAIN when an invalid IP packet has been - recieved. We suppress warnings in this case because this might + received. We suppress warnings in this case because this might create quite a bit of log traffic on machines with unstable links. (See #60) */ @@ -824,7 +824,7 @@ AvahiDnsPacket *avahi_recv_dns_packet_ipv6( if ((l = recvmsg(fd, &msg, 0)) < 0) { /* Linux returns EAGAIN when an invalid IP packet has been - recieved. We suppress warnings in this case because this might + received. We suppress warnings in this case because this might create quite a bit of log traffic on machines with unstable links. (See #60) */ diff --git a/avahi-core/wide-area.c b/avahi-core/wide-area.c index bf3f60d..add81c7 100644 --- a/avahi-core/wide-area.c +++ b/avahi-core/wide-area.c @@ -515,7 +515,7 @@ static void handle_packet(AvahiWideAreaLookupEngine *e, AvahiDnsPacket *p) { AvahiKey *k; if (!(k = avahi_dns_packet_consume_key(p, NULL))) { - avahi_log_warn(__FILE__": Wide area response packet too short or invalid while reading question key. (Maybe an UTF8 problem?)"); + avahi_log_warn(__FILE__": Wide area response packet too short or invalid while reading question key. (Maybe a UTF-8 problem?)"); avahi_server_set_errno(e->server, AVAHI_ERR_INVALID_PACKET); final_event = AVAHI_BROWSER_FAILURE; goto finish; @@ -532,7 +532,7 @@ static void handle_packet(AvahiWideAreaLookupEngine *e, AvahiDnsPacket *p) { AvahiRecord *rr; if (!(rr = avahi_dns_packet_consume_record(p, NULL))) { - avahi_log_warn(__FILE__": Wide area response packet too short or invalid while reading response ecord. (Maybe an UTF8 problem?)"); + avahi_log_warn(__FILE__": Wide area response packet too short or invalid while reading response record. (Maybe a UTF-8 problem?)"); avahi_server_set_errno(e->server, AVAHI_ERR_INVALID_PACKET); final_event = AVAHI_BROWSER_FAILURE; goto finish; diff --git a/docs/NEWS b/docs/NEWS index 9af73a6..ed48d0e 100644 --- a/docs/NEWS +++ b/docs/NEWS @@ -14,7 +14,7 @@ This is an important bugfix release. * Properly find alternative service/host names for very long names * DNS name compression fix (Sjoerd Simons) * Fedora init script order fix - * Several fixes to make gcc produces less warnings + * Several fixes to make gcc produce less warnings * Minor documentation and build fixes This release is backwards compatible with Avahi 0.6.x with x < 21. @@ -219,7 +219,7 @@ Changes: picked instead. This follows Bonjour's behaviour and has the advantage not confusing people with regular host names ending in digits. - * Don't disable all static services when SIGHUP is recieved. + * Don't disable all static services when SIGHUP is received. * Fix build when Avahi is configured without Gtk+ but with Python support * Fix build on MacOS X @@ -639,7 +639,7 @@ and boasts the following features mDNS/DNS-SD is part of a larger set of specifications for easy configuration of networking known as "ZeroConf" (http://www.zeroconf.org/), with the aim of allowing you to plug into -a network and instantly be able to interact with it's services. +a network and instantly be able to interact with its services. Avahi was designed to be a fully free implementation, and is available under the LGPL. Many other implementations of the mDNS/DNS-SD diff --git a/man/avahi-autoipd.8.xml.in b/man/avahi-autoipd.8.xml.in index 4655765..2e7bb67 100644 --- a/man/avahi-autoipd.8.xml.in +++ b/man/avahi-autoipd.8.xml.in @@ -118,7 +118,7 @@

--no-proc-title

Don't change the process name while running. Unless this option is specified avahi-autoipd will - reflect it's current state and the IP address in the process + reflect its current state and the IP address in the process title.

 diff --git a/man/avahi-daemon.8.xml.in b/man/avahi-daemon.8.xml.in index fdbf8c0..7b5539d 100644 --- a/man/avahi-daemon.8.xml.in +++ b/man/avahi-daemon.8.xml.in @@ -95,7 +95,7 @@

--no-proc-title

Don't change the process name while running. Unless this option is specified avahi-daemon will reflect - it's current state and the selected host name in the process + its current state and the selected host name in the process title.

 -- 2.7.4