Permalink
Browse files

Merge branch 'master' into dev

  • Loading branch information...
majek committed Feb 13, 2012
2 parents 915f2d4 + b87dab0 commit 0880e2955bc657563b4b87773f5a3171e61689b9
Showing with 1 addition and 1 deletion.
  1. +1 −1 README.md
View
@@ -188,7 +188,7 @@ iframe-htmlfile | [HtmlFile][^8] used from an [iframe via postMessage][^3].
xhr-polling | Long-polling using [cross domain XHR][^5].
xdr-polling | Long-polling using [XDomainRequest][^9].
iframe-xhr-polling | Long-polling using normal AJAX from an [iframe via postMessage][^3].
-jsnop-polling | Slow and old fashioned [JSONP polling][^6]. This transport will show "busy indicator" (aka: "spinning wheel") when sending data.
+jsonp-polling | Slow and old fashioned [JSONP polling][^6]. This transport will show "busy indicator" (aka: "spinning wheel") when sending data.
[^1]: http://tools.ietf.org/html/draft-hixie-thewebsocketprotocol-76

0 comments on commit 0880e29

Please sign in to comment.