From 2e9d971dec3dda75e2fede86cd057e632e89a85f Mon Sep 17 00:00:00 2001 From: Nick Mathewson Date: Fri, 18 Mar 2005 23:09:29 +0000 Subject: [PATCH] Correct documentation wrt versions; where files go; and default behavior of osx installer. Can somebody with good html fu improve my table? svn:r3778 --- doc/TODO | 6 +++-- doc/tor-doc-osx.html | 28 +++++++++-------------- doc/tor-doc.html | 53 ++++++++++++++++++++++++++++++++++---------- 3 files changed, 55 insertions(+), 32 deletions(-) diff --git a/doc/TODO b/doc/TODO index c83a5e88e7..d977edcf39 100644 --- a/doc/TODO +++ b/doc/TODO @@ -112,7 +112,9 @@ N - Clean up NT service code even more. Document it. Enable it by default. Documentation N - Document new version system. r - Correct and clarify the wiki entry on port forwarding. -N - Document where OSX, windows logs go, where stuff is installed. + o Document where OSX logs and torrc go. + o Document where windows logs and torrc go. + - (Make sure they actually go there.) Installers N - Vet all pending installer patches @@ -121,7 +123,7 @@ N - Vet all pending installer patches o Make OSX man pages go into man directory. N . Make logs go into platform default locations. o OSX - - + - Windows. (?) Correctness - Mark bugs for 010 or post 010 in bugtracker. diff --git a/doc/tor-doc-osx.html b/doc/tor-doc-osx.html index 681e70e3fa..8c73b6b239 100644 --- a/doc/tor-doc-osx.html +++ b/doc/tor-doc-osx.html @@ -16,7 +16,9 @@

Step One: Download and Install Tor

-Note that this is the installation instructions for running a client on Mac OS X. If you want to run a server, please read the "Configuring a server" section in tor-doc.html. +Note that this is the installation instructions for running a client on + Mac OS X. If you want to run a server, please read the "Configuring a + server" section in tor-doc.html.

@@ -37,27 +39,17 @@ src="http://tor.eff.org/img/screenshot-osx-installer-splash.png" border="1">

-By default, Tor is not configured to run at startup. - -You can enable this by selecting "Customize" in the Installer.

- -select components to install - -

-And then checking the "Tor Startup Script" box as shown below. -Be sure to leave the other boxes checked. +By default, Tor is configured to run at startup. If you do not want Tor to +run on startup, you can disable this by selecting "Customize" in the +Installer, and then un-checking the "Tor Startup Script" box. Be sure to +leave the other boxes checked.

-select components to install -

Once the installer is finished and your computer restarts, Tor will start automatically. Tor comes configured as a client by default. It -uses a built-in default configuration file, and most people won't need -to change any of the settings. Tor is now installed.

+uses a built-in default configuration file in /Library/Tor/torrc, +but most people won't need to change any of the settings. Tor is now +installed.

Privoxy is installed as part of the Tor bundle package installer. Privoxy is a filtering web proxy that integrates well with diff --git a/doc/tor-doc.html b/doc/tor-doc.html index 1f2f37fb58..eae731e5cc 100644 --- a/doc/tor-doc.html +++ b/doc/tor-doc.html @@ -153,20 +153,17 @@ server below.

Installing Tor

-

Win32 users can use our Tor installer. See these instructions for help with -installing, configuring, and using Tor on Win32. -
-Mac OS X users can use our Tor installer. See these instructions for help with -installing, configuring, and using Tor on Mac OS X. +

We have installers for Windows and Mac OS X. For help with installing, + configuring, and using Tor on these operating systems, consult the + Windows instructions or the + Mac OS X instructions.

You can get the latest releases here.

If you got Tor from a tarball, unpack it: tar xzf -tor-0.0.9.1.tar.gz; cd tor-0.0.9.1. Run ./configure, then +tor-0.0.9.5.tar.gz; cd tor-0.0.9.5. Run ./configure, then make, and then make install (as root if necessary). Then you can launch tor from the command-line by running tor. Otherwise, if you got it prepackaged (e.g. in the the section above.

To set up a Tor server, do the following steps after installing Tor. -(These instructions are Unix-centric; but Tor 0.0.9.2 is running as a +(These instructions are Unix-centric; but Tor 0.0.9.5 is running as a server on Windows now as well.)

If possible, sign your mail using PGP. +

+ +

Here's where Tor puts its files on many common platforms:

+ + + + + + + + + + + + + + +
UnixWindowsMac OS X
Configuration/etc/torrc
or /usr/local/etc/torrc		\Application Data\username\tor\torrc
or + \Application Data\tor\torrc		/Library/Tor/torrc
Fingerprint/var/lib/tor/fingerprint + or /usr/local/var/lib/tor/fingerprint/Application Data\username\tor\fingerprint + or /Application Data\tor\fingerprint/Library/Tor/var/lib/tor/fingerprint
Logs/var/log/tor + or /usr/local/var/log/tor/Application Data\username\tor\log + or /Application Data\tor\log/var/log/tor
+

Optionally, we recommend the following steps as well: @@ -360,7 +389,7 @@ servers, and you need to configure each client and server so it knows about your directory servers rather than the default ones.