diff --git a/ChangeLog.md b/ChangeLog.md index 712527f5672..8452d339196 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -3,7 +3,7 @@ - browser: `` function bound to "p" - editor: `` function bound to "Ctrl-r" - Cygwin support: https://www.neomutt.org/distro/cygwin - - OpenSUSE support: https://www.neomutt.org/distro/suse + - openSUSE support: https://www.neomutt.org/distro/suse - Upstream Homebrew support: Very soon - https://www.neomutt.org/distro/homebrew * Bug Fixes - gmail server-size search @@ -19,7 +19,7 @@ - Updated French translation * Website - Installation guide for Cygwin - - Installation guide for OpenSUSE + - Installation guide for openSUSE - Installation guide for CRUX * Build - check that DTDs are installed diff --git a/INSTALL b/INSTALL index 10714f399f5..2268ec77809 100644 --- a/INSTALL +++ b/INSTALL @@ -10,23 +10,23 @@ Notes or S-Lang, ftp://space.mit.edu/pub/davis/slang/ -- Mutt needs an implementation of the iconv API for character set +- NeoMutt needs an implementation of the iconv API for character set conversions. A free one can be found under the following URL: http://www.gnu.org/software/libiconv/ -- For building the manual, mutt needs the DocBook XSL stylesheets +- For building the manual, neomutt needs the DocBook XSL stylesheets as well as the DocBook DTD as of version 4.2 installed locally. Installation ============ -Installing Mutt is rather painless through the use of the GNU -autoconf package. Simply untar the Mutt distribution, and run the +Installing NeoMutt is rather painless through the use of the GNU +autoconf package. Simply untar the NeoMutt distribution, and run the ``configure'' script. If you have obtained the distribution from the Mercurial repository, run the ``prepare'' script with the same command -line parameters you would pass to configure. It will set up mutt's +line parameters you would pass to configure. It will set up neomutt's build environment and add the files which are present in the tar balls, but not in the Mercurial repository. @@ -35,7 +35,7 @@ needs to know in order to compile. However, there are a few options to ``configure'' to help it out, or change the default behavior: --prefix=DIR - install Mutt in DIR instead of /usr/local + install NeoMutt in DIR instead of /usr/local --with-curses=DIR use the curses lib in DIR/lib. If you have ncurses, ``configure'' @@ -46,7 +46,7 @@ to ``configure'' to help it out, or change the default behavior: use the S-Lang library instead of ncurses. This library seems to work better for some people because it is less picky about proper termcap entries than ncurses. It is recommended that you use at - *least* version 0.99-38 with Mutt. + *least* version 0.99-38 with NeoMutt. --with-mailpath=DIR specify where the spool mailboxes are located on your system @@ -76,25 +76,25 @@ to ``configure'' to help it out, or change the default behavior: Use the Cyrus SASL library for IMAP or POP authentication. This library provides generic support for several authentication methods, and more may be added by the system administrator without recompiling - mutt. SASL may also be able to encrypt your mail session even if + neomutt. SASL may also be able to encrypt your mail session even if SSL is not available. --disable-nls - This switch disables mutt's native language support. + This switch disables neomutt's native language support. --enable-flock use flock() to lock files. --disable-fcntl - by default, Mutt uses fcntl() to lock files. Over NFS this can + by default, NeoMutt uses fcntl() to lock files. Over NFS this can result in poor performance on read/write. --enable-locales-fix on some systems, the result of isprint() can't be used reliably to decide which characters are printable, even if you set the - LANG environment variable. If you set this option, Mutt will + LANG environment variable. If you set this option, NeoMutt will assume all characters in the ISO-8859-* range are printable. If - you leave it unset, Mutt will attempt to use isprint() if either + you leave it unset, NeoMutt will attempt to use isprint() if either of the environment variables LANG, LC_ALL or LC_CTYPE is set, and will revert to the ISO-8859-* range if they aren't. If you need --enable-locales-fix then you will probably need @@ -103,22 +103,22 @@ to ``configure'' to help it out, or change the default behavior: LC_ALL or LC_CTYPE instead). --without-wc-funcs - by default Mutt uses the functions mbrtowc(), wctomb() and + by default NeoMutt uses the functions mbrtowc(), wctomb() and wcwidth() provided by the system, when they are available. - With this option Mutt will use its own version of those + With this option NeoMutt will use its own version of those functions, which should work with 8-bit display charsets, UTF-8, euc-jp or shift_jis, even if the system doesn't normally support those multibyte charsets. - If you find Mutt is displaying non-ascii characters as octal + If you find NeoMutt is displaying non-ascii characters as octal escape sequences (e.g. \243), even though you have set LANG and LC_CTYPE correctly, then you might find you can solve the problem with either or both of --enable-locales-fix and --without-wc-funcs. Once ``configure'' has completed, simply type ``make install.'' -Mutt should compile cleanly (without errors) and you should end up with a -binary called ``mutt.'' If you get errors about undefined symbols like +NeoMutt should compile cleanly (without errors) and you should end up with a +binary called ``neomutt.'' If you get errors about undefined symbols like A_NORMAL or KEY_MIN, then you probably don't have a SysV compliant curses library. You should install either ncurses or S-Lang (see above), and then run the ``configure'' script again. @@ -130,10 +130,10 @@ Please note that "VPATH" builds currently only work with GNU make (gmake). Character set support ===================== -Mutt no longer contains functions for doing character set conversion. +NeoMutt no longer contains functions for doing character set conversion. Instead, it expects the iconv functions (iconv_open, iconv, iconv_close) to be provided. Most up-to-date systems provide these -functions, often as part of the C library. If you are installing Mutt +functions, often as part of the C library. If you are installing NeoMutt on a system which does not have them, it is recommended that you install Bruno Haible's portable libiconv library, which you can obtain from: @@ -146,21 +146,21 @@ version of iconv. If you decide to use your system's iconv implementation, you may -need to tell mutt about implementation-defined names for some +need to tell neomutt about implementation-defined names for some character sets. Sample configuration files for various systems can be found in the directory contrib/iconv/ in this source distribution, and will be installed in the samples/iconv directory -as part of mutt's documentation. +as part of neomutt's documentation. In order to use these sample configuration files, just put a line like - source /usr/local/doc/mutt/samples/iconv/iconv.osf1-4.0d.rc + source /usr/local/doc/neomutt/samples/iconv/iconv.osf1-4.0d.rc into your system's global Muttrc, which normally resides in /etc or /usr/local/etc. -If you really want to, you can configure Mutt --disable-iconv, but +If you really want to, you can configure NeoMutt --disable-iconv, but there will then be no character set conversion. diff --git a/README.SSL b/README.SSL index 50cc087f447..084f1fab086 100644 --- a/README.SSL +++ b/README.SSL @@ -1,9 +1,9 @@ -IMAP/SSL in mutt +IMAP/SSL in neomutt ================ Compilation ----------- -If you want to have SSL support in mutt, you need to install OpenSSL +If you want to have SSL support in neomutt, you need to install OpenSSL (http://www.openssl.org) libraries and headers before compiling. OpenSSL versions 0.9.3 through 1.0.1c have been tested. @@ -29,7 +29,7 @@ or mailboxes imaps://localhost/inbox mailboxes imaps://localhost:994/inbox -If you get errors about lack of entropy, it means that Mutt was unable +If you get errors about lack of entropy, it means that NeoMutt was unable to find a source of random data to initialize SSL library with. Should this happen, you need to generate the data yourself and save it in a file pointed by $entropy_file or $RANDFILE (environment) variables or @@ -40,10 +40,10 @@ generates unpredictable output, for example 'ps aluxww' in Linux, and calculating the MD5-sum from the output and saving it in a file. ** Note: The contents of the file pointed by $RANDFILE environment -** variable (or ~/.rnd if unset) will be overwritten every time Mutt +** variable (or ~/.rnd if unset) will be overwritten every time NeoMutt ** is run so don't put anything you can't afford to lose in that file. -The files Mutt will try to use to initialize SSL library with are files +The files NeoMutt will try to use to initialize SSL library with are files pointed by $entropy_file and $RANDFILE (or ~/.rnd if unset.) If your OpenSSL is version 0.9.5 or later, the previous files can also be EGD sockets (see http://www.lothar.com/tech/crypto/ for more information @@ -66,7 +66,7 @@ can also be saved so that further connections to the server are automatically accepted. If OpenSSL was built with support for ServerNameIndication (SNI) and TLS -is used in the negotiation, mutt will send its idea of the server-name +is used in the negotiation, neomutt will send its idea of the server-name as part of the TLS negotiation. This allows the server to select an appropriate certificate, in the event that one server handles multiple hostnames with different certificates. @@ -75,7 +75,7 @@ If your organization has several equivalent IMAP-servers, each of them should have a unique certificate which is signed with a common certificate. If you want to use all of those servers, you don't need to save each server certificate on the first connect. Instead, you can get -the signer certificate and save it instead. That way, mutt will +the signer certificate and save it instead. That way, neomutt will automatically accept all certificates signed with the saved certificate. System-wide certificates are by default considered trusted when checking @@ -90,7 +90,7 @@ certificates each time you connect to a server, you have set this variable to some reasonable value. For example: - set certificate_file=~/.mutt/certificates + set certificate_file=~/.neomutt/certificates Troubleshooting @@ -119,4 +119,4 @@ Tommi.Komulainen@iki.fi Updated by: Jeremy Katz - Phil Pennock + Phil Pennock diff --git a/README.md b/README.md index df290119a06..a64e064b67c 100644 --- a/README.md +++ b/README.md @@ -28,7 +28,7 @@ sorted through them, fixed them up and documented them. | Encrypt-to-Self | Save a self-encrypted copy of emails | Fmemopen | Replace some temporary files with memory buffers | Forgotten Attachment | Alert user when (s)he forgets to attach a file to an outgoing email. -| Global Hooks | Define actions to run globally within Mutt +| Global Hooks | Define actions to run globally within NeoMutt | Ifdef | Conditional config options | Index Color | Custom rules for theming the email index | Initials Expando | Expando for author's initials @@ -56,8 +56,8 @@ sorted through them, fixed them up and documented them. | ---------------------- | --------------------------------------------- | Header Cache Benchmark | Script to test the speed of the header cache | Keybase | Keybase Integration -| Useful programs | List of useful programs interacting with mutt -| Vi Keys | Easy and clean Vi-keys for Mutt +| Useful programs | List of useful programs interacting with NeoMutt +| Vi Keys | Easy and clean Vi-keys for NeoMutt | Vim Syntax | Vim Syntax File ## Where is NeoMutt? diff --git a/contrib/keybase/keybase.py b/contrib/keybase/keybase.py index 42bfc2d428d..cc361631239 100644 --- a/contrib/keybase/keybase.py +++ b/contrib/keybase/keybase.py @@ -38,7 +38,7 @@ def encryptSign(parameters): print("Type help to learn how to use me.") while exitVar.lower() != 'quit': - inputStuffs = input('mutt#: ') + inputStuffs = input('neomutt#: ') if (inputStuffs.lower() == 'help'): helpfunc() diff --git a/doc/PGP-Notes.txt b/doc/PGP-Notes.txt index 2215c41040f..8cfa6ff91a0 100644 --- a/doc/PGP-Notes.txt +++ b/doc/PGP-Notes.txt @@ -1,4 +1,4 @@ - USING PGP FROM WITHIN MUTT + USING PGP FROM WITHIN NEOMUTT WARNING: The configuration interface has completely changed as of @@ -9,12 +9,12 @@ WARNING: The configuration interface has completely changed as of USERS' GUIDE -How do I use mutt with PGP, PGP5, or GnuPG? +How do I use neomutt with PGP, PGP5, or GnuPG? ------------------------------------------- Go to the contrib subdirectory of the source tree. You'll find three files there, pgp2.rc, pgp5.rc, and gpg.rc. These files -contain ready-to-use configurations for using mutt with pgp2, pgp5, +contain ready-to-use configurations for using neomutt with pgp2, pgp5, and gpg. Include one of these files with your ~/.muttrc, and things should @@ -28,10 +28,10 @@ given to the PGP binaries match your needs. Frequently Asked Questions and Tips ----------------------------------- -Q: "People are sending PGP messages which mutt doesn't +Q: "People are sending PGP messages which neomutt doesn't recognize. What can I do?" -The new way is to leave headers alone and use mutt's +The new way is to leave headers alone and use neomutt's check-traditional-pgp function, which can detect PGP messages at run-time, and adjust content-types. @@ -96,7 +96,7 @@ if (/^$BPGPS/:b && /^$EPGPS/:b) Q: "I don't like that PGP/MIME stuff, but want to use the old way of PGP-signing my mails. Can't you include - that with mutt?" + that with neomutt?" The old answer to this question used to be this: @@ -113,7 +113,7 @@ The old answer to this question used to be this: There's a new answer, though: Set the $pgp_autoinline configuration variable (it's a quad-option) to something different -from "no" (that's the default). Mutt will then try to use +from "no" (that's the default). NeoMutt will then try to use 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. @@ -127,7 +127,7 @@ Q: "I don't like all the ^Gs and various other verbosity Roland Rosenfeld has found a quite elegant solution to this problem: PGP has some pretty good foreign -language support. So we just introduce a language called "mutt" +language support. So we just introduce a language called "neomutt" which contains empty strings for the messages we don't want to see. To use this, copy either language.txt or language50.txt (depending on what PGP version you are using) to your $PGPPATH. Make sure the @@ -157,7 +157,7 @@ or exim. Auxiliary Programs ------------------ -Mutt needs two auxiliary programs for its PGP support: pgpewrap and +NeoMutt needs two auxiliary programs for its PGP support: pgpewrap and pgpring. @@ -165,7 +165,7 @@ pgpring. pgpring is a key ring dumper. It extracts information from PGP's binary key ring and emits it in an (almost) readable output format -understood by mutt's key selection routines. This output format +understood by neomutt's key selection routines. This output format mimics the one used by the GNU Privacy Guard (GPG). You'll need this program with PGP 2 and PGP 5. @@ -203,14 +203,14 @@ will execute: pgpe file -r a -r b -r c This script is needed with PGP 5 and with GPG, since their command -line interfaces can't be properly served by mutt's format mechanism. +line interfaces can't be properly served by neomutt's format mechanism. The Configuration Interface --------------------------- -As usual within mutt, the configuration interface for the PGP +As usual within neomutt, the configuration interface for the PGP commands relies on printf-like formats. For all PGP commands, the following %-sequences are defined. @@ -230,7 +230,7 @@ following %-sequences are defined. configuration variable $pgp_sign_as. You probably need to use this within a conditional % sequence. - %r In many contexts, mutt passes key IDs to pgp. %r expands to + %r In many contexts, neomutt passes key IDs to pgp. %r expands to a list of key IDs. The following command formats are defined: diff --git a/doc/mbox.5 b/doc/mbox.5 index 407b1d7f13c..e83c486266b 100644 --- a/doc/mbox.5 +++ b/doc/mbox.5 @@ -70,7 +70,7 @@ into before storing it. Besides \fBMBOXO\fP and \fBMBOXRD\fP there is also \fBMBOXCL\fP which is \fBMBOXO\fP with a "Content-Length:"\-field with the number of bytes in the message body; some MUAs (like -.BR mutt (1)) +.BR neomutt (1)) do automatically transform \fBMBOXO\fP mailboxes into \fBMBOXCL\fP ones when ever they write them back as \fBMBOXCL\fP can be read by any \fBMBOXO\fP-MUA without any problems. @@ -147,7 +147,7 @@ format folders. .PP .\" .SH "SEE ALSO" -.BR mutt (1), +.BR neomutt (1), .BR fcntl (2), .BR flock (2), .BR link (2), diff --git a/doc/neomuttrc.head b/doc/neomuttrc.head index 095cdc7e3b4..e38cce172a6 100644 --- a/doc/neomuttrc.head +++ b/doc/neomuttrc.head @@ -1,5 +1,5 @@ # -# System configuration file for Mutt +# System configuration file for NeoMutt # # Default list of header fields to weed when displaying. @@ -23,9 +23,9 @@ macro index,pager,attach,compose \cb "\ "call urlview to extract URLs out of a message" # Show documentation when pressing F1 -macro generic,pager " less @docdir@/manual.txt" "show Mutt documentation" +macro generic,pager " less @docdir@/manual.txt" "show NeoMutt documentation" -# show the incoming mailboxes list (just like "mutt -y") and back when pressing "y" +# show the incoming mailboxes list (just like "neomutt -y") and back when pressing "y" macro index,pager y "?" "show incoming mailboxes list" bind browser y exit @@ -34,7 +34,7 @@ bind browser y exit # close-hook '\.gz$' "gzip --stdout '%t' > '%f'" # append-hook '\.gz$' "gzip --stdout '%t' >> '%f'" -# If Mutt is unable to determine your site's domain name correctly, you can +# If NeoMutt is unable to determine your site's domain name correctly, you can # set the default here. # # set hostname=cs.hmc.edu @@ -71,11 +71,11 @@ mime_lookup application/octet-stream ## Qualify any MIME part with an "attachment" disposition, EXCEPT for ## text/x-vcard and application/pgp parts. (PGP parts are already known -## to mutt, and can be searched for with ~g, ~G, and ~k.) +## to neomutt, and can be searched for with ~g, ~G, and ~k.) ## ## I've added x-pkcs7 to this, since it functions (for S/MIME) ## analogously to PGP signature attachments. S/MIME isn't supported -## in a stock mutt build, but we can still treat it specially here. +## in a stock neomutt build, but we can still treat it specially here. ## attachments +A */.* attachments -A text/x-vcard application/pgp.* @@ -87,7 +87,7 @@ attachments -A application/x-pkcs7-.* ## attachments +I text/plain -## These two lines make Mutt qualify MIME containers. (So, for example, +## These two lines make NeoMutt qualify MIME containers. (So, for example, ## a message/rfc822 forward will count as an attachment.) The first ## line is unnecessary if you already have "attach-allow */.*", of ## course. These are off by default! The MIME elements contained diff --git a/doc/neomuttrc.man.head b/doc/neomuttrc.man.head index 76f09298c61..cbedd603074 100644 --- a/doc/neomuttrc.man.head +++ b/doc/neomuttrc.man.head @@ -28,7 +28,7 @@ .. .TH neomuttrc 5 "September 2002" Unix "User Manuals" .SH NAME -neomuttrc \- Configuration file for the Mutt Mail User Agent +neomuttrc \- Configuration file for the NeoMutt Mail User Agent .SH DESCRIPTION .PP A neomutt configuration file consists of a series of \(lqcommands\(rq. @@ -173,7 +173,7 @@ Valid maps are: .BR pager ", " pgp ", " postpone ", " .BR mix . .IP -For more information on keys and functions, please consult the Mutt +For more information on keys and functions, please consult the NeoMutt Manual. Note that the function name is to be specified without angle brackets. .TP @@ -208,15 +208,15 @@ the given \fIcommand\fP is executed. When multiple which they occur in the configuration file. .TP \fBtimeout-hook\fP \fIcommand\fP -Run a command periodically when Mutt checks for new mail. +Run a command periodically when NeoMutt checks for new mail. This hook is called every $timeout seconds. .TP \fBstartup-hook\fP \fIcommand\fP -Before neomutt opens the first mailbox when first starting, mutt will run the +Before neomutt opens the first mailbox when first starting, neomutt will run the startup hook for the given \fIcommand\fP. .TP \fBshutdown-hook\fP \fIcommand\fP -Before neomutt is about to exit, and before the mailbox is closed, mutt will run +Before neomutt is about to exit, and before the mailbox is closed, neomutt will run the shutdown hook for the given \fIcommand\fP. .TP \fBfolder-hook\fP [\fB!\fP]\fIregex\fP \fIcommand\fP @@ -284,7 +284,7 @@ the above mentioned list of ignored headers. \fBunsubscribe\fP \fIregex\fP [ \fIregex\fP ... ] .fi .IP -Mutt maintains two lists of mailing list address patterns, a list of +NeoMutt maintains two lists of mailing list address patterns, a list of subscribed mailing lists, and a list of known mailing lists. All subscribed mailing lists are known. Patterns use regular expressions. .IP @@ -382,7 +382,7 @@ a recipient. .IP These commands provide a way to handle compressed folders. The given \fBregex\fP specifies which folders are taken as compressed (e.g. -"\fI\\\\.gz$\fP"). The commands tell Mutt how to uncompress a folder +"\fI\\\\.gz$\fP"). The commands tell NeoMutt how to uncompress a folder (\fBopen-hook\fP), compress a folder (\fBclose-hook\fP) or append a compressed mail to a compressed folder (\fBappend-hook\fP). The \fIcommand\fP string is the @@ -405,7 +405,7 @@ This command adds the named \fIstring\fP to the keyboard buffer. These commands are used to set and manipulate configuration variables. .IP -Mutt knows four basic types of variables: boolean, number, string +NeoMutt knows four basic types of variables: boolean, number, string and quadoption. Boolean variables can be \fBset\fP (true), \fBunset\fP (false), or \fBtoggle\fPd. Number variables can be assigned a positive integer value. @@ -439,7 +439,7 @@ The given file will be evaluated as a configuration file. These commands define spam-detection patterns from external spam filters, so that neomutt can sort, limit, and search on ``spam tags'' or ``spam attributes'', or display them -in the index. See the Mutt manual for details. +in the index. See the NeoMutt manual for details. .PP .nf \fBsubjectrx\fP \fIpattern\fP \fIreplacement\fP @@ -473,7 +473,7 @@ can be any of the \fB-hook\fP commands documented above. .fi .IP These commands allow the user to modify the list of allowed header -fields in a \fImailto:\fP URL that Mutt will include in the +fields in a \fImailto:\fP URL that NeoMutt will include in the the generated message. By default the list contains \fBsubject\fP and \fBbody\fP, as specified by RFC2368; and \fBcc\fP, \fBin-reply-to\fP, and \fBreferences\fP to aid with @@ -507,7 +507,7 @@ Additionally, you can negate a pattern by prepending a bang (\(lq()\(rq). Example: \(lq!(~t neomutt|~c mutt) ~f elkins\(rq. .SS Simple Patterns .PP -Mutt understands the following simple patterns: +NeoMutt understands the following simple patterns: .P .PD 0 .TP 12 @@ -685,7 +685,7 @@ two-digit date, optionally followed by a two-digit month, optionally followed by a year specifications. Omitted fields default to the current month and year. .PP -Mutt understands either two or four digit year specifications. When +NeoMutt understands either two or four digit year specifications. When given a two-digit year, neomutt will interpret values less than 70 as lying in the 21st century (i.e., \(lq38\(rq means 2038 and not 1938, and \(lq00\(rq is interpreted as 2000), and values diff --git a/doc/neomuttrc.man.tail b/doc/neomuttrc.man.tail index a143450b21d..5eed71e16f6 100644 --- a/doc/neomuttrc.man.tail +++ b/doc/neomuttrc.man.tail @@ -6,7 +6,7 @@ .BR mailcap (5), .BR maildir (5), .BR mbox (5), -.BR mutt (1), +.BR neomutt (1), .BR printf (3), .BR regex (7), .BR strftime (3) diff --git a/doc/pgpewrap.1 b/doc/pgpewrap.1 index 20327349e6d..5fc4fdec891 100644 --- a/doc/pgpewrap.1 +++ b/doc/pgpewrap.1 @@ -19,7 +19,7 @@ .\" .TH pgpewrap 1 "May 2013" Unix "User Manuals" .SH NAME -pgpewrap \- Mutt command line munging tool +pgpewrap \- NeoMutt command line munging tool .SH SYNTAX .PP @@ -42,5 +42,5 @@ will execute: pgpe file -r a -r b -r c This script is needed with PGP 5 and with GPG, since their command -line interfaces can't be properly served by mutt's format mechanism. +line interfaces can't be properly served by neomutt's format mechanism. diff --git a/doc/pgpring.1 b/doc/pgpring.1 index 0009ad92ef1..67a1bbb1e5e 100644 --- a/doc/pgpring.1 +++ b/doc/pgpring.1 @@ -19,7 +19,7 @@ .\" .TH pgpring 1 "May 2013" Unix "User Manuals" .SH NAME -pgpring \- Mutt key ring dumper +pgpring \- NeoMutt key ring dumper .SH SYNTAX .PP @@ -30,7 +30,7 @@ pgpring \- Mutt key ring dumper .PP pgpring is a key ring dumper. It extracts information from PGP's binary key ring and emits it in an (almost) readable output format -understood by mutt's key selection routines. This output format +understood by neomutt's key selection routines. This output format mimics the one used by the GNU Privacy Guard (GPG). .SH OPTIONS diff --git a/doc/smime-notes.txt b/doc/smime-notes.txt index c355f87e57c..7380ab4f922 100644 --- a/doc/smime-notes.txt +++ b/doc/smime-notes.txt @@ -1,4 +1,4 @@ -How to use mutt's S/MIME capabilities +How to use neomutt's S/MIME capabilities - Add the contents of contrib/smime.rc to your .muttrc. Don't worry about changing the smime_default_key line at this point -- you'll change it later. @@ -23,7 +23,7 @@ How to use mutt's S/MIME capabilities provided when you exported the certificate. * When it asks for a "PEM pass phrase", make up a new password. Every - time you sign or decrypt a message, mutt will ask for the PEM pass + time you sign or decrypt a message, neomutt will ask for the PEM pass phrase. * Finally, when the script asks for a label, enter an easy-to-remember @@ -41,7 +41,7 @@ How to use mutt's S/MIME capabilities - You probably want to import trusted root certificates from Mozilla or the system. This makes you trust anything that was ultimately signed by one of them. You can use "smime_keys add_root" to do so, or just download - https://curl.haxx.se/ca/cacert.pem into the place you point mutt's + https://curl.haxx.se/ca/cacert.pem into the place you point neomutt's smime_ca_location variable to. @@ -71,7 +71,7 @@ mailbox, keyid, label, id of the intermediate certificate and keyflags. (verification failed), r: revoked, e: expired, u: unverified, v: successfully verified and finally t: trusted, in case it was successfully verified and you chose to trust the certificate (the - script will ask you). Mutt will not use invalid, revoked or expired + script will ask you). NeoMutt will not use invalid, revoked or expired certificates for signing or encryption. It will ask for confirmation before using unverified certificates, and finally it will issue a warning before using successfully verified but untrusted certificates. @@ -83,10 +83,10 @@ Key retrieval is done obviously by searching the index file for a given mailbox. If none is found, the user is presented a list of available keys and asked to select one of those. -The certificate and key directories specified in muttrc have to exist. Mutt +The certificate and key directories specified in muttrc have to exist. NeoMutt 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 certificate outside of mutt. (See above) +neomutt does not address any PKCS10 or PKCS12 issues (yet?); that is, you have +to get a valid certificate outside of neomutt. (See above) diff --git a/doc/smime_keys.1 b/doc/smime_keys.1 index cfbf5f6efaa..5a7ac4d46b6 100644 --- a/doc/smime_keys.1 +++ b/doc/smime_keys.1 @@ -21,14 +21,14 @@ .\" .TH smime_keys 1 "May 2009" Unix "User Manuals" .SH "NAME" -smime_keys \- Utility to add S/MIME certificate to the internal database used by mutt +smime_keys \- Utility to add S/MIME certificate to the internal database used by neomutt .SH SYNOPSIS .PP .B smime_keys [file(s) | keyID [file(s)]] .SH "DESCRIPTION" The purpose of this tool is to manipulate the internal database of S/MIME certificates -used by mutt to sign mail messages which will be sent or to verify mail messages received +used by neomutt to sign mail messages which will be sent or to verify mail messages received and signed with S/MIME .SH OPTIONS .PP @@ -66,4 +66,4 @@ but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. .PP -Mutt Home Page: http://www.mutt.org/ +NeoMutt Home Page: https://www.neomutt.org/ diff --git a/from.c b/from.c index 7ec527adbd5..e2eb7495e4e 100644 --- a/from.c +++ b/from.c @@ -70,7 +70,7 @@ int is_from(const char *s, char *path, size_t pathlen, time_t *tp) if (q || !*p) return 0; - /* pipermail archives have the return_path obscured such as "me at mutt.org" */ + /* pipermail archives have the return_path obscured such as "me at neomutt.org" */ if (mutt_str_strncasecmp(p, " at ", 4) == 0) { p = strchr(p + 4, ' '); diff --git a/imap/README b/imap/README index ac0d5fe1e09..ba8155463cb 100644 --- a/imap/README +++ b/imap/README @@ -1,4 +1,4 @@ -IMAP in mutt should be considered beta quality. For the most part it +IMAP in neomutt should be considered beta quality. For the most part it works well, but it is still not quite as stable or as full-featured as some of the other drivers. I believe it is now acceptable for daily use (and that's how I use it now, currently against Cyrus 1.6.24 and @@ -10,21 +10,21 @@ IMAP folder with multiple clients is not supported - it may work, but no guarantees. There are still several non-critical known bugs, see http://bugs.guug.de/ for the current list. -You may also be disappointed in mutt's handling of very large IMAP mailboxes. -To build the message index mutt must fetch a subset of headers from every +You may also be disappointed in neomutt's handling of very large IMAP mailboxes. +To build the message index neomutt must fetch a subset of headers from every message in the mailbox, which costs time and network traffic linear to the number of messages in your mailbox. -Nevertheless in general mutt is quite a fast and fully-featured IMAP client. +Nevertheless in general neomutt is quite a fast and fully-featured IMAP client. It tries to be polite to IMAP servers as well, opening few connections and avoiding needless polls of the server, unlike certain other popular IMAP clients by certain large corporations :) -Mutt supports almost all official authentication and security protocols for +NeoMutt supports almost all official authentication and security protocols for IMAP, including SSL/TLS, native CRAM-MD5 and GSSAPI routines, and a SASL plugin which can handle just about everything else. -Please report bugs to mutt-dev@mutt.org and/or brendan@kublai.com. Version, +Please report bugs to neomutt-dev@neomutt.org and/or brendan@kublai.com. Version, options, stack-trace and .neomuttdebug files are a plus. Brendan Cully diff --git a/imap/command.c b/imap/command.c index 7fee52b8f5d..a0420b0750d 100644 --- a/imap/command.c +++ b/imap/command.c @@ -331,7 +331,7 @@ static void cmd_parse_fetch(struct ImapData *idata, char *s) imap_set_flags(idata, h, s, &server_changes); if (server_changes) { - /* If server flags could conflict with mutt's flags, reopen the mailbox. */ + /* If server flags could conflict with neomutt's flags, reopen the mailbox. */ if (h->changed) idata->reopen |= IMAP_EXPUNGE_PENDING; else diff --git a/imap/imap.c b/imap/imap.c index e5d3827a83d..27f0f1a1635 100644 --- a/imap/imap.c +++ b/imap/imap.c @@ -906,7 +906,7 @@ void imap_expunge_mailbox(struct ImapData *idata) else { h->index = i; - /* Mutt has several places where it turns off h->active as a + /* NeoMutt has several places where it turns off h->active as a * hack. For example to avoid FLAG updates, or to exclude from * imap_exec_msgset. * diff --git a/mbox.c b/mbox.c index 841094dd301..ba1f802f911 100644 --- a/mbox.c +++ b/mbox.c @@ -1218,7 +1218,7 @@ static int mbox_sync_mailbox(struct Context *ctx, int *index_hint) char savefile[_POSIX_PATH_MAX]; - snprintf(savefile, sizeof(savefile), "%s/mutt.%s-%s-%u", NONULL(Tmpdir), + snprintf(savefile, sizeof(savefile), "%s/neomutt.%s-%s-%u", NONULL(Tmpdir), NONULL(Username), NONULL(ShortHostname), (unsigned int) getpid()); rename(tempfile, savefile); mutt_sig_unblock(); diff --git a/mh.c b/mh.c index 41580af85b5..2614df88fa3 100644 --- a/mh.c +++ b/mh.c @@ -386,7 +386,7 @@ static int mh_mkstemp(struct Context *dest, FILE **fp, char **tgt) omask = umask(mh_umask(dest)); while (true) { - snprintf(path, _POSIX_PATH_MAX, "%s/.mutt-%s-%d-%" PRIu64, dest->path, + snprintf(path, _POSIX_PATH_MAX, "%s/.neomutt-%s-%d-%" PRIu64, dest->path, NONULL(ShortHostname), (int) getpid(), mutt_rand64()); fd = open(path, O_WRONLY | O_EXCL | O_CREAT, 0666); if (fd == -1)