Browse code

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.

Damian Johnson authored on07/11/2017 18:28:47
Showing10 changed files
... ...
@@ -196,7 +196,7 @@ table.people tr td:first-child {
196 196
       <div class="icon"><a href="https://db.torproject.org/fetchkey.cgi?fingerprint=68278CC5DD2D1E85C4E45AD90445B7AB9ABBEEC6"><img src="$(IMGROOT)/pgp-key.png" alt="pgp key" /></a></div>
197 197
       <div class="name"><a href="#atagar">Damian Johnson</a></div>
198 198
       <div class="field"><b>IRC:</b> atagar</div>
199
-      <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>
199
+      <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>
200 200
     </td>
201 201
   </tr>
202 202
 
... ...
@@ -168,12 +168,12 @@ href="<wiki>/doc/TorExitGuidelines">guidelines
168 168
 
169 169
     <p>
170 170
     13. You might like to use the <a
171
-    href="https://www.atagar.com/arm/">arm</a> relay monitor to watch
172
-    your relay's activities from the command line. First, "sudo apt
173
-    install tor-arm". Second, as the user that will be running arm, run
171
+    href="https://nyx.torproject.org/">Nyx</a> relay monitor to watch
172
+    your relay's activities from the command line. First, "sudo pip install
173
+    nyx". Second, as the user that will be running nyx, run
174 174
     "sudo adduser $USER debian-tor" to add your user to the debian-tor
175 175
     group so it can reach Tor's controlsocket. Then log out and log back
176
-    in (so your user is actually in the group), and run "arm".
176
+    in (so your user is actually in the group), and run "nyx".
177 177
     </p>
178 178
 
179 179
     <p>
... ...
@@ -91,9 +91,9 @@
91 91
               -->
92 92
               <td>
93 93
                 <div class="project">
94
-                <a href="https://www.atagar.com/arm/"><img
95
-                src="$(IMGROOT)/icon-Arm.jpg" alt="Arm Icon"></a>
96
-                <h3><a href="https://www.atagar.com/arm/">Arm</a></h3>
94
+                <a href="https://nyx.torproject.org/"><img
95
+                src="$(IMGROOT)/icon-Nyx.jpg" alt="Nyx Icon"></a>
96
+                <h3><a href="https://nyx.torproject.org/">Nyx</a></h3>
97 97
                 <p>Terminal (command line) application for monitoring
98 98
                 and configuring Tor.</p>
99 99
                 </div>
... ...
@@ -423,7 +423,7 @@ meetings around the world.</li>
423 423
     </p>
424 424
 
425 425
     <a id="project-nyx"></a>
426
-    <h3><a href="https://www.atagar.com/arm/">Nyx</a> (<a
426
+    <h3><a href="https://nyx.torproject.org/">Nyx</a> (<a
427 427
     href="https://gitweb.torproject.org/nyx.git">code</a>, <a
428 428
     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
429 429
     tracker</a>)</h3>
430 430
similarity index 100%
431 431
rename from images/icon-Arm.jpg
432 432
rename to images/icon-Nyx.jpg
433 433
similarity index 100%
434 434
rename from images/screenshot_arm_page1.png
435 435
rename to images/screenshot_nyx_page1.png
436 436
similarity index 100%
437 437
rename from images/screenshot_arm_page1_cropped.png
438 438
rename to images/screenshot_nyx_page1_cropped.png
439 439
similarity index 52%
440 440
rename from projects/en/arm.wml
441 441
rename to projects/en/nyx.wml
... ...
@@ -2,56 +2,54 @@
2 2
 # Revision: $Revision$
3 3
 # Translation-Priority: 4-optional
4 4
 
5
-#include "head.wmi" TITLE="Tor Project: Arm" CHARSET="UTF-8"
5
+#include "head.wmi" TITLE="Tor Project: Nyx" CHARSET="UTF-8"
6 6
 <div id="content" class="clearfix">
7 7
 	<div id="breadcrumbs">
8 8
     <a href="<page index>">Home &raquo; </a>
9 9
     <a href="<page projects/projects>">Projects &raquo; </a>
10
-    <a href="<page projects/arm>">Arm &raquo; </a>
10
+    <a href="<page projects/nyx>">Nyx &raquo; </a>
11 11
   </div>
12
-	<div id="maincol"> 
12
+	<div id="maincol">
13 13
     <!-- PUT CONTENT AFTER THIS TAG -->
14
-    
15
-    <h2>Arm (<a href="https://www.atagar.com/arm/">Project Page</a>)</h2>
14
+
15
+    <h2>Nyx (<a href="https://nyx.torproject.org/">Project Page</a>)</h2>
16 16
     <div class="underline"></div>
17
-    
17
+
18 18
     <!-- BEGIN SIDEBAR -->
19 19
     <div class="sidebar-left">
20
-    <a href="https://www.atagar.com/arm/screenshots.php"><img src="$(IMGROOT)/screenshot_arm_page1_cropped.png" alt="Arm bandwidth graph and log"></a>
20
+    <a href="https://nyx.torproject.org/"><img src="$(IMGROOT)/screenshot_nyx_page1_cropped.png" alt="Nyx bandwidth graph and log"></a>
21 21
     </div>
22 22
     <!-- END SIDEBAR -->
23
-    
23
+
24 24
     <p>
25
-    The anonymizing relay monitor (arm) is a CLI status monitor for Tor. This
26
-    functions much like top does for system usage, providing real time
27
-    statistics for:
25
+    Nyx is a command-line monitor for Tor. With this you can get detailed
26
+    real-time information about your relay such as...
28 27
     </p>
29
-    
28
+
30 29
     <ul>
31 30
       <li>resource usage (bandwidth, cpu, and memory usage)</li>
32 31
       <li>general relaying information (nickname, fingerprint, flags, or/dir/controlports)</li>
33 32
       <li>event log with optional regex filtering and deduplication</li>
34 33
       <li>connections correlated against tor's consensus data (ip, connection types, relay details, etc)</li>
35
-      <li>torrc configuration file with syntax highlighting and validation</li>
36 34
     </ul>
37
-    
35
+
38 36
     <p>
39
-    Most of arm's attributes are configurable through an optional armrc
37
+    Most of Nyx's attributes are configurable through an optional <a
38
+    href="https://nyx.torproject.org/#configuration">nyxrc</a>
40 39
     configuration file. It runs on any platform supported by curses including
41
-    Linux, Mac OS X, and other Unix-like variants. For screenshots, change
42
-    logs, and repositories please see its <a href="https://www.atagar.com/arm/">project page</a>.
40
+    Linux, Mac OS X, and other Unix-like variants. For more information <b><a
41
+    href="https://nyx.torproject.org/">please see its homepage</a></b>.
43 42
     </p>
44
-    
45
-    <h1><a href="https://www.atagar.com/arm/download.php">Download</a></h1>
43
+
44
+    <h1><a href="https://nyx.torproject.org/#download">Download</a></h1>
46 45
     <br />
47
-    
46
+
48 47
     <a id="Support"></a>
49 48
     <h3><a class="anchor" href="#Support">Support &amp; Development</a></h3>
50
-    
49
+
51 50
     <p>
52
-    Please open a <a
53
-    href="https://trac.torproject.org/projects/tor/report/28">ticket</a> on our bug
54
-    tracker for any bugs you find or features you would like to see added in future releases. 
51
+    Please open a <a href="https://trac.torproject.org/projects/tor/wiki/doc/nyx/bugs">ticket</a> on our bug
52
+    tracker for any bugs you find or features you would like to see added in future releases.
55 53
     </p>
56 54
   </div>
57 55
   <!-- END MAINCOL -->
... ...
@@ -62,4 +60,4 @@
62 60
   <!-- END SIDECOL -->
63 61
 </div>
64 62
 <!-- END CONTENT -->
65
-#include <foot.wmi>      
63
+#include <foot.wmi>
... ...
@@ -24,10 +24,10 @@ package requires no installation. Just extract it and run.</p>
24 24
 </div></div>
25 25
 
26 26
 <div class="projectbox">
27
-<a href="https://www.atagar.com/arm/"><img class="icon"
28
-src="$(IMGROOT)/icon-Arm.jpg" alt="Arm Icon" width="75" height="75"></a>
27
+<a href="https://nyx.torproject.org/"><img class="icon"
28
+src="$(IMGROOT)/icon-Nyx.jpg" alt="Nyx Icon" width="75" height="75"></a>
29 29
 <div class="projectdesc"><div class="name"><a href="<page
30
-projects/arm>">Arm</a></div> <p>Arm is a terminal status monitor for Tor,
30
+projects/nyx>">Nyx</a></div> <p>Nyx is a terminal status monitor for Tor,
31 31
 intended for command-line aficionados and ssh connections. This functions
32 32
 much like top does for system usage, providing real time information on
33 33
 Tor's resource utilization and state.</p> </div></div>
... ...
@@ -29,8 +29,8 @@
29 29
           {'url' => 'projects/torbrowser',
30 30
            'txt' => 'Tor Browser',
31 31
           },
32
-          {'url'  => 'projects/arm',
33
-           'txt'  => 'Arm',
32
+          {'url'  => 'projects/nyx',
33
+           'txt'  => 'Nyx',
34 34
           },
35 35
           {'url'  => 'https://guardianproject.info/apps/orbot/',
36 36
            'txt'  => 'Orbot',