Merge branch 'master' of ssh+git://git.claws-mail.org/home/git/claws

[claws.git] / manual / advanced.xml

diff --git a/manual/advanced.xml b/manual/advanced.xml
index 5797638529e087f91c45d5dc55bda1176abe97d1..4b882e61bbc46ed8ad8de27c7186258d8f7ef53e 100644 (file)
--- a/manual/advanced.xml
+++ b/manual/advanced.xml
@@ -555,10 +555,19 @@
        There's a small tool written in Perl-GTK called Clawsker which 
        provides a user-friendly GUI for tweaking these settings instead of
        direct editing of <filename>clawsrc</filename>. You can read more
-       about it on the <ulink url="http://www.claws-mail.org/clawsker">Clawsker
-       page</ulink>.
+       about it on the <ulink 
+       url="http://www.claws-mail.org/clawsker.php">Clawsker page</ulink>.
     </para>
     <variablelist>
+      <varlistentry>
+       <term><literal>address_search_wildcard</literal></term>
+       <listitem>
+         <para>
+       TAB-address completion in the Compose window and other GUI places will match any part of the
+       string (1) or just the start of the string (0).
+         </para>
+       </listitem>
+      </varlistentry>
       <varlistentry>
        <term><literal>addressbook_use_editaddress_dialog</literal></term>
        <listitem>
@@ -602,6 +611,16 @@
          </para>
        </listitem>
       </varlistentry>
+      <varlistentry>
+       <term><literal>diff_added_color</literal></term>
+       <term><literal>diff_deleted_color</literal></term>
+       <term><literal>diff_hunk_color</literal></term>
+       <listitem>
+         <para>
+       Colors to use when displaying attachments in unified diff format.
+         </para>
+       </listitem>
+      </varlistentry>
       <varlistentry>
        <term><literal>emphasis_color</literal></term>
        <listitem>
@@ -611,12 +630,18 @@
        </listitem>
       </varlistentry>
       <varlistentry>
-       <term><literal>enable_dotted_lines</literal></term>
+       <term><literal>enable_avatars</literal></term>
        <listitem>
          <para>
-       Use the <emphasis>old</emphasis> dotted line look in the main window
-       GtkTreeView components, (Folder List and Message List), instead of the
-       <emphasis>modern</emphasis> lineless look.
+       Enables capture and/or rendering of internal avatars (Face and
+       also X-Face headers if built with compface support). 
+       '0' disables both, '1' enables capture only, '2' enables rendering
+       only and '3' enables both.
+         </para>
+         <para>
+        Note that external plugins already providing these features may
+       disable partially or completely this to speed up process, regardless
+       of the configured value.
          </para>
        </listitem>
       </varlistentry>
@@ -637,6 +662,15 @@
          </para>
        </listitem>
       </varlistentry>
+      <varlistentry>
+       <term><literal>folder_search_wildcard</literal></term>
+       <listitem>
+         <para>
+       The type-ahead function in the Select Folder window will match any
+       part of the folder name (1) or just the start of the folder name (0).
+         </para>
+       </listitem>
+      </varlistentry>
       <varlistentry>
        <term><literal>folderview_vscrollbar_policy</literal></term>
        <listitem>
@@ -806,6 +840,16 @@
          </para>
        </listitem>
       </varlistentry>
+      <varlistentry>
+    <term><literal>type_any_header</literal></term>
+    <listitem>
+      <para>
+    Allows to type any header on the compose window header entries.
+    By default only the entries available from the combobox can be
+    selected.
+      </para>
+    </listitem>
+      </varlistentry>
       <varlistentry>
        <term><literal>two_line_vertical</literal></term>
        <listitem>
@@ -868,6 +912,15 @@
          </para>
        </listitem>
       </varlistentry>
+      <varlistentry>
+       <term><literal>zero_replacement_char</literal></term>
+       <listitem>
+         <para>
+       Character to show in Folder List counter columns when a folder contains
+       no messages. Default value is 0.
+         </para>
+       </listitem>
+      </varlistentry>
     </variablelist>
   </section>
   <section id="adv_autofaces">