Merge branch '2.9x'

This commit is contained in:
Mike Gelfand
2018-01-25 03:07:52 +03:00
26 changed files with 82 additions and 33 deletions

View File

@@ -59,7 +59,7 @@ Dump transmission-daemon's settings to stderr.
Run in the foreground and print errors to stderr.
.It Fl g Fl -config-dir Ar directory
Where to look for configuration files. This can be used to swap between using the cli, daemon, gtk, and qt clients.
See https://trac.transmissionbt.com/wiki/ConfigFiles for more information.
See https://github.com/transmission/transmission/wiki/Configuration-Files for more information.
.It Fl er Fl -encryption-required
Encrypt all peer connections.
.It Fl ep Fl -encryption-preferred
@@ -148,7 +148,7 @@ The config-dir used when neither
nor
.Op Fl g
is specified.
See https://trac.transmissionbt.com/wiki/ConfigFiles for more information.
See https://github.com/transmission/transmission/wiki/Configuration-Files for more information.
.El
.Sh AUTHORS
.An -nosplit