From ba4333b5854d2caf6b486372b060376990fe089e Mon Sep 17 00:00:00 2001 From: pdmef Date: Sat, 13 Aug 2005 10:10:07 +0000 Subject: [PATCH] Rocco Rutte: - rename $smtp_auth_(username|password) to $smtp_(user|pass) (synonyms kept) to improve consistency - add some SMTP documentation to manual git-svn-id: svn://svn.berlios.de/mutt-ng/trunk@394 e385b8ad-14ed-0310-8656-cc95a2468c6d --- UPGRADING | 6 + contrib/update-config.pl | 5 +- doc/manual.sgml.head | 26 ++++ doc/manual.sgml.tail | 1 + doc/manual.txt | 324 ++++++++++++++++++++------------------- init.h | 6 +- 6 files changed, 211 insertions(+), 157 deletions(-) diff --git a/UPGRADING b/UPGRADING index 0e22ced..c1e88ab 100644 --- a/UPGRADING +++ b/UPGRADING @@ -10,6 +10,12 @@ This document is not the place for verbose documentation; it only offers the necessary keywords to look them up in the manual, ChangeLog or other sources of information. +2005-08-13: + + To improve consistency, the following variables were renamed and + synonyms kept: $smtp_auth_username to $smtp_user and + $smtp_auth_password to $smtp_pass. + 2005-08-11: The $smtp_use_tls option has been added. diff --git a/contrib/update-config.pl b/contrib/update-config.pl index da404c9..2a6ae97 100755 --- a/contrib/update-config.pl +++ b/contrib/update-config.pl @@ -47,7 +47,10 @@ my %opts = ( "save_unsubscribed" => "nntp_save_unsubscribed", "show_new_news" => "nntp_show_new_news", "show_only_unread" => "nntp_show_only_unread", - "x_comment_to" => "nntp_x_comment_to" + "x_comment_to" => "nntp_x_comment_to", + # libesmtp + "smtp_auth_username" => "smtp_user", + "smtp_auth_password" => "smtp_pass" ); if (@ARGV == 0) { diff --git a/doc/manual.sgml.head b/doc/manual.sgml.head index 7bbf027..da82317 100644 --- a/doc/manual.sgml.head +++ b/doc/manual.sgml.head @@ -3512,6 +3512,32 @@ score !~* =42 +SMTP Support (OPTIONAL) + +

Mutt-ng can be built using a library called ``libESMTP'' which +provides SMTP functionality. When muttng -v contains ++USE_LIBESMTP, this will be or is the case already. + +

To enable sending mail directly via SMTP without an MTA such as +Postfix or SSMTP and the like, simply set the variable pointing to your SMTP server. + +

Authentication mechanisms are available via the and variables. + +

Transport Encryption via the StartTLS command is also available. For +this to work, first of all Mutt-ng must be built with SSL or GNUTLS. +Secondly, the variable must be either set +to ``enabled'' or ``required.'' In both cases, StartTLS will be used if +the server supports it: for the second case, the connection will fail if +it doesn't while switching back to unencrypted communication for the +first one. + + + Managing multiple IMAP/POP/NNTP accounts (OPTIONAL)

