From: Paul Mangan Date: Wed, 15 Feb 2006 08:25:24 +0000 (+0000) Subject: 2006-02-15 [paul] 2.0.0cvs50 X-Git-Tag: REL_2_1_0~144 X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=commitdiff_plain;h=663c86fca333bca13d561cfbc76bd45d8592251c;hp=b05d54983ca6011926bc266bdfc25ade9aa47156 2006-02-15 [paul] 2.0.0cvs50 * manual/advanced.xml improve Templates info written by wwp --- diff --git a/ChangeLog b/ChangeLog index 37ae3f15f..b46d256e6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2006-02-15 [paul] 2.0.0cvs50 + + * manual/advanced.xml + improve Templates info + written by wwp + 2006-02-14 [colin] 2.0.0cvs49 * src/pixmaps/address_book.xpm diff --git a/PATCHSETS b/PATCHSETS index 2f39c79c9..3f0c1f98f 100644 --- a/PATCHSETS +++ b/PATCHSETS @@ -1233,3 +1233,4 @@ ( cvs diff -u -r 1.274.2.96 -r 1.274.2.97 src/mainwindow.c; ) > 2.0.0cvs47.patchset ( cvs diff -u -r 1.49.2.72 -r 1.49.2.73 src/procmime.c; cvs diff -u -r 1.96.2.95 -r 1.96.2.96 src/textview.c; cvs diff -u -r 1.36.2.55 -r 1.36.2.56 src/common/utils.c; ) > 2.0.0cvs48.patchset ( cvs diff -u -r 1.1.14.1 -r 1.1.14.2 src/pixmaps/address_book.xpm; cvs diff -u -r 1.1.14.1 -r 1.1.14.2 src/pixmaps/preferences.xpm; cvs diff -u -r 1.1.14.1 -r 1.1.14.2 src/pixmaps/properties.xpm; ) > 2.0.0cvs49.patchset +( cvs diff -u -r 1.1.2.9 -r 1.1.2.10 manual/advanced.xml; ) > 2.0.0cvs50.patchset diff --git a/configure.ac b/configure.ac index 420c6c737..6aa7edf83 100644 --- a/configure.ac +++ b/configure.ac @@ -11,7 +11,7 @@ MINOR_VERSION=0 MICRO_VERSION=0 INTERFACE_AGE=0 BINARY_AGE=0 -EXTRA_VERSION=49 +EXTRA_VERSION=50 EXTRA_RELEASE= EXTRA_GTK2_VERSION= diff --git a/manual/advanced.xml b/manual/advanced.xml index 7301596de..a930358f1 100644 --- a/manual/advanced.xml +++ b/manual/advanced.xml @@ -42,7 +42,22 @@ Templates are used in composition windows, and act as a model for emails. Templates can be filled with static text and dynamic parts, such as the original sender's name ("Dear %N, ..."), the date, etc. When applying a template, the dynamic fields will be replaced with the relevant values. You can configure templates via the Tools menu. - + + When applying a template, you will be asked to Insert or Replace, the difference between replacing and inserting is only concerned with the message body. Replace will replace the current composition window message body with the body defined in the template, clearing it if the template body is empty. Insert will insert the template's body, if set, at the current cursor position. + + + Whether you choose to Insert or Replace, any To, Cc or Bcc field that is defined in the template will be appended to the compose window's recipients list. If it is defined, the template's Subject will always replace the compose window's Subject. + + + Symbols can be used in all parts of the templates and will be substituted with their respective dynamic value if possible, otherwise no value will be used. This often makes more sense if you apply a template when a replying or forwarding. There is no restriction on which symbols can be used in template parts, even if inserting the body (%M or %Q) may make no sense in common situations. + + + When applying a template, the body is processed first, then the To, Cc, Bcc and Subject fields follow. + + + Further information and examples of usage can be found in the user-contributed FAQ on the Sylpheed-Claws website http://claws.sylpheed.org/faq.php + +
Processing