Merge branch 'master' of github.com:inconshreveable/ngrok

CONTRIBUTORS

@@ -1,6 +1,12 @@
 Contributors to ngrok, both large and small:
-Alan Shreve      (inconshreveable)
-Kyle Conroy      (kyleconroy)
-Caleb Spare      (cespare)
-Stephen Huenneke (skastel)
-Nick Presta      (nickpresta)
+
+- Alan Shreve 
+- Brandon Philips 
+- Caleb Spare 
+- Jay Hayes 
+- Kevin Burke 
+- Kyle Conroy 
+- Nick Presta 
+- Stephen Huenneke 
+- inconshreveable 
+- jzs 

Makefile

@@ -1,4 +1,4 @@
-.PHONY: default server client deps fmt clean all release-client release-server release-all client-assets server-assets
+.PHONY: default server client deps fmt clean all release-client release-server release-all client-assets server-assets contributors
 export GOPATH:=$(shell pwd)
 
 default: all
@@ -37,3 +37,7 @@ all: fmt client server
 
 clean:
 	go clean -i -r ngrok/...
+
+contributors:
+	echo "Contributors to ngrok, both large and small:\n" > CONTRIBUTORS
+	git log --raw | grep "^Author: " | sort | uniq | cut -d ' ' -f2- | sed 's/^/- /' | cut -d '<' -f1 >> CONTRIBUTORS

docs/DEVELOPMENT.md

@@ -50,7 +50,7 @@ Create an ngrok configuration file, "debug.yml" with the following contents:
     tunnels:
       test:
         proto:
-	  http: 8080
+          http: 8080
 
 
 Then run ngrok with either of these commands:

src/ngrok/client/cli.go

@@ -109,7 +109,9 @@ func parseArgs() (opts *Options, err error) {
 		flag.Usage()
 		os.Exit(0)
 	case "":
-		err = fmt.Errorf("You must specify a local port to tunnel or an ngrok command.")
+		err = fmt.Errorf("Error: Specify a local port to tunnel to, or " +
+			"an ngrok command.\n\nExample: To expose port 80, run " +
+			"'ngrok 80'")
 		return
 
 	default:

src/ngrok/client/config.go

@@ -194,7 +194,7 @@ func LoadConfiguration(opts *Options) (config *Configuration, err error) {
 func defaultPath() string {
 	user, err := user.Current()
 
-	// user.Current() does not work on linux when cross compilling because
+	// user.Current() does not work on linux when cross compiling because
 	// it requires CGO; use os.Getenv("HOME") hack until we compile natively
 	homeDir := os.Getenv("HOME")
 	if err != nil {

src/ngrok/client/controller.go

@@ -40,7 +40,7 @@ type Controller struct {
 	// the views
 	views []mvc.View
 
-	// interal structure to issue commands to the controller
+	// internal structure to issue commands to the controller
 	cmds chan command
 
 	// internal structure to synchronize access to State object

src/ngrok/client/model.go

@@ -178,7 +178,7 @@ func (c *ClientModel) Run() {
 		// run the control channel
 		c.control()
 
-		// control oonly returns when a failure has occurred, so we're going to try to reconnect
+		// control only returns when a failure has occurred, so we're going to try to reconnect
 		if c.connStatus == mvc.ConnOnline {
 			wait = 1 * time.Second
 		}

src/ngrok/client/views/web/http.go

@@ -1,4 +1,4 @@
-// interative web user interface
+// interactive web user interface
 package web
 
 import (
@@ -144,7 +144,7 @@ func makeBody(h http.Header, body []byte) SerializedBody {
 
 func (whv *WebHttpView) updateHttp() {
 	// open channels for incoming http state changes
-	// and broadbasts
+	// and broadcasts
 	txnUpdates := whv.httpProto.Txns.Reg()
 	for txn := range txnUpdates {
 		// XXX: it's not safe for proto.Http and this code

src/ngrok/client/views/web/view.go

@@ -1,4 +1,4 @@
-// interative web user interface
+// interactive web user interface
 package web
 
 import (
@@ -17,7 +17,7 @@ type WebView struct {
 
 	ctl mvc.Controller
 
-	// messages sent over this broadcast are sent too all websocket connections
+	// messages sent over this broadcast are sent to all websocket connections
 	wsMessages *util.Broadcast
 }