From 3fc3f53dc21eae5ceb660b401a79ec18f01329b0 Mon Sep 17 00:00:00 2001 From: Paul Mangan Date: Mon, 6 Nov 2006 10:14:58 +0000 Subject: [PATCH] 2006-11-06 [paul] 2.5.6cvs22 * manual/advanced.xml * manual/es/advanced.xml put 'respect_flowed_format' info in the correct place --- ChangeLog | 7 +++++++ PATCHSETS | 1 + configure.ac | 2 +- manual/advanced.xml | 20 ++++++++++---------- manual/es/advanced.xml | 22 +++++++++++----------- 5 files changed, 30 insertions(+), 22 deletions(-) diff --git a/ChangeLog b/ChangeLog index 16a54f3bd..905851574 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2006-11-06 [paul] 2.5.6cvs22 + + * manual/advanced.xml + * manual/es/advanced.xml + put 'respect_flowed_format' info in the correct + place + 2006-11-06 [mones] 2.5.6cvs21 * po/es.po diff --git a/PATCHSETS b/PATCHSETS index c682f91d5..df5bde5f0 100644 --- a/PATCHSETS +++ b/PATCHSETS @@ -2024,3 +2024,4 @@ ( cvs diff -u -r 1.179.2.136 -r 1.179.2.137 src/imap.c; cvs diff -u -r 1.34.2.7 -r 1.34.2.8 src/imap.h; cvs diff -u -r 1.105.2.68 -r 1.105.2.69 src/prefs_account.c; cvs diff -u -r 1.1.4.54 -r 1.1.4.55 src/etpan/imap-thread.c; ) > 2.5.6cvs19.patchset ( cvs diff -u -r 1.9.2.8 -r 1.9.2.9 po/cs.po; cvs diff -u -r 1.58.2.26 -r 1.58.2.27 po/de.po; cvs diff -u -r 1.42.2.27 -r 1.42.2.28 po/fr.po; cvs diff -u -r 1.34.2.20 -r 1.34.2.21 po/it.po; cvs diff -u -r 1.28.2.8 -r 1.28.2.9 po/nl.po; cvs diff -u -r 1.50.2.21 -r 1.50.2.22 po/pt_BR.po; cvs diff -u -r 1.2.2.22 -r 1.2.2.23 po/sk.po; cvs diff -u -r 1.4.2.7 -r 1.4.2.8 po/sv.po; cvs diff -u -r 1.5.2.19 -r 1.5.2.20 po/zh_CN.po; ) > 2.5.6cvs20.patchset ( cvs diff -u -r 1.60.2.37 -r 1.60.2.38 po/es.po; ) > 2.5.6cvs21.patchset +( cvs diff -u -r 1.1.2.31 -r 1.1.2.32 manual/advanced.xml; cvs diff -u -r 1.1.2.6 -r 1.1.2.7 manual/es/advanced.xml; ) > 2.5.6cvs22.patchset diff --git a/configure.ac b/configure.ac index 8bbf323e1..795c0f0ee 100644 --- a/configure.ac +++ b/configure.ac @@ -11,7 +11,7 @@ MINOR_VERSION=5 MICRO_VERSION=6 INTERFACE_AGE=0 BINARY_AGE=0 -EXTRA_VERSION=21 +EXTRA_VERSION=22 EXTRA_RELEASE= EXTRA_GTK2_VERSION= diff --git a/manual/advanced.xml b/manual/advanced.xml index f9a981d6f..22a40989a 100644 --- a/manual/advanced.xml +++ b/manual/advanced.xml @@ -418,16 +418,6 @@ - - respect_flowed_format - - - 0 or 1. Respect format=flowed on text/plain message parts. This - will cause some mails to have long lines, but will fix some URLs - that would otherwise be wrapped. Default is 0, turned off. - - - smtpssl @@ -626,6 +616,16 @@ + + respect_flowed_format + + + 0 or 1. Respect format=flowed on text/plain message parts. This + will cause some mails to have long lines, but will fix some URLs + that would otherwise be wrapped. Default is 0, turned off. + + + skip_ssl_cert_check diff --git a/manual/es/advanced.xml b/manual/es/advanced.xml index 50dfcfdd2..3443b88ee 100644 --- a/manual/es/advanced.xml +++ b/manual/es/advanced.xml @@ -438,17 +438,6 @@ - - respect_flowed_format - - - 0 o 1. Respetar el format=flowed en las partes - text/plain de los mensajes. Esto provocará que - algunos correos tengan líneas largas, pero corregirá algunas URLs - que de otra manera serían cortadas. Por omisión es 0, desactivado. - - - smtpssl @@ -679,6 +668,17 @@ + + respect_flowed_format + + + 0 o 1. Respetar el format=flowed en las partes + text/plain de los mensajes. Esto provocará que + algunos correos tengan líneas largas, pero corregirá algunas URLs + que de otra manera serían cortadas. Por omisión es 0, desactivado. + + + skip_ssl_cert_check -- 2.25.1