Andrew Lewman commited on 2012-11-28 16:23:43
              Zeige 2 geänderte Dateien mit 17 Einfügungen und 11 Löschungen.
            
| ... | ... | 
                      @@ -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.  | 
                    |
| 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.  | 
                    |
| 28 | 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  | 
                    
| ... | ... | 
                      @@ -76,7 +81,8 @@  | 
                  
| 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',  | 
                    
| 20 | 20 |