From a607d39b8888f077473c19f5f4b809a9a31dba25 Mon Sep 17 00:00:00 2001 From: Ahmet Alp Balkan Date: Wed, 22 Mar 2017 12:53:26 -0700 Subject: [PATCH 1/2] Add PR template to encourage clicking Allow Edits Also moving issue template to /.github for better organization. This is supported by GitHub. Signed-off-by: Ahmet Alp Balkan --- ISSUE_TEMPLATE.md => .github/ISSUE_TEMPLATE.md | 0 .github/PULL_REQUEST_TEMPLATE.md | 3 +++ 2 files changed, 3 insertions(+) rename ISSUE_TEMPLATE.md => .github/ISSUE_TEMPLATE.md (100%) create mode 100644 .github/PULL_REQUEST_TEMPLATE.md diff --git a/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md similarity index 100% rename from ISSUE_TEMPLATE.md rename to .github/ISSUE_TEMPLATE.md diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md new file mode 100644 index 0000000000..694c62712b --- /dev/null +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -0,0 +1,3 @@ +> NOTE: Please check the “Allow edits from maintainers” box below to allow +> reviewers fix problems on your patch and speed up the review process. +> Please delete this note before submitting the pull request. From acbca1f251ef65ad56ae788d27822a4d66b3092b Mon Sep 17 00:00:00 2001 From: Xiaoyu Zhang Date: Thu, 23 Mar 2017 06:00:51 +0800 Subject: [PATCH 2/2] update index.md add one word,"say that" may be proper. --- docs/user-guide/configmap/index.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/user-guide/configmap/index.md b/docs/user-guide/configmap/index.md index 28eabedadd..139a4bf3c7 100644 --- a/docs/user-guide/configmap/index.md +++ b/docs/user-guide/configmap/index.md @@ -424,7 +424,7 @@ basis. The [Secrets](/docs/user-guide/secrets/) user guide explains the syntax. ## Real World Example: Configuring Redis -Let's take a look at a real-world example: configuring redis using ConfigMap. Say we want to inject +Let's take a look at a real-world example: configuring redis using ConfigMap. Say that we want to inject redis with the recommendation configuration for using redis as a cache. The redis config file should contain: