X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=contrib%2Fsample.muttngrc;h=edddfd5cb459a7975c2dccdce0b8ae77a1f7bad6;hp=23b782e5f7ed7acf83a4bb56dba57a5922aa979d;hb=e4ebc9b0ae5de07d53d8b0ecf594244e1bc44d0a;hpb=c3b4e01c2a35f1deb308ec4ca5224e031a4576bb

diff --git a/contrib/sample.muttngrc b/contrib/sample.muttngrc
index 23b782e..edddfd5 100644
--- a/contrib/sample.muttngrc
+++ b/contrib/sample.muttngrc
@@ -156,7 +156,7 @@ set ask_follow_up=yes
 
 # If set, Mutt will prompt you for x-comment-to field before editing the
 # body of an outgoing message.
-#set ask_x_comment_to
+#set nntp_ask_x_comment_to
 
 # This  variable  describes the format of the 'attachment' menu.
 # (see "man muttngrc for details).
@@ -182,7 +182,7 @@ set bounce=ask-no
 
 # Get asked if Mutt mark all articles in newsgroup as read when you quit the 
 # newsgroup. Default-NO
-set catchup_newsgroup=ask-no
+set nntp_catchup=ask-no
 
 # Character set your terminal uses
 set charset="iso-8859-15"
@@ -227,7 +227,7 @@ set folder=~/.mutt/Mail
 set folder_format="%2C %N %-40.40f %d"
 
 # Ask me by a follow-up2poster
-set followup_to_poster=ask-yes
+set nntp_followup_to_poster=ask-yes
 
 # This  variable  describes the format of the subject when forwarding 
 # a message.
@@ -235,7 +235,7 @@ set forward_format="(Weiterleitung) %s [%a]"
 
 # This  variable  describes the display of the newsgroup-browser.
 # (see "man muttngrc" for details).
-set group_index_format="%4C %M%N %5s  %-45.45f %d"
+set nntp_group_index_format="%4C %M%N %5s  %-45.45f %d"
 
 # This  variable controls the size of the history-buffer.
 set history=100
@@ -280,10 +280,10 @@ set message_format="%-.16n: %s"
 set msgid_format="%Y-%m-%dT%h-%M-%s.G%P%p"
 
 # In this directory muttng will save cached news articles headers.
-set news_cache_dir="~/.mutt/newsspool"
+set nntp_cache_dir="~/.mutt/newsspool"
 
 # In this file muttng write information about subscribed newsgroups.
-set newsrc="~/.mutt/newsrc"
+set nntp_newsrc="~/.mutt/newsrc"
 
 # This variable define the format of the "status"-line in the pager.
 set pager_format="%> [%b]"
@@ -363,10 +363,10 @@ set send_charset="us-ascii:iso-8859-1:iso-8859-15:utf-8"
 set smtp_host="mail.gmx.de"
 
 # Set the username for authentication on mail.gmx.de
-set smtp_auth_username="......."
+set smtp_user="......."
 
 # Set the password for authentication on mail.gmx.de
-set smtp_auth_password="......."
+set smtp_pass="......."
 
 
 # NO sendmail. I deliver via "smtp_host"!
@@ -380,10 +380,10 @@ set smtp_auth_password="......."
 #set sendmail_wait=-1
 
 # Asked the newsserver for new newsgroups when entering the browser.
-set show_new_news
+set nntp_show_new_news
 
 # Show only unread and subscribed newsgroups
-#set show_only_unread
+#set nntp_show_only_unread
 
 # 30 chars width for the left sidebar
 set sidebar_width=30
@@ -426,7 +426,7 @@ set tilde
 set trash=+papierkorb
 
 # Set the User-Agent-Header.
-set user_agent
+set agent_string
 
 # Do not wait for a keypress, if I use a commando like "pipe-message".
 unset wait_key
@@ -503,7 +503,7 @@ my_hdr X-GnuPG-KeyID: 8BCAC169
 my_hdr X-GnuPG-Fingerprint: 95F3 5951 6091 8F46 82B9  EE2E 9686 20D3 8BCA C169
 
 # My X-Editor-header. Look strange. ;)
-my_hdr X-Editor: `vim --version | grep IMp | awk -F"(" '{ print $1 }'|sed 's/[ ]$//g'`.`vim --version | rev |grep cnI | awk '{ print $1}' | rev | awk -F "1-" '{ print $2 }'`
+#my_hdr X-Editor: `vim --version | grep IMp | awk -F"(" '{ print $1 }'|sed 's/[ ]$//g'`.`vim --version | rev |grep cnI | awk '{ print $1}' | rev | awk -F "1-" '{ print $2 }'`
 
 # My From-header.
 my_hdr From: akneib@foobar.tld
@@ -603,7 +603,7 @@ save-hook .                                           +archiv/save-`date +%Y-%m`
 
 
 # Send-Hooks. No PGP-autosign for all messages.
-send-hook . "unset pgp_autosign"
+send-hook . "unset crypt_autosign"
 
 # Define an atriibution-line an a from-header which use, 
 # when send a message to this mailinglist.
@@ -612,11 +612,11 @@ send-hook ^mailingliste@.*invalid\\.foo$ \
 
 # PGP-autoencrypt and set a new attribution-line for this recipient.
 send-hook ^gerd.geppert@(bar|foobar|invalid)\\.tld \
-      'set pgp_autoencrypt attribution="Hallo %v,\n\n* Du schriebst:\n" ; my_hdr From: "Andreas Kneib" <akneib@inval.id>'
+      'set crypt_autoencrypt attribution="Hallo %v,\n\n* Du schriebst:\n" ; my_hdr From: "Andreas Kneib" <akneib@inval.id>'
 
 # PGP-autosign and set a new attribution-line for this recipient.
 send-hook ^.*@foobar.invalid \
-      'set pgp_autosign attribution="Hallo %v,\n\n* Du schriebst:\n"'
+      'set crypt_autosign attribution="Hallo %v,\n\n* Du schriebst:\n"'
 
 
 # Send-hook for newsgroups. "!~t." means: Messages with no To:-header.