merge of 'a7c66fdbd876dc741e1f16fccc43acb062bc4cc0'

     and 'e128f93e1c700e303df3a0d655519dd6d1e83d7d'

i2p2www/pages/site/docs/api/samv3.html

@@ -120,9 +120,10 @@ received through other forms are answered with an error message) :
           [option=value]*
 
 DESTINATION specifies what destination should be used for 
-sending and receiving messages/streams.  It has to be a suitable
-private base64 destination key. If the destination is
-specified as TRANSIENT, the SAM bridge creates a new destination.
+sending and receiving messages/streams.  It is the base 64 encoding of
+the concatenation of the destination, private key, and signing private key.
+If the destination is specified as TRANSIENT,
+the SAM bridge creates a new destination.
 
 {$nickname} is the choice of the client. No whitespace is allowed.
 

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

 {% extends "global/layout.html" %}
 {% block title %}{% trans %}Common structures Specification{% endtrans %}{% endblock %}
-{% block lastupdated %}{% trans %}February 2014{% endtrans %}{% endblock %}
-{% block accuratefor %}0.9.11{% endblock %}
+{% block lastupdated %}{% trans %}June 2014{% endtrans %}{% endblock %}
+{% block accuratefor %}0.9.13{% endblock %}
 {% block content %}
 <p>{% trans i2np=site_url('docs/protocol/i2np'),
 i2cp=site_url('docs/protocol/i2cp'),
@@ -253,7 +253,7 @@ A certificate is a container for various receipts or proof of works used through
 {% endtrans %}</p>
 <h4>{% trans %}Contents{% endtrans %}</h4>
 <p>{% trans -%}
-1 byte <a href="#type_Integer">Integer</a> specifying certificate type, followed by a 2 <a href="#type_Integer">Integer</a> specifying the size of the certificate payload, then that many bytes.
+1 byte <a href="#type_Integer">Integer</a> specifying certificate type, followed by a 2 byte <a href="#type_Integer">Integer</a> specifying the size of the certificate payload, then that many bytes.
 {% endtrans %}</p>
 {% highlight lang='dataspec' %}
 +----+----+----+----+----+-//
@@ -338,8 +338,12 @@ parses Destinations and RouterIdentities.
 The key certificate payload contains:
 </p><table border=1>
 <tr><th>Data</th><th>Length</th></tr>
-<tr><td>Signing Public Key Type</td><td align="center">2</td></tr>
-<tr><td>Crypto Public Key Type</td><td align="center">2</td></tr>
+<tr><td>Signing Public Key Type
+(<a href="#type_Integer">Integer</a>)
+</td><td align="center">2</td></tr>
+<tr><td>Crypto Public Key Type
+(<a href="#type_Integer">Integer</a>)
+</td><td align="center">2</td></tr>
 <tr><td>Excess Signing Public Key Data</td><td align="center">0+</td></tr>
 <tr><td>Excess Crypto Public Key Data</td><td align="center">0+</td></tr>
 </table>