Merge branch 'develop'

Conflicts:
	INSTALL
	README
	USAGE

1 files changed, 32 insertions, 28 deletions

diff --git a/INSTALL b/INSTALL
index 8ed2eaeb..a995a3f6 100644
--- a/INSTALL
+++ b/INSTALL
@@ -3,39 +3,45 @@ INSTALL
 
 Alot depends on development versions of notmuch and urwid.
 Note that due to restrictions on argparse and subprocess,
-you need to run python v>=2.7.
+you need to run *python v>=2.7*.
 
-1. make sure you have urwid V>= 1.0
--------------------------------------
+urwid
+-----
+make sure you have
+
+    git clone http://github.com/wardi/urwid
+    cd urwid
+    sudo python setup.py install
 
-> git clone http://github.com/wardi/urwid
-> cd urwid
-> sudo python setup.py install
 It seems you need the python headers for this.
 On debian/ubuntu:
->aptitude install python2.7-dev
 
+    aptitude install python2.7-dev
+
+
+notmuch
+-------
+install notmuch *and* python bindings from git:
 
-2. install notmuch and python bindings from git:
-------------------------------------------------
+    git clone git://notmuchmail.org/git/notmuch
 
-> git clone git://notmuchmail.org/git/notmuch
-> cd notmuch
-> ./configure
-> make
-> sudo make install
-> cd bindings/python
-> sudo python setup.py install
+    cd notmuch
+    ./configure
+    make
+    sudo make install
+    cd bindings/python
+    sudo python setup.py install
 
 
-3. get alot and install it from git:
-------------------------------------
+alot
+----
+get alot and install it from git:
 
-> git clone git://github.com/pazz/alot alot
-> cd alot
-> sudo python setup.py install
+    git clone git://github.com/pazz/alot alot
+    cd alot
+    sudo python setup.py install
 
-That's it, now "alot" should be in your path.
+That's it, now `alot` should be in your path.
 
 Alot tries to be as unobtrusive as possible, with one exception:
 It forces you to use UTF-8 encoding whereever it can:
@@ -43,12 +49,10 @@ All text parts and headers of outgoing emails are converted to utf-8,
 notmuch tagstrings, edited emails and config files are interpreted as utf-8.
 
 All configs are optional, but if you want to send mails you need to
-specify at least one account section:
+specify at least one account section in you config:
 
-  [account uoe]
-  realname = Your Name
-  address = your@address
-  sendmail_command = msmtp
-  sent_mailbox = maildir:///home/you/mail/Sent
+    [account uoe]
+    realname = Your Name
+    address = your@address
 
 See USAGE for default keymaps and how to do fancy customization.