From 4f6dea72b913083b598b95d4bb63222181adddcc Mon Sep 17 00:00:00 2001 From: fen4o Date: Thu, 3 Nov 2016 12:22:29 +0200 Subject: [PATCH 1/2] Fix broken rkt networking link --- docs/getting-started-guides/scratch.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/getting-started-guides/scratch.md b/docs/getting-started-guides/scratch.md index 72a9ee3125..84b0ffb5af 100644 --- a/docs/getting-started-guides/scratch.md +++ b/docs/getting-started-guides/scratch.md @@ -381,7 +381,7 @@ The minimum version required is [v0.5.6](https://github.com/coreos/rkt/releases/ minimum version required to match rkt v0.5.6 is [systemd 215](http://lists.freedesktop.org/archives/systemd-devel/2014-July/020903.html). -[rkt metadata service](https://github.com/coreos/rkt/blob/master/Documentation/networking.md) is also required +[rkt metadata service](https://github.com/coreos/rkt/blob/master/Documentation/networking/overview.md) is also required for rkt networking support. You can start rkt metadata service by using command like `sudo systemd-run rkt metadata-service` From cfe0f0e22a2d5e5409c4cf060febab10e7475248 Mon Sep 17 00:00:00 2001 From: Jared Date: Mon, 7 Nov 2016 11:51:19 -0800 Subject: [PATCH 2/2] Update create-pull-request.md --- docs/contribute/create-pull-request.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/contribute/create-pull-request.md b/docs/contribute/create-pull-request.md index ef8ac32c74..e79fe22c96 100644 --- a/docs/contribute/create-pull-request.md +++ b/docs/contribute/create-pull-request.md @@ -44,7 +44,7 @@ choose the [page type](/docs/contribute/page-templates/) that is the best fit for your content. -### Submitting a pull request to the master branch +### Submitting a pull request to the master branch (Current Release) If you want your change to be published in the released version Kubernetes docs, create a pull request against the master branch of the Kubernetes @@ -62,7 +62,7 @@ site where you can verify that your changes have rendered correctly. If needed, revise your pull request by committing changes to your new branch in your fork. -### Submitting a pull request to the <vnext> branch +### Submitting a pull request to the <vnext> branch (Upcoming Release) If your documentation change should not be released until the next release of the Kubernetes product, create a pull request against the <vnext> branch