[cordova-coho] branch master updated: Fix spelling

[no...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

normanbreau pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cordova-coho.git


The following commit(s) were added to refs/heads/master by this push:
     new b2d6ddf  Fix spelling
     new bdcb072  Merge pull request #278 from jbampton/fix-spelling
b2d6ddf is described below

commit b2d6ddfd6c9b798c174c31b699daaf5b4028703e
Author: John Bampton <jb...@users.noreply.github.com>
AuthorDate: Thu Dec 10 16:11:46 2020 +1000

    Fix spelling
---
 docs/coho-release-process.md     | 2 +-
 docs/processing-pull-requests.md | 4 ++--
 spec/gitutil.spec.js             | 2 +-
 src/executil.js                  | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/docs/coho-release-process.md b/docs/coho-release-process.md
index d74b48e..28103c8 100644
--- a/docs/coho-release-process.md
+++ b/docs/coho-release-process.md
@@ -62,7 +62,7 @@ See if any dependencies are outdated
 
     (cd cordova-coho && npm outdated --depth=0)
 
-Update them in each project's `package.json` file. Make sure to run through the test section below for compatability issues. The `--depth=0` prevents from listing dependencies of dependencies. 
+Update them in each project's `package.json` file. Make sure to run through the test section below for compatibility issues. The `--depth=0` prevents from listing dependencies of dependencies. 
 
 ## Update Release Notes & Version
 
diff --git a/docs/processing-pull-requests.md b/docs/processing-pull-requests.md
index 31703d4..3b6aca4 100644
--- a/docs/processing-pull-requests.md
+++ b/docs/processing-pull-requests.md
@@ -75,7 +75,7 @@ _Thanks for the pull request. I've had a look at it and think it looks good. Bef
 
 There are two ways to merge a PR.
 
-The goal is to have one or more commits in `master` that are connected to both the original author and you as the commiter, and include the JIRA issue number in the form CB-#### (no "[]"'s, no ":").
+The goal is to have one or more commits in `master` that are connected to both the original author and you as the committer, and include the JIRA issue number in the form CB-#### (no "[]"'s, no ":").
 
 Example commit message:
 
@@ -99,7 +99,7 @@ This command will do the following:
 * Attempt a `--ff-only` merge to master. If this fails, then: 
     * Perform a rebase of the `pr/pr#` branch.
     * Attempt a `--ff-only` merge to master. 
-    * On success, it will modify the last commit's message to include. 'This closes #pr' to ensure the corresponding PR closes on pushing to remote.
+    * On success, it will modify the last commits message to include. 'This closes #pr' to ensure the corresponding PR closes on pushing to remote.
 
 You then should:
  * Squash as many commits as is reasonable together.
diff --git a/spec/gitutil.spec.js b/spec/gitutil.spec.js
index 1588055..e1f6ac6 100644
--- a/spec/gitutil.spec.js
+++ b/spec/gitutil.spec.js
@@ -45,7 +45,7 @@ describe('gitutil unit tests', function () {
         expect(executil.ARGS.calls.argsFor(0)[0]).toEqual('git status --porcelain');
     }, TIMEOUT);
 
-    it('Test#004 : reseting from origin', function * () {
+    it('Test#004 : resetting from origin', function * () {
         yield gitutilJS.resetFromOrigin();
         expect(executil.execHelper.calls.count()).toEqual(1);
         expect(executil.ARGS.calls.count()).toEqual(1);
diff --git a/src/executil.js b/src/executil.js
index b67db22..64a0033 100644
--- a/src/executil.js
+++ b/src/executil.js
@@ -37,7 +37,7 @@ exports.verbose = false;
 // silent == true or 1 ==> don't print command, don't print output
 // silent == 2 ==> don't print command, print output
 // silent == 3 ==> print command, don't print output
-// TODO: this function should be consolidated to promises, and shouldnt take win/fail callbacks.
+// TODO: this function should be consolidated to promises, and shouldn't take win/fail callbacks.
 // some async confusion here
 function execHelper (cmdAndArgs, silent, allowError, win, fail) {
     // there are times where we want silent but not allowError.


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org