Merge branch 'master' into 2.3

This commit is contained in:
Spencer Alger
2014-07-11 12:49:22 -07:00
37 changed files with 202 additions and 5479 deletions

View File

@ -10,7 +10,7 @@ client.index({
tags: ['y', 'z'],
published: true,
}
}, function (error response) {
}, function (error, response) {
});
---------

View File

@ -874,7 +874,7 @@ client.index({
tags: ['y', 'z'],
published: true,
}
}, function (error response) {
}, function (error, response) {
});
---------
@ -1570,6 +1570,8 @@ Options:::
`Text` -- The source text for which the suggestions should be returned
`timeout`::
`Date, Number` -- Explicit operation timeout
`trackScores`::
`Boolean` -- Whether to calculate and return scores even if they are not used for sorting
`version`::
`Boolean` -- Specify whether to return document version as part of a hit
`index`::
@ -3718,7 +3720,7 @@ The default method is `GET` and the usual <<api-conventions,params and return va
`fields`::
`String, String[], Boolean` -- A comma-separated list of fields for `fielddata` and `completion` index metric (supports wildcards)
`groups`::
`Boolean` -- A comma-separated list of search groups for `search` index metric
`String, String[], Boolean` -- A comma-separated list of search groups for `search` index metric
`human`::
`Boolean` -- Whether to return time and byte values in human-readable format.
`[level=indices]`::

View File

@ -740,7 +740,7 @@ client.index({
tags: ['y', 'z'],
published: true,
}
}, function (error response) {
}, function (error, response) {
});
---------

View File

@ -835,7 +835,7 @@ client.index({
tags: ['y', 'z'],
published: true,
}
}, function (error response) {
}, function (error, response) {
});
---------
@ -1502,6 +1502,8 @@ Options:::
`Text` -- The source text for which the suggestions should be returned
`timeout`::
`Date, Number` -- Explicit operation timeout
`trackScores`::
`Boolean` -- Whether to calculate and return scores even if they are not used for sorting
`version`::
`Boolean` -- Specify whether to return document version as part of a hit
`index`::

View File

@ -849,7 +849,7 @@ client.index({
tags: ['y', 'z'],
published: true,
}
}, function (error response) {
}, function (error, response) {
});
---------
@ -1520,6 +1520,8 @@ Options:::
`Text` -- The source text for which the suggestions should be returned
`timeout`::
`Date, Number` -- Explicit operation timeout
`trackScores`::
`Boolean` -- Whether to calculate and return scores even if they are not used for sorting
`version`::
`Boolean` -- Specify whether to return document version as part of a hit
`index`::

View File

@ -153,7 +153,7 @@ client.search({
response.render('search_results', {
results: response.hits.hits,
page: pageNum,
pages: Math.ceil(response.hists.total / perPage)
pages: Math.ceil(response.hits.total / perPage)
})
});
-----------------