Duplicity

Merge lp:~l2g/duplicity/doc-update into lp:~duplicity-team/duplicity/trunk

  1. doc-update
  2. Merge into trunk
Proposed by Kenneth Loafman
Status: Merged
Approved by: Kenneth Loafman
Approved revision: 570
Merged at revision: not available
Proposed branch: lp:~l2g/duplicity/doc-update
Merge into: lp:~duplicity-team/duplicity/trunk
Diff against target: None lines
To merge this branch: bzr merge lp:~l2g/duplicity/doc-update
Reviewer Review Type Date Requested Status
Kenneth Loafman Approve
Review via email: mp+9287@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Kenneth Loafman (kenneth-loafman) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== renamed file 'CVS-README' => 'REPO-README'
2--- CVS-README 2008-11-12 13:53:17 +0000
3+++ REPO-README 2009-07-21 19:04:37 +0000
4@@ -1,11 +1,13 @@
5-CVS README - Notes for people checking out of CVS
6--------------------------------------------------
7+REPO README - Notes for people checking out of Launchpad (bzr)
8+--------------------------------------------------------------
9
10 Getting duplicity to run:
11 -------------------------
12
13 By the numbers:
14-1) Do the checkout while in a location called $DUP_ROOT.
15+1) Do the checkout while in a location called $DUP_ROOT:
16+ bzr lp:duplicity . [for the dev branch]
17+ -OR- bzr lp:duplicity/stable . [for the stable branch]
18 2) cd $DUP_ROOT/duplicity
19 3) run "python compilec.py" to create _librsync.so
20 4) cd ..
21
22=== modified file 'duplicity.1'
23--- duplicity.1 2009-07-19 19:18:21 +0000
24+++ duplicity.1 2009-07-21 20:46:04 +0000
25@@ -61,7 +61,7 @@
26 Because duplicity uses
27 librsync, the incremental archives are space efficient and only record
28 the parts of files that have changed since the last backup. Currently
29-duplicity supports deleted files, full unix permissions, directories,
30+duplicity supports deleted files, full Unix permissions, directories,
31 symbolic links, fifos, etc., but not hard links.
32
33 Duplicity will read the PASSPHRASE environment variable to find the
34@@ -1099,13 +1099,13 @@
35 or HTTP errors when trying to upload files to your newly created
36 bucket. Give it a few minutes and the bucket should function normally.
37 .SH IMAP
38-An Imap account can be used as a target for the upload. The userid may
39+An IMAP account can be used as a target for the upload. The userid may
40 be specified and the password will be requested.
41 .PP
42 The
43 .B from_address_prefix
44 may be specified (and probably should be). The text will be used as
45-the "From" address in the imap server. Then on a restore (or list) command
46+the "From" address in the IMAP server. Then on a restore (or list) command
47 the
48 .B from_address_prefix
49 will distinguish between different backups.

Subscribers

People subscribed via source and target branches

to all changes: