Browse Source

Merge pull request #114 from pborreli/typos

Fixed typos
inconshreveable 11 years ago
parent
commit
c260a1a429
6 changed files with 7 additions and 7 deletions
  1. 1 1
      README.md
  2. 2 2
      docs/CHANGELOG.md
  3. 1 1
      docs/DEVELOPMENT.md
  4. 1 1
      docs/SELFHOSTING.md
  5. 1 1
      src/ngrok/msg/pack.go
  6. 1 1
      src/ngrok/server/tunnel.go

+ 1 - 1
README.md

@@ -9,7 +9,7 @@ ngrok captures and analyzes all traffic over the tunnel for later inspection and
 ## What can I do with ngrok?
 ## What can I do with ngrok?
 - Expose any http service behind a NAT or firewall to the internet on a subdomain of ngrok.com
 - Expose any http service behind a NAT or firewall to the internet on a subdomain of ngrok.com
 - Expose any tcp service behind a NAT or firewall to the internet on a random port of ngrok.com
 - Expose any tcp service behind a NAT or firewall to the internet on a random port of ngrok.com
-- Inspect all http requests/resposes that are transmitted over the tunnel
+- Inspect all http requests/responses that are transmitted over the tunnel
 - Replay any request that was transmitted over the tunnel
 - Replay any request that was transmitted over the tunnel
 
 
 
 

+ 2 - 2
docs/CHANGELOG.md

@@ -9,7 +9,7 @@
 - IMPROVEMENT: Improvements to ngrok's logging for easier debugging
 - IMPROVEMENT: Improvements to ngrok's logging for easier debugging
 - IMPROVEMENT: Batch metric reporting to Keen to not be limited by the speed of their API at high request loads
 - IMPROVEMENT: Batch metric reporting to Keen to not be limited by the speed of their API at high request loads
 - IMPROVEMENT: Added additional safety to ensure the server doesn't crash on panics()
 - IMPROVEMENT: Added additional safety to ensure the server doesn't crash on panics()
-- BUGFIX: Fixed an issue with prefetching tunnel connections that could hang tunnel connections when behind an aggresive NAT
+- BUGFIX: Fixed an issue with prefetching tunnel connections that could hang tunnel connections when behind an aggressive NAT
 - BUGFIX: Fixed a race condition where ngrokd could send back a different message instead of AuthResp first
 - BUGFIX: Fixed a race condition where ngrokd could send back a different message instead of AuthResp first
 - BUGFIX: Fixed an issue where under some circumstances, reconnecting would fail and tell the client the tunnels were still in use
 - BUGFIX: Fixed an issue where under some circumstances, reconnecting would fail and tell the client the tunnels were still in use
 - BUGFIX: Fixed an issue where a race-condition with handling pings could cause a tunnel to hang forever and stop handling requests
 - BUGFIX: Fixed an issue where a race-condition with handling pings could cause a tunnel to hang forever and stop handling requests
@@ -74,4 +74,4 @@
 ## 0.12 - 06/30/2013
 ## 0.12 - 06/30/2013
 - IMPROVEMENT: Improved developer documentation
 - IMPROVEMENT: Improved developer documentation
 - IMPROVEMENT: Simplified build process with custom version of go-bindata that compiles assets into binary releases
 - IMPROVEMENT: Simplified build process with custom version of go-bindata that compiles assets into binary releases
-- BUGFIX: Github issue #4: Raw/Binary requests bodies are no longer truncated at 8192 bytes.
+- BUGFIX: GitHub issue #4: Raw/Binary requests bodies are no longer truncated at 8192 bytes.

+ 1 - 1
docs/DEVELOPMENT.md

@@ -74,7 +74,7 @@ At a high level, ngrok's tunneling works as follows:
 1. When the server receives a *ReqTunnel* message, it will send 1 or more *NewTunnel* messages that indicate successful tunnel creation or indicate failure.
 1. When the server receives a *ReqTunnel* message, it will send 1 or more *NewTunnel* messages that indicate successful tunnel creation or indicate failure.
 
 
 ### Tunneling connections
 ### Tunneling connections
-1. When the server receives a new public connection, it locates the approriate tunnel by examining the HTTP host header (or the port number for TCP tunnels). This connection from the public internet is called a *Public Connection*.
+1. When the server receives a new public connection, it locates the appropriate tunnel by examining the HTTP host header (or the port number for TCP tunnels). This connection from the public internet is called a *Public Connection*.
 1. The server sends a *ReqProxy* message to the client over the control connection.
 1. The server sends a *ReqProxy* message to the client over the control connection.
 1. The client initiates a new TCP connection to the server called a *Proxy Connection*.
 1. The client initiates a new TCP connection to the server called a *Proxy Connection*.
 1. The client sends a *RegProxy* message over the proxy connection so the server can associate it to a control connection (and thus the tunnels it's responsible for).
 1. The client sends a *RegProxy* message over the proxy connection so the server can associate it to a control connection (and thus the tunnels it's responsible for).

+ 1 - 1
docs/SELFHOSTING.md

@@ -45,7 +45,7 @@ options.
 	server_addr: example.com:4443
 	server_addr: example.com:4443
 	trust_host_root_certs: true
 	trust_host_root_certs: true
 
 
-Subsitute the address of your ngrokd server for "example.com:4443". The "trust_host_root_certs" parameter instructs
+Substitute the address of your ngrokd server for "example.com:4443". The "trust_host_root_certs" parameter instructs
 ngrok to trust the root certificates on your computer when establishing TLS connections to the server. By default, ngrok
 ngrok to trust the root certificates on your computer when establishing TLS connections to the server. By default, ngrok
 only trusts the root certificate for ngrok.com.
 only trusts the root certificate for ngrok.com.
 
 

+ 1 - 1
src/ngrok/msg/pack.go

@@ -17,7 +17,7 @@ func unpack(buffer []byte, msgIn Message) (msg Message, err error) {
 		t, ok := TypeMap[env.Type]
 		t, ok := TypeMap[env.Type]
 
 
 		if !ok {
 		if !ok {
-			err = errors.New(fmt.Sprintf("Unsupposted message type %s", env.Type))
+			err = errors.New(fmt.Sprintf("Unsupported message type %s", env.Type))
 			return
 			return
 		}
 		}
 
 

+ 1 - 1
src/ngrok/server/tunnel.go

@@ -161,7 +161,7 @@ func NewTunnel(m *msg.ReqTunnel, ctl *Control) (t *Tunnel, err error) {
 	case "http", "https":
 	case "http", "https":
 		l, ok := listeners[proto]
 		l, ok := listeners[proto]
 		if !ok {
 		if !ok {
-			err = fmt.Errorf("Not listeneing for %s connections", proto)
+			err = fmt.Errorf("Not listening for %s connections", proto)
 			return
 			return
 		}
 		}