[kde-doc-english] [kdepim/KDE/4.11] doc/kmail: Documentation: Menus, Composer settings and edit menus. Improvement to Fundamentals links.

Burkhard Lück lueck at hube-lueck.de
Sun Sep 8 09:08:37 UTC 2013 

Git commit c17b2ebde88672f3a90c61518bc170528ac2800d by Burkhard Lück, on behalf of Scarlett Clark.
Committed on 21/08/2013 at 19:18.
Pushed by lueck into branch 'KDE/4.11'.

Documentation: Menus, Composer settings and edit menus. Improvement to Fundamentals links.

REVIEW:112194
(cherry picked from commit cf416240740f88de945635b0be39766d706cac3d)
backport to 4.11.2

M  +88   -286  doc/kmail/menus.docbook

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

diff --git a/doc/kmail/menus.docbook b/doc/kmail/menus.docbook
index 4e487e1..2b7483c 100644
--- a/doc/kmail/menus.docbook
+++ b/doc/kmail/menus.docbook
@@ -45,17 +45,11 @@
 </chapterinfo>
 
 <title>Command and Menu Reference</title>
-<para>
-  &kmail; has common &kde; <guimenu>Edit</guimenu>, <guimenu>Settings</guimenu>, and
-<guimenu>Help</guimenu> menu items, for more information read the sections about the <ulink url="help:/fundamentals/ui.html#menus-edit">Edit Menu</ulink>, <ulink
-url="help:/fundamentals/ui.html#menus-settings">Settings Menu</ulink>, and <ulink url="help:/fundamentals/ui.html#menus-help">Help Menu</ulink>
-of the &kde; Fundamentals.
-</para>
 <para>Each &kmail; specific menu item is discussed below. When there is a keyboard shortcut that
 performs a menu item function, the default shortcut is listed with the menu item.</para>
 
-<sect1 id="main-mail-reader-window">
-<title>The Main &kmail; Reader Window</title>
+<sect1 id="reader-menu-items">
+<title>The &kmail; Reader Window</title>
 
 <sect2 id="reader-file-menu">
 <title>File Menu</title>
@@ -259,7 +253,8 @@ This allows you to choose which server to send your queued messages from. They m
 
 <sect2 id="reader-edit-menu">
 <title>Edit Menu</title>
-
+<para>If the menu item you are looking for is missing, please see <ulink url="help:/fundamentals/ui.html#menus-edit">Edit Menu</ulink> of the &kde; Fundamentals.
+  The items listed here are &kmail; specific.</para>
 <variablelist>
 <varlistentry id="move-to-trash">
 <term><menuchoice>
@@ -1180,14 +1175,14 @@ Please see next section for details.</para></note></listitem>
 <listitem><para><action>Brings up the Export Data Wizard dialog</action> which assists in easily exporting your settings and email.
  Please see <link linkend="export-data-wizard">Export &kmail; Data</link> for details.</para></listitem>
 </varlistentry>
-<varlistentry id="settings-configure-automatic-archiving">
+<varlistentry id="tools-configure-automatic-archiving">
 <term><menuchoice>
 <guimenu>Tools</guimenu>
 <guimenuitem>Configure Automatic Archiving...</guimenuitem>
 </menuchoice></term>
 <listitem><para><action>Brings up the dialog to set up automatic archiving.</action> Please see <link linkend="auto-archive">Automatic Archiving</link> for details.</para></listitem>
 </varlistentry>
-<varlistentry id="settings-configure-send-later-agent">
+<varlistentry id="tools-configure-send-later-agent">
 <term><menuchoice>
 <guimenu>Tools</guimenu>
 <guimenuitem>Configure Send Later Agent...</guimenuitem>
@@ -1225,7 +1220,8 @@ Please see next section for details.</para></note></listitem>
 
 <sect2 id="reader-settings-menu">
 <title>Settings Menu</title>
