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

Rewrite Contributing and readme #4416

Merged
merged 21 commits into from
Jul 19, 2023
Merged
Show file tree
Hide file tree
Changes from 11 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
146 changes: 115 additions & 31 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -1,60 +1,144 @@
- [Creating an issue](#creating-an-issue)
- [Contributing content](#contributing-content)
- [Documentation workflow](#documentation-workflow)
kolchfa-aws marked this conversation as resolved.
Show resolved Hide resolved
- [Before you start](#before-you-start)
- [Making minor changes](#making-minor-changes)
- [Making major changes](#making-major-changes)
- [Setting up your local copy of the repository](#setting-up-your-local-copy-of-the-repository)
- [Making, viewing, and submitting changes](#making-viewing-and-submitting-changes)
- [Review process](#review-process)
- [Style linting](#style-linting)
- [Getting help](#getting-help)

# Contributing Guidelines
kolchfa-aws marked this conversation as resolved.
Show resolved Hide resolved

Thank you for your interest in improving the OpenSource documentation! We value and appreciate all feedback and contributions from our community, including requests for additional documentation, corrections to existing content, and to report technical issues with the documentation site.
Thank you for your interest in improving the OpenSource documentation! We value and appreciate all feedback and contributions from our community, including requests for additional documentation, corrections to existing content, and reports of technical issues with the documentation site.
kolchfa-aws marked this conversation as resolved.
Show resolved Hide resolved

You can [create an issue](#creating-an-issue) asking us to change the documentation or [contribute content](#contributing-content) yourself.

NOTE: If you’d like to contribute but don't know where to start, try browsing existing [issues](https://github.com/opensearch-project/documentation-website/issues). Our projects use custom GitHub issue labels for status, version, type of request, and so on, but we recommend looking at any issues labeled `good first issue` first.
Copy link
Collaborator

Choose a reason for hiding this comment

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

Should we mention the help wanted label as well?


## Creating an issue

Use the documentation issue template to describe the change you'd like to make.
kolchfa-aws marked this conversation as resolved.
Show resolved Hide resolved

1. Go to https://github.com/opensearch-project/documentation-website/issues and select **New issue**.
1. Enter the requested information, including as much detail as possible, especially which version or versions the request affects.
1. Select **Submit new issue**.

The `untriaged` label is assigned automatically. During the triage process, the documentation team will add the appropriate labels, assign the issue to a technical writer, and prioritize the request. We may follow up with you for additional information.
kolchfa-aws marked this conversation as resolved.
Show resolved Hide resolved

## Contributing content

There are two ways to contribute content depending on the magnitude of the change:
kolchfa-aws marked this conversation as resolved.
Show resolved Hide resolved

- [Minor changes](#making-minor-changes): For small changes to existing files, like fixing typos or adding parameters, you can edit files in GitHub directly. This approach does not require cloning the repository and does not allow you to test the documentation.
- [Major changes](#making-major-changes): For changes you want to test first, like adding new or reorganizing pages or adding a table or section, you can edit files locally and push the changes to GitHub. This approach requires setting up a local version of the repository and lets you test documentation.
kolchfa-aws marked this conversation as resolved.
Show resolved Hide resolved

### Contribution workflow

The workflow for contributing documentation is no different than the one for contributing code:
kolchfa-aws marked this conversation as resolved.
Show resolved Hide resolved

- Make your changes
kolchfa-aws marked this conversation as resolved.
Show resolved Hide resolved
- Build the documentation website to check your work (only possible if you are making changes locally)
kolchfa-aws marked this conversation as resolved.
Show resolved Hide resolved
- Submit a [pull request](https://github.com/opensearch-project/documentation-website/pulls) (PR)
kolchfa-aws marked this conversation as resolved.
Show resolved Hide resolved
- Maintainers review and merge your PR
kolchfa-aws marked this conversation as resolved.
Show resolved Hide resolved

### Before you start

Before contributing content, make sure to read the following resources:
- [README](README.md)
- [OpenSearch Project Style Guidelines](STYLE_GUIDE.md)
- [API Style Guide](API_STYLE_GUIDE.md)
- [Formatting Guide](FORMATTING_GUIDE.md)

NOTE: Please make sure that any documentation you submit is your work or work that you have the rights to submit. We respect the intellectual property rights of others, and as part of contributing, we'll ask you to sign your contribution with a [Developer Certificate of Origin (DCO)](https://github.com/opensearch-project/.github/blob/main/CONTRIBUTING.md#developer-certificate-of-origin) that states you have the rights to submit this work and you understand we'll use your contribution.
kolchfa-aws marked this conversation as resolved.
Show resolved Hide resolved

### Making minor changes

If you want to make minor changes to an existing file, you can use this approach:

1. [Fork this repository](https://docs.github.com/en/get-started/quickstart/fork-a-repo).

1. In your fork on GitHub, navigate to the file that you want to change.

1. In the upper-right corner, select the dropdown with the pencil icon and select **Edit in place**. Edit the file.
Copy link
Collaborator

Choose a reason for hiding this comment

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

Why do they have to use the "Edit in place" option? They can also just select the pencil icon, which defaults to editing through GitHub automatically?


1. In the upper-right corner, select **Commit changes...***. Enter the commit message and optional description and select **Create a new branch for this commit and start a pull request**.

### Making major changes

If you're adding new pages or making major changes to the documentation, we recommend that you work in a local copy of the repository and test the rendered HTML before submitting a pull request.
kolchfa-aws marked this conversation as resolved.
Show resolved Hide resolved

#### Setting up your local copy of the repository

Follow these steps to set up your local copy of the repository:

1. [Fork this repository](https://docs.github.com/en/get-started/quickstart/fork-a-repo) and clone your fork.

1. Navigate to the repository root.
kolchfa-aws marked this conversation as resolved.
Show resolved Hide resolved

The OpenSearch documentation team is dedicated to providing complete and best-in-class documentation. Thank you for your patience as we build our documentation team and content library. We appreciate your support and patience.
1. Install [Ruby](https://www.ruby-lang.org/en/) if you don't already have it. We recommend [RVM](https://rvm.io/), but use whatever method you prefer:
kolchfa-aws marked this conversation as resolved.
Show resolved Hide resolved

## How to request changes
```
curl -sSL https://get.rvm.io | bash -s stable
rvm install 2.6
kolchfa-aws marked this conversation as resolved.
Show resolved Hide resolved
ruby -v
```

Before entering a change request, please read this document carefully. We want to make sure we have all the information necessary to effectively respond to your contribution.
1. Install [Jekyll](https://jekyllrb.com/) if you don't already have it:

There are two ways to contribute: 1) create an issue where you describe the change and 2) create a pull request that contains the content to directly insert into the documentation.
```
gem install bundler jekyll
```

**Create an Issue**
1. Install dependencies:
kolchfa-aws marked this conversation as resolved.
Show resolved Hide resolved

Use the Github issue tracker to describe the change you'd like to make.
```
bundle install
```

1. Go to https://github.com/opensearch-project/documentation-website/issues and select *New issue*.
2. Enter the requested information and include as much detail as possible, especially which version or versions the request affects.
3. Select *Submit new issue*.
#### Making, viewing, and submitting changes

Here's how to build the website, make the changes, and view them locally:
kolchfa-aws marked this conversation as resolved.
Show resolved Hide resolved

The ‘untriaged’ label is assigned automatically. During the triage process, the documentation team will add the appropriate labels, assign the issue to a technical writer, and prioritize the request. We may follow up with you for additional information.
1. Build the website:

```
sh build.sh
```

**Create a pull request**
The build script should automatically open your web browser, but if it doesn't, open [http://localhost:4000/docs/](http://localhost:4000/docs/).

If you’d like to make a change directly to the content, create a pull request. If it’s a quick fix, we should be able to release the update quickly. Bigger requests might take a bit of time for us to review.
1. Create a new branch against the latest source on the main branch.

Note that a pull request requires DCO sign off before we can merge it. You can use the -s command line option to append this automatically to your commit message, for example $ git commit -s -m 'This is my commit message'. For more information, see https://github.com/apps/dco.
1. Edit the Markdown files that you want to change.

Before submitting, make sure to:
1. When you save a file, marvel as Jekyll automatically rebuilds the site and refreshes your web browser. This process can take anywhere from 10 to 30 seconds.
Copy link
Collaborator

Choose a reason for hiding this comment

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

The build takes longer on most machines now.

Suggested change
1. When you save a file, marvel as Jekyll automatically rebuilds the site and refreshes your web browser. This process can take anywhere from 10 to 30 seconds.
1. When you save a file, Jekyll automatically rebuilds the site and refreshes your web browser. This process can take anywhere from 60 - 90 seconds.


* Work against the latest source on the main branch.
* Check existing open and recently merged pull requests to ensure that someone else hasn't addressed the problem already.
* If the change requires significant work, open an issue where we can first discuss your request.
1. When you're happy with how everything looks, commit, [sign off](https://github.com/src-d/guide/blob/9171d013c648236c39faabcad8598be3c0cf8f56/developer-community/fix-DCO.md#how-to-prevent-missing-sign-offs-in-the-future), push your changes to your fork, and submit a pull request.
kolchfa-aws marked this conversation as resolved.
Show resolved Hide resolved

To create a pull request:
Note that a pull request requires DCO sign-off before we can merge it. You can use the -s command line option to append this automatically to your commit message, for example `git commit -s -m 'This is my commit message'`. For more information, see https://github.com/apps/dco.
kolchfa-aws marked this conversation as resolved.
Show resolved Hide resolved

1. Fork the repository.
2. Modify the source. Make sure to focus on the specific change you are contributing. For example, if you also reformat the code, it will be hard for us to focus on your change.
3. Test the code. Make sure that any local tests pass.
4. Commit to your fork using clear commit messages.
5. Create the [pull request](https://github.com/opensearch-project/documentation-website/pulls) and save it, making sure to answer the default questions in the pull request template.
## Review process

If you need additional support, GitHub provides documentation on [forking a repository](https://help.github.com/articles/fork-a-repo/) and [creating a pull request](https://help.github.com/articles/creating-a-pull-request/).
We greatly appreciate everyone who takes the time to make a contribution. We will review all contributions as quickly as possible. If it’s a quick fix, we should be able to release the update quickly. Bigger requests might take a bit of time for us to review.
kolchfa-aws marked this conversation as resolved.
Show resolved Hide resolved

During the PR process, expect that there will be some back-and-forth. Please try to respond to comments in a timely fashion, and if you don't want to continue with the PR, let us know.
kolchfa-aws marked this conversation as resolved.
Show resolved Hide resolved

## Finding contributions to work on
We use the [Vale](https://github.com/errata-ai/vale) linter to ensure that our documentation adheres to the [OpenSearch Project Style Guidelines](STYLE_GUIDE.md). Addressing Vale comments on the PR expedites the review process. You can also install Vale locally so you can address the comments before creating a PR. For more information, see [Style linting](README.md#style-linting).

If you’d like to contribute but don't know where to start, try browsing existing issues. Our projects use custom GitHub issue labels for status, version, type of request, etc., but we recommend looking at any issues labeled “good first issue” first.
If we accept the PR, we will merge your change and usually take care of backporting it to appropriate branches ourselves.
kolchfa-aws marked this conversation as resolved.
Show resolved Hide resolved
Copy link
Collaborator

Choose a reason for hiding this comment

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

Do we need to include "usually" here? If we usually do it, shouldn't we always do it? Then we could just say "If we accept the PR, we will merge it and backport it to the appropriate branches."


### Style linting

## Security issue notifications
To ensure that our documentation adheres to the [OpenSearch Project Style Guidelines](STYLE_GUIDE.md) we use the [Vale](https://github.com/errata-ai/vale) linter. Addressing Vale comments on the PR expedites the review process. You can also install Vale locally as follows so you can address the comments before creating a PR:
kolchfa-aws marked this conversation as resolved.
Show resolved Hide resolved

If you discover a potential security issue in this project we ask that you notify AWS/Amazon Security via our [vulnerability reporting page](http://aws.amazon.com/security/vulnerability-reporting/). Please do **not** create a public github issue.
1. Run `brew install vale`.
2. Run `vale *` from the documentation site root directory to lint all Markdown files. To lint a specific file, run `vale /path/to/file`.

Optionally, you can install the [Vale VSCode](https://github.com/chrischinchilla/vale-vscode) extension that integrates Vale with Visual Studio Code. By default, only _errors_ and _warnings_ are underlined. To change the minimum alert level to include _suggestions_, go to **Vale VSCode** > **Extension Settings** and select **suggestion** in the **Vale > Vale CLI: Min Alert Level** dropdown list.
Copy link
Collaborator

Choose a reason for hiding this comment

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

If there is only one extension that does this, then it should be "the Vale VSCode extension, which integrates..."


## Licensing
## Getting help

See the [LICENSE](LICENSE) file for our project's licensing.
For help with any step in the contributing process, please reach out to one of the [points of contact](README.md#points-of-contact).
kolchfa-aws marked this conversation as resolved.
Show resolved Hide resolved
17 changes: 17 additions & 0 deletions FORMATTING_GUIDE.md
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,23 @@ This guide provides an overview of the formatted elements commonly used in the O

## Adding pages or sections

This repository contains [Markdown](https://guides.github.com/features/mastering-markdown/) files organized into Jekyll _collections_ (for example, `_api-reference` or `_dashboards`). Each Markdown file corresponds to one page on the website.

In addition to the content for a given page, each Markdown file contains some Jekyll [front matter](https://jekyllrb.com/docs/front-matter/) similar to the following:

```
---
layout: default
title: Date
nav_order: 25
has_children: false
parent: Date field types
grand_parent: Supported field types
---
```

If you want to reorganize content or add new pages, keep an eye on `has_children`, `parent`, `grand_parent`, and `nav_order`, which define the hierarchy and order of pages in the left navigation.
kolchfa-aws marked this conversation as resolved.
Show resolved Hide resolved
Copy link
Collaborator

Choose a reason for hiding this comment

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

Can we use something other than the idiomatic "keep an eye on"? Also, do we need both "hierarchy" and "order", or does "hierarchy" already denote order?


When adding a page or a section, make the `nav_order` of the child pages multiples of 10. For example, if you have a parent page `Clients`, make child pages `Java`, `Python`, and `JavaScript` have a `nav_order` of 10, 20, and 30, respectively. Doing so makes inserting additional child pages easier because it does not require you to renumber existing pages.

Each collection must have an `index.md` file that corresponds to the collection's index page. In the `index.md` file's front matter, specify `nav_excluded: true` so that the page does not appear separately under the collection.
Expand Down
Loading