update install and readme: people should now do 'make install'

svn:r618

diff --git a/INSTALL b/INSTALL
index 791255d084ab4566f959c4b47a41f60a9a02ecac..26847de09c9fe10625d6073dbf135ba9eae83ea4 100644 (file)
--- a/INSTALL
+++ b/INSTALL
@@ -1,12 +1,12 @@
 Quickstart version for users:
 
 0) Download the absolute newest version. No, really.
-  http://freehaven.net/tor/
+  http://freehaven.net/tor/dist/
 1) tar xvf it, and then cd into the directory.
 2) ./configure (or do the two-line version in the README, if you're on bsd)
 3) make
-4) cd src/config
-5) ../or/tor -f oprc
+4) make install
+5) tor (if it doesn't work, give it the whole path or fix your path)
   You don't need to run this as root, and you probably shouldn't.
   (Once you're comfortable running it, you can run it with "-l warn",
    which will only log things that you need to know.)

diff --git a/README b/README
index 535a4352ea0c008c43b31df56224530af61af3c5..fbe27b611d76aaf6f58f997fbec536e9bd692a97 100644 (file)
--- a/README
+++ b/README
@@ -17,12 +17,10 @@ doesn't work for you.
 
 Do you want to run a tor server?
 
-  First, set up a config file for your node (start with sample-orrc and
-  edit the top portion). Then run the node (as above, but with the new
-  config file) to generate keys. One of the generated files is your
-  'fingerprint' file.  Mail it to arma@mit.edu. Remember that you won't
-  be able to authenticate to the other tor nodes until I've added you
-  to the directory.
+  First, move sample-server-torrc onto torrc, and edit it. Then run tor
+  to generate keys. One of the generated files is your 'fingerprint' file.
+  Mail it to arma@mit.edu. Remember that you won't be able to authenticate
+  to the other tor nodes until I've added you to the directory.
 
 Configuring tsocks: