2007-08-24 [paul] 2.10.0cvs162

	* manual/advanced.xml
		add info about the hidden emphasis_color option
	* manual/keyboard.xml
		correct the info about hotkeys
		wrap the long lines

diff --git a/ChangeLog b/ChangeLog
index be122063c215133e68201d7366092a2a1f340b29..a71f0c994fe8e84b977ac811f2208f0f1bd4a90a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2007-08-24 [paul]      2.10.0cvs162
+
+       * manual/advanced.xml
+               add info about the hidden emphasis_color option
+       * manual/keyboard.xml
+               correct the info about hotkeys
+               wrap the long lines
+
 2007-08-24 [paul]      2.10.0cvs161
 
        * src/folderview.c

diff --git a/PATCHSETS b/PATCHSETS
index f5340b94003d6d5948ed4d43052dd1b9b1e5c4c5..6cec24aeeb77ba8385d3e2672137208be6f27d7c 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -2816,3 +2816,4 @@
 ( cvs diff -u -r 1.207.2.176 -r 1.207.2.177 src/folderview.c;  ) > 2.10.0cvs159.patchset
 ( cvs diff -u -r 1.61.2.66 -r 1.61.2.67 src/account.c;  cvs diff -u -r 1.213.2.157 -r 1.213.2.158 src/folder.c;  cvs diff -u -r 1.87.2.45 -r 1.87.2.46 src/folder.h;  ) > 2.10.0cvs160.patchset
 ( cvs diff -u -r 1.207.2.177 -r 1.207.2.178 src/folderview.c;  ) > 2.10.0cvs161.patchset
+( cvs diff -u -r 1.1.2.40 -r 1.1.2.41 manual/advanced.xml;  cvs diff -u -r 1.1.2.9 -r 1.1.2.10 manual/keyboard.xml;  ) > 2.10.0cvs162.patchset

diff --git a/configure.ac b/configure.ac
index bd441267f3b549e1542ec0962a84f28f7360b293..188a06cde485364e7db186953662bb403c78b0a4 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=10
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=161
+EXTRA_VERSION=162
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/manual/advanced.xml b/manual/advanced.xml
index be45b37a4e62c84491d7a0bf38c9c30d9dbae572..4752fb54f81572e49a3f5ce12c2898f88698f8af 100644 (file)
--- a/manual/advanced.xml
+++ b/manual/advanced.xml
@@ -554,6 +554,14 @@
          </para>
        </listitem>
       </varlistentry>
+      <varlistentry>
+       <term><literal>emphasis_color</literal></term>
+       <listitem>
+         <para>
+       The colour used for the X-Mailer line when its value is Claws Mail.
+         </para>
+       </listitem>
+      </varlistentry>
       <varlistentry>
        <term><literal>enable_dotted_lines</literal></term>
        <listitem>

diff --git a/manual/keyboard.xml b/manual/keyboard.xml
index 3d4c8fb0bae607be31f3c83cc50005fa6f36097d..4bc3332152a2b923ff901b1dd6fea028a3987459 100644 (file)
--- a/manual/keyboard.xml
+++ b/manual/keyboard.xml
@@ -4,15 +4,37 @@
 
   <section id="keyb_general">
     <title>Motivations and general conventions</title>
-    <para>Although Claws Mail is a graphical application and can mainly be commanded with your mouse, it also requires the frequent use of the keyboard. Composing a mail is the most common of the tasks that require the use of the keyboard. For people who write a lot of mails, having to move hands from keyboard to mouse greatly reduces productivity, so Claws Mail provides keyboard shortcuts to allow faster operation.
+    <para>
+       Although Claws Mail is a graphical application and can mainly be 
+       commanded with your mouse, it also requires the frequent use of the 
+       keyboard. Composing a mail is the most common of the tasks that 
+       require the use of the keyboard. For people who write a lot of mails, 
+       having to move hands from keyboard to mouse greatly reduces 
+       productivity, so Claws Mail provides keyboard shortcuts to allow 
+       faster operation.
     </para>
-    <para>This not only benefits power users by providing keyboard alternatives and keyboard navigation, it also enables people with disabilities, (who may not be able to properly control a pointing device), to use Claws Mail.
+    <para>
+       This not only benefits power users by providing keyboard alternatives 
+       and keyboard navigation, it also enables people with disabilities, 
+       (who may not be able to properly control a pointing device), to use 
+       Claws Mail.
     </para>
-    <para>The most general convention is the <option>Escape</option> key. Focused dialogues or windows can be closed by hitting the <option>Esc</option> key.
+    <para>
+       The most general convention is the <option>Escape</option> key. Focused 
+       dialogues or windows can be closed by hitting the <option>Esc</option> 
+       key.
     </para>
-    <para>There are other key combinations which are assigned by default to menu items. We won't list these here, as they are already shown on the righthand side of the menus themselves, so you can easily learn them with usage. Furthermore, if you don't like them, these shortcuts can be changed on the fly by focusing on the menu item and pressing the desired key combination, but only for key combinations that include the <option>Alt</option>, <option>Ctrl</option> and/or <option>Shift</option> modifier keys; single keys cannot be assigned. (This is a standard behaviour of GTK2 library based programs like Claws Mail. Note that this behaviour may be disabled by default on some desktops.)
+    <para>
+       There are other key combinations which are assigned by default to menu 
+       items. We won't list these here, as they are already shown on the 
+       righthand side of the menus themselves, so you can easily learn them 
+       with usage. Furthermore, if you don't like them, these shortcuts can be 
+       changed on the fly by focusing on the menu item and pressing the 
+       desired key combination.
     </para>
-    <para>In addition to these shortcuts there are others which vary from window to window, which are summarised in the following sections.
+    <para>
+       In addition to these shortcuts there are others which vary from window 
+       to window, which are summarised in the following sections.
     </para>
   </section>