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

docs: move docs branch sections from readme to contrib guide #1902

Merged
merged 26 commits into from
Oct 2, 2023

Conversation

ShivangShandilya
Copy link
Contributor

This PR closes: #1863

This PR adds Publishing Section in our docs contributing guide as it gives a pretty good idea in what happens when things are merged in page and main branch.

Signed-off-by: Shivang Shandilya <101946115+ShivangShandilya@users.noreply.github.com>
@ShivangShandilya ShivangShandilya requested review from a team as code owners August 21, 2023 04:13
@github-actions github-actions bot added the documentation Improvements or additions to documentation label Aug 21, 2023
@netlify
Copy link

netlify bot commented Aug 21, 2023

Deploy Preview for keptn-lifecycle-toolkit ready!

Name Link
🔨 Latest commit 827e4f8
🔍 Latest deploy log https://app.netlify.com/sites/keptn-lifecycle-toolkit/deploys/651702ec8216430008a36360
😎 Deploy Preview https://deploy-preview-1902--keptn-lifecycle-toolkit.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 configuration.

Copy link
Member

@mowies mowies left a comment

Choose a reason for hiding this comment

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

This looks good in general, but please remove the copied sections from the readme and instead link to the newly created sections so that we don't have duplicated content. That should improve maintainability in the future.

docs/CONTRIBUTING.md Outdated Show resolved Hide resolved
@mowies
Copy link
Member

mowies commented Aug 21, 2023

Also, please run markdownlint-fix in the docs folder and fix any remaining markdown lint issues. You can find the list of issues in the failing PR check.

@mowies mowies changed the title docs: add documentation to reflect what happens when things are merged into the page branch and main branch. docs: move docs branch sections from readme to contrib guide Aug 21, 2023
ShivangShandilya and others added 2 commits August 22, 2023 10:48
Co-authored-by: Moritz Wiesinger <moritz.wiesinger@dynatrace.com>
Signed-off-by: Shivang Shandilya <101946115+ShivangShandilya@users.noreply.github.com>
@ShivangShandilya
Copy link
Contributor Author

Also, please run markdownlint-fix in the docs folder and fix any remaining markdown lint issues. You can find the list of issues in the failing PR check.

Shows no issues when running the command
Screenshot from 2023-08-22 10-55-57

Signed-off-by: Shivang Shandilya <101946115+ShivangShandilya@users.noreply.github.com>
Signed-off-by: Shivang Shandilya <101946115+ShivangShandilya@users.noreply.github.com>
@ShivangShandilya
Copy link
Contributor Author

ShivangShandilya commented Aug 23, 2023

@mowies take a look at the new changes I made I have tried changing the content a bit so it doesn't look duplicated.
Also, I have added a new block (we can remove it if you don't like it) a FAQs block, I have taken ques from the community meeting docs and placed them over here.

Reason: I found these ques to answer queries that a new contributor might have when contributing to docs, we can further add ques if in future some new queries arise.
Result: A thorough read of the docs contributing guide should almost solve all the queries of the contributor

I was quite hesitant to make this change but I think its a good addition overall but I can remove it if you say otherwise 😅

Signed-off-by: Shivang Shandilya <101946115+ShivangShandilya@users.noreply.github.com>
Copy link
Member

@mowies mowies left a comment

Choose a reason for hiding this comment

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

LGTM, i would just put the FAQ content into the other sections

docs/CONTRIBUTING.md Outdated Show resolved Hide resolved
Signed-off-by: Shivang Shandilya <101946115+ShivangShandilya@users.noreply.github.com>
Copy link
Member

@mowies mowies left a comment

Choose a reason for hiding this comment

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

I suggested a slightly different version. See if you like it :)

docs/CONTRIBUTING.md Outdated Show resolved Hide resolved
Signed-off-by: Moritz Wiesinger <moritz.wiesinger@dynatrace.com>
@mowies
Copy link
Member

mowies commented Aug 24, 2023

@ShivangShandilya I fixed the markdownlint issues. If you apply my suggestion, also the last error should get fixed.

Co-authored-by: Moritz Wiesinger <moritz.wiesinger@dynatrace.com>
Signed-off-by: Shivang Shandilya <101946115+ShivangShandilya@users.noreply.github.com>
@StackScribe
Copy link
Contributor

Also, please run markdownlint-fix in the docs folder and fix any remaining markdown lint issues. You can find the list of issues in the failing PR check.

Shows no issues when running the command Screenshot from 2023-08-22 10-55-57

If make markdownlint-fix shows 0 errors, it means that it was able to correct all the issues it found, not that it did not find any issues.

Signed-off-by: Shivang Shandilya <101946115+ShivangShandilya@users.noreply.github.com>
mowies
mowies previously approved these changes Aug 28, 2023
@StackScribe
Copy link
Contributor

This is a nice start but it is supposed to be in the "Documentation contributions" section of the "Contributing" guide that is accessed from the "Contributing" tab on the Keptn screen. To implement this:

  1. Go to the docs/content/en/contribute/docs directory
  2. Create a sub-directory with a meaningful name, perhaps versions
  3. Create an _index.md file in that directory.
  4. Add a header block to that index.md file. You can copy the header block from the file in the local-building/_index.md file. I suggest using a weight of 425. This locates it after the local-building page but close, which seems logical.

Add your text after this header block, with one blank line after the header box.

@StackScribe
Copy link
Contributor

StackScribe commented Aug 28, 2023

