diff --git a/i2p2www/pages/global/nav.html b/i2p2www/pages/global/nav.html
index 5d7f5b88a0e1255583a87db6e021cd6aeacd0660..a27d32d4b74282aad06c817e5aa4faaf67126a13 100644
--- a/i2p2www/pages/global/nav.html
+++ b/i2p2www/pages/global/nav.html
@@ -11,7 +11,6 @@
<li><a href="{{ site_url('faq') }}"><div class="menuitem"><span>{{ _('FAQ') }}</span></div></a></li>
<li class="has-sub"><div class="menuitem"><span>{{ _('Applications') }}</span></div>
<ul>
- <li><a href="{{ site_url('docs/applications/supported') }}"><div class="menuitem"><span>{{ _('Supported applications') }}</span></div></a></li>
<li><a href="{{ site_url('docs/applications/bittorrent') }}"><div class="menuitem"><span>{{ _('Bittorrent') }}</span></div></a></li>
<li><a href="{{ site_url('docs/applications/gitlab') }}"><div class="menuitem"><span>{{ _('GitLab') }}</span></div></a></li>
<li><a href="{{ site_url('docs/applications/git') }}"><div class="menuitem"><span>{{ _('Git') }}</span></div></a></li>
diff --git a/i2p2www/pages/site/docs/applications/supported.html b/i2p2www/pages/site/docs/applications/supported.html
deleted file mode 100644
index 3faab028e471f5a0075c27df246d456c335f7a41..0000000000000000000000000000000000000000
--- a/i2p2www/pages/site/docs/applications/supported.html
+++ /dev/null
@@ -1,744 +0,0 @@
-{% extends "global/layout.html" %}
-{% block title %}{% trans %}Supported Applications{% endtrans %}{% endblock %}
-{% block content_nav %}
- <ul>
- <li><a href="#blogging-and-forums">{% trans %}Blogging, Forums, and Wikis{% endtrans %}</a></li>
-
- <li><a href="#decentralized-file-storage">{% trans %}Decentralized File Storage{% endtrans %}</a></li>
-
- <li>
- <a href="#development-tools">{% trans %}Development Tools{% endtrans %}</a>
-
- <ul>
- <li><a href="#version-control">{% trans %}Version control{% endtrans %}</a></li>
- </ul>
- </li>
-
- <li><a href="#domain-naming">{% trans %}Domain Naming{% endtrans %}</a></li>
-
- <li><a href="#email">{% trans %}Email{% endtrans %}</a></li>
-
- <li>
- <a href="#file-sharing">{% trans %}File Sharing{% endtrans %}</a>
-
- <ul>
- <li><a href="#bittorrent-clients">{% trans %}BitTorrent clients{% endtrans %}</a></li>
-
- <li><a href="#bittorrent-trackers-and-indexers">{% trans %}BitTorrent trackers and indexers{% endtrans %}</a></li>
-
- <li><a href="#ed2k">ED2K</a></li>
-
- <li><a href="#gnutella">Gnutella</a></li>
- </ul>
- </li>
-
- <li>
- <a href="#network-administration">{% trans %}Network Administration{% endtrans %}</a>
-
- <ul>
- <li><a href="#general-purpose-socket-utilities">{% trans %}General-purpose socket utilities{% endtrans %}</a></li>
-
- <li><a href="#sshscpsftp">SSH/SCP/SFTP</a></li>
- </ul>
- </li>
-
- <li>
- <a href="#real-time-chat">{% trans %}Real-time Chat{% endtrans %}</a>
-
- <ul>
- <li><a href="#instant-messaging-clients">{% trans %}Instant messaging clients{% endtrans %}</a></li>
-
- <li><a href="#irc-clients">{% trans %}IRC clients{% endtrans %}</a></li>
-
- <li><a href="#irc-servers">{% trans %}IRC servers{% endtrans %}</a></li>
- </ul>
- </li>
-
- <li>
- <a href="#web-browsing">{% trans %}Web Browsing{% endtrans %}</a>
-
- <ul>
- <li><a href="#anonymous-websites">{% trans %}Anonymous websites{% endtrans %}</a></li>
-
- <li><a href="#proxy-software">{% trans %}Proxy software{% endtrans %}</a></li>
-
- <li><a href="#inproxies">{% trans %}Inproxies{% endtrans %}</a></li>
-
- <li><a href="#outproxies">{% trans %}Outproxies{% endtrans %}</a></li>
- </ul>
- </li>
-
- <li>
- <a href="#website-hosting">{% trans %}Website Hosting{% endtrans %}</a>
-
- <ul>
- <li><a href="#web-servers">{% trans %}Web servers{% endtrans %}</a></li>
- </ul>
- </li>
- </ul>
-{% endblock %}
-
-{% block content %}
-<p>{% trans trac='https://trac.i2p2.de/report/1' -%}
-This is intended to be a comprehensive listing of applications used with
-I2P. If you know of something that's missing please submit a ticket on
-<a href="{{trac }}">Trac</a>, and be sure to select the
-“www†component in the submission form.
-{%- endtrans %}</p>
-
-<p>{% trans %}
-Supported applications are tagged with one or more of the following:
-{%- endtrans %}</p>
-
-<dl>
- <dt><em>{{ _('bundled') }}</em></dt>
-
- <dd>
- <p>{% trans -%}
-<em>Bundled application</em> — I2P ships with a few officially
-supported applications that let new users take immediate advantage of
-some of I2P's more useful capabilities.
-{%- endtrans %}</p>
- </dd>
-</dl>
-<dl>
- <dt><em>{{ _('plugin') }}</em></dt>
-
- <dd>
- <p>{% trans plugins=('stats.i2p/i2p/plugins/') -%}
-<em>Third-party plugin</em> — I2P's plugin system provides convenient
-deployment of I2P-enabled applications and allows tighter integration
-with the router. Plugins are [reviewed by the community](<a href=
-"http://{{ plugins }}">http://{{ plugins }}</a>) to identify security and
-anonymity issues.
-{%- endtrans %}</p>
- </dd>
-</dl>
-
-<dl>
- <dt><em>{{ _('standalone') }}, {{ _('standalone/mod') }}</em></dt>
-
- <dd>
- <p>{% trans -%}
-<em>Third-party standalone application</em> — Many standard network
-applications only require careful setup and configuration to communicate
-anonymously over I2P. These are tagged with <em>standalone</em>. Some
-applications, tagged with <em>standalone/mod</em>, require patching to
-function properly over I2P or to prevent inadvertent disclosure of
-identifying information such as the user's hostname or external IP
-address.
-{%- endtrans %}</p>
- </dd>
-</dl>
-
-<dl>
- <dt><em>{{ _('service') }}</em></dt>
-
- <dd>
- <p>{% trans -%}
-<em>Third-party essential network service</em> — Services which on
-the I2P network are analogous to those provided on the public Internet
-by hosting providers, ISPs, and Google: eepsite indexes and jump
-services, search engines, email, DNS-style name services, hosting,
-proxies, etc. These services focus on boosting the usefulness of the
-network as a whole, and making network content more discoverable.
-{%- endtrans %}</p>
- </dd>
-</dl>
-<dl>
-
- <dt><em>{{ _('unmaintained') }}</em></dt>
-
- <dd>
- <p>{% trans -%}
-<em>Unmaintained</em> — This is used to tag plugins, applications,
-and services which appear to be unmaintained and may be removed from
-this listing in the future.
-{%- endtrans %}</p>
- </dd>
-</dl>
-
-<p><strong>{% trans threatmodel=site_url('docs/how/threat-model') -%}
-Warning: Using an application, plugin, or service with I2P
-doesn't automatically protect your anonymity. I2P is merely a set of tools
-which can help you mitigate certain <a href="{{ threatmodel }}">identified
-threats to anonymity</a>. We do not and cannot make any guarantees about the
-safety of the applications, plugins, and services listed below. Most
-applications and plugins must be properly configured, and some will need to
-be patched — and even then your anonymity might not be assured. Similarly,
-services could put your anonymity at risk, either by design or through
-carelessness on their part or your own.
-{%- endtrans %}</strong></p>
-
-<p><strong>{% trans -%}
-If you have doubts about the suitability of an application,
-plugin, or service for use with I2P, you are urged to inquire about privacy
-issues with its maintainers, to search its mailing lists and bug tracker if
-one exists, and consult trusted, knowledgeable members of the I2P
-community.
-{%- endtrans %}</strong></p>
-
-<p><strong>{% trans -%}
-Take responsibility for your own anonymity and safety — always
-seek expert advice, educate yourself, practice good judgment, be mindful of
-disclosing personally identifying information, and don't take
-shortcuts.
-{%- endtrans %}</strong></p>
-
-<h3 id="blogging-and-forums"><a href="#TOC">{% trans %}Blogging, Forums, and Wikis{% endtrans %}</a></h3>
-
-<ul>
- <!-- let's disable this for now, at least, since it's nearly impossible to
- find configuration instructions; plus, there certainly isn't a plugin
- available for this.
- <li>
- <p><a href="http://www.blojsom.com/blog/"><strong>Blojsom</strong></a> —
- Lightweight blogging platform.
- <sup><em>[{{ _('plugin') }}, {{ _('standalone/mod') }}]</em></sup></p>
- </li>
- -->
-
- <li>
- <p><a href="https://github.com/trevorturk/eldorado/"><strong>El Dorado</strong></a> —
- {% trans %}Lightweight forum software.{% endtrans %}
- <sup><em>[{{ _('standalone/mod') }}]</em></sup></p>
- </li>
-
- <li>
- <p><a href="http://pebble.sourceforge.net/"><strong>Pebble</strong></a> —
- {% trans %}Another lightweight blogging platform.{% endtrans %}
- <sup><em>[{{ _('plugin') }}, {{ _('standalone/mod') }}]</em></sup></p>
- </li>
-
- <li>
- <p><a href="https://www.phpbb.com/"><strong>phpBB</strong></a> —
- {% trans %}Most popular open source forum software.{% endtrans %}
- <sup><em>[{{ _('standalone/mod') }}]</em></sup></p>
- </li>
-
- <li>
- <p><a href="http://syndie.de/"><strong>Syndie</strong></a> —
- {% trans %}Distributed forums software, originally developed by jrandom.{% endtrans %}
- <sup><em>[{{ _('plugin') }}, {{ _('standalone') }}, {{ _('unmaintained') }}]</em></sup></p>
- </li>
- <li>
- <p><a href="http://jamwiki.org"><strong>JAMWiki</strong></a> —
-{% trans plugins=i2pconv('plugins.i2p') -%}
-A Java-based MediaWiki clone. No external database needed.
-Plugin available <a href="http://{{ plugins }}/plugins/jamwiki">here</a>.
-{%- endtrans %}
- <sup><em>[{{ _('standalone') }}, {{ _('plugin') }}]</em></sup></p>
- </li>
-</ul>
-
-<h3 id="decentralized-file-storage"><a href="#TOC">{% trans %}Decentralized File Storage{% endtrans %}</a></h3>
-
-<ul>
- <li><a href="http://echelon.i2p/tahoelafs/"><strong>Tahoe-LAFS-I2P</strong></a> —
-{% trans stats=i2pconv('stats.i2p') -%}
-Port of the <a href="http://tahoe-lafs.org/"><strong>Tahoe-LAFS</strong></a>
-distributed file system to the I2P network. Controller plugin <a href=
-"http://{{ stats }}/i2p/plugins/">here</a>.
-{%- endtrans %}
- <sup><em>[{{ _('plugin') }}, {{ _('standalone') }}]</em></sup></li>
-</ul>
-
-<h3 id="development-tools"><a href="#TOC">{% trans %}Development Tools{% endtrans %}</a></h3>
-
-<h4 id="version-control"><a href="#TOC">{% trans %}Version control{% endtrans %}</a></h4>
-
-<ul>
- <li>
- <p><a href="http://git-scm.com/"><strong>Git</strong></a> —
- {% trans %}Most popular distributed version control system.{% endtrans %}
- <sup><em>[{{ _('standalone') }}]</em></sup></p>
- </li>
-
- <li>
- <p><a href="http://www.monotone.ca/"><strong>Monotone</strong></a> —
-{% trans monotone=site_url('get-involved/guides/monotone') -%}
-Another distributed version control system. Currently
-<a href="{{ monotone }}">used in I2P development</a>.
-{%- endtrans %}
- <sup><em>[{{ _('standalone') }}]</em></sup></p>
- </li>
-</ul>
-
-<h3 id="domain-naming"><a href="#TOC">{% trans %}Domain Naming{% endtrans %}</a></h3>
-
-<ul>
- <li><a href="http://127.0.0.1:7657/susidns/"><strong>susidns</strong></a> —
-{% trans naming=site_url('docs/naming') -%}
-Provides management of addressbooks, which are part of a simple,
-user-controlled <a href="{{ naming }}">I2P naming system</a> somewhat
-analogous to the Internet's Domain Name System (DNS). Addressbooks map
-Base64 destinations to short, usually human-readable “domain†names ending
-with a .i2p suffix which the I2P router's HTTP client can resolve back to
-Base64 addresses. (<em>Note:</em> While Base64 destinations are globally
-unique, addressbook “domain†names only resolve to unique destinations
-locally.)
-{%- endtrans %}
- <sup><em>[{{ _('bundled') }}]</em></sup>
- </li>
-</ul>
-
-<h3 id="email"><a href="#TOC">{% trans %}Email{% endtrans %}</a></h3>
-
-<ul>
- <li>
- <p><a href="http://{{ i2pconv('bote.i2p') }}/"><strong>I2P-Bote</strong></a> —
-{% trans -%}
-Serverless peer-to-peer email application using a distributed hash table
-(DHT) for secure mail storage.
-{%- endtrans %}
- <sup><em>[{{ _('plugin') }}]</em></sup></p>
- </li>
-
- <li>
- <p><a href="http://{{ i2pconv('hq.postman.i2p') }}/"><strong>Postman's anonymous email service</strong></a> —
-{% trans -%}
-Provides email service within the I2P network via @mail.i2p addresses,
-and email gateway service between the I2P network and the public Internet
-via @i2pmail.org addresses. One of the oldest continuous services on I2P.
-{%- endtrans %}
- <sup><em>[{{ _('service') }}]</em></sup></p>
- </li>
-
- <li>
- <p><a href="http://127.0.0.1:7657/susimail/susimail"><strong>susimail</strong></a> —
-{% trans -%}
-Simple web browser-based email interface. Configured to use Postman's
-email service by default.
-{%- endtrans %}
- <sup><em>[{{ _('bundled') }}]</em></sup></p>
- </li>
-
- <li>
- <p><strong>Sylpheed Claws, Thunderbird, other MUAs</strong> —
-{% trans reviews='http://'+i2pconv('hq.postman.i2p')+'/?page_id=9',
-smtp='http://'+i2pconv('hq.postman.i2p')+'/?page_id=10',
-pop3='http://'+i2pconv('hq.postman.i2p')+'/?page_id=11' -%}
-Can be configured to use Postman's email service. See
-<a href="{{ reviews}}">this comparison of MUAs</a>,
-and configuration settings for
-<a href="{{ smtp }}">SMTP</a> and <a href="{{ pop3 }}">POP3</a>.
-{%- endtrans %}
- <sup><em>[{{ _('standalone') }}]</em></sup></p>
- </li>
-</ul>
-
-<h3 id="file-sharing"><a href="#TOC">{% trans %}File Sharing{% endtrans %}</a></h3>
-
-<h4 id="bittorrent-clients"><a href="#TOC">{% trans %}BitTorrent clients{% endtrans %}</a></h4>
-
-<ul>
- <li>
- <p><a href="http://127.0.0.1:7657/i2psnark/"><strong>I2PSnark</strong></a> —
- {% trans %}I2P's integrated BitTorrent client.{% endtrans %}
- <sup><em>[{{ _('bundled') }}]</em></sup></p>
- </li>
-
- <li>
- <p><a href="http://echelon.i2p/i2psnarkxl"><strong>I2PSnarkXL</strong></a> —
- {% trans %}Modified version of I2PSnark, no more supported neither
- functional.{% endtrans %}
- <sup><em>[{{ _('standalone') }}]</em></sup></p>
- </li>
-
- <li>
- <p><a href="http://{{ i2pconv('bob.i2p') }}/Robert.html"><strong>Robert</strong></a> —
-{% trans %}
-A fork of rufus that uses the Basic Open Bridge (BOB) and has many
-improvements, including using the latest wxwidgets and python. It also
-supports use of seedless if installed for trackerless torrents and
-magnet-link like fetching of torrents within I2P.
-{% endtrans %}
- <sup><em>[{{ _('standalone') }}]</em></sup></p>
- </li>
-
- <li>
- <p><a href="http://www.transmissionbt.com/"><strong>Transmission</strong></a> —
-{% trans -%}
-Clean, full-featured cross-platform BitTorrent client with official
-ports for several GUI toolkits.
-{%- endtrans %}
- <sup><em>[{{ _('standalone/mod') }}]</em></sup></p>
- </li>
-
- <li>
- <p><a href="http://www.vuze.com//w/I2PHelper_HowTo"><strong>Azureus/Vuze</strong></a> —
- {% trans %}Has a plugin providing I2P support.{% endtrans %}
- <sup><em>[{{ _('standalone') }}]</em></sup></p>
- </li>
-</ul>
-
-<h4 id="bittorrent-trackers-and-indexers"><a href="#TOC">{% trans %}BitTorrent trackers and indexers{% endtrans %}</a></h4>
-
-<p>{% trans zzz=i2pconv('zzz.i2p') -%}
-For a detailed feature comparison of I2P-enabled trackers/indexers, see
-<a href="http://{{ zzz }}/files/trackers.html">here</a>.
-{%- endtrans %}</p>
-
-<ul>
- <li>
- <p><a href="http://{{ i2pconv('echelon.i2p') }}/tracker/"><strong>Bytemonsoon</strong></a> —
-{% trans -%}
-The code that powered one of the first major tracker/indexer sites on the
-Internet. Patched for I2P.
-{%- endtrans %}
- <sup><em>[{{ _('standalone/mod') }}]</em></sup></p>
- </li>
-
- <li>
- <p><a href="http://erdgeist.org/arts/software/opentracker/"><strong>opentracker</strong></a> —
-{% trans newdevs=site_url('get-involved/guides/new-developers') -%}
-Lightweight tracker/indexer. I2P mod available in the i2p.opentracker
-branch of the <a href="{{ newdevs }}">I2P Monotone repository</a>.
-{%- endtrans %}
- <sup><em>[{{ _('standalone/mod') }}]</em></sup></p>
- </li>
-
- <li>
- <p><a href="http://{{ i2pconv('stats.i2p') }}/i2p/plugins/"><strong>zzzot</strong></a> —
-{% trans zzz=i2pconv('zzz.i2p') -%}
-<a href="http://{{ zzz }}/">zzz's</a> Java-based open tracker. More info
-<a href="http://{{ zzz }}/topics/598?page=1#p2085">here</a>.
-{%- endtrans %}
- <sup><em>[{{ _('plugin') }}]</em></sup></p>
- </li>
-</ul>
-
-<h4 id="ed2k"><a href="#TOC">ED2K</a></h4>
-
-<ul>
- <li>
- <a href="http://www.imule.i2p"><strong>iMule</strong></a> —
- {% trans %}I2P port of the aMule ED2K client.{% endtrans %}
- <sup><em>[{{ _('standalone') }}]</em></sup></li>
-</ul>
-
-<h4 id="gnutella"><a href="#TOC">Gnutella</a></h4>
-
-<ul>
- <li>
- <p><a href="http://echelon.i2p/i2phex"><strong>I2Phex</strong></a> —
-{% trans stats=i2pconv('stats.i2p') -%}
-Port of the <a href="http://www.phex.org/mambo/">Phex</a> Gnutella client. Website
-for plugin version <a href="http://{{ stats }}/i2p/plugins/">here</a>.
-{%- endtrans %}
- <sup><em>[{{ _('plugin') }}, {{ _('standalone') }}]</em></sup></p>
- </li>
-
- <li>
- <p><a href="http://echelon.i2p/jwebcache"><strong>jwebcache</strong></a> —
-{% trans stats=i2pconv('stats.i2p') -%}
-Cache for Gnutella peers on I2P. Website for plugin version
-<a href="http://{{ stats }}/i2p/plugins/">here</a>.
-{%- endtrans %}
- <sup><em>[{{ _('plugin') }}, {{ _('standalone') }}]</em></sup></p>
- </li>
-</ul>
-
-<h3 id="network-administration"><a href="#TOC">{% trans %}Network Administration{% endtrans %}</a></h3>
-
-<h4 id="general-purpose-socket-utilities"><a href="#TOC">{% trans %}General-purpose socket utilities{% endtrans %}</a></h4>
-
-<ul>
- <li>
- <p><a href="https://cvsweb.openbsd.org/cgi-bin/cvsweb/src/usr.bin/nc/"><strong>netcat-openbsd</strong></a> —
-{% trans -%}
-OpenBSD's rewrite of the Unix standard tool, netcat, for socket relaying.
-Several clones, ports, and forks have appeared over the years.
-{%- endtrans %}
- <sup><em>[{{ _('standalone') }}]</em></sup></p>
- </li>
-
- <li>
- <p><a href="http://www.dest-unreach.org/socat/"><strong>socat</strong></a> —
- {% trans %}Like netcat but more powerful.{% endtrans %}
- <sup><em>[{{ _('standalone') }}]</em></sup></p>
- </li>
-
- <!--<li>
- <p><a href="http://tsocks.sourceforge.net/"><strong>tsocks</strong></a> —
- {% trans %}Proxy providing simple, transparent SOCKS-ification of network applications.{% endtrans %}
- <sup><em>[{{ _('standalone') }}]</em></sup></p>
- </li>-->
-</ul>
-
-<h4 id="sshscpsftp"><a href="#TOC">SSH/SCP/SFTP</a></h4>
-
-<ul>
- <li>
- <p><a href="http://www.openssh.com/"><strong>OpenSSH</strong></a> —
- {% trans %}Most popular implementation of the Secure Shell (SSH) protocol and related tools.{% endtrans %}
- <sup><em>[{{ _('standalone') }}]</em></sup></p>
- </li>
-
- <li>
- <p><a href="http://www.chiark.greenend.org.uk/~sgtatham/putty/"><strong>PuTTY</strong></a> —
- {% trans %}Open source Secure Shell (SSH) client for Windows.{% endtrans %}
- <sup><em>[{{ _('standalone') }}]</em></sup></p>
- </li>
-</ul>
-
-<h3 id="real-time-chat"><a href="#TOC">{% trans %}Real-time Chat{% endtrans %}</a></h3>
-
-<h4 id="instant-messaging-clients"><a href="#TOC">{% trans %}Instant messaging clients{% endtrans %}</a></h4>
-
-<ul>
- <li>
- <a href="http://echelon.i2p/qti2pmessenger"><strong>I2P Messenger</strong></a> —
- {% trans %}IM client with multiple incarnations, unsuported.{% endtrans %}
- <sup><em>[{{ _('standalone') }}]</em></sup>
- </li>
-</ul>
-
-<h4 id="irc-clients"><a href="#TOC">{% trans %}IRC clients{% endtrans %}</a></h4>
-
-<p>{% trans -%}
-Many IRC clients leak identifying information to servers or other
-clients, so I2P's IRC and SOCKS IRC client tunnels filter certain inbound
-and outbound messages to scrub data such as LAN IP addresses, external IP
-addresses, local hostnames, and the name and version of the IRC client. Two
-message types in particular, DCC and CTCP, can't be sufficiently anonymized
-without changes to the protocols or to IRC client/server code, so they are
-completely blocked, except for CTCP ACTION (the message emitted by the
-<code>/me</code> command) which isn't inherently dangerous.
-{%- endtrans %}</p>
-
-<p>{% trans -%}
-I2P's IRC filtering may not cover every possible leak — users should also
-check if their client is sending their real name or local username. Packet
-sniffers such as <a href="http://www.wireshark.org/">Wireshark</a> are
-useful here. Eliminating remaining leaks may be as simple as changing the
-client's default configuration. If that doesn't help, inform the I2P
-developers; they may be able to solve it via additional filtering.
-{%- endtrans %}</p>
-
-<ul>
- <li>
- <p><a href="http://www.oldschoolirc.com/"><strong>jIRCii</strong></a> —
-{% trans stats=i2pconv('stats.i2p') -%}
-Small Java-based IRC client. Plugin available <a href=
-"http://{{ stats }}/i2p/plugins/">here</a>.
-{%- endtrans %}
- <sup><em>[{{ _('plugin') }}, {{ _('standalone') }}]</em></sup></p>
- </li>
-
- <li>
- <p><a href="https://hexchat.github.io/"><strong>HexChat</strong></a> —
- {% trans %}Cross-platform graphical IRC client based on XChat.{% endtrans %}
- <sup><em>[{{ _('standalone') }}]</em></sup></p>
- </li>
-
- <li>
- <p><a href="http://www.irssi.org/"><strong>irssi</strong></a> —
- {% trans %}Unixy terminal-based IRC client.{% endtrans %}
- <sup><em>[{{ _('standalone') }}]</em></sup></p>
- </li>
-
- <li>
- <p><a href="http://www.weechat.org/"><strong>WeeChat</strong></a> —
- {% trans %}Another Unixy terminal-based IRC client.{% endtrans %}
- <sup><em>[{{ _('standalone') }}]</em></sup></p>
- </li>
-</ul>
-
-<h4 id="irc-servers"><a href="#TOC">{% trans %}IRC servers{% endtrans %}</a></h4>
-
-<ul>
- <li>
- <p><a href="http://ngircd.barton.de/index.php.en"><strong>ngIRCd</strong></a> —
- {% trans %}IRC server developed from scratch.{% endtrans %}
- <sup><em>[{{ _('standalone/mod') }}]</em></sup></p>
- </li>
-
- <li>
- <p><a href="http://www.unrealircd.com/"><strong>UnrealIRCd</strong></a> —
- {% trans %}Most popular IRC server.{% endtrans %}
- <sup><em>[{{ _('standalone/mod') }}]</em></sup></p>
- </li>
-</ul>
-
-<h3 id="web-browsing"><a href="#TOC">{% trans %}Web Browsing{% endtrans %}</a></h3>
-
-<h4 id="anonymous-websites"><a href="#TOC">{% trans %}Anonymous websites{% endtrans %}</a></h4>
-
-<ul>
- <li>
- <p><strong>Eepsites</strong> —
-{% trans -%}
-Any website hosted anonymously on I2P, reachable through the I2P router's HTTP proxy.
-{%- endtrans %}
- <sup><em>[{{ _('service') }}]</em></sup></p>
- </li>
-
- <li>
- <p><strong>Deepsites</strong> —
-{% trans -%}
-Distributed anonymous websites hosted
-using Tahoe-LAFS-I2P, currently only reachable with Tahoe-LAFS-I2P
-clients or through the Tahoe-LAFS-I2P HTTP proxy.
-{%- endtrans %}
- <sup><em>[{{ _('service') }}]</em></sup></p>
- </li>
-
- <li>
- <p><a href="http://{{ i2pconv('i2host.i2p') }}/"><strong>{{ i2pconv('i2host.i2p') }}</strong></a> —
-{% trans sponge=i2pconv('sponge.i2p') -%}
-Website for <a href="http://{{ sponge }}/">sponge's</a> jump service.
-Source code available.
-{%- endtrans %}
- <sup><em>[{{ _('service') }}]</em></sup></p>
- </li>
-
- <li>
- <p><a href="http://{{ i2pconv('i2jump.i2p') }}/"><strong>{{ i2pconv('i2jump.i2p') }}</strong></a> —
- {% trans %}Another jump service.{% endtrans %}
- <sup><em>[{{ _('service') }}]</em></sup></p>
- </li>
-
- <li>
- <p><a href="http://{{ i2pconv('identiguy.i2p') }}/"><strong>{{ i2pconv('identiguy.i2p') }}</strong></a> —
- {% trans %}Dynamically updated eepsite index.{% endtrans %}
- <sup><em>[{{ _('service') }}]</em></sup></p>
- </li>
-
- <li>
- <p><a href="http://{{ i2pconv('stats.i2p') }}/"><strong>{{ i2pconv('stats.i2p') }}</strong></a> —
- {% trans zzz=i2pconv('zzz.i2p') %}Website for <a href="http://{{ zzz }}/">zzz's</a> jump service.{% endtrans %}
- <sup><em>[{{ _('service') }}]</em></sup></p>
- </li>
-</ul>
-
-<h4 id="proxy-software"><a href="#TOC">{% trans %}Proxy software{% endtrans %}</a></h4>
-
-<ul>
- <li>
- <p><a href="http://www.pps.jussieu.fr/~jch/software/polipo/"><strong>Polipo</strong></a> —
- {% trans %}SOCKS-enabled caching web proxy with basic filtering capabilities.{% endtrans %}
- <sup><em>[{{ _('standalone') }}]</em></sup></p>
- </li>
-
- <li>
- <p><a href="http://www.privoxy.org/"><strong>Privoxy</strong></a> —
-{% trans -%}
-Privacy-focused non-caching web proxy with advanced filtering
-capabilities. Excels at removing ads and other junk.
-{%- endtrans %}
- <sup><em>[{{ _('standalone') }}]</em></sup></p>
- </li>
-
- <li>
- <p><a href="http://www.squid-cache.org/"><strong>Squid</strong></a> —
- {% trans %}Venerable caching web proxy.{% endtrans %}
- <sup><em>[{{ _('standalone') }}]</em></sup></p>
- </li>
-</ul>
-
-<h4 id="inproxies"><a href="#TOC">{% trans %}Inproxies{% endtrans %}</a></h4>
-
-<p>{% trans -%}
-Gateways allowing users on the public Internet to access eepsites.
-{%- endtrans %}</p>
-
-<ul>
- <li>
- <a href="http://i2p.to/"><strong>i2p.to</strong></a> —
-{% trans tino=i2pconv('tino.i2p') -%}
-<a href="http://{{ tino }}/">tino's</a> inproxy on the public Internet,
-currently out of service,
-{%- endtrans %}
- <sup><em>[{{ _('service') }}]</em></sup>
- </li>
-
-<!-- <li>
- <a href="http://i2p.us/"><strong>i2p.us</strong></a> —
-{% trans -%}
-Another inproxy on the public Internet.
-{%- endtrans %}
- <sup><em>[{{ _('service') }}]</em></sup>
- </li>
-
- <li>
- <a href="http://i2p.me/"><strong>i2p.me</strong></a> —
-
-{% trans -%}
-Another inproxy on the public Internet.
-{%- endtrans %}
- <sup><em>[{{ _('service') }}]</em></sup>
- </li>
- <a href="http://i2p.rocks/"><strong>i2p.rocks</strong></a> —
- -->
- {% trans -%}
- Another inproxy on the public Internet.
- {%- endtrans %}
- <sup><em>[{{ _('service') }}]</em></sup>
- </li>
-</ul>
-
-<h4 id="outproxies"><a href="#TOC">{% trans %}Outproxies{% endtrans %}</a></h4>
-
-<p>{% trans -%}
-Gateways allowing I2P users to access content hosted on the public Internet.
-{%- endtrans %}</p>
-
-<ul>
- <li>
- <strong>false.i2p</strong> —
- {% trans %}Publicly advertised outproxy running Squid, located in Europe.{% endtrans %}
- <sup><em>[{{ _('service') }}]</em></sup>
- </li>
-</ul>
-
-<h3 id="website-hosting"><a href="#TOC">{% trans %}Website Hosting{% endtrans %}</a></h3>
-
-<ul>
- <li>
- <a href="http://jetty.codehaus.org/jetty/"><strong>Jetty</strong></a> —
-{% trans -%}
-Lightweight web server and Java servlet container. I2P is tightly
-integrated with a bundled copy of Jetty which by default is configured to
-host the <a href="http://127.0.0.1:7658/">user's eepsite</a>. The bundled
-Jetty also serves the I2P router console and web applications bundled with
-I2P.
-{%- endtrans %}
- <sup><em>[{{ _('bundled') }}, {{ _('standalone') }}]</em></sup></li>
-</ul>
-
-<h4 id="web-servers"><a href="#TOC">{% trans %}Web servers{% endtrans %}</a></h4>
-
-<p>{% trans -%}
-In addition to Jetty, any web server should function over I2P without
-modification so long as it's HTTP-compliant. Some web servers known to
-currently serve content on the I2P network are:
-{%- endtrans %}</p>
-
-<ul>
- <li>
- <p><a href="http://httpd.apache.org/"><strong>Apache HTTP Server</strong></a> —
- {% trans %}Most popular web server on the public WWW.{% endtrans %}
- <sup><em>[{{ _('standalone') }}]</em></sup></p>
- </li>
-
- <li>
- <p><a href="http://tomcat.apache.org/"><strong>Apache Tomcat</strong></a> —
- {% trans %}Web server and Java servlet container. More features than Jetty.{% endtrans %}
- <sup><em>[{{ _('standalone') }}]</em></sup></p>
- </li>
-
- <li>
- <p><a href="http://www.lighttpd.net/"><strong>lighttpd</strong></a> —
- {% trans %}Fast lightweight web server.{% endtrans %}
- <sup><em>[{{ _('standalone') }}]</em></sup></p>
- </li>
-
- <li>
- <p><a href="http://nginx.org/"><strong>nginx</strong></a> —
- {% trans %}High-performance lightweight web server.{% endtrans %}
- <sup><em>[{{ _('standalone') }}]</em></sup></p>
- </li>
-</ul>
-<!-- vim: set noai nosi ft=html tw=79 et sw=4 ts=4 spell spelllang=en: -->
-{% endblock %}
diff --git a/i2p2www/pages/site/faq.html b/i2p2www/pages/site/faq.html
index 0764190a6ac6bc830915e4bdd0f834009b17debb..b9a387475e4f0e38da986226d718eba4ac86a66b 100644
--- a/i2p2www/pages/site/faq.html
+++ b/i2p2www/pages/site/faq.html
@@ -10,16 +10,22 @@
<li><a href="#eepsite">{% trans %}Whats an "eepsite" and how do I configure my browser so I can use them?{% endtrans %}</a></li>
<li><a href="#active">{% trans %}What do the Active x/y numbers mean in the router console?{% endtrans %}</a></li>
<li><a href="#exit">{% trans %}Is my router an "exit node"(outproxy) to the regular Internet? I don't want it to be.{% endtrans %}</a></li>
+<li><a href="#safe">{% trans %}Is using I2P Safe?{% endtrans %}</a></li>
<li><a href="#netdb_ip">{% trans %}I see IP addresses of all other I2P nodes in the router console. Does that mean my IP address is visible by others?{% endtrans %}</a></li>
+<li><a href="#detection">{% trans %}Is it easy to detect the use of I2P by analyzing network traffic?{% endtrans %}</a></li>
<li><a href="#outproxy">{% trans %}I can't access regular Internet sites through I2P.{% endtrans %}</a></li>
<li><a href="#proxy_safe">{% trans %}Is using an outproxy safe?{% endtrans %}</a></li>
<li><a href="#badcontent">{% trans %}I am opposed to certain types of content. How do I keep from distributing, storing, or accessing them?{% endtrans %}</a></li>
+<li><a href="#blocking">{% trans %}Is it possible to block I2P?{% endtrans %}</a></li>
<li style="list-style: none; display: inline">
<h4>{{ _('Getting Started') }}</h4>
</li>
<li><a href="#browserproxy">{% trans %}How do I configure my browser?{% endtrans %}</a></li>
<li><a href="#irc">{% trans %}How do I connect to IRC within I2P?{% endtrans %}</a></li>
<li><a href="#myeepsite">{% trans %}How do I set up my own eepsite?{% endtrans %}</a></li>
+<li><a href="#hosting">{% trans %}If I host a website at I2P at home, containing only HTML and CSS, is it dangerous?{% endtrans %}</a></li>
+<li><a href="#addresses">{% trans %}How Does I2P find ".i2p" websites?{% endtrans %}</a></li>
+<li><a href="#addressbook">{% trans %}How do I add to the AddressBook?{% endtrans %}</a></li>
<li><a href="#ports">{% trans %}What ports does I2P use?{% endtrans %}</a></li>
<li><a href="#subscriptions">{% trans %}I'm missing lots of hosts in my addressbook. What are some good subscription links?{% endtrans %}</a></li>
<li><a href="#remote_webconsole">{% trans %}How can I access the web console from my other machines or password protect it?{% endtrans %}</a></li>
@@ -110,6 +116,15 @@ By default, I2P's HTTP Proxy (configured to run on port 4444) includes a single
There is an <a href="{{ outproxy }}">outproxy guide</a> available on our forums, if you would like to learn more about running an outproxy.
{%- endtrans %}</p>
+<h3 id="safe">{% trans %}Is using I2P Safe?{% endtrans %}</h3>
+<p>{% trans %}I2P strives to be safe in it's default configuration for all users. In most, possibly all countries, anonymizing
+software and strong encryption are not illegal to possess or use.{% endtrans %}</p>
+
+<p>{% trans %} It may be dangerous to use I2P in what the project calls "Strict Countries" where the law may not be clear on anonymizing software and where risks are judged to be fairly high. Most I2P peers are not in those strict countries and the ones that are are placed in "Hidden Mode" where they interact with the rest of the network in more limited ways, so that they are less visible to network observers. Structurally, taking over a single peer, or even a fairly large group of peers, with a subpoena is not an effective way to deanonymizing anybody else's traffic.
+{% endtrans %}</p>
+
+<p>Before you use I2P, use Basic Computer Hygiene Always! Apply your OS vendor provided software updates in a prompt manner. Be aware of the state of your firewall and anti-virus status if you use one. Always get your software from authentic sources.</p>
+
<h3 id="netdb_ip"><span class="permalink"><a href="#netdb_ip">
{% trans %}I see IP addresses of all other I2P nodes in the router console. Does that mean my IP address is visible by others?{% endtrans %}</a></span>
</h3>
@@ -121,6 +136,14 @@ Yes, and this is how a fully distributed peer-to-peer network works. Every node
While the fact that your computer runs I2P is public, nobody can see your activities in it. You can't say if a user behind this IP address is sharing files, hosting a website, doing research or just running a node to contribute bandwidth to the project.
{%- endtrans %}</p>
+<h3 id="detection">{% trans %}Is it easy to detect the use of I2P by analyzing network traffic?{% endtrans %}</h3>
+<p>{% trans %}It can be deduced that somebody is using the I2P network with some reliability, but it is a little difficult to know for sure.
+The most reliable way to know for sure would be to have a computer with a fairly stable IP address that you suspect is an I2P user, and a
+bunch of computers you control on different networks all running I2P. When one of them connects to your suspected computer, you will be able
+to see their I2P router in the netDB. This might take time, and it might never happen. You could also try blocking all obfuscated traffic
+on a particular network until you're sure every I2P router on that network has lost all of it's peers. At that point, they'll reach out
+to reseed servers to get more peers, which a network administrator can probably observe.{% endtrans %}</p>
+
<h3 id="outproxy"><span class="permalink"><a href="#outproxy">
{% trans %}I can't access regular Internet sites through I2P.{% endtrans %}</a></span>
</h3>
@@ -198,6 +221,12 @@ Your router will not request any content without your specific instruction to do
</li>
</ul>
+<h3 id="blocking">Is it possible to block I2P?</h3>
+<p>{% trans %}Yes, by far the easiest and most common way is by blocking bootstrap, or "Reseed" servers. Completely blocking all obfuscated traffic
+would work as well (although it would break many, many other things that are not I2P and most are not willing to go this far).
+In the case of reseed blocking, there is a reseed bundle on Github, blocking it will also block Github.
+You can reseed over a proxy (many can be found on Internet if you do not want to use Tor) or share reseed bundles on a friend-to-friend basis offline.{% endtrans %}</p>
+
<h2>Getting Started</h2>
<h3 id="browserproxy"><span class="permalink"><a href="#browserproxy">
@@ -230,6 +259,22 @@ Weechat users can use the following command to add a new network:
Click on the <a href="http://localhost:7658/">Website</a> link at the top of your router console for instructions.
{%- endtrans %}</p>
+<h3 id="hosting">{% trans %}If I host a website at I2P at home, containing only HTML and CSS, is it dangerous?{% endtrans %}</h3>
+<p>{% trans %}If you're hosting a personal blog or doing something otherwise non-sensitive, then you are obviously in little danger.
+If you have privacy needs that are basically non-specific, you are in little danger. If you are hosting something sensitive, then
+your services will go down at the same time that your router goes down. Someone who observes your downtime and correlates it to
+real-world events could probably de-anonymize you with enough effort. I2P has defenses available against this like multihoming or
+Tahoe-LAFS, but they require additional set up and are only appropriate for some threat models. There is no magic solution, protecting
+yourself from a real threat will take real consideration in any case.{% endtrans %}</p>
+
+<h3 id="addresses">{% trans %}How Does I2P find ".i2p" websites? {% endtrans %}</h3>
+<p>The I2P Addressbook application maps human-readable names to long-term destinations, associated with services, making it more like a hosts file or a contact list than a network database or a DNS service. It's also local-first there is no recognized global namespace, you decide what any given .i2p domain maps to in the end. The middle-ground is something called a "Jump Service" which provides a human-readable name by redirecting you to a page where you will be asked "Do you give the I2P router permission to call $SITE_CRYPTO_KEY the name $SITE_NAME.i2p" or something to that effect. Once it's in your addressbook, you can generate your own jump URL's to help share the site with others. </p>
+
+<h3 id="addressbook">{% trans %}How do I add addresses to the Addressbook? {% endtrans %}</h3>
+<p>{% trans %}You cannot add an address without knowing at least the base32 or base64 of the site you want to visit. The "hostname" which is human-readable is only an alias for the cryptographic address, which corresponds to the base32 or base64. Without the cryptographic address, there is no way to access an I2P site, this is by design. Distributing the address to people who do not know it yet is usually the responsibility of the Jump service provider. Visiting an I2P site which is unknown will trigger the use of a Jump service. stats.i2p is the most reliable Jump service.{% endtrans %}</p>
+
+<p>{% trans %}If you're hosting a site via i2ptunnel, then it won't have a registration with a jump service yet. To give it a URL locally, then visit the configuration page and click the button that says "Add to Local Addressbook." Then go to http://127.0.0.1:7657/dns to look up the addresshelper URL and share it.{% endtrans %}</p>
+
<h3 id="ports"><span class="permalink"><a href="#ports">
{% trans %}What ports does I2P use?{% endtrans %}</a></span>
</h3>