From 51f59f3c78aa6282c86424507dee9674440280e7 Mon Sep 17 00:00:00 2001 From: feihujiang Date: Thu, 17 Sep 2015 18:26:01 +0800 Subject: [PATCH] Fix the wrong path of document --- pkg/api/meta/interfaces.go | 2 +- pkg/api/types.go | 2 +- pkg/api/v1/types.go | 2 +- pkg/api/v1/types_swagger_doc_generated.go | 2 +- pkg/api/validation/validation.go | 4 ++-- pkg/client/unversioned/doc.go | 2 +- pkg/kubelet/dockertools/manager_test.go | 2 +- pkg/master/master_test.go | 2 +- pkg/registry/thirdpartyresourcedata/codec_test.go | 2 +- pkg/util/strategicpatch/patch.go | 2 +- 10 files changed, 11 insertions(+), 11 deletions(-) diff --git a/pkg/api/meta/interfaces.go b/pkg/api/meta/interfaces.go index 6fd638f2ff0..303a06305be 100644 --- a/pkg/api/meta/interfaces.go +++ b/pkg/api/meta/interfaces.go @@ -141,7 +141,7 @@ type RESTMapping struct { // RESTMapper allows clients to map resources to kind, and map kind and version // to interfaces for manipulating those objects. It is primarily intended for -// consumers of Kubernetes compatible REST APIs as defined in docs/api-conventions.md. +// consumers of Kubernetes compatible REST APIs as defined in docs/devel/api-conventions.md. // // The Kubernetes API provides versioned resources and object kinds which are scoped // to API groups. In other words, kinds and resources should not be assumed to be diff --git a/pkg/api/types.go b/pkg/api/types.go index ecc7ede2094..2cda72a3c36 100644 --- a/pkg/api/types.go +++ b/pkg/api/types.go @@ -1465,7 +1465,7 @@ type NodeAddress struct { } // NodeResources is an object for conveying resource information about a node. -// see http://docs.k8s.io/design/resources.md for more details. +// see http://releases.k8s.io/HEAD/docs/design/resources.md for more details. type NodeResources struct { // Capacity represents the available resources of a node Capacity ResourceList `json:"capacity,omitempty"` diff --git a/pkg/api/v1/types.go b/pkg/api/v1/types.go index b47f9ffaa82..0d15746a596 100644 --- a/pkg/api/v1/types.go +++ b/pkg/api/v1/types.go @@ -2650,7 +2650,7 @@ type ThirdPartyResource struct { type ThirdPartyResourceList struct { TypeMeta `json:",inline"` // Standard list metadata. - // More info: http://docs.k8s.io/api-conventions.md#metadata + // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata ListMeta `json:"metadata,omitempty"` // Items is a list of schema objects. diff --git a/pkg/api/v1/types_swagger_doc_generated.go b/pkg/api/v1/types_swagger_doc_generated.go index f9db84a8950..23fb848fda7 100644 --- a/pkg/api/v1/types_swagger_doc_generated.go +++ b/pkg/api/v1/types_swagger_doc_generated.go @@ -1378,7 +1378,7 @@ func (ThirdPartyResourceData) SwaggerDoc() map[string]string { var map_ThirdPartyResourceList = map[string]string{ "": "ThirdPartyResourceList is a list of ThirdPartyResource.", - "metadata": "Standard list metadata. More info: http://docs.k8s.io/api-conventions.md#metadata", + "metadata": "Standard list metadata. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata", "items": "Items is a list of schema objects.", } diff --git a/pkg/api/validation/validation.go b/pkg/api/validation/validation.go index df0dbb26150..c083bb3ea29 100644 --- a/pkg/api/validation/validation.go +++ b/pkg/api/validation/validation.go @@ -1412,7 +1412,7 @@ func ValidateNodeUpdate(oldNode *api.Node, node *api.Node) errs.ValidationErrorL } // Validate compute resource typename. -// Refer to docs/resources.md for more details. +// Refer to docs/design/resources.md for more details. func validateResourceName(value string, field string) errs.ValidationErrorList { allErrs := errs.ValidationErrorList{} if !validation.IsQualifiedName(value) { @@ -1433,7 +1433,7 @@ func ValidateLimitRange(limitRange *api.LimitRange) errs.ValidationErrorList { allErrs := errs.ValidationErrorList{} allErrs = append(allErrs, ValidateObjectMeta(&limitRange.ObjectMeta, true, ValidateLimitRangeName).Prefix("metadata")...) - // ensure resource names are properly qualified per docs/resources.md + // ensure resource names are properly qualified per docs/design/resources.md limitTypeSet := map[api.LimitType]bool{} for i := range limitRange.Spec.Limits { limit := limitRange.Spec.Limits[i] diff --git a/pkg/client/unversioned/doc.go b/pkg/client/unversioned/doc.go index 90b11113424..aa92c1290dd 100644 --- a/pkg/client/unversioned/doc.go +++ b/pkg/client/unversioned/doc.go @@ -52,7 +52,7 @@ More advanced consumers may wish to provide their own transport via a http.Round } client, err := client.New(config) -The RESTClient type implements the Kubernetes API conventions (see `docs/api-conventions.md`) +The RESTClient type implements the Kubernetes API conventions (see `docs/devel/api-conventions.md`) for a given API path and is intended for use by consumers implementing their own Kubernetes compatible APIs. */ diff --git a/pkg/kubelet/dockertools/manager_test.go b/pkg/kubelet/dockertools/manager_test.go index 61dc7513415..f7ea9988e85 100644 --- a/pkg/kubelet/dockertools/manager_test.go +++ b/pkg/kubelet/dockertools/manager_test.go @@ -569,7 +569,7 @@ func replaceProber(dm *DockerManager, result probe.Result, err error) { // Unknown or error. // // PLEASE READ THE PROBE DOCS BEFORE CHANGING THIS TEST IF YOU ARE UNSURE HOW PROBES ARE SUPPOSED TO WORK: -// (See https://github.com/GoogleCloudPlatform/kubernetes/blob/master/docs/pod-states.md#pod-conditions) +// (See https://github.com/GoogleCloudPlatform/kubernetes/blob/master/docs/user-guide/pod-states.md#pod-conditions) func TestProbeContainer(t *testing.T) { manager, _ := newTestDockerManager() dc := &docker.APIContainers{ diff --git a/pkg/master/master_test.go b/pkg/master/master_test.go index 1f981f9c618..555731369f7 100644 --- a/pkg/master/master_test.go +++ b/pkg/master/master_test.go @@ -434,7 +434,7 @@ type Foo struct { type FooList struct { api.TypeMeta `json:",inline"` - api.ListMeta `json:"metadata,omitempty" description:"standard list metadata; see http://docs.k8s.io/api-conventions.md#metadata"` + api.ListMeta `json:"metadata,omitempty" description:"standard list metadata; see http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata"` items []Foo `json:"items"` } diff --git a/pkg/registry/thirdpartyresourcedata/codec_test.go b/pkg/registry/thirdpartyresourcedata/codec_test.go index 61cd10d8de4..b6aca4ff136 100644 --- a/pkg/registry/thirdpartyresourcedata/codec_test.go +++ b/pkg/registry/thirdpartyresourcedata/codec_test.go @@ -37,7 +37,7 @@ type Foo struct { type FooList struct { api.TypeMeta `json:",inline"` - api.ListMeta `json:"metadata,omitempty" description:"standard list metadata; see http://docs.k8s.io/api-conventions.md#metadata"` + api.ListMeta `json:"metadata,omitempty" description:"standard list metadata; see http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata"` items []Foo `json:"items"` } diff --git a/pkg/util/strategicpatch/patch.go b/pkg/util/strategicpatch/patch.go index 34f6a70713c..6a0861091bc 100644 --- a/pkg/util/strategicpatch/patch.go +++ b/pkg/util/strategicpatch/patch.go @@ -30,7 +30,7 @@ import ( // certain fields with metadata that indicates whether the elements of JSON // lists should be merged or replaced. // -// For more information, see the PATCH section of docs/api-conventions.md. +// For more information, see the PATCH section of docs/devel/api-conventions.md. // // Some of the content of this package was borrowed with minor adaptations from // evanphx/json-patch and openshift/origin.