summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGonzalo Diethelm <gonzalo.diethelm@diethelm.org>2012-02-24 15:51:36 -0300
committerGonzalo Diethelm <gonzalo.diethelm@diethelm.org>2012-02-24 15:51:36 -0300
commit4db2e9389f89793c242a09d6c4be6548cb4c2b49 (patch)
tree1a9f2fe837d6546881ee15810f4a93afa1383d32
parent45d40c982396eabb4dff57b1338cb400df4b7659 (diff)
Ignore SDF files.
Corrected typo in documentation.
-rw-r--r--.gitignore1
-rw-r--r--doc/xs_socket.txt2
2 files changed, 2 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore
index 2d4f5bf..0933b44 100644
--- a/.gitignore
+++ b/.gitignore
@@ -61,6 +61,7 @@ bin/
lib/
obj/
builds/msvc/*.suo
+builds/msvc/*.sdf
builds/msvc/*/*.user
builds/msvc/*/Debug
builds/msvc/*/Release
diff --git a/doc/xs_socket.txt b/doc/xs_socket.txt
index 217850f..7c37fc0 100644
--- a/doc/xs_socket.txt
+++ b/doc/xs_socket.txt
@@ -53,7 +53,7 @@ another with a "full fence" memory barrier.
.Socket types
Crossroads defines several messaging patterns which encapsulate exact semantics
-of a particular topology. For example, publush-subscribe pattern defines data
+of a particular topology. For example, publish-subscribe pattern defines data
distribution trees while request-reply defines networks of shared stateless
services. Each pattern defines several socket types (roles in the pattern).