Git commit eee17929ebb60d1ed7e04a868035030993216f30 by Burkhard L?ck, on behalf 
of Scarlett Clark.
Committed on 25/08/2013 at 14:19.
Pushed by lueck into branch 'KDE/4.11'.

Documentation: Moving detailed information from menus to the using-kmail docs. 
Rework to accommodate.

REVIEW:112218
(cherry picked from commit d54c6b6656f8ececfa1500ce338bff6acdb8aa1a)
backport to 4.11.2

M  +43   -22   doc/kmail/using-kmail.docbook

http://commits.kde.org/kdepim/eee17929ebb60d1ed7e04a868035030993216f30

diff --git a/doc/kmail/using-kmail.docbook b/doc/kmail/using-kmail.docbook
index 6c20664..e853c39 100644
--- a/doc/kmail/using-kmail.docbook
+++ b/doc/kmail/using-kmail.docbook
@@ -10,11 +10,11 @@
 </address></affiliation>
 </author>
 <author>
-  <firstname>Scarlett</firstname>
-  <surname>Clark</surname>
-  <affiliation><address>
-    <email>scarlett at scarlettgatelyclark.com</email>
-  </address></affiliation>
+<firstname>Scarlett</firstname>
+<surname>Clark</surname>
+<affiliation><address>
+&Scarlett.Clark.mail;
+</address></affiliation>
 </author>
 <!-- TRANS:ROLES_OF_TRANSLATORS -->
 </authorgroup>
@@ -64,22 +64,43 @@ which allows you to show or hide several columns in the 
list.
 </para>
 </listitem>
 </varlistentry>
-  <varlistentry><term>Message preview pane (in the lower right by 
default)</term>
-    <listitem>
-       <para>This pane displays the currently selected message. There are 
several options to change the view of this pane.
-         There are many header views (the top of the message) to choose from. 
Go to 
<menuchoice><guimenu>View</guimenu><guisubmenu>Headers</guisubmenu></menuchoice>
 and try them out until you find one you like!
-        Please see <link linkend="view-headers">View Headers</link> for 
detailed information on header types.</para>
-       <para>If you prefer to view your email in &HTML; format instead of 
plain text (Default) click on the bar located on the left hand side of the 
pane. The text on the bar will inform you which view you are in. If this bar is 
missing you can enable it in the settings dialog, from there you want
-         the <guilabel>Message Window</guilabel> tab, and select 
<guilabel>Show &HTML; status bar</guilabel>.</para>
-       <para>You may choose how attachments appear in your messages through 
<menuchoice><guimenu>View</guimenu><guisubmenu>Attachments</guisubmenu></menuchoice>.
-        Please see <link linkend="view-attachments">View Attachments</link> in 
the menus help section for detailed information on attachments.</para>
-         <para>
-            For complex messages you can show the structure of the message of 
the message by selecting <menuchoice><guimenu>View</guimenu><guimenuitem>Show 
Message Structure</guimenuitem></menuchoice>,
-            this will show in the message structure viewer below the preview 
pane.</para>
-          <para>You can scroll through the message page-by-page using the 
<keycap>Page Up</keycap> and <keycap>Page Down</keycap> keys, or line-by-line 
using the
-            <keycap>Up arrow</keycap> and <keycap>Down arrow</keycap> keys; 
you can also use <link linkend="keyboard-shortcuts">keyboard shortcuts</link> 
to skip through your messages without having to use the mouse.</para>
-      </listitem>
-  </varlistentry>
+<varlistentry id="using-message-preview-pane">
+<term>Message preview pane (in the lower right by default)</term>
+<listitem><para>This pane displays the currently selected message. Below you 
will find options to adjust the reader window to your preference.</para>
+<para>The top of the reader window contains various header options. Go to 
<menuchoice><guimenu>View</guimenu><guisubmenu>Headers</guisubmenu></menuchoice>
+and try them out until you find one you like! Details for the various headers 
are as follows:</para>
+<itemizedlist id="using-header-options">
+  <listitem><para><guilabel>Enterprise Headers</guilabel> A minimal header 
with title, From, and To, with a graphical design.</para></listitem>
+  <listitem><para><guilabel>Fancy Headers</guilabel> Minimal header with a 
spam status notification.</para></listitem>
+  <listitem><para><guilabel>Brief Headers</guilabel> Title, and in parentheses 
you will find From and the date.</para></listitem>
+  <listitem><para><guilabel>Standard Headers</guilabel> Title, From, and 
To.</para></listitem>
+  <listitem><para><guilabel>Long Headers</guilabel> Title, Date, From, and 
To.</para></listitem>
+  <listitem><para><guilabel>All Headers</guilabel> List everything you ever 
wanted to know about the email, including every server it went through, 
virus/spam scanners it went through &etc;</para></listitem>
+  <listitem><para><guilabel>Custom Headers</guilabel> See <link 
linkend="configure-appearance-message-window">Message Window 
configuration</link> <guilabel>Headers:</guilabel> to set up custom headers 
that can be selected here.</para></listitem>
+  <listitem><para><guilabel>Example</guilabel> An example header from the 
<guilabel>Download New Themes</guilabel></para></listitem>
+  <listitem><para><guilabel>Example Fancy</guilabel> An example fancy header 
from the <guilabel>Download New Themes</guilabel></para></listitem>
+  <listitem><para><guilabel>Download New Themes</guilabel> Allows you to 
download custom themes created by other &kmail; users.</para></listitem>
+</itemizedlist>
+<para>If you prefer to view your email in &HTML; format instead of plain text 
(Default) click on the bar located on the left hand side of the pane.
+The text on the bar will inform you which view you are in. If this bar is 
missing you can enable it in the settings dialog, from there you want the 
<guilabel>Message Window</guilabel>
+tab, and select <guilabel>Show &HTML; status bar</guilabel>.</para>
+<para>If you would like to change how your attachments appear in your 
messages, go to 
<menuchoice><guimenu>View</guimenu><guisubmenu>Attachments</guisubmenu></menuchoice>.
+Your options are as follows:</para>
+<itemizedlist id="using-attachment-view-options">
+  <listitem><para><guimenuitem>As Icons</guimenuitem>, all attachments appear 
as icons at the bottom of the message.</para></listitem>
+  <listitem><para><guimenuitem>Smart</guimenuitem> will show attachments as 
icons, unless the message suggests that they should be displayed inline.
+  You can suggest that certain attachments should be shown inline in your own 
messages when you select <guilabel>Suggest automatic display</guilabel>
+  in the attachment's properties dialog.</para></listitem>
+  <listitem><para><guimenuitem>Inline</guimenuitem> shows the contents of the 
attachments at the bottom of the message.
+  Attachments that cannot be displayed, &eg; compressed files, will still be 
shown as an icon.</para></listitem>
+  <listitem><para><guimenuitem>Hide</guimenuitem> will not show 
attachments.</para></listitem>
+</itemizedlist>
+<para>For complex messages you can show the structure of the message of the 
message by selecting
+<menuchoice><guimenu>View</guimenu><guimenuitem>Show Message 
Structure</guimenuitem></menuchoice>, this will show in the message structure 
viewer below the preview pane.</para>
+<para>You can scroll through the message page-by-page using the <keycap>Page 
Up</keycap> and <keycap>Page Down</keycap> keys, or line-by-line using the
+<keycap>Up arrow</keycap> and <keycap>Down arrow</keycap> keys; you can also 
use <link linkend="keyboard-shortcuts">keyboard shortcuts</link>
+to skip through your messages without having to use the 
mouse.</para></listitem>
+</varlistentry>
 </variablelist>
 
 </sect1>
@@ -203,7 +224,7 @@ Shortcuts...</guimenuitem></menuchoice> dialog.</para>
         to select which header fields are displayed. Some field options offer a
         <guibutton>Sticky</guibutton> checkbox, that if checked, your 
selection will remain as the default when you open a
         new composer window. The following list describes the various 
headers.</para>
-      <itemizedlist>
+      <itemizedlist id="composer-headers">
         <listitem>
           <para>The <guimenuitem>Identity</guimenuitem> drop down box allows 
you to select an identity to use.</para>
         </listitem>

Reply via email to