Skip to content

Commit

Permalink
update website
Browse files Browse the repository at this point in the history
  • Loading branch information
zhangxiaoyu-zidif committed Oct 19, 2017
1 parent 47a377a commit cb9cad5
Show file tree
Hide file tree
Showing 11 changed files with 17 additions and 17 deletions.
4 changes: 2 additions & 2 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ Before submitting a pull request to create new content, please review the [Kuber

Kubernetes.io uses github issues to track documentation issues and requests. If you see a documentation issue, submit an issue using the following steps:

1. Check the [kubernetes.io issues list](https://github.com/kubernetes/kubernetes.github.io/issues) as you might find out the issue is a duplicate.
2. Use the [included template for every new issue](https://github.com/kubernetes/kubernetes.github.io/issues/new). When you create a bug report, include as many details as possible and include suggested fixes to the issue.
1. Check the [kubernetes.io issues list](https://github.com/kubernetes/website/issues) as you might find out the issue is a duplicate.
2. Use the [included template for every new issue](https://github.com/kubernetes/website/issues/new). When you create a bug report, include as many details as possible and include suggested fixes to the issue.

Note that code issues should be filed against the main kubernetes repository, while documentation issues should go in the kubernetes.io repository.

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ title: CentOS

## 警告

本文档适用于Kubernetes 1.1.0,目前已经被[废弃](https://github.com/kubernetes/kubernetes.github.io/issues/1613)。相关内容请参阅最新版[指南](/docs/getting-started-guides/kubeadm/)
本文档适用于Kubernetes 1.1.0,目前已经被[废弃](https://github.com/kubernetes/website/issues/1613)。相关内容请参阅最新版[指南](/docs/getting-started-guides/kubeadm/)

## 前提条件

Expand Down
2 changes: 1 addition & 1 deletion docs/concepts/cluster-administration/manage-deployment.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ title: Managing Resources
You've deployed your application and exposed it via a service. Now what? Kubernetes provides a number of tools to help you manage your application deployment, including scaling and updating. Among the features that we will discuss in more depth are [configuration files](/docs/concepts/configuration/overview/) and [labels](/docs/concepts/overview/working-with-objects/labels/).

You can find all the files for this example [in our docs
repo here](https://github.com/kubernetes/kubernetes.github.io/tree/{{page.docsbranch}}/docs/user-guide/).
repo here](https://github.com/kubernetes/website/tree/{{page.docsbranch}}/docs/user-guide/).

* TOC
{:toc}
Expand Down
2 changes: 1 addition & 1 deletion docs/concepts/configuration/assign-pod-node.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ that a pod ends up on a machine with an SSD attached to it, or to co-locate pods
services that communicate a lot into the same availability zone.

You can find all the files for these examples [in our docs
repo here](https://github.com/kubernetes/kubernetes.github.io/tree/{{page.docsbranch}}/docs/user-guide/node-selection).
repo here](https://github.com/kubernetes/website/tree/{{page.docsbranch}}/docs/user-guide/node-selection).

* TOC
{:toc}
Expand Down
2 changes: 1 addition & 1 deletion docs/concepts/workloads/controllers/deployment.md
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ The `template` field contains the following instructions:
To create this Deployment, run the following command:

```shell
kubectl create -f https://raw.githubusercontent.com/kubernetes/kubernetes.github.io/master/docs/concepts/workloads/controllers/nginx-deployment.yaml
kubectl create -f https://raw.githubusercontent.com/kubernetes/website/master/docs/concepts/workloads/controllers/nginx-deployment.yaml
```

Note: You can append `--record` to this command to record the current command in the annotations of
Expand Down
2 changes: 1 addition & 1 deletion docs/getting-started-guides/centos/centos_manual_config.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ title: CentOS
* TOC
{:toc}

**Caution:** This guide was originally written for Kubernetes 1.1.0 and [is deprecated](https://github.com/kubernetes/kubernetes.github.io/issues/1613) and is replaced by [kubeadm](/docs/admin/kubeadm/).
**Caution:** This guide was originally written for Kubernetes 1.1.0 and [is deprecated](https://github.com/kubernetes/website/issues/1613) and is replaced by [kubeadm](/docs/admin/kubeadm/).
{: .caution}

## Prerequisites
Expand Down
8 changes: 4 additions & 4 deletions docs/home/contribute/create-pull-request.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ title: Creating a Documentation Pull Request
{% capture overview %}

To contribute to the Kubernetes documentation, create a pull request against the
[kubernetes/kubernetes.github.io](https://github.com/kubernetes/kubernetes.github.io){: target="_blank"}
[kubernetes/website](https://github.com/kubernetes/website){: target="_blank"}
repository. This page shows how to create a pull request.

{% endcapture %}
Expand All @@ -26,7 +26,7 @@ Documentation will be published under the [CC BY SA 4.0](https://git.k8s.io/kube
## Creating a fork of the Kubernetes documentation repository

1. Go to the
[kubernetes/kubernetes.github.io](https://github.com/kubernetes/kubernetes.github.io){: target="_blank"}
[kubernetes/website](https://github.com/kubernetes/website){: target="_blank"}
repository.

1. In the upper-right corner, click **Fork**. This creates a copy of the
Expand All @@ -51,7 +51,7 @@ create a pull request against the master branch of the Kubernetes
documentation repository.

1. In your GitHub account, in your new branch, create a pull request
against the master branch of the kubernetes/kubernetes.github.io
against the master branch of the kubernetes/website
repository. This opens a page that shows the status of your pull request.

1. Click **Show all checks**. Wait for the **deploy/netlify** check to complete.
Expand All @@ -70,7 +70,7 @@ of the Kubernetes documentation repository. The <vnext> branch has the
form `release-<version-number>`, for example release-1.5.

1. In your GitHub account, in your new branch, create a pull request
against the &lt;vnext&gt; branch of the kubernetes/kubernetes.github.io
against the &lt;vnext&gt; branch of the kubernetes/website
repository. This opens a page that shows the status of your pull request.

1. Click **Show all checks**. Wait for the **deploy/netlify** check to complete.
Expand Down
2 changes: 1 addition & 1 deletion docs/home/contribute/page-templates.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ title: Using Page Templates
<li><a href="#concept_template">Concept</a></li>
</ul>

<p>The page templates are in the <a href="https://git.k8s.io/kubernetes.github.io/_includes/templates" target="_blank">_includes/templates</a> directory of the <a href="https://github.com/kubernetes/kubernetes.github.io">kubernetes.github.io</a> repository.
<p>The page templates are in the <a href="https://git.k8s.io/kubernetes.github.io/_includes/templates" target="_blank">_includes/templates</a> directory of the <a href="https://github.com/kubernetes/website">kubernetes.github.io</a> repository.

<h2 id="task_template">Task template</h2>

Expand Down
2 changes: 1 addition & 1 deletion docs/home/contribute/review-issues.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ title: Reviewing Documentation Issues

{% capture overview %}

This page explains how documentation issues are reviewed and prioritized for the [kubernetes/kubernetes.github.io](https://github.com/kubernetes/kubernetes.github.io){: target="_blank"} repository. The purpose is to provide a way to organize issues and make it easier to contribute to Kubernetes documentation. The following should be used as the standard way of prioritizing, labeling, and interacting with issues.
This page explains how documentation issues are reviewed and prioritized for the [kubernetes/website](https://github.com/kubernetes/website){: target="_blank"} repository. The purpose is to provide a way to organize issues and make it easier to contribute to Kubernetes documentation. The following should be used as the standard way of prioritizing, labeling, and interacting with issues.
{% endcapture %}

{% capture body %}
Expand Down
2 changes: 1 addition & 1 deletion docs/home/contribute/stage-documentation-changes.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ branch, your changes are staged in a custom subdomain on Netlify so that
you can see your changes in rendered form before the pull request is merged.

1. In your GitHub account, in your new branch, submit a pull request to the
kubernetes/kubernetes.github.io repository. This opens a page that shows the
kubernetes/website repository. This opens a page that shows the
status of your pull request.

1. Scroll down to the list of automated checks. Click **Show all checks**.
Expand Down
6 changes: 3 additions & 3 deletions editdocs.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@ $( document ).ready(function() {
$("#generalInstructions").hide();
$("#continueEdit").show();
$("#continueEditButton").text("Edit " + forwarding);
$("#continueEditButton").attr("href", "https://github.com/kubernetes/kubernetes.github.io/edit/{{ page.docsbranch }}/" + forwarding)
$("#continueEditButton").attr("href", "https://github.com/kubernetes/website/edit/{{ page.docsbranch }}/" + forwarding)
$("#viewOnGithubButton").text("View " + forwarding + " on GitHub");
$("#viewOnGithubButton").attr("href", "https://git.k8s.io/kubernetes.github.io/" + forwarding)
$("#viewOnGithubButton").attr("href", "https://git.k8s.io/website/" + forwarding)
} else {
$("#generalInstructions").show();
$("#continueEdit").hide();
Expand Down Expand Up @@ -44,7 +44,7 @@ $( document ).ready(function() {

<p>Click the button below to visit the repo for our site. You can then click the <b>Fork</b> button in the upper-right area of the screen to create a copy of our site in your GitHub account called a <i>fork</i>. Make any changes you want in your fork, and when you are ready to send those changes to us, go to the index page for your fork and click <b>New Pull Request</b> to let us know about it.</p>

<p><a class="button" href="https://github.com/kubernetes/kubernetes.github.io/">Browse this site's source code</a></p>
<p><a class="button" href="https://github.com/kubernetes/website/">Browse this site's source code</a></p>

</div>
<!-- END: Dynamic section -->
Expand Down

0 comments on commit cb9cad5

Please sign in to comment.