Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix incorrect notation of 'directory' into Korean #22155

Merged
merged 2 commits into from
Jul 2, 2020

Conversation

pjhwa
Copy link
Contributor

@pjhwa pjhwa commented Jun 29, 2020

Closes #21731

This PR contains the fix for Korean notation of 'directory' of the following files:

  • content/ko/docs/concepts/overview/working-with-objects/annotations.md
  • content/ko/docs/concepts/overview/working-with-objects/object-management.md
  • content/ko/docs/concepts/policy/pod-security-policy.md
  • content/ko/docs/concepts/workloads/controllers/daemonset.md
  • content/ko/docs/contribute/style/write-new-topic.md
  • content/ko/docs/reference/glossary/volume.md
  • content/ko/docs/setup/best-practices/certificates.md
  • content/ko/docs/tasks/access-application-cluster/access-cluster.md
  • content/ko/docs/tasks/access-application-cluster/configure-access-multiple-clusters.md
  • content/ko/docs/tasks/configure-pod-container/static-pod.md
  • content/ko/docs/tasks/tools/install-kubectl.md
  • content/ko/docs/tutorials/configuration/configure-redis-using-configmap.md
  • content/ko/docs/tutorials/stateless-application/guestbook.md

@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Jun 29, 2020
@k8s-ci-robot k8s-ci-robot added sig/docs Categorizes an issue or PR as relevant to SIG Docs. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Jun 29, 2020
@netlify
Copy link

netlify bot commented Jun 29, 2020

Deploy preview for k8s-dev-ko ready!

Built with commit e93faa5

https://deploy-preview-22155--k8s-dev-ko.netlify.app

@gochist
Copy link
Member

gochist commented Jun 30, 2020

@pjhwa 감사합니다!
/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jun 30, 2020
@gochist
Copy link
Member

gochist commented Jun 30, 2020

/unassign
/assign @seokho-son

@k8s-ci-robot k8s-ci-robot assigned seokho-son and unassigned gochist Jun 30, 2020
@gochist
Copy link
Member

gochist commented Jul 1, 2020

@pjhwa 충돌 해결을 부탁드립니다.

@k8s-ci-robot k8s-ci-robot removed the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jul 1, 2020
@pjhwa
Copy link
Contributor Author

pjhwa commented Jul 1, 2020

@gochist 일단 해결했습니다.
참고로, 이 PR 페이지 하단의 Conflict 해결 버튼을 눌러서 진행하는 과정에 "Commit merge" 버튼을 눌렀더니 "Merge branch 'dev-1.18-ko.7' into fix-21731" 이렇게 되었네요. 여기서 커밋은 2개로 보이는데, 로컬에선 마지막 커밋 메시지만 보이네요.

@seokho-son
Copy link
Member

감사합니다!
/approve

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: seokho-son

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jul 2, 2020
@seokho-son
Copy link
Member

/lgtm
as well :)

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jul 2, 2020
@k8s-ci-robot k8s-ci-robot merged commit 10ddc8c into kubernetes:dev-1.18-ko.7 Jul 2, 2020
@gochist
Copy link
Member

gochist commented Jul 2, 2020

@gochist 일단 해결했습니다.
참고로, 이 PR 페이지 하단의 Conflict 해결 버튼을 눌러서 진행하는 과정에 "Commit merge" 버튼을 눌렀더니 "Merge branch 'dev-1.18-ko.7' into fix-21731" 이렇게 되었네요. 여기서 커밋은 2개로 보이는데, 로컬에선 마지막 커밋 메시지만 보이네요.

깃헙에서 충돌을 해결하시면 리모트 브랜치에 머지 커밋이 추가됩니다. 로컬에 내용을 가져오시려면 git fetch 또는 git pull 명령을 사용하시면 됩니다.

gochist added a commit that referenced this pull request Jul 10, 2020
- Translate reference/command-line-tools-reference/feature-gates.md int… (#22240)
- Fix issue of broken links to translated docs (#22105)
- Fix issue of document link in some ko documents (#22379)
- Translate tasks/administer-cluster/access-cluster-services.md into Ko… (#21776)
- Fix issue with 'Linux' and 'Windows' notation in Korean docs (#22362)
- Fix issue of broken links to translated docs #2 (#22270)
- Fix issue with k8s.io/ko/docs/concepts/overview/kubernetes-api.md (#22261)
- Fix issue with k8s.io/ko/docs/concepts/overview/working-with-objects/ (#22263)
- Fix incorrect notation of 'directory' into Korean (#22155)
- Fix issue with k8s.io/ko/docs/concepts/overview/components.md (#22232)
- Update outdated files in dev-1.18-ko.7 (#22128)
- Modify spacing term ReplicaSet in Korean (#22148)

Co-authored-by: Jerry Park <jaehwa@gmail.com>
Co-authored-by: woopyoung <ywp041@gmail.com>
Co-authored-by: coolguyhong <podolsmith@naver.com>
Co-authored-by: PyungHo Yoon <learder@gmail.com>
Co-authored-by: Seokho Son <shsongist@gmail.com>
Co-authored-by: jmyung <jesang.myung@gmail.com>
Co-authored-by: Ian Y. Choi <ianyrchoi@gmail.com>
gochist added a commit that referenced this pull request Jul 10, 2020
- Translate reference/command-line-tools-reference/feature-gates.md int… (#22240)
- Fix issue of broken links to translated docs (#22105)
- Fix issue of document link in some ko documents (#22379)
- Translate tasks/administer-cluster/access-cluster-services.md into Ko… (#21776)
- Fix issue with 'Linux' and 'Windows' notation in Korean docs (#22362)
- Fix issue of broken links to translated docs #2 (#22270)
- Fix issue with k8s.io/ko/docs/concepts/overview/kubernetes-api.md (#22261)
- Fix issue with k8s.io/ko/docs/concepts/overview/working-with-objects/ (#22263)
- Fix incorrect notation of 'directory' into Korean (#22155)
- Fix issue with k8s.io/ko/docs/concepts/overview/components.md (#22232)
- Update outdated files in dev-1.18-ko.7 (#22128)
- Modify spacing term ReplicaSet in Korean (#22148)
- Translate tasks/administer-cluster/extended-resource-node.md into Korean (#21849)
- Translate tasks/administer-cluster/access-cluster-api.md into Korean (#21730)

Co-authored-by: Jerry Park <jaehwa@gmail.com>
Co-authored-by: woopyoung <ywp041@gmail.com>
Co-authored-by: coolguyhong <podolsmith@naver.com>
Co-authored-by: PyungHo Yoon <learder@gmail.com>
Co-authored-by: Seokho Son <shsongist@gmail.com>
Co-authored-by: jmyung <jesang.myung@gmail.com>
Co-authored-by: Ian Y. Choi <ianyrchoi@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. language/ko Issues or PRs related to Korean language lgtm "Looks good to me", indicates that a PR is ready to be merged. sig/docs Categorizes an issue or PR as relevant to SIG Docs. size/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants