commit 13e6c7b808a20dc6c15721268eb0286684ee8af7 Author: Damian Johnson <atagar@torproject.org> Date: Tue Nov 7 09:28:47 2017 -0800 Replace tor website references of arm with nyx Think I got 'em all. Now that Nyx is live we can aggressively start dereferencing the old name. --- about/en/corepeople.wml | 2 +- docs/en/tor-relay-debian.wml | 8 ++-- en/index.wml | 6 +-- getinvolved/en/volunteer.wml | 2 +- images/{icon-Arm.jpg => icon-Nyx.jpg} | Bin ...shot_arm_page1.png => screenshot_nyx_page1.png} | Bin ...ropped.png => screenshot_nyx_page1_cropped.png} | Bin projects/en/{arm.wml => nyx.wml} | 48 ++++++++++----------- projects/en/projects.wml | 6 +-- projects/en/sidenav.wmi | 4 +- 10 files changed, 37 insertions(+), 39 deletions(-) diff --git a/about/en/corepeople.wml b/about/en/corepeople.wml index f1f4d6cf..35270cf6 100644 --- a/about/en/corepeople.wml +++ b/about/en/corepeople.wml @@ -196,7 +196,7 @@ table.people tr td:first-child { <div class="icon"><a href="https://db.torproject.org/fetchkey.cgi?fingerprint=68278CC5DD2D1E85C4E45AD90445B7AB9ABBEEC6"><img src="$(IMGROOT)/pgp-key.png" alt="pgp key" /></a></div> <div class="name"><a href="#atagar">Damian Johnson</a></div> <div class="field"><b>IRC:</b> atagar</div> - <div class="description">Author of the <a href="https://stem.torproject.org/">Stem</a> python controller library and <a href="https://www.atagar.com/arm/">Nyx</a> relay monitor.</div> + <div class="description">Author of the <a href="https://stem.torproject.org/">Stem</a> python controller library and <a href="https://nyx.torproject.org/">Nyx</a> relay monitor.</div> </td> </tr> diff --git a/docs/en/tor-relay-debian.wml b/docs/en/tor-relay-debian.wml index e55e51c8..10bebc7c 100644 --- a/docs/en/tor-relay-debian.wml +++ b/docs/en/tor-relay-debian.wml @@ -168,12 +168,12 @@ href="<wiki>/doc/TorExitGuidelines">guidelines <p> 13. You might like to use the <a - href="https://www.atagar.com/arm/">arm</a> relay monitor to watch - your relay's activities from the command line. First, "sudo apt - install tor-arm". Second, as the user that will be running arm, run + href="https://nyx.torproject.org/">Nyx</a> relay monitor to watch + your relay's activities from the command line. First, "sudo pip install + nyx". Second, as the user that will be running nyx, run "sudo adduser $USER debian-tor" to add your user to the debian-tor group so it can reach Tor's controlsocket. Then log out and log back - in (so your user is actually in the group), and run "arm". + in (so your user is actually in the group), and run "nyx". </p> <p> diff --git a/en/index.wml b/en/index.wml index 5c166f10..24f55b53 100644 --- a/en/index.wml +++ b/en/index.wml @@ -91,9 +91,9 @@ --> <td> <div class="project"> - <a href="https://www.atagar.com/arm/"><img - src="$(IMGROOT)/icon-Arm.jpg" alt="Arm Icon"></a> - <h3><a href="https://www.atagar.com/arm/">Arm</a></h3> + <a href="https://nyx.torproject.org/"><img + src="$(IMGROOT)/icon-Nyx.jpg" alt="Nyx Icon"></a> + <h3><a href="https://nyx.torproject.org/">Nyx</a></h3> <p>Terminal (command line) application for monitoring and configuring Tor.</p> </div> diff --git a/getinvolved/en/volunteer.wml b/getinvolved/en/volunteer.wml index 206dbec9..f9b77670 100644 --- a/getinvolved/en/volunteer.wml +++ b/getinvolved/en/volunteer.wml @@ -423,7 +423,7 @@ meetings around the world.</li> </p> <a id="project-nyx"></a> - <h3><a href="https://www.atagar.com/arm/">Nyx</a> (<a + <h3><a href="https://nyx.torproject.org/">Nyx</a> (<a href="https://gitweb.torproject.org/nyx.git">code</a>, <a href="https://trac.torproject.org/projects/tor/query?status=accepted&status=assigned&status=needs_review&status=new&status=reopened&component=Core+Tor%2FNyx&order=priority">bug tracker</a>)</h3> diff --git a/images/icon-Arm.jpg b/images/icon-Nyx.jpg similarity index 100% rename from images/icon-Arm.jpg rename to images/icon-Nyx.jpg diff --git a/images/screenshot_arm_page1.png b/images/screenshot_nyx_page1.png similarity index 100% rename from images/screenshot_arm_page1.png rename to images/screenshot_nyx_page1.png diff --git a/images/screenshot_arm_page1_cropped.png b/images/screenshot_nyx_page1_cropped.png similarity index 100% rename from images/screenshot_arm_page1_cropped.png rename to images/screenshot_nyx_page1_cropped.png diff --git a/projects/en/arm.wml b/projects/en/nyx.wml similarity index 52% rename from projects/en/arm.wml rename to projects/en/nyx.wml index 47a406a7..28b3d1aa 100644 --- a/projects/en/arm.wml +++ b/projects/en/nyx.wml @@ -2,56 +2,54 @@ # Revision: $Revision$ # Translation-Priority: 4-optional -#include "head.wmi" TITLE="Tor Project: Arm" CHARSET="UTF-8" +#include "head.wmi" TITLE="Tor Project: Nyx" CHARSET="UTF-8" <div id="content" class="clearfix"> <div id="breadcrumbs"> <a href="<page index>">Home » </a> <a href="<page projects/projects>">Projects » </a> - <a href="<page projects/arm>">Arm » </a> + <a href="<page projects/nyx>">Nyx » </a> </div> - <div id="maincol"> + <div id="maincol"> <!-- PUT CONTENT AFTER THIS TAG --> - - <h2>Arm (<a href="https://www.atagar.com/arm/">Project Page</a>)</h2> + + <h2>Nyx (<a href="https://nyx.torproject.org/">Project Page</a>)</h2> <div class="underline"></div> - + <!-- BEGIN SIDEBAR --> <div class="sidebar-left"> - <a href="https://www.atagar.com/arm/screenshots.php"><img src="$(IMGROOT)/screenshot_arm_page1_cropped.png" alt="Arm bandwidth graph and log"></a> + <a href="https://nyx.torproject.org/"><img src="$(IMGROOT)/screenshot_nyx_page1_cropped.png" alt="Nyx bandwidth graph and log"></a> </div> <!-- END SIDEBAR --> - + <p> - The anonymizing relay monitor (arm) is a CLI status monitor for Tor. This - functions much like top does for system usage, providing real time - statistics for: + Nyx is a command-line monitor for Tor. With this you can get detailed + real-time information about your relay such as... </p> - + <ul> <li>resource usage (bandwidth, cpu, and memory usage)</li> <li>general relaying information (nickname, fingerprint, flags, or/dir/controlports)</li> <li>event log with optional regex filtering and deduplication</li> <li>connections correlated against tor's consensus data (ip, connection types, relay details, etc)</li> - <li>torrc configuration file with syntax highlighting and validation</li> </ul> - + <p> - Most of arm's attributes are configurable through an optional armrc + Most of Nyx's attributes are configurable through an optional <a + href="https://nyx.torproject.org/#configuration">nyxrc</a> configuration file. It runs on any platform supported by curses including - Linux, Mac OS X, and other Unix-like variants. For screenshots, change - logs, and repositories please see its <a href="https://www.atagar.com/arm/">project page</a>. + Linux, Mac OS X, and other Unix-like variants. For more information <b><a + href="https://nyx.torproject.org/">please see its homepage</a></b>. </p> - - <h1><a href="https://www.atagar.com/arm/download.php">Download</a></h1> + + <h1><a href="https://nyx.torproject.org/#download">Download</a></h1> <br /> - + <a id="Support"></a> <h3><a class="anchor" href="#Support">Support & Development</a></h3> - + <p> - Please open a <a - href="https://trac.torproject.org/projects/tor/report/28">ticket</a> on our bug - tracker for any bugs you find or features you would like to see added in future releases. + Please open a <a href="https://trac.torproject.org/projects/tor/wiki/doc/nyx/bugs">ticket</a> on our bug + tracker for any bugs you find or features you would like to see added in future releases. </p> </div> <!-- END MAINCOL --> @@ -62,4 +60,4 @@ <!-- END SIDECOL --> </div> <!-- END CONTENT --> -#include <foot.wmi> +#include <foot.wmi> diff --git a/projects/en/projects.wml b/projects/en/projects.wml index 3c42dc88..d6fd6aba 100644 --- a/projects/en/projects.wml +++ b/projects/en/projects.wml @@ -24,10 +24,10 @@ package requires no installation. Just extract it and run.</p> </div></div> <div class="projectbox"> -<a href="https://www.atagar.com/arm/"><img class="icon" -src="$(IMGROOT)/icon-Arm.jpg" alt="Arm Icon" width="75" height="75"></a> +<a href="https://nyx.torproject.org/"><img class="icon" +src="$(IMGROOT)/icon-Nyx.jpg" alt="Nyx Icon" width="75" height="75"></a> <div class="projectdesc"><div class="name"><a href="<page -projects/arm>">Arm</a></div> <p>Arm is a terminal status monitor for Tor, +projects/nyx>">Nyx</a></div> <p>Nyx is a terminal status monitor for Tor, intended for command-line aficionados and ssh connections. This functions much like top does for system usage, providing real time information on Tor's resource utilization and state.</p> </div></div> diff --git a/projects/en/sidenav.wmi b/projects/en/sidenav.wmi index 7473b483..63dbcd39 100644 --- a/projects/en/sidenav.wmi +++ b/projects/en/sidenav.wmi @@ -29,8 +29,8 @@ {'url' => 'projects/torbrowser', 'txt' => 'Tor Browser', }, - {'url' => 'projects/arm', - 'txt' => 'Arm', + {'url' => 'projects/nyx', + 'txt' => 'Nyx', }, {'url' => 'https://guardianproject.info/apps/orbot/', 'txt' => 'Orbot',