deja-dup-team team mailing list archive
-
deja-dup-team team
-
Mailing list archive
-
Message #00589
[Merge] lp:~jwcampbell/deja-dup/deja-dup-doc-updates into lp:deja-dup
Jim Campbell has proposed merging lp:~jwcampbell/deja-dup/deja-dup-doc-updates into lp:deja-dup.
Requested reviews:
Déjà Dup Developers (deja-dup-hackers)
For more details, see:
https://code.launchpad.net/~jwcampbell/deja-dup/deja-dup-doc-updates/+merge/170892
Some trivial fixes to the Deja Dup documentation. Most of the fixes are related to style, but I did fix a validation error on credits.page, as well as a few minor typos.
--
https://code.launchpad.net/~jwcampbell/deja-dup/deja-dup-doc-updates/+merge/170892
Your team Déjà Dup Developers is requested to review the proposed merge of lp:~jwcampbell/deja-dup/deja-dup-doc-updates into lp:deja-dup.
=== modified file 'help/C/backup-auto.page'
--- help/C/backup-auto.page 2011-08-28 00:50:59 +0000
+++ help/C/backup-auto.page 2013-06-21 18:22:27 +0000
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<page xmlns="http://projectmallard.org/1.0/"
- type="topic"
+ type="topic" style="task"
id="backup-auto">
<info>
<desc>Give yourself peace of mind</desc>
=== modified file 'help/C/backup-first.page'
--- help/C/backup-first.page 2011-05-06 21:59:19 +0000
+++ help/C/backup-first.page 2013-06-21 18:22:27 +0000
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<page xmlns="http://projectmallard.org/1.0/"
- type="topic"
+ type="topic" style="task"
id="backup-first">
<info>
<desc>Start now</desc>
=== modified file 'help/C/contribute.page'
--- help/C/contribute.page 2011-06-13 18:55:47 +0000
+++ help/C/contribute.page 2013-06-21 18:22:27 +0000
@@ -2,7 +2,7 @@
<page xmlns="http://projectmallard.org/1.0/"
xmlns:its="http://www.w3.org/2005/11/its"
its:version="1.0"
- type="topic"
+ type="topic" style="task"
id="contribute">
<info>
<desc>Help make <app>Déjà Dup</app> better</desc>
=== modified file 'help/C/credits.page'
--- help/C/credits.page 2011-06-28 13:36:58 +0000
+++ help/C/credits.page 2013-06-21 18:22:27 +0000
@@ -2,7 +2,7 @@
<page xmlns="http://projectmallard.org/1.0/"
xmlns:its="http://www.w3.org/2005/11/its"
its:version="1.0"
- type="topic"
+ type="topic" style="tip"
id="credits">
<info>
<desc>Meet the team</desc>
@@ -10,7 +10,7 @@
</info>
<title>Credits</title>
-<section>
+<section id="development-credits">
<title>Development</title>
<list>
<item its:translate="no"><p><link href="mailto:temposs@xxxxxxxxx">Andrew Fister</link></p></item>
@@ -21,7 +21,7 @@
</list>
</section>
-<section>
+<section id="documentation-credits">
<title>Documentation</title>
<list>
<item its:translate="no"><p><link href="mailto:mike@xxxxxxxxxxx">Michael Terry</link></p></item>
@@ -29,7 +29,7 @@
</list>
</section>
-<section>
+<section id="art-credits">
<title>Art</title>
<list>
<item its:translate="no"><p><link href="mailto:nisses.mail@xxxxxxx">Andreas Nilsson</link></p></item>
@@ -39,7 +39,7 @@
</list>
</section>
-<section>
+<section id="translation-credits">
<title>Translation</title>
<code>translator-credits</code>
</section>
=== added directory 'help/C/figures'
=== added file 'help/C/figures/deja-dup-icon.png'
Binary files help/C/figures/deja-dup-icon.png 1970-01-01 00:00:00 +0000 and help/C/figures/deja-dup-icon.png 2013-06-21 18:22:27 +0000 differ
=== modified file 'help/C/index.page'
--- help/C/index.page 2011-04-21 09:30:07 +0000
+++ help/C/index.page 2013-06-21 18:22:27 +0000
@@ -3,8 +3,11 @@
xmlns:its="http://www.w3.org/2005/11/its"
its:version="1.0"
type="guide"
+ style="2column task"
id="index">
<info>
+ <title type="link">Déjà Dup Backup Tool</title>
+ <title type="text">Déjà Dup Backup Tool</title>
<credit type="author maintainer" its:translate="no">
<name>Michael Terry</name>
<email>mike@xxxxxxxxxxx</email>
@@ -13,7 +16,11 @@
<license href="http://creativecommons.org/licenses/by-sa/3.0/"><p>Creative Commons Attribution-Share Alike 3.0 Unported License</p></license>
</info>
-<title>Backup Help</title>
+ <title>
+ <media type="image" mime="image/png" src="figures/deja-dup-icon.png">
+ </media>
+ Déjà Dup Backup Tool
+ </title>
<section id="backup" style="2column">
<title>Backing Up</title>
=== modified file 'help/C/license.page'
--- help/C/license.page 2011-04-30 02:37:05 +0000
+++ help/C/license.page 2013-06-21 18:22:27 +0000
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<page xmlns="http://projectmallard.org/1.0/"
- type="topic"
+ type="topic" style="tip"
id="license">
<info>
<desc>Know your rights</desc>
=== modified file 'help/C/prefs.page'
--- help/C/prefs.page 2013-02-05 15:55:29 +0000
+++ help/C/prefs.page 2013-06-21 18:22:27 +0000
@@ -1,7 +1,7 @@
<page xmlns="http://projectmallard.org/1.0/"
xmlns:its="http://www.w3.org/2005/11/its"
its:version="1.0"
- type="topic"
+ type="topic" style="task"
id="prefs">
<info>
<desc>Adjust your backup settings</desc>
@@ -11,7 +11,7 @@
<terms>
<item>
<title><gui>Automatic backups</gui></title>
- <p>Turn this option on to have <app>Déjà Dup</app> automatically back up for you. This is recommended so that you don’t forget to do it yourself. Backups are more useful the more recent they are, so it is important to regularly back up.</p>
+ <p>Turn this option on to have <app>Déjà Dup</app> automatically back up for you. This is recommended so that you don’t forget to do it yourself. Backups are more useful the more recent they are, so it is important to back up regularly.</p>
</item>
<item>
<title><gui>Backup location</gui></title>
@@ -20,11 +20,11 @@
<item>
<title>Cloud Services</title>
<p>The first few backup locations are cloud storage services provided by various companies. For a small fee, they hold your data for you. A cloud service like this is recommended because it is an easy way to keep your data offsite (meaning out of your home: in case of disaster or theft, your data will still be safe).</p>
- <note style="warning"><p>These services costs money. Read their rates carefully before using them.</p></note>
+ <note style="warning"><p>These services cost money. Read their rates carefully before using them.</p></note>
</item>
<item>
<title>Remote Servers</title>
- <p>Choose the type of remote server to which you want to connect. Then you can enter the server information. Alternatively, if you know your server’s URL, choose <gui>Custom Location</gui> and enter it.</p>
+ <p>Choose the type of remote server to which you want to connect. Then you can enter the server information. Alternately, if you know your server’s URL, choose <gui>Custom Location</gui> and enter it.</p>
</item>
<item>
<title>Removable Media</title>
=== modified file 'help/C/restore-full.page'
--- help/C/restore-full.page 2011-07-22 13:15:59 +0000
+++ help/C/restore-full.page 2013-06-21 18:22:27 +0000
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<page xmlns="http://projectmallard.org/1.0/"
- type="topic"
+ type="topic" style="task"
id="restore-full">
<info>
<desc>Recover from total system failure</desc>
=== modified file 'help/C/restore-lost.page'
--- help/C/restore-lost.page 2011-07-22 13:15:59 +0000
+++ help/C/restore-lost.page 2013-06-21 18:22:27 +0000
@@ -2,7 +2,7 @@
<page xmlns="http://projectmallard.org/1.0/"
xmlns:its="http://www.w3.org/2005/11/its"
its:version="1.0"
- type="topic"
+ type="topic" style="task"
id="restore-lost">
<info>
<desc>Restore a file that is no longer present</desc>
=== modified file 'help/C/restore-revert.page'
--- help/C/restore-revert.page 2011-08-15 18:21:37 +0000
+++ help/C/restore-revert.page 2013-06-21 18:22:27 +0000
@@ -2,7 +2,7 @@
<page xmlns="http://projectmallard.org/1.0/"
xmlns:its="http://www.w3.org/2005/11/its"
its:version="1.0"
- type="topic"
+ type="topic" style="task"
id="restore-revert">
<info>
<desc>Restore a previous version of a file</desc>
=== modified file 'help/C/restore-worst-case.page'
--- help/C/restore-worst-case.page 2011-06-28 13:36:58 +0000
+++ help/C/restore-worst-case.page 2013-06-21 18:22:27 +0000
@@ -2,7 +2,7 @@
<page xmlns="http://projectmallard.org/1.0/"
xmlns:its="http://www.w3.org/2005/11/its"
its:version="1.0"
- type="topic"
+ type="topic" style="task"
id="restore-worst-case">
<info>
<desc>What to do if you can’t restore your files</desc>
=== modified file 'help/C/support.page'
--- help/C/support.page 2011-05-06 21:59:19 +0000
+++ help/C/support.page 2013-06-21 18:22:27 +0000
@@ -2,7 +2,7 @@
<page xmlns="http://projectmallard.org/1.0/"
xmlns:its="http://www.w3.org/2005/11/its"
its:version="1.0"
- type="topic"
+ type="topic" style="tip"
id="support">
<info>
<desc>Get more help</desc>
Follow ups