Git commit 61544c4d31671aa4668053ee7264ad142e801e20 by Burkhard L?ck, on behalf of Allen Winter. Committed on 25/08/2013 at 19:02. Pushed by lueck into branch 'KDE/4.11'.
remove stashed cruft that somehow made its way into this docbook. kmail docbook builds now CCMAIL: scarlett at scarlettgatelyclark.com (cherry picked from commit 2348b91e3201edb645dffda1f41106b5264e8f43) backport to 4.11.2 M +0 -8 doc/kmail/menus.docbook http://commits.kde.org/kdepim/61544c4d31671aa4668053ee7264ad142e801e20 diff --git a/doc/kmail/menus.docbook b/doc/kmail/menus.docbook index e22d546..221bcfc 100644 --- a/doc/kmail/menus.docbook +++ b/doc/kmail/menus.docbook @@ -137,12 +137,8 @@ performs a menu item function, the default shortcut is listed with the menu item <para><action>Display a dialog which shows how your email will be printed.</action></para> <note><para>This will only be enabled if a printer is available.</para></note></listitem> </varlistentry> -<<<<<<< Updated upstream <!--FIXME what means available? Printer Driver installed? Printer connected?--> <varlistentry id="file-print"> -======= -<varlistentry id="reader-file-print"> ->>>>>>> Stashed changes <term><menuchoice> <shortcut> <keycombo action="simul">&Ctrl;<keycap>P</keycap></keycombo> @@ -1224,12 +1220,8 @@ Please see next section for details.</para></note></listitem> </menuchoice></term> <listitem><para><action>Opens the <link linkend="filters">Message Filters</link> window.</action></para></listitem> </varlistentry> -<<<<<<< Updated upstream <!--FIXME http://www.aegiap.eu/kdeblog/2013/08/new-in-kdepim-4-12-sieve-12/ --> <varlistentry id="settings-manage-sieve-scripts"> -======= -<varlistentry id="reader-settings-manage-sieve-scripts"> ->>>>>>> Stashed changes <term><menuchoice> <guimenu>Settings</guimenu> <guimenuitem>Manage Sieve Scripts...</guimenuitem>
