From f963add18354a5dd6785c55629181d661550e83c Mon Sep 17 00:00:00 2001
From: idk <hankhill19580@gmail.com>
Date: Mon, 20 Sep 2021 23:28:22 -0400
Subject: [PATCH] Update glossary to include broad p2p/distributed software
 terms

---
 i2p2www/blog/2021/09/18/i2p-bitcoin.draft.rst | 16 ++--
 i2p2www/pages/site/about/glossary.html        | 78 +++++++++++++++++--
 2 files changed, 81 insertions(+), 13 deletions(-)

diff --git a/i2p2www/blog/2021/09/18/i2p-bitcoin.draft.rst b/i2p2www/blog/2021/09/18/i2p-bitcoin.draft.rst
index 9ccc32f9..9f19a8f1 100644
--- a/i2p2www/blog/2021/09/18/i2p-bitcoin.draft.rst
+++ b/i2p2www/blog/2021/09/18/i2p-bitcoin.draft.rst
@@ -12,10 +12,9 @@
 An event months in the making, Bitcoin Core has added official support for I2P!
 Bitcoin-over-I2P nodes can interact fully with the rest of the Bitcoin nodes,
 using the help of nodes that operate within both I2P and the clearnet, making
-them first-class participants in the Bitcoin network. This is exciting news, in
-part because it highlights some of the things I2P is singularly good at, like
-empowering application developers to build I2P connections programmatically and
-conveniently.
+them first-class participants in the Bitcoin network. It's exciting to see
+large communities like Bitcoin taking notice of the advantages I2P can bring
+to them providing privacy and reachability to people all over the world.
 {%- endtrans %}
 
 {% trans -%}
@@ -24,5 +23,10 @@ How it Works
 ------------
 
 {% trans -%}
-I2P support is automatic, via the SAM API.
-{%- endtrans %}
\ No newline at end of file
+I2P support is automatic, via the SAM API. This is also exciting news, because
+it highlights some of the things I2P is singularly good at, like empowering 
+application developers to build I2P connections programmatically and
+conveniently. Bitcoin-over-I2P users can use I2P with no manual configuration by
+enabling the SAM API.
+{%- endtrans %}
+
diff --git a/i2p2www/pages/site/about/glossary.html b/i2p2www/pages/site/about/glossary.html
index 67c6ff26..effa0840 100644
--- a/i2p2www/pages/site/about/glossary.html
+++ b/i2p2www/pages/site/about/glossary.html
@@ -2,16 +2,80 @@
 {% block title %}{{ _('Glossary') }}{% endblock %}
 {% block content %}
 {% trans -%}
-This page lists often-used terminology when discussing I2P and cryptography.
+This table lists often-used terminology when discussing I2P and cryptography.
 {%- endtrans %}
 <table>
     <ul>
