commit f393897a17a7988ab2009ad8df14bd8e934ce313 Author: David Goulet dgoulet@ev0ke.net Date: Sat Aug 24 15:47:57 2013 -0400

Minor fixes in man pages

Signed-off-by: David Goulet dgoulet@ev0ke.net --- doc/torsocks.1 | 12 ++++++------ doc/torsocks.8 | 6 +++--- doc/torsocks.conf.5 | 4 ++-- 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/doc/torsocks.1 b/doc/torsocks.1 index 885ff52..b4dab1f 100644 --- a/doc/torsocks.1 +++ b/doc/torsocks.1 @@ -18,7 +18,7 @@ By default, torsocks will assume that it should connect to the Tor SOCKS proxy running at 127.0.0.1 on port 9050 being the defaults of the Tor daemon.

In order to use a configuration file, torsocks tries to read the -\fB@CONFDIR@/tor/torsocks.conf\fP file or look for the environment variable +\fB/etc/tor/torsocks.conf\fP file or look for the environment variable TORSOCKS_CONF_FILE with the location of the file. If that file cannot be read, torsocks will use sensible defaults for most Tor installations.

@@ -32,24 +32,24 @@ For further information on configuration, see Show summary of possible options and commands. .TP .BR "--shell" -Create a new shell with @LDPRELOAD@ including \fBtorsocks(8)\fP. +Create a new shell with LD_PRELOAD including \fBtorsocks(8)\fP. .TP .BR "on | off" -This option adds or removes \fBtorsocks(8)\fP from the @LDPRELOAD@ environment +This option adds or removes \fBtorsocks(8)\fP from the LD_PRELOAD environment variable for the current shell. If you want to use this option, you HAVE to source torsocks from yours. .br

.nf -Add the torsocks library to @LDPRELOAD@ +Add the torsocks library to LD_PRELOAD $ . torsocks on .br -Remove the torsocks library from @LDPRELOAD@ +Remove the torsocks library from LD_PRELOAD $ . torsocks off .fi .TP .BR "show | sh" -Show the current value of the @LDPRELOAD@ environment variable. +Show the current value of the LD_PRELOAD environment variable.

.SH "ENVIRONMENT VARIABLES" .PP diff --git a/doc/torsocks.8 b/doc/torsocks.8 index 1820465..e91c356 100644 --- a/doc/torsocks.8 +++ b/doc/torsocks.8 @@ -18,12 +18,12 @@ Please note that the ISC res_* API is currently not supported. Here is an example on how to use torsocks library with \fBssh(1)\fP: .br

-$ @LDPRELOAD@=/path/to/libtorsocks.so ssh -l kalexander -p 1234 prism.nsa.gov +$ LD_PRELOAD=/path/to/libtorsocks.so ssh -l kalexander -p 1234 prism.nsa.gov [...]

.SH SHELL USAGE

-Set @LDPRELOAD@ to load the library then use applications as normal. The syntax +Set LD_PRELOAD to load the library then use applications as normal. The syntax to force preload of the library for different shells is specified below:

Bash, Ksh and Bourne shell: @@ -111,7 +111,7 @@ executables that make system calls directly with the system call trap (int 0x80).

.SH FILES -@CONFDIR@/tor/torsocks.conf - default torsocks configuration file +/etc/tor/torsocks.conf - default torsocks configuration file

.SH SEE ALSO .BR torsocks.conf(5), diff --git a/doc/torsocks.conf.5 b/doc/torsocks.conf.5 index 6018153..cdafad0 100644 --- a/doc/torsocks.conf.5 +++ b/doc/torsocks.conf.5 @@ -15,13 +15,13 @@ Your installation of torsocks includes a default configuration file that contains values sensible for use with most Tor installations. The installation location for your default configuration file is:

- @CONFDIR@/tor/torsocks.conf +/etc/tor/torsocks.conf

In order to use a configuration file, you must set the environment variable TORSOCKS_CONF_FILE with the location of the file.

If TORSOCKS_CONF_FILE is not set, torsocks will attempt to read the -configuration file at @CONFDIR@/tor/torsocks.conf. If that file cannot be read, +configuration file at /etc/tor/torsocks.conf. If that file cannot be read, torsocks will use sensible defaults for most Tor installations, i.e. it will assume that you want to use a SOCKS proxy running at 127.0.0.1 (localhost) on port 9050.