Package: mutt
Version: 1.5.18-6
Severity: minor
Tags: patch

The "manual.txt.gz" doc file contains many typos and minor errors.
Here's a patch to fix them:


# This is a patch for manual.txt to update it to manual.txt.new
# 
# To apply this patch:
# STEP 1: Chdir to the source directory.
# STEP 2: Run the 'applypatch' program with this patch file as input.
#
# If you do not have 'applypatch', it is part of the 'makepatch' package
# that you can fetch from the Comprehensive Perl Archive Network:
# http://www.perl.com/CPAN/authors/Johan_Vromans/makepatch-x.y.tar.gz
# In the above URL, 'x' should be 2 or higher.
#
# To apply this patch without the use of 'applypatch':
# STEP 1: Chdir to the source directory.
# STEP 2: Run the 'patch' program with this file as input.
#
#### End of Preamble ####

#### Patch data follows ####
diff -c 'manual.txt' 'manual.txt.new'
Index: ./manual.txt
*** ./manual.txt        Mon Sep 21 19:25:35 2009
--- ./manual.txt.new    Mon Sep 21 19:25:09 2009
***************
*** 123,129 ****
  
                  27. Reading initialization commands from another file
  
!                 28. Configuring features conditionnaly
  
                  29. Removing hooks
  
--- 123,129 ----
  
                  27. Reading initialization commands from another file
  
!                 28. Configuring features conditionally
  
                  29. Removing hooks
  
***************
*** 1143,1149 ****
     |----------------+-----------------+-------------------------------------|
     | ^K             | kill-eol        | delete to the end of the line       |
     |----------------+-----------------+-------------------------------------|
!    | ESC d          | kill-eow        | delete to the end ot the word       |
     |----------------+-----------------+-------------------------------------|
     | ^W             | kill-word       | kill the word in front of the       |
     |                |                 | cursor                              |
--- 1143,1149 ----
     |----------------+-----------------+-------------------------------------|
     | ^K             | kill-eol        | delete to the end of the line       |
     |----------------+-----------------+-------------------------------------|
!    | ESC d          | kill-eow        | delete to the end to the word       |
     |----------------+-----------------+-------------------------------------|
     | ^W             | kill-word       | kill the word in front of the       |
     |                |                 | cursor                              |
***************
*** 1832,1838 ****
     current chain position, use the insert function. To append a remailer
     behind the current chain position, use select-entry or append. You can
     also delete entries from the chain, using the corresponding function.
!    Finally, to abandon your changes, leave the menu, or accept them pressing
     (by default) the Return key.
  
     Note that different remailers do have different capabilities, indicated in
--- 1832,1838 ----
     current chain position, use the insert function. To append a remailer
     behind the current chain position, use select-entry or append. You can
     also delete entries from the chain, using the corresponding function.
!    Finally, to abandon your changes, leave the menu, or accept them, pressing
     (by default) the Return key.
  
     Note that different remailers do have different capabilities, indicated in
***************
*** 1866,1872 ****
     calling the editor).
  
     After editing the initial message text and before entering the compose
!    menu, mutt properly space-stuffes the message. Space-stuffing is required
     by RfC3676 defining format=flowed and means to prepend a space to:
  
       o all lines starting with a space
--- 1866,1872 ----
     calling the editor).
  
     After editing the initial message text and before entering the compose
!    menu, mutt properly space-stuffs the message. Space-stuffing is required
     by RfC3676 defining format=flowed and means to prepend a space to:
  
       o all lines starting with a space
***************
*** 2016,2022 ****
  
     27. Reading initialization commands from another file
  
!    28. Configuring features conditionnaly
  
     29. Removing hooks
  
--- 2016,2022 ----
  
     27. Reading initialization commands from another file
  
!    28. Configuring features conditionally
  
     29. Removing hooks
  
***************
*** 2125,2131 ****
     interpreted as: either a regular expression or an email address,
     respectively.
  
!    These address groups can also be created implicitely by the alias, lists,
     subscribe and alternates commands by specifying the optional -group
     option.
  
--- 2125,2131 ----
     interpreted as: either a regular expression or an email address,
     respectively.
  
!    These address groups can also be created implicitly by the alias, lists,
     subscribe and alternates commands by specifying the optional -group
     option.
  
***************
*** 2416,2422 ****
  
       o body (match regexp in the body of messages)
  
!      o bold (hiliting bold patterns in the body of messages)
  
       o error (error messages printed by Mutt)
  
--- 2416,2422 ----
  
       o body (match regexp in the body of messages)
  
!      o bold (highlighting bold patterns in the body of messages)
  
       o error (error messages printed by Mutt)
  
***************
*** 2439,2445 ****
  
       o quoted1, quoted2, ..., quotedN (higher levels of quoting)
  
!      o search (hiliting of words in the pager)
  
       o signature
  
--- 2439,2445 ----
  
       o quoted1, quoted2, ..., quotedN (higher levels of quoting)
  
!      o search (highlighting of words in the pager)
  
       o signature
  
***************
*** 2449,2455 ****
  
       o tree (thread tree drawn in the message index and attachment menu)
  
!      o underline (hiliting underlined patterns in the body of messages)
  
     foreground and background can be one of the following:
  
--- 2449,2455 ----
  
       o tree (thread tree drawn in the message index and attachment menu)
  
!      o underline (highlighting underlined patterns in the body of messages)
  
     foreground and background can be one of the following:
  
***************
*** 2677,2683 ****
     is executed, so if these names contain shortcut characters (such as ``=''
     and ``!''), any variable definition that affect these characters (like
     $folder and $spoolfile) should be executed before the mailboxes command.
!    If none of these shorcuts are used, a local path should be absolute as
     otherwise mutt tries to find it within the current working directory from
     where mutt was started which may not always be desired.
  
--- 2677,2683 ----
     is executed, so if these names contain shortcut characters (such as ``=''
     and ``!''), any variable definition that affect these characters (like
     $folder and $spoolfile) should be executed before the mailboxes command.
!    If none of these shortcuts are used, a local path should be absolute as
     otherwise mutt tries to find it within the current working directory from
     where mutt was started which may not always be desired.
  
***************
*** 3121,3127 ****
     to be an executable program from which to read input (eg. source
     ~/bin/myscript|).
  
! 28. Configuring features conditionnaly
  
     Usage: ifdef item command
  
--- 3121,3127 ----
     to be an executable program from which to read input (eg. source
     ~/bin/myscript|).
  
! 28. Configuring features conditionally
  
     Usage: ifdef item command
  
***************
*** 3156,3165 ****
     with each format variable, but there are general modifiers available with
     all formatting expandos, too. Those are our concern here.
  
!    Some of the modifers are borrowed right out of C (though you might know
!    them from Perl, Python, shell, or another langugage). These are the [-]m.n
     modifiers, as in %-12.12s. As with such programming languages, these
!    modifiers allow you to specify the minumum and maximum size of the
     resulting string, as well as its justification. If the ``-'' sign follows
     the percent, the string will be left-justified instead of right-justified.
     If there's a number immediately following that, it's the minimum amount of
--- 3156,3165 ----
     with each format variable, but there are general modifiers available with
     all formatting expandos, too. Those are our concern here.
  
!    Some of the modifiers are borrowed right out of C (though you might know
!    them from Perl, Python, shell, or another language). These are the [-]m.n
     modifiers, as in %-12.12s. As with such programming languages, these
!    modifiers allow you to specify the minimum and maximum size of the
     resulting string, as well as its justification. If the ``-'' sign follows
     the percent, the string will be left-justified instead of right-justified.
     If there's a number immediately following that, it's the minimum amount of
***************
*** 3688,3694 ****
  
   ~f "me@(mutt\.org|cs\.hmc\.edu)"
  
!    Without the quotes, the parenthesis wouldn't end. This would be seperated
     to two OR'd patterns: ~f me@(mutt\.org and cs\.hmc\.edu). They are never
     what you want.
  
