From 7fc0f80480063a9d4cb9e8c07b50db2a5627799e Mon Sep 17 00:00:00 2001
From: Timo Sirainen <tss@iki.fi>
Date: Thu, 22 Jul 2010 17:06:16 +0100
Subject: [PATCH] Fixing my english: s/non-?existing/nonexistent/

---
 doc/example-config/conf.d/15-lda.conf                    | 2 +-
 src/auth/auth-master-connection.c                        | 2 +-
 src/auth/db-passwd-file.c                                | 2 +-
 src/lib-dict/dict.h                                      | 2 +-
 src/lib-storage/index/dbox-multi/mdbox-storage-rebuild.c | 2 +-
 src/lib-storage/index/index-mail-headers.c               | 4 ++--
 src/lib-storage/index/index-mail.c                       | 2 +-
 src/lib-storage/index/index-search.c                     | 2 +-
 src/lib-storage/index/index-thread.c                     | 2 +-
 src/lib-storage/index/maildir/maildir-keywords.h         | 2 +-
 src/lib-storage/index/maildir/maildir-util.c             | 2 +-
 src/lib-storage/index/shared/shared-storage.c            | 6 +++---
 src/lib-storage/list/mailbox-list-maildir.c              | 2 +-
 src/lib-storage/mail-storage.h                           | 2 +-
 src/lib-storage/mailbox-list.c                           | 2 +-
 src/plugins/fts-solr/fts-backend-solr.c                  | 2 +-
 src/plugins/virtual/virtual-sync.c                       | 4 ++--
 17 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/doc/example-config/conf.d/15-lda.conf b/doc/example-config/conf.d/15-lda.conf
index a59d0ec018..ad7db56b1b 100644
--- a/doc/example-config/conf.d/15-lda.conf
+++ b/doc/example-config/conf.d/15-lda.conf
@@ -28,7 +28,7 @@
 # Delimiter character between local-part and detail in email address.
 #recipient_delimiter = +
 
-# Should saving a mail to a non-existing mailbox automatically create it?
+# Should saving a mail to a nonexistent mailbox automatically create it?
 #lda_mailbox_autocreate = no
 
 # Should automatically created mailboxes be also automatically subscribed?
