Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion docs/api_conventions.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ By default, all api methods accept the following parameters. They are omitted fr
`String` -- The HTTP method to use for this request. All of the API methods have their own default.

`body`::
`String, Anything` -- The body to send along with this request. If the body is a string it will be passed along as is, otherwise it is passed to the serializer and converted to either JSON or a newline seperated list of JSON objects based on the API method.
`String, Anything` -- The body to send along with this request. If the body is a string it will be passed along as is, otherwise it is passed to the serializer and converted to either JSON or a newline separated list of JSON objects based on the API method.
+
NOTE: the https://github.com/fullscale/elastic.js[elastic.js] or https://github.com/danpaz/bodybuilder[bodybuilder] libraries can be used to make building request bodies simpler.

Expand Down
4 changes: 2 additions & 2 deletions src/lib/client_action.js
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ var castType = {
}
/* falls through */
default:
throw new TypeError('Invalid ' + name + ': expected be a comma seperated list, array, number or string.');
throw new TypeError('Invalid ' + name + ': expected be a comma separated list, array, number or string.');
}
},
'boolean': function (param, val) {
Expand Down Expand Up @@ -355,4 +355,4 @@ function commaSepList(str) {
return str.split(',').map(function (i) {
return i.trim();
});
}
}
4 changes: 2 additions & 2 deletions test/integration/yaml_suite/yaml_doc.js
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ function getVersionFromES(done) {
* Transform x.x.x into xxx.xxx.xxx, striping off any text at the end like beta or pre-alpha35
*
* @param {String} version - Version number represented as a string
* @return {String} - Version number represented as three numbers, seperated by -, all numbers are
* @return {String} - Version number represented as three numbers, separated by -, all numbers are
* padded with 0 and will be three characters long so the strings can be compared.
*/
function versionToComparableString(version, def) {
Expand All @@ -84,7 +84,7 @@ function versionToComparableString(version, def) {
* Compare a version range to the ES_VERSION, determining if the current version
* falls within the range.
*
* @param {String} rangeString - a string representing two version numbers seperated by a "-"
* @param {String} rangeString - a string representing two version numbers separated by a "-"
* @return {Boolean} - is the current version within the range (inclusive)
*/
function rangeMatchesCurrentVersion(rangeString, done) {
Expand Down