From 57a7a2b6cdcaf7d2134d6ae06d7a3dc8e9d1aab1 Mon Sep 17 00:00:00 2001
From: zzz <zzz@mail.i2p>
Date: Wed, 25 May 2016 17:29:04 +0000
Subject: [PATCH] Updates for proposals 112 and 126

---
 i2p2www/pages/site/docs/naming.html        | 12 ++++++++++--
 i2p2www/pages/site/docs/transport/ssu.html |  8 ++++++--
 i2p2www/pages/spec/index.html              |  1 +
 i2p2www/spec/ssu.rst                       |  9 ++++++---
 4 files changed, 23 insertions(+), 7 deletions(-)

diff --git a/i2p2www/pages/site/docs/naming.html b/i2p2www/pages/site/docs/naming.html
index d11689a6..df076b59 100644
--- a/i2p2www/pages/site/docs/naming.html
+++ b/i2p2www/pages/site/docs/naming.html
@@ -1,7 +1,7 @@
 {% extends "global/layout.html" %}
 {% block title %}{% trans %}Naming and Addressbook{% endtrans %}{% endblock %}
-{% block lastupdated %}{% trans %}April 2014{% endtrans %}{% endblock %}
-{% block accuratefor %}0.9.12{% endblock %}
+{% block lastupdated %}{% trans %}May 2016{% endtrans %}{% endblock %}
+{% block accuratefor %}0.9.26{% endblock %}
 {% block content %}
 <h2 id="overview">{% trans %}Overview{% endtrans %}</h2>
 
@@ -326,6 +326,14 @@ this file is the only place where it is appropriate to place private aliases or
 "pet names" for sites already in hosts.txt.
 {%- endtrans %}</p>
 
+<h3>{% trans %}Advanced Subscription Feed Format{% endtrans %}</h3>
+As of release 0.9.26, subscription sites and clients may support an advanced
+hosts.txt feed protocol that includes metadata including signatures.
+This format is backwards-compatible with the standard
+hosts.txt hostname=base64destination format.
+See <a href="/spec/proposals/112-addressbook-subscription-feed-commands">Proposal 112</a> for details.
+
+
 <h3>{% trans %}Outgoing Subscriptions{% endtrans %}</h3>
 <p>{% trans -%}
 Addressbook will publish the merged hosts.txt to a location
diff --git a/i2p2www/pages/site/docs/transport/ssu.html b/i2p2www/pages/site/docs/transport/ssu.html
index b2f96c9f..4b5688da 100644
--- a/i2p2www/pages/site/docs/transport/ssu.html
+++ b/i2p2www/pages/site/docs/transport/ssu.html
@@ -1,7 +1,7 @@
 {% extends "global/layout.html" %}
 {% block title %}{% trans %}Secure Semireliable UDP{% endtrans %} (SSU){% endblock %}
-{% block lastupdated %}{% trans %}April 2016{% endtrans %}{% endblock %}
-{% block accuratefor %}0.9.25{% endblock %}
+{% block lastupdated %}{% trans %}May 2016{% endtrans %}{% endblock %}
+{% block accuratefor %}0.9.26{% endblock %}
 {% block content %}
 
 <p>{% trans transports=site_url('docs/transport'), ntcp=site_url('docs/transport/ntcp') -%}
@@ -491,10 +491,14 @@ with either Bob or Charlie, but it is not required.
 
 <p>
 IPv6 Notes:
+Through release 0.9.26, only testing of IPv4 addresses is supported.
 Only testing of IPv4 addresses is supported.
 Therefore, all Alice-Bob and Alice-Charlie communication must be via IPv4.
 Bob-Charlie communication, however, may be via IPv4 or IPv6.
 Alice's address, when specified in the PeerTest message, must be 4 bytes.
+As of release 0.9.27, testing of IPv6 addresses is supported,
+and Alice-Bob and Alice-Charlie communication may be via IPv6.
+See <a href="/spec/proposals/126-ipv6-peer-testing">Proposal 126</a> for details.
 </p>
 
 
diff --git a/i2p2www/pages/spec/index.html b/i2p2www/pages/spec/index.html
index f56ce094..685da5fd 100644
--- a/i2p2www/pages/spec/index.html
+++ b/i2p2www/pages/spec/index.html
@@ -61,5 +61,6 @@ These will eventually be migrated to the new specifications system.
 <li><a href="{{ site_url('docs/api/samv3') }}">SAM v3</a></li>
 <li><a href="{{ site_url('docs/api/bob') }}">BOB</a></li>
 <li><a href="{{ site_url('docs/applications/bittorrent') }}">{{ _('Bittorrent') }}</a></li>
+<li><a href="{{ site_url('docs/naming') }}">{{ _('Naming and Addressbook') }}</a></li>
 </ul>
 {% endblock %}
diff --git a/i2p2www/spec/ssu.rst b/i2p2www/spec/ssu.rst
index 0b7bdf63..4123497b 100644
--- a/i2p2www/spec/ssu.rst
+++ b/i2p2www/spec/ssu.rst
@@ -3,8 +3,8 @@ SSU Protocol Specification
 ==========================
 .. meta::
     :category: Transports
-    :lastupdated: April 2016
-    :accuratefor: 0.9.25
+    :lastupdated: May 2016
+    :accuratefor: 0.9.26
 
 .. contents::
 
@@ -1066,10 +1066,13 @@ Notes
   always 4 bytes in the current implementation. IPv6 testing is not currently
   supported.
 
-* IPv6 Notes: Only testing of IPv4 addresses is supported. Therefore, all
+* IPv6 Notes: Through release 0.9.26, only testing of IPv4 addresses is supported. Therefore, all
   Alice-Bob and Alice-Charlie communication must be via IPv4. Bob-Charlie
   communication, however, may be via IPv4 or IPv6. Alice's address, when
   specified in the PeerTest message, must be 4 bytes.
+  As of release 0.9.27, testing of IPv6 addresses is supported,
+  and Alice-Bob and Alice-Charlie communication may be via IPv6.
+  See Proposal 126 for details.
 
 * A peer must maintain a table of active test states (nonces). On reception of
   a PeerTest message, look up the nonce in the table. If found, it's an