Fix various typos

BWITS · Jul 21, 2016 · 88d73f2 · 88d73f2
1 parent 6208131
commit 88d73f2
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/auth_server/server/server.go b/auth_server/server/server.go
@@ -190,7 +190,7 @@ func (as *AuthServer) Authenticate(ar *authRequest) (bool, error) {
 			if err == authn.NoMatch {
 				continue
 			} else if err == authn.WrongPass {
-				glog.Warningf("Failed authenticateion with %s: %s", err)
+				glog.Warningf("Failed authentication with %s: %s", err)
 				return false, nil
 			}
 			err = fmt.Errorf("authn #%d returned error: %s", i+1, err)
@@ -357,7 +357,7 @@ func (as *AuthServer) doAuth(rw http.ResponseWriter, req *http.Request) {
 			return
 		}
 	} else {
-		// Authenticaltion-only request ("docker login"), pass through.
+		// Authentication-only request ("docker login"), pass through.
 	}
 	token, err := as.CreateToken(ar, ares)
 	if err != nil {

diff --git a/examples/reference.yml b/examples/reference.yml
@@ -50,7 +50,7 @@ google_auth:
   domain: "example.com"  # Optional. If set, only logins fromt his domain are accepted.
   # client_id and client_secret for API access. Required.
   # Follow instructions here: https://developers.google.com/identity/sign-in/web/devconsole-project
-  # NB: Make sure JavaScript origins are configured correcly.
+  # NB: Make sure JavaScript origins are configured correctly.
   client_id: "1223123456-somethingsomething.apps.googleusercontent.com"
   # Either client_secret or client_secret_file is required. Use client_secret_file if you don't
   # want to have sensitive information checked in.
@@ -66,10 +66,10 @@ google_auth:
 # Instead, Auth server maintains a database of GitHub authentication tokens.
 # Go to the server's port with you browser and follow the "Login with GitHub account" link.
 # Once signed in, you will get a throw-away password which you can use for Docker login.
-google_auth:
+github_auth:
   # client_id and client_secret for API access. Required.
   # You can register a new application here: https://github.com/settings/developers
-  # NB: Make sure JavaScript origins are configured correcly.
+  # NB: Make sure JavaScript origins are configured correctly.
   client_id: "1223123456"
   # Either client_secret or client_secret_file is required. Use client_secret_file if you don't
   # want to have sensitive information checked in.