saving uncommitted changes in /etc prior to emerge run

diff --git a/mutt/Muttrc.dist b/mutt/Muttrc.dist
index 693bbc3a39d590ed519b07f116da515f09e02abd..258d2e92888579b64f7ee0e334d60468a3f32c33 100644 (file)
--- a/mutt/Muttrc.dist
+++ b/mutt/Muttrc.dist
@@ -23,7 +23,7 @@ macro index,pager,attach,compose \cb "\
 "call urlview to extract URLs out of a message"
 
 # Show documentation when pressing F1
-macro generic,pager <F1> "<shell-escape> less /usr/share/doc/mutt-1.5.23-r7/manual.txt<Enter>" "show Mutt documentation"
+macro generic,pager <F1> "<shell-escape> less /usr/share/doc/mutt-1.5.24-r2/manual.txt<Enter>" "show Mutt documentation"
 
 # show the incoming mailboxes list (just like "mutt -y") and back when pressing "y"
 macro index,pager y "<change-folder>?<toggle-mailboxes>" "show incoming mailboxes list"
@@ -2111,6 +2111,21 @@ attachments   -I message/external-body
 # mailbox types.
 # 
 # 
+# set maildir_check_cur=no
+#
+# Name: maildir_check_cur
+# Type: boolean
+# Default: no
+# 
+# 
+# If set, mutt will poll both the new and cur directories of
+# a maildir folder for new messages.  This might be useful if other
+# programs interacting with the folder (e.g. dovecot) are moving new
+# messages to the cur directory.  Note that setting this option may
+# slow down polling for new messages in large folders, since mutt has
+# to scan all cur messages.
+# 
+# 
 # set mark_old=yes
 #
 # Name: mark_old
@@ -2885,6 +2900,10 @@ attachments   -I message/external-body
 # This format is also generated by the pgpring utility which comes
 # with mutt.
 # 
+# Note: gpg's fixed-list-mode option should not be used.  It
+# produces a different date format which may result in mutt showing
+# incorrect key generation dates.
+# 
 # This is a format string, see the $pgp_decode_command command for
 # possible printf(3)-like sequences.
 # (PGP only)
@@ -2904,6 +2923,10 @@ attachments   -I message/external-body
 # This format is also generated by the pgpring utility which comes
 # with mutt.
 # 
+# Note: gpg's fixed-list-mode option should not be used.  It
+# produces a different date format which may result in mutt showing
+# incorrect key generation dates.
+# 
 # This is a format string, see the $pgp_decode_command command for
 # possible printf(3)-like sequences.
 # (PGP only)
@@ -4767,18 +4790,20 @@ attachments   -I message/external-body
 # 
 # 
 # This variable specifies whether to attempt to use SSLv2 in the
-# SSL authentication process.
+# SSL authentication process. Note that SSLv2 and SSLv3 are now
+# considered fundamentally insecure and are no longer recommended.
 # 
 # 
-# set ssl_use_sslv3=yes
+# set ssl_use_sslv3=no
 #
 # Name: ssl_use_sslv3
 # Type: boolean
-# Default: yes
+# Default: no
 # 
 # 
 # This variable specifies whether to attempt to use SSLv3 in the
-# SSL authentication process.
+# SSL authentication process. Note that SSLv2 and SSLv3 are now
+# considered fundamentally insecure and are no longer recommended.
 # 
 # 
 # set ssl_use_tlsv1=yes