diff --git a/doc/manual.sgml.tail b/doc/manual.sgml.tail index c9dd0bf..a3ab1b4 100644 --- a/doc/manual.sgml.tail +++ b/doc/manual.sgml.tail @@ -392,6 +392,7 @@ Rocco Rutte Iain Lea Andreas Kneib Carsten Schoelzki diff --git a/doc/manual.txt b/doc/manual.txt index 0b480d3..2482bb2 100644 --- a/doc/manual.txt +++ b/doc/manual.txt @@ -4,7 +4,7 @@ by Andreas Krennmair and others originally based on _m_u_t_t by Michael Elkins and others - version devel-r388 + version devel-r394 AAbbssttrraacctt @@ -570,7 +570,7 @@ This command is used to temporarily edit an attachment's content type to fix, for instance, bogus character set parameters. When invoked from the index or from the pager, you'll have the opportunity to edit the top-level attachment's - content type. On the _a_t_t_a_c_h_m_e_n_t _m_e_n_u (section 5.1.2 , page 66), you can + content type. On the _a_t_t_a_c_h_m_e_n_t _m_e_n_u (section 5.1.2 , page 67), you can change any attachment's content type. These changes are not persistent, and get lost upon changing folders. @@ -3166,10 +3166,33 @@ from people who they have defined an alias for so that those 2 groups of messages are excluded from the strict rules. - _4_._1_6 _M_a_n_a_g_i_n_g _m_u_l_t_i_p_l_e _I_M_A_P_/_P_O_P_/_N_N_T_P _a_c_c_o_u_n_t_s _(_O_P_T_I_O_N_A_L_) + _4_._1_6 _S_M_T_P _S_u_p_p_o_r_t _(_O_P_T_I_O_N_A_L_) + + Mutt-ng can be built using a library called ``libESMTP'' which provides SMTP + functionality. When configure was called with --with-libesmtp or the output + muttng -v contains +USE_LIBESMTP, this will be or is the case already. + + To enable sending mail directly via SMTP without an MTA such as Postfix or + SSMTP and the like, simply set the _$_s_m_t_p___h_o_s_t (section 6.4.285 , page 148) + variable pointing to your SMTP server. + + Authentication mechanisms are available via the _$_s_m_t_p___u_s_e_r (section 6.4.289 , + page 149) and _$_s_m_t_p___p_a_s_s (section 6.4.286 , page 148) variables. + + Transport Encryption via the StartTLS command is also available. For this to + work, first of all Mutt-ng must be built with SSL or GNUTLS. Secondly, the + _$_s_m_t_p___u_s_e___t_l_s (section 6.4.288 , page 149) variable must be either set to + ``enabled'' or ``required.'' In both cases, StartTLS will be used if the server + supports it: for the second case, the connection will fail if it doesn't while + switching back to unencrypted communication for the first one. + + _4_._1_7 _M_a_n_a_g_i_n_g _m_u_l_t_i_p_l_e _I_M_A_P_/_P_O_P_/_N_N_T_P _a_c_c_o_u_n_t_s _(_O_P_T_I_O_N_A_L_) If you happen to have accounts on multiple IMAP and/or POP servers, you may find managing all the authentication settings inconvenient and error-prone. + + The Mutt Next Generation E-Mail Client 64 + The account-hook command may help. This hook works like folder-hook but is invoked whenever you access a remote mailbox (including inside the folder browser), not just when you open the mailbox. @@ -3180,21 +3203,18 @@ account-hook imap://host1/ 'set imap_user=me1 imap_pass=foo' account-hook imap://host2/ 'set tunnel="ssh host2 /usr/libexec/imapd"' - _4_._1_7 _S_t_a_r_t _a _W_W_W _B_r_o_w_s_e_r _o_n _U_R_L_s _(_E_X_T_E_R_N_A_L_) + _4_._1_8 _S_t_a_r_t _a _W_W_W _B_r_o_w_s_e_r _o_n _U_R_L_s _(_E_X_T_E_R_N_A_L_) If a message contains URLs (_u_n_i_f_i_e_d _r_e_s_o_u_r_c_e _l_o_c_a_t_o_r = address in the WWW space like _h_t_t_p_:_/_/_w_w_w_._m_u_t_t_._o_r_g_/), it is efficient to get a menu with all the URLs and start a WWW browser on one of them. This functionality is provided by the - external urlview program which can be retrieved at - - The Mutt Next Generation E-Mail Client 64 - - ftp://ftp.mutt.org/mutt/contrib/ and the configuration commands: + external urlview program which can be retrieved at ftp://ftp.mutt.org/mutt/con- + trib/ and the configuration commands: macro index \cb |urlview\n macro pager \cb |urlview\n - _4_._1_8 _C_o_m_p_r_e_s_s_e_d _f_o_l_d_e_r_s _S_u_p_p_o_r_t _(_O_P_T_I_O_N_A_L_) + _4_._1_9 _C_o_m_p_r_e_s_s_e_d _f_o_l_d_e_r_s _S_u_p_p_o_r_t _(_O_P_T_I_O_N_A_L_) If Mutt-ng was compiled with compressed folders support (by running the _c_o_n_f_i_g_- _u_r_e script with the _-_-_e_n_a_b_l_e_-_c_o_m_p_r_e_s_s_e_d flag), Mutt can open folders stored in @@ -3208,8 +3228,8 @@ may be faster than converting the entire folder to the accepted format, append- ing to it and converting back to the user-defined format. - There are three hooks defined (_o_p_e_n_-_h_o_o_k (section 4.18.1 , page 64), _c_l_o_s_e_- - _h_o_o_k (section 4.18.2 , page 64) and _a_p_p_e_n_d_-_h_o_o_k (section 4.18.3 , page 65)) + There are three hooks defined (_o_p_e_n_-_h_o_o_k (section 4.19.1 , page 64), _c_l_o_s_e_- + _h_o_o_k (section 4.19.2 , page 65) and _a_p_p_e_n_d_-_h_o_o_k (section 4.19.3 , page 65)) which define commands to uncompress and compress a folder and to append mes- sages to an existing compressed folder respectively. @@ -3219,11 +3239,13 @@ close-hook \\.gz$ "gzip -c %t > %f" append-hook \\.gz$ "gzip -c %t >> %f" + The Mutt Next Generation E-Mail Client 65 + You do not have to specify all of the commands. If you omit _a_p_p_e_n_d_-_h_o_o_k (sec- - tion 4.18.3 , page 65), the folder will be open and closed again each time you - will add to it. If you omit _c_l_o_s_e_-_h_o_o_k (section 4.18.2 , page 64) (or give + tion 4.19.3 , page 65), the folder will be open and closed again each time you + will add to it. If you omit _c_l_o_s_e_-_h_o_o_k (section 4.19.2 , page 65) (or give empty command) , the folder will be open in the mode. If you specify _a_p_p_e_n_d_- - _h_o_o_k (section 4.18.3 , page 65) though you'll be able to append to the folder. + _h_o_o_k (section 4.19.3 , page 65) though you'll be able to append to the folder. Note that Mutt-ng will only try to use hooks if the file is not in one of the accepted formats. In particular, if the file is empty, mutt supposes it is not @@ -3233,14 +3255,11 @@ unset _$_s_a_v_e___e_m_p_t_y (section 6.4.240 , page 138), so that the compressed file will be removed if you delete all of the messages. - _4_._1_8_._1 _O_p_e_n _a _c_o_m_p_r_e_s_s_e_d _m_a_i_l_b_o_x _f_o_r _r_e_a_d_i_n_g + _4_._1_9_._1 _O_p_e_n _a _c_o_m_p_r_e_s_s_e_d _m_a_i_l_b_o_x _f_o_r _r_e_a_d_i_n_g Usage: open-hook _r_e_g_e_x_p '_c_o_m_m_a_n_d' The _c_o_m_m_a_n_d is the command that can be used for opening the folders whose names - - The Mutt Next Generation E-Mail Client 65 - match _r_e_g_e_x_p. The _c_o_m_m_a_n_d string is the printf-like format string, and it should accept two @@ -3260,21 +3279,23 @@ If the _c_o_m_m_a_n_d is empty, this operation is disabled for this file type. - _4_._1_8_._2 _W_r_i_t_e _a _c_o_m_p_r_e_s_s_e_d _m_a_i_l_b_o_x + _4_._1_9_._2 _W_r_i_t_e _a _c_o_m_p_r_e_s_s_e_d _m_a_i_l_b_o_x Usage: close-hook _r_e_g_e_x_p '_c_o_m_m_a_n_d' This is used to close the folder that was open with the _o_p_e_n_-_h_o_o_k (section - 4.18.1 , page 64) command after some changes were made to it. + 4.19.1 , page 64) command after some changes were made to it. The _c_o_m_m_a_n_d string is the command that can be used for closing the folders whose names match _r_e_g_e_x_p. It has the same format as in the _o_p_e_n_-_h_o_o_k (section - 4.18.1 , page 64) command. Temporary folder in this case is the folder previ- - ously produced by the <_o_p_e_n_-_h_o_o_k (section 4.18.1 , page 64) command. + 4.19.1 , page 64) command. Temporary folder in this case is the folder previ- + ously produced by the <_o_p_e_n_-_h_o_o_k (section 4.19.1 , page 64) command. The _c_o_m_m_a_n_d should nnoott remove the decompressed file. The _c_o_m_m_a_n_d should return non-zero exit status if it fails, so mutt knows something's wrong. + The Mutt Next Generation E-Mail Client 66 + Example: close-hook \\.gz$ "gzip -c %t > %f" @@ -3282,19 +3303,16 @@ If the _c_o_m_m_a_n_d is empty, this operation is disabled for this file type, and the file can only be open in the readonly mode. - _c_l_o_s_e_-_h_o_o_k (section 4.18.2 , page 64) is not called when you exit from the + _c_l_o_s_e_-_h_o_o_k (section 4.19.2 , page 65) is not called when you exit from the folder if the folder was not changed. - _4_._1_8_._3 _A_p_p_e_n_d _a _m_e_s_s_a_g_e _t_o _a _c_o_m_p_r_e_s_s_e_d _m_a_i_l_b_o_x + _4_._1_9_._3 _A_p_p_e_n_d _a _m_e_s_s_a_g_e _t_o _a _c_o_m_p_r_e_s_s_e_d _m_a_i_l_b_o_x Usage: append-hook _r_e_g_e_x_p '_c_o_m_m_a_n_d' This command is used for saving to an existing compressed folder. The _c_o_m_m_a_n_d is the command that can be used for appending to the folders whose names match - - The Mutt Next Generation E-Mail Client 66 - - _r_e_g_e_x_p. It has the same format as in the _o_p_e_n_-_h_o_o_k (section 4.18.1 , page 64) + _r_e_g_e_x_p. It has the same format as in the _o_p_e_n_-_h_o_o_k (section 4.19.1 , page 64) command. The temporary folder in this case contains the messages that are being appended. @@ -3305,21 +3323,21 @@ append-hook \\.gz$ "gzip -c %t >> %f" - When _a_p_p_e_n_d_-_h_o_o_k (section 4.18.3 , page 65) is used, the folder is not opened, + When _a_p_p_e_n_d_-_h_o_o_k (section 4.19.3 , page 65) is used, the folder is not opened, which saves time, but this means that we can not find out what the folder type is. Thus the default (_$_m_b_o_x___t_y_p_e (section 6.4.125 , page 111)) type is always supposed (i.e. this is the format used for the temporary folder). - If the file does not exist when you save to it, _c_l_o_s_e_-_h_o_o_k (section 4.18.2 , - page 64) is called, and not _a_p_p_e_n_d_-_h_o_o_k (section 4.18.3 , page 65). _a_p_p_e_n_d_- - _h_o_o_k (section 4.18.3 , page 65) is only for appending to existing folders. + If the file does not exist when you save to it, _c_l_o_s_e_-_h_o_o_k (section 4.19.2 , + page 65) is called, and not _a_p_p_e_n_d_-_h_o_o_k (section 4.19.3 , page 65). _a_p_p_e_n_d_- + _h_o_o_k (section 4.19.3 , page 65) is only for appending to existing folders. If the _c_o_m_m_a_n_d is empty, this operation is disabled for this file type. In this case, the folder will be open and closed again (using _o_p_e_n_-_h_o_o_k (section - 4.18.1 , page 64) and _c_l_o_s_e_-_h_o_o_k (section 4.18.2 , page 64)respectively) each + 4.19.1 , page 64) and _c_l_o_s_e_-_h_o_o_k (section 4.19.2 , page 65)respectively) each time you will add to it. - _4_._1_8_._4 _E_n_c_r_y_p_t_e_d _f_o_l_d_e_r_s + _4_._1_9_._4 _E_n_c_r_y_p_t_e_d _f_o_l_d_e_r_s The compressed folders support can also be used to handle encrypted folders. If you want to encrypt a folder with PGP, you may want to use the following hooks: @@ -3327,6 +3345,8 @@ open-hook \\.pgp$ "pgp -f < %f > %t" close-hook \\.pgp$ "pgp -fe YourPgpUserIdOrKeyId < %t > %f" + The Mutt Next Generation E-Mail Client 67 + Please note, that PGP does not support appending to an encrypted folder, so there is no append-hook defined. @@ -3339,9 +3359,6 @@ Quite a bit of effort has been made to make Mutt-ng the premier text-mode MIME MUA. Every effort has been made to provide the functionality that the discern- ing MIME user requires, and the conformance to the standards wherever possible. - - The Mutt Next Generation E-Mail Client 67 - When configuring Mutt-ng for MIME, there are two extra types of configuration files which Mutt-ng uses. One is the mime.types file, which contains the map- ping of file extensions to IANA MIME types. The other is the mailcap file, @@ -3377,6 +3394,9 @@ The default binding for view-attachments is `v', which displays the attachment menu for a message. The attachment menu displays a list of the attachments in + + The Mutt Next Generation E-Mail Client 68 + a message. From the attachment menu, you can save, print, pipe, delete, and view attachments. You can apply these operations to a group of attachments at once, by tagging the attachments and by using the ``tag-prefix'' operator. You @@ -3394,9 +3414,6 @@ The compose menu is the menu you see before you send a message. It allows you to edit the recipient list, the subject, and other aspects of your message. It - - The Mutt Next Generation E-Mail Client 68 - also contains a list of the attachments of your message, including the main body. From this menu, you can print, copy, filter, pipe, edit, compose, review, and rename an attachment or a list of tagged attachments. You can also @@ -3432,6 +3449,8 @@ application/pgp pgp audio/x-aiff aif aifc aiff + The Mutt Next Generation E-Mail Client 69 + A sample mime.types file comes with the Mutt-ng distribution, and should con- tain most of the MIME types you are likely to use. @@ -3447,9 +3466,6 @@ these if the appropriate entry is found in the mime.types file. It also recog- nises 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 - - The Mutt Next Generation E-Mail Client 69 - various molecular viewers. Non-recognised mime types should only be used if the recipient of the message is likely to be expecting such attachments. @@ -3487,6 +3503,8 @@ optional fields. Each field of a definition line is divided by a semicolon ';' character. + The Mutt Next Generation E-Mail Client 70 + The content type is specified in the MIME standard type/subtype method. For example, text/plain, text/html, image/gif, etc. In addition, the mailcap for- mat includes two formats for wildcards, one using the special '*' subtype, the @@ -3501,9 +3519,6 @@ 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-ng will turn over the terminal to the view program until the program quits, at - - The Mutt Next Generation E-Mail Client 70 - which time Mutt will remove the temporary file if it exists. So, in the simplest form, you can send a text/plain message to the external @@ -3538,6 +3553,8 @@ This is the simplest form of a mailcap file. + The Mutt Next Generation E-Mail Client 71 + _5_._3_._2 _S_e_c_u_r_e _u_s_e _o_f _m_a_i_l_c_a_p The interpretation of shell meta-characters embedded in MIME parameters can @@ -3553,9 +3570,6 @@ double quotes. Mutt-ng 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 - - The Mutt Next Generation E-Mail Client 71 - to fix broken behaviour with quotes introduces new leaks - there is no alterna- tive to correct quoting in the first place. @@ -3591,23 +3605,24 @@ and Mutt-ng will use your standard pager to display the results. needsterminal - Mutt-ng uses this flag when viewing attachments with _a_u_t_o_v_i_e_w (sec- - tion 5.4 , page 74), in order to decide whether it should honor - the setting of the _$_w_a_i_t___k_e_y (section 6.4.334 , page 161) variable - or not. When an attachment is viewed using an interactive program, - and the corresponding mailcap entry has a _n_e_e_d_s_t_e_r_m_i_n_a_l flag, Mutt- - ng will use _$_w_a_i_t___k_e_y (section 6.4.334 , page 161) and the exit - status of the program to decide if it will ask you to press a key - after the external program has exited. In all other situations it - will not prompt you for a key. + Mutt-ng uses this flag when viewing attachments with _a_u_t_o_v_i_e_w + + The Mutt Next Generation E-Mail Client 72 + + (section 5.4 , page 74), in order to decide whether it should + honor the setting of the _$_w_a_i_t___k_e_y (section 6.4.334 , page 161) + variable or not. When an attachment is viewed using an interactive + program, and the corresponding mailcap entry has a _n_e_e_d_s_t_e_r_m_i_n_a_l + flag, Mutt-ng will use _$_w_a_i_t___k_e_y (section 6.4.334 , page 161) and + the exit status of the program to decide if it will ask you to + press a key after the external program has exited. In all other + situations it will not prompt you for a key. compose= This flag specifies the command to use to create a new attachment of a specific MIME type. Mutt-ng supports this from the compose menu. - The Mutt Next Generation E-Mail Client 72 - composetyped= This flag specifies the command to use to create a new attachment of a specific MIME type. This command differs from the compose @@ -3648,6 +3663,8 @@ text/html; netscape -remote 'openURL(%s)' ; test=RunningX text/html; lynx %s + The Mutt Next Generation E-Mail Client 73 + In this example, Mutt-ng will run the program RunningX which will return 0 if the X Window manager is running, and non-zero if it isn't. If RunningX returns 0, then Mutt-ng will call netscape to @@ -3660,9 +3677,6 @@ When searching for an entry in the mailcap file, Mutt-ng will search for the most useful entry for its purpose. For instance, if you are attempting to print an image/gif, and you have the following entries in your mailcap file, - - The Mutt Next Generation E-Mail Client 73 - Mutt-ng will search for an entry with the print command: image/*; xv %s @@ -3702,6 +3716,8 @@ use of this keyword causes Mutt-ng to not pass the body of the mes- sage to the view/print/edit program on stdin. + The Mutt Next Generation E-Mail Client 74 + %t Mutt-ng will expand %t to the text representation of the content type of the message in the same form as the first parameter of the @@ -3714,8 +3730,6 @@ Content-Type: text/plain; charset=iso-8859-1 - The Mutt Next Generation E-Mail Client 74 - then Mutt-ng will expand %{charset} to iso-8859-1. The default metamail mailcap file uses this feature to test the charset to spawn an xterm using the right charset to view the message. @@ -3961,7 +3975,7 @@ The following are the commands understood by mutt. - +o _a_c_c_o_u_n_t_-_h_o_o_k (section 4.16 , page 62) _p_a_t_t_e_r_n _c_o_m_m_a_n_d + +o _a_c_c_o_u_n_t_-_h_o_o_k (section 4.17 , page 63) _p_a_t_t_e_r_n _c_o_m_m_a_n_d +o _a_l_i_a_s (section 3.3 , page 23) _k_e_y _a_d_d_r_e_s_s [ , _a_d_d_r_e_s_s, ... ] @@ -3975,7 +3989,7 @@ +o _u_n_a_l_t_e_r_n_a_t_i_v_e___o_r_d_e_r (section 5.5 , page 75) _m_i_m_e_t_y_p_e [ _m_i_m_e_t_y_p_e ... ] - +o _a_p_p_e_n_d_-_h_o_o_k (section 4.18.3 , page 65) _r_e_g_e_x_p _c_o_m_m_a_n_d + +o _a_p_p_e_n_d_-_h_o_o_k (section 4.19.3 , page 65) _r_e_g_e_x_p _c_o_m_m_a_n_d +o _a_u_t_o___v_i_e_w (section 5.4 , page 74) _m_i_m_e_t_y_p_e [ _m_i_m_e_t_y_p_e ... ] @@ -3985,7 +3999,7 @@ +o _c_h_a_r_s_e_t_-_h_o_o_k (section 3.5 , page 26) _a_l_i_a_s _c_h_a_r_s_e_t - +o _c_l_o_s_e_-_h_o_o_k (section 4.18.2 , page 64) _r_e_g_e_x_p _c_o_m_m_a_n_d + +o _c_l_o_s_e_-_h_o_o_k (section 4.19.2 , page 65) _r_e_g_e_x_p _c_o_m_m_a_n_d +o _c_o_l_o_r (section 3.8 , page 27) _o_b_j_e_c_t _f_o_r_e_g_r_o_u_n_d _b_a_c_k_g_r_o_u_n_d [ _r_e_g_e_x_p ] @@ -4035,7 +4049,7 @@ +o _u_n_m_y___h_d_r (section 3.15 , page 34) _f_i_e_l_d [ _f_i_e_l_d ... ] - +o _o_p_e_n_-_h_o_o_k (section 4.18.1 , page 64) _r_e_g_e_x_p _c_o_m_m_a_n_d + +o _o_p_e_n_-_h_o_o_k (section 4.19.1 , page 64) _r_e_g_e_x_p _c_o_m_m_a_n_d +o _c_r_y_p_t_-_h_o_o_k (section 3.22 , page 37) _p_a_t_t_e_r_n _k_e_y_-_i_d @@ -7927,7 +7941,7 @@ This command is used to verify S/MIME signatures of type application/x- pkcs7-mime. (S/MIME only) - _6_._4_._2_8_5 _s_m_t_p___a_u_t_h___p_a_s_s_w_o_r_d + _6_._4_._2_8_5 _s_m_t_p___h_o_s_t Type: string @@ -7937,14 +7951,11 @@ The Mutt Next Generation E-Mail Client 150 - Defines the password to use with SMTP AUTH. If ``_$_s_m_t_p___a_u_t_h___u_s_e_r_n_a_m_e (section - 6.4.286 , page 148)'' is set, but this variable is not, you will be prompted - for a password when sending. - - NNoottee:: Storing passwords in a configuration file presents a security risk since - the superuser of your machine may read it regardless of the file's permissions. + Defines the SMTP host which will be used to deliver mail, as opposed to invok- + ing the sendmail binary. Setting this variable overrides the value of ``_$_s_e_n_d_- + _m_a_i_l (section 6.4.247 , page 140)'', and any associated variables. - _6_._4_._2_8_6 _s_m_t_p___a_u_t_h___u_s_e_r_n_a_m_e + _6_._4_._2_8_6 _s_m_t_p___p_a_s_s Type: string @@ -7952,22 +7963,14 @@ Availability: SMTP - Defines the username to use with SMTP AUTH. Setting this variable will cause - Mutt-ng to attempt to use SMTP AUTH when sending. - - _6_._4_._2_8_7 _s_m_t_p___h_o_s_t - - Type: string - - Default: '' - - Availability: SMTP + Defines the password to use with SMTP AUTH. If ``_$_s_m_t_p___a_u_t_h___u_s_e_r_n_a_m_e (section + , page )'' is set, but this variable is not, you will be prompted for a pass- + word when sending. - Defines the SMTP host which will be used to deliver mail, as opposed to invok- - ing the sendmail binary. Setting this variable overrides the value of ``_$_s_e_n_d_- - _m_a_i_l (section 6.4.247 , page 140)'', and any associated variables. + NNoottee:: Storing passwords in a configuration file presents a security risk since + the superuser of your machine may read it regardless of the file's permissions. - _6_._4_._2_8_8 _s_m_t_p___p_o_r_t + _6_._4_._2_8_7 _s_m_t_p___p_o_r_t Type: number @@ -7981,7 +7984,7 @@ Defaults to 25, the standard SMTP port, but RFC 2476-compliant SMTP servers will probably desire 587, the mail submission port. - _6_._4_._2_8_9 _s_m_t_p___u_s_e___t_l_s + _6_._4_._2_8_8 _s_m_t_p___u_s_e___t_l_s Type: string @@ -7991,13 +7994,23 @@ Defines wether to use STARTTLS. If this option is set to ``_r_e_q_u_i_r_e_d'' and the server does not support STARTTLS or there is an error in the TLS Handshake, the - - The Mutt Next Generation E-Mail Client 151 - connection will fail. Setting this to ``_e_n_a_b_l_e_d'' will try to start TLS and continue without TLS in case of an error. Muttng still needs to have SSL sup- port enabled in order to use it. + _6_._4_._2_8_9 _s_m_t_p___u_s_e_r + + Type: string + + Default: '' + + Availability: SMTP + + The Mutt Next Generation E-Mail Client 151 + + Defines the username to use with SMTP AUTH. Setting this variable will cause + Mutt-ng to attempt to use SMTP AUTH when sending. + _6_._4_._2_9_0 _s_o_r_t Type: sort order @@ -8044,10 +8057,10 @@ This can be set to any value that ``_$_s_o_r_t (section 6.4.290 , page 149)'' can, except threads (in that case, Mutt-ng will just use date-sent). You can also specify the ``last-'' prefix in addition to ``reverse-'' prefix, but last- must + come after reverse-. The last- prefix causes messages to be sorted against its The Mutt Next Generation E-Mail Client 152 - come after reverse-. The last- prefix causes messages to be sorted against its siblings by which has the last descendant, using the rest of sort_aux as an ordering. @@ -8099,13 +8112,13 @@ Default: ',' ``_s_p_a_m___s_e_p_a_r_a_t_o_r (section 6.4.295 , page 151)'' controls what happens when + multiple spam headers are matched: if _u_n_s_e_t, each successive header will The Mutt Next Generation E-Mail Client 153 - multiple spam headers are matched: if _u_n_s_e_t, each successive header will over- - write any previous matches value for the spam label. If _s_e_t, each successive - match will append to the previous, using ``_s_p_a_m___s_e_p_a_r_a_t_o_r (section 6.4.295 , - page 151)'' as a separator. + overwrite any previous matches value for the spam label. If _s_e_t, each succes- + sive match will append to the previous, using ``_s_p_a_m___s_e_p_a_r_a_t_o_r (section + 6.4.295 , page 151)'' as a separator. _6_._4_._2_9_6 _s_p_o_o_l_f_i_l_e @@ -8156,10 +8169,10 @@ Type: number - The Mutt Next Generation E-Mail Client 154 - Default: 0 + The Mutt Next Generation E-Mail Client 154 + Availability: GNUTLS This variable specifies the minimum acceptable prime size (in bits) for use in @@ -8211,12 +8224,12 @@ This variables specifies whether to attempt to use TLSv1 in the SSL authentica- tion process. - The Mutt Next Generation E-Mail Client 155 - _6_._4_._3_0_5 _s_s_l___u_s_e_s_y_s_t_e_m_c_e_r_t_s Type: boolean + The Mutt Next Generation E-Mail Client 155 + Default: yes Availability: SSL @@ -8267,11 +8280,11 @@ %F number of flagged messages * - The Mutt Next Generation E-Mail Client 156 - %h local hostname + The Mutt Next Generation E-Mail Client 156 + %l size (in bytes) of the current mailbox * @@ -8324,11 +8337,11 @@ %>X right justify the rest of the string and pad with 'X' - The Mutt Next Generation E-Mail Client 157 - %|X pad to the end of the line with 'X' + The Mutt Next Generation E-Mail Client 157 + * = can be optionally printed if nonzero Some of the above sequences can be used to optionally print a string if their @@ -8380,12 +8393,12 @@ Default: yes - The Mutt Next Generation E-Mail Client 158 - With mailto: style links, a body as well as arbitrary header information may be embedded. This may lead to (user) headers being overwriten without note if ``_$_e_d_i_t___h_e_a_d_e_r_s (section 6.4.54 , page 92)'' is unset. + The Mutt Next Generation E-Mail Client 158 + If this variable is _s_e_t, mutt-ng is strict and allows anything to be changed. If it's _u_n_s_e_t, all headers given will be prefixed with ``X-Mailto-'' and the message including headers will be shown in the editor regardless of what @@ -8436,12 +8449,12 @@ Default: '\([Ww][Aa][RrSs]: .*\)[ ]*$' - The Mutt Next Generation E-Mail Client 159 - When non-empty and _$_s_t_r_i_p___w_a_s (section 6.4.312 , page 157) is _s_e_t, mutt-ng will remove this trailing part of the ``Subject'' line when replying if it won't be empty afterwards. + The Mutt Next Generation E-Mail Client 159 + _6_._4_._3_1_4 _s_t_u_f_f___q_u_o_t_e_d Type: boolean @@ -8492,11 +8505,11 @@ Default: no - The Mutt Next Generation E-Mail Client 160 - When _s_e_t, Mutt-ng uses the date received rather than the date sent to thread messages by subject. + The Mutt Next Generation E-Mail Client 160 + _6_._4_._3_1_9 _t_i_l_d_e Type: boolean @@ -8549,11 +8562,11 @@ Default: '' - The Mutt Next Generation E-Mail Client 161 - If _s_e_t, this variable specifies the path of the trash folder where the mails marked for deletion will be moved, instead of being irremediably purged. + The Mutt Next Generation E-Mail Client 161 + NNoottee: When you delete a message in the trash folder, it is really deleted, so that there is no way to recover mail. @@ -8605,12 +8618,12 @@ _6_._4_._3_2_8 _u_s_e___d_o_m_a_i_n - The Mutt Next Generation E-Mail Client 162 - Type: boolean Default: yes + The Mutt Next Generation E-Mail Client 162 + When _s_e_t, Mutt-ng will qualify all local addresses (ones without the @host por- tion) with the value of ``_$_h_o_s_t_n_a_m_e (section 6.4.89 , page 100)''. If _u_n_s_e_t, no addresses will be qualified. @@ -8661,13 +8674,13 @@ Type: path - The Mutt Next Generation E-Mail Client 163 - Default: '' Specifies the visual editor to invoke when the _~_v command is given in the builtin editor. + The Mutt Next Generation E-Mail Client 163 + _6_._4_._3_3_4 _w_a_i_t___k_e_y Type: boolean @@ -8717,13 +8730,13 @@ Type: boolean - The Mutt Next Generation E-Mail Client 164 - Default: yes Controls whether Mutt-ng writes out the Bcc header when preparing messages to be sent. Exim users may wish to _u_n_s_e_t this. + The Mutt Next Generation E-Mail Client 164 + _6_._4_._3_3_9 _w_r_i_t_e___i_n_c Type: number @@ -8772,14 +8785,14 @@ you're in an appropriate terminal). The default must be _u_n_s_e_t to force in the validity checking. - The Mutt Next Generation E-Mail Client 165 - _6_._4_._3_4_3 _x_t_e_r_m___t_i_t_l_e Type: string Default: 'Mutt-ng with %?m?%m messages&no messages?%?n? [%n New]?' + The Mutt Next Generation E-Mail Client 165 + Controls the format of the title bar of the xterm provided that _$_x_t_e_r_m___s_e_t___t_i_t_l_e_s (section 6.4.342 , page 163) has been _s_e_t. This string is identical in formatting to the one used by ``_$_s_t_a_t_u_s___f_o_r_m_a_t (section 6.4.307 , @@ -8799,8 +8812,6 @@ tings for this menu will affect the default bindings for all menus (except as noted). - The Mutt Next Generation E-Mail Client 166 - bottom-page L move to the bottom of the page current-bottom not bound move current entry to bottom of page current-middle not bound move current entry to middle of page @@ -8833,6 +8844,8 @@ top-page H move to the top of the page what-key not bound display the keycode for a key press + The Mutt Next Generation E-Mail Client 166 + _6_._5_._2 _i_n_d_e_x The Mutt Next Generation E-Mail Client 167 @@ -9225,6 +9238,8 @@ The following people have been very helpful to the development of Mutt-ng: + Christian Gall + Iain Lea Andreas Kneib @@ -9233,10 +9248,10 @@ Elimar Riesebieter - _7_._2 _A_b_o_u_t _t_h_i_s _d_o_c_u_m_e_n_t - The Mutt Next Generation E-Mail Client 176 + _7_._2 _A_b_o_u_t _t_h_i_s _d_o_c_u_m_e_n_t + This document was written in SGML, and then rendered using the sgml-tools pack- age. @@ -9355,23 +9370,24 @@ 4.14.2 Authentication 61 4.15 NNTP Support (OPTIONAL) ........................................ 62 4.15.1 Again: Scoring 62 - 4.16 Managing multiple IMAP/POP/NNTP accounts (OPTIONAL) ............ 63 - 4.17 Start a WWW Browser on URLs (EXTERNAL) ......................... 63 - 4.18 Compressed folders Support (OPTIONAL) .......................... 64 - 4.18.1 Open a compressed mailbox for reading 64 - 4.18.2 Write a compressed mailbox 65 - 4.18.3 Append a message to a compressed mailbox 65 - 4.18.4 Encrypted folders 66 - - 5. Mutt-ng's MIME Support ............................................... 66 + 4.16 SMTP Support (OPTIONAL) ........................................ 63 + 4.17 Managing multiple IMAP/POP/NNTP accounts (OPTIONAL) ............ 63 + 4.18 Start a WWW Browser on URLs (EXTERNAL) ......................... 64 + 4.19 Compressed folders Support (OPTIONAL) .......................... 64 + 4.19.1 Open a compressed mailbox for reading 65 + 4.19.2 Write a compressed mailbox 65 + 4.19.3 Append a message to a compressed mailbox 66 + 4.19.4 Encrypted folders 66 + + 5. Mutt-ng's MIME Support ............................................... 67 5.1 Using MIME in Mutt ............................................. 67 5.1.1 Viewing MIME messages in the pager 67 5.1.2 The Attachment Menu 67 - 5.1.3 The Compose Menu 67 + 5.1.3 The Compose Menu 68 5.2 MIME Type configuration with mime.types ........................ 68 5.3 MIME Viewer configuration with mailcap ......................... 69 5.3.1 The Basics of the mailcap file 69 - 5.3.2 Secure use of mailcap 70 + 5.3.2 Secure use of mailcap 71 5.3.3 Advanced mailcap Usage 71 5.3.4 Example mailcap files 74 5.4 MIME Autoview .................................................. 75 @@ -9404,10 +9420,10 @@ 6.4.19 beep_new 86 6.4.20 bounce 86 6.4.21 bounce_delivered 86 - 6.4.22 braille_friendly 86 iii + 6.4.22 braille_friendly 86 6.4.23 certificate_file 86 6.4.24 charset 87 6.4.25 check_new 87 @@ -9460,10 +9476,10 @@ 6.4.72 forward_format 98 6.4.73 forward_quote 98 6.4.74 from 98 - 6.4.75 gecos_mask 98 iv + 6.4.75 gecos_mask 98 6.4.76 hdrs 99 6.4.77 header 99 6.4.78 header_cache 99 @@ -9516,10 +9532,10 @@ 6.4.125 mbox_type 112 6.4.126 menu_context 112 6.4.127 menu_move_off 112 - 6.4.128 menu_scroll 112 v + 6.4.128 menu_scroll 112 6.4.129 message_format 113 6.4.130 meta_key 113 6.4.131 metoo 113 @@ -9572,10 +9588,10 @@ 6.4.178 pgp_encrypt_sign_command 125 6.4.179 pgp_entry_format 125 6.4.180 pgp_export_command 126 - 6.4.181 pgp_getkeys_command 126 vi + 6.4.181 pgp_getkeys_command 126 6.4.182 pgp_good_sign 126 6.4.183 pgp_ignore_subkeys 126 6.4.184 pgp_import_command 127 @@ -9628,10 +9644,10 @@ 6.4.231 reply_regexp 137 6.4.232 reply_self 137 6.4.233 reply_to 137 - 6.4.234 resolve 138 vii + 6.4.234 resolve 138 6.4.235 reverse_alias 138 6.4.236 reverse_name 138 6.4.237 reverse_realname 138 @@ -9682,14 +9698,14 @@ 6.4.282 smime_timeout 149 6.4.283 smime_verify_command 149 6.4.284 smime_verify_opaque_command 149 - 6.4.285 smtp_auth_password 149 - 6.4.286 smtp_auth_username 150 - 6.4.287 smtp_host 150 + 6.4.285 smtp_host 149 + 6.4.286 smtp_pass 150 viii - 6.4.288 smtp_port 150 - 6.4.289 smtp_use_tls 150 + 6.4.287 smtp_port 150 + 6.4.288 smtp_use_tls 150 + 6.4.289 smtp_user 150 6.4.290 sort 151 6.4.291 sort_alias 151 6.4.292 sort_aux 151 @@ -9705,7 +9721,7 @@ 6.4.302 ssl_use_sslv2 154 6.4.303 ssl_use_sslv3 154 6.4.304 ssl_use_tlsv1 154 - 6.4.305 ssl_usesystemcerts 155 + 6.4.305 ssl_usesystemcerts 154 6.4.306 status_chars 155 6.4.307 status_format 155 6.4.308 status_on_top 157 @@ -9740,13 +9756,13 @@ 6.4.337 wrapmargin 163 6.4.338 write_bcc 163 6.4.339 write_inc 164 - 6.4.340 xterm_icon 164 ix + 6.4.340 xterm_icon 164 6.4.341 xterm_leave 164 6.4.342 xterm_set_titles 164 - 6.4.343 xterm_title 165 + 6.4.343 xterm_title 164 6.5 Functions ....................................................... 165 6.5.1 generic 165 6.5.2 index 166 @@ -9762,7 +9778,7 @@ 7. Miscellany ............................................................ 173 7.1 Acknowledgments ................................................. 174 - 7.2 About this document ............................................. 175 + 7.2 About this document ............................................. 176 x diff --git a/init.h b/init.h index 87036a4..f397051 100644 --- a/init.h +++ b/init.h @@ -2343,7 +2343,8 @@ struct option_t MuttVars[] = { ** (S/MIME only) */ #if defined(USE_LIBESMTP) - {"smtp_auth_username", DT_STR, R_NONE, UL &SmtpAuthUser, 0}, + {"smtp_auth_username", DT_SYN, R_NONE, UL "smtp_user", 0}, + {"smtp_user", DT_STR, R_NONE, UL &SmtpAuthUser, 0}, /* ** .pp ** Availability: SMTP @@ -2352,7 +2353,8 @@ struct option_t MuttVars[] = { ** Defines the username to use with SMTP AUTH. Setting this variable will ** cause Mutt-ng to attempt to use SMTP AUTH when sending. */ - {"smtp_auth_password", DT_STR, R_NONE, UL &SmtpAuthPass, 0}, + {"smtp_auth_password", DT_SYN, R_NONE, UL "smtp_pass", 0}, + {"smtp_pass", DT_STR, R_NONE, UL &SmtpAuthPass, 0}, /* ** .pp ** Availability: SMTP -- 2.20.1