summaryrefslogtreecommitdiffstats
path: root/docs/en
diff options
context:
space:
mode:
authorLoïc Hoguin <[email protected]>2018-07-05 12:37:38 +0200
committerLoïc Hoguin <[email protected]>2018-07-05 12:37:38 +0200
commit1c03530c953cb6c550633b292f3fed0351a7b30a (patch)
treece78dd2f6bf62450711c4c18721460dbe100381f /docs/en
parentecf6d483b55d573292475c61ae21c9702dce5e01 (diff)
downloadninenines.eu-1c03530c953cb6c550633b292f3fed0351a7b30a.tar.gz
ninenines.eu-1c03530c953cb6c550633b292f3fed0351a7b30a.tar.bz2
ninenines.eu-1c03530c953cb6c550633b292f3fed0351a7b30a.zip
Apply inflation to my consulting rates
Diffstat (limited to 'docs/en')
-rw-r--r--docs/en/cowboy/2.0/manual/cowboy_req.read_body/index.html2
-rw-r--r--docs/en/cowboy/2.1/manual/cowboy_req.read_body/index.html2
-rw-r--r--docs/en/cowboy/2.2/manual/cowboy_req.read_body/index.html2
-rw-r--r--docs/en/cowboy/2.3/manual/cowboy_req.read_body/index.html2
-rw-r--r--docs/en/cowboy/2.4/manual/cowboy_req.read_body/index.html2
-rw-r--r--docs/en/gun/1.0/guide/websocket.asciidoc2
-rw-r--r--docs/en/gun/1.0/guide/websocket/index.html2
-rw-r--r--docs/en/ranch/1.3/guide/listeners/index.html2
-rw-r--r--docs/en/ranch/1.4/guide/listeners/index.html2
-rw-r--r--docs/en/ranch/1.5/guide/listeners/index.html2
10 files changed, 10 insertions, 10 deletions
diff --git a/docs/en/cowboy/2.0/manual/cowboy_req.read_body/index.html b/docs/en/cowboy/2.0/manual/cowboy_req.read_body/index.html
index 7d3e6194..b02b99c3 100644
--- a/docs/en/cowboy/2.0/manual/cowboy_req.read_body/index.html
+++ b/docs/en/cowboy/2.0/manual/cowboy_req.read_body/index.html
@@ -94,7 +94,7 @@ http://www.gnu.org/software/src-highlite -->
<p>The <code>length</code> option can be used to request smaller or bigger chunks of data to be sent. It is a best effort approach, Cowboy may send more data than configured on occasions. It defaults to 8MB.</p>
<p>The <code>period</code> indicates how long the connection process will wait before it provides us with the data it received. It defaults to 15 seconds.</p>
<p>The connection process sends data to the request process when either the <code>length</code> of data or the <code>period</code> of time is reached.</p>
-<p>The <code>timeout</code> option is a safeguard in case the connection process becomes unresponsive. The function will crash if no message was received in that interval. The timeout should be larger than the period. It defaults to the period<br/> 1 second.</p>
+<p>The <code>timeout</code> option is a safeguard in case the connection process becomes unresponsive. The function will crash if no message was received in that interval. The timeout should be larger than the period. It defaults to the period + 1 second.</p>
</dd>
</dl>
<h2 id="_return_value">Return value</h2>
diff --git a/docs/en/cowboy/2.1/manual/cowboy_req.read_body/index.html b/docs/en/cowboy/2.1/manual/cowboy_req.read_body/index.html
index a04fa945..af2b2340 100644
--- a/docs/en/cowboy/2.1/manual/cowboy_req.read_body/index.html
+++ b/docs/en/cowboy/2.1/manual/cowboy_req.read_body/index.html
@@ -94,7 +94,7 @@ http://www.gnu.org/software/src-highlite -->
<p>The <code>length</code> option can be used to request smaller or bigger chunks of data to be sent. It is a best effort approach, Cowboy may send more data than configured on occasions. It defaults to 8MB.</p>
<p>The <code>period</code> indicates how long the connection process will wait before it provides us with the data it received. It defaults to 15 seconds.</p>
<p>The connection process sends data to the request process when either the <code>length</code> of data or the <code>period</code> of time is reached.</p>
-<p>The <code>timeout</code> option is a safeguard in case the connection process becomes unresponsive. The function will crash if no message was received in that interval. The timeout should be larger than the period. It defaults to the period<br/> 1 second.</p>
+<p>The <code>timeout</code> option is a safeguard in case the connection process becomes unresponsive. The function will crash if no message was received in that interval. The timeout should be larger than the period. It defaults to the period + 1 second.</p>
</dd>
</dl>
<h2 id="_return_value">Return value</h2>
diff --git a/docs/en/cowboy/2.2/manual/cowboy_req.read_body/index.html b/docs/en/cowboy/2.2/manual/cowboy_req.read_body/index.html
index 4330cee2..e17d7126 100644
--- a/docs/en/cowboy/2.2/manual/cowboy_req.read_body/index.html
+++ b/docs/en/cowboy/2.2/manual/cowboy_req.read_body/index.html
@@ -94,7 +94,7 @@ http://www.gnu.org/software/src-highlite -->
<p>The <code>length</code> option can be used to request smaller or bigger chunks of data to be sent. It is a best effort approach, Cowboy may send more data than configured on occasions. It defaults to 8MB.</p>
<p>The <code>period</code> indicates how long the connection process will wait before it provides us with the data it received. It defaults to 15 seconds.</p>
<p>The connection process sends data to the request process when either the <code>length</code> of data or the <code>period</code> of time is reached.</p>
-<p>The <code>timeout</code> option is a safeguard in case the connection process becomes unresponsive. The function will crash if no message was received in that interval. The timeout should be larger than the period. It defaults to the period<br/> 1 second.</p>
+<p>The <code>timeout</code> option is a safeguard in case the connection process becomes unresponsive. The function will crash if no message was received in that interval. The timeout should be larger than the period. It defaults to the period + 1 second.</p>
</dd>
</dl>
<h2 id="_return_value">Return value</h2>
diff --git a/docs/en/cowboy/2.3/manual/cowboy_req.read_body/index.html b/docs/en/cowboy/2.3/manual/cowboy_req.read_body/index.html
index d74da7da..2e703b2b 100644
--- a/docs/en/cowboy/2.3/manual/cowboy_req.read_body/index.html
+++ b/docs/en/cowboy/2.3/manual/cowboy_req.read_body/index.html
@@ -94,7 +94,7 @@ http://www.gnu.org/software/src-highlite -->
<p>The <code>length</code> option can be used to request smaller or bigger chunks of data to be sent. It is a best effort approach, Cowboy may send more data than configured on occasions. It defaults to 8MB.</p>
<p>The <code>period</code> indicates how long the connection process will wait before it provides us with the data it received. It defaults to 15 seconds.</p>
<p>The connection process sends data to the request process when either the <code>length</code> of data or the <code>period</code> of time is reached.</p>
-<p>The <code>timeout</code> option is a safeguard in case the connection process becomes unresponsive. The function will crash if no message was received in that interval. The timeout should be larger than the period. It defaults to the period<br/> 1 second.</p>
+<p>The <code>timeout</code> option is a safeguard in case the connection process becomes unresponsive. The function will crash if no message was received in that interval. The timeout should be larger than the period. It defaults to the period + 1 second.</p>
</dd>
</dl>
<h2 id="_return_value">Return value</h2>
diff --git a/docs/en/cowboy/2.4/manual/cowboy_req.read_body/index.html b/docs/en/cowboy/2.4/manual/cowboy_req.read_body/index.html
index 1be995a0..ba338fb4 100644
--- a/docs/en/cowboy/2.4/manual/cowboy_req.read_body/index.html
+++ b/docs/en/cowboy/2.4/manual/cowboy_req.read_body/index.html
@@ -94,7 +94,7 @@ http://www.gnu.org/software/src-highlite -->
<p>The <code>length</code> option can be used to request smaller or bigger chunks of data to be sent. It is a best effort approach, Cowboy may send more data than configured on occasions. It defaults to 8MB.</p>
<p>The <code>period</code> indicates how long the connection process will wait before it provides us with the data it received. It defaults to 15 seconds.</p>
<p>The connection process sends data to the request process when either the <code>length</code> of data or the <code>period</code> of time is reached.</p>
-<p>The <code>timeout</code> option is a safeguard in case the connection process becomes unresponsive. The function will crash if no message was received in that interval. The timeout should be larger than the period. It defaults to the period<br/> 1 second.</p>
+<p>The <code>timeout</code> option is a safeguard in case the connection process becomes unresponsive. The function will crash if no message was received in that interval. The timeout should be larger than the period. It defaults to the period + 1 second.</p>
</dd>
</dl>
<h2 id="_return_value">Return value</h2>
diff --git a/docs/en/gun/1.0/guide/websocket.asciidoc b/docs/en/gun/1.0/guide/websocket.asciidoc
index cf32291f..418b4561 100644
--- a/docs/en/gun/1.0/guide/websocket.asciidoc
+++ b/docs/en/gun/1.0/guide/websocket.asciidoc
@@ -93,7 +93,7 @@ gun:ws_send(ConnPid, {text, "Hello!"}).
//----
Note that if you send a close frame, Gun will close the connection
-cleanly and will not attempt to reconnect afterwards.
+cleanly but will attempt to reconnect afterwards.
=== Receiving data
diff --git a/docs/en/gun/1.0/guide/websocket/index.html b/docs/en/gun/1.0/guide/websocket/index.html
index 67becc45..c3adc6e2 100644
--- a/docs/en/gun/1.0/guide/websocket/index.html
+++ b/docs/en/gun/1.0/guide/websocket/index.html
@@ -124,7 +124,7 @@ http://www.gnu.org/software/src-highlite -->
<!-- close-->
<!-- ]).-->
<!-- ------>
-<p>Note that if you send a close frame, Gun will close the connection cleanly and will not attempt to reconnect afterwards.</p>
+<p>Note that if you send a close frame, Gun will close the connection cleanly but will attempt to reconnect afterwards.</p>
<h2 id="_receiving_data">Receiving data</h2>
<p>Gun sends an Erlang message to the owner process for every Websocket message it receives.</p>
<div class="listingblock"><div class="content"><!-- Generator: GNU source-highlight 3.1.8
diff --git a/docs/en/ranch/1.3/guide/listeners/index.html b/docs/en/ranch/1.3/guide/listeners/index.html
index b1c30867..0cb47104 100644
--- a/docs/en/ranch/1.3/guide/listeners/index.html
+++ b/docs/en/ranch/1.3/guide/listeners/index.html
@@ -180,7 +180,7 @@ http://www.gnu.org/software/src-highlite -->
<font color="#FF6600">echo_protocol</font>, []
)<font color="#990000">.</font></tt></pre>
</div></div>
-<p>The maximum number of connections is a soft limit. In practice, it can reach <code>max_connections</code><br/> the number of acceptors.</p>
+<p>The maximum number of connections is a soft limit. In practice, it can reach <code>max_connections</code> + the number of acceptors.</p>
<p>When the maximum number of connections is reached, Ranch will stop accepting connections. This will not result in further connections being rejected, as the kernel option allows queueing incoming connections. The size of this queue is determined by the <code>backlog</code> option and defaults to 1024. Ranch does not know about the number of connections that are in the backlog.</p>
<p>You may not always want connections to be counted when checking for <code>max_connections</code>. For example you might have a protocol where both short-lived and long-lived connections are possible. If the long-lived connections are mostly waiting for messages, then they don&apos;t consume much resources and can safely be removed from the count.</p>
<p>To remove the connection from the count, you must call the <code>ranch:remove_connection/1</code> from within the connection process, with the name of the listener as the only argument.</p>
diff --git a/docs/en/ranch/1.4/guide/listeners/index.html b/docs/en/ranch/1.4/guide/listeners/index.html
index 633c942c..1b53166f 100644
--- a/docs/en/ranch/1.4/guide/listeners/index.html
+++ b/docs/en/ranch/1.4/guide/listeners/index.html
@@ -180,7 +180,7 @@ http://www.gnu.org/software/src-highlite -->
<font color="#FF6600">echo_protocol</font>, []
)<font color="#990000">.</font></tt></pre>
</div></div>
-<p>The maximum number of connections is a soft limit. In practice, it can reach <code>max_connections</code><br/> the number of acceptors.</p>
+<p>The maximum number of connections is a soft limit. In practice, it can reach <code>max_connections</code> + the number of acceptors.</p>
<p>When the maximum number of connections is reached, Ranch will stop accepting connections. This will not result in further connections being rejected, as the kernel option allows queueing incoming connections. The size of this queue is determined by the <code>backlog</code> option and defaults to 1024. Ranch does not know about the number of connections that are in the backlog.</p>
<p>You may not always want connections to be counted when checking for <code>max_connections</code>. For example you might have a protocol where both short-lived and long-lived connections are possible. If the long-lived connections are mostly waiting for messages, then they don&apos;t consume much resources and can safely be removed from the count.</p>
<p>To remove the connection from the count, you must call the <code>ranch:remove_connection/1</code> from within the connection process, with the name of the listener as the only argument.</p>
diff --git a/docs/en/ranch/1.5/guide/listeners/index.html b/docs/en/ranch/1.5/guide/listeners/index.html
index 3f33574b..503cc762 100644
--- a/docs/en/ranch/1.5/guide/listeners/index.html
+++ b/docs/en/ranch/1.5/guide/listeners/index.html
@@ -180,7 +180,7 @@ http://www.gnu.org/software/src-highlite -->
<font color="#FF6600">echo_protocol</font>, []
)<font color="#990000">.</font></tt></pre>
</div></div>
-<p>The maximum number of connections is a soft limit. In practice, it can reach <code>max_connections</code><br/> the number of acceptors.</p>
+<p>The maximum number of connections is a soft limit. In practice, it can reach <code>max_connections</code> + the number of acceptors.</p>
<p>When the maximum number of connections is reached, Ranch will stop accepting connections. This will not result in further connections being rejected, as the kernel option allows queueing incoming connections. The size of this queue is determined by the <code>backlog</code> option and defaults to 1024. Ranch does not know about the number of connections that are in the backlog.</p>
<p>You may not always want connections to be counted when checking for <code>max_connections</code>. For example you might have a protocol where both short-lived and long-lived connections are possible. If the long-lived connections are mostly waiting for messages, then they don&apos;t consume much resources and can safely be removed from the count.</p>
<p>To remove the connection from the count, you must call the <code>ranch:remove_connection/1</code> from within the connection process, with the name of the listener as the only argument.</p>