Browse code

replace projects with contact so people can find it. Update the contact page with a section for Support, so people aren't so confused about how to get support.

Andrew Lewman authored on28/11/2012 16:23:43
Showing2 changed files
... ...
@@ -13,6 +13,7 @@
13 13
   <div id="maincol">
14 14
     <h2>Tor: Contact</h2>
15 15
     <ul>
16
+    <li><a href="#support">Support</a></li>
16 17
     <li><a href="#email">Email</a></li>
17 18
     <li><a href="#identica">Identi.ca</a></li>
18 19
     <li><a href="#irc">IRC</a></li>
... ...
@@ -21,21 +22,25 @@
21 22
     <li><a href="#phone">Telephone</a></li>
22 23
     </ul>
23 24
 
25
+    <a id="support"></a>
26
+    h3><a class="anchor" href="#support">Support</a></h3>
27
+
28
+     <i>help@rt.torproject.org</i> is the address to use for Tor support
29
+      requests. This is staffed for helping people with questions about
30
+      all things Tor. This is best effort service with no guarantees.
31
+
24 32
     <a id="email"></a>
25 33
     <h3><a class="anchor" href="#email">Email</a></h3>
26
-    <i>tor-assistants at torproject.org</i> is the catch-all address for everything. It can be
27
-    used for reaching people working on Tor.
28
-    
34
+    <i>tor-assistants@torproject.org</i> is the catch-all address for
35
+    everything. It can be used for reaching people working on Tor.
36
+
29 37
     A few other addresses are more specific:
30
-    
38
+
31 39
     <ul>
32
-      <li><i>help@rt.torproject.org</i> is the address to use for Tor
33
-      support requests. This is staffed by volunteers helping people
34
-      with questions about all things Tor. This is best effort service
35
-      with no guarantees.</li>
36
-      <li><i>tor-translation@lists.torproject.org</i> can put new <a href="<page
37
-      getinvolved/translation>">website translations</a> into place,
38
-      and help answer questions about existing and new translations.</li>
40
+      <li><i>tor-translation@lists.torproject.org</i> can put new <a
41
+      href="<page getinvolved/translation>">website translations</a>
42
+      into place, and help answer questions about existing and
43
+      new translations.</li>
39 44
       <li><i>tordnsel at torproject.org</i> is the alias for the people responsible for
40 45
       the tordns exitlist.</li>
41 46
       <li><i>donations@torproject.org</i> is for questions and comments about <a
... ...
@@ -48,7 +53,7 @@
48 53
       and coordination, major gifts, contract inquiries, licensing and
49 54
       certification, etc.</li>
50 55
     </ul>
51
-    
56
+
52 57
     <a id="identica"></a>
53 58
     <h3><a class="anchor" href="#identica">Identi.ca</a></h3>
54 59
     <p>Contact us via our microblogging Identi.ca account <a
... ...
@@ -58,7 +63,7 @@
58 63
     <h3><a class="anchor" href="#irc">IRC</a></h3>
59 64
     <p>Tor users and developers can also be found in the following channels on <a
60 65
     href="http://www.oftc.net/oftc/">OFTC</a>:</p>
61
-    
66
+
62 67
     <ul>
63 68
       <li><i>#tor</i> - User and relay operation discussions. Having trouble
64 69
       running Tor or a question for other Tor users? Then this is the spot for
... ...
@@ -69,14 +74,15 @@
69 74
       <li><i>#nottor</i> - This is where Tor people hang out to talk about
70 75
       stuff that is not related to Tor.</li>
71 76
     </ul>
72
-    
77
+
73 78
     <a id="livechat"></a>
74 79
     <h3><a class="anchor" href="#livechat">Live Chat</a></h3>
75 80
     <p>Tor is experimenting with live chat (XMPP/Jabber/GChat), Voice over
76 81
     IP (VOIP), VOIP+ZRTP, SIP, Video, and desktop sharing through the <a
77 82
     href="http://jitsi.org/">Jitsi Open Source Communicator</a>. Contact
78 83
     us at <em>torproject@jit.si</em> for live help, questions, or
79
-    feedback. This address does not receive emails, only XMPP and VOIP.</p> 
84
+    feedback. This address does not receive emails, only XMPP and
85
+VOIP.</p>
80 86
 
81 87
     <p>The best time to reach someone is 10:00 - 12:00 GMT-5
82 88
     on Tuesday and 16:00 - 18:00 GMT-5 on Thursday.</p>
... ...
@@ -10,10 +10,10 @@
10 10
         'index'                        , 'Home',
11 11
         'about/overview'              , 'About Tor',
12 12
         'docs/documentation'          , 'Documentation',
13
-        'projects/projects'           , 'Projects',
14 13
         'press/press'                 , 'Press',
15 14
         '<blog>'                      , 'Blog',
16 15
         'http://www.printfection.com/torprojectstore' , 'Store',
16
+	'about/contact'			, 'Contact',
17 17
     );
18 18
     my @calltoaction = (
19 19
         'download/download-easy'                , 'Download',