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

[zh]merge main into dev-zh #1024

Merged
merged 20 commits into from
Jul 22, 2022
Merged

[zh]merge main into dev-zh #1024

merged 20 commits into from
Jul 22, 2022

Conversation

Petrie
Copy link
Contributor

@Petrie Petrie commented Jul 1, 2022

All docs added tags . We need merge main into dev-zh to avoid conflicts in the future

jihoon-seo and others added 6 commits June 23, 2022 14:49
@jihoon-seo @jasonsmithio @CathPag
[en] Add term: 'Event-Driven Architecture' (#976)
8e7dfee 
* [en] Add term: 'Event-Driven Architecture'

Signed-off-by: Jason (Jay) Smith <thejaysmith@google.com>
Signed-off-by: Jihoon Seo <jihoon.seo@etri.re.kr>

* Small edits

Co-authored-by: Jason "Jay" Smith <jay@thejaysmith.com>
Co-authored-by: Catherine Paganini <74001907+CathPag@users.noreply.github.com>
@cjyabraham
Some design and search improvements (#930)
919b82f 
* design tweaks to topnav

* hooked up google search

* added tags

* revert previous fix to use more elegant fix for dropdown menu positioning

* add some test tags to Hindi article

* remove "exclude_search" meta tag since it no longer applies in new search

* styled tag pages

* tweak search styles

* tweak search styles

* search tweak

* search style tweak

* search form tweaks

* styled the articles of tag listing

* add initial set of tags

* don't show meta links on search or tags pages

* use relpermalink for tags

* more tagging work; added all tags page

* fixed permalink

* fixing relative permalink

* fixed spacing on footer

* style tweaks and clean-up

* i18n all tags label

* revert styling of search bar on mobile

* Revert "add initial set of tags"

This reverts commit 61e0785.

* re-apply all tags after merge operation
@iamNoah1 @CathPag
[en] Certificates (#921)
e461e69 
* first shot, some edit from catherine

Signed-off-by: Noah Ispas (iamNoah1) <noahispas@gmail.com>

add decrypt to wordlist

Change Request from Jason

Co-authored-by: Jason Morgan <jmorgan@f9vs.com>

Change requests from Jason

Co-authored-by: Jason Morgan <jmorgan@f9vs.com>

Change Requests from Jason

Co-authored-by: Jason Morgan <jmorgan@f9vs.com>

Change Requests from Jason

Co-authored-by: Jason Morgan <jmorgan@f9vs.com>

Change Requests from Jason

Co-authored-by: Jason Morgan <jmorgan@f9vs.com>

remove details about public and private keys entirely

* remove dublication

Signed-off-by: Noah Ispas (iamNoah1) <noahispas@gmail.com>

* renamed certificate to digital certificate

Signed-off-by: Noah Ispas (iamNoah1) <noahispas@gmail.com>

* naming

Signed-off-by: Noah Ispas (iamNoah1) <noahispas@gmail.com>

* Change Requests from Catherine

Co-authored-by: Catherine Paganini <74001907+CathPag@users.noreply.github.com>

Co-authored-by: Catherine Paganini <74001907+CathPag@users.noreply.github.com>
@jihoon-seo
Add .hugo_build.lock file to gitignore (#998)
e54d891 
Signed-off-by: Jihoon Seo <jihoon.seo@etri.re.kr>
@Petrie
complete Slack link (#1000)
ea40142 
* complete Slack link

Signed-off-by: Petrie <lpfvip2008@gmail.com>

* Remove changes in localized contents.

Signed-off-by: Petrie <lpfvip2008@gmail.com>
@seokho-son
Add French Localization Team Approvers (#975)
4f333a5
@netlify
Copy link

netlify bot commented Jul 1, 2022 •
edited
Loading

✅ Deploy Preview for cncfglossary ready!

Name Link
🔨 Latest commit 9c1274d
🔍 Latest deploy log https://app.netlify.com/sites/cncfglossary/deploys/62d64dee53262800097cbe17
😎 Deploy Preview https://deploy-preview-1024--cncfglossary.netlify.app
📱 Preview on mobile
Toggle QR Code...

QR Code

Use your smartphone camera to open QR code link.

To edit notification comments on pull requests, go to your Netlify site settings.

@Petrie Petrie marked this pull request as draft July 1, 2022 14:43
@jihoon-seo jihoon-seo added the lang/zh for Chinese label Jul 1, 2022
@Petrie Petrie marked this pull request as ready for review July 2, 2022 07:24
seokho-son and others added 6 commits July 4, 2022 13:30
@seokho-son
Update settings for maintainers (#1023)
971043e 
Signed-off-by: Seokho Son <shsongist@gmail.com>
@mhausenblas
expands and refines o11y definition (#1004)
f158fd1 
* expands and refines o11y definition

Signed-off-by: Michael Hausenblas <hausenbl@amazon.com>

Signed-off-by: Michael Hausenblas <hausenbl@amazon.com>

* Update content/en/observability.md

Signed-off-by: Michael Hausenblas <hausenbl@amazon.com>

Co-authored-by: Catherine Paganini <74001907+CathPag@users.noreply.github.com>

Signed-off-by: Michael Hausenblas <hausenbl@amazon.com>

* Update content/en/observability.md

Signed-off-by: Michael Hausenblas <hausenbl@amazon.com>

Co-authored-by: Catherine Paganini <74001907+CathPag@users.noreply.github.com>

Signed-off-by: Michael Hausenblas <hausenbl@amazon.com>

* Update content/en/observability.md

Signed-off-by: Michael Hausenblas <hausenbl@amazon.com>

Co-authored-by: Catherine Paganini <74001907+CathPag@users.noreply.github.com>

Signed-off-by: Michael Hausenblas <hausenbl@amazon.com>

* Update content/en/observability.md

Co-authored-by: Catherine Paganini <74001907+CathPag@users.noreply.github.com>

Signed-off-by: Michael Hausenblas <hausenbl@amazon.com>

* Update content/en/observability.md

Signed-off-by: Michael Hausenblas <hausenbl@amazon.com>

Co-authored-by: Catherine Paganini <74001907+CathPag@users.noreply.github.com>

Signed-off-by: Michael Hausenblas <hausenbl@amazon.com>

* Update content/en/observability.md

Signed-off-by: Michael Hausenblas <hausenbl@amazon.com>

Co-authored-by: Catherine Paganini <74001907+CathPag@users.noreply.github.com>

Signed-off-by: Michael Hausenblas <hausenbl@amazon.com>

* Update content/en/observability.md

Signed-off-by: Michael Hausenblas <hausenbl@amazon.com>

Co-authored-by: Catherine Paganini <74001907+CathPag@users.noreply.github.com>

Signed-off-by: Michael Hausenblas <hausenbl@amazon.com>

* Update content/en/observability.md

Signed-off-by: Michael Hausenblas <hausenbl@amazon.com>

Co-authored-by: Catherine Paganini <74001907+CathPag@users.noreply.github.com>

Signed-off-by: Michael Hausenblas <hausenbl@amazon.com>

* Update content/en/observability.md

Signed-off-by: Michael Hausenblas <hausenbl@amazon.com>

Co-authored-by: Catherine Paganini <74001907+CathPag@users.noreply.github.com>

Signed-off-by: Michael Hausenblas <hausenbl@amazon.com>

* Update content/en/observability.md

Co-authored-by: Catherine Paganini <74001907+CathPag@users.noreply.github.com>

Signed-off-by: Michael Hausenblas <hausenbl@amazon.com>

* Update content/en/observability.md

Co-authored-by: Catherine Paganini <74001907+CathPag@users.noreply.github.com>

Signed-off-by: Michael Hausenblas <hausenbl@amazon.com>

* Update content/en/observability.md

Co-authored-by: Catherine Paganini <74001907+CathPag@users.noreply.github.com>

Signed-off-by: Michael Hausenblas <hausenbl@amazon.com>

* rewrites o11y definition to concept

Signed-off-by: Michael Hausenblas <hausenbl@amazon.com>
@cjyabraham
tweak to config to get search working on PR instances (#1050)
1d6e12a 
Signed-off-by: cjyabraham <cjyabraham@gmail.com>
@sarkartanmay393 @iamNoah1 @CathPag
[en] Modify load-balancer.md (#1008)
c04837c 
* sarkartanmay393: Modified load-balancer.md

Signed-off-by: Tanmay Sarkar <sarkartanmay393@gmail.com>

* sarkartanmay393: Changes.

Signed-off-by: Tanmay Sarkar <sarkartanmay393@gmail.com>

* Update content/en/load-balancer.md

Co-authored-by: Noah Ispas <13436814+iamNoah1@users.noreply.github.com>

Signed-off-by: Tanmay Sarkar <84321236+sarkartanmay393@users.noreply.github.com>

* Apply suggestions from code review

Co-authored-by: Noah Ispas <13436814+iamNoah1@users.noreply.github.com>

Signed-off-by: Tanmay Sarkar <84321236+sarkartanmay393@users.noreply.github.com>

* add semantic line breaks

Signed-off-by: Noah Ispas <13436814+iamNoah1@users.noreply.github.com>

* Add semantic line breaks

Signed-off-by: Noah Ispas <13436814+iamNoah1@users.noreply.github.com>

* Add semantic line breaks

Signed-off-by: Noah Ispas <13436814+iamNoah1@users.noreply.github.com>

* Add semantic line breaks

Signed-off-by: Noah Ispas <13436814+iamNoah1@users.noreply.github.com>

* Update content/en/load-balancer.md

Co-authored-by: Catherine Paganini <74001907+CathPag@users.noreply.github.com>

Signed-off-by: Noah Ispas <13436814+iamNoah1@users.noreply.github.com>

* Update content/en/load-balancer.md

Co-authored-by: Catherine Paganini <74001907+CathPag@users.noreply.github.com>

Signed-off-by: Noah Ispas <13436814+iamNoah1@users.noreply.github.com>

* Update content/en/load-balancer.md

Co-authored-by: Catherine Paganini <74001907+CathPag@users.noreply.github.com>

Signed-off-by: Noah Ispas <13436814+iamNoah1@users.noreply.github.com>

* Update content/en/load-balancer.md

Co-authored-by: Catherine Paganini <74001907+CathPag@users.noreply.github.com>

Signed-off-by: Noah Ispas <13436814+iamNoah1@users.noreply.github.com>

* Update content/en/load-balancer.md

Co-authored-by: Catherine Paganini <74001907+CathPag@users.noreply.github.com>

Signed-off-by: Noah Ispas <13436814+iamNoah1@users.noreply.github.com>

* Update content/en/load-balancer.md

Co-authored-by: Catherine Paganini <74001907+CathPag@users.noreply.github.com>

Signed-off-by: Noah Ispas <13436814+iamNoah1@users.noreply.github.com>

* Update content/en/load-balancer.md

Co-authored-by: Catherine Paganini <74001907+CathPag@users.noreply.github.com>

Signed-off-by: Noah Ispas <13436814+iamNoah1@users.noreply.github.com>

* Update content/en/load-balancer.md

Co-authored-by: Catherine Paganini <74001907+CathPag@users.noreply.github.com>

Signed-off-by: Noah Ispas <13436814+iamNoah1@users.noreply.github.com>

* Removing link 

We only need to link to a term once in each entry.

Signed-off-by: Catherine Paganini <74001907+CathPag@users.noreply.github.com>

Co-authored-by: Noah Ispas <13436814+iamNoah1@users.noreply.github.com>
Co-authored-by: Catherine Paganini <74001907+CathPag@users.noreply.github.com>
@cjyabraham
revert change to see if this fixes sitemap urls
801443f 
Signed-off-by: cjyabraham <cjyabraham@gmail.com>
@cjyabraham
Merge branch 'main' of https://github.com/cncf/glossary into main
ce33738
dependabot bot and others added 6 commits July 11, 2022 15:26
@dependabot
chore(deps): bump rojopolis/spellcheck-github-actions
181070f 
Bumps [rojopolis/spellcheck-github-actions](https://github.com/rojopolis/spellcheck-github-actions) from 0.24.0 to 0.25.0.
- [Release notes](https://github.com/rojopolis/spellcheck-github-actions/releases)
- [Changelog](https://github.com/rojopolis/spellcheck-github-actions/blob/master/CHANGELOG.md)
- [Commits](rojopolis/spellcheck-github-actions@0.24.0...0.25.0)

---
updated-dependencies:
- dependency-name: rojopolis/spellcheck-github-actions
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
@seokho-son
Merge pull request #1062 from cncf/dependabot/github_actions/rojopoli…
7ea8204 
…s/spellcheck-github-actions-0.25.0

chore(deps): bump rojopolis/spellcheck-github-actions from 0.24.0 to 0.25.0
@cjyabraham
fix old links to favicons in docsy
489ff6a 
Signed-off-by: cjyabraham <cjyabraham@gmail.com>
@cjyabraham
Merge branch 'main' of https://github.com/cncf/glossary into main
7834638
@iamNoah1 @CathPag
add some guidelines for localization teams (#1075)
edded5b 
* add some guidelines for localization teams

Signed-off-by: Noah Ispas (iamNoah1) <noahispas@gmail.com>

* Small edits

Co-authored-by: Catherine Paganini <74001907+CathPag@users.noreply.github.com>
@iamNoah1 @jihoon-seo
remove adrianna from all files (#1066)
cd65beb 
* remove adriana from all files

Signed-off-by: Noah Ispas (iamNoah1) <noahispas@gmail.com>

* Update CODEOWNERS

Co-authored-by: Jihoon Seo <46767780+jihoon-seo@users.noreply.github.com>
iamNoah1
iamNoah1 approved these changes Jul 15, 2022
View reviewed changes
Copy link
Collaborator

@iamNoah1 iamNoah1 left a comment

Choose a reason for hiding this comment

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

lgtm

@thetwopct
Updating custom theme for Glossary site (#1081)
9c1274d 
Signed-off-by: James Hunt <10615884+thetwopct@users.noreply.github.com>
jihoon-seo
jihoon-seo approved these changes Jul 19, 2022
View reviewed changes
Copy link
Collaborator

@jihoon-seo jihoon-seo left a comment

Choose a reason for hiding this comment

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

LGTM!

@jihoon-seo jihoon-seo mentioned this pull request Jul 19, 2022
Closed
@jihoon-seo
Copy link
Collaborator

@hanyuancheung @Jacob953 @Rocksnake @Submarinee
Please take a look and merge this PR!

For who merges this PR: Please do not squash when merging this PR. Instead, please use "Create a merge commit" method.

Jacob953
Jacob953 approved these changes Jul 22, 2022
View reviewed changes
Copy link
Collaborator

@Jacob953 Jacob953 left a comment

Choose a reason for hiding this comment

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

LGTM

seokho-son
seokho-son approved these changes Jul 22, 2022
View reviewed changes
Copy link
Collaborator

@seokho-son seokho-son left a comment

Choose a reason for hiding this comment

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

LGTM. Let me merge this PR. :)

@seokho-son seokho-son merged commit 26facc9 into dev-zh Jul 22, 2022
@Jacob953 Jacob953 mentioned this pull request Jul 22, 2022
Merged
2 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Jacob953 Jacob953 Jacob953 approved these changes

@jihoon-seo jihoon-seo jihoon-seo approved these changes

@iamNoah1 iamNoah1 iamNoah1 approved these changes

@seokho-son seokho-son seokho-son approved these changes

@Garima-Negi Garima-Negi Awaiting requested review from Garima-Negi Garima-Negi is a code owner

@sayantani11 sayantani11 Awaiting requested review from sayantani11

@anubha-v-ardhan anubha-v-ardhan Awaiting requested review from anubha-v-ardhan

@jayesh-srivastava jayesh-srivastava Awaiting requested review from jayesh-srivastava jayesh-srivastava is a code owner

@caniszczyk caniszczyk Awaiting requested review from caniszczyk caniszczyk is a code owner

@CathPag CathPag Awaiting requested review from CathPag CathPag is a code owner

@JasonMorgan JasonMorgan Awaiting requested review from JasonMorgan JasonMorgan is a code owner

@edsoncelio edsoncelio Awaiting requested review from edsoncelio edsoncelio is a code owner

@brunoguidone brunoguidone Awaiting requested review from brunoguidone brunoguidone is a code owner

@jessicalins jessicalins Awaiting requested review from jessicalins jessicalins is a code owner

Assignees
No one assigned
Labels
lang/zh for Chinese
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
10 participants
@Petrie @jihoon-seo @seokho-son @iamNoah1 @Jacob953 @cjyabraham @edsoncelio @mhausenblas @sarkartanmay393 @thetwopct