aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLoïc Hoguin <[email protected]>2013-08-25 11:34:57 +0200
committerLoïc Hoguin <[email protected]>2013-08-25 11:34:57 +0200
commit2b2dfdea1f9859b575990f640e9f29864ab5161e (patch)
treee439de471a868a0a92938fb1698b59f998772fc3
parent473dbb5ce698f5128858df1c85c33a696a0a0bbc (diff)
parentadc91ef8d4a9bdadaa9bcdf2d7345aa7892eb0e2 (diff)
downloadgun-2b2dfdea1f9859b575990f640e9f29864ab5161e.tar.gz
gun-2b2dfdea1f9859b575990f640e9f29864ab5161e.tar.bz2
gun-2b2dfdea1f9859b575990f640e9f29864ab5161e.zip
Merge branch 'master' of git://github.com/jimt/gun
-rw-r--r--guide/connect.md2
-rw-r--r--guide/http.md2
2 files changed, 2 insertions, 2 deletions
diff --git a/guide/connect.md b/guide/connect.md
index 4410e60..147edf3 100644
--- a/guide/connect.md
+++ b/guide/connect.md
@@ -36,7 +36,7 @@ Monitoring the connection process
The connection is managed by a separate process. Because
software errors are a reality, it is important to monitor
-this process for failure. Thankfully, do to the asynchronous
+this process for failure. Thankfully, due to the asynchronous
nature of Gun, we only need to create a monitor once when
the connection is established.
diff --git a/guide/http.md b/guide/http.md
index 1034a5d..98a042e 100644
--- a/guide/http.md
+++ b/guide/http.md
@@ -15,7 +15,7 @@ identify incoming messages.
Streams are references in Gun, and are therefore always unique.
Streams can be canceled at any time. This will stop any further
-messages to be sent to the controlling process. Depending on
+messages being sent to the controlling process. Depending on
its capabilities, the server will also be instructed to drop
the request.