diff --git a/docs/about/03-migration.md b/docs/about/03-migration.md index cd74cfff4..272971bab 100644 --- a/docs/about/03-migration.md +++ b/docs/about/03-migration.md @@ -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 diff --git a/docs/dev/02-making-changes.md b/docs/dev/02-making-changes.md index aeb86ed58..6c64ba3ae 100644 --- a/docs/dev/02-making-changes.md +++ b/docs/dev/02-making-changes.md @@ -56,7 +56,7 @@ Checkout a new branch and name it accordingly to what you intend to do: $ git checkout -b ``` -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). @@ -72,7 +72,7 @@ change the code, run the tests, etc. ```bash $ git push origin ``` -- 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. diff --git a/docs/intro/02-configuration.md b/docs/intro/02-configuration.md index cda8d570d..e6526bc91 100644 --- a/docs/intro/02-configuration.md +++ b/docs/intro/02-configuration.md @@ -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. diff --git a/docs/plus/03-jenkins.md b/docs/plus/03-jenkins.md index 68410ef03..842d7ae9a 100644 --- a/docs/plus/03-jenkins.md +++ b/docs/plus/03-jenkins.md @@ -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 diff --git a/docs/plus/08-emberjs.md b/docs/plus/08-emberjs.md index dc34f31f8..f071ed4d3 100644 --- a/docs/plus/08-emberjs.md +++ b/docs/plus/08-emberjs.md @@ -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 ``` @@ -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() {