Copyediting / spelling / grammar

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

4 files changed, 9 insertions, 9 deletions

diff --git a/avahi-daemon/caps.c b/avahi-daemon/caps.c
index 2d0f39a..3c9f50f 100644
--- a/avahi-daemon/caps.c
+++ b/avahi-daemon/caps.c
@@ -39,8 +39,8 @@ int avahi_caps_reduce(void) {
     static cap_value_t cap_values[] = { CAP_SYS_CHROOT, CAP_SETUID, CAP_SETGID };
     
     /* Let's reduce our caps to the minimum set and tell Linux to keep
-     * them accross setuid(). This is called before we droppped
-     * priviliges. */
+     * them across setuid(). This is called before we drop
+     * privileges. */
     
     caps = cap_init();
     assert(caps);
@@ -55,7 +55,7 @@ int avahi_caps_reduce(void) {
     }
     cap_free(caps);
 
-    /* Retain capabilities accros setuid() */
+    /* Retain capabilities across setuid() */
     if (prctl(PR_SET_KEEPCAPS, 1, 0, 0, 0) < 0) {
         avahi_log_error("prctl(PR_SET_KEEPCAPS) failed: %s", strerror(errno));
         ret = -1;
@@ -70,8 +70,8 @@ int avahi_caps_reduce2(void) {
     static cap_value_t cap_values[] = { CAP_SYS_CHROOT };
 
     /* Reduce our caps to the bare minimum and tell Linux not to keep
-     * them across setuid(). This is called after we dropped
-     * privilige. */
+     * them across setuid(). This is called after we drop
+     * privileges. */
     
     /* No longer retain caps across setuid() */
     if (prctl(PR_SET_KEEPCAPS, 0, 0, 0, 0) < 0) {
diff --git a/avahi-daemon/dbus-protocol.c b/avahi-daemon/dbus-protocol.c
index 3259355..d61935a 100644
--- a/avahi-daemon/dbus-protocol.c
+++ b/avahi-daemon/dbus-protocol.c
@@ -134,7 +134,7 @@ static Client *client_get(const char *name, int create) {
     if (server->n_clients >= CLIENTS_MAX)
         return NULL;
     
-    /* If not existant yet, create a new entry */
+    /* If not existent yet, create a new entry */
     client = avahi_new(Client, 1);
     client->id = server->current_id++;
     client->name = avahi_strdup(name);
diff --git a/avahi-daemon/main.c b/avahi-daemon/main.c
index 42b3221..d8f9aa6 100644
--- a/avahi-daemon/main.c
+++ b/avahi-daemon/main.c
@@ -1177,7 +1177,7 @@ static int drop_root(void) {
 #elif defined(HAVE_SETREGID)
     r = setregid(gr->gr_gid, gr->gr_gid);
 #else
-#error "No API to drop priviliges"
+#error "No API to drop privileges"
 #endif
 
     if (r < 0) {
@@ -1193,7 +1193,7 @@ static int drop_root(void) {
 #elif defined(HAVE_SETREUID)
     r = setreuid(pw->pw_uid, pw->pw_uid);
 #else
-#error "No API to drop priviliges"
+#error "No API to drop privileges"
 #endif
 
     if (r < 0) {
diff --git a/avahi-daemon/simple-protocol.c b/avahi-daemon/simple-protocol.c
index 04b07c7..33e5db3 100644
--- a/avahi-daemon/simple-protocol.c
+++ b/avahi-daemon/simple-protocol.c
@@ -472,7 +472,7 @@ int simple_protocol_setup(const AvahiPoll *poll_api) {
     strncpy(sa.sun_path, AVAHI_SOCKET, sizeof(sa.sun_path)-1);
 
     /* We simply remove existing UNIX sockets under this name. The
-       Avahi daemons makes sure that it runs only once on a host,
+       Avahi daemon makes sure that it runs only once on a host,
        therefore sockets that already exist are stale and may be
        removed without any ill effects */