commit 377d53f0f8ad5b28af8b28a4c73a80a72db7d4c8 Author: traumschule <traumschuleriebau@riseup.net> Date: Wed Aug 15 15:06:30 2018 +0200 mention #tor-relays (fixes #26293) --- about/en/contact.wml | 16 +++++++++++----- docs/en/documentation.wml | 17 ++++++++++------- getinvolved/en/volunteer.wml | 13 ++++++++----- 3 files changed, 29 insertions(+), 17 deletions(-) diff --git a/about/en/contact.wml b/about/en/contact.wml index 539ea547..bfcbc8a5 100644 --- a/about/en/contact.wml +++ b/about/en/contact.wml @@ -62,13 +62,19 @@ <a id="irc"></a> <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="https://www.oftc.net/">OFTC</a>:</p> + <p>Tor users and developers can also be found in the following + channels on <a href="https://www.oftc.net/">OFTC</a> + (<a href="https://www.oftc.net/Tor/">join via Tor</a>):</p> <ul> - <li><i>#tor</i> - For questions about using Tor (as a client, as - a relay, as an onion service). Having trouble running Tor or have - a question for other Tor users? Then this is the spot for you.</li> + <li><i>#tor</i> - For questions about using Tor (as a client, + or as an onion service). Having trouble running Tor or have a + question for other Tor users? Then this is the spot for you.</li> + <li><i>#tor-relays</i> - The Tor network is made of relays, if + you are interested in running one yourself, join here and make sure + to read this + <a href="https://blog.torproject.org/get-help-running-your-relay-our-new-advocate">blog post</a> + on how to get help running a relay.</li> <li><i>#tor-dev</i> - Channel for people who want to do development. Discussions about Tor-related coding, protocols, and <a href="<page getinvolved/volunteer>">project ideas</a> are all welcome.</li> diff --git a/docs/en/documentation.wml b/docs/en/documentation.wml index edfd4780..b46e1f0b 100644 --- a/docs/en/documentation.wml +++ b/docs/en/documentation.wml @@ -53,13 +53,16 @@ file</a>. We also provide a <a href="<page docs/tor-manual-dev>">manual for the development version of Tor</a>.</li> - <li>If you have questions, we have an IRC channel (for users, relay - operators, and developers) - at <a href="irc://irc.oftc.net/tor">#tor on irc.oftc.net</a>. If - you have a bug, especially a crash bug, read <a - href="<wikifaq>#MyTorkeepscrashing.">how - to report a Tor bug</a> first and then tell us as much information - about it as you can in + <li>If you have questions, we have an IRC channel at + <a href="irc://irc.oftc.net/tor">#tor on irc.oftc.net</a> (you can + <a href="https://www.oftc.net/Tor/">join via Tor</a> as well). Developers work + in <a href="irc://irc.oftc.net/tor-dev">#tor-dev</a> and relay operators + help each other in <a href="irc://irc.oftc.net/tor-relays">#tor-relays</a>, + read this fine article by + <a href="https://blog.torproject.org/get-help-running-your-relay-our-new-advocate"> + Tor's Relay Advocate</a>. If you have a bug, especially a crash bug, read + <a href="<wikifaq>#MyTorkeepscrashing.">how to report a Tor bug</a> + first and then tell us as much information about it as you can in <a href="https://bugs.torproject.org/tor">our bugtracker</a>. (If your bug is with your browser or some other application, please don't put diff --git a/getinvolved/en/volunteer.wml b/getinvolved/en/volunteer.wml index 01856c80..13fe607b 100644 --- a/getinvolved/en/volunteer.wml +++ b/getinvolved/en/volunteer.wml @@ -48,12 +48,15 @@ <a id="Advocacy"></a> <h2><a class="anchor" href="#Advocacy">Advocacy</a></h2> <ol> - <li>Monitor some of our <a + <li>The tor community uses <a href="https://lists.torproject.org/cgi-bin/mailman/listinfo">public mailing - lists</a>, like <a - href="https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-talk">tor-talk</a>, <a - href="https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-relays">tor-relays</a>, <a - href="https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-dev">tor-dev</a>, or <a + lists</a> and IRC channels (<a href="https://www.oftc.net/Tor/">join via Tor</a>), like + <a href="https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-talk">tor-talk</a> + (<a href="irc://irc.oftc.net/tor">#tor on irc.oftc.net</a>), + <a href="https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-relays">tor-relays</a> + (<a href="irc://irc.oftc.net/tor-relays">#tor-relays</a>), + <a href="https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-dev">tor-dev</a> + (<a href="irc://irc.oftc.net/tor-dev">#tor-dev</a>), or <a href="https://lists.torproject.org/cgi-bin/mailman/listinfo/tbb-dev">tbb-dev</a>, and summarize noteworthy changes into articles for our blog and <a href="https://newsletter.torproject.org/">newsletter</a>.</li>