2008-05-15 [paul] 3.4.0cvs38

	* manual/advanced.xml
		fix typo

diff --git a/ChangeLog b/ChangeLog
index 07448341d18b9b76852014a5302e8b149e5c43a8..845f43d1325d067dbf1e0079773ff5eb1bd79f8a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-05-15 [paul]      3.4.0cvs38
+
+       * manual/advanced.xml
+               fix typo
+
 2008-05-15 [paul]      3.4.0cvs37
 
        * manual/advanced.xml

diff --git a/PATCHSETS b/PATCHSETS
index d2b5f0be5f86ed33a3d1ee2257880c1cf281174d..24450abcfc849f06b695fcd1df45e3b5e9c9f04c 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -3333,3 +3333,4 @@
 ( cvs diff -u -r 1.382.2.449 -r 1.382.2.450 src/compose.c;  cvs diff -u -r 1.204.2.169 -r 1.204.2.170 src/prefs_common.c;  cvs diff -u -r 1.103.2.107 -r 1.103.2.108 src/prefs_common.h;  cvs diff -u -r 1.1.2.20 -r 1.1.2.21 src/prefs_send.c;  ) > 3.4.0cvs35.patchset
 ( cvs diff -u -r 1.115.2.194 -r 1.115.2.195 src/main.c;  cvs diff -u -r 1.274.2.240 -r 1.274.2.241 src/mainwindow.c;  cvs diff -u -r 1.39.2.44 -r 1.39.2.45 src/mainwindow.h;  ) > 3.4.0cvs36.patchset
 ( cvs diff -u -r 1.1.2.47 -r 1.1.2.48 manual/advanced.xml;  cvs diff -u -r 1.1.2.21 -r 1.1.2.22 src/prefs_send.c;  ) > 3.4.0cvs37.patchset
+( cvs diff -u -r 1.1.2.48 -r 1.1.2.49 manual/advanced.xml;  ) > 3.4.0cvs38.patchset

diff --git a/configure.ac b/configure.ac
index 9c3219b6656989a1039cb5bb54c2f623241cda74..193044d7e38e5cffcc21abe24177febf115fb479 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=4
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=37
+EXTRA_VERSION=38
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/manual/advanced.xml b/manual/advanced.xml
index 8a2dc091dc1275d5960b4a39a81ed53ddec57a0e..667cbfacaebf39219b6c9e11a642c6aca5fd95b3 100644 (file)
--- a/manual/advanced.xml
+++ b/manual/advanced.xml
@@ -651,7 +651,7 @@
        0 or 1. The outgoing encoding of a message will use 7bit US-ASCII
        whenever it is suitable for the message content, ignoring the
        Outgoing Encoding option unless it is necessary. Turning this
-       option off forces the user-defined content to be used, regardless
+       option off forces the user-defined encoding to be used, regardless
        of message content. Default is 1, turned on.
          </para>
        </listitem>