From bacd47805ed9be1bd1fcb7b3fc3e12adf12ade64 Mon Sep 17 00:00:00 2001
From: Andre Klapper <a9016009@gmx.de>
Date: Thu, 4 Aug 2011 15:38:54 +0200
Subject: Put new user documentation in place

---
 help/C/backup-restore.page | 44 ++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 44 insertions(+)
 create mode 100644 help/C/backup-restore.page

(limited to 'help/C/backup-restore.page')

diff --git a/help/C/backup-restore.page b/help/C/backup-restore.page
new file mode 100644
index 0000000000..96dcab1888
--- /dev/null
+++ b/help/C/backup-restore.page
@@ -0,0 +1,44 @@
+<page xmlns="http://projectmallard.org/1.0/" xmlns:its="http://www.w3.org/2005/11/its"
+      type="topic" id="backup-restore">
+
+  <info>
+    <desc>Back up and restore your Evolution data and settings.</desc>
+
+    <link type="guide" xref="index#data-migration-and-sync"/>
+    <link type="seealso" xref="data-storage"/>
+
+    <revision pkgversion="2.32.1" version="0.1" date="2011-01-06" status="draft"/>
+    <credit type="author">
+      <name>Andre Klapper</name>
+      <email>ak-47@gmx.net</email>
+    </credit>
+    <license>
+      <p>Creative Commons Share Alike 3.0</p>
+    </license>
+
+  </info>
+
+  <title>Back up and restore</title>
+
+<p>You can back up your Evolution data. The backup saves your settings, mail, contacts, tasks, memos and calendars. It will be stored in a gzip-compressed tar archive file.</p>
+
+<section id="backup">
+<title>Backing up</title>
+<list>
+<item><p>Select <guiseq><gui>File</gui><gui>Back up Evolution Settings...</gui></guiseq>.</p></item>
+<item><p>Choose a filename and the folder where you want to save the backup file, and click <gui style="button">Save</gui>.</p></item>
+<item><p>You will get asked to close Evolution. Answer with <gui style="button">Yes</gui>.</p></item>
+</list>
+</section>
+
+<section id="restore">
+<title>Restoring</title>
+<list>
+<item><p>Select <guiseq><gui>File</gui><gui>Restore Evolution Settings...</gui></guiseq>.</p></item>
+<item><p>Choose the file, and click <gui style="button">Open</gui>.</p></item>
+<item><p>You will get asked to close Evolution. Answer with <gui style="button">Yes</gui>.</p></item>
+</list>
+<note style="tip"><p>In the <link xref="intro-first-run">first-run assistant</link>, you can restore Evolution data from a backup file.</p></note>
+</section>
+
+</page>
-- 
cgit v1.2.3


From e3a7795a359107c5595985c2561badec9514816a Mon Sep 17 00:00:00 2001
From: Andre Klapper <a9016009@gmx.de>
Date: Fri, 5 Aug 2011 14:49:07 +0200
Subject: Bugfixes and corrections pointed out by Akhil Laddha

---
 help/C/backup-restore.page | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'help/C/backup-restore.page')

diff --git a/help/C/backup-restore.page b/help/C/backup-restore.page
index 96dcab1888..bbfdbf5dcd 100644
--- a/help/C/backup-restore.page
+++ b/help/C/backup-restore.page
@@ -7,7 +7,7 @@
     <link type="guide" xref="index#data-migration-and-sync"/>
     <link type="seealso" xref="data-storage"/>
 
-    <revision pkgversion="2.32.1" version="0.1" date="2011-01-06" status="draft"/>
+    <revision pkgversion="3.1.5" version="0.2" date="2011-08-05" status="final"/>
     <credit type="author">
       <name>Andre Klapper</name>
       <email>ak-47@gmx.net</email>
@@ -25,7 +25,7 @@
 <section id="backup">
 <title>Backing up</title>
 <list>
-<item><p>Select <guiseq><gui>File</gui><gui>Back up Evolution Settings...</gui></guiseq>.</p></item>
+<item><p>Select <guiseq><gui>File</gui><gui>Back up Evolution Data...</gui></guiseq>.</p></item>
 <item><p>Choose a filename and the folder where you want to save the backup file, and click <gui style="button">Save</gui>.</p></item>
 <item><p>You will get asked to close Evolution. Answer with <gui style="button">Yes</gui>.</p></item>
 </list>