diff --git a/src/auth/auth-master-connection.c b/src/auth/auth-master-connection.c
index 4fd2c6e685..e2e93f0d25 100644
--- a/src/auth/auth-master-connection.c
+++ b/src/auth/auth-master-connection.c
@@ -91,7 +91,7 @@ master_input_request(struct auth_master_connection *conn, const char *args)
 
 	client_conn = auth_client_connection_lookup(client_pid);
 	if (client_conn == NULL) {
-		i_error("Master requested auth for nonexisting client %u",
+		i_error("Master requested auth for nonexistent client %u",
 			client_pid);
 		(void)o_stream_send_str(conn->output,
 					t_strdup_printf("FAIL\t%u\n", id));
diff --git a/src/auth/db-passwd-file.c b/src/auth/db-passwd-file.c
index 8305b6d598..0f636ca51c 100644
--- a/src/auth/db-passwd-file.c
+++ b/src/auth/db-passwd-file.c
@@ -245,7 +245,7 @@ static bool passwd_file_sync(struct passwd_file *pw)
 
 	if (stat(pw->path, &st) < 0) {
 		/* with variables don't give hard errors, or errors about
-		   nonexisting files */
+		   nonexistent files */
 		if (errno == EACCES) {
 			i_error("passwd-file %s: %s", pw->path,
 				eacces_error_get("stat", pw->path));
diff --git a/src/lib-dict/dict.h b/src/lib-dict/dict.h
index 684cac5115..ac87552ea5 100644
--- a/src/lib-dict/dict.h
+++ b/src/lib-dict/dict.h
@@ -59,7 +59,7 @@ int dict_iterate_deinit(struct dict_iterate_context **ctx);
 /* Start a new dictionary transaction. */
 struct dict_transaction_context *dict_transaction_begin(struct dict *dict);
 /* Commit the transaction. Returns 1 if ok, 0 if dict_atomic_inc() was used
-   on a non-existing key, -1 if failed. */
+   on a nonexistent key, -1 if failed. */
 int dict_transaction_commit(struct dict_transaction_context **ctx);
 /* Commit the transaction, but don't wait to see if it finishes successfully.
    If callback isn't NULL, it's called eventually. If it's not called by the
diff --git a/src/lib-storage/index/dbox-multi/mdbox-storage-rebuild.c b/src/lib-storage/index/dbox-multi/mdbox-storage-rebuild.c
index 58c35252b8..161f5c924a 100644
--- a/src/lib-storage/index/dbox-multi/mdbox-storage-rebuild.c
+++ b/src/lib-storage/index/dbox-multi/mdbox-storage-rebuild.c
@@ -338,7 +338,7 @@ static int rebuild_apply_map(struct mdbox_storage_rebuild_context *ctx)
 		pos = bsearch(&search_msgp, msgs, count, sizeof(*msgs),
 			      mdbox_rebuild_msg_offset_cmp);
 		if (pos == NULL || (*pos)->map_uid != 0) {
-			/* map record points to non-existing or
+			/* map record points to nonexistent or
 			   a duplicate message. */
 			mail_index_expunge(ctx->atomic->sync_trans, seq);
 		} else {
diff --git a/src/lib-storage/index/index-mail-headers.c b/src/lib-storage/index/index-mail-headers.c
index 21d0f33352..c420b3f0cf 100644
--- a/src/lib-storage/index/index-mail-headers.c
+++ b/src/lib-storage/index/index-mail-headers.c
@@ -340,7 +340,7 @@ void index_mail_parse_header(struct message_part *part,
 		str_append_n(mail->header_data, hdr->middle, hdr->middle_len);
 
 		/* remember that we saw this header so we don't add it to
-		   cache as nonexisting. */
+		   cache as nonexistent. */
 		match[field_idx] |= HEADER_MATCH_FLAG_FOUND;
 	}
 	str_append_n(mail->header_data, hdr->value, hdr->value_len);
@@ -641,7 +641,7 @@ index_mail_get_raw_headers(struct index_mail *mail, const char *field,
 	data = buffer_get_modifiable_data(dest, &len);
 
 	if (len == 0) {
-		/* cached as non-existing. */
+		/* cached as nonexistent. */
 		*value_r = p_new(mail->data_pool, const char *, 1);
 		return 0;
 	}
diff --git a/src/lib-storage/index/index-mail.c b/src/lib-storage/index/index-mail.c
index 92838b9fb7..c08392b536 100644
--- a/src/lib-storage/index/index-mail.c
+++ b/src/lib-storage/index/index-mail.c
@@ -1129,7 +1129,7 @@ void index_mail_close(struct mail *_mail)
 	/* If uid == 0 but seq != 0, we came here from saving a (non-mbox)
 	   message. If that happens, don't bother checking if anything should
 	   be cached since it was already checked. Also by now the transaction
-	   may have already been rollbacked and seq point to a non-existing
+	   may have already been rollbacked and seq point to a nonexistent
 	   message. */
 	if (mail->mail.mail.uid != 0) {
 		index_mail_cache_sizes(mail);
diff --git a/src/lib-storage/index/index-search.c b/src/lib-storage/index/index-search.c
index 79234568ca..60e63db1e6 100644
--- a/src/lib-storage/index/index-search.c
+++ b/src/lib-storage/index/index-search.c
@@ -736,7 +736,7 @@ static bool search_msgset_fix_limits(unsigned int messages_count,
 			   (e.g. with count+1:* we still want to include it) */
 			seq_range_array_add(seqset, 0, messages_count);
 		}
-		/* remove all non-existing messages */
+		/* remove all nonexistent messages */
 		seq_range_array_remove_range(seqset, messages_count + 1,
 					     (uint32_t)-1);
 	}
diff --git a/src/lib-storage/index/index-thread.c b/src/lib-storage/index/index-thread.c
index 5a8e007909..0153467aea 100644
--- a/src/lib-storage/index/index-thread.c
+++ b/src/lib-storage/index/index-thread.c
@@ -232,7 +232,7 @@ static int thread_get_mail_header(struct mail *mail, const char *name,
 			return -1;
 
 		/* Message is expunged. Instead of failing the entire THREAD
-		   command, just treat the header as non-existing. */
+		   command, just treat the header as nonexistent. */
 		*value_r = NULL;
 	}
 	return 0;
diff --git a/src/lib-storage/index/maildir/maildir-keywords.h b/src/lib-storage/index/maildir/maildir-keywords.h
index ea0e3d8251..43e47d70ef 100644
--- a/src/lib-storage/index/maildir/maildir-keywords.h
+++ b/src/lib-storage/index/maildir/maildir-keywords.h
@@ -19,7 +19,7 @@ maildir_keywords_init_readonly(struct mailbox *box);
 struct maildir_keywords_sync_ctx *
 maildir_keywords_sync_init(struct maildir_keywords *mk,
 			   struct mail_index *index);
-/* Don't try to add any nonexisting keywords */
+/* Don't try to add any nonexistent keywords */
 struct maildir_keywords_sync_ctx *
 maildir_keywords_sync_init_readonly(struct maildir_keywords *mk,
 				    struct mail_index *index);
diff --git a/src/lib-storage/index/maildir/maildir-util.c b/src/lib-storage/index/maildir/maildir-util.c
index d0ef09d4e2..b4be61d437 100644
--- a/src/lib-storage/index/maildir/maildir-util.c
+++ b/src/lib-storage/index/maildir/maildir-util.c
@@ -92,7 +92,7 @@ static int do_racecheck(struct maildir_mailbox *mbox, const char *path,
 	struct stat st;
 
 	if (lstat(path, &st) == 0 && (st.st_mode & S_IFLNK) != 0) {
-		/* most likely a symlink pointing to a non-existing file */
+		/* most likely a symlink pointing to a nonexistent file */
 		mail_storage_set_critical(&mbox->storage->storage,
 			"Maildir: Symlink destination doesn't exist: %s", path);
 		return -2;
diff --git a/src/lib-storage/index/shared/shared-storage.c b/src/lib-storage/index/shared/shared-storage.c
index 61466b4656..4341e0683f 100644
--- a/src/lib-storage/index/shared/shared-storage.c
+++ b/src/lib-storage/index/shared/shared-storage.c
@@ -95,7 +95,7 @@ shared_storage_get_list_settings(const struct mail_namespace *ns ATTR_UNUSED,
 }
 
 static void
-get_nonexisting_user_location(struct shared_storage *storage,
+get_nonexistent_user_location(struct shared_storage *storage,
 			      const char *username, string_t *location)
 {
 	/* user wasn't found. we'll still need to create the storage
@@ -103,7 +103,7 @@ get_nonexisting_user_location(struct shared_storage *storage,
 	str_append(location, storage->storage_class->name);
 	str_append_c(location, ':');
 
-	/* use a reachable but non-existing path as the mail root directory */
+	/* use a reachable but nonexistent path as the mail root directory */
 	str_append(location, storage->storage.user->set->base_dir);
 	str_append(location, "/user-not-found/");
 	str_append(location, username);
@@ -265,7 +265,7 @@ int shared_storage_get_namespace(struct mail_namespace **_ns,
 	if (ret > 0)
 		var_expand(location, storage->location, tab);
 	else {
-		get_nonexisting_user_location(storage, userdomain, location);
+		get_nonexistent_user_location(storage, userdomain, location);
 		new_ns->flags |= NAMESPACE_FLAG_UNUSABLE;
 	}
 
diff --git a/src/lib-storage/list/mailbox-list-maildir.c b/src/lib-storage/list/mailbox-list-maildir.c
index 141ec634c9..f33beef6bd 100644
--- a/src/lib-storage/list/mailbox-list-maildir.c
+++ b/src/lib-storage/list/mailbox-list-maildir.c
@@ -566,7 +566,7 @@ maildir_list_rename_mailbox(struct mailbox_list *oldlist, const char *oldname,
 	int ret;
         bool found;
 
-	/* NOTE: it's possible to rename a nonexisting mailbox which has
+	/* NOTE: it's possible to rename a nonexistent mailbox which has
 	   children. In that case we should ignore the rename() error. */
 	oldpath = mailbox_list_get_path(oldlist, oldname,
 					MAILBOX_LIST_PATH_TYPE_MAILBOX);
diff --git a/src/lib-storage/mail-storage.h b/src/lib-storage/mail-storage.h
index 4dbfd4348c..9755b5a799 100644
--- a/src/lib-storage/mail-storage.h
+++ b/src/lib-storage/mail-storage.h
@@ -337,7 +337,7 @@ void mailbox_close(struct mailbox *box);
 void mailbox_free(struct mailbox **box);
 
 /* Create a mailbox. Returns failure if it already exists. Mailbox name is
-   allowed to contain multiple new non-existing hierarchy levels. If directory
+   allowed to contain multiple new nonexistent hierarchy levels. If directory
    is TRUE, the mailbox should be created so that it can contain children. The
    mailbox itself doesn't have to be created as long as it shows up in LIST.
    If update is non-NULL, its contents are used to set initial mailbox
diff --git a/src/lib-storage/mailbox-list.c b/src/lib-storage/mailbox-list.c
index fc95f3b9b0..232d18263d 100644
--- a/src/lib-storage/mailbox-list.c
+++ b/src/lib-storage/mailbox-list.c
@@ -1156,7 +1156,7 @@ int mailbox_list_set_subscribed(struct mailbox_list *list,
 		return -1;
 
 	/* subscriptions are about names, not about mailboxes. it's possible
-	   to have a subscription to non-existing mailbox. renames also don't
+	   to have a subscription to nonexistent mailbox. renames also don't
 	   change subscriptions. so instead of using actual GUIDs, we'll use
 	   hash of the name. */
 	mailbox_name_get_sha128(name, guid);
diff --git a/src/plugins/fts-solr/fts-backend-solr.c b/src/plugins/fts-solr/fts-backend-solr.c
index 4015091513..15844eb191 100644
--- a/src/plugins/fts-solr/fts-backend-solr.c
+++ b/src/plugins/fts-solr/fts-backend-solr.c
@@ -182,7 +182,7 @@ fts_backend_solr_init(struct mailbox *box)
 						   set->default_ns_prefix);
 		if (backend->default_ns == NULL) {
 			i_fatal("fts_solr: default_ns setting points to "
-				"nonexisting namespace");
+				"nonexistent namespace");
 		}
 	} else {
 		backend->default_ns =
diff --git a/src/plugins/virtual/virtual-sync.c b/src/plugins/virtual/virtual-sync.c
index f743ec3c4a..921dd5062d 100644
--- a/src/plugins/virtual/virtual-sync.c
+++ b/src/plugins/virtual/virtual-sync.c
@@ -774,7 +774,7 @@ static void virtual_sync_drop_existing(struct virtual_backend_box *bbox,
 	seq_range_array_remove_seq_range(added_uids, &drop_uids);
 }
 
-static void virtual_sync_drop_nonexisting(struct virtual_backend_box *bbox,
+static void virtual_sync_drop_nonexistent(struct virtual_backend_box *bbox,
 					  ARRAY_TYPE(seq_range) *removed_uids)
 {
 	ARRAY_TYPE(seq_range) drop_uids;
@@ -835,7 +835,7 @@ static void virtual_sync_mailbox_box_update(struct virtual_sync_context *ctx,
 	}
 
 	virtual_sync_drop_existing(bbox, &added_uids);
-	virtual_sync_drop_nonexisting(bbox, &removed_uids);
+	virtual_sync_drop_nonexistent(bbox, &removed_uids);
 
 	/* if any of the pending removes came back, we don't want to expunge
 	   them anymore. also since they already exist, remove them from
-- 
2.47.3