-
+<para>If the menu item you are looking for is missing, please see <ulink url="help:/fundamentals/ui.html#menus-settings">Settings Menu</ulink> of the &kde; Fundamentals.
+  The items listed here are &kmail; specific.</para>
 <variablelist>
 <varlistentry id="settings-show-quick-search-bar">
 <term><menuchoice>
@@ -1262,7 +1258,8 @@ Please see next section for details.</para></note></listitem>
 </sect2>
 <sect2>
 <title>Help Menu</title>
-&help.menu.documentation;
+<para><ulink url="help:/fundamentals/ui.html#menus-help">
+Help Menu</ulink> of the &kde; Fundamentals.</para>
 </sect2>
 </sect1>
 
@@ -1395,222 +1392,82 @@ Please see next section for details.</para></note></listitem>
 
 
 <sect2 id="composer-edit-menu">
-<title><guimenu>Edit</guimenu> Menu</title>
-
+<title>Edit Menu</title>
+<para>If the menu item you are looking for is missing, please see <ulink url="help:/fundamentals/ui.html#menus-edit">Edit Menu</ulink> of the &kde; Fundamentals.
+  The items listed here are &kmail; specific.</para>
 <variablelist>
-
-<varlistentry>
-<term>
-<menuchoice>
+<varlistentry id="edit-paste-quotation">
+<term><menuchoice>
+<shortcut>
+<keycombo action="simul">&Ctrl;&Shift;<keycap>O</keycap></keycombo>
+</shortcut>
 <guimenu>Edit</guimenu>
 <guimenuitem>Paste as Quotation</guimenuitem>
-</menuchoice>
-</term>
-<listitem>
-<para>Pastes the text from the clipboard marked as quotation.</para>
-</listitem>
-</varlistentry>
-<!-- missing: Paste as Attachment-->
-<varlistentry>
-<term>
-<menuchoice>
-<shortcut><keycombo action="simul">&Ctrl;<keycap>Z</keycap></keycombo></shortcut>
-<guimenu>Edit</guimenu>
-<guimenuitem>Undo</guimenuitem>
-</menuchoice>
-</term>
-<listitem>
-<para>Undo your steps in editing the current message.</para>
-</listitem>
-</varlistentry>
-
-<varlistentry>
-<term>
-<menuchoice>
-<shortcut><keycombo action="simul">&Ctrl;&Shift;<keycap>Z</keycap></keycombo></shortcut>
-<guimenu>Edit</guimenu>
-<guimenuitem>Redo</guimenuitem>
-</menuchoice>
-</term>
-<listitem>
-<para>Redo your steps in editing the current message.</para>
-</listitem>
+</menuchoice></term>
+<listitem><para><action>Pastes the text from the clipboard</action> marked as quotation.</para></listitem>
 </varlistentry>
-
-<varlistentry>
-<term>
-<menuchoice>
-<shortcut><keycombo action="simul">&Ctrl;<keycap>X</keycap></keycombo></shortcut>
+<varlistentry id="edit-paste-attachment">
+<term><menuchoice>
 <guimenu>Edit</guimenu>
-<guimenuitem>Cut</guimenuitem>
-</menuchoice>
-</term>
-<listitem>
-<para>Cutting text works as with most editors: the selected text is
-removed and put into the clipboard. Note that you can also select text and
-drag it to a new position.</para>
-</listitem>
+<guimenuitem>Paste as Attachment</guimenuitem>
+</menuchoice></term>
+<listitem><para><action>Pastes the text from the clipboard</action> as an attachment.</para></listitem>
 </varlistentry>
-
-<varlistentry>
-<term>
-<menuchoice>
-<shortcut><keycombo action="simul">&Ctrl;<keycap>C</keycap></keycombo>
+<varlistentry id="edit-paste-without-formatting">
+<term><menuchoice>
+<shortcut>
+<keycombo action="simul">&Ctrl;&Shift;<keycap>V</keycap></keycombo>
 </shortcut>
 <guimenu>Edit</guimenu>
