typos in manual
Hello there,
The patch below fixes some typos in the mutt documentation and some
en_UK to en_US spelling for consistency.
Cheers,
Ralf
* doc/PGP-Notes.txt, doc/devel-notes.txt, doc/manual.xml.head,
doc/smime-notes.txt: Fix some typos.
Index: doc/PGP-Notes.txt
===================================================================
RCS file: /cvsroots/mutt/doc/PGP-Notes.txt,v
retrieving revision 3.0
diff -u -r3.0 PGP-Notes.txt
--- doc/PGP-Notes.txt 24 Jan 2002 13:35:07 -0000 3.0
+++ doc/PGP-Notes.txt 10 Aug 2006 21:10:29 -0000
@@ -116,7 +116,7 @@
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 @@
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.
Index: doc/devel-notes.txt
===================================================================
RCS file: /cvsroots/mutt/doc/devel-notes.txt,v
retrieving revision 3.5
diff -u -r3.5 devel-notes.txt
--- doc/devel-notes.txt 8 Aug 2006 23:04:01 -0000 3.5
+++ doc/devel-notes.txt 10 Aug 2006 21:10:29 -0000
@@ -157,7 +157,7 @@
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.
Index: doc/manual.xml.head
===================================================================
RCS file: /cvsroots/mutt/doc/manual.xml.head,v
retrieving revision 3.24
diff -u -r3.24 manual.xml.head
--- doc/manual.xml.head 3 Aug 2006 23:46:31 -0000 3.24
+++ doc/manual.xml.head 10 Aug 2006 21:10:31 -0000
@@ -319,7 +319,7 @@
<para>
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.
</para>
@@ -466,7 +466,7 @@
<term>S</term>
<listitem>
<para>
-message is signed, and the signature is succesfully verified
+message is signed, and the signature is successfully verified
</para>
</listitem>
</varlistentry>
@@ -850,7 +850,7 @@
<para>
Asks for an external Unix command and pipes the current or
tagged message(s) to it. The variables <link
linkend="pipe-decode">$pipe_decode</link>, <link
linkend="pipe-split">$pipe_split</link>,
-<link linkend="pipe-sep">$pipe_sep</link> and <link
linkend="wait-key">$wait_key</link> control the exact behaviour
of this function.
+<link linkend="pipe-sep">$pipe_sep</link> and <link
linkend="wait-key">$wait_key</link> control the exact behavior of
this function.
</para>
<para>
@@ -923,7 +923,7 @@
<para>
<table>
-<title>Most commom mail sending keys</title>
+<title>Most common mail sending keys</title>
<tgroup cols="3">
<thead>
<row><entry>Key</entry><entry>Function</entry><entry>Description</entry></row>
@@ -1816,7 +1816,7 @@
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).
</para>
<para>
@@ -2277,7 +2277,7 @@
<para>
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 <emphasis>mutt-users@xxxxxxxx</emphasis>. So, to tell Mutt
+addressed to <emphasis>mutt-users@xxxxxxxx</emphasis>. 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 @@
<emphasis role="bold">to</emphasis>, instead of the message you are
<emphasis>sending</emphasis>. <literal>send-hook</literal> is
matched against all messages, both <emphasis>new</emphasis> and
<emphasis>replies</emphasis>. <emphasis role="bold">Note:</emphasis>
<literal>reply-hook</literal>s are matched <emphasis
role="bold">before</emphasis> the <literal>send-hook</literal>, <emphasis
role="bold">regardless</emphasis>
-of the order specified in the users's configuration file.
+of the order specified in the user's configuration file.
</para>
<para>
@@ -2798,7 +2798,7 @@
<para>
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 <emphasis>format</emphasis> strings, you'll get only the last one to
match.
</para>
@@ -2819,7 +2819,7 @@
<para>
Generally, when you sort by spam tag, mutt will sort
<emphasis>lexically</emphasis> --
-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
<literal>sort -n</literal>.) A message with no spam attributes at all -- that
is, one
@@ -2903,7 +2903,7 @@
<emphasis>quadoption</emphasis> variables are used to control whether or not
to be prompted
for certain actions, or to specify a default action. A value of
<emphasis>yes</emphasis>
will cause the action to be carried out automatically as if you had answered
-yes to the question. Similarly, a value of <emphasis>no</emphasis> will cause
the the
+yes to the question. Similarly, a value of <emphasis>no</emphasis> will cause
the
action to be carried out as if you had answered ``no.'' A value of
<emphasis>ask-yes</emphasis> will cause a prompt with a default answer of
``yes'' and
<emphasis>ask-no</emphasis> will provide a default answer of ``no.''
@@ -3963,7 +3963,7 @@
exactly the same way as it would when <emphasis>limiting</emphasis> or
<emphasis>searching</emphasis> 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.).
</para>
<para>
@@ -4281,7 +4281,7 @@
<para>
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.
</para>
@@ -4300,7 +4300,7 @@
</para>
<para>
-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.
</para>
@@ -4860,7 +4860,7 @@
<para>
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
<literal>toggle-unlink</literal> command (default: u). The next field is the
MIME
content-type, and can be changed with the <literal>edit-type</literal> command
(default: ˆT). The next field is the encoding for the attachment,
@@ -4911,11 +4911,11 @@
command from the compose menu (default: ˆT). The MIME type is actually a
major mime type followed by the sub-type, separated by a '/'. 6 major
types: application, text, image, video, audio, and model have been approved
-after various internet discussions. Mutt recognises all of these if the
-appropriate entry is found in the mime.types file. It also recognises other
+after various internet discussions. Mutt recognizes all of these if the
+appropriate entry is found in the mime.types file. It also recognizes other
major mime types, such as the chemical type that is widely used in the
-molecular modelling community to pass molecular data in various forms to
-various molecular viewers. Non-recognised mime types should only be used
+molecular modeling community to pass molecular data in various forms to
+various molecular viewers. Non-recognized mime types should only be used
if the recipient of the message is likely to be expecting such attachments.
</para>
@@ -4989,7 +4989,7 @@
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 @@
<title>Secure use of mailcap</title>
<para>
-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 <link
linkend="mailcap-sanitize">$mailcap_sanitize</link> variable.
@@ -5073,7 +5073,7 @@
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.
</para>
@@ -5672,7 +5672,7 @@
<row><entry>-b</entry><entry>specify a blind carbon-copy (BCC)
address</entry></row>
<row><entry>-c</entry><entry>specify a carbon-copy (Cc) address</entry></row>
<row><entry>-D</entry><entry>print the value of all mutt variables to
stdout</entry></row>
-<row><entry>-e</entry><entry>specify a config command to be run after
initilization files are read</entry></row>
+<row><entry>-e</entry><entry>specify a config command to be run after
initialization files are read</entry></row>
<row><entry>-f</entry><entry>specify a mailbox to load</entry></row>
<row><entry>-F</entry><entry>specify an alternate file to read initialization
commands</entry></row>
<row><entry>-h</entry><entry>print help on command line options</entry></row>
Index: doc/smime-notes.txt
===================================================================
RCS file: /cvsroots/mutt/doc/smime-notes.txt,v
retrieving revision 3.5
diff -u -r3.5 smime-notes.txt
--- doc/smime-notes.txt 13 Mar 2002 12:31:02 -0000 3.5
+++ doc/smime-notes.txt 10 Aug 2006 21:10:31 -0000
@@ -53,7 +53,7 @@
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 @@
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)