Merge branch '1.9.4' of tasktools.org:task into 1.9.4

This commit is contained in:
Paul Beckingham 2010-11-11 13:16:34 -05:00
commit 914007c7e5
2 changed files with 4 additions and 3 deletions

View file

@ -8,6 +8,7 @@
(thanks to Jostein Berntsen).
+ Fixed but #539, where the man page task-color(5) contained a line that
began with a ' and was not displayed.
+ Fixed bug #537, where the man page task-sync(5) misspecified some URIs
------ old releases ------------------------------

View file

@ -109,9 +109,9 @@ All the other URIs allow access to remote machines. The first uses SSH and scp
.br
.RS
ssh://[user@]host[:port]:path/to/undo.data
ssh://[user@]host[:port]/path/to/undo.data
.br
[user@]host[:port]:/path/
[user@]host:/path/
.RE
Rsync is another supported protocol that minimizes network traffic, by a clever
@ -131,7 +131,7 @@ http://host[:port]/path/to/undo.data
.br
https://host[:port]/path/to/undo.data
.br
ftp://user@host[:port]/path/to/undo.data
ftp://[user@]host[:port]/path/to/undo.data
.RE
.SH CONFLICTS