[master] 195b601 Correct value for 2.1

[Andreas Plesner Jacobsen]

commit 195b601710ae556f3bcb6c27b73f6d60c3986bde
Author: Andreas Plesner Jacobsen <apj at mutt.dk>
Date:   Fri Feb 24 15:16:15 2012 +0100

    Correct value for 2.1

diff --git a/doc/sphinx/installation/upgrade.rst b/doc/sphinx/installation/upgrade.rst
index 2c06a3f..93446ea 100644
--- a/doc/sphinx/installation/upgrade.rst
+++ b/doc/sphinx/installation/upgrade.rst
@@ -151,7 +151,7 @@ The following parameters have new defaults:
 * ``ban_lurker_sleep`` changed from 0 to 0.01 seconds, enabling the ban lurker by default.
 * ``connect_timeout`` changed from 0.4 to 0.7 seconds.
 * ``log_hashstring`` changed from off to on.
-* ``send_timeout`` changed from 60 to 60 seconds.
+* ``send_timeout`` changed from 600 to 60 seconds.
 * ``thread_pool_add_delay`` changed from 20 to 2 ms.
 
 Changed parameter names