--- 3688,3694 ----
  
   ~f "me@(mutt\.org|cs\.hmc\.edu)"
  
!    Without the quotes, the parenthesis wouldn't end. This would be separated
     to two OR'd patterns: ~f me@(mutt\.org and cs\.hmc\.edu). They are never
     what you want.
  
***************
*** 4152,4158 ****
     close-hook is called, and not append-hook. append-hook is only for
     appending to existing folders. If the command is empty, this operation is
     disabled for this file type. In this case, the folder will be open and
!    closed again (using open-hook and close-hookrespectively) each time you
     will add to it.
  
    1.4. Encrypted folders
--- 4152,4158 ----
     close-hook is called, and not append-hook. append-hook is only for
     appending to existing folders. If the command is empty, this operation is
     disabled for this file type. In this case, the folder will be open and
!    closed again (using open-hook and close-hook, respectively) each time you
     will add to it.
  
    1.4. Encrypted folders
***************
*** 4734,4740 ****
     Disposition is the attachment's Content-disposition type -- either
     "inline" or "attachment". You can abbreviate this to I or A.
  
!    Disposition is prefixed by either a + symbolor a - symbol. If it's a +,
     you're saying that you want to allow this disposition and MIME type to
     qualify. If it's a -, you're saying that this disposition and MIME type is
     an exception to previous + rules. There are examples below of how this is
--- 4734,4740 ----
     Disposition is the attachment's Content-disposition type -- either
     "inline" or "attachment". You can abbreviate this to I or A.
  
!    Disposition is prefixed by either a + symbol or a - symbol. If it's a +,
     you're saying that you want to allow this disposition and MIME type to
     qualify. If it's a -, you're saying that this disposition and MIME type is
     an exception to previous + rules. There are examples below of how this is
***************
*** 4796,4802 ****
   ## line is unnecessary if you already have "attach-allow */.*", of
   ## course.  These are off by default!  The MIME elements contained
   ## within a message/* or multipart/* are still examined, even if the
!  ## containers themseves don't qualify.
   ##
   #attachments  +A message/.* multipart/.*
   #attachments  +I message/.* multipart/.*
--- 4796,4802 ----
   ## line is unnecessary if you already have "attach-allow */.*", of
   ## course.  These are off by default!  The MIME elements contained
   ## within a message/* or multipart/* are still examined, even if the
!  ## containers themselves don't qualify.
   ##
   #attachments  +A message/.* multipart/.*
   #attachments  +I message/.* multipart/.*
***************
*** 4903,4909 ****
     different username for each folder:
     imap://usern...@imapserver[:port]/INBOX or
     imap://userna...@imapserver[:port]/path/to/folder. Replacing imap:// by
!    imaps:// would make mutt attempt to conect using SSL or TLS on a different
     port to encrypt the communication.
  
  2. SSL/TLS Support
--- 4903,4909 ----
     different username for each folder:
     imap://usern...@imapserver[:port]/INBOX or
     imap://userna...@imapserver[:port]/path/to/folder. Replacing imap:// by
!    imaps:// would make mutt attempt to connect using SSL or TLS on a different
     port to encrypt the communication.
  
  2. SSL/TLS Support
***************
*** 5206,5212 ****
     with ``='' for string searches.
  
     Even though a regular expression search is fast, it's several times slower
!    than a pure string search which is noticable especially on large folders.
     As a consequence, a string search should be used instead of a regular
     expression search if the user already knows enough about the search
     pattern.
--- 5206,5212 ----
     with ``='' for string searches.
  
     Even though a regular expression search is fast, it's several times slower
!    than a pure string search which is noticeable especially on large folders.
     As a consequence, a string search should be used instead of a regular
     expression search if the user already knows enough about the search
     pattern.
***************
*** 6639,6647 ****
  
     This variable sets the request for when notification is returned. The
     string consists of a comma separated list (no spaces!) of one or more of
