[or-cvs] [tor/master] fix the wiki link in doc pages. remove obsolete FAQ.

[arma@xxxxxxxx]

Author: Roger Dingledine <arma@xxxxxxxxxxxxxx>
Date: Thu, 1 Oct 2009 04:45:59 -0400
Subject: fix the wiki link in doc pages. remove obsolete FAQ.
Commit: 1efb643224e1bad000e90077f3e53ff896fe2634

---
 doc/FAQ         |    4 ----
 doc/HACKING     |    2 +-
 doc/TODO.future |    2 +-
 doc/tor.1.in    |    2 +-
 4 files changed, 3 insertions(+), 7 deletions(-)
 delete mode 100644 doc/FAQ

diff --git a/doc/FAQ b/doc/FAQ
deleted file mode 100644
index 3a7db3a..0000000
--- a/doc/FAQ
+++ /dev/null
@@ -1,4 +0,0 @@
-This file is obsolete. Check out the online FAQ at the wiki
-for more accurate and complete questions and answers:
-http://wiki.noreply.org/wiki/TheOnionRouter/TorFAQ
-
diff --git a/doc/HACKING b/doc/HACKING
index 30ac246..6e6f020 100644
--- a/doc/HACKING
+++ b/doc/HACKING
@@ -150,7 +150,7 @@ valgrind --leak-check=yes --error-limit=no --show-reachable=yes src/or/tor
 
 1.4. Log conventions
 
-  http://wiki.noreply.org/noreply/TheOnionRouter/TorFAQ#LogLevels
+  https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#LogLevels
 
   No error or warning messages should be expected during normal OR or OP
   operation.
diff --git a/doc/TODO.future b/doc/TODO.future
index a6cc951..4220799 100644
--- a/doc/TODO.future
+++ b/doc/TODO.future
@@ -272,7 +272,7 @@ Future versions:
       the RPM and other startup scripts should too?
     - add a "default.action" file to the tor/vidalia bundle so we can
       fix the https thing in the default configuration:
-      http://wiki.noreply.org/noreply/TheOnionRouter/TorFAQ#PrivoxyWeirdSSLPort
+      https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#PrivoxyWeirdSSLPort
 
 
 =======================================================================
diff --git a/doc/tor.1.in b/doc/tor.1.in
index a4dac0e..739b889 100644
--- a/doc/tor.1.in
+++ b/doc/tor.1.in
@@ -41,7 +41,7 @@ Verify the configuration file is valid.
 \fB--nt-service\fP
 \fB--service [install|remove|start|stop]\fP
 Manage the Tor Windows NT/2000/XP service.  Current instructions can
-be found at http://wiki.noreply.org/noreply/TheOnionRouter/TorFAQ#WinNTService
+be found at https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#WinNTService
 .LP
 .TP
 \fB--list-torrc-options\fP
-- 
1.5.6.5