-        <li>I2P: Invisible Internet Project: a project meant to provide an anonymity layer, so user can communicate anonymously using a range of applications.</li>
-        <li>Router: The core I2P software, which routes encrypted packets on the I2P network. All routers by default participate in the network, which both helps the network and provides cover traffic for any clients or servers connecting to the I2P network through the router.</li>
-        <li>RouterIdentity: A collection of information required to communicate directly with a router, such as its IP address and listening port, public signing and encryption keys etc.</li>
-        <li>Tunnel: An anonymous communication pathway between a client or server and the I2P network. Tunnels are unidirectional, so any one client or server must have at least two Tunnels - one for inbound traffic and one for outbound traffic.</li>
-        <li>Destination: The cryptographic identity of a tunnel. These are the identities of clients and servers within the I2P network, and are analogous to the IP:port of a computer on the normal internet.</li>
-        <li>LeaseSet: A collection of information required to communicate with a client or server at a particular Destination, such as the gateways of the inbound Tunnels for that Destination.</li>
+        <li>{% trans -%}I2P: Invisible Internet Project: a project meant to
+        provide an anonymity layer, so user can communicate anonymously using a
+        range of applications.{%- endtrans %}</li>
+        <li>{% trans -%}Router: The core I2P software, which routes encrypted
+        packets on the I2P network. All routers by default participate in the
+        network, which both helps the network and provides cover traffic for any
+        clients or servers connecting to the I2P network through the
+        router.{%- endtrans %}</li>
+        <li>{% trans -%}RouterIdentity: A collection of information required to
+        communicate directly with a router, such as its IP address and listening
+        port, public signing and encryption keys etc.{%- endtrans %}</li>
+        <li>{% trans -%}Tunnel: An anonymous communication pathway between a
+        client or server and the I2P network. Tunnels are unidirectional, so any
+        one client or server must have at least two Tunnels - one for inbound
+        traffic and one for outbound traffic.{%- endtrans %}</li>
+        <li>{% trans -%}Destination: The cryptographic identity of a tunnel.
+        These are the identities of clients and servers within the I2P network,
+        and are analogous to the IP:port of a computer on the normal
+        internet.{%- endtrans %}</li>
+        <li>{% trans -%}LeaseSet: A collection of information required to
+        communicate with a client or server at a particular Destination, such as
+        the gateways of the inbound Tunnels for that
+        Destination.{%- endtrans %}</li>
+    </ul>
+</table>
+{% trans -%}This table lists definition of different networks and their components. These
+terms and the definitions provided are taken from
+<a href="https://decentpatterns.xyz/report/#key-terms">Decentralization Off The
+Shelf: 7 Maxims by Simply Secure</a>(used with permission).{%- endtrans %}
+<table>
+    <ul>
+        <li>{% trans -%}Decentralization: Network architecture that avoids
+        reliance on a single party. Encompasses peer-to-peer, blockchain,
+        federated, and distributed technologies that involve many individual
+        users.{%- endtrans %}</li>
+        <li>{% trans -%}Peer-to-Peer (p2p): Peers make a portion of their 
+        resources, such as processing power, disk storage or network bandwidth,
+        directly available to other network participants, without the need for
+        central coordination by servers or stable hosts. Popularized by
+        BitTorrent, Napster, and Bitcoin.{%- endtrans %}</li>
+        <li>{% trans -%}Federated: Federation allows separate deployments of a
+        service to communicate with each other through a common protocol, for
+        instance a mail server run by Google federates with a mail server run by
+        Microsoft when you send an email from @gmail.com to @hotmail.com.
+        Each deployment may host multiple users.{%- endtrans %}</li>
+        <li>{% trans -%}Blockchain: A distributed ledger that can record
+        transactions between multiple parties efficiently and in a verifiable
+        and permanent way.{%- endtrans %}</li>
+        <li>{% trans -%}Distributed systems: Academic topic within the
+        discipline of Computer Science which is concerned with the design of
+        computer systems that consist of many individual computers connected
+        over a network. Peer-to-peer networks and blockchains are examples of
+        distributed systems architectures.{%- endtrans %}</li>
+        <li>{% trans -%}TCP/UDP: The two foundational transport protocols used
+        on the Internet. Common protocols used to send data between two
+        computers.{%- endtrans %}</li>
+        <li>{% trans -%}DHT: Distributed hash table, used in some projects to
+        connect peers to each other by storing information in the form of
+        key-value pairs in a distributed manner.{%- endtrans %}</li>
+        <li>{% trans -%}IP address: A number of a computer or network which is
+        unique and thus can be used to address it.{%- endtrans %}</li>
+        <li>{% trans -%}WebRTC: A protocol standard for establishing connections
+        in a web browser where data passes directly between
+        users.{%- endtrans %}</li>
+        <li>{% trans -%}Hash: A number, usually displayed as a string of letters
+        and numbers. It can serve as a ‘fingerprint’ uniquely identifying
+        data.{%- endtrans %}</li>
+        <li>{% trans -%}UX: User experience, the overall experience of a person
+        using a product or a service, especially in terms of how easy it is to
+        use.{%- endtrans %}</li>
     </ul>
 </table>
 {% endblock %}