Move Bitmessage to peer-to-peer RTC. Move I2P-Bote to Self contained networks. Remove "email alternatives" page. (#1559)

- Move I2P-Bote to Self contained networks.
- Remove "email alternatives" page and nav item

_includes/nav.html

@@ -64,7 +64,6 @@
           <span class="nav-dropdown">
             <a class="dropdown-item" href="/software/calendar-contacts/"><span class="fas fa-calendar fa-fw"></span> Calendar/Contacts Sync Tools</a>
             <a class="dropdown-item" href="/software/notebooks/"><span class="far fa-sticky-note fa-fw"></span> Digital Notebook</a>
-            <a class="dropdown-item" href="/software/email/#messaging"><span class="fas fa-random fa-fw"></span> Email Alternatives</a>
             <a class="dropdown-item" href="/software/email/"><span class="fas fa-envelope fa-fw"></span> Email Clients</a>
             <a class="dropdown-item" href="/software/encryption-tools/"><span class="fas fa-lock fa-fw"></span> File Encryption</a>
             <a class="dropdown-item" href="/software/file-sharing/"><span class="fas fa-file-export fa-fw"></span> File Sharing</a>

_includes/sections/email-alternatives.html

@@ -1,34 +0,0 @@
-<h1 id="messaging" class="anchor"><a href="#messaging"><i class="fas fa-link anchor-icon"></i></a> Email Alternatives</h1>
-
-{% include cardv2.html
-title="Bitmessage"
-image="/assets/img/tools/Bitmessage.png"
-description="Bitmessage is a P2P communications protocol used to send encrypted messages to another person or to many subscribers. It is decentralized and trustless,
-meaning that you need not inherently trust any entities like root certificate authorities. It uses strong authentication which means that the sender of a message cannot be spoofed, and it aims to hide \"non-content\" data."
-website="https://bitmessage.org/"
-forum="https://forum.privacytools.io/t/discussion-bitmessage/661"
-github="https://github.com/Bitmessage/PyBitmessage"
-windows="https://github.com/Bitmessage/PyBitmessage/releases"
-mac="https://github.com/Bitmessage/PyBitmessage/releases"
-linux="https://repology.org/project/pybitmessage/versions"
-%}
-
-{% include cardv2.html
-title="RetroShare"
-image="/assets/img/tools/RetroShare.png"
-description="Retroshare creates encrypted connections to your friends. Nobody can spy on you. Retroshare is completely decentralized. This means there are no central servers. It is entirely open-source and free. There are no costs, no ads, and no Terms of Service."
-website="https://retroshare.cc/"
-forum="https://forum.privacytools.io/t/discussion-retroshare/662"
-github="https://github.com/RetroShare/RetroShare"
-windows="https://retroshare.cc/downloads.html#windows"
-mac="https://retroshare.cc/downloads.html#mac"
-linux="https://retroshare.cc/downloads.html#gnulinux"
-freebsd="https://retroshare.cc/downloads.html#freebsd"
-%}
-
-
-<h3>Worth Mentioning</h3>
-
-<ul>
-  <li><a href="https://i2pbote.xyz/">I2P-Bote</a> - End-to-end encrypted decentralized mail system within the I2P network.</li>
-</ul>

_includes/sections/instant-messenger.html

@@ -196,4 +196,5 @@
 <ul>
     <li><a href="https://status.im">Status.im</a> - Encrypted instant messenger with an integrated <a href="https://en.wikipedia.org/wiki/Ethereum">Ethereum</a> wallet (cryptocurrency) that also includes support for <a href="https://our.status.im/tag/dapps">DApps (decentralized apps)</a> (web apps in a curated store). Uses the <a href="https://blog.enuma.io/update/2018/08/08/decentralized-application-messaging-with-whisper.html">Whisper protocol</a> for P2P communication. <span class="badge badge-warning">Experimental</span></li>
     <li><a href="https://retroshare.cc">Retroshare</a> - Encrypted instant messaging and voice/video call client. RetroShare supports both <a href="https://www.torproject.org/">Tor</a> and <a href="https://geti2p.net">I2P</a>.</li>
+    <li><a href="https://bitmessage.org">Bitmessage</a> is a decentralized, encrypted, peer-to-peer, trustless communications protocol that can be used by one person to send encrypted messages to another person, or to multiple subscribers.</li>
 </ul>

_includes/sections/self-contained-networks.html

@@ -63,6 +63,7 @@ github="https://github.com/freenet/"
 <ul>
   <li><a href="https://zeronet.io/">ZeroNet</a> - Open, free, and uncensorable websites, using Bitcoin cryptography and BitTorrent network. <span class="badge badge-danger" data-toggle="tooltip" title="Your IP address isn't hidden by default and won't be, unless you enforce Tor usage.">privacy warning <span class="far fa-question-circle"></span></span></li>
   <li><a href="https://retroshare.cc/">RetroShare</a> - An open source, cross-platform, friend-to-friend, secure, and decentralized communication platform.</li>
+  <li><a href="https://i2pbote.xyz/">I2P-Bote</a> - End-to-end encrypted decentralized mail system within the I2P network.</li>
   <li><a href="https://gnunet.org/">GNUnet</a> - GNUnet provides a strong foundation of free software for a global, distributed network that provides security and privacy.</li>
   <li><a href="https://ipfs.io/">IPFS</a> <em>and</em> <a href="https://github.com/ipfs-shipyard/ipfs-companion">IPFS Companion</a>- A peer-to-peer hypermedia protocol to make the web faster, safer, and more open. IPFS Companion is a browser extension for redirecting queries to a gateway of your choice (generally local). <a href="https://github.com/privacytoolsIO/privacytools.io/pull/361#issuecomment-344414022">
     <span class="badge badge-danger" data-toggle="tooltip" title="">

pages/old.html

@@ -33,8 +33,6 @@ permalink: /classic/
 
 {% include sections/email-clients.html %}
 
-{% include sections/email-alternatives.html %}
-
 {% include sections/search-engines.html %}
 
 {% include sections/instant-messenger.html %}

pages/software.html

@@ -11,7 +11,6 @@ description: "Discover a variety of open-source software built to protect your p
   <ul class="list-group list-group-flush">
     <li class="list-group-item"><a href="/software/calendar-contacts/"><span class="fas fa-calendar fa-fw"></span> Calendar/Contacts Sync Tools</a></li>
     <li class="list-group-item"><a href="/software/notebooks/"><span class="far fa-sticky-note fa-fw"></span> Digital Notebook</a></li>
-    <li class="list-group-item"><a href="/software/email/#messaging"><span class="fas fa-random fa-fw"></span> Email Alternatives</a></li>
     <li class="list-group-item"><a href="/software/email/"><span class="fas fa-envelope fa-fw"></span> Email Clients</a></li>
     <li class="list-group-item"><a href="/software/encryption-tools/"><span class="fas fa-lock fa-fw"></span> File Encryption</a></li>
     <li class="list-group-item"><a href="/software/file-sharing/"><span class="fas fa-file-export fa-fw"></span> File Sharing</a></li>

pages/software/email.html

@@ -16,4 +16,3 @@ description: "Discover free, open-source, and secure email clients, along with s
 
 {% include sections/email-clients.html %}
 
-{% include sections/email-alternatives.html %}