Git commit c1c85f4171fa897a384912ba65a379c997f41e4f by Scarlett Clark. Committed on 03/12/2013 at 14:28. Pushed by scarlettclark into branch 'master'.
Documentation: Completed Backup section, update menu. REVIEW:114269 M +3 -5 doc/kmail/menus.docbook M +25 -4 doc/kmail/using-kmail.docbook http://commits.kde.org/kdepim/c1c85f4171fa897a384912ba65a379c997f41e4f diff --git a/doc/kmail/menus.docbook b/doc/kmail/menus.docbook index 4d6d34a..c9ef93b 100644 --- a/doc/kmail/menus.docbook +++ b/doc/kmail/menus.docbook @@ -635,11 +635,9 @@ Please see next section for details.</para></note></listitem> <guimenu>Folder</guimenu> <guimenuitem>Archive Folder...</guimenuitem> </menuchoice></term> -<listitem><para><action>Brings up a dialog to allow you to create an archive of the currently selected folder.</action> - In the dialog select a format (choices are: zip, tar, tar.bz2, and tar.gz). If you would like to - change the default name or location, click the folder at the end of <guilabel>Archive File</guilabel>. - Check the <guilabel>Delete folder and subfolders after completion</guilabel> if you would like everything you archived deleted. - By default all subfolders will be archived, uncheck <guilabel>Archive all subfolders</guilabel> if you only want to archive the parent folder.</para></listitem> +<listitem><para><action>Brings up a dialog to allow you to create an archive of the currently selected folder.</action> Please see + <link linkend="folder-archive">Folder Archive</link> for details.</para> + </listitem> </varlistentry> <varlistentry id="reader-folder-delete-folder"> <term><menuchoice> diff --git a/doc/kmail/using-kmail.docbook b/doc/kmail/using-kmail.docbook index a529e83..5b5a872 100644 --- a/doc/kmail/using-kmail.docbook +++ b/doc/kmail/using-kmail.docbook @@ -18,8 +18,8 @@ </author> <!-- TRANS:ROLES_OF_TRANSLATORS --> </authorgroup> -<date>2013-06-14</date> -<releaseinfo>4.10.60 (&kde; 4.11)</releaseinfo> +<date>2013-12-02</date> +<releaseinfo>(&kde; 4.12)</releaseinfo> </chapterinfo> <title>Using &kmail;</title> @@ -1792,8 +1792,19 @@ you need to debug your filtering process. <title>Backing up &kmail;</title> <para>This section describes various backup solutions within &kmail;.</para> <sect2 id="archiving"> -<title>Automatic Archiving</title> +<title>Archiving</title> <variablelist> +<varlistentry id="folder-archive"> +<term><menuchoice><guimenu>Folder</guimenu><guimenuitem>Archive Folder...</guimenuitem></menuchoice></term> +<listitem> +<para>This feature is also available through the context menu launched with a &RMB;, then select <guimenuitem>Archive Folder...</guimenuitem>. This will +<action>open a dialog</action> that allows you to create a single archive of the currently selected folder.</para> +<para>The <guilabel>Folder:</guilabel> shows the currently selected folder, if you wish to change the folder to be archived click the folder icon. + The <guilabel>Format:</guilabel> drop down menu allows you to choose a format (choices are: zip, tar, tar.bz2, and tar.gz). + If you would like to change the default name or location, click the folder at the end of <guilabel>Archive File</guilabel>.</para> + <para>Check the <guilabel>Delete folder and subfolders after completion</guilabel> if you would like everything you archived deleted. + By default all subfolders will be archived, uncheck <guilabel>Archive all subfolders</guilabel> if you only want to archive the parent folder.</para> +</listitem></varlistentry> <varlistentry id="auto-archive"> <term><menuchoice><guimenu>Settings</guimenu><guimenuitem>Configure Automatic Archiving...</guimenuitem></menuchoice></term> <listitem> @@ -1808,7 +1819,17 @@ you need to debug your filtering process. </varlistentry> </variablelist> </sect2> - +<sect2 id="exporting"> +<title>Exporting</title> +<variablelist> +<varlistentry id="settingsexport"> +<term><menuchoice><guimenu>Tools</guimenu><guimenuitem>Export &kmail; Data...</guimenuitem></menuchoice></term> +<listitem> +<para>This feature exports settings and local mail to a compressed file. Please see <ulink url="help:/pimsettingexporter">pimsettingexporter</ulink> for details.</para> +</listitem> +</varlistentry> +</variablelist> +</sect2> </sect1> <sect1 id="multiple-accounts">
