mutt stable branch with some hacks

Fix some typos; regularise spelling from UK to US forms.

+27 -27
+2 -2
doc/PGP-Notes.txt
··· 116 116 There's a new answer, though: Set the $pgp_create_traditional 117 117 configuration variable (it's a quad-option) to something different 118 118 from "no" (that's the default). Mutt will then try to use 119 - application/pgp whereever it makes sense. In particular, it does 119 + application/pgp wherever it makes sense. In particular, it does 120 120 not make any sense with multiparts, or non-ASCII or non-text bodies. 121 121 In all other cases, PGP/MIME is used unconditionally. 122 122 ··· 144 144 MTA." 145 145 146 146 The author of the Courier MTA believes that the standard specifying 147 - multipart/signed is broken. For that reason, he has choosen to 147 + multipart/signed is broken. For that reason, he has chosen to 148 148 implement his MTA in a way which does not assure that 149 149 multipart/signed body parts are left untouched. 150 150
+1 -1
doc/devel-notes.txt
··· 157 157 in ELM and PINE is the tremendous duplication of code... 158 158 Help keep Mutt small! 159 159 160 - - when adding new options, make the old behaviour the 160 + - when adding new options, make the old behavior the 161 161 default. 162 162 163 163 - try to keep mutt as portable as possible.
+22 -22
doc/manual.xml.head
··· 319 319 320 320 <para> 321 321 Mutt automatically filters out repeated items from the history. It 322 - also mimics the behaviour of some shells by ignoring items starting 322 + also mimics the behavior of some shells by ignoring items starting 323 323 with a space. 324 324 </para> 325 325 ··· 466 466 <term>S</term> 467 467 <listitem> 468 468 <para> 469 - message is signed, and the signature is succesfully verified 469 + message is signed, and the signature is successfully verified 470 470 </para> 471 471 </listitem> 472 472 </varlistentry> ··· 850 850 <para> 851 851 Asks for an external Unix command and pipes the current or 852 852 tagged message(s) to it. The variables <link linkend="pipe-decode">&dollar;pipe&lowbar;decode</link>, <link linkend="pipe-split">&dollar;pipe&lowbar;split</link>, 853 - <link linkend="pipe-sep">&dollar;pipe&lowbar;sep</link> and <link linkend="wait-key">&dollar;wait&lowbar;key</link> control the exact behaviour of this function. 853 + <link linkend="pipe-sep">&dollar;pipe&lowbar;sep</link> and <link linkend="wait-key">&dollar;wait&lowbar;key</link> control the exact behavior of this function. 854 854 </para> 855 855 856 856 <para> ··· 923 923 <para> 924 924 925 925 <table> 926 - <title>Most commom mail sending keys</title> 926 + <title>Most common mail sending keys</title> 927 927 <tgroup cols="3"> 928 928 <thead> 929 929 <row><entry>Key</entry><entry>Function</entry><entry>Description</entry></row> ··· 1816 1816 work regardless of the current key bindings, so they are not dependent on 1817 1817 the user having particular key definitions. This makes them more robust 1818 1818 and portable, and also facilitates defining of macros in files used by more 1819 - than one user (eg. the system Muttrc). 1819 + than one user (e.g., the system Muttrc). 1820 1820 </para> 1821 1821 1822 1822 <para> ··· 2277 2277 <para> 2278 2278 Specify as much of the address as you need to to remove ambiguity. For 2279 2279 example, if you've subscribed to the Mutt mailing list, you will receive mail 2280 - addresssed to <emphasis>mutt-users@mutt.org</emphasis>. So, to tell Mutt 2280 + addressed to <emphasis>mutt-users@mutt.org</emphasis>. So, to tell Mutt 2281 2281 that this is a mailing list, you could add ``lists mutt-users@'' to your 2282 2282 initialization file. To tell mutt that you are subscribed to it, 2283 2283 add ``subscribe mutt-users'' to your initialization file instead. ··· 2564 2564 <emphasis role="bold">to</emphasis>, instead of the message you are <emphasis>sending</emphasis>. <literal>send-hook</literal> is 2565 2565 matched against all messages, both <emphasis>new</emphasis> and <emphasis>replies</emphasis>. <emphasis role="bold">Note:</emphasis> 2566 2566 <literal>reply-hook</literal>s are matched <emphasis role="bold">before</emphasis> the <literal>send-hook</literal>, <emphasis role="bold">regardless</emphasis> 2567 - of the order specified in the users's configuration file. 2567 + of the order specified in the user's configuration file. 2568 2568 </para> 2569 2569 2570 2570 <para> ··· 2798 2798 2799 2799 <para> 2800 2800 If the &dollar;spam&lowbar;separator variable is unset, then each 2801 - spam pattern match supercedes the previous one. Instead of getting 2801 + spam pattern match supersedes the previous one. Instead of getting 2802 2802 joined <emphasis>format</emphasis> strings, you'll get only the last one to match. 2803 2803 </para> 2804 2804 ··· 2819 2819 2820 2820 <para> 2821 2821 Generally, when you sort by spam tag, mutt will sort <emphasis>lexically</emphasis> -- 2822 - that is, by ordering strings alphnumerically. However, if a spam tag 2822 + that is, by ordering strings alphanumerically. However, if a spam tag 2823 2823 begins with a number, mutt will sort numerically first, and lexically 2824 2824 only when two numbers are equal in value. (This is like UNIX's 2825 2825 <literal>sort -n</literal>.) A message with no spam attributes at all -- that is, one ··· 2903 2903 <emphasis>quadoption</emphasis> variables are used to control whether or not to be prompted 2904 2904 for certain actions, or to specify a default action. A value of <emphasis>yes</emphasis> 2905 2905 will cause the action to be carried out automatically as if you had answered 2906 - yes to the question. Similarly, a value of <emphasis>no</emphasis> will cause the the 2906 + yes to the question. Similarly, a value of <emphasis>no</emphasis> will cause the 2907 2907 action to be carried out as if you had answered ``no.'' A value of 2908 2908 <emphasis>ask-yes</emphasis> will cause a prompt with a default answer of ``yes'' and 2909 2909 <emphasis>ask-no</emphasis> will provide a default answer of ``no.'' ··· 3963 3963 exactly the same way as it would when <emphasis>limiting</emphasis> or 3964 3964 <emphasis>searching</emphasis> the mailbox, except that you are restricted to those 3965 3965 operators which match information mutt extracts from the header of 3966 - the message (i.e. from, to, cc, date, subject, etc.). 3966 + the message (i.e., from, to, cc, date, subject, etc.). 3967 3967 </para> 3968 3968 3969 3969 <para> ··· 4281 4281 4282 4282 <para> 4283 4283 Mutt has the ability to dynamically restructure threads that are broken 4284 - either by misconfigured software or bad behaviour from some 4284 + either by misconfigured software or bad behavior from some 4285 4285 correspondents. This allows to clean your mailboxes formats) from these 4286 4286 annoyances which make it hard to follow a discussion. 4287 4287 </para> ··· 4300 4300 </para> 4301 4301 4302 4302 <para> 4303 - You can also connect multiple childs at once, tagging them and using the 4303 + You can also connect multiple children at once, tagging them and using the 4304 4304 tag-prefix command (';') or the auto&lowbar;tag option. 4305 4305 </para> 4306 4306 ··· 4860 4860 4861 4861 <para> 4862 4862 The '-' denotes that Mutt will delete the file after sending (or 4863 - postponing, or cancelling) the message. It can be toggled with the 4863 + postponing, or canceling) the message. It can be toggled with the 4864 4864 <literal>toggle-unlink</literal> command (default: u). The next field is the MIME 4865 4865 content-type, and can be changed with the <literal>edit-type</literal> command 4866 4866 (default: &circ;T). The next field is the encoding for the attachment, ··· 4911 4911 command from the compose menu (default: &circ;T). The MIME type is actually a 4912 4912 major mime type followed by the sub-type, separated by a '/'. 6 major 4913 4913 types: application, text, image, video, audio, and model have been approved 4914 - after various internet discussions. Mutt recognises all of these if the 4915 - appropriate entry is found in the mime.types file. It also recognises other 4914 + after various internet discussions. Mutt recognizes all of these if the 4915 + appropriate entry is found in the mime.types file. It also recognizes other 4916 4916 major mime types, such as the chemical type that is widely used in the 4917 - molecular modelling community to pass molecular data in various forms to 4918 - various molecular viewers. Non-recognised mime types should only be used 4917 + molecular modeling community to pass molecular data in various forms to 4918 + various molecular viewers. Non-recognized mime types should only be used 4919 4919 if the recipient of the message is likely to be expecting such attachments. 4920 4920 </para> 4921 4921 ··· 4989 4989 The view command is a Unix command for viewing the type specified. There 4990 4990 are two different types of commands supported. The default is to send 4991 4991 the body of the MIME message to the command on stdin. You can change 4992 - this behaviour by using &percnt;s as a parameter to your view command. 4992 + this behavior by using &percnt;s as a parameter to your view command. 4993 4993 This will cause Mutt to save the body of the MIME message to a temporary 4994 4994 file, and then call the view command with the &percnt;s replaced by 4995 4995 the name of the temporary file. In both cases, Mutt will turn over the ··· 5055 5055 <title>Secure use of mailcap</title> 5056 5056 5057 5057 <para> 5058 - The interpretion of shell meta-characters embedded in MIME parameters 5058 + The interpretation of shell meta-characters embedded in MIME parameters 5059 5059 can lead to security problems in general. Mutt tries to quote parameters 5060 5060 in expansion of &percnt;s syntaxes properly, and avoids risky characters by 5061 5061 substituting them, see the <link linkend="mailcap-sanitize">&dollar;mailcap&lowbar;sanitize</link> variable. ··· 5073 5073 you, the right way, as should any other program which interprets 5074 5074 mailcap. Don't put them into backtick expansions. Be highly careful 5075 5075 with eval statements, and avoid them if possible at all. Trying to fix 5076 - broken behaviour with quotes introduces new leaks - there is no 5076 + broken behavior with quotes introduces new leaks - there is no 5077 5077 alternative to correct quoting in the first place. 5078 5078 </para> 5079 5079 ··· 5672 5672 <row><entry>-b</entry><entry>specify a blind carbon-copy (BCC) address</entry></row> 5673 5673 <row><entry>-c</entry><entry>specify a carbon-copy (Cc) address</entry></row> 5674 5674 <row><entry>-D</entry><entry>print the value of all mutt variables to stdout</entry></row> 5675 - <row><entry>-e</entry><entry>specify a config command to be run after initilization files are read</entry></row> 5675 + <row><entry>-e</entry><entry>specify a config command to be run after initialization files are read</entry></row> 5676 5676 <row><entry>-f</entry><entry>specify a mailbox to load</entry></row> 5677 5677 <row><entry>-F</entry><entry>specify an alternate file to read initialization commands</entry></row> 5678 5678 <row><entry>-h</entry><entry>print help on command line options</entry></row>
+2 -2
doc/smime-notes.txt
··· 53 53 Key management is done in a way similar to OpenSSL's CA directory. Private 54 54 keys and certificates are stored in different directories, as OpenSSL 55 55 expects either to be supplied in a (distinct) file. Each directory contains 56 - an unsorted file named '.index' wherin each line has several fields: 56 + an unsorted file named '.index' wherein each line has several fields: 57 57 mailbox, keyid, label, id of the intermediate certificate and keyflags. 58 58 59 59 * Keyid is a hashvalue derived from the subject field of a certificate ··· 88 88 The certificate and key directories specified in muttrc have to exist. Mutt 89 89 will not create them. If you wish to sign messages yourself, note that this 90 90 mutt does not address any PKCS10 or PKCS12 issues (yet?); that is, you have 91 - to get a valid certficate outside of mutt. (See above) 91 + to get a valid certificate outside of mutt. (See above) 92 92 93 93 94 94