[tor-commits] r25918: {website} replace projects with contact so people can find it. Update (in website/trunk: about/en en)

[Andrew Lewman]

Author: phobos
Date: 2012-11-28 15:23:43 +0000 (Wed, 28 Nov 2012)
New Revision: 25918

Modified:
   website/trunk/about/en/contact.wml
   website/trunk/en/navigation.wmi
Log:
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.


Modified: website/trunk/about/en/contact.wml
===================================================================
--- website/trunk/about/en/contact.wml	2012-11-27 04:03:01 UTC (rev 25917)
+++ website/trunk/about/en/contact.wml	2012-11-28 15:23:43 UTC (rev 25918)
@@ -13,6 +13,7 @@
   <div id="maincol">
     <h2>Tor: Contact</h2>
     <ul>
+    <li><a href="#support">Support</a></li>
     <li><a href="#email">Email</a></li>
     <li><a href="#identica">Identi.ca</a></li>
     <li><a href="#irc">IRC</a></li>
@@ -21,21 +22,25 @@
     <li><a href="#phone">Telephone</a></li>
     </ul>
 
+    <a id="support"></a>
+    h3><a class="anchor" href="#support">Support</a></h3>
+
+     <i>help at rt.torproject.org</i> is the address to use for Tor support
+      requests. This is staffed for helping people with questions about
+      all things Tor. This is best effort service with no guarantees.
+
     <a id="email"></a>
     <h3><a class="anchor" href="#email">Email</a></h3>
-    <i>tor-assistants at torproject.org</i> is the catch-all address for everything. It can be
-    used for reaching people working on Tor.
-    
+    <i>tor-assistants at torproject.org</i> is the catch-all address for
+    everything. It can be used for reaching people working on Tor.
+
     A few other addresses are more specific:
-    
+
     <ul>
-      <li><i>help at rt.torproject.org</i> is the address to use for Tor
-      support requests. This is staffed by volunteers helping people
-      with questions about all things Tor. This is best effort service
-      with no guarantees.</li>
-      <li><i>tor-translation at lists.torproject.org</i> can put new <a href="<page
-      getinvolved/translation>">website translations</a> into place,
-      and help answer questions about existing and new translations.</li>
+      <li><i>tor-translation at lists.torproject.org</i> can put new <a
+      href="<page getinvolved/translation>">website translations</a>
+      into place, and help answer questions about existing and
+      new translations.</li>
       <li><i>tordnsel at torproject.org</i> is the alias for the people responsible for
       the tordns exitlist.</li>
       <li><i>donations at torproject.org</i> is for questions and comments about <a
@@ -48,7 +53,7 @@
       and coordination, major gifts, contract inquiries, licensing and
       certification, etc.</li>
     </ul>
-    
+
     <a id="identica"></a>
     <h3><a class="anchor" href="#identica">Identi.ca</a></h3>
     <p>Contact us via our microblogging Identi.ca account <a
@@ -58,7 +63,7 @@
     <h3><a class="anchor" href="#irc">IRC</a></h3>
     <p>Tor users and developers can also be found in the following channels on <a
     href="http://www.oftc.net/oftc/">OFTC</a>:</p>
-    
+
     <ul>
       <li><i>#tor</i> - User and relay operation discussions. Having trouble
       running Tor or a question for other Tor users? Then this is the spot for
@@ -69,14 +74,15 @@
       <li><i>#nottor</i> - This is where Tor people hang out to talk about
       stuff that is not related to Tor.</li>
     </ul>
-    
+
     <a id="livechat"></a>
     <h3><a class="anchor" href="#livechat">Live Chat</a></h3>
     <p>Tor is experimenting with live chat (XMPP/Jabber/GChat), Voice over
     IP (VOIP), VOIP+ZRTP, SIP, Video, and desktop sharing through the <a
     href="http://jitsi.org/">Jitsi Open Source Communicator</a>. Contact
     us at <em>torproject at jit.si</em> for live help, questions, or
-    feedback. This address does not receive emails, only XMPP and VOIP.</p> 
+    feedback. This address does not receive emails, only XMPP and
+VOIP.</p>
 
     <p>The best time to reach someone is 10:00 - 12:00 GMT-5
     on Tuesday and 16:00 - 18:00 GMT-5 on Thursday.</p>

Modified: website/trunk/en/navigation.wmi
===================================================================
--- website/trunk/en/navigation.wmi	2012-11-27 04:03:01 UTC (rev 25917)
+++ website/trunk/en/navigation.wmi	2012-11-28 15:23:43 UTC (rev 25918)
@@ -10,10 +10,10 @@
         'index'                        , 'Home',
         'about/overview'              , 'About Tor',
         'docs/documentation'          , 'Documentation',
-        'projects/projects'           , 'Projects',
         'press/press'                 , 'Press',
         '<blog>'                      , 'Blog',
         'http://www.printfection.com/torprojectstore' , 'Store',
+	'about/contact'			, 'Contact',
     );
     my @calltoaction = (
         'download/download-easy'                , 'Download',