Merge branch 'master' into patch-1

_layouts/docwithnav.html

@@ -52,8 +52,8 @@
 	        (function(d,c,j){if(!document.getElementById(j)){var pd=d.createElement(c),s;pd.id=j;pd.src=('https:'==document.location.protocol)?'https://polldaddy.com/js/rating/rating.js':'http://i0.poll.fm/js/rating/rating.js';s=document.getElementsByTagName(c)[0];s.parentNode.insertBefore(pd,s);}}(document,'script','pd-rating-js'));
 		</script>
 		<a href="" onclick="window.open('https://github.com/kubernetes/kubernetes.github.io/issues/new?title=Issue%20with%20' +
-		window.location.pathname)" class="button issue">Create Issue</a>
-		<a href="/editdocs#{{ page.path }}" class="button issue">Edit This Page</a>
+		window.location.pathname)" class="button issue">Create an Issue</a>
+		<a href="/editdocs#{{ page.path }}" class="button issue">Edit this Page</a>
 	{% endif %}
 	</div>
 </section>

test/examples_test.go

@@ -127,11 +127,11 @@ func validateObject(obj runtime.Object) (errors field.ErrorList) {
 			t.Namespace = api.NamespaceDefault
 		}
 		errors = expvalidation.ValidateDaemonSet(t)
-	case *batch.ScheduledJob:
+	case *batch.CronJob:
 		if t.Namespace == "" {
 			t.Namespace = api.NamespaceDefault
 		}
-		errors = batch_validation.ValidateScheduledJob(t)
+		errors = batch_validation.ValidateCronJob(t)
 	default:
 		errors = field.ErrorList{}
 		errors = append(errors, field.InternalError(field.NewPath(""), fmt.Errorf("no validation defined for %#v", obj)))
@@ -242,7 +242,7 @@ func TestExampleObjectSchemas(t *testing.T) {
 			"redis-resource-deployment":  &extensions.Deployment{},
 			"redis-secret-deployment":    &extensions.Deployment{},
 			"run-my-nginx":               &extensions.Deployment{},
-			"sj":                         &batch.ScheduledJob{},
+			"sj":                         &batch.CronJob{},
 		},
 		"../docs/admin": {
 			"daemon": &extensions.DaemonSet{},
@@ -272,7 +272,7 @@ func TestExampleObjectSchemas(t *testing.T) {
 		"../docs/user-guide/node-selection": {
 			"pod": &api.Pod{},
 			"pod-with-node-affinity": &api.Pod{},
-			"pod-with-pod-affinity": &api.Pod{},
+			"pod-with-pod-affinity":  &api.Pod{},
 		},
 		"../docs/admin/resourcequota": {
 			"best-effort":       &api.ResourceQuota{},