merge of 'c537c7ab7db5ba6fd16633e9a921b3c117f68978'

and 'f1a660ceb94f188d9b3e070c23b68162a0060ad7'
This commit is contained in:
zzz
2014-04-07 14:54:37 +00:00

View File

@@ -1,7 +1,7 @@
{% extends "global/layout.html" %}
{% block title %}{% trans %}Naming and Addressbook{% endtrans %}{% endblock %}
{% block lastupdated %}{% trans %}December 2013{% endtrans %}{% endblock %}
{% block accuratefor %}0.9.9{% endblock %}
{% block lastupdated %}{% trans %}April 2014{% endtrans %}{% endblock %}
{% block accuratefor %}0.9.12{% endblock %}
{% block content %}
<h2 id="overview">{% trans %}Overview{% endtrans %}</h2>
@@ -201,7 +201,7 @@ passing the new host/key entry to you.
<p>{% trans -%}
For this reason, the only subscription configured by
default is <code>http://www.i2p2.i2p/hosts.txt</code>,
default is <code>http://i2p-projekt.i2p/hosts.txt (http://udhdrtrcetjm5sxzskjyr5ztpeszydbh4dpl3pl4utgqqw2v4jna.b32.i2p/hosts.txt)</code>,
which contains a copy of the hosts.txt included
in the I2P release.
Users must configure additional subscriptions in their