You need an introductory paragraph that begins with a good topic sentence. Something like "Keptn documentation is versioned. By default, the version for the current Keptn release is displayed on the documentation page but users can select other versions from the Releases tab. The following are available:`

Then maybe use the first list you have, but I would put the Official Documentation first, followed by the Development branch, then add a third item for "Documentation for previous releases.

I'll comment your file further with some other suggestions. Do not slavishly follow my suggestions -- they have too much duplicated information. I think it's good information but you can decide where it goes. It may make sense to have the bullet list in the introduction be very brief: just "Latest", "Development", "Old versions", and "Contribute" then move all the details about each into the sections below.

docs/CONTRIBUTING.md Outdated Show resolved Hide resolved
docs/CONTRIBUTING.md Outdated Show resolved Hide resolved
ShivangShandilya and others added 6 commits September 9, 2023 22:39
Co-authored-by: Meg McRoberts <meg.mcroberts@dynatrace.com>
Signed-off-by: Shivang Shandilya <101946115+ShivangShandilya@users.noreply.github.com>
Co-authored-by: Meg McRoberts <meg.mcroberts@dynatrace.com>
Signed-off-by: Shivang Shandilya <101946115+ShivangShandilya@users.noreply.github.com>
Co-authored-by: Meg McRoberts <meg.mcroberts@dynatrace.com>
Signed-off-by: Shivang Shandilya <101946115+ShivangShandilya@users.noreply.github.com>
Co-authored-by: Giovanni Liva <giovanni.liva@dynatrace.com>
Signed-off-by: Shivang Shandilya <101946115+ShivangShandilya@users.noreply.github.com>
Co-authored-by: Meg McRoberts <meg.mcroberts@dynatrace.com>
Signed-off-by: Shivang Shandilya <101946115+ShivangShandilya@users.noreply.github.com>
Co-authored-by: Meg McRoberts <meg.mcroberts@dynatrace.com>
Signed-off-by: Shivang Shandilya <101946115+ShivangShandilya@users.noreply.github.com>
@ShivangShandilya
Copy link
Contributor Author

I'll just work on this ASAP, sorry for taking so long 🥲

ShivangShandilya and others added 2 commits September 11, 2023 18:26
Co-authored-by: Meg McRoberts <meg.mcroberts@dynatrace.com>
Signed-off-by: Shivang Shandilya <101946115+ShivangShandilya@users.noreply.github.com>
Signed-off-by: Shivang Shandilya <101946115+ShivangShandilya@users.noreply.github.com>
@ShivangShandilya
Copy link
Contributor Author

@StackScribe I have made some changes, please take a look.
I have gone along with the bullet list suggestion as I think it's a good one.
Also I have added the Previous Versions block after the Development block and also rephrased some of the documentation so that it doesn't look duplicated.
I think it looks much better than before but more suggestions are appreciated 😄

@RealAnna
Copy link
Contributor

@ShivangShandilya this is 🚀 , if you fix the markdown errors we can merge this so everyone will finally know how to edit docs pages 👍

Copy link
Member

@rakshitgondwal rakshitgondwal left a comment

Choose a reason for hiding this comment

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

These suggestions should help you with the markdownlint errors @ShivangShandilya

ShivangShandilya and others added 4 commits September 29, 2023 22:31
Co-authored-by: Rakshit Gondwal <98955085+rakshitgondwal@users.noreply.github.com>
Signed-off-by: Shivang Shandilya <101946115+ShivangShandilya@users.noreply.github.com>
Co-authored-by: Rakshit Gondwal <98955085+rakshitgondwal@users.noreply.github.com>
Signed-off-by: Shivang Shandilya <101946115+ShivangShandilya@users.noreply.github.com>
Co-authored-by: Rakshit Gondwal <98955085+rakshitgondwal@users.noreply.github.com>
Signed-off-by: Shivang Shandilya <101946115+ShivangShandilya@users.noreply.github.com>
Co-authored-by: Rakshit Gondwal <98955085+rakshitgondwal@users.noreply.github.com>
Signed-off-by: Shivang Shandilya <101946115+ShivangShandilya@users.noreply.github.com>
@ShivangShandilya
Copy link
Contributor Author

These suggestions should help you with the markdownlint errors @ShivangShandilya

Thanks @rakshitgondwal for helping me out here 🚀

@sonarcloud
Copy link

sonarcloud bot commented Sep 29, 2023

Kudos, SonarCloud Quality Gate passed!    Quality Gate passed

Bug A 0 Bugs
Vulnerability A 0 Vulnerabilities
Security Hotspot A 0 Security Hotspots
Code Smell A 0 Code Smells

No Coverage information No Coverage information
No Duplication information No Duplication information

@mowies mowies merged commit 1965c16 into keptn:main Oct 2, 2023
15 checks passed
@mowies
Copy link
Member

mowies commented Oct 2, 2023

thanks for your contribution @ShivangShandilya !

@ShivangShandilya ShivangShandilya deleted the docs-contributing branch October 2, 2023 13:32
StackScribe added a commit to StackScribe/lifecycle-toolkit that referenced this pull request Oct 13, 2023
)

Co-authored-by: Moritz Wiesinger <moritz.wiesinger@dynatrace.com>
Co-authored-by: Meg McRoberts <meg.mcroberts@dynatrace.com>
Co-authored-by: Giovanni Liva <giovanni.liva@dynatrace.com>
Co-authored-by: Rakshit Gondwal <98955085+rakshitgondwal@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
documentation Improvements or additions to documentation
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Docs contributing guide should reflect what to do with page and main branch
6 participants