From: Ralf Wildenhues Date: Thu, 10 Aug 2006 21:47:44 +0000 (+0000) Subject: Fix some typos; regularise spelling from UK to US forms. X-Git-Tag: mutt-1-5-13-rel~12 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=36a9e629ee563da093f725783c310bc50e3b97c1;p=mutt Fix some typos; regularise spelling from UK to US forms. --- diff --git a/doc/PGP-Notes.txt b/doc/PGP-Notes.txt index a817d246..0f5cec96 100644 --- a/doc/PGP-Notes.txt +++ b/doc/PGP-Notes.txt @@ -116,7 +116,7 @@ The old answer to this question used to be this: There's a new answer, though: Set the $pgp_create_traditional configuration variable (it's a quad-option) to something different from "no" (that's the default). Mutt will then try to use -application/pgp whereever it makes sense. In particular, it does +application/pgp wherever it makes sense. In particular, it does not make any sense with multiparts, or non-ASCII or non-text bodies. In all other cases, PGP/MIME is used unconditionally. @@ -144,7 +144,7 @@ Q: "My PGP signatures are being invalidated. BTW, I'm using Courier MTA." The author of the Courier MTA believes that the standard specifying -multipart/signed is broken. For that reason, he has choosen to +multipart/signed is broken. For that reason, he has chosen to implement his MTA in a way which does not assure that multipart/signed body parts are left untouched. diff --git a/doc/devel-notes.txt b/doc/devel-notes.txt index 838ec990..c9d1e81a 100644 --- a/doc/devel-notes.txt +++ b/doc/devel-notes.txt @@ -157,7 +157,7 @@ Style Guide in ELM and PINE is the tremendous duplication of code... Help keep Mutt small! -- when adding new options, make the old behaviour the +- when adding new options, make the old behavior the default. - try to keep mutt as portable as possible. diff --git a/doc/manual.xml.head b/doc/manual.xml.head index 3640d600..23dcd139 100644 --- a/doc/manual.xml.head +++ b/doc/manual.xml.head @@ -319,7 +319,7 @@ following categories: Mutt automatically filters out repeated items from the history. It -also mimics the behaviour of some shells by ignoring items starting +also mimics the behavior of some shells by ignoring items starting with a space. @@ -466,7 +466,7 @@ message has been replied to S -message is signed, and the signature is succesfully verified +message is signed, and the signature is successfully verified @@ -850,7 +850,7 @@ the message you are replying to. Asks for an external Unix command and pipes the current or tagged message(s) to it. The variables $pipe_decode, $pipe_split, -$pipe_sep and $wait_key control the exact behaviour of this function. +$pipe_sep and $wait_key control the exact behavior of this function. @@ -923,7 +923,7 @@ messages. -Most commom mail sending keys +Most common mail sending keys KeyFunctionDescription @@ -1816,7 +1816,7 @@ The advantage with using function names directly is that the macros will work regardless of the current key bindings, so they are not dependent on the user having particular key definitions. This makes them more robust and portable, and also facilitates defining of macros in files used by more -than one user (eg. the system Muttrc). +than one user (e.g., the system Muttrc). @@ -2277,7 +2277,7 @@ give a portion of the list's e-mail address. Specify as much of the address as you need to to remove ambiguity. For example, if you've subscribed to the Mutt mailing list, you will receive mail -addresssed to mutt-users@mutt.org. So, to tell Mutt +addressed to mutt-users@mutt.org. So, to tell Mutt that this is a mailing list, you could add ``lists mutt-users@'' to your initialization file. To tell mutt that you are subscribed to it, add ``subscribe mutt-users'' to your initialization file instead. @@ -2564,7 +2564,7 @@ matches recipients of the message. to, instead of the message you are sending. send-hook is matched against all messages, both new and replies. Note: reply-hooks are matched before the send-hook, regardless -of the order specified in the users's configuration file. +of the order specified in the user's configuration file. @@ -2798,7 +2798,7 @@ DCC report indicate the checksum used -- in this case, ``Fuz2''.) If the $spam_separator variable is unset, then each -spam pattern match supercedes the previous one. Instead of getting +spam pattern match supersedes the previous one. Instead of getting joined format strings, you'll get only the last one to match. @@ -2819,7 +2819,7 @@ to sorting. Generally, when you sort by spam tag, mutt will sort lexically -- -that is, by ordering strings alphnumerically. However, if a spam tag +that is, by ordering strings alphanumerically. However, if a spam tag begins with a number, mutt will sort numerically first, and lexically only when two numbers are equal in value. (This is like UNIX's sort -n.) A message with no spam attributes at all -- that is, one @@ -2903,7 +2903,7 @@ newline and tab, respectively. quadoption variables are used to control whether or not to be prompted for certain actions, or to specify a default action. A value of yes will cause the action to be carried out automatically as if you had answered -yes to the question. Similarly, a value of no will cause the the +yes to the question. Similarly, a value of no will cause the action to be carried out as if you had answered ``no.'' A value of ask-yes will cause a prompt with a default answer of ``yes'' and ask-no will provide a default answer of ``no.'' @@ -3963,7 +3963,7 @@ language for matching messages in hook commands. This works in exactly the same way as it would when limiting or searching the mailbox, except that you are restricted to those operators which match information mutt extracts from the header of -the message (i.e. from, to, cc, date, subject, etc.). +the message (i.e., from, to, cc, date, subject, etc.). @@ -4281,7 +4281,7 @@ uninteresting threads and quickly find topics of value. Mutt has the ability to dynamically restructure threads that are broken -either by misconfigured software or bad behaviour from some +either by misconfigured software or bad behavior from some correspondents. This allows to clean your mailboxes formats) from these annoyances which make it hard to follow a discussion. @@ -4300,7 +4300,7 @@ reply will then be connected to this "parent" message. -You can also connect multiple childs at once, tagging them and using the +You can also connect multiple children at once, tagging them and using the tag-prefix command (';') or the auto_tag option. @@ -4860,7 +4860,7 @@ Attachments appear as follows: The '-' denotes that Mutt will delete the file after sending (or -postponing, or cancelling) the message. It can be toggled with the +postponing, or canceling) the message. It can be toggled with the toggle-unlink command (default: u). The next field is the MIME content-type, and can be changed with the edit-type command (default: ˆT). The next field is the encoding for the attachment, @@ -4911,11 +4911,11 @@ type that Mutt assigns to an attachment by using the edit-type @@ -4989,7 +4989,7 @@ respectively. The view command is a Unix command for viewing the type specified. There are two different types of commands supported. The default is to send the body of the MIME message to the command on stdin. You can change -this behaviour by using %s as a parameter to your view command. +this behavior by using %s as a parameter to your view command. This will cause Mutt to save the body of the MIME message to a temporary file, and then call the view command with the %s replaced by the name of the temporary file. In both cases, Mutt will turn over the @@ -5055,7 +5055,7 @@ This is the simplest form of a mailcap file. Secure use of mailcap -The interpretion of shell meta-characters embedded in MIME parameters +The interpretation of shell meta-characters embedded in MIME parameters can lead to security problems in general. Mutt tries to quote parameters in expansion of %s syntaxes properly, and avoids risky characters by substituting them, see the $mailcap_sanitize variable. @@ -5073,7 +5073,7 @@ Don't quote them with single or double quotes. Mutt does this for you, the right way, as should any other program which interprets mailcap. Don't put them into backtick expansions. Be highly careful with eval statements, and avoid them if possible at all. Trying to fix -broken behaviour with quotes introduces new leaks - there is no +broken behavior with quotes introduces new leaks - there is no alternative to correct quoting in the first place. @@ -5672,7 +5672,7 @@ to send messages from the command line as well. -bspecify a blind carbon-copy (BCC) address -cspecify a carbon-copy (Cc) address -Dprint the value of all mutt variables to stdout --especify a config command to be run after initilization files are read +-especify a config command to be run after initialization files are read -fspecify a mailbox to load -Fspecify an alternate file to read initialization commands -hprint help on command line options diff --git a/doc/smime-notes.txt b/doc/smime-notes.txt index 1d651ea9..15ab8492 100644 --- a/doc/smime-notes.txt +++ b/doc/smime-notes.txt @@ -53,7 +53,7 @@ Other notes Key management is done in a way similar to OpenSSL's CA directory. Private keys and certificates are stored in different directories, as OpenSSL expects either to be supplied in a (distinct) file. Each directory contains -an unsorted file named '.index' wherin each line has several fields: +an unsorted file named '.index' wherein each line has several fields: mailbox, keyid, label, id of the intermediate certificate and keyflags. * Keyid is a hashvalue derived from the subject field of a certificate @@ -88,7 +88,7 @@ and asked to select one of those. The certificate and key directories specified in muttrc have to exist. Mutt will not create them. If you wish to sign messages yourself, note that this mutt does not address any PKCS10 or PKCS12 issues (yet?); that is, you have -to get a valid certficate outside of mutt. (See above) +to get a valid certificate outside of mutt. (See above)