fix the wiki link in doc pages. remove obsolete FAQ.

diff --git a/doc/FAQ b/doc/FAQ
deleted file mode 100644 (file)
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 30ac2465fa22fda6c5de73c30b28b70fc01c2666..6e6f020628f9c51e9ecc5027409ba21ec0b0d892 100644 (file)
--- 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 a6cc95150e8c2f5833717f9b401169b7fab8ae27..422079957443cc145831267ece87809980152aca 100644 (file)
--- 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 a4dac0e077586d286dfcc448810231b140a6f4d8..739b889fb581f9c053fde2b1f57fbe116bf7aeb1 100644 (file)
--- 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