2006-06-22 [colin] 2.3.1cvs11

	* manual/advanced.xml
		Forgotten hidden pref

diff --git a/ChangeLog b/ChangeLog
index 607351421303ae2591c58a7a677b54bd5a93494d..8e4335fa5aa2fcc16a8441c80f071041552560e5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-06-22 [colin]     2.3.1cvs11
+
+       * manual/advanced.xml
+               Forgotten hidden pref
+
 2006-06-21 [paul]      2.3.1cvs10
 
        * src/prefs_account.c

diff --git a/PATCHSETS b/PATCHSETS
index 000ae46b43b0bcb27e4eaa116bb98294902e0f01..91220253ca4f80029019dd57b137cf40259da8eb 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -1611,3 +1611,4 @@
 ( cvs diff -u -r 1.213.2.102 -r 1.213.2.103 src/folder.c;  ) > 2.3.1cvs8.patchset
 ( cvs diff -u -r 1.61.2.45 -r 1.61.2.46 src/account.c;  cvs diff -u -r 1.382.2.282 -r 1.382.2.283 src/compose.c;  cvs diff -u -r 1.105.2.55 -r 1.105.2.56 src/prefs_account.c;  cvs diff -u -r 1.49.2.19 -r 1.49.2.20 src/prefs_account.h;  cvs diff -u -r 1.1.4.43 -r 1.1.4.44 src/etpan/imap-thread.c;  ) > 2.3.1cvs9.patchset
 ( cvs diff -u -r 1.105.2.56 -r 1.105.2.57 src/prefs_account.c;  ) > 2.3.1cvs10.patchset
+( cvs diff -u -r 1.1.2.21 -r 1.1.2.22 manual/advanced.xml;  ) > 2.3.1cvs11.patchset

diff --git a/configure.ac b/configure.ac
index d0bd85ac033a457d3fc11ad503e71f4ba0f5747b..3e94e349aadb45ea81bd9c04d0f79c356221de73 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=3
 MICRO_VERSION=1
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=10
+EXTRA_VERSION=11
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/manual/advanced.xml b/manual/advanced.xml
index 6bb705d049b72f40040c8c295daa8180c234c68e..c227c0a7fcc308e9f5e12433b374349d0545deba 100644 (file)
--- a/manual/advanced.xml
+++ b/manual/advanced.xml
@@ -209,6 +209,9 @@
            <varlistentry><term>log_error_color</term><term>log_in_color</term><term>log_msg_color</term><term>log_out_color</term><term>log_warn_color</term>
                        <listitem><para>colours used in log window</para></listitem>
            </varlistentry>
+           <varlistentry><term>mark_as_read_delay</term>
+                       <listitem><para>Seconds to wait before marking a mail as read</para></listitem>
+           </varlistentry>
            <varlistentry><term>skip_ssl_cert_check</term>
                    <listitem><para>Disables the verification of SSL certificates</para></listitem>
            </varlistentry>