@@ -15,7 +15,7 @@ func RegisterMimeTypes() {

 	registerIfNeeded(".png", "image/png")

 	registerIfNeeded(".svg", "image/svg+xml")

-	// Javascript types

+	// JavaScript types

 	registerIfNeeded(".js", "application/javascript; charset=utf-8")

 	registerIfNeeded(".json", "application/json; charset=utf-8")

@@ -10,14 +10,14 @@ import (

 	oauthapi "github.com/openshift/origin/pkg/oauth/api"

 )

-// unionAuthenticationHandler is an oauth.AuthenticationHandler that muxes multiple challange handlers and redirect handlers

+// unionAuthenticationHandler is an oauth.AuthenticationHandler that muxes multiple challenge handlers and redirect handlers

 type unionAuthenticationHandler struct {

 	challengers  map[string]AuthenticationChallenger

 	redirectors  map[string]AuthenticationRedirector

 	errorHandler AuthenticationErrorHandler

 }

-// NewUnionAuthenticationHandler returns an oauth.AuthenticationHandler that muxes multiple challange handlers and redirect handlers

+// NewUnionAuthenticationHandler returns an oauth.AuthenticationHandler that muxes multiple challenge handlers and redirect handlers

 func NewUnionAuthenticationHandler(passedChallengers map[string]AuthenticationChallenger, passedRedirectors map[string]AuthenticationRedirector, errorHandler AuthenticationErrorHandler) AuthenticationHandler {

 	challengers := passedChallengers

 	if challengers == nil {

@@ -10,7 +10,7 @@ import (

 // Registry is an interface for things that know how to store Policies.

 type Registry interface {

-	// ListPolicies obtains list of policys that match a selector.

+	// ListPolicies obtains list of policies that match a selector.

 	ListPolicies(ctx kapi.Context, labels, fields klabels.Selector) (*authorizationapi.PolicyList, error)

 	// GetPolicy retrieves a specific policy.

 	GetPolicy(ctx kapi.Context, id string) (*authorizationapi.Policy, error)

@@ -128,7 +128,7 @@ func doesRoleExist(name string, policy *authorizationapi.Policy) bool {

 	return exists

 }

-// EnsurePOlicy returns the policy object for the specified namespace.  If one does not exist, it is created for you.  Permission to

+// EnsurePolicy returns the policy object for the specified namespace.  If one does not exist, it is created for you.  Permission to

 // create, update, or delete roles in a namespace implies the ability to create a Policy object itself.

 func (r *REST) EnsurePolicy(ctx kapi.Context) (*authorizationapi.Policy, error) {

 	policy, err := r.registry.GetPolicy(ctx, authorizationapi.PolicyName)

@@ -18,7 +18,7 @@ type PolicyRegistry struct {

 	DeletedPolicyName string

 }

-// ListPolicies obtains list of policys that match a selector.

+// ListPolicies obtains list of policies that match a selector.

 func (r *PolicyRegistry) ListPolicies(ctx kapi.Context, labels, fields klabels.Selector) (*authorizationapi.PolicyList, error) {

 	if r.Err != nil {

 		return nil, r.Err

@@ -99,7 +99,7 @@ type GitSourceRevision struct {

 	// Author is the author of a specific commit

 	Author SourceControlUser `json:"author,omitempty"`

-	// Committer is the commiter of a specific commit

+	// Committer is the committer of a specific commit

 	Committer SourceControlUser `json:"committer,omitempty"`

 	// Message is the description of a specific commit

@@ -277,7 +277,7 @@ type BuildTriggerPolicy struct {

 	// Type is the type of build trigger

 	Type BuildTriggerType `json:"type,omitempty"`

-	// GithubWebHook contains the parameters for a Github webhook type of trigger

+	// GithubWebHook contains the parameters for a GitHub webhook type of trigger

 	GithubWebHook *WebHookTrigger `json:"github,omitempty"`

 	// GenericWebHook contains the parameters for a Generic webhook type of trigger

@@ -292,7 +292,7 @@ type BuildTriggerType string

 const (

 	// GithubWebHookBuildTriggerType represents a trigger that launches builds on

-	// Github webhook invocations

+	// GitHub webhook invocations

 	GithubWebHookBuildTriggerType BuildTriggerType = "github"

 	// GenericWebHookBuildTriggerType represents a trigger that launches builds on

@@ -99,7 +99,7 @@ type GitSourceRevision struct {

 	// Author is the author of a specific commit

 	Author SourceControlUser `json:"author,omitempty"`

-	// Committer is the commiter of a specific commit

+	// Committer is the committer of a specific commit

 	Committer SourceControlUser `json:"committer,omitempty"`

 	// Message is the description of a specific commit

@@ -285,7 +285,7 @@ type BuildTriggerPolicy struct {

 	// Type is the type of build trigger

 	Type BuildTriggerType `json:"type,omitempty"`

-	// GithubWebHook contains the parameters for a Github webhook type of trigger

+	// GithubWebHook contains the parameters for a GitHub webhook type of trigger

 	GithubWebHook *WebHookTrigger `json:"github,omitempty"`

 	// GenericWebHook contains the parameters for a Generic webhook type of trigger

@@ -300,7 +300,7 @@ type BuildTriggerType string

 const (

 	// GithubWebHookBuildTriggerType represents a trigger that launches builds on

-	// Github webhook invocations

+	// GitHub webhook invocations

 	GithubWebHookBuildTriggerType BuildTriggerType = "github"

 	// GenericWebHookBuildTriggerType represents a trigger that launches builds on

@@ -1,3 +1,3 @@

-// Package builder contains builders for STI and Docker in Openshift Origin

+// Package builder contains builders for STI and Docker in OpenShift Origin

 package builder

@@ -18,7 +18,7 @@ import (

 )

 // urlCheckTimeout is the timeout used to check the source URL

-// If fetching the URL exceeeds the timeout, then the build will

+// If fetching the URL exceeds the timeout, then the build will

 // not proceed further and stop

 const urlCheckTimeout = 16 * time.Second

@@ -263,7 +263,7 @@ func TestNoImageIDChange(t *testing.T) {

 }

 func TestBuildCreateError(t *testing.T) {

-	// valid configuration, but build creation failes, in that situation the buildconfig should not be updated

+	// valid configuration, but build creation fails, in that situation the buildconfig should not be updated

 	buildcfg := mockBuildConfig("registry.com/namespace/imagename", "registry.com/namespace/imagename", "testImageRepo", "testTag")

 	controller := mockImageChangeController(buildcfg, "testImageRepo", "registry.com/namespace/imagename", map[string]string{"testTag": "newImageID123"})

 	buildCreator := controller.BuildCreator.(*mockBuildCreator)

@@ -76,7 +76,7 @@ func (c *builds) Delete(name string) (err error) {

 	return

 }

-// Watch returns a watch.Interfac that watches the requested builds

+// Watch returns a watch.Interface that watches the requested builds

 func (c *builds) Watch(label, field labels.Selector, resourceVersion string) (watch.Interface, error) {

 	return c.r.Get().

 		Prefix("watch").

@@ -4,7 +4,7 @@ import (

 	userapi "github.com/openshift/origin/pkg/user/api"

 )

-// FakeUserss implements BuildInterface. Meant to be embedded into a struct to get a default

+// FakeUsers implements BuildInterface. Meant to be embedded into a struct to get a default

 // implementation. This makes faking out just the methods you want to test easier.

 type FakeUsers struct {

 	Fake *Fake

@@ -41,7 +41,7 @@ func newImageRepositories(c *Client, namespace string) *imageRepositories {

 	}

 }

-// List returns a list of imagerepositories that match the label and fiels selectors.

+// List returns a list of imagerepositories that match the label and field selectors.

 func (c *imageRepositories) List(label, field labels.Selector) (result *imageapi.ImageRepositoryList, err error) {

 	result = &imageapi.ImageRepositoryList{}

 	err = c.r.Get().

@@ -206,11 +206,11 @@ type AuthConfig struct {

 	// GoogleClientID is the client_secret of a client registered with the Google OAuth provider.

 	GoogleClientSecret string

-	// GithubClientID is the client_id of a client registered with the Github OAuth provider.

+	// GithubClientID is the client_id of a client registered with the GitHub OAuth provider.

 	// It must be authorized to redirect to {MasterPublicAddr}/oauth2callback/github

 	// Used by AuthHandlerGithub

 	GithubClientID string

-	// GithubClientID is the client_secret of a client registered with the Github OAuth provider.

+	// GithubClientID is the client_secret of a client registered with the GitHub OAuth provider.

 	GithubClientSecret string

 }

@@ -414,7 +414,7 @@ func (c *AuthConfig) getAuthenticationFinalizer() osinserver.AuthorizeHandler {

 func (c *AuthConfig) getAuthenticationHandler(mux cmdutil.Mux, errorHandler handlers.AuthenticationErrorHandler) handlers.AuthenticationHandler {

 	successHandler := c.getAuthenticationSuccessHandler()

-	// TODO presumeably we'll want either a list of what we've got or a way to describe a registry of these

+	// TODO presumably we'll want either a list of what we've got or a way to describe a registry of these

 	// hard-coded strings as a stand-in until it gets sorted out

 	var authHandler handlers.AuthenticationHandler

 	authHandlerType := c.AuthHandler

@@ -458,7 +458,7 @@ func (c *AuthConfig) getAuthenticationHandler(mux cmdutil.Mux, errorHandler hand

 }

 func (c *AuthConfig) getPasswordAuthenticator() authenticator.Password {

-	// TODO presumeably we'll want either a list of what we've got or a way to describe a registry of these

+	// TODO presumably we'll want either a list of what we've got or a way to describe a registry of these

 	// hard-coded strings as a stand-in until it gets sorted out

 	passwordAuthType := c.PasswordAuth

 	userRegistry := useretcd.New(c.EtcdHelper, user.NewDefaultUserInitStrategy())

@@ -504,7 +504,7 @@ func (c *AuthConfig) getAuthenticationSuccessHandler() handlers.AuthenticationSu

 }

 func (c *AuthConfig) getAuthenticationRequestHandlerFromType(authRequestHandlerType AuthRequestHandlerType) authenticator.Request {

-	// TODO presumeably we'll want either a list of what we've got or a way to describe a registry of these

+	// TODO presumably we'll want either a list of what we've got or a way to describe a registry of these

 	// hard-coded strings as a stand-in until it gets sorted out

 	var authRequestHandler authenticator.Request

 	switch authRequestHandlerType {

@@ -545,7 +545,7 @@ func (c *AuthConfig) getAuthenticationRequestHandlerFromType(authRequestHandlerT

 }

 func (c *AuthConfig) getAuthenticationRequestHandler() authenticator.Request {

-	// TODO presumeably we'll want either a list of what we've got or a way to describe a registry of these

+	// TODO presumably we'll want either a list of what we've got or a way to describe a registry of these

 	// hard-coded strings as a stand-in until it gets sorted out

 	var authRequestHandlers []authenticator.Request

 	for _, requestHandler := range c.AuthRequestHandlers {

@@ -368,7 +368,7 @@ func (c *MasterConfig) InstallUnprotectedAPI(container *restful.Container) []str

 	return []string{}

 }

-//initAPIVersionRoute initializes the osapi endpoint to behave similiar to the upstream api endpoint

+//initAPIVersionRoute initializes the osapi endpoint to behave similar to the upstream api endpoint

 func initAPIVersionRoute(root *restful.WebService, version string) {

 	versionHandler := apiserver.APIVersionHandler(version)

 	root.Route(root.GET(OpenShiftAPIPrefix).To(versionHandler).

@@ -442,12 +442,12 @@ func start(cfg *config, args []string) error {

 			// Bootstrap clients

 			osClientConfigTemplate := kclient.Config{Host: cfg.MasterAddr.URL.String(), Version: latest.Version}

-			// Openshift client

+			// OpenShift client

 			openshiftClientUser := &user.DefaultInfo{Name: "system:openshift-client"}

 			if osmaster.OSClientConfig, err = ca.MakeClientConfig("openshift-client", openshiftClientUser, osClientConfigTemplate); err != nil {

 				return err

 			}

-			// Openshift deployer client

+			// OpenShift deployer client

 			openshiftDeployerUser := &user.DefaultInfo{Name: "system:openshift-deployer", Groups: []string{"system:deployers"}}

 			if osmaster.DeployerOSClientConfig, err = ca.MakeClientConfig("openshift-deployer", openshiftDeployerUser, osClientConfigTemplate); err != nil {

 				return err

@@ -543,7 +543,7 @@ func start(cfg *config, args []string) error {

 			// Google config

 			GoogleClientID:     env("OPENSHIFT_OAUTH_GOOGLE_CLIENT_ID", ""),

 			GoogleClientSecret: env("OPENSHIFT_OAUTH_GOOGLE_CLIENT_SECRET", ""),

-			// Github config

+			// GitHub config

 			GithubClientID:     env("OPENSHIFT_OAUTH_GITHUB_CLIENT_ID", ""),

 			GithubClientSecret: env("OPENSHIFT_OAUTH_GITHUB_CLIENT_SECRET", ""),

 		}

@@ -28,7 +28,7 @@ type Deployment struct {

 	Details *DeploymentDetails `json:"details,omitempty"`

 }

-// DeploymentStatus decribes the possible states a deployment can be in.

+// DeploymentStatus describes the possible states a deployment can be in.

 type DeploymentStatus string

 const (

@@ -29,7 +29,7 @@ type Deployment struct {

 	Details *DeploymentDetails `json:"details,omitempty"`

 }

-// DeploymentStatus decribes the possible states a deployment can be in.

+// DeploymentStatus describes the possible states a deployment can be in.

 type DeploymentStatus string

 const (

@@ -212,7 +212,7 @@ func TestImageChangeMatchScenarios(t *testing.T) {

 		t.Logf("running scenario: %v", s)

 		controller.HandleImageRepo()

-		// assert updates/generations occured

+		// assert updates/generations occurred

 		if s.matches && !updated {

 			t.Fatalf("expected update for scenario: %v", s)

 		}

@@ -137,7 +137,7 @@ type WeightedResolver struct {

 // PerfectMatchWeightedResolver returns only matches from resolvers that are identified as exact

 // (weight 0.0), and only matches from those resolvers that qualify as exact (score = 0.0). If no

 // perfect matches exist, an ErrMultipleMatches is returned indicating the remaining candidate(s).

-// Note that this metchod may resolve ErrMultipleMatches with a single match, indicating an error

+// Note that this method may resolve ErrMultipleMatches with a single match, indicating an error

 // (no perfect match) but with only one candidate.

 type PerfectMatchWeightedResolver []WeightedResolver

@@ -9,7 +9,7 @@ import (

 func init() {

 	err := kapi.Scheme.AddConversionFuncs(

-		// The docker metadat must be cast to a version

+		// The docker metadata must be cast to a version

 		func(in *newer.Image, out *Image, s conversion.Scope) error {

 			if err := s.Convert(&in.ObjectMeta, &out.ObjectMeta, 0); err != nil {

 				return err

@@ -38,7 +38,7 @@ type Parameter struct {

 	From string `json:"from,omitempty"`

 	// Optional: Value holds the Parameter data. The Value data can be

-	// overwritten by the generator. The value replaces all occurances

+	// overwritten by the generator. The value replaces all occurrences

 	// of the Parameter ${Name} expression during the Template to Config

 	// transformation.

 	Value string `json:"value,omitempty"`

@@ -39,7 +39,7 @@ type Parameter struct {

 	From string `json:"from,omitempty"`

 	// Optional: Value holds the Parameter data. The Value data can be

-	// overwritten by the generator. The value replaces all occurances

+	// overwritten by the generator. The value replaces all occurrences

 	// of the Parameter ${Name} expression during the Template to Config

 	// transformation.

 	Value string `json:"value,omitempty"`

@@ -82,7 +82,7 @@ func alphabetSlice(from, to byte) (string, error) {

 	return ASCII[leftPos:rightPos], nil

 }

-// replaceWithGenerated replaces all occurences of the given expression

+// replaceWithGenerated replaces all occurrences of the given expression

 // in the string with random characters of the specified range and length.

 func replaceWithGenerated(s *string, expression string, ranges [][]byte, length int, seed *rand.Rand) error {

 	var alphabet string

@@ -36,7 +36,7 @@ func NewProcessor(generators map[string]Generator) *Processor {

 // Process transforms Template object into List object. It generates

 // Parameter values using the defined set of generators first, and then it

-// substitutes all Parameter expression occurances with their corresponding

+// substitutes all Parameter expression occurrences with their corresponding

 // values (currently in the containers' Environment variables only).

 func (p *Processor) Process(template *api.Template) (*configapi.Config, errs.ValidationErrorList) {

 	templateErrors := errs.ValidationErrorList{}

@@ -85,7 +85,7 @@ func GetParameterByName(t *api.Template, name string) *api.Parameter {

 // SubstituteParameters loops over all Environment variables defined for

 // all ReplicationController and Pod containers and substitutes all

-// Parameter expression occurances with their corresponding values.

+// Parameter expression occurrences with their corresponding values.

 //

 // Example of Parameter expression:

 //   - ${PARAMETER_NAME}

@@ -119,7 +119,7 @@ func (p *Processor) SubstituteParameters(params []api.Parameter, item runtime.Ob

 // substituteParametersInManifest is a helper function that iterates

 // over the given manifest and substitutes all Parameter expression

-// occurances with their corresponding values.

+// occurrences with their corresponding values.

 func (p *Processor) substituteParametersInManifest(containers []kapi.Container, paramMap map[string]string) {

 	for i := range containers {

 		for e := range containers[i].Env {

@@ -110,7 +110,7 @@ func TestEtcdUpdateUserIdentityMappingWithConflictingUser(t *testing.T) {

 			ObjectMeta: kapi.ObjectMeta{Name: "yankee:xray"},

 		},

 	}

-	// this key is intentionally wrong so that we can have an internally consistend UserIdentityMapping

+	// this key is intentionally wrong so that we can have an internally consistent UserIdentityMapping

 	// that was placed in a bad key location

 	key := makeTestUserIdentityMapping("zulu", "alfa")

 	fakeClient.Set(key, runtime.EncodeOrDie(latest.Codec, startingMapping), 0)

@@ -2,7 +2,7 @@ package util

 import "sort"

-// UniqueStrings returns a sorted, uniqified slice of the specified strings

+// UniqueStrings returns a sorted, uniquified slice of the specified strings

 func UniqueStrings(strings []string) []string {

 	m := make(map[string]bool, len(strings))

 	for _, s := range strings {

@@ -20,7 +20,7 @@ type TemplatePlugin struct {

 // router controls the interaction of the plugin with the underlying router implementation

 type router interface {

-	// Mutative operations in this interfance do not return errors.

+	// Mutative operations in this interface do not return errors.

 	// The only error state for these methods is when an unknown

 	// frontend key is used; all call sites make certain the frontend

 	// is created.

@@ -43,7 +43,7 @@ func (r *TestRouter) FindServiceUnit(id string) (v ServiceUnit, ok bool) {

 	return

 }

-// AddEndpoints adds the endpoints to the serivce unit identified by id

+// AddEndpoints adds the endpoints to the service unit identified by id

 func (r *TestRouter) AddEndpoints(id string, endpoints []Endpoint) {

 	r.Committed = false //expect any call to this method to subsequently call commit

 	su, _ := r.FindServiceUnit(id)

@@ -82,7 +82,7 @@ func (r *TestRouter) AddRoute(id string, route *routeapi.Route) {

 	r.State[id] = su

 }

-// RemoveRoute removes the serivce alias config for Route from the ServiceUnit

+// RemoveRoute removes the service alias config for Route from the ServiceUnit

 func (r *TestRouter) RemoveRoute(id string, route *routeapi.Route) {

 	r.Committed = false //expect any call to this method to subsequently call commit

 	if _, ok := r.State[id]; !ok {

@@ -27,7 +27,7 @@ func init() {

 // TestRouter is the table based test for routers.  It will initialize a fake master/client and expect to deploy

 // a router image in docker.  It then sends watch events through the simulator and makes http client requests that

-// should go through the deployed router and return data from teh client simulator.

+// should go through the deployed router and return data from the client simulator.

 func TestRouter(t *testing.T) {

 	//create a server which will act as a user deployed application that

 	//serves http and https as well as act as a master to simulate watches