Copyright © {{ 'now' | date: "%Y" }} The Linux Foundation®. All rights reserved. The Linux Foundation has registered trademarks and uses trademarks. For a list of trademarks of The Linux Foundation, please see our Trademark Usage page:
https://www.linuxfoundation.org/trademark-usage
diff --git a/_includes/templates/glossary/README.md b/_includes/templates/glossary/README.md
index 453c23fdc70a1..18973e992640a 100644
--- a/_includes/templates/glossary/README.md
+++ b/_includes/templates/glossary/README.md
@@ -7,7 +7,7 @@ To write a glossary snippet, start with a copy of the template, [`/_data/glossar
* (Required) `name`
* The name of the term.
* (Required) `tags`
- * Must be one of the tags listed in kubernetes.github.io/_data/canonical-terms-tags.yml.
+ * Must be one of the tags listed in the [tags directory in the website repository](https://github.com/kubernetes/website/tree/master/_data/canonical-tags).
* (Required) `short description`
* Make sure to replace the instructional text in the template with your content.
* (Optional) `aka`
diff --git a/_layouts/docwithnav.html b/_layouts/docwithnav.html
index f10f958bece6b..351dc9de89010 100755
--- a/_layouts/docwithnav.html
+++ b/_layouts/docwithnav.html
@@ -61,11 +61,11 @@
{{ page.title }}
"id" : "8345992",
"unique_id" : "{{ page.url }}",
"title" : "{{ page.title }}",
- "permalink" : "http://kubernetes.github.io{{ page.url }}"
+ "permalink" : "https://kubernetes.io{{ page.url }}"
};
(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'));
-
Create an Issue
{% unless page.noedit %}
Edit this Page
diff --git a/cn/_includes/code.html b/cn/_includes/code.html
index d59db08ff7760..83a702785d636 100644
--- a/cn/_includes/code.html
+++ b/cn/_includes/code.html
@@ -1,6 +1,6 @@
{% capture samplecode %}{% include_relative {{include.file}} %}{% endcapture %}
{% if include.k8slink %}{% capture ghlink %}https://raw.githubusercontent.com/kubernetes/kubernetes/blob/{{page.githubbranch}}{{include.k8slink}}{% endcapture %}{% endif %}
-{% if include.ghlink %}{% capture ghlink %}https://raw.githubusercontent.com/kubernetes/kubernetes.github.io/{{page.docsbranch}}{{include.ghlink}}{% endcapture %}{% endif %}
+{% if include.ghlink %}{% capture ghlink %}https://raw.githubusercontent.com/kubernetes/website/{{page.docsbranch}}{{include.ghlink}}{% endcapture %}{% endif %}
{% capture mysample %}
```{{include.language}}
{{ samplecode | raw | strip }}
diff --git a/cn/docs/tasks/run-application/run-stateless-application-deployment.md b/cn/docs/tasks/run-application/run-stateless-application-deployment.md
index ef228f9d66889..610f91334a216 100644
--- a/cn/docs/tasks/run-application/run-stateless-application-deployment.md
+++ b/cn/docs/tasks/run-application/run-stateless-application-deployment.md
@@ -42,7 +42,7 @@ title: 使用Deployment运行一个无状态应用
kubectl describe deployment nginx-deployment
- user@computer:~/kubernetes.github.io$ kubectl describe deployment nginx-deployment
+ user@computer:~/website$ kubectl describe deployment nginx-deployment
Name: nginx-deployment
Namespace: default
CreationTimestamp: Tue, 30 Aug 2016 18:11:37 -0700
diff --git a/docs/concepts/cluster-administration/networking.md b/docs/concepts/cluster-administration/networking.md
index 3ddbf248cb2db..7692cb93e47fa 100644
--- a/docs/concepts/cluster-administration/networking.md
+++ b/docs/concepts/cluster-administration/networking.md
@@ -232,7 +232,7 @@ to run, and in both cases, the network provides one IP address per pod - as is s
### CNI-Genie from Huawei
-[CNI-Genie](https://github.com/Huawei-PaaS/CNI-Genie) is a CNI plugin that enables Kubernetes to [simultanously have access to different implementations](https://github.com/Huawei-PaaS/CNI-Genie/blob/master/docs/multiple-cni-plugins/README.md#what-cni-genie-feature-1-multiple-cni-plugins-enables) of the [Kubernetes network model](https://git.k8s.io/kubernetes.github.io/docs/concepts/cluster-administration/networking.md#kubernetes-model) in runtime. This includes any implementation that runs as a [CNI plugin](https://github.com/containernetworking/cni#3rd-party-plugins), such as [Flannel](https://github.com/coreos/flannel#flannel), [Calico](http://docs.projectcalico.org/), [Romana](http://romana.io), [Weave-net](https://www.weave.works/products/weave-net/).
+[CNI-Genie](https://github.com/Huawei-PaaS/CNI-Genie) is a CNI plugin that enables Kubernetes to [simultanously have access to different implementations](https://github.com/Huawei-PaaS/CNI-Genie/blob/master/docs/multiple-cni-plugins/README.md#what-cni-genie-feature-1-multiple-cni-plugins-enables) of the [Kubernetes network model](https://git.k8s.io/website/docs/concepts/cluster-administration/networking.md#kubernetes-model) in runtime. This includes any implementation that runs as a [CNI plugin](https://github.com/containernetworking/cni#3rd-party-plugins), such as [Flannel](https://github.com/coreos/flannel#flannel), [Calico](http://docs.projectcalico.org/), [Romana](http://romana.io), [Weave-net](https://www.weave.works/products/weave-net/).
CNI-Genie also supports [assigning multiple IP addresses to a pod](https://github.com/Huawei-PaaS/CNI-Genie/blob/master/docs/multiple-ips/README.md#feature-2-extension-cni-genie-multiple-ip-addresses-per-pod), each from a different CNI plugin.
diff --git a/docs/home/contribute/create-pull-request.md b/docs/home/contribute/create-pull-request.md
index 12638ac23b60e..2d888eaa1f889 100644
--- a/docs/home/contribute/create-pull-request.md
+++ b/docs/home/contribute/create-pull-request.md
@@ -17,7 +17,7 @@ repository. This page shows how to create a pull request.
1. Sign the
[Linux Foundation Contributor License Agreement](https://identity.linuxfoundation.org/projects/cncf){: target="_blank"}.
-Documentation will be published under the [CC BY SA 4.0](https://git.k8s.io/kubernetes.github.io/LICENSE) license.
+Documentation will be published under the [CC BY SA 4.0](https://git.k8s.io/website/LICENSE) license.
{% endcapture %}
diff --git a/docs/home/contribute/page-templates.md b/docs/home/contribute/page-templates.md
index 3d87d25708e13..5ca04c2c88dc0 100644
--- a/docs/home/contribute/page-templates.md
+++ b/docs/home/contribute/page-templates.md
@@ -13,7 +13,7 @@ title: Using Page Templates
Concept
-
The page templates are in the _includes/templates directory of the kubernetes.github.io repository.
+
The page templates are in the _includes/templates directory of the website repository.
Task template
diff --git a/docs/home/contribute/stage-documentation-changes.md b/docs/home/contribute/stage-documentation-changes.md
index 90914c31a6cfc..e43850779d0c4 100644
--- a/docs/home/contribute/stage-documentation-changes.md
+++ b/docs/home/contribute/stage-documentation-changes.md
@@ -33,7 +33,7 @@ can see your changes.
You can use the k8sdocs Docker image to run a local staging server. If you're
interested, you can view the
-[Dockerfile](https://git.k8s.io/kubernetes.github.io/staging-container/Dockerfile){: target="_blank"}
+[Dockerfile](https://git.k8s.io/website/staging-container/Dockerfile){: target="_blank"}
for this image.
1. Install Docker if you don't already have it.
diff --git a/docs/tabs-example.md b/docs/tabs-example.md
index 3f446f9c8d82b..425b487044f22 100644
--- a/docs/tabs-example.md
+++ b/docs/tabs-example.md
@@ -43,7 +43,7 @@ kubectl apply -f "https://git.io/weave-kube"
## Example Liquid template code for tabs
-Below is the [Liquid](https://shopify.github.io/liquid/) template code for the tabs demo above to illustrate how to specify the contents of each tab. The [`/_includes/tabs.md`](https://git.k8s.io/kubernetes.github.io/_includes/tabs.md) file included at the end then uses those elements to render the actual tab set.
+Below is the [Liquid](https://shopify.github.io/liquid/) template code for the tabs demo above to illustrate how to specify the contents of each tab. The [`/_includes/tabs.md`](https://git.k8s.io/website/_includes/tabs.md) file included at the end then uses those elements to render the actual tab set.
### The code
diff --git a/docs/tasks/run-application/run-stateless-application-deployment.md b/docs/tasks/run-application/run-stateless-application-deployment.md
index e5e22f3d85bb8..aafb6572b5c28 100644
--- a/docs/tasks/run-application/run-stateless-application-deployment.md
+++ b/docs/tasks/run-application/run-stateless-application-deployment.md
@@ -46,7 +46,7 @@ a Deployment that runs the nginx:1.7.9 Docker image:
The output is similar to this:
- user@computer:~/kubernetes.github.io$ kubectl describe deployment nginx-deployment
+ user@computer:~/website$ kubectl describe deployment nginx-deployment
Name: nginx-deployment
Namespace: default
CreationTimestamp: Tue, 30 Aug 2016 18:11:37 -0700
diff --git a/docs/user-guide/update-demo/index.md.orig b/docs/user-guide/update-demo/index.md.orig
index 77af52f62c7b8..812862f938b9d 100644
--- a/docs/user-guide/update-demo/index.md.orig
+++ b/docs/user-guide/update-demo/index.md.orig
@@ -7,15 +7,15 @@ title: Rolling Update Demo
This example demonstrates the usage of Kubernetes to perform a [rolling update](/docs/user-guide/kubectl/kubectl_rolling-update/) on a running group of [pods](/docs/user-guide/pods/). See [here](/docs/concepts/cluster-administration/manage-deployment/#updating-your-application-without-a-service-outage) to understand why you need a rolling update. Also check [rolling update design document](https://git.k8s.io/community/contributors/design-proposals/cli/simple-rolling-update.md) for more information.
The files for this example are viewable in [our docs repo
-here](https://github.com/kubernetes/kubernetes.github.io/tree/{{page.docsbranch}}/docs/user-guide/update-demo).
+here](https://github.com/kubernetes/website/tree/{{page.docsbranch}}/docs/user-guide/update-demo).
### Step Zero: Prerequisites
This example assumes that you have forked the docs repository and [turned up a Kubernetes cluster](/docs/setup/):
```shell
-$ git clone -b {{page.docsbranch}} https://github.com/kubernetes/kubernetes.github.io
-$ cd kubernetes.github.io
+$ git clone -b {{page.docsbranch}} https://github.com/kubernetes/website
+$ cd website
```
### Step One: Turn up the UX for the demo