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.

Sign up for GitHub

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

Jump to bottom

Update docs/admin/authentication.md #5408

Merged
merged 2 commits into from
Sep 16, 2017
Merged

Update docs/admin/authentication.md #5408

merged 2 commits into from
Sep 16, 2017

Conversation

islinwb
Copy link
Contributor

@islinwb islinwb commented Sep 12, 2017 •
edited by k8s-reviewable
Loading

This change is Reviewable

@k8s-ci-robot k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Sep 12, 2017
@k8sio-netlify-preview-bot
Copy link
Collaborator

k8sio-netlify-preview-bot commented Sep 12, 2017 •
edited
Loading

Deploy preview ready!

Built with commit 8229082

https://deploy-preview-5408--kubernetes-io-master-staging.netlify.com

zacharysarah
zacharysarah suggested changes Sep 12, 2017
View reviewed changes
Copy link
Contributor

@zacharysarah zacharysarah left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👋 Looks good--only one change needed before merging.

You can make the change yourself, or if you check the box to allow edits from maintainers, I can make the change for you.

docs/admin/authentication.md Outdated
@@ -168,7 +168,7 @@ with a value of `Basic BASE64ENCODED(USER:PASSWORD)`.

### Service Account Tokens

Service accounts are an automatically enabled authenticator that uses signed
Service account is an automatically enabled authenticator that uses signed
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Change to:

A service account is...

@islinwb
Copy link
Contributor Author

islinwb commented Sep 13, 2017

@zacharysarah Changes has been made. Thanks. Actually I've checked the box before but you still couldn't make the change. I have no idea what was wrong. Do I need to do more than just checking the box?

@islinwb
Copy link
Contributor Author

islinwb commented Sep 13, 2017

Update:
@zacharysarah I guess another box (after creating the PR) needs to be ckecked other than the box appeard when creating PR. The two boxes are of the same content. It's on the right side of the PR page.
1

@zacharysarah
Copy link
Contributor

@islinwb 👋

The two boxes are of the same content. It's on the right side of the PR page.

Thank you for solving that question! The process to allow edits from maintainers is more confusing that it should be; I will see what we can do about making it easier and more straightforward.

/cc @kubernetes/sig-docs-maintainers for visibility

@chenopis chenopis merged commit 831833d into kubernetes:master Sep 16, 2017
chenopis added a commit that referenced this pull request Sep 18, 2017
@chenopis
Merge branch 'master' of https://github.com/kubernetes/kubernetes.git…
270cd19 
…hub.io into chenopis-404-20170915

* 'master' of https://github.com/kubernetes/kubernetes.github.io:
  Adding Treasure Data to KCSP page (#5488)
  Update docs/admin/authentication.md (#5408)
  ZTE-SH-CN-debug-pod-replication-controller-2017-09-14-14
  ZTE-SH-CN-define-command-argument-container (#5381)
  Update index.md
  Update Kompose docs
  Improve host aliases page (#5443)
  Add link to AlwaysPullImages admission controller
chenopis added a commit that referenced this pull request Sep 19, 2017
@chenopis
Merge branch 'master' of https://github.com/kubernetes/kubernetes.git…
65b5e10 
…hub.io into chenopis-user-journeys

* 'master' of https://github.com/kubernetes/kubernetes.github.io: (21 commits)
  Remove User FAQ refer links (#5467)
  fix link of secret
  ZTE-SH-CN-debug-stateful-set-2017-09-19
  use para. page.version to replace specific version
  update the admission-controllers.md index.md what-is-kubernetes.md link
  Fix incorrect links
  update aggregated-api-servers.md link
  update api-group link
  fix version.md link
  Monthly 404 fix (#5494)
  Fix spelling mistake.
  Adding Treasure Data to KCSP page (#5488)
  Update docs/admin/authentication.md (#5408)
  ZTE-SH-CN-debug-pod-replication-controller-2017-09-14-14
  ZTE-SH-CN-define-command-argument-container (#5381)
  Update index.md
  Update Kompose docs
  Improve host aliases page (#5443)
  Add link to AlwaysPullImages admission controller
  Revert "create homepage for user journeys"
  ...

# Conflicts:
#	docs/home/index.md
jesscodez pushed a commit that referenced this pull request Sep 22, 2017
@islinwb
Update docs/admin/authentication.md (#5408)
eb6e612 
* Update docs/admin/authentication.md

* Update authentication.md
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@zacharysarah zacharysarah zacharysarah approved these changes

Assignees

@zacharysarah zacharysarah

Labels
cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. size/S Denotes a PR that changes 10-29 lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@islinwb @k8sio-netlify-preview-bot @zacharysarah @k8s-ci-robot @chenopis