Skip to content

Fix a couple of typos in contributing.md #679

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

Closed
tagatac wants to merge 1 commit into from
Closed

Fix a couple of typos in contributing.md #679

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions contributing.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ When resolving JIRAs, observe a few useful conventions:
- In case several people contributed, prefer to assign to the more 'junior', non-committer contributor
- For issues that can't be reproduced against master as reported, resolve as **Cannot Reproduce**
- Fixed is reasonable too, if it's clear what other previous pull request resolved it. Link to it.
- If the issue is the same as or a subset of another issue, resolved as **Duplicate**
- If the issue is the same as or a subset of another issue, resolve as **Duplicate**
- Make sure to link to the JIRA it duplicates
- Prefer to resolve the issue that has less activity or discussion as the duplicate
- If the issue seems clearly obsolete and applies to issues or components that have changed
Expand Down Expand Up @@ -479,7 +479,7 @@ lines can be up to 100 characters in length, not 79.
- For R code, Apache Spark follows
<a href="https://google.github.io/styleguide/Rguide.xml">Google's R Style Guide</a> with three exceptions:
lines can be up to 100 characters in length, not 80, there is no limit on function name but it has a initial
lower case latter and S4 objects/methods are allowed.
lower case letter and S4 objects/methods are allowed.
- For Java code, Apache Spark follows
<a href="http://www.oracle.com/technetwork/java/codeconvtoc-136057.html">Oracle's Java code conventions</a> and
Scala guidelines below. The latter is preferred.
Expand Down
4 changes: 2 additions & 2 deletions site/contributing.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -278,7 +278,7 @@ <h2>Contributing to JIRA maintenance</h2>
<li>Fixed is reasonable too, if it&#8217;s clear what other previous pull request resolved it. Link to it.</li>
</ul>
</li>
<li>If the issue is the same as or a subset of another issue, resolved as <strong>Duplicate</strong>
<li>If the issue is the same as or a subset of another issue, resolve as <strong>Duplicate</strong>
<ul>
<li>Make sure to link to the JIRA it duplicates</li>
<li>Prefer to resolve the issue that has less activity or discussion as the duplicate</li>
Expand Down Expand Up @@ -692,7 +692,7 @@ <h2>Code style guide</h2>
<li>For R code, Apache Spark follows
<a href="https://google.github.io/styleguide/Rguide.xml">Google&#8217;s R Style Guide</a> with three exceptions:
lines can be up to 100 characters in length, not 80, there is no limit on function name but it has a initial
lower case latter and S4 objects/methods are allowed.</li>
lower case letter and S4 objects/methods are allowed.</li>
<li>For Java code, Apache Spark follows
<a href="http://www.oracle.com/technetwork/java/codeconvtoc-136057.html">Oracle&#8217;s Java code conventions</a> and
Scala guidelines below. The latter is preferred.</li>
Expand Down