From 465a2e7c909e45105c7723afa1209b5bc9f5b494 Mon Sep 17 00:00:00 2001 From: Charles Kerr Date: Sun, 12 Dec 2010 16:36:46 +0000 Subject: [PATCH] (trunk) extremely minor manpage copyediting --- cli/transmission-cli.1 | 4 ++-- daemon/transmission-daemon.1 | 8 ++++---- daemon/transmission-remote.1 | 16 ++++++++-------- gtk/main.c | 13 +++++++++++++ gtk/transmission-gtk.1 | 6 +++--- qt/transmission-qt.1 | 4 ++-- utils/transmission-create.1 | 2 +- utils/transmission-edit.1 | 2 +- 8 files changed, 34 insertions(+), 21 deletions(-) diff --git a/cli/transmission-cli.1 b/cli/transmission-cli.1 index 8c6e4dc12..d91c2dfe7 100644 --- a/cli/transmission-cli.1 +++ b/cli/transmission-cli.1 @@ -47,7 +47,7 @@ scripting capabilities. The options are as follows: .Bl -tag -width Ds .It Fl b Fl -blocklist -Enable peer blocklists. Transmission understands the bluetack blocklist file format. +Enable peer blocklists. Transmission understands the bluetack blocklist file format. New blocklists can be added by copying them into the config-dir's "blocklists" subdirectory. .It Fl B Fl -no-blocklist Disble blocklists. @@ -64,7 +64,7 @@ Prefer unencrypted peer connections. .It Fl f, -finish Ar script Set a script to run when the torrent finishes .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. +Where to look for configuration files. This can be used to swap between using the cli, daemon, gtk, and qt clients. See http://trac.transmissionbt.com/wiki/ConfigFiles for more information. .It Fl h, Fl -help Prints a short usage summary. diff --git a/daemon/transmission-daemon.1 b/daemon/transmission-daemon.1 index eb85aa4f2..0324d2d41 100644 --- a/daemon/transmission-daemon.1 +++ b/daemon/transmission-daemon.1 @@ -42,10 +42,10 @@ Wildcards can be specified in an address by using '*'. Default: "127.0.0.1" Example: "127.0.0.*,192.168.1.*" .It Fl b Fl -blocklist -Enable peer blocklists. Transmission understands the bluetack blocklist file format. +Enable peer blocklists. Transmission understands the bluetack blocklist file format. New blocklists can be added by copying them into the config-dir's "blocklists" subdirectory. .It Fl c Ar directory -Directory to watch for new .torrent files to be added. As they are added to this directory, +Directory to watch for new .torrent files to be added. As they are added to this directory, the daemon will load them into Transmission. .It Fl C Do not watch for new .torrent files. @@ -54,7 +54,7 @@ Disble blocklists. .It Fl f Fl -foreground 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. +Where to look for configuration files. This can be used to swap between using the cli, daemon, gtk, and qt clients. See http://trac.transmissionbt.com/wiki/ConfigFiles for more information. .It Fl er Fl -encryption-required Encrypt all peer connections. @@ -96,7 +96,7 @@ Enable distributed hash table (DHT). .It Fl O Fl -no-dht Disable distribued hash table (DHT). .It Fl p Fl -port Ar port -Port to open and listen for RPC requests on. Default: 9091 +Port to open and listen for RPC requests on. Default: 9091 .It Fl P, -peerport Ar port Port to listen for incoming peers on. Default: 51413 .It Fl t Fl -auth diff --git a/daemon/transmission-remote.1 b/daemon/transmission-remote.1 index 0939e75c8..68a6f8ca4 100644 --- a/daemon/transmission-remote.1 +++ b/daemon/transmission-remote.1 @@ -122,12 +122,12 @@ Don't store incomplete torrents in a different directory. Limit the maximum download speed to .Ar limit KiB/s. -If current torrent(s) are selected this operates on them. Otherwise, it changes the global setting. +If current torrent(s) are selected this operates on them. Otherwise, it changes the global setting. .It Fl D Fl -no-downlimit Disable download speed limits. -If current torrent(s) are selected this operates on them. Otherwise, it changes the global setting. +If current torrent(s) are selected this operates on them. Otherwise, it changes the global setting. .It Fl e Fl -cache Ar size -Set the session's maximum memory cache size in MiB. This cache is used to reduce disk IO. +Set the session's maximum memory cache size in MiB. This cache is used to reduce disk IO. .It Fl er Fl -encryption-required Encrypt all peer connections. .It Fl ep Fl -encryption-preferred @@ -210,13 +210,13 @@ Try to download the specified files normally. Try to download the specified files last .It Fl pr Fl -peers Ar number Set the maximum number of peers. -If current torrent(s) are selected this operates on them. Otherwise, it changes the global setting. +If current torrent(s) are selected this operates on them. Otherwise, it changes the global setting. .It Fl r Fl -remove -Remove the current torrent(s). This does not delete the downloaded data. +Remove the current torrent(s). This does not delete the downloaded data. .It Fl -remove-and-delete Remove the current torrent(s) and delete their downloaded data. .It Fl -reannounce -Reannounce the current torrent(s). This is the same as the GUI's "ask tracker for more peers" button. +Reannounce the current torrent(s). This is the same as the GUI's "ask tracker for more peers" button. .It Fl -move Move the current torrents' data from their current locations to the specified directory. .It Fl -find @@ -261,10 +261,10 @@ Make the current torrent(s) not honor the session limits. Limit the maximum upload speed to .Ar limit KiB/s. -If current torrent(s) are selected this operates on them. Otherwise, it changes the global setting. +If current torrent(s) are selected this operates on them. Otherwise, it changes the global setting. .It Fl U Fl -no-uplimit Disable upload speed limits. -If current torrent(s) are selected this operates on them. Otherwise, it changes the global setting. +If current torrent(s) are selected this operates on them. Otherwise, it changes the global setting. .It Fl v Fl -verify Verify the current torrent(s) .It Fl V Fl -version diff --git a/gtk/main.c b/gtk/main.c index d7095a1b4..eb99b6d37 100644 --- a/gtk/main.c +++ b/gtk/main.c @@ -538,6 +538,19 @@ applyDesktopProxySettings( CURL * easy, GConfClient * client, const char * host_ { int port; GConfValue * value; + static gboolean env_set; + static gboolean env_checked = FALSE; + + /* Both libcurl and GNOME have hooks for proxy support. + * If someone has set the http_proxy environment variable, + * don't apply the GNOME settings here. That way libcurl can override GNOME. */ + if( !env_checked ) { + const char * str = g_getenv( "http_proxy" ); + env_set = str && *str; + env_checked = TRUE; + } + if( env_set ) + return; if(( value = gconf_client_get( client, host_key, NULL ))) { diff --git a/gtk/transmission-gtk.1 b/gtk/transmission-gtk.1 index 262a0548f..7b26b6247 100644 --- a/gtk/transmission-gtk.1 +++ b/gtk/transmission-gtk.1 @@ -37,7 +37,7 @@ is a fast and easy BitTorrent client. .Pp BitTorrent is a peer-to-peer file transfer protocol which uses a metainfo file (usually with the .torrent file extension) and a central -tracker to distribute file data amongst a group of peers. For more +tracker to distribute file data amongst a group of peers. For more information on the BitTorrent protocol see http://www.bittorrent.org/ .Sh OPTIONS .Bl -tag -width Ds @@ -48,7 +48,7 @@ Start with all torrents paused .It Fl m Fl -minimized Start minimized in notification area .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. +Where to look for configuration files. This can be used to swap between using the cli, daemon, gtk, and qt clients. See http://trac.transmissionbt.com/wiki/ConfigFiles for more information. .El .Pp @@ -62,7 +62,7 @@ is already running, the torrents will be added to the running instance. .It Ev TRANSMISSION_HOME Sets the default config-dir. .It Ev http_proxy -Sets the proxy to use for http tracker announces. If set, this overrides the GNOME proxy preferences. +Sets the proxy to use for http tracker announces. If set, this overrides the GNOME proxy preferences. .El .Sh FILES .Bl -tag -width Ds -compact diff --git a/qt/transmission-qt.1 b/qt/transmission-qt.1 index 9ae7442e3..919470445 100644 --- a/qt/transmission-qt.1 +++ b/qt/transmission-qt.1 @@ -15,14 +15,14 @@ is a fast and easy BitTorrent client. .Pp BitTorrent is a peer-to-peer file transfer protocol which uses a metainfo file (usually with the .torrent file extension) and a central -tracker to distribute file data amongst a group of peers. For more +tracker to distribute file data amongst a group of peers. For more information on the BitTorrent protocol see http://www.bittorrent.org/ .Sh OPTIONS .Bl -tag -width Ds .It Fl h Fl -help Show help options .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. +Where to look for configuration files. This can be used to swap between using the cli, daemon, gtk, and qt clients. See http://trac.transmissionbt.com/wiki/ConfigFiles for more information. .It Fl m Fl -minimized Start minimized in notification area diff --git a/utils/transmission-create.1 b/utils/transmission-create.1 index 90397de8e..9b9d771c1 100644 --- a/utils/transmission-create.1 +++ b/utils/transmission-create.1 @@ -28,7 +28,7 @@ Add a comment to the torrent file. .It Fl t Fl -tracker Add a tracker's .Ar announce URL -to the .torrent. Most torrents will have at least one +to the .torrent. Most torrents will have at least one .Ar announce URL. To add more than one, use this option multiple times. .El diff --git a/utils/transmission-edit.1 b/utils/transmission-edit.1 index 5a119c101..25c5ba53b 100644 --- a/utils/transmission-edit.1 +++ b/utils/transmission-edit.1 @@ -25,7 +25,7 @@ Add an announce URL to the torrent's announce-list if it's not already in the li .It Fl d Fl -delete Ar URL Remove an announce URL from the torrent's announce-list .It Fl r Fl -replace Ar search Ar replace -Substring search-and-replace inside a torrent's announce URLs. This can be used to change an announce URL when the tracker moves or your passcode changes. +Substring search-and-replace inside a torrent's announce URLs. This can be used to change an announce URL when the tracker moves or your passcode changes. .El .Sh EXAMPLES Update a tracker passcode in all your torrents: