Skip to content

Style Guide: Clarify Adding Third-Party Content #15892

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

Merged
merged 1 commit into from
Aug 27, 2019
Merged

Style Guide: Clarify Adding Third-Party Content #15892

merged 1 commit into from
Aug 27, 2019

Conversation

aimeeu
Copy link
Contributor

@aimeeu aimeeu commented Aug 16, 2019

Add new section that states what vendor-specific content is not
allowed. Add table of examples of allowed and not allowed content.

Fixes #15576

This PR replaces PR #15774 (I had irrevocable git issues trying to squash commits).

/assign @zacharysarah

Preview: https://deploy-preview-15892--kubernetes-io-master-staging.netlify.com/docs/contribute/style/content-guide/

@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 Aug 16, 2019
@netlify
Copy link

netlify bot commented Aug 16, 2019

Deploy preview for kubernetes-io-master-staging ready!

Built with commit 6ec42dd

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

@k8s-ci-robot k8s-ci-robot added language/en Issues or PRs related to English language sig/docs Categorizes an issue or PR as relevant to SIG Docs. labels Aug 16, 2019
@aimeeu
Copy link
Contributor Author

aimeeu commented Aug 16, 2019

Copy link
Contributor

@sftim sftim left a comment

Choose a reason for hiding this comment

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

/lgtm

This is the only place in the style guide that abbreviates “Kubernetes” to “k8s”. I'm fine with the abbreviation but thought I'd call it out.

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Aug 16, 2019
@@ -38,6 +38,32 @@ The English-language documentation uses U.S. English spelling and grammar.

{{< comment >}}[If you're localizing this page, you can omit the point about US English.]{{< /comment >}}

## Guidelines for Contributing content

Copy link
Contributor

Choose a reason for hiding this comment

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

hello @aimeeu . A few style nits:

  • What does it mean to host content from projects ... ? Does this mean that CNCF incubating projects can publish their docs on kubernetes.io?
  • Check the style guide about capitalization and headings, Guidelines for contributing content
  • Use of slashes: stale/rotten
  • Is it worthwhile to include the detailed info about archived projects? Possibly just state that content, for CNCF archived projects, is not supported
  • Html vs Markdown table?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@kbhawkey

  • I used the verbiage from the Issue; I'll ask Zach.
  • Thank you for catching the capitalization typo
  • Again, I used the verbiage from the Issue; maybe I just follow requirements too closely...lol
  • I think it is worthwhile to include the info about how to figure out if a project has been archived since the CNCF doesn't maintain a nice list. The info is also useful to reviewers and approvers who may need to check project status. In the case of rkt, nothing on the website or in the GitHub repo stated the project was going to be archived.
  • HTML vs Markdown -> the Style Guide is the only place that uses HTML tables. This was discussed in the previous PR for this issue (the PR that I had to close due to unfixable git squash problems). I plan to open an issue to change the HTML tables to Markdown after this PR has been merged.

Copy link
Contributor

Choose a reason for hiding this comment

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

@kbhawkey 👋

Does this mean that CNCF incubating projects can publish their docs on kubernetes.io?

No.

Thanks for all the style guide feedback!

Copy link
Contributor

Choose a reason for hiding this comment

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

@aimeeu

I used the verbiage from the Issue

That's a reasonable place to start, but as @kbhawkey and @sftim correctly review, the style guide takes precedence. My own notes are a shorthand at best, and should not be regarded as fit for human consumption. 😜

Copy link
Contributor

Choose a reason for hiding this comment

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

* What does it mean to `host` content from projects ... ? Does this mean that CNCF incubating projects can publish their docs on kubernetes.io?

@kbhawkey raises an excellent question here. I think we should be as clear as possible. I would suggest using the word "include" instead of "host" (see explanation and suggested wording below).

In addition, we should explicitly call out the difference between "hosting" third-party content (the technical verbiage is actually included in the kubernetes/website source repository and published to docs.k8s.io) and linking to third-party content.

Perhaps a paragraph like this would work?

===

The Kubernetes documentation comprises the content of the kubernetes/website
source repository. The majority of the Kubernetes documentation is specific to the Kubernetes project. However, there are some scenarios where the Kubernetes documentation includes content from or about non-Kubernetes projects.

This content falls into the following categories:

  1. Instructional content involving non-Kubernetes projects during setup or operation of Kubernetes
  2. Detailed technical content about how to use a non-Kubernetes project or how that project is designed
  3. Content that describes a non-Kubernetes project
  4. Content that simply links to information about a non-Kubernetes project

.... and then we go into specific guidance on handling the above categories of external content ...

thoughts?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@jaypipes I reworked the entire section (lost myself for almost a day down the rabbit hole, at one point even started a flow diagram LOL). Please let me know if my changes are what you envisioned and clear for the average contributor.

Copy link
Contributor

Choose a reason for hiding this comment

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

Do you think this content deserves a new page now, outside of the style guide page? There is a lot of content now.

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 probably does. I'll wait for others to weigh in before making further changes. After a quick glance, a couple of other pages would need updating to reflect looking at both content guide and style guide before contributing.

@k8s-ci-robot k8s-ci-robot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed lgtm "Looks good to me", indicates that a PR is ready to be merged. size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Aug 19, 2019
@zacharysarah
Copy link
Contributor

@sftim

This is the only place in the style guide that abbreviates “Kubernetes” to “k8s”. I'm fine with the abbreviation but thought I'd call it out.

I'm not fine with it. 😆 I think @aimeeu (reasonably) copied over language from the issue, but it clearly needs refinement before it's ready for readers. Thanks for calling out the discrepancy!

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.

@aimeeu Good ongoing work. ✨ Unless it's explicitly stated as a requirement, please feel no obligation to reproduce specific language from an issue. As other reviewers note, the style guide sets the standard.

Please resolve feedback from other reviewers (thanks @kbhawkey and @sftim!) in order to continue.

@k8s-ci-robot k8s-ci-robot added the do-not-merge/invalid-commit-message Indicates that a PR should not merge because it has an invalid commit message. label Aug 20, 2019
@aimeeu
Copy link
Contributor Author

aimeeu commented Aug 20, 2019

@sftim - added linking to LF and LinuxAcademy training courses based on @zacharysarah's review of PR #15919

@k8s-ci-robot k8s-ci-robot removed the do-not-merge/invalid-commit-message Indicates that a PR should not merge because it has an invalid commit message. label Aug 20, 2019
@sftim
Copy link
Contributor

sftim commented Aug 20, 2019

Hi @aimeeu

The commit for this PR covers more changes than its description suggests.
It's not a huge problem, but you might want to reword to cover all the changes in the (squashed?) commit.

@sftim
Copy link
Contributor

sftim commented Aug 20, 2019

/lgtm

@k8s-ci-robot k8s-ci-robot added lgtm "Looks good to me", indicates that a PR is ready to be merged. and removed lgtm "Looks good to me", indicates that a PR is ready to be merged. labels Aug 20, 2019
@aimeeu
Copy link
Contributor Author

aimeeu commented Aug 20, 2019

Updated to include Linux Academy (LA) examples discussed during 20 Aug SIG Docs meeting. Decided that links to vendor-neutral LA courses are OK but not to vendor-specific LA courses.

/cc @jaypipes

@k8s-ci-robot
Copy link
Contributor

@aimeeu: GitHub didn't allow me to assign the following users: jaypipes.

Note that only kubernetes members, repo collaborators and people who have commented on this issue/PR can be assigned. Additionally, issues/PRs can only have 10 assignees at the same time.
For more information please see the contributor guide

In response to this:

Updated to include Linux Academy (LA) examples discussed during 20 Aug SIG Docs meeting. Decided that links to vendor-neutral LA courses is OK but not to vendor-specific LA courses.

/assign @jaypipes

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

Copy link
Contributor

@jaypipes jaypipes left a comment

Choose a reason for hiding this comment

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

Added some thoughts about how we categorize the third-party content in a way that is clear to the reader.


Kubernetes documentation only hosts content from projects within the
`kubernetes` or `kubernetes-sigs` GitHub organizations or from current CNCF
projects ([Graduated/Incubating](https://www.cncf.io/projects/), [Sandbox](https://www.cncf.io/sandbox-projects/)).
Copy link
Contributor

Choose a reason for hiding this comment

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

I would actually argue against the Kubernetes documentation hosting any content other than content for projects in the kubernetes or kubernetes-sigs GitHub organizations. Kubernetes documentation should be for Kubernetes things only.

Making this decision would allow a clear line to be drawn and also allow the docs team to avoid the sticky issue around whether to include CNCF sandboxed projects (which have a much lower bar) in documentation.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I tried to make it clear that project docs belong in the project's docs, with Kubernetes dos linking to the project's docs. I may have overdone "...a CNCF project or a project in the kubernetes or kubernetes-sigs GitHub organizations..." - I can be somewhat pedantic.

@@ -38,6 +38,32 @@ The English-language documentation uses U.S. English spelling and grammar.

{{< comment >}}[If you're localizing this page, you can omit the point about US English.]{{< /comment >}}

## Guidelines for Contributing content

Copy link
Contributor

Choose a reason for hiding this comment

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

* What does it mean to `host` content from projects ... ? Does this mean that CNCF incubating projects can publish their docs on kubernetes.io?

@kbhawkey raises an excellent question here. I think we should be as clear as possible. I would suggest using the word "include" instead of "host" (see explanation and suggested wording below).

In addition, we should explicitly call out the difference between "hosting" third-party content (the technical verbiage is actually included in the kubernetes/website source repository and published to docs.k8s.io) and linking to third-party content.

Perhaps a paragraph like this would work?

===

The Kubernetes documentation comprises the content of the kubernetes/website
source repository. The majority of the Kubernetes documentation is specific to the Kubernetes project. However, there are some scenarios where the Kubernetes documentation includes content from or about non-Kubernetes projects.

This content falls into the following categories:

  1. Instructional content involving non-Kubernetes projects during setup or operation of Kubernetes
  2. Detailed technical content about how to use a non-Kubernetes project or how that project is designed
  3. Content that describes a non-Kubernetes project
  4. Content that simply links to information about a non-Kubernetes project

.... and then we go into specific guidance on handling the above categories of external content ...

thoughts?

@aimeeu
Copy link
Contributor Author

aimeeu commented Aug 22, 2019

@jaypipes @sftim @kbhawkey @zacharysarah I went down the rabbit hole and rewrote the whole section, hopefully making the guidelines clear. Feedback appreciated.
https://deploy-preview-15892--kubernetes-io-master-staging.netlify.com/docs/contribute/style/style-guide/#guidelines-for-contributing-content

[kubernetes](https://github.com/kubernetes) and
[kubernetes-sigs](https://github.com/kubernetes-sigs) GitHub organizations if
those projects do not have their own documentation. Linking to active kubernetes,
kubernetes-sigs, and CNCF projects from the Kubernetes documentation is always
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
kubernetes-sigs, and CNCF projects from the Kubernetes documentation is always
kubernetes-sigs, and {{< glossary_tooltip text="CNCF" term_id="cncf" >}} projects from the Kubernetes documentation is always

?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

thanks @STIM for pointing out the glossary option! I moved the content guidelines to a new page as @kbhawkey suggested and added your tool tip to the text.

Add new section for content guidelines
Add table of examples of what is and is not allowed
Add examples of links to Linux Academy courses based on discussion
during the Aug 20 SIG Docs meeting.
Remove example table and reformat based on feedback
Move content guide to its own page
Update existing pages to mention new Content Guide page

Signed-off-by: Aimee Ukasick <aimeeu.opensource@gmail.com>
@k8s-ci-robot k8s-ci-robot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Aug 23, 2019
@aimeeu
Copy link
Contributor Author

aimeeu commented Aug 23, 2019

@sftim
Copy link
Contributor

sftim commented Aug 23, 2019

I like the new separate page.

@zacharysarah
Copy link
Contributor

@aimeeu This is ✨!

Thanks for incorporating all of this feedback—there was a lot!

Agreed with other reviewers that this belongs in a separate page. Good call, folks.

/lgtm
/approve

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Aug 27, 2019
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: zacharysarah

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 Aug 27, 2019
@k8s-ci-robot k8s-ci-robot merged commit c9d9e1b into kubernetes:master Aug 27, 2019
@sftim
Copy link
Contributor

sftim commented Aug 27, 2019

😕 I don't see https://kubernetes.io/docs/contribute/style/content-guide/ like I expected too, it's erroring with a 404 Not Found.

@zacharysarah
Copy link
Contributor

zacharysarah commented Aug 27, 2019

@sftim I don't see any of the changes. Maybe a DNS propagation issue?

EDIT: Ah, nope, we've got a failing build.

@aimeeu aimeeu deleted the 15576styleGuideVendorContent branch August 27, 2019 19:38
wahyuoi pushed a commit to wahyuoi/website that referenced this pull request Sep 9, 2019
Add new section for content guidelines
Add table of examples of what is and is not allowed
Add examples of links to Linux Academy courses based on discussion
during the Aug 20 SIG Docs meeting.
Remove example table and reformat based on feedback
Move content guide to its own page
Update existing pages to mention new Content Guide page

Signed-off-by: Aimee Ukasick <aimeeu.opensource@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/en Issues or PRs related to English 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/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Clarify style guide: eliminate most third party content
6 participants