Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Docs: use more common spelling (#11417)
  • Loading branch information
aladdin-add authored and not-an-aardvark committed Feb 21, 2019
1 parent b9aabe3 commit ce0777d
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
4 changes: 2 additions & 2 deletions docs/developer-guide/code-conventions.md
Expand Up @@ -169,7 +169,7 @@ Operators with two operands must be preceded and followed by a single space to m

## Parentheses Spacing

When parentheses are used, there should be no white space immediately after the opening paren or immediately before the closing paren.
When parentheses are used, there should be no whitespace immediately after the opening paren or immediately before the closing paren.

// Good
var found = (values[i] === item);
Expand Down Expand Up @@ -895,7 +895,7 @@ The `try` class of statements should have the following form:
statements
}

## White Space
## Whitespace

Blank lines improve readability by setting off sections of code that are logically related.

Expand Down
4 changes: 2 additions & 2 deletions docs/maintainer-guide/releases.md
Expand Up @@ -30,15 +30,15 @@ On the day of a scheduled release, the release team should follow these steps:
* Have been open at least two days and have been reviewed (these are just waiting for merge).
* Important pull requests (as determined by the team). You should stop and have people review before merging if they haven't been already.
* Documentation changes.
* Small bug fixes written by a team member.
* Small bugfixes written by a team member.
1. Log into Jenkins and schedule a build for the "ESLint Release" job.
1. Watch the console output of the build on Jenkins. At some point, the build will pause and a link will be produced with an input field for a six-digit 2FA code.
1. Enter the current six-digit 2FA code from your authenticator app. (Also see: [npm-2fa](./npm-2fa))
1. Continue the build and wait for it to finish.
1. Update the release blog post with a "Highlights" section, including new rules and anything else that's important.
1. Make a release announcement in the public chatroom.
1. Make a release announcement on Twitter.
1. Make a release announcement on the release issue. Document any problems that occurred during the release, and remind the team not to merge anything other than documentation changes and bug fixes. Leave the release issue open.
1. Make a release announcement on the release issue. Document any problems that occurred during the release, and remind the team not to merge anything other than documentation changes and bugfixes. Leave the release issue open.
1. Add the `patch release pending` label to the release issue. (When this label is present, `eslint-github-bot` will create a pending status check on non-semver-patch pull requests, to ensure that they aren't accidentally merged while a patch release is pending.)

On the Monday following the scheduled release, the release team needs to determine if a patch release is necessary. A patch release is considered necessary if any of the following occurred since the scheduled release:
Expand Down
2 changes: 1 addition & 1 deletion docs/user-guide/configuring.md
Expand Up @@ -617,7 +617,7 @@ The complete configuration hierarchy, from highest precedence to lowest preceden
1. Project-level configuration:
1. `.eslintrc.*` or `package.json` file in same directory as linted file
1. Continue searching for `.eslintrc` and `package.json` files in ancestor directories (parent has highest precedence, then grandparent, etc.), up to and including the root directory or until a config with `"root": true` is found.
1. In the absence of any configuration from (1) thru (3), fall back to a personal default configuration in `~/.eslintrc`.
1. In the absence of any configuration from (1) through (3), fall back to a personal default configuration in `~/.eslintrc`.

## Extending Configuration Files

Expand Down

0 comments on commit ce0777d

Please sign in to comment.