[Duplicity-team] [Merge] lp:~ed.so/duplicity/manpage into lp:duplicity

2012-12-22 Thread noreply
The proposal to merge lp:~ed.so/duplicity/manpage into lp:duplicity has been 
updated.

Status: Needs review = Merged

For more details, see:
https://code.launchpad.net/~ed.so/duplicity/manpage/+merge/141148
-- 
https://code.launchpad.net/~ed.so/duplicity/manpage/+merge/141148
Your team duplicity-team is requested to review the proposed merge of 
lp:~ed.so/duplicity/manpage into lp:duplicity.

___
Mailing list: https://launchpad.net/~duplicity-team
Post to : duplicity-team@lists.launchpad.net
Unsubscribe : https://launchpad.net/~duplicity-team
More help   : https://help.launchpad.net/ListHelp


[Duplicity-team] [Merge] lp:~ed.so/duplicity/manpage into lp:duplicity

2012-11-10 Thread Kenneth Loafman
Kenneth Loafman has proposed merging lp:~ed.so/duplicity/manpage into 
lp:duplicity.

Requested reviews:
  duplicity-team (duplicity-team)

For more details, see:
https://code.launchpad.net/~ed.so/duplicity/manpage/+merge/133811

more formatting fixes, clarifications in sections EXAMPLES, FILE SELECTION
-- 
https://code.launchpad.net/~ed.so/duplicity/manpage/+merge/133811
Your team duplicity-team is requested to review the proposed merge of 
lp:~ed.so/duplicity/manpage into lp:duplicity.
=== modified file 'bin/duplicity.1'
--- bin/duplicity.1	2012-10-17 14:04:27 +
+++ bin/duplicity.1	2012-11-11 01:40:25 +
@@ -68,50 +68,39 @@
 .SH SYNOPSIS
 .B duplicity [full|incremental]
 .I [options]
-.I source_directory target_url
+source_directory target_url
 
 .B duplicity verify
-.I [options]
-.I [--file-to-restore relpath]
-.I source_url target_directory
+.I [options] [--file-to-restore relpath]
+source_url target_directory
 
 .B duplicity collection-status
 .I [options]
-.I target_url
+target_url
 
 .B duplicity list-current-files
-.I [options]
-.I [--time time]
-.I target_url
+.I [options] [--time time]
+target_url
 
 .B duplicity [restore]
-.I [options]
-.I [--file-to-restore relpath]
-.I [--time time]
-.I source_url target_directory
-
-.B duplicity remove-older-than
-.I time
-.I [options]
-.I [--force]
-.I target_url
-
-.B duplicity remove-all-but-n-full
-.I count
-.I [options]
-.I [--force]
-.I target_url
-
-.B duplicity remove-all-inc-of-but-n-full
-.I count
-.I [options]
-.I [--force]
-.I target_url
+.I [options] [--file-to-restore relpath] [--time time]
+source_url target_directory
+
+.B duplicity remove-older-than time
+.I [options] [--force]
+target_url
+
+.B duplicity remove-all-but-n-full  count
+.I [options] [--force]
+target_url
+
+.B duplicity remove-all-inc-of-but-n-full count
+.I [options] [--force]
+target_url
 
 .B duplicity cleanup
-.I [options]
-.I [--force]
-.I target_url
+.I [options] [--force] [--extra-clean]
+target_url
 
 .SH DESCRIPTION
 Duplicity incrementally backs up files and directory
@@ -291,7 +280,7 @@
 .TP
 .BI --allow-source-mismatch
 Do not abort on attempts to use the same archive dir or remote backend
-to back up different directories.  duplicity will tell you if you need
+to back up different directories. duplicity will tell you if you need
 this switch.
 
 .TP
@@ -632,12 +621,9 @@
 .I orig
 in the backup as if it were the path
 .I new.
-Can be passed multiple times.  An example:
-.PP
-.RS
+Can be passed multiple times. An example:
+
 duplicity restore --rename Documents/metal Music/metal sftp://u...@other.host/some_dir /home/me
-.PP
-.RE
 
 .TP
 .BI --rsync-options  options
@@ -646,12 +632,9 @@
 list should be of the form opt1=parm1 opt2=parm2 where the option string is
 quoted and the only spaces allowed are between options. The option string
 will be passed verbatim to rsync, after any internally generated option
-designating the remote port to use.  Here is a possibly useful example:
-.PP
-.RS
+designating the remote port to use. Here is a possibly useful example:
+
 duplicity --rsync-options=--partial-dir=.rsync-partial /home/me rsync://u...@other.host/some_dir
-.PP
-.RE
 
 .TP
 .BI --s3-european-buckets
@@ -759,10 +742,9 @@
 differs slightly hence the options should therefore be given in the long option format described in
 .BR ssh_config(5) ,
 like in this example:
-.RS
-.PP
+
 duplicity --ssh-options=-oProtocol=2 -oIdentityFile=/my/backup/id /home/me scp://u...@other.host/some_dir
