Git commit 0fea2135bfc4c269535470a324a9c2a3b17cc09d by Yuri Chornoivan, on behalf of Antoni Bella P?rez. Committed on 19/09/2013 at 07:26. Pushed by yurchor into branch 'master'.
More fixes for kmail docs M +11 -11 doc/kmail/menus.docbook M +8 -7 doc/kmail/using-kmail.docbook http://commits.kde.org/kdepim/0fea2135bfc4c269535470a324a9c2a3b17cc09d diff --git a/doc/kmail/menus.docbook b/doc/kmail/menus.docbook index ddbe45c..366c4da 100644 --- a/doc/kmail/menus.docbook +++ b/doc/kmail/menus.docbook @@ -84,7 +84,7 @@ performs a menu item function, the default shortcut is listed with the menu item <guisubmenu>New</guisubmenu> <guimenuitem>Add Folder...</guimenuitem> </menuchoice></term> -<listitem><para><action>Create a new folder</action></para></listitem> +<listitem><para><action>Create a new folder.</action></para></listitem> </varlistentry> <varlistentry id="reader-new-addressbook-contact"> <term><menuchoice> @@ -343,10 +343,10 @@ If the selected messages are already in the trash folder, they will be permanent <listitem><para><guilabel>Message Sort Order</guilabel> has several options, most are self explanatory. The following options may not be immediately obvious, therefore deserve an explanation.</para> <itemizedlist> - <listitem><para><guilabel>Smart Sender/Receiver</guilabel> will display the sender when you are reading in your outbox folder/template folder, and display the receiver when you are in your inbox/inbox subfolders.</para></listitem> + <listitem><para><guilabel>By Smart Sender/Receiver</guilabel> will display the sender when you are reading in your outbox folder/template folder, and display the receiver when you are in your inbox/inbox subfolders.</para></listitem> <listitem><para><guilabel>By Action Item Status</guilabel> and <guilabel>By Important Status</guilabel> need to be set before they can be sorted. Please see <link linkend="reader-mark-messages">Mark Messages</link> for more information on marking your messages.</para></listitem> </itemizedlist></listitem> - <listitem><para><guilabel>Message Sort Direction</guilabel> and <guilabel>Group Sort Direction</guilabel> allow you to change the direction of your message/group sort respectively.</para></listitem> + <listitem><para><guilabel>Message Sort Direction</guilabel> and <guilabel>Group Sort Direction</guilabel> allow you to change the direction of your messages/groups sort respectively.</para></listitem> <listitem><para><guilabel>Folder always Uses this Sort Order</guilabel> allows you to keep your sort settings per folder.</para></listitem> </itemizedlist></listitem> </varlistentry> @@ -397,7 +397,7 @@ The following options may not be immediately obvious, therefore deserve an expla <guimenuitem>Attachments</guimenuitem> </menuchoice></term> <listitem><para><action>Changes the way attachments appear in the <guilabel>Message Preview Pane</guilabel></action> -(independent of the &MIME; Tree) Please see <link linkend="using-attachment-view-options">Attachment Options</link> for details on attachments.</para></listitem> +(independent of the &MIME; Tree). Please see <link linkend="using-attachment-view-options">Attachment Options</link> for details on attachments.</para></listitem> </varlistentry> <varlistentry id="reader-view-expand-thread-or-group"> <term><menuchoice> @@ -891,11 +891,11 @@ Please see next section for details.</para></note></listitem> <para>The following options are available to mailing list folders:</para> <itemizedlist> <listitem><para><guimenuitem>Post New Message(email)</guimenuitem> will presets the <guilabel>To:</guilabel> with the address configured in Post to List.</para></listitem> - <listitem><para><guimenuitem>Request Help(email)</guimenuitem> will presets the <guilabel>To:</guilabel> with the address configured in Post to List and help in the <guilabel>Subject:</guilabel> field.</para></listitem> + <listitem><para><guimenuitem>Request Help(email)</guimenuitem> will presets the <guilabel>To:</guilabel> with the address configured in Post to List and <literal>help</literal> word in the <guilabel>Subject:</guilabel> field.</para></listitem> <listitem><para><guimenuitem>Subscribe to List(web)</guimenuitem> will open your default web browser to the subscribe website of the configured mailing list.</para></listitem> - <listitem><para><guimenuitem>Subscribe to List(email)</guimenuitem> will presets the <guilabel>To:</guilabel> with the mailing list subscription address and subscribe in the <guilabel>Subject:</guilabel> field.</para></listitem> - <listitem><para><guimenuitem>Unsubscribe to List(web)</guimenuitem> will open your default web browser to the unsubscribe website of the configured mailing list.</para></listitem> - <listitem><para><guimenuitem>Unsubscribe to List(email)</guimenuitem> will presets the <guilabel>To:</guilabel> with the mailing list subscription address and unsubscribe in the <guilabel>Subject:</guilabel> field.</para></listitem> + <listitem><para><guimenuitem>Subscribe to List(email)</guimenuitem> will presets the <guilabel>To:</guilabel> with the mailing list subscription address and <literal>subscribe</literal> word in the <guilabel>Subject:</guilabel> field.</para></listitem> + <listitem><para><guimenuitem>Unsubscribe from List(web)</guimenuitem> will open your default web browser to the unsubscribe website of the configured mailing list.</para></listitem> + <listitem><para><guimenuitem>Unsubscribe from List(email)</guimenuitem> will presets the <guilabel>To:</guilabel> with the mailing list subscription address and <literal>unsubscribe</literal> word in the <guilabel>Subject:</guilabel> field.</para></listitem> </itemizedlist></listitem> </varlistentry> <varlistentry id="reader-message-copy-message-to"> @@ -910,7 +910,7 @@ Please see next section for details.</para></note></listitem> <guimenu>Message</guimenu> <guisubmenu>Move Message To</guisubmenu> </menuchoice></term> -<listitem><para>The same as copy message to, except you <action>permanently move the selected messages to a specified folder.</action>.</para></listitem> +<listitem><para>The same as copy message to, except you <action>permanently move the selected messages to a specified folder.</action></para></listitem> </varlistentry> <varlistentry id="reader-mark-messages"> <term><menuchoice> @@ -1033,7 +1033,7 @@ Please see next section for details.</para></note></listitem> <imageobject> <imagedata fileref="mail-thread-watch.png" format="PNG"/></imageobject> </inlinemediaobject></entry> -<entry>Set the watched thread status, which allows you to easily view threads your interested in by selecting Watched in the status sort bar.</entry></row> +<entry>Set the watched thread status, which allows you to easily view threads your interested in by selecting <guimenu>Watched</guimenu> status in the drop down box found into Quick Search Bar.</entry></row> <row> <entry><guimenuitem>Ignore Thread</guimenuitem></entry> <entry><inlinemediaobject> @@ -1063,7 +1063,7 @@ Please see next section for details.</para></note></listitem> <guimenuitem>Apply Filter</guimenuitem> </menuchoice></term> <listitem><para><action>Allows you to <guimenuitem>Apply all Filters</guimenuitem>.</action> If you have spam filtering set up through - <link linkend="the-anti-spam-wizard">Anti-Spam Wizard</link> the options <guimenuitem>Filter Classify as Spam</guimenuitem> and <guimenuitem>Filter Classify as NOT Spam</guimenuitem> will be available for spam filtering.</para></listitem> + <link linkend="the-anti-spam-wizard">Anti-Spam Wizard</link> the options <guimenuitem>Classify as Spam</guimenuitem> and <guimenuitem>Classify as NOT Spam</guimenuitem> will be available for spam filtering.</para></listitem> </varlistentry> <varlistentry id="reader-message-create-to-do-reminder"> <term><menuchoice> diff --git a/doc/kmail/using-kmail.docbook b/doc/kmail/using-kmail.docbook index f66b86d..e59dfae 100644 --- a/doc/kmail/using-kmail.docbook +++ b/doc/kmail/using-kmail.docbook @@ -75,11 +75,11 @@ and try them out until you find one you like! Details for the various headers ar <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>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> + <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> @@ -95,7 +95,7 @@ Your options are as follows:</para> Attachments that cannot be displayed, ⪚ 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 +<para>For complex messages you can show the structure 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> @@ -1796,7 +1796,7 @@ you need to debug your filtering process. <sect2 id="archiving"> <title>Automatic Archiving</title> <variablelist> - <varlistentry id="auto-archive"><term><menuchoice><guimenu>Tools</guimenu><guimenuitem>Create Automatic Archiving...</guimenuitem></menuchoice></term> + <varlistentry id="auto-archive"><term><menuchoice><guimenu>Tools</guimenu><guimenuitem>Configure Automatic Archiving...</guimenuitem></menuchoice></term> <listitem> <para>This is a powerful tool that can be used to assist in backing up your email. To use this, click the <guibutton>Add...</guibutton> button, and the <guilabel>Add Archive Mail</guilabel> dialog will pop up.</para> @@ -1810,13 +1810,14 @@ you need to debug your filtering process. </itemizedlist> </listitem> </varlistentry> + <!-- fixme: 4.12? incompatible with Tools -> Configure Automatic Archiving... --> <varlistentry id="archive-folder"><term><menuchoice><guimenu>Settings</guimenu><guimenuitem>Configure Folder Archive Agent...</guimenuitem></menuchoice></term> <listitem> <para>This dialog allows you to enable/disable the folder archive agent. It is enabled by default, to disable uncheck the <guilabel>Enable</guilabel> checkbox. You can change the location of your Archive folder by clicking the folder icon next to <guilabel>Archive folder:</guilabel> and selecting the folder you wish to use.</para> </listitem> - </varlistentry> + </varlistentry> </variablelist> </sect2>
