diff --git a/chai b/chai
index 09e17b9e..5fc5114a 160000
--- a/chai
+++ b/chai
@@ -1 +1 @@
-Subproject commit 09e17b9e090c02d38cd5ee441881dd2691635124
+Subproject commit 5fc5114a2420c4a6903e15febbc232a51e8dfb2a
diff --git a/data/codex.json b/data/codex.json
index 6d7d08bf..8dc5973a 100644
--- a/data/codex.json
+++ b/data/codex.json
@@ -9,7 +9,7 @@
"tweeturl": "http://chaijs.com",
"tweetvia": "jakeluer",
"tweetrelated": "jakeluer",
- "version": "2.1.0",
+ "version": "3.4.2",
"hasdownloads": false,
"description": "Chai is a BDD / TDD assertion library for [node](http://nodejs.org) and the browser that can be delightfully paired with any javascript testing framework."
},
@@ -27,6 +27,11 @@
, "description": ""
, "render-file": false }
+ , { "name": "plugins"
+ , "title": "utility : assert"
+ , "file": "../chai/lib/chai/assertion.js"
+ , "description": ""
+ , "render-file": false }
, { "name": "plugins"
, "title": "utility : addMethod"
, "file": "../chai/lib/chai/utils/addMethod.js"
diff --git a/data/guide/helpers/add_method_as_property.md b/data/guide/helpers/add_method_as_property.md
index 7d243b7b..2680d8d6 100644
--- a/data/guide/helpers/add_method_as_property.md
+++ b/data/guide/helpers/add_method_as_property.md
@@ -24,7 +24,7 @@ expect(arr).to.contain(2);
expect(obj).to.contain.key('a');
```
-For this to work, two seperate functions are needed. One that will be invoked when the
+For this to work, two separate functions are needed. One that will be invoked when the
chain is used as either a property or a method, and one that will be invoked when only used
as a method.
@@ -97,7 +97,7 @@ function assertModelAge (n) {
}
```
-By now, that should be self-explanitory. Now for our property function.
+By now, that should be self-explanatory. Now for our property function.
```javascript
function chainModelAge () {
diff --git a/data/guide/helpers/overwrite_property.md b/data/guide/helpers/overwrite_property.md
index bed8bb75..c76928ea 100644
--- a/data/guide/helpers/overwrite_property.md
+++ b/data/guide/helpers/overwrite_property.md
@@ -57,12 +57,12 @@ arthur.set('id', 'dont panic');
expect(arthur).to.not.be.ok;
```
-We would expect this expection to pass as well, as our statement is
+We would expect this expectation to pass as well, as our statement is
negated and the id is not a number. Unfortunately, the negation flag
was not passed to our number assertion, so it still expects the value
to be a number.
-##### Transfering Flags
+##### Transferring Flags
For this we will expand on this assertion by transfering all of the
flags from the original assertion to our new assertion. The final
diff --git a/data/guide/index.md b/data/guide/index.md
index 11d349d6..71fd9c6f 100644
--- a/data/guide/index.md
+++ b/data/guide/index.md
@@ -4,7 +4,7 @@
# Welcome to Chai
-We are glad that you have decided to give Chai.js a try! If this is your first visit, get aquainted with
+We are glad that you have decided to give Chai.js a try! If this is your first visit, get acquainted with
the basics, such as installation and our included assertion styles.
## The Basics
@@ -20,4 +20,4 @@ you want to achieve. The Plugin API is also intended as a way to simplify testin
a way to encapsulate common assertions for repeat use.
- [Core Plugin Concepts](/guide/plugins/) covers the basics of using the Chai Plugin API.
-- [Building a Helper](/guide/helpers/) is a walkthrough for writing your first plugin.
+- [Building a Helper](/guide/helpers/) is a walk-through for writing your first plugin.
diff --git a/data/guide/plugins/use.md b/data/guide/plugins/use.md
index e598d954..8266d704 100644
--- a/data/guide/plugins/use.md
+++ b/data/guide/plugins/use.md
@@ -4,7 +4,7 @@
render-file: false
---
-## Accessing Utilties
+## Accessing Utilities
Chai comes with a number of utilities to assist in the construction of assertions,
but it does not provide these directly on the `chai` export. These can be accessed
diff --git a/data/guide/styles/assert.md b/data/guide/styles/assert.md
index 18e529e7..c6f6cfdb 100644
--- a/data/guide/styles/assert.md
+++ b/data/guide/styles/assert.md
@@ -9,7 +9,7 @@
View full Assert API
The assert style is exposed through `assert` interface. This provides
-the classic assert-dot notation, similiar to that packaged with
+the classic assert-dot notation, similar to that packaged with
node.js. This assert module, however, provides several additional
tests and is browser compatible.
diff --git a/data/guide/styles/expect.md b/data/guide/styles/expect.md
index 3ab3704c..224dc371 100644
--- a/data/guide/styles/expect.md
+++ b/data/guide/styles/expect.md
@@ -38,5 +38,5 @@ assertions that might occur.
// AssertionError: topic [answer]: expected 43 to equal 42.
expect(answer, 'topic [answer]').to.equal(42);
-This comes in handy when being used with non-descript topics such as
+This comes in handy when being used with nondescript topics such as
booleans or numbers.
diff --git a/data/guide/styles/should.md b/data/guide/styles/should.md
index b678d05a..60112ab7 100644
--- a/data/guide/styles/should.md
+++ b/data/guide/styles/should.md
@@ -8,7 +8,7 @@
The `should` style allows for the same chainable assertions as the
`expect` interface, however it extends each object with a `should`
-property to start your chain. This style has some issues when used Internet
+property to start your chain. This style has some issues when used with Internet
Explorer, so be aware of browser compatibility.
var should = require('chai').should() //actually call the function
diff --git a/out/api/assert/index.html b/out/api/assert/index.html
index f5e48340..fe09bab0 100644
--- a/out/api/assert/index.html
+++ b/out/api/assert/index.html
@@ -10,9 +10,9 @@
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
+
@@ -40,8 +40,8 @@
};
-
-
+
+
-
+
-
-
+
+
-
+
-
-
+
+
-
+
-
-
+
+
-
+
-
-
+
+
-
+
-
-
+
+
-
+
-
-
+
+
-
+
-
-
+
+