-<guimenuitem>Copy</guimenuitem>
-</menuchoice>
-</term>
-<listitem>
-<para>Copying text works as with most editors: the selected text is copied to the clipboard.
-Note that you can also select text while holding the &Ctrl; key, and drag it to a new
-position to copy it.</para>
-</listitem>
-</varlistentry>
-
-<varlistentry>
-<term>
-<menuchoice>
-<shortcut><keycombo action="simul">&Ctrl;<keycap>V</keycap></keycombo></shortcut>
-<guimenu>Edit</guimenu>
-<guimenuitem>Paste</guimenuitem>
-</menuchoice>
-</term>
-<listitem>
-<para>Pasting works the same as with most editors: the text from the
-clipboard is pasted at the current cursor position.</para>
-</listitem>
-</varlistentry>
-
-<varlistentry>
-<term>
-<menuchoice>
-<shortcut><keycombo action="simul">&Ctrl;<keycap>A</keycap></keycombo></shortcut>
-<guimenu>Edit</guimenu>
-<guimenuitem>Select All</guimenuitem>
-</menuchoice>
-</term>
-<listitem>
-<para>Selects all of the text in your message.</para>
-</listitem>
-</varlistentry>
-
-<varlistentry>
-<term>
-<menuchoice>
-<shortcut><keycombo action="simul">&Ctrl;<keycap>F</keycap></keycombo></shortcut>
-<guimenu>Edit</guimenu>
-<guimenuitem>Find...</guimenuitem>
-</menuchoice>
-</term>
-<listitem>
-<para>Opens a dialog to search for strings in the current message.</para>
-</listitem>
-</varlistentry>
-
-<varlistentry>
-<term>
-<menuchoice>
-<shortcut><keycap>F3</keycap></shortcut>
-<guimenu>Edit</guimenu>
-<guimenuitem>Find Next</guimenuitem>
-</menuchoice>
-</term>
-<listitem>
-<para>Goes to the next occurrence of the previously searched string.</para>
-</listitem>
-</varlistentry>
-
-<varlistentry>
-<term>
-<menuchoice>
-<shortcut><keycombo action="simul">&Ctrl;<keycap>R</keycap></keycombo></shortcut>
-<guimenu>Edit</guimenu>
-<guimenuitem>Replace...</guimenuitem>
-</menuchoice>
-</term>
-<listitem>
-<para>Opens a dialog that lets you replace strings in your message with other strings.</para>
-</listitem>
+<guimenuitem>Paste Without Formatting,</guimenuitem>
+</menuchoice></term>
+<listitem><para><action>Pastes the text from the clipboard</action> exactly as is, with no formatting.</para></listitem>
 </varlistentry>
-
-<varlistentry>
-<term>
-<menuchoice>
+<varlistentry id="edit-clean-spaces">
+<term><menuchoice>
 <guimenu>Edit</guimenu>
 <guimenuitem>Clean Spaces</guimenuitem>
-</menuchoice>
-</term>
-<listitem>
-<para>This replaces multiple line breaks or spaces with single line breaks or spaces.
-It works on the current selection or on the complete message if there is no selection.</para>
-</listitem>
+</menuchoice></term>
+<listitem><para>This replaces multiple line breaks or spaces with single line breaks or spaces.
+It works on the current selection or the complete message text if there is no selection.</para></listitem>
 </varlistentry>
-
-<varlistentry>
-<term>
-<menuchoice>
+<varlistentry id="edit-add-quote-characters">
+<term><menuchoice>
 <guimenu>Edit</guimenu>
 <guimenuitem>Add Quote Characters</guimenuitem>
-</menuchoice>
-</term>
-<listitem>
-<para>Prepends the selected text with quotation marks.</para>
-</listitem>
+</menuchoice></term>
+<listitem><para>Prepends the selected text with quotation marks.</para></listitem>
 </varlistentry>