-.TP
+
 .B NOTE:
 .I ssh paramiko backend
 currently supports only the
@@ -1000,18 +982,29 @@
 system.  The file selection system comprises a number of file
 selection conditions, which are set using one of the following command
 line options:
-.BR --exclude ,
-.BR --exclude-device-files ,
-.BR --exclude-filelist ,
-.BR --exclude-filelist-stdin ,
-.BR --exclude-globbing-filelist ,
-.BR --exclude-regexp ,
-.BR --include ,
-.BR --include-filelist ,
-.BR --include-filelist-stdin ,
-.BR --include-globbing-filelist ,
-and
-.BR --include-regexp .
+.RS
+--exclude
+.br
+--exclude-device-files
+.br
+--exclude-filelist
+.br
+--exclude-filelist-stdin
+.br
+--exclude-globbing-filelist
+.br
+--exclude-regexp
+.br
+--include
+.br
+--include-filelist
+.br
+--include-filelist-stdin
+.br
+--include-globbing-filelist
+.br
+--include-regexp
+.RE
 Each file selection condition either matches or doesn't match a given
 file.  A given file is excluded by the file selection system exactly
 when the first matching file selection condition specifies that the
@@ -1048,15 +1041,15 @@
 .BR include-globbing-filelist ,
 and
 .B exclude-globbing-filelist
-options accept
+options accept some
 .IR extended shell globbing patterns .
-These patterns can contain the special patterns
+These patterns can contain
 .BR * ,
 .BR ** ,
 .BR ? ,
 and
-.BR [...] .
-As in a normal shell,
+.B [...]
+(character ranges). As in a normal shell,
 .B *
 can be expanded to any string of characters not containing /,
 .B ?
@@ -1076,66 

[Duplicity-team] [Merge] lp:~ed.so/duplicity/manpage into lp:duplicity

2012-11-10 Thread noreply
The proposal to merge lp:~ed.so/duplicity/manpage into lp:duplicity has been 
updated.

Status: Needs review = Merged

For more details, see:
https://code.launchpad.net/~ed.so/duplicity/manpage/+merge/133811
-- 
https://code.launchpad.net/~ed.so/duplicity/manpage/+merge/133811
Your team duplicity-team is requested to review the proposed merge of 
lp:~ed.so/duplicity/manpage into lp:duplicity.

___
Mailing list: https://launchpad.net/~duplicity-team
Post to : duplicity-team@lists.launchpad.net
Unsubscribe : https://launchpad.net/~duplicity-team
More help   : https://help.launchpad.net/ListHelp


[Duplicity-team] [Merge] lp:~ed.so/duplicity/manpage into lp:duplicity

2011-10-07 Thread edso
edso has proposed merging lp:~ed.so/duplicity/manpage into lp:duplicity.

Requested reviews:
  duplicity-team (duplicity-team)

For more details, see:
https://code.launchpad.net/~ed.so/duplicity/manpage/+merge/78609

some updates to the manpage
-- 
https://code.launchpad.net/~ed.so/duplicity/manpage/+merge/78609
Your team duplicity-team is requested to review the proposed merge of 
lp:~ed.so/duplicity/manpage into lp:duplicity.
=== modified file 'duplicity.1'
--- duplicity.1	2011-08-18 18:15:38 +
+++ duplicity.1	2011-10-07 14:24:48 +
@@ -628,6 +628,9 @@
 Should be specified only once because currently only 
 .B one
 signing key is supported. Last entry overrides all other entries.
+.br
+see also
+.BI A NOTE ON SYMMETRIC ENCRYPTION AND SIGNING
 
 .TP
 .B --ssh-askpass
@@ -688,12 +691,18 @@
 .BI --use-agent
 If this option is specified, then
 .I --use-agent
-is passed to the GnuPG
-encryption process and it will turn off any passphrase interaction with
-the user with respect to
+is passed to the GnuPG encryption process and it will try to connect to
+.B gpg-agent
+before it asks for a passphrase for
 .I --encrypt-key
 or
-.I --sign-key.
+.I --sign-key
+if needed.
+.br
+.B Note:
+GnuPG 2 and newer ignore this option and will always use a running
+.B gpg-agent
+if no passphrase was delivered.
 
 .TP
 .BI --use-scp
@@ -710,25 +719,22 @@
 for put and get operations
 
 .TP
-.BI -v verb , --verbosity  verb
-Specify verbosity level (0 is total silent, 4 is the default, and 9 is
-noisiest).  Verbosity may also be one of: character
-.I ewnid,
-or word
-.I error,
-.I warning,
-.I notice,
-.I info,
-.I debug.
-The default is 4 (Notice).  The options
-.I -v4,
-.I -vn,
-and
-.I -vnotice
-are functionally equivalent, as are  the mixed/upper-case versions,
-.I -vN,
-.I -vNotice, and
-.I -vNOTICE.
+.BI --verbosity  level , -v level
+Specify output verbosity level (log level).
+Named levels and corresponding values are
+0 Error, 2 Warning, 4 Notice (default), 8 Info, 9 Debug (noisiest).
+.br
+.I level
+may also be
+.br
+.B a character:
+e, w, n, i, d
+.br
+.B a word:
+error, warning, notice, info, debug
+
+The options -v4, -vn and -vnotice are functionally equivalent, as are the mixed/\
+upper-case versions -vN, -vNotice and -vNOTICE.
 
 .TP
 .BI --version
