Skip to content

Commit

Permalink
Merge pull request #1165 from cirocosta/docs-typos-and-consistency
Browse files Browse the repository at this point in the history
docs: fixes typos and makes config filename consistent
  • Loading branch information
maksimr committed Aug 20, 2014
2 parents 12836cc + 50d24a0 commit f1c567a
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion docs/about/03-migration.md
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ In some cases NPM can run into dependency tree issues during the migration proce
with an "unsatisfied peer dependency" error, removing all of the packages (`rm -rf ./node_modules`) and installing
them again should clear up the issue.

If you have any other issuses, please ask on the [mailing list].
If you have any other issues, please ask on the [mailing list].


[mailing list]: https://groups.google.com/forum/?fromgroups#!forum/karma-users
4 changes: 2 additions & 2 deletions docs/dev/02-making-changes.md
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ Checkout a new branch and name it accordingly to what you intend to do:
$ git checkout -b <branch_name>
```

Open your favourite editor, make some changes, run the tests, change the code, run the tests,
Open your favorite editor, make some changes, run the tests, change the code, run the tests,
change the code, run the tests, etc.

- Please follow http://nodeguide.com/style.html (with exception of 100 characters per line).
Expand All @@ -72,7 +72,7 @@ change the code, run the tests, etc.
```bash
$ git push origin <branch_name>
```
- Go to the github page and click "Open a Pull reguest".
- Go to the GitHub page and click "Open a Pull request".
- Write a good description of the change.

After sending a pull request, other developers will review and discuss your change.
Expand Down
2 changes: 1 addition & 1 deletion docs/intro/02-configuration.md
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ Some configurations, which are already present within the configuration file, ca
as a command line argument for when Karma is executed.

```bash
karma start karma-conf.js --log-level debug --single-run
karma start my.conf.js --log-level debug --single-run
```

Try `karma start --help` if you want to see all available options.
Expand Down
2 changes: 1 addition & 1 deletion docs/plus/03-jenkins.md
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ from, etc.)
## Configure the Build Environment
First go to the job page and click on configure. Then in the Build
Environment sub-section, check the “Inject environment
variables to the build process checkbox. A few textboxes will
variables to the build process' checkbox. A few textboxes will
appear and in the “Properties Content” box set the following:
```bash
Expand Down
4 changes: 2 additions & 2 deletions docs/plus/08-emberjs.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ To execute javascript unit and integration tests with ember.js follow the steps
npm install karma-ember-preprocessor --save-dev
```

4. genenerate a configuration file for karma
4. generate a configuration file for karma
```bash
karma init
```
Expand Down Expand Up @@ -80,7 +80,7 @@ To execute javascript unit and integration tests with ember.js follow the steps
});
```
5. add a simple qunit test
5. add a simple Qunit test
```javascript
test('one should equal one', function() {
Expand Down

0 comments on commit f1c567a

Please sign in to comment.