merge of '3dbeff2fa03095876e7d62f3e3b73028194ab363'

     and 'ee9e0c6e682353822ba0ae099de649cd048cd720'

i2p2www/pages/site/docs/spec/common-structures.html

@@ -518,7 +518,7 @@ Defines the way to uniquely identify a particular router
 | certificate                           |
 +----+----+----+-//
 
-public_key :: `PublicKey`
+public_key :: `PublicKey` (partial or full)
               length -> 256 bytes or as specified in key certificate
 
 padding :: random data
@@ -586,11 +586,11 @@ public_key :: `PublicKey` (partial or full)
 
 padding :: random data
               length -> 0 bytes or as specified in key certificate
-              padding length + signing_public_key_length == 128 bytes
+              padding length + signing_public_key length == 128 bytes
 
 signing_public_key :: `SigningPublicKey` (partial or full)
               length -> 128 bytes or as specified in key certificate
-              padding length + signing_public_key_length == 128 bytes
+              padding length + signing_public_key length == 128 bytes
 
 certificate :: `Certificate`
                length -> >= 3 bytes
@@ -843,6 +843,8 @@ As of release 0.9.3, the expiration is assumed zero and not stored, so any non-z
 will fail in the RouterInfo signature verification.
 Implementing expiration (or another use for these bytes) will be a backwards-incompatible change.
 Routers MUST set this field to all zeros.
+As of release 0.9.12, a non-zero expiration field is again recognized, however we must wait
+several releases to use this field, until the vast majority of the network recognizes it.
 {%- endtrans %}</li>
 
 <li>{% trans -%}

i2p2www/pages/site/docs/transport/ntcp.html

 {% extends "global/layout.html" %}
 {% block title %}{% trans %}NTCP (NIO-based TCP){% endtrans %}{% endblock %}
-i2p2www/pages/site/docs/transport/ntcp.html   4
+{% block lastupdated %}{% trans %}February 2014{% endtrans %}{% endblock %}
 {% block accuratefor %}0.9.11{% endblock %}
 {% block content %}
 <p>{% trans transports=site_url('docs/transport'), ssu=site_url('docs/transport/ssu') -%}
@@ -473,6 +473,9 @@ A check info connection will receive 256 bytes containing:
      <li>{% trans %}xor of the local router's identity hash and the SHA256 of bytes 32 through bytes 223{% endtrans %}</li>
 </ul>
 </pre>
+<p>{% trans -%}
+Check connection is completely disabled as of release 0.9.12.
+{%- endtrans %}</p>
 
 <h2>{% trans %}Discussion{% endtrans %}</h2>
 <p>{% trans ntcpdisc=site_url('docs/discussions/ntcp') -%}
@@ -502,9 +505,6 @@ Can the establishment messages be randomly padded somehow, to frustrate
 identification of I2P traffic based on initial packet sizes?
 {%- endtrans %}</li>
 
-<li>{% trans -%}
-Review and possibly disable 'check connection'
-{%- endtrans %}</li>
 </ul>
 
 {% endblock %}