-
-<varlistentry>
-<term>
-<menuchoice>
+<varlistentry id="edit-remove-quote-characters">
+<term><menuchoice>
 <guimenu>Edit</guimenu>
 <guimenuitem>Remove Quote Characters</guimenuitem>
-</menuchoice>
-</term>
-<listitem>
-<para>Removes the left-most quotation marks from the selected text.</para>
-</listitem>
+</menuchoice></term>
+<listitem><para>Removes the left-most quotation marks from the selected text.</para></listitem>
 </varlistentry>
-
-<varlistentry>
-<term>
-<menuchoice>
+<varlistentry id="edit-uppercase">
+<term><menuchoice>
 <guimenu>Edit</guimenu>
 <guimenuitem>Uppercase</guimenuitem>
-</menuchoice>
-</term>
-<listitem>
-<para>Uppercase selected text.</para>
-</listitem>
+</menuchoice></term>
+<listitem><para>Convert the selected text to uppercase.</para></listitem>
 </varlistentry>
-
-<varlistentry>
-<term>
-<menuchoice>
+<varlistentry id="edit-lowercase">
+<term><menuchoice>
 <guimenu>Edit</guimenu>
 <guimenuitem>Lowercase</guimenuitem>
-</menuchoice>
-</term>
-<listitem>
-<para>Lowercase selected text.</para>
-</listitem>
+</menuchoice></term>
+<listitem><para>Convert the selected text to lowercase.</para></listitem>
 </varlistentry>
-
-<varlistentry>
-<term>
-<menuchoice>
+<varlistentry id="edit-insert-special-characters">
+<term><menuchoice>
 <guimenu>Edit</guimenu>
 <guimenuitem>Insert Special Characters</guimenuitem>
-</menuchoice>
-</term>
-<listitem>
-<para>It allows to insert special character in composer.</para>
-</listitem>
+</menuchoice></term>
+<listitem><para>It allows you to insert special character in composer.</para></listitem>
 </varlistentry>
-
-
 </variablelist>
 
-
 </sect2>
 
 <sect2 id="composer-view-menu">
@@ -1762,7 +1619,7 @@ You can learn more about this in the <link linkend="pgp">chapter on OpenPGP</lin
 <term>
 <menuchoice>
 <guimenu>Options</guimenu>
-<guisubmenu>Formatting (HTML)</guisubmenu>
+<guisubmenu>Rich Text Editing</guisubmenu>
 </menuchoice>
 </term>
 <listitem>
@@ -1917,112 +1774,57 @@ attachment window.</para>
 
 <sect2 id="composer-tools-menu">
 <title><guimenu>Tools</guimenu> Menu</title>
-
+<para>If the menu item you are looking for is missing, please see <ulink url="help:/fundamentals/ui.html#menus-tools">Tools Menu</ulink> of the &kde; Fundamentals.
+  The items listed here are &kmail; specific.</para>
 <variablelist>
-
-<varlistentry>
-<term>
-<menuchoice>
+<varlistentry id="tools-select-recipients">
+<term><menuchoice>
 <guimenu>Tools</guimenu>
-<guimenuitem>Spelling...</guimenuitem>
-</menuchoice>
-</term>
-<listitem>
-<para>Uses <ulink url="help:/sonnet/">&sonnet;</ulink> to check the spelling in the body of your
-message. Note that
-you have to configure &sonnet; with <menuchoice><guimenu>Settings</guimenu>
-<guimenuitem>Spellchecker...</guimenuitem></menuchoice> if you use it for the
-first time.</para>
-</listitem>
+<guimenuitem>Select Recipients...</guimenuitem>
+</menuchoice></term>
+<listitem><para><action>Opens up the <guilabel>Select Recipient</guilabel> dialog</action> with your personal contacts to select from.</para></listitem>
 </varlistentry>
-<!-- Select Recipients missing lueck 31.05.2011-->
-<varlistentry>
-<term>
-<menuchoice>
+<varlistentry id="tools-addressbook">
+<term><menuchoice>
 <guimenu>Tools</guimenu>
 <guimenuitem>Addressbook...</guimenuitem>
-</menuchoice>
-</term>
-<listitem>
-<para>Opens up <ulink url="help:/kaddressbook">&kaddressbook;</ulink>.</para>
-</listitem>
+</menuchoice></term>
+<listitem><para><action>Opens up <ulink url="help:/kaddressbook">&kaddressbook;</ulink></action>.</para></listitem>
+</varlistentry>
+<varlistentry id="tools-save-distribution-list">
+<term><menuchoice>
+<guimenu>Tools</guimenu>
+<guimenuitem>Save Distribution List...</guimenuitem>
+</menuchoice></term>
+<listitem><para><action>Opens a dialog</action> that allows you to save groups of contacts.</para></listitem>
 </varlistentry>
-<!-- Save Distribution List missing lueck 31.05.2011-->
 </variablelist>
 
 </sect2>
 
 <sect2 id="composer-settings-menu">
-<title><guimenu>Settings</guimenu> Menu</title>
-
+<title>Settings Menu</title>
+<para>If the menu item you are looking for is missing, please see <ulink url="help:/fundamentals/ui.html#menus-settings">Settings Menu</ulink> of the &kde; Fundamentals.
+  The items listed here are &kmail; specific.</para>
 <variablelist>
-
 <varlistentry>
-<term>
-<menuchoice>
-<guimenu>Settings</guimenu>
-<guimenuitem>Toolbars Shown</guimenuitem>
-</menuchoice>
-</term>
-<listitem>
-<para>Enables and disables the Main Toolbar, &ie; the one with the icon
-to send the message &etc; and the &html; Toolbar, &ie; the one which with the
-tools to change certain properties of the composed text.</para>
-</listitem>
-</varlistentry>
-
-<varlistentry>
-<term>
-<menuchoice>
+<term><menuchoice>
 <guimenu>Settings</guimenu>
 <guimenuitem>Spellchecker...</guimenuitem>
-</menuchoice>
-</term>
+</menuchoice></term>
 <listitem>
 <para>Allows you to configure <ulink url="help:/sonnet/">&sonnet;</ulink>, &kde;'s spellchecker.</para>
 </listitem>
 </varlistentry>
-
-<varlistentry>
-<term>
-<menuchoice>
-<guimenu>Settings</guimenu>
-<guimenuitem>Configure Shortcuts...</guimenuitem>
-</menuchoice>
-</term>
-<listitem>
-<para>Opens a window that lets you configure the keyboard shortcuts for many
-menu commands.</para>
-</listitem>
-</varlistentry>
-
-<varlistentry>
-<term>
-<menuchoice>
-<guimenu>Settings</guimenu>
-<guimenuitem>Configure Toolbars...</guimenuitem>
-</menuchoice>
-</term>
-<listitem>
-<para>Opens a window that allows you to decide which icons appear in the
-toolbar.</para>
-</listitem>
-</varlistentry>
-
-<varlistentry>
-<term>
-<menuchoice>
-<guimenu>Settings</guimenu>
-<guimenuitem>Configure &kmail;...</guimenuitem>
-</menuchoice>
-</term>
-<listitem>
-<para>Opens &kmail;'s <link linkend="configure">configuration dialog</link>.</para>
-</listitem>
-</varlistentry>
-
 </variablelist>
 </sect2>
+
+<sect2>
+<title>Help Menu</title>
+<para>
+<ulink url="help:/fundamentals/ui.html#menus-help">
+Help Menu</ulink> of the &kde; Fundamentals,</para>
+</sect2>
 </sect1>
 
 </chapter>

More information about the kde-doc-english mailing list