[gnome-user-docs: 10/10] Merge branch 'tiffany/backup.page'

[Tiffany Antopolski <antopolski src gnome org>]

commit 995e99d073025ba052c523c46e545658c0161a07
Merge: fb3af42 ba515af
Author: Tiffany Antopolski <tiffany antopolski com>
Date:   Tue Jan 4 14:29:42 2011 -0500

    Merge branch 'tiffany/backup.page'
    
    Conflicts:
    	gnome-help/C/backup-frequency.page

 gnome-help/C/backup-frequency.page  |   21 ++++++++-
 gnome-help/C/backup-how.page        |   47 +++++++++++++++++++
 gnome-help/C/backup-restore.page    |   10 +++-
 gnome-help/C/backup-thinkabout.page |   43 +++++++++++++++++-
 gnome-help/C/backup-what.page       |   47 +++++++++++++++++++
 gnome-help/C/backup-where.page      |   45 ++++++++++++++++++
 gnome-help/C/backup-why.page        |   35 ++++++++++++++
 gnome-help/C/backup.page            |   87 ++++-------------------------------
 8 files changed, 252 insertions(+), 83 deletions(-)
---
diff --cc gnome-help/C/backup-frequency.page
index 27aaad3,25c3a4c..c1c50f6
--- a/gnome-help/C/backup-frequency.page
+++ b/gnome-help/C/backup-frequency.page
@@@ -14,9 -14,25 +14,26 @@@
  
    <title>Frequency of Backups</title>
    <p>
-   Backups should be done on a regular basis. Fortunately, itâ??s easy to set up automatic backups using <app>Déjà  Dup</app>.
+   The frequency of backups will depend on the type of data to be backed up.
    </p>
+ <p>
  
++
+ For example, if you are running a network environment with critical data stored on your servers, then even nightly backups may not be enough. 
+ </p>
+ <p>
+ On the other hand, if you are backing up the data on your home computer then you may need to factor in a few things, such as:
+ </p>
+ <list>
+ <item><p>
+  The amount of time you spend on the computer.</p></item>
+ <item><p>
+  How often and by how much the data on the computer changes.</p></item>
+ </list>
+ <p>
+ 
+ If it is just some music, e-mails and family photos, then weekly, monthly or even less frequent backups may suffice. However, if you happen to be in the middle of a tax audit, more frequent backups may be necessary.
+ </p>
    <comment>
     <cite date="2010-06-29" href="mailto:gnome-doc-list gnome org">GNOME Documentation Project</cite>
     <p>Explain how often the user should back up and why (there may be different frequencies for different types of data).</p>