@@ -34,7 +34,7 @@
 <section id="restore">
 <title>Restoring</title>
 <list>
-<item><p>Select <guiseq><gui>File</gui><gui>Restore Evolution Settings...</gui></guiseq>.</p></item>
+<item><p>Select <guiseq><gui>File</gui><gui>Restore Evolution Data...</gui></guiseq>.</p></item>
 <item><p>Choose the file, and click <gui style="button">Open</gui>.</p></item>
 <item><p>You will get asked to close Evolution. Answer with <gui style="button">Yes</gui>.</p></item>
 </list>
-- 
cgit v1.2.3


From 08fc05b8f9a91c7e86a521ae9c47264bc73ae30d Mon Sep 17 00:00:00 2001
From: Michael Hill <mdhillca@gmail.com>
Date: Thu, 29 Sep 2011 13:06:35 +0200
Subject: User Docs: Fix several typos and issues. Fixes bug #658651.

---
 help/C/backup-restore.page | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'help/C/backup-restore.page')

diff --git a/help/C/backup-restore.page b/help/C/backup-restore.page
index bbfdbf5dcd..4106b75e28 100644
--- a/help/C/backup-restore.page
+++ b/help/C/backup-restore.page
@@ -27,7 +27,7 @@
 <list>
 <item><p>Select <guiseq><gui>File</gui><gui>Back up Evolution Data...</gui></guiseq>.</p></item>
 <item><p>Choose a filename and the folder where you want to save the backup file, and click <gui style="button">Save</gui>.</p></item>
-<item><p>You will get asked to close Evolution. Answer with <gui style="button">Yes</gui>.</p></item>
+<item><p>You will be asked to close Evolution. Answer with <gui style="button">Yes</gui>.</p></item>
 </list>
 </section>
 
@@ -36,7 +36,7 @@
 <list>
 <item><p>Select <guiseq><gui>File</gui><gui>Restore Evolution Data...</gui></guiseq>.</p></item>
 <item><p>Choose the file, and click <gui style="button">Open</gui>.</p></item>
-<item><p>You will get asked to close Evolution. Answer with <gui style="button">Yes</gui>.</p></item>
+<item><p>You will be asked to close Evolution. Answer with <gui style="button">Yes</gui>.</p></item>
 </list>
 <note style="tip"><p>In the <link xref="intro-first-run">first-run assistant</link>, you can restore Evolution data from a backup file.</p></note>
 </section>
-- 
cgit v1.2.3


From 16f746c30a0f165dc930ffa37e3fa20b74ee8ff7 Mon Sep 17 00:00:00 2001
From: Andre Klapper <a9016009@gmx.de>
Date: Thu, 29 Sep 2011 13:21:12 +0200
Subject: User Docs: Mention that spam settings are not included in backup.
 Fixes bug #657682

---
 help/C/backup-restore.page | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'help/C/backup-restore.page')

diff --git a/help/C/backup-restore.page b/help/C/backup-restore.page
index 4106b75e28..64e1ff50fc 100644
--- a/help/C/backup-restore.page
+++ b/help/C/backup-restore.page
@@ -7,7 +7,7 @@
     <link type="guide" xref="index#data-migration-and-sync"/>
     <link type="seealso" xref="data-storage"/>
 
-    <revision pkgversion="3.1.5" version="0.2" date="2011-08-05" status="final"/>
+    <revision pkgversion="3.1.5" version="0.3" date="2011-09-29" status="final"/>
     <credit type="author">
       <name>Andre Klapper</name>
       <email>ak-47@gmx.net</email>
@@ -29,6 +29,7 @@
 <item><p>Choose a filename and the folder where you want to save the backup file, and click <gui style="button">Save</gui>.</p></item>
 <item><p>You will be asked to close Evolution. Answer with <gui style="button">Yes</gui>.</p></item>
 </list>
+<note style="warning"><p>Note that your <link xref="mail-spam">spam filtering</link> settings are not included in the backup file, as these settings are not controlled by Evolution and as developers of spam filtering tools might change implementation details. If you use Bogofilter you will need to back up <file>~/.bogofilter/</file>. If you use SpamAssassin you will need to back up <file>~/.spamassassin/</file>.</p></note>
 </section>
 
 <section id="restore">
-- 
cgit v1.2.3