Merge branch 'release'

[notmuch] / INSTALL

diff --git a/INSTALL b/INSTALL
index b543c5085e3278b494e501f3c991c1a56ff8d5a1..6099ed01b39d1c4a9b4476bddebe40d0e5f2109b 100644 (file)
--- a/INSTALL
+++ b/INSTALL
@@ -20,7 +20,7 @@ configure stage.
 
 Dependencies
 ------------
 
 Dependencies
 ------------

-Notmuch depends on four libraries: Xapian, GMime 2.4 or 2.6,
+Notmuch depends on four libraries: Xapian, GMime 2.6,

 Talloc, and zlib which are each described below:
 
        Xapian
 Talloc, and zlib which are each described below:
 
        Xapian


@@ -30,7 +30,7 @@ Talloc, and zlib which are each described below:
        It provides all the real machinery of indexing and searching,
        (including the very nice parsing of the query string).
 
        It provides all the real machinery of indexing and searching,
        (including the very nice parsing of the query string).
 

-       Xapian is available from http://xapian.org
+       Xapian is available from https://xapian.org

 
        Note: Notmuch will work best with Xapian 1.0.18 (or later) or
        Xapian 1.1.4 (or later). Previous versions of Xapian (whether
 
        Note: Notmuch will work best with Xapian 1.0.18 (or later) or
        Xapian 1.1.4 (or later). Previous versions of Xapian (whether


@@ -39,8 +39,8 @@ Talloc, and zlib which are each described below:
        reading mail while notmuch would wait for Xapian when removing
        the "inbox" and "unread" tags from messages in a thread.
 
        reading mail while notmuch would wait for Xapian when removing
        the "inbox" and "unread" tags from messages in a thread.
 

-       GMime 2.4 or 2.6
-       ----------------
+       GMime  2.6
+       ----------

        GMime provides decoding of MIME email messages for Notmuch.
 
        Without GMime, Notmuch would not be able to extract and index
        GMime provides decoding of MIME email messages for Notmuch.
 
        Without GMime, Notmuch would not be able to extract and index


@@ -58,7 +58,7 @@ Talloc, and zlib which are each described below:
        made development of Notmuch much easier and much less prone to
        memory leaks.
 
        made development of Notmuch much easier and much less prone to
        memory leaks.
 

-       Talloc is available from http://talloc.samba.org/
+       Talloc is available from https://talloc.samba.org/

 
        zlib
        ----
 
        zlib
        ----


@@ -75,14 +75,11 @@ Talloc, and zlib which are each described below:
 Building Documentation
 ----------------------
 
 Building Documentation
 ----------------------
 

-By default the documentation for notmuch is built using sphinx.
+To build the documentation for notmuch you need at least version 1.0
+of sphinx (Jul. 2010).

 
 Sphinx is available from www.sphinx-doc.org.
 
 
 Sphinx is available from www.sphinx-doc.org.
 

-If you prefer, you can build the man pages using rst2man, from the
-python docutils package. See doc/INSTALL for details.
-
-

 Installing Dependencies from Packages
 -------------------------------------
 
 Installing Dependencies from Packages
 -------------------------------------