!    the following: never, to never request notification, failure, to request
!    notification on transmission failure, delay, to be notified of message
!    delays, success, to be notified of successful transmission.
  
     Example: set dsn_notify="failure,delay"
  
--- 6639,6647 ----
  
     This variable sets the request for when notification is returned. The
     string consists of a comma separated list (no spaces!) of one or more of
!    the following: never, to never request notification; failure, to request
!    notification on transmission failure; delay, to be notified of message
!    delays; success, to be notified of successful transmission.
  
     Example: set dsn_notify="failure,delay"
  
***************
*** 8134,8140 ****
  
     If set, Mutt will automatically encode PGP/MIME signed messages as
     quoted-printable. Please note that unsetting this variable may lead to
!    problems with non-verifyable PGP signatures, so only change this if you
     know what you are doing. (PGP only)
  
    3.166. pgp_timeout
--- 8134,8140 ----
  
     If set, Mutt will automatically encode PGP/MIME signed messages as
     quoted-printable. Please note that unsetting this variable may lead to
!    problems with non-verifiable PGP signatures, so only change this if you
     know what you are doing. (PGP only)
  
    3.166. pgp_timeout
***************
*** 9645,9651 ****
     Type: number
     Default: 600
  
!    When Mutt is waiting for user input either idleing in menus or in an
     interactive prompt, Mutt would block until input is present. Depending on
     the context, this would prevent certain operations from working, like
     checking for new mail or keeping an IMAP connection alive.
--- 9645,9651 ----
     Type: number
     Default: 600
  
!    When Mutt is waiting for user input, either idling in menus or in an
     interactive prompt, Mutt would block until input is present. Depending on
     the context, this would prevent certain operations from working, like
     checking for new mail or keeping an IMAP connection alive.
#### End of Patch data ####

#### ApplyPatch data follows ####
# Data version        : 1.0
# Date generated      : Mon Sep 21 19:27:30 2009
# Generated by        : makepatch 2.03
# Recurse directories : Yes
# Excluded files      : (\A|/).*\~\Z
#                       (\A|/).*\.a\Z
#                       (\A|/).*\.bak\Z
#                       (\A|/).*\.BAK\Z
#                       (\A|/).*\.elc\Z
#                       (\A|/).*\.exe\Z
#                       (\A|/).*\.gz\Z
#                       (\A|/).*\.ln\Z
#                       (\A|/).*\.o\Z
#                       (\A|/).*\.obj\Z
#                       (\A|/).*\.olb\Z
#                       (\A|/).*\.old\Z
#                       (\A|/).*\.orig\Z
#                       (\A|/).*\.rej\Z
#                       (\A|/).*\.so\Z
#                       (\A|/).*\.Z\Z
#                       (\A|/)\.del\-.*\Z
#                       (\A|/)\.make\.state\Z
#                       (\A|/)\.nse_depinfo\Z
#                       (\A|/)core\Z
#                       (\A|/)tags\Z
#                       (\A|/)TAGS\Z
# p 'manual.txt' 401661 1253586309 0100640
#### End of ApplyPatch data ####

#### End of Patch kit [created: Mon Sep 21 19:27:30 2009] ####
#### Patch checksum: 405 16178 7588 ####
#### Checksum: 423 16864 64845 ####

-- Package-specific info:
Mutt 1.5.18 (2008-05-17)
Copyright (C) 1996-2008 Michael R. Elkins and others.
Mutt comes with ABSOLUTELY NO WARRANTY; for details type `mutt -vv'.
Mutt is free software, and you are welcome to redistribute it
under certain conditions; type `mutt -vv' for details.

System: Linux 2.6.26-2-686 (i686)
ncurses: ncurses 5.7.20081213 (compiled with 5.7)
libidn: 1.8 (compiled with 1.10)
hcache backend: GDBM version 1.8.3. 10/15/2002 (built Apr 24 2006 03:25:20)
Compile options:
-DOMAIN
+DEBUG
-HOMESPOOL  +USE_SETGID  +USE_DOTLOCK  +DL_STANDALONE  
+USE_FCNTL  -USE_FLOCK   
+USE_POP  +USE_IMAP  +USE_SMTP  +USE_GSS  -USE_SSL_OPENSSL  +USE_SSL_GNUTLS  
+USE_SASL  +HAVE_GETADDRINFO  
+HAVE_REGCOMP  -USE_GNU_REGEX  
+HAVE_COLOR  +HAVE_START_COLOR  +HAVE_TYPEAHEAD  +HAVE_BKGDSET  
+HAVE_CURS_SET  +HAVE_META  +HAVE_RESIZETERM  
+CRYPT_BACKEND_CLASSIC_PGP  +CRYPT_BACKEND_CLASSIC_SMIME  -CRYPT_BACKEND_GPGME  
-EXACT_ADDRESS  -SUN_ATTACHMENT  
+ENABLE_NLS  -LOCALES_HACK  +COMPRESSED  +HAVE_WC_FUNCS  +HAVE_LANGINFO_CODESET 
 +HAVE_LANGINFO_YESEXPR  
+HAVE_ICONV  -ICONV_NONTRANS  +HAVE_LIBIDN  +HAVE_GETSID  +USE_HCACHE  
-ISPELL
SENDMAIL="/usr/sbin/sendmail"
MAILPATH="/var/mail"
PKGDATADIR="/usr/share/mutt"
SYSCONFDIR="/etc"
EXECSHELL="/bin/sh"
MIXMASTER="mixmaster"
To contact the developers, please mail to <mutt-...@mutt.org>.
To report a bug, please visit http://bugs.mutt.org/.

patch-1.5.13.cd.ifdef.2
patch-1.5.13.cd.purge_message.3.4
patch-1.5.13.nt+ab.xtitles.4
patch-1.5.4.vk.pgp_verbose_mime
patch-1.5.6.dw.maildir-mtime.1
patch-1.5.8.hr.sensible_browser_position.3

-- System Information:
Debian Release: 5.0.3
  APT prefers stable
  APT policy: (500, 'stable')
Architecture: i386 (i686)

Kernel: Linux 2.6.26-2-686 (SMP w/1 CPU core)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/bash

Versions of packages mutt depends on:
ii  libc6           2.7-18                   GNU C Library: Shared libraries
ii  libcomerr2      1.41.3-1                 common error description library
ii  libgdbm3        1.8.3-3                  GNU dbm database routines (runtime
ii  libgnutls26     2.4.2-6+lenny1           the GNU TLS library - runtime libr
ii  libidn11        1.8+20080606-1           GNU libidn library, implementation
ii  libkrb53        1.6.dfsg.4~beta1-5lenny1 MIT Kerberos runtime libraries
ii  libncursesw5    5.7+20081213-1           shared libraries for terminal hand
ii  libsasl2-2      2.1.22.dfsg1-23+lenny1   Cyrus SASL - authentication abstra

Versions of packages mutt recommends:
ii  locales                       2.7-18     GNU C Library: National Language (
ii  mime-support                  3.44-1     MIME files 'mime.types' & 'mailcap
ii  postfix [mail-transport-agent 2.5.5-1.1  High-performance mail transport ag

Versions of packages mutt suggests:
ii  ca-certificates         20080809         Common CA certificates
ii  gnupg                   1.4.9-3+lenny1   GNU privacy guard - a free PGP rep
ii  ispell                  3.1.20.0-4.4     International Ispell (an interacti
pn  mixmaster               <none>           (no description available)
ii  openssl                 0.9.8g-15+lenny5 Secure Socket Layer (SSL) binary a
pn  urlview                 <none>           (no description available)

Versions of packages mutt is related to:
ii  mutt                          1.5.18-6   text-based mailreader supporting M
pn  mutt-dbg                      <none>     (no description available)
pn  mutt-patched                  <none>     (no description available)

-- no debconf information



-- 
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org

Reply via email to