@@ -789,13 +795,14 @@
 .PP
 file:///some_dir
 .PP
-ftp://user[:password]@other.host[:port]/some_dir
+ftp[s]://user[:password]@other.host[:port]/some_dir
 .PP
 hsi://user[:password]@other.host/some_dir
 .PP
-imap://user[:password]@host.com[/from_address_prefix]
-.PP
-imaps://user[:password]@host.com[/from_address_prefix]
+imap[s]://user[:password]@host.com[/from_address_prefix]
+.br
+see also
+.BI A NOTE ON IMAP
 .PP
 .BI using rsync daemon
 .br
@@ -808,14 +815,20 @@
 rsync://u...@host.com[:port]//absolute_path
 .PP
 s3://host/bucket_name[/prefix]
-.PP
+.br
 s3+http://bucket_name[/prefix]
+.br
+see also
+.BI A NOTE ON EUROPEAN S3 BUCKETS
 .PP
 .BI Ubuntu One
 .br
 u1://host/volume_path
 .br
 u1+http://volume_path
+.br
+see also
+.BI A NOTE ON UBUNTU ONE
 .PP
 .BI ssh protocols
 .br
@@ -830,9 +843,7 @@
 .PP
 tahoe://alias/directory
 .PP
-webdav://user[:password]@other.host/some_dir
-.PP
-webdavs://user[:password]@other.host/some_dir
+webdav[s]://user[:password]@other.host/some_dir
 .PP
 gdocs://user[:password]@other.host/some_dir
 
@@ -1134,67 +1145,7 @@
 which aren't followed by 'foo'.  However, it wouldn't match /home even
 if /home/ben/1234567 existed.
 
-.SH OPERATION AND DATA FORMATS
-This section describes duplicity's basic operation and the format of
-its data files.  It should not necessary to read this section to use
-duplicity.
-
-The files used by duplicity to store backup data are tarfiles in GNU
-tar format.  They can be produced independently by
-.BR rdiffdir (1).
-For incremental backups, new files are saved normally in the tarfile.
-But when a file changes, instead of storing a complete copy of the
-file, only a diff is stored, as generated by
-.BR rdiff (1).
-If a file is deleted, a 0 length file is stored in the tar.  It is
-possible to restore a duplicity archive manually by using
-.B tar
-and then
-.BR cp ,
-.BR rdiff ,
-and
-.B rm
-as necessary.  These duplicity archives have the extension
-.BR difftar .
-
-Both full and incremental backup sets have the same format.  In
-effect, a full backup set is an incremental one generated from an
-empty signature (see below).  The files in full backup sets will start
-with
-.B duplicity-full
-while the incremental sets start with
-.BR duplicity-inc .
-When restoring, duplicity applies patches in order, so deleting, for
-instance, a full backup set may make related incremental backup sets
-unusable.
-
-In order to determine which files have been deleted, and to calculate
-diffs for changed files, duplicity needs to process information about
-previous sessions.  It stores this information in the form of tarfiles
-where each entry's data contains the signature (as produced by
-.BR rdiff )
-of the file instead 

Re: [Duplicity-team] [Merge] lp:~ed.so/duplicity/manpage into lp:duplicity

2011-10-07 Thread Kenneth Loafman
Thanks ede!  This update was very much needed.

-- 
https://code.launchpad.net/~ed.so/duplicity/manpage/+merge/78609
Your team duplicity-team is requested to review the proposed merge of 
lp:~ed.so/duplicity/manpage into lp:duplicity.

___
Mailing list: https://launchpad.net/~duplicity-team
Post to : duplicity-team@lists.launchpad.net
Unsubscribe : https://launchpad.net/~duplicity-team
More help   : https://help.launchpad.net/ListHelp


Re: [Duplicity-team] [Merge] lp:~ed.so/duplicity/manpage into lp:duplicity

2011-10-07 Thread edso
On 07.10.2011 17:41, Kenneth Loafman wrote:
 Thanks ede!  This update was very much needed.
 

you mean the logging explained, right? ..ede

-- 
https://code.launchpad.net/~ed.so/duplicity/manpage/+merge/78609
Your team duplicity-team is requested to review the proposed merge of 
lp:~ed.so/duplicity/manpage into lp:duplicity.

___
Mailing list: https://launchpad.net/~duplicity-team
Post to : duplicity-team@lists.launchpad.net
Unsubscribe : https://launchpad.net/~duplicity-team
More help   : https://help.launchpad.net/ListHelp