Merge into lp:duplicity/0.6-series

Proposed by edso on 2012-12-22
Status: Merged
Merged at revision: 900
Proposed branch:
Merge into: lp:duplicity/0.6-series
Diff against target: 39 lines (+10/-5)
1 file modified
bin/duplicity.1 (+10/-5)
To merge this branch: bzr merge
Reviewer Review Type Date Requested Status
duplicity-team 2012-12-22 Pending
Review via email:

Description of the change

clear up PASSPHRASE reusage as sign passphrase
minor fixes

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'bin/duplicity.1'
2--- bin/duplicity.1 2012-11-22 02:02:01 +0000
3+++ bin/duplicity.1 2012-12-22 10:31:23 +0000
4@@ -862,9 +862,13 @@
5 prompted for the passphrase.
6 .TP
8-The passphrase to be used for
9-.B --sign-key
10-, if SIGN_PASSPHRASE is not set but PASSPHRASE is set, the latter will be used.
11+The passphrase to be used for
12+.BR --sign-key .
13+If ommitted
14+.B and
15+sign key is also one of the keys to encrypt against
17+will be reused instead.
18 Otherwise, if passphrase is needed but not set the user will be prompted for it.
21@@ -880,7 +884,7 @@
22 it is permitted however.
23 Consider setting the environment variable
25-instead, which is used by most, but not all backends, regardless of it's name.
26+instead, which is used by most, if not all backends, regardless of it's name.
27 .PP
28 In protocols that support it, the path may be preceded by a single
29 slash, '/path', to represent a relative path to the target home directory,
30@@ -1368,7 +1372,8 @@
31 OAuth tokens have a practically unlimited lifetime; you can have multiple
32 active tokens and you can revoke tokens using the Ubuntu One web interface.
33 .PP
34-duplicity expects th token in the environment variable FTP_PASSWORD
35+Duplicity expects the token in the environment variable
37 (in the format "consumer_key:consumer_secret:token:token_secret"). If no
38 token is present, duplicity asks for your Ubuntu One email address and password
39 and requests an access token from the Ubuntu SSO service. The newly


People subscribed via source and target branches

to all changes: