Merge branch 'master' of i2pgit.org:i2p-hackers/i2p.www into style-guide

This commit is contained in:
idk
2020-11-11 13:15:24 -05:00
8 changed files with 126 additions and 63 deletions

View File

@@ -1,7 +1,7 @@
{% extends "global/layout.html" %}
{% block title %}SAM V3{% endblock %}
{% block lastupdated %}July 2020{% endblock %}
{% block accuratefor %}0.9.47{% endblock %}
{% block lastupdated %}2020-10{% endblock %}
{% block accuratefor %}0.9.48{% endblock %}
{% block content %}
<p>Specified below is a simple client protocol for interacting with I2P.
</p>
@@ -838,8 +838,8 @@ $port is the port number of the socket server to which SAM will
forward connection requests. It is mandatory.
</p><p>
When a connection request arrives from I2P, the SAM bridge requests a
socket connection from $host:$port. If it is accepted after no more
When a connection request arrives from I2P, the SAM bridge opens a
socket connection to $host:$port. If it is accepted in less
than 3 seconds, SAM will accept the connection from I2P, and then:
</p><p>