squash the commits into one

Kubernetes-commit: fa6b60120b5d54b5f9c13b76973283e68d053f8a

pkg/endpoints/handlers/watch.go

@@ -50,7 +50,7 @@ type realTimeoutFactory struct {
 	timeout time.Duration
 }
 
-// TimeoutChan returns a channel which will receive something when the watch times out,
+// TimeoutCh returns a channel which will receive something when the watch times out,
 // and a cleanup function to call when this happens.
 func (w *realTimeoutFactory) TimeoutCh() (<-chan time.Time, func() bool) {
 	if w.timeout == 0 {

pkg/endpoints/installer.go

@@ -84,7 +84,7 @@ var toDiscoveryKubeVerb = map[string]string{
 	"WATCHLIST":        "watch",
 }
 
-// Installs handlers for API resources.
+// Install handlers for API resources.
 func (a *APIInstaller) Install(ws *restful.WebService) (apiResources []metav1.APIResource, errors []error) {
 	errors = make([]error, 0)
 
@@ -841,7 +841,7 @@ func (a *APIInstaller) registerResourceHandlers(path string, storage rest.Storag
 	return &apiResource, nil
 }
 
-// This magic incantation returns *ptrToObject for an arbitrary pointer
+// indirectArbitraryPointer returns *ptrToObject for an arbitrary pointer
 func indirectArbitraryPointer(ptrToObject interface{}) interface{} {
 	return reflect.Indirect(reflect.ValueOf(ptrToObject)).Interface()
 }