[gmime: 8/24] spelling cleanup
- From: Jeffrey Stedfast <fejj src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gmime: 8/24] spelling cleanup
- Date: Sat, 26 Aug 2017 13:20:25 +0000 (UTC)
commit f1f240ef0b281c71943bea2e56e857b928560876
Author: Daniel Kahn Gillmor <dkg fifthhorseman net>
Date: Thu Jul 13 08:56:38 2017 +0200
spelling cleanup
PORTING | 4 ++--
docs/reference/building.sgml | 2 +-
docs/reference/streams.sgml | 2 +-
docs/tutorial/gmime-tut.sgml | 4 ++--
examples/basic-example.c | 2 +-
gmime/charset-map.c | 2 +-
gmime/gmime-application-pkcs7-mime.c | 10 +++++-----
gmime/gmime-charset.c | 2 +-
gmime/gmime-crypto-context.c | 2 +-
gmime/gmime-filter.c | 2 +-
gmime/gmime-message.c | 2 +-
gmime/gmime-multipart-encrypted.c | 6 +++---
gmime/gmime-multipart-signed.c | 4 ++--
gmime/gmime-utils.c | 2 +-
util/url-scanner.c | 2 +-
15 files changed, 24 insertions(+), 24 deletions(-)
---
diff --git a/PORTING b/PORTING
index 80de6d9..d491dcb 100644
--- a/PORTING
+++ b/PORTING
@@ -1,6 +1,6 @@
It is my intention to make migrating code using one version of GMime
to another as easy as I can and so for the most part, I will try not
-to break API/ABI compatability between versions, however this isn't
+to break API/ABI compatibility between versions, however this isn't
always easy to do.
This document is intended to help developers port their application(s)
@@ -104,7 +104,7 @@ Porting from GMime 2.6 to GMime 3.0
detach argument.
- g_mime_crypto_context_decrypt_session() has been merged with
- g_mime_crypto_context_decrypt() and so the decryot method now takes a session_key
+ g_mime_crypto_context_decrypt() and so the decrypt method now takes a session_key
argument that is allowed to be NULL.
- g_mime_crypto_context_verify() no longer takes a 'digest' argument.
diff --git a/docs/reference/building.sgml b/docs/reference/building.sgml
index 2cf25f5..712d36f 100644
--- a/docs/reference/building.sgml
+++ b/docs/reference/building.sgml
@@ -155,7 +155,7 @@
</listitem>
</itemizedlist>
<para>
- GMime depends on the existance of two (2) libraries: GLib and iconv.
+ GMime depends on the existence of two (2) libraries: GLib and iconv.
</para>
<itemizedlist>
<listitem>
diff --git a/docs/reference/streams.sgml b/docs/reference/streams.sgml
index f3ae793..88c39fc 100644
--- a/docs/reference/streams.sgml
+++ b/docs/reference/streams.sgml
@@ -49,7 +49,7 @@
GMimeObject (for example) will require.</para>
<para>GMimeStreamMmap is a memory-mapped stream. This isn't
- guarenteed to work on all systems since not all systems support
+ guaranteed to work on all systems since not all systems support
the POSIX mmap system call, but for those that do - this might
present a faster stream than GMimeStreamFs and/or
GMimeStreamFile. You'll have to do some experimentation to know
diff --git a/docs/tutorial/gmime-tut.sgml b/docs/tutorial/gmime-tut.sgml
index bfde37c..52a5226 100644
--- a/docs/tutorial/gmime-tut.sgml
+++ b/docs/tutorial/gmime-tut.sgml
@@ -119,7 +119,7 @@ url="http://library.gnome.org/devel/gmime/stable/gmime-building.html">http://lib
<para>Before we get too deep into using GMime, it is important
to understand how to use the underlying I/O classes since GMime
- is so very heavily dependant upon them.</para>
+ is so very heavily dependent upon them.</para>
<para>If you've looked at the API at all already, you will have
probably noticed that the stream functions work very much like
@@ -547,7 +547,7 @@ void g_mime_stream_buffer_readln (GMimeStream *stream, GByteArray *buffer);
<para>GMimeFilterUnix2Dos will likely become very useful to you if
you are implementing any internet standards or DOS/UNIX
- compatability. This filter is meant for converting line endings
+ compatibility. This filter is meant for converting line endings
from the traditional UNIX sequence (LF) to the internet standard
(and DOS) sequence. There's also a GMimeFilterDos2Unix to perform
the opposite conversion.</para>
diff --git a/examples/basic-example.c b/examples/basic-example.c
index cdfc91a..87f8649 100644
--- a/examples/basic-example.c
+++ b/examples/basic-example.c
@@ -148,7 +148,7 @@ verify_foreach_callback (GMimeObject *parent, GMimeObject *part, gpointer user_d
int i;
if (!(signatures = g_mime_multipart_signed_verify (mps, GMIME_VERIFY_NONE, &err))) {
- /* an error occured - probably couldn't start gpg? */
+ /* an error occurred - probably couldn't start gpg? */
/* for more information about GError, see:
* http://developer.gnome.org/doc/API/2.0/glib/glib-Error-Reporting.html
diff --git a/gmime/charset-map.c b/gmime/charset-map.c
index f616d45..a610914 100644
--- a/gmime/charset-map.c
+++ b/gmime/charset-map.c
@@ -120,7 +120,7 @@ int main (int argc, char **argv)
int bytes;
int j, k;
- /* dont count the terminator */
+ /* don't count the terminator */
bytes = ((sizeof (tables) / sizeof (tables[0])) + 7 - 1) / 8;
g_assert (bytes <= 4);
diff --git a/gmime/gmime-application-pkcs7-mime.c b/gmime/gmime-application-pkcs7-mime.c
index 74db382..a404326 100644
--- a/gmime/gmime-application-pkcs7-mime.c
+++ b/gmime/gmime-application-pkcs7-mime.c
@@ -226,7 +226,7 @@ g_mime_application_pkcs7_mime_decompress (GMimeApplicationPkcs7Mime *pkcs7_mime,
*
* Returns: (nullable) (transfer full): a new #GMimeApplicationPkcs7Mime object on success
* or %NULL on fail. If encrypting fails, an exception will be set on @err to provide
- * information as to why the failure occured.
+ * information as to why the failure occurred.
**/
GMimeApplicationPkcs7Mime *
g_mime_application_pkcs7_mime_encrypt (GMimeObject *entity, GMimeEncryptFlags flags, GPtrArray *recipients,
GError **err)
@@ -296,7 +296,7 @@ g_mime_application_pkcs7_mime_encrypt (GMimeObject *entity, GMimeEncryptFlags fl
*
* When non-%NULL, @session_key should be a %NULL-terminated string,
* such as the one returned by g_mime_decrypt_result_get_session_key()
- * from a previous decryption. If the @sesion_key is not valid, decryption
+ * from a previous decryption. If the @session_key is not valid, decryption
* will fail.
*
* If @result is non-%NULL, then on a successful decrypt operation, it will be
@@ -306,7 +306,7 @@ g_mime_application_pkcs7_mime_encrypt (GMimeObject *entity, GMimeEncryptFlags fl
*
* Returns: (nullable) (transfer full): the decrypted MIME part on success or
* %NULL on fail. If the decryption fails, an exception will be set on
- * @err to provide information as to why the failure occured.
+ * @err to provide information as to why the failure occurred.
**/
GMimeObject *
g_mime_application_pkcs7_mime_decrypt (GMimeApplicationPkcs7Mime *pkcs7_mime,
@@ -397,7 +397,7 @@ g_mime_application_pkcs7_mime_decrypt (GMimeApplicationPkcs7Mime *pkcs7_mime,
*
* Returns: (nullable) (transfer full): a new #GMimeApplicationPkcs7Mime object on success
* or %NULL on fail. If signing fails, an exception will be set on @err to provide
- * information as to why the failure occured.
+ * information as to why the failure occurred.
**/
GMimeApplicationPkcs7Mime *
g_mime_application_pkcs7_mime_sign (GMimeObject *entity, const char *userid, GError **err)
@@ -468,7 +468,7 @@ g_mime_application_pkcs7_mime_sign (GMimeObject *entity, const char *userid, GEr
* Returns: (nullable) (transfer full): a new #GMimeSignatureList object on
* success or %NULL on fail. If the verification fails, an exception
* will be set on @err to provide information as to why the failure
- * occured.
+ * occurred.
**/
GMimeSignatureList *
g_mime_application_pkcs7_mime_verify (GMimeApplicationPkcs7Mime *pkcs7_mime, GMimeVerifyFlags flags,
GMimeObject **entity, GError **err)
diff --git a/gmime/gmime-charset.c b/gmime/gmime-charset.c
index e77bcb5..dac7090 100644
--- a/gmime/gmime-charset.c
+++ b/gmime/gmime-charset.c
@@ -103,7 +103,7 @@ static struct {
/* Note: according to http://www.iana.org/assignments/character-sets,
* ks_c_5601-1987 should really map to ISO-2022-KR, but the EUC-KR
* mapping was given to me via a native Korean user, so I'm not sure
- * if I should change this... perhaps they are compatable? */
+ * if I should change this... perhaps they are compatible? */
{ "ks_c_5601-1987", "EUC-KR" },
{ "5601", "EUC-KR" },
{ "ksc-5601", "EUC-KR" },
diff --git a/gmime/gmime-crypto-context.c b/gmime/gmime-crypto-context.c
index 16ca934..cb7364c 100644
--- a/gmime/gmime-crypto-context.c
+++ b/gmime/gmime-crypto-context.c
@@ -488,7 +488,7 @@ crypto_decrypt (GMimeCryptoContext *ctx, GMimeDecryptFlags flags, const char *se
*
* When non-%NULL, @session_key should be a %NULL-terminated string,
* such as the one returned by g_mime_decrypt_result_get_session_key()
- * from a previous decryption. If the @sesion_key is not valid, decryption
+ * from a previous decryption. If the @session_key is not valid, decryption
* will fail.
*
* If the encrypted input stream was also signed, the returned
diff --git a/gmime/gmime-filter.c b/gmime/gmime-filter.c
index e43e470..121204d 100644
--- a/gmime/gmime-filter.c
+++ b/gmime/gmime-filter.c
@@ -170,7 +170,7 @@ filter_run (GMimeFilter *filter, char *inbuf, size_t inlen, size_t prespace,
size_t newlen = inlen + prespace + filter->backlen;
if (p->inlen < newlen) {
- /* NOTE: g_realloc copies data, we dont need that (slower) */
+ /* NOTE: g_realloc copies data, we don't need that (slower) */
g_free (p->inbuf);
p->inbuf = g_malloc (newlen + PRE_HEAD);
p->inlen = newlen + PRE_HEAD;
diff --git a/gmime/gmime-message.c b/gmime/gmime-message.c
index e30da0e..eabef24 100644
--- a/gmime/gmime-message.c
+++ b/gmime/gmime-message.c
@@ -1140,7 +1140,7 @@ multipart_guess_body (GMimeMultipart *multipart)
* Returns: (transfer none): a #GMimeObject containing the textual
* content that appears to be the main body of the message.
*
- * Note: This function is NOT guarenteed to always work as it
+ * Note: This function is NOT guaranteed to always work as it
* makes some assumptions that are not necessarily true. It is
* recommended that you traverse the MIME structure yourself.
**/
diff --git a/gmime/gmime-multipart-encrypted.c b/gmime/gmime-multipart-encrypted.c
index 97c84db..a418fc2 100644
--- a/gmime/gmime-multipart-encrypted.c
+++ b/gmime/gmime-multipart-encrypted.c
@@ -153,7 +153,7 @@ g_mime_multipart_encrypted_new (void)
*
* Returns: (nullable) (transfer full): a new #GMimeMultipartEncrypted object on success
* or %NULL on fail. If encrypting fails, an exception will be set on @err to provide
- * information as to why the failure occured.
+ * information as to why the failure occurred.
**/
GMimeMultipartEncrypted *
g_mime_multipart_encrypted_encrypt (GMimeCryptoContext *ctx, GMimeObject *entity, gboolean sign, const char
*userid,
@@ -246,7 +246,7 @@ g_mime_multipart_encrypted_encrypt (GMimeCryptoContext *ctx, GMimeObject *entity
*
* When non-%NULL, @session_key should be a %NULL-terminated string,
* such as the one returned by g_mime_decrypt_result_get_session_key()
- * from a previous decryption. If the @sesion_key is not valid, decryption
+ * from a previous decryption. If the @session_key is not valid, decryption
* will fail.
*
* If @result is non-%NULL, then on a successful decrypt operation, it will be
@@ -256,7 +256,7 @@ g_mime_multipart_encrypted_encrypt (GMimeCryptoContext *ctx, GMimeObject *entity
*
* Returns: (nullable) (transfer full): the decrypted MIME part on success or
* %NULL on fail. If the decryption fails, an exception will be set on
- * @err to provide information as to why the failure occured.
+ * @err to provide information as to why the failure occurred.
**/
GMimeObject *
g_mime_multipart_encrypted_decrypt (GMimeMultipartEncrypted *encrypted, GMimeDecryptFlags flags,
diff --git a/gmime/gmime-multipart-signed.c b/gmime/gmime-multipart-signed.c
index 5913c10..ab54a43 100644
--- a/gmime/gmime-multipart-signed.c
+++ b/gmime/gmime-multipart-signed.c
@@ -206,7 +206,7 @@ sign_prepare (GMimeObject *mime_part)
*
* Returns: (nullable) (transfer full): a new #GMimeMultipartSigned object on success
* or %NULL on fail. If signing fails, an exception will be set on @err to provide
- * information as to why the failure occured.
+ * information as to why the failure occurred.
**/
GMimeMultipartSigned *
g_mime_multipart_signed_sign (GMimeCryptoContext *ctx, GMimeObject *entity,
@@ -365,7 +365,7 @@ check_protocol_supported (const char *protocol, const char *supported)
* Returns: (nullable) (transfer full): a new #GMimeSignatureList object on
* success or %NULL on fail. If the verification fails, an exception
* will be set on @err to provide information as to why the failure
- * occured.
+ * occurred.
**/
GMimeSignatureList *
g_mime_multipart_signed_verify (GMimeMultipartSigned *mps, GMimeVerifyFlags flags, GError **err)
diff --git a/gmime/gmime-utils.c b/gmime/gmime-utils.c
index 2742e1b..5046d8c 100644
--- a/gmime/gmime-utils.c
+++ b/gmime/gmime-utils.c
@@ -1819,7 +1819,7 @@ rfc2047_decode_tokens (GMimeParserOptions *options, rfc2047_token *tokens, size_
/* convert the raw decoded text into UTF-8 */
if (!g_ascii_strcasecmp (charset, "UTF-8")) {
- /* slight optimization over going thru iconv */
+ /* slight optimization over going through iconv */
str = (char *) outptr;
len = outlen;
diff --git a/util/url-scanner.c b/util/url-scanner.c
index 3457019..4a56c7c 100644
--- a/util/url-scanner.c
+++ b/util/url-scanner.c
@@ -557,7 +557,7 @@ url_scanner_table_init (void)
/* not defined to be special in rfc0822, but when scanning
backwards to find the beginning of the email address we do
- not want to include this char if we come accross it - so
+ not want to include this char if we come across it - so
this is kind of a hack, but it's ok */
url_scanner_table['/'] |= IS_SPECIAL;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]