diff --git a/acinclude.m4 b/acinclude.m4 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -60,7 +60,7 @@ ]) dnl LIST_MEMBER() -dnl Check wether an element ist contained in a list. Set `found' to +dnl Check whether an element ist contained in a list. Set `found' to dnl `1' if the element is found in the list, to `0' otherwise. AC_DEFUN([LIST_MEMBER], [ diff --git a/configure.ac b/configure.ac --- a/configure.ac +++ b/configure.ac @@ -279,7 +279,7 @@ fi -# Note: You need to declare all possible langauges also in +# Note: You need to declare all possible languages also in # lang/Makefile.am's DIST_SUBDIRS. AC_ARG_ENABLE([languages], AC_HELP_STRING([--enable-languages=languages], @@ -335,7 +335,7 @@ # Check that if qt is enabled cpp also is enabled LIST_MEMBER("qt", $enabled_languages) if test "$found" = "1"; then - # We need to ensure that in the langauge order qt comes after cpp + # We need to ensure that in the language order qt comes after cpp # so we remove qt first and explicitly add it as last list member. enabled_languages=$(echo $enabled_languages | sed 's/qt//') LIST_MEMBER("cpp", $enabled_languages) diff --git a/doc/gpgme.texi b/doc/gpgme.texi --- a/doc/gpgme.texi +++ b/doc/gpgme.texi @@ -497,13 +497,13 @@ largefile support add-on. Then a new data type @code{off64_t} is provided, which is 64 bit wide. Or you can replace the existing @code{off_t} data type with its 64 bit wide counterpart. All -occurences of @code{off_t} are then automagically replaced. +occurrences of @code{off_t} are then automagically replaced. As if matters were not complex enough, there are also two different types of file descriptors in such systems. This is important because if file descriptors are exchanged between programs that use a different maximum file size, certain errors must be produced on some -file descriptors to prevent subtle overflow bugs from occuring. +file descriptors to prevent subtle overflow bugs from occurring. As you can see, supporting two different maximum file sizes at the same time is not at all an easy task. However, the maximum file size @@ -725,7 +725,7 @@ @item require-gnupg Set the mimimum version of the required GnuPG engine. If that version -is not met, GPGME fails early instead of trying to use the existant +is not met, GPGME fails early instead of trying to use the existent version. The given version must be a string with major, minor, and micro number. Example: "2.1.0". @@ -1112,7 +1112,7 @@ The new defaults are not applied to already created GPGME contexts. This function returns the error code @code{GPG_ERR_NO_ERROR} if -successful, or an eror code on failure. +successful, or an error code on failure. @end deftypefun The functions @code{gpgme_ctx_get_engine_info} and @@ -1537,7 +1537,7 @@ @code{0}. Also, it is guaranteed that an error value made from the error code @code{0} will be @code{0} itself (as a whole). This means that the error source information is lost for this error code, -however, as this error code indicates that no error occured, this is +however, as this error code indicates that no error occurred, this is generally not a problem. @item GPG_ERR_GENERAL @@ -1611,7 +1611,7 @@ the certificate. @item GPG_ERR_NO_POLICY_MATCH -This value indicates that a policy issue occured. +This value indicates that a policy issue occurred. @item GPG_ERR_NO_SECKEY This value indicates that no secret key for the user ID is available. @@ -2429,7 +2429,7 @@ context @var{ctx}. This function returns the error code @code{GPG_ERR_NO_ERROR} if -successful, or an eror code on failure. +successful, or an error code on failure. @end deftypefun @@ -2665,7 +2665,7 @@ @item GPGME_KEYLIST_MODE_EXTERN The @code{GPGME_KEYLIST_MODE_EXTERN} symbol specifies that an external source should be searched for keys in the keylisting operation. The -type of external source is dependant on the crypto engine used and +type of external source is dependent on the crypto engine used and whether it is combined with @code{GPGME_KEYLIST_MODE_LOCAL}. For example, it can be a remote keyserver or LDAP certificate server. @@ -5191,7 +5191,7 @@ A policy requirement was not met. @item GPGME_SIGSUM_SYS_ERROR - A system error occured. + A system error occurred. @end table @item char *fpr @@ -5983,7 +5983,7 @@ If this flag is set the available information is not fresh enough. @item error -If this flag is set some other error has occured. +If this flag is set some other error has occurred. @item version The version string of the latest released version. @@ -6015,7 +6015,7 @@ The function @code{gpgme_op_query_swdb_result} returns a @code{gpgme_query_swdb_result_t} pointer to a structure holding the result of a @code{gpgme_op_query_swdb} operation. The pointer is only -valid if the last operation on the context was a sucessful call to +valid if the last operation on the context was a successful call to @code{gpgme_op_query_swdb}. If that call failed, the result might be a @code{NULL} pointer. The returned pointer is only valid until the next operation is started on the context @var{ctx}. @@ -6273,9 +6273,9 @@ @code{gpgme_event_io_cb_t} function with @acronym{GPGME} and will always be passed as the first argument when registering a callback function. For example, the user can use this to determine the context in which -this event has occured. +this event has occurred. -@var{type} will specify the type of event that has occured. +@var{type} will specify the type of event that has occurred. @var{type_data} specifies the event further, as described in the above list of possible @code{gpgme_event_io_t} types. @@ -6313,7 +6313,7 @@ @item void *event_priv This is passed as the first argument to the @code{event} function when it is called by @acronym{GPGME}. For example, it can be used to -determine the context in which the event has occured. +determine the context in which the event has occurred. @end table @end deftp diff --git a/doc/texinfo.tex b/doc/texinfo.tex --- a/doc/texinfo.tex +++ b/doc/texinfo.tex @@ -460,7 +460,7 @@ \def\argremovecomment#1\comment#2\ArgTerm{\argremovec #1\c\ArgTerm} \def\argremovec#1\c#2\ArgTerm{\argcheckspaces#1\^^M\ArgTerm} -% Each occurence of `\^^M' or `\^^M' is replaced by a single space. +% Each occurrence of `\^^M' or `\^^M' is replaced by a single space. % % \argremovec might leave us with trailing space, e.g., % @end itemize @c foo @@ -485,7 +485,7 @@ % to get _exactly_ the rest of the line, we had to prevent such situation. % We prepended an \empty token at the very beginning and we expand it now, % just before passing the control to \argtorun. -% (Similarily, we have to think about #3 of \argcheckspacesY above: it is +% (Similarly, we have to think about #3 of \argcheckspacesY above: it is % either the null string, or it ends with \^^M---thus there is no danger % that a pair of braces would be stripped. % @@ -542,7 +542,7 @@ % used to check whether the current environment is the one expected. % % Non-false conditionals (@iftex, @ifset) don't fit into this, so they -% are not treated as enviroments; they don't open a group. (The +% are not treated as environments; they don't open a group. (The % implementation of @end takes care not to call \endgroup in this % special case.) @@ -565,7 +565,7 @@ \fi } -% Evironment mismatch, #1 expected: +% Environment mismatch, #1 expected: \def\badenverr{% \errhelp = \EMsimple \errmessage{This command can appear only \inenvironment\temp, @@ -7317,7 +7317,7 @@ % In case a @footnote appears in a vbox, save the footnote text and create % the real \insert just after the vbox finished. Otherwise, the insertion % would be lost. -% Similarily, if a @footnote appears inside an alignment, save the footnote +% Similarly, if a @footnote appears inside an alignment, save the footnote % text to a box and make the \insert when a row of the table is finished. % And the same can be done for other insert classes. --kasal, 16nov03. diff --git a/doc/uiserver.texi b/doc/uiserver.texi --- a/doc/uiserver.texi +++ b/doc/uiserver.texi @@ -484,7 +484,7 @@ @code{FILE} commands. Afterwards, the actual operation is requested: @deffn Command CHECKSUM_CREATE_FILES --nohup -Request that checksums are created for the files specifed by +Request that checksums are created for the files specified by @code{FILE}. The choice of checksum algorithm and the destination storage and format for the created checksums depend on the preferences of the user and the functionality provided by the UI server. For @@ -499,7 +499,7 @@ @deffn Command CHECKSUM_VERIFY_FILES --nohup -Request that checksums are created for the files specifed by +Request that checksums are created for the files specified by @code{FILE} and verified against previously created and stored checksums. The choice of checksum algorithm and the source storage and format for previously created checksums depend on the preferences diff --git a/lang/cpp/README b/lang/cpp/README --- a/lang/cpp/README +++ b/lang/cpp/README @@ -62,7 +62,7 @@ Data data; /* Start the edit on some key previously obtained. */ Error e = ctx->edit(key, std::unique_ptr(ei), data); - /* Errors provide boolean comparision */ + /* Errors provide boolean comparison */ if (!e) ... /* Delete the context */ diff --git a/lang/cpp/src/swdbresult.h b/lang/cpp/src/swdbresult.h --- a/lang/cpp/src/swdbresult.h +++ b/lang/cpp/src/swdbresult.h @@ -86,7 +86,7 @@ /* The time the online info was retrieved. */ unsigned long retrieved() const; - /* This bit is set if an error occured or some of the information + /* This bit is set if an error occurred or some of the information * in this structure may not be set. */ bool warning() const; diff --git a/lang/python/examples/exportimport.py b/lang/python/examples/exportimport.py --- a/lang/python/examples/exportimport.py +++ b/lang/python/examples/exportimport.py @@ -45,7 +45,7 @@ # of them. with gpg.Context() as c: # Note: We must not modify the key store during iteration, - # therfore, we explicitly make a list. + # therefore, we explicitly make a list. keys = list(c.keylist(user)) for k in keys: diff --git a/lang/qt/README b/lang/qt/README --- a/lang/qt/README +++ b/lang/qt/README @@ -38,7 +38,7 @@ result handlers. The result signal provides a tuple of objects with the -appropiate result information for this job. For historic +appropriate result information for this job. For historic reasons each result signal also includes an AuditLog and an AuditLog Error. These are only useful for S/MIME signature validation but are part of other jobs @@ -72,7 +72,7 @@ job->start(keys, inptr, outptr, Context::AlwaysTrust); /* Do not delete the job as it is autodeleted. */ -Syncronus usage: +Synchronous usage: /* Create a job */ KeyListJob *listjob = openpgp()->keyListJob(false, false, false); diff --git a/src/debug.c b/src/debug.c --- a/src/debug.c +++ b/src/debug.c @@ -222,7 +222,7 @@ -/* This should be called as soon as the locks are intialized. It is +/* This should be called as soon as the locks are initialized. It is required so that the assuan logging gets conncted to the gpgme log stream as early as possible. */ void diff --git a/src/edit.c b/src/edit.c --- a/src/edit.c +++ b/src/edit.c @@ -194,7 +194,7 @@ -/* The deprectated interface. */ +/* The deprecated interface. */ static gpgme_error_t edit_start (gpgme_ctx_t ctx, int synchronous, int type, gpgme_key_t key, gpgme_edit_cb_t fnc, void *fnc_value, gpgme_data_t out) diff --git a/src/genkey.c b/src/genkey.c --- a/src/genkey.c +++ b/src/genkey.c @@ -650,7 +650,7 @@ } -/* See set_uid_flag. Thsi is the synchronous variant. */ +/* See set_uid_flag. This is the synchronous variant. */ gpgme_error_t gpgme_op_set_uid_flag (gpgme_ctx_t ctx, gpgme_key_t key, const char *userid, diff --git a/src/gpgme.h.in b/src/gpgme.h.in --- a/src/gpgme.h.in +++ b/src/gpgme.h.in @@ -697,7 +697,7 @@ /* The malloced TOFU information or NULL. */ gpgme_tofu_info_t tofu; - /* Time of the last refresh of thsi user id. 0 if unknown. */ + /* Time of the last refresh of this user id. 0 if unknown. */ unsigned long last_update; }; typedef struct _gpgme_user_id *gpgme_user_id_t; @@ -2245,7 +2245,7 @@ /* The time the online info was retrieved. */ unsigned long retrieved; - /* This bit is set if an error occured or some of the information + /* This bit is set if an error occurred or some of the information * in this structure may not be set. */ unsigned int warning : 1; diff --git a/src/parsetlv.h b/src/parsetlv.h --- a/src/parsetlv.h +++ b/src/parsetlv.h @@ -1,4 +1,4 @@ -/* parsetlv.h - TLV functions defintions +/* parsetlv.h - TLV functions definitions * Copyright (C) 2012 g10 Code GmbH * * This file is free software; you can redistribute it and/or modify diff --git a/src/trustlist.c b/src/trustlist.c --- a/src/trustlist.c +++ b/src/trustlist.c @@ -66,7 +66,7 @@ K for a key The RECNO is either the one of the dir record or the one of the uid record. OT is the the usual trust letter and only availabel on K - lines. VAL is the calcualted validity MC is the marginal trust + lines. VAL is the calculated validity MC is the marginal trust counter and only available on U lines CC is the same for the complete count NAME ist the username and only printed on U lines. */ diff --git a/tests/ChangeLog-2011 b/tests/ChangeLog-2011 --- a/tests/ChangeLog-2011 +++ b/tests/ChangeLog-2011 @@ -237,7 +237,7 @@ * gpg/t-keylist.c: Reordered list to match new demo keyring. Add arg for number of subkeys and for extra checking function. (main): Enhanced a few error outputs. Changed subkey - counting. Call extra checking fucntion. + counting. Call extra checking function. (check_whisky): New. 2005-10-07 Marcus Brinkmann