[tor-commits] [metrics-web/master] Introduce the term "server" in the glossary.

[karsten at torproject.org]

commit cc60eede3ee8c2f47612414a847b9fc25b8f8c54
Author: Karsten Loesing <karsten.loesing at gmx.net>
Date:   Thu Jan 23 09:07:35 2020 +0100

    Introduce the term "server" in the glossary.
    
    On the metrics website we're using the term "server" for both relays
    and bridges and the term "node" for both clients and servers.
    
    Fixes #26068.
---
 src/main/resources/web/jsps/glossary.jsp | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/main/resources/web/jsps/glossary.jsp b/src/main/resources/web/jsps/glossary.jsp
index b508c53..eaee46e 100644
--- a/src/main/resources/web/jsps/glossary.jsp
+++ b/src/main/resources/web/jsps/glossary.jsp
@@ -29,7 +29,7 @@
       claims to have handled on behalf of <a href="#client">clients</a>.</p>
       
       <p id="bridge"><b><a href="#bridge">bridge:</a></b> a
-      <a href="#relay">relay</a> whose
+      <a href="#server">server</a> in the Tor network whose
       existence is non-public and which can therefore provide access for blocked
       <a href="#client">clients</a>, often in combination with
       <a href="#pluggable-transport">pluggable transports</a>, which registers
@@ -91,8 +91,8 @@
       and used by <a href="#client">clients</a> to circumvent transport-level
       blockings (for example, by ISPs or governments).</p>
       
-      <p id="relay"><b><a href="#relay">relay:</a></b> a publicly-listed node in
-      the Tor
+      <p id="relay"><b><a href="#relay">relay:</a></b> a publicly-listed
+      <a href="#server">server</a> in the Tor
       network that forwards traffic on behalf of <a href="#client">clients</a>,
       and that registers itself with the
       <a href="#directory-authority">directory authorities</a>.</p>
@@ -111,6 +111,11 @@
       party builds a three-hop circuit, meeting at the rendezvous
       point.</p>
 
+      <p id="server"><b><a href="#server">server:</a></b> a node in the Tor
+      network, either a <a href="#relay">relay</a> or a
+      <a href="#bridge">bridge</a>, that forwards traffic on behalf of
+      <a href="#client">clients</a>.</p>
+
     </div>
 
 <jsp:include page="bottom.jsp"/>