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

Glossary project part 1 #1305

Merged
merged 30 commits into from
May 30, 2024
Merged

Glossary project part 1 #1305

merged 30 commits into from
May 30, 2024

Conversation

martyav
Copy link
Contributor

@martyav martyav commented May 24, 2024

Addresses #358

Reminders

  • See the README for more details on how to work with the Rancher docs.

  • Verify if changes pertain to other versions of Rancher. If they do, finalize the edits on one version of the page, then apply the edits to the other versions.

  • If the pull request is dependent on an upcoming release, make sure to target the release branch instead of main.

Description

Since we were asked to publish what we have instead of waiting for the rest of the glossary to be filled out, I created a new working branch based off of #1125. I'm keeping #1125 open as it still contains useful conversations and can be used for tracking.

Comments

Copy link
Contributor

@sunilarjun sunilarjun left a comment

Choose a reason for hiding this comment

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

Just a spelling correction and some whitespace adjustment, thanks for compiling Marty!

shared-files/_glossary.md Outdated Show resolved Hide resolved
shared-files/_glossary.md Outdated Show resolved Hide resolved
shared-files/_glossary.md Outdated Show resolved Hide resolved
Rancher Enterprise
</dt>
<dd>
An alternative name for <i>Rancher Prime</i>.
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
An alternative name for <i>Rancher Prime</i>.
An alternative name for <i>Rancher Prime</i>.

shared-files/_glossary.md Outdated Show resolved Hide resolved
Copy link
Contributor

@btat btat left a comment

Choose a reason for hiding this comment

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

Listing these here since they apply to multiple things

  1. The An alternative name for... instances use colon, comma, and periods. We should be consistent.
  2. The criteria used to determine what values show in the Related terms field for the K8s distros seems very inconsistent. If we're using "they're all K8s distros" as the relation, then all entries should list all other entries.
    • K3s
      • RKE2
    • Rancher Kubernetes Engine (RKE)
      • K3s, RKE2, RKE Government
    • RKE1
      • RKE2
    • RKE2
      • None
    • RKE Government
      • None

docs/glossary.md Outdated Show resolved Hide resolved
shared-files/_glossary.md Outdated Show resolved Hide resolved
shared-files/_glossary.md Outdated Show resolved Hide resolved
shared-files/_glossary.md Outdated Show resolved Hide resolved
shared-files/_glossary.md Outdated Show resolved Hide resolved
shared-files/_glossary.md Outdated Show resolved Hide resolved
shared-files/_glossary.md Show resolved Hide resolved
shared-files/_glossary.md Outdated Show resolved Hide resolved
shared-files/_glossary.md Outdated Show resolved Hide resolved
shared-files/_glossary.md Outdated Show resolved Hide resolved
@martyav martyav requested review from btat and sunilarjun May 29, 2024 14:30
shared-files/_glossary.md Outdated Show resolved Hide resolved
shared-files/_glossary.md Outdated Show resolved Hide resolved
A CNCF-certified Kubernetes distribution that runs entirely within Docker containers. There are two main versions of RKE available. The 1.x software line is sometimes called <i>RKE1</i>. The next-generation line is called <i>RKE2</i>.
</li>
<li>
Shorthand for <i>RKE1</i>, the 1.x software line of RKE.
Copy link
Contributor

@btat btat May 29, 2024

Choose a reason for hiding this comment

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

Is this considered a second definition or is the ordered list used as a workaround to add another paragraph?

Shorthand for RKE1 - it seems a bit awkward to call the preferred term a shorthand of a secondary form.
the 1.x software line of RKE - we're kind of defining RKE by making a reference to RKE with this part.

Also, both parts of the second listitem seemed like they can be dropped since the first listitem already makes a similar reference.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

It was intended as a second definition, but if we don't need it we can get rid of the list

Copy link
Contributor

Choose a reason for hiding this comment

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

I'd vote for removing it.

Forgot to include this in my original comment:
the 1.x software line of RKE - we're kind of defining RKE by making a reference to RKE with this part.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

If definition 2 stood alone without the previous definition describing RKE, it would be more confusing. But, at any rate, definition 1 already covers the RKE1 usage ("The 1.x software line is sometimes called RKE1") so the second definition isn't necessary. We can just remove the second definition and update that sentence in the first to, "The 1.x software line is sometimes called RKE1, or simply RKE."

shared-files/_glossary.md Outdated Show resolved Hide resolved
shared-files/_glossary.md Outdated Show resolved Hide resolved
shared-files/_glossary.md Outdated Show resolved Hide resolved
shared-files/_glossary.md Outdated Show resolved Hide resolved
@martyav martyav dismissed sunilarjun’s stale review May 30, 2024 17:30

Dismissing as the changes requested have been fulfilled, but the review is still open

@martyav martyav merged commit 3c0a23c into rancher:main May 30, 2024
2 checks passed
@martyav martyav mentioned this pull request Jun 